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

app.js

@@ -1,8 +1,8 @@
 App({
 	globalData: {
 		userInfo: null,
-    ip: 'https://test.renminshitang.com.cn/daotian/api_dev',
+    // ip: 'https://test.renminshitang.com.cn/daotian/api_dev',
-		// ip: "https://daotian.matripe.com.cn",
+		ip: "https://daotian.matripe.com.cn",
 		// ip: 'http://localhost:8001',
 		sessionId: "",
 		header: {

pages/index/index.js

@@ -1492,7 +1492,7 @@ Page({
           console.log("searchCityParamStorage======", searchCityParamStorage);
           that.data.storeJobListSearchForm.cityName = searchCityParamStorage.name;
           if (app.isEmptyCheck(searchCityParamStorage.name)) {
-            that.data.storeJobListSearchForm.cityName = "全国";
+            that.data.storeJobListSearchForm.cityName = "";
           }
 
           that.setData({
@@ -1782,7 +1782,7 @@ Page({
       console.log(that.data.inputVal);
       that.data.storeJobListSearchForm.cityName = that.data.searchCityParamStorage.name;
       if (app.isEmptyCheck(that.data.searchCityParamStorage.name)) {
-        that.data.storeJobListSearchForm.cityName = "全国";
+        that.data.storeJobListSearchForm.cityName = "";
       }
       that.data.storeJobListSearchForm.keys = that.data.inputVal == "搜索职位" ? "" : that.data.inputVal;
       // debugger;

pages/mine/index.wxml

@@ -49,7 +49,7 @@
     </view>
   </navigator>
 
-  <!-- <navigator class url="{{isLogin? '/pages/mine/myJob/index': '/pages/login/index'}}" hover-class="none" hover-stop-propagation="false">
+   <navigator class url="{{isLogin? '/pages/mine/myJob/index': '/pages/login/index'}}" hover-class="none" hover-stop-propagation="false">
     <view class="br_8" hover-class="none" style="background-color:#fff" hover-stop-propagation="false">
       <view class="setting mt_10" hover-class="thover">
         <view>
@@ -61,7 +61,7 @@
         </view>
       </view>
     </view>
-  </navigator>   -->
+  </navigator> 
   <navigator class url="{{isLogin? '/pages/mine/listManagement/index': '/pages/login/index'}}" hover-class="none" hover-stop-propagation="false" wx:if="{{isMyPro}}">
     <view class="br_8" hover-class="none" style="background-color:#fff" hover-stop-propagation="false">
       <view class="setting mt_10" hover-class="thover">

pages/type/type/index.js

@@ -115,8 +115,9 @@ Page({
           res.data.data.labels.push(last);
         }
 
-
+        if(res.data.data.labels[0]){
-        that.data.storeJobListSearchForm['jobCategoryLabelIds'] = res.data.data.labels[0].id
+          that.data.storeJobListSearchForm['jobCategoryLabelIds'] = res.data.data.labels[0].id
+        }
         that.setData({
           list:res.data.data.labels,
           storeJobListSearchForm: that.data.storeJobListSearchForm