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

pages/index/index.js

@@ -1827,6 +1827,8 @@ Page({
           that.getTag();
 
           that.data.recordList.forEach((item, index) => {
+            console.log(item.storeDistrict);
+            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);
@@ -1849,6 +1851,7 @@ Page({
             recordList: that.data.recordList,
             currentJobDrawer: that.data.currentJobDrawer,
           });
+          console.log(that.data.recordList)
           // if (that.data.recordList.length < res.data.data.pageBean.recordCount) {
           // 	that.setData({
           // 		hasMoreData: true,
@@ -1947,9 +1950,15 @@ Page({
   goDetail (e) {
     console.log(e);
     var that = this;
-    wx.navigateTo({
-      url: "../detail/index?storeJobId=" + e.currentTarget.dataset.id + "&wxCode=" + that.data.wxCode,
-    });
+    if (this.data.isLogin) {
+        wx.navigateTo({
+          url: "../detail/index?storeJobId=" + e.currentTarget.dataset.id + "&wxCode=" + that.data.wxCode,
+        });
+      } else {
+        wx.navigateTo({
+          url: "../login/index",
+        });
+      }
 
   },
   /**

pages/index/index.wxml

@@ -270,7 +270,7 @@
         <!-- margin-top:{{(selectBrandList.length > 0 || selectJobList.length > 0 || activez != 'all' || sexid != '-1' ? 34 : 0) + statusBarHeight + ((navigationBarHeight - menuButtonHeight) / 2) + 132}}px -->
         <view class="standardList" style="padding-top: 0;min-height: calc(100vh - {{selectBrandList.length > 0 || selectJobList.length > 0 || activez != 'zuigao' || sexid != '-1' ? '170px':'214px'}})">
           <view>
-            <view x:if="{{recordList != null && recordList.length > 0}}" style="padding-top: 0;overflow-x: hidden;">
+            <view wx:if="{{recordList != null && recordList.length > 0}}" style="padding-top: 0;overflow-x: hidden;">
               <view class="jcenter bgf br8">
                 <view class="listcontainer" style="border-top: 1px solid #f3f3f3;">
                   <view class="jobOne" hover-start-time="50" hover-stay-time="0" wx:for="{{recordList}}" data-id="{{item.id}}" bindtap="goDetail" wx:key="index" hover-class="{{item.recruitment == '1' ? 'ahover':''}}" style="background-color:{{item.recruitment == '1' ? '#fff':'#f5f5f5'}};border-bottom: {{item.recruitment == '1' ? '':'1px solid #ddd'}};">
@@ -304,11 +304,11 @@
                           <view class="v-center mt12 mb12">
                             <view class="f14s 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}}
+                                <view class="overText fl mr4" style="max-width: 150px;">
+                                  {{(item.citys && item.citys != '-') ? 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>
+                                <view class="fl" wx:if="{{item.distance != null && item.distance != '' && storeJobListSearchForm.sortTag == 2}}"> {{ item.distanceKm}}</view>
+                                <view class="fl" wx:else>{{item.age}}</view>
                               </view>
                               <!--<view class="fr f14s fw400" style="color: var(--color-f40);">{{item.monthlyPay}}</view>-->
                             </view>