Merge branch 'master' of http://101.37.147.115:3000/bocaigroup/dandelionPlatform

pages/type/type/index.js

@@ -171,6 +171,7 @@ Page({
 					// that.getTag();
 
 					that.data.recordList.forEach((item, index) => {
+            item['citys'] = commonUtil.setJobInfoPosition(item.storeDistrict);
 						// console.log(item);
 						if (app.isNotEmptyCheck(item.returnFeeType) || item.returnFeeType == "0" || item.returnFee == "0") {
 							item["fuWuFei"] = commonUtil.getReturnFeeTypeName1ById(item.returnFeeType, item.returnFee);

pages/type/type/index.wxml

@@ -41,7 +41,7 @@
 		                    <view class="f12 c045 flex-1 display-flex">
 		                      <view hover-class="none" hover-stop-propagation="false" style="max-width:220px;">
 		                        <view class="overText fl" style="max-width: 150px;">
-		                          {{item.district == "" ?'':item.district}}
+		                          {{item.citys}}
 		                        </view>
 		                        <view class="fl ml4" wx:if="{{item.distance != null && item.distance != '' && storeJobListSearchForm.sortTag == 2}}"> {{ ' | ' + item.distanceKm}}</view>
 		                        <view class="fl ml4" wx:else>{{' | ' +item.age}}</view>