企业详情页编辑/删除按钮隐藏显示，企业搜索列表功能优化，登录增加userId获取

app.js

@@ -5,4 +5,5 @@ App({
     host : "http://sookajs.top:4002"
   },
   isLoginSuccess:false,
+  loginUserId: null,
 })

base/httputil.js

@@ -1,7 +1,7 @@
 // let BASE_Server = "http://127.0.0.1:8329"
     // let BASE_Server = "https://192.168.1.109:8080"
 let BASE_Server = "https://sookajs.top:18080"
-// let BASE_Server = "http://192.168.2.9:18080"
+// let BASE_Server = "http://192.168.2.9:8080"
 
 
 

pages/denglu/denglu.js

@@ -70,6 +70,8 @@ Page({
     } else {
       // that.data.openid = res.openid
       app.globalToken = res.data.access_token,
+      app.loginUserId=res.data.loginUser.userId,
+    
       wx.setStorageSync('userName', that.data.userName),
       wx.setStorageSync('password', that.data.password),
       app.isLoginSuccess = true

pages/details/details.js

@@ -8,8 +8,8 @@ Page({
   onLoad(e) {
     this.data.busEnterpriseId = e.busEnterpriseId
   },
-  onShow(){
-   
+  onShow() {
+
     this.getEnterpriseDetails()
   },
   data: {
@@ -29,7 +29,8 @@ Page({
       longitude: 125.3504459,
       width: 35,
       height: 50
-    }]
+    }],
+    isShowEdit: true,
 
   },
 
@@ -40,11 +41,15 @@ Page({
     http.post("/system/AppEnterpriseController/getEnterpriseDetails", obj, this.getEnterpriseDetailsSuccess)
   },
   getEnterpriseDetailsSuccess(res) {
- 
+    //  var currentUserId=res.enterpriseDetails.userId;
+    //  var loginUserid=app.loginUserId; 
+    this.isShowEdit = (res.enterpriseDetails.userId === app.loginUserId)
     this.setData({
       enterpriseDetails: res.enterpriseDetails,
       latitude: res.enterpriseDetails.latitude,
       longitude: res.enterpriseDetails.longitude,
+      isShowEdit: this.isShowEdit,
+
       markers: [{
         id: res.enterpriseDetails.busEnterpriseId,
         name: res.enterpriseDetails.businessName,
@@ -52,7 +57,7 @@ Page({
         latitude: res.enterpriseDetails.latitude,
         longitude: res.enterpriseDetails.longitude,
         width: 35,
-        height: 50
+        height: 50,
       }]
     })
   },
@@ -70,20 +75,20 @@ Page({
     })
   },
   //巡更点跳转
-  xungengList(){
+  xungengList() {
     wx.navigateTo({
-      url: '../patrol_list/patrol_list?enterpriseId='+this.data.busEnterpriseId,
+      url: '../patrol_list/patrol_list?enterpriseId=' + this.data.busEnterpriseId,
     })
   },
   //导航
   navRoad(event) {
-   
+
     wx.getLocation({ //获取当前经纬度
       type: 'wgs84', //返回可以用于wx.openLocation的经纬度，
       success: function (res) {
         wx.openLocation({ //​使用微信内置地图查看位置。
           latitude: Number(event.currentTarget.dataset.marker.latitude), //要去的纬度-地址
-          longitude:Number( event.currentTarget.dataset.marker.longitude), //要去的经度-地址
+          longitude: Number(event.currentTarget.dataset.marker.longitude), //要去的经度-地址
           name: event.currentTarget.dataset.marker.name,
           address: event.currentTarget.dataset.marker.address
         })
@@ -97,48 +102,48 @@ Page({
   //巡检跳转
   bindViewXunJian() {
     wx.navigateTo({
-      url: '../xunjian/xunjian?busEnterpriseId='+this.data.busEnterpriseId
-      +"&isBeforeBack=true",
+      url: '../xunjian/xunjian?busEnterpriseId=' + this.data.busEnterpriseId
+        + "&isBeforeBack=true",
     })
   },
   //巡检跳转
   bindViewXunChaJiLu() {
     wx.navigateTo({
       url: '../xunchajilu/xunchajilu?busEnterpriseId='
-      +this.data.enterpriseDetails.busEnterpriseId
-      +"&businessName="+this.data.enterpriseDetails.businessName,
+        + this.data.enterpriseDetails.busEnterpriseId
+        + "&businessName=" + this.data.enterpriseDetails.businessName,
     })
   },
   //企业详情
   bindViewQiYeXiangQingTable() {
     wx.navigateTo({
-      url: '../qiyexqtable/qiyexqtable?busEnterpriseId='+this.data.busEnterpriseId,
+      url: '../qiyexqtable/qiyexqtable?busEnterpriseId=' + this.data.busEnterpriseId,
     })
-    },
-    bindViewQiYeDelete(){
-        wx.showModal({
-          title: '提示',
-          content: '确认废弃该企业？',
-          complete: (res) => {
-            if (res.cancel) {
-              
-            }else {
-              this.deleteEnterprise()
-            }
-          }
-        })
-    },
-    deleteEnterprise() {
-      let obj = new Object();
-      obj.busEnterpriseId = this.data.busEnterpriseId
-      http.post("/system/AppEnterpriseController/deleteEnterprise", obj, this.deleteEnterpriseSuccess)
-    },
-    deleteEnterpriseSuccess(res) {
-      wx.showToast({
-        title: res.msg,
-      })
-      if(res.code == 200){
-        wx.navigateBack()
+  },
+  bindViewQiYeDelete() {
+    wx.showModal({
+      title: '提示',
+      content: '确认废弃该企业？',
+      complete: (res) => {
+        if (res.cancel) {
+
+        } else {
+          this.deleteEnterprise()
+        }
       }
-    },
+    })
+  },
+  deleteEnterprise() {
+    let obj = new Object();
+    obj.busEnterpriseId = this.data.busEnterpriseId
+    http.post("/system/AppEnterpriseController/deleteEnterprise", obj, this.deleteEnterpriseSuccess)
+  },
+  deleteEnterpriseSuccess(res) {
+    wx.showToast({
+      title: res.msg,
+    })
+    if (res.code == 200) {
+      wx.navigateBack()
+    }
+  },
 })

pages/details/details.wxml

@@ -5,16 +5,12 @@
 
     <view class="map_btn">
     <text class="iconfont icon-wenjianguanli" bindtap="bindViewXunChaJiLu"></text>
-    <text class="iconfont icon-icon-test" bindtap="bindViewQiYeXiangQingTable"></text>
-    <text class="iconfont icon-pinleishanchu" bindtap="bindViewQiYeDelete"></text>
+    <text class="iconfont icon-icon-test" bindtap="bindViewQiYeXiangQingTable" wx:if="{{isShowEdit}}"></text>
+    <text class="iconfont icon-pinleishanchu" bindtap="bindViewQiYeDelete" wx:if="{{isShowEdit}}"></text>
     </view>
 
-
-
     <view class="map_view">
 
-
-
       <view>
         <span>经度：</span>
         <i>{{enterpriseDetails.longitude}}</i>

pages/details/details.wxss

@@ -36,7 +36,10 @@ word-wrap:break-word
   background: rgba(0, 0, 0, 0.479);
   display: flex;
   flex-direction: row;
-  width: 220rpx;
+  /* width: 220rpx; */
+  width: auto;
+  padding-left: 20rpx;
+  padding-right: 20rpx;
   height: 70rpx;
   position: absolute;
   right:20rpx;

pages/search/search.js

@@ -22,7 +22,7 @@ Page({
     total: 0,
     pageNum: 1 // 页码
   },
-  onLoad() {},
+  onLoad() { },
 
   //加载数据
   loadData: function () {
@@ -33,8 +33,6 @@ Page({
     // obj.businessName = e.detail.value
     obj.searchValue = this.data.keyword,
       this.list(obj)
-
-
   },
   onShow() {
     this.loadData();
@@ -49,7 +47,20 @@ Page({
   },
 
   searchEnterprise(e) {
+    wx.showNavigationBarLoading();
+
+    var loadingData = this.data.loadingData
+    if (loadingData) {
+      return;
+    }
+    this.setData({
+      pageNum: 1,
+      isRefresh: true
+    })
     var obj = new Object()
+    obj.pageNum = this.data.pageNum
+    obj.pageSize = 10
+    obj.reasonable = false
     this.data.keyword = e.detail.value,
       obj.searchValue = e.detail.value,
       this.list(obj)
@@ -106,7 +117,8 @@ Page({
 
       var that = this
 
-      if (res.data.rows.length == 0) {
+
+      if (res.rows.length == 0) {
         wx.showToast({
           title: '暂无更多数据',
           icon: "none"
@@ -119,8 +131,8 @@ Page({
       }
       if (this.data.isRefresh) {
         this.setData({
-          enterpriseList: res.data.rows,
-          total: res.data.total
+          enterpriseList: res.rows,
+          total: res.total
         })
 
 
@@ -139,7 +151,7 @@ Page({
 
       } else {
         this.setData({
-          enterpriseList: this.data.enterpriseList.concat(res.data.rows)
+          enterpriseList: this.data.enterpriseList.concat(res.rows)
         })
         // 隐藏加载框
 
@@ -148,7 +160,6 @@ Page({
             hidden: true,
             loadingData: false
           });
-
           wx.hideLoading();
         }, 1000)