commit

base/httputil.js

@@ -1,5 +1,5 @@
 // let BASE_Server = "http://127.0.0.1:8329"
-    // let BASE_Server = "https://192.168.1.114:18080"
+    // let BASE_Server = "https://192.168.1.100:8080"
 let BASE_Server = "https://sookajs.top:28080"
 
 

pages/menu/menu.js

@@ -14,6 +14,7 @@ Component({
       value: []
     }
   },
+  //使用全局样式
   options: {
     addGlobalClass: true,
   },

pages/menu/menu.wxml

@@ -10,6 +10,8 @@
     </block>
     </view>
     <view catchtap='showclick' class='menu_main menu_con'>
-    <i class="iconfont icon-jiahao"></i>
+      <i class="iconfont icon-jiahao"></i>
+    <!-- <i wx:if="{{showmenus}}" class="iconfont icon-jiahao" style="z-index: 999;"></i> -->
+    <!-- <i wx:else class="iconfont icon-jiahao" style="z-index: -1;"></i> -->
     </view>
 </view>

pages/menu/menu.wxss

@@ -53,7 +53,7 @@ height: 50rpx;
 
   color: #fff;
   /* margin: auto; */
-  position: absolute;top:50%;left:50%;transform:translate(-50%,-50%);
+  position: absolute;bottom:5rpx;left:50%;transform:translate(-50%,-50%);
 }
 .menu_bg{
   background: rgb(236, 235, 235);

pages/search/search.js

@@ -44,7 +44,7 @@ Page({
         enterpriseCode:res.result
       })
       var obj = new Object()
-      obj.enterpriseCode = that.data.enterpriseCode
+      obj.searchValue = that.data.enterpriseCode
       that.list(obj)
       },
       fail: (res) => {

pages/search/search.wxml

@@ -2,7 +2,7 @@
   <!-- 搜索 -->
   <view class="search-container">
     <view class="search-left">
-      <input type="text" bindinput="searchEnterprise" placeholder="请输入企业名称" />
+      <input type="text" bindinput="searchEnterprise" placeholder="请输入企业名称" value="{{enterpriseCode}}" />
     </view>
     <button bindtap="bindViewSearchCode" class="search-right">
       <text class="iconfont icon-saoyisao1"></text>

pages/xuncha/xuncha.js

@@ -24,9 +24,9 @@ Page({
         "title": "巡检",
       },
     ],
-    mainmodel: {
+    // mainmodel: {
 
-    }
+    // }
   },
 
   onLoad() {

pages/xuncha/xuncha.wxml

@@ -54,8 +54,8 @@
       <!-- <view class="line2"></view> -->
     </view>
     <!--bindmenuItemClick为按钮点击的时候的回调方法  mainmodel是显示的按钮，menulist为折叠的菜单的数组数据-->
-    <menu bindmenuItemClick="menuItemClick" mainmodel="{{mainmodel}}" menulist="{{menulist}}"></menu>
-
-  </view>
+    <menu wx:if="" bindmenuItemClick="menuItemClick" menulist="{{menulist}}" mainmodel="{{mainmodel}}"></menu>
+     
+    </view>
 
 </view>

pages/xunchajilu/xunchajilu.js

@@ -61,7 +61,7 @@ Page({
   }else{
    
     wx.navigateTo({
-      url: '../xunjianmore/xunjianmore?buslogid='+buslogid
+      url: '../xunjianmore/xunjianmore?buslogid='+buslogid+'&busEnterpriseId='+this.data.busEnterpriseId
     })
   }
  

pages/xungengdetails/xungengdetails.js

@@ -49,6 +49,7 @@ Page({
   getDetailsSuccess(res) {
     
     wx.hideLoading()
+    debugger
     if (res.data.length == 0) {
 
       wx.showToast({

pages/xunjian/xunjian.js

@@ -360,12 +360,11 @@ Page({
           url: '../details/details?busEnterpriseId=' + this.data.busEnterpriseId,
         })
       }
-    } else {
-      wx.showToast({
-        title: res.msg,
-        icon: "none"
-      })
-    }
+    } 
+    wx.showToast({
+      title: res.msg,
+      icon: "none"
+    })
   },
 
   cz_xunjianItems(listid, checked, jibie) {

project.private.config.json

@@ -1,7 +1,7 @@
 {
   "projectname": "sooka_edyj_minapp",
   "setting": {
-    "compileHotReLoad": false,
+    "compileHotReLoad": true,
     "urlCheck": false
   },
   "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",