2020-5-27 提交

测试小程序分包/miniprogram-2/packageA/pages/admin_limits/admin_limit_allocation/admin_limit_allocation.js

@@ -35,8 +35,10 @@ Page({
     var that = this
     if (data == undefined) {
       var searchID = ''
+      var page = that.data.page
     } else {
       var searchID = data
+      var page = 1
     }
     wx.getStorage({
       key: 'userName',
@@ -48,7 +50,7 @@ Page({
           },
           method: "post",
           data: {
-            page: that.data.page,
+            page: page,
             ret: searchID,
             username: res.data
           },
@@ -56,8 +58,9 @@ Page({
             if (res.statusCode != 200) {
               app.showError()
             } else {
-              if (res.data.nums != 0) {
+              if (res.data.nums != 0 && res.data.dat.length !== 0) {
                 var list = that.data.list
+                var list = []
                 for (var i = 0; i < res.data.dat.length; i++) {
                   list.push(res.data.dat[i]);
                 }
@@ -74,11 +77,13 @@ Page({
                   //后端数据条数大于限制数据条数时显示提示
                   if (res.data.nums >= num) {
                     that.setData({
-                      newData: '0'
+                      newData: '0',
+                      num: res.data.num
                     })
                   }
                 }
               } else {
+                wx.hideLoading()
                 wx.showModal({
                   title: '提示',
                   content: '暂无数据',

测试小程序分包/miniprogram-2/packageA/pages/admin_limits/admin_limit_allocation/admin_limit_allocation.wxml

@@ -30,7 +30,7 @@
 		</view>
 
 		<!-- 已显示全部信息 -->
-		<view class="admin_limit_allocation-ul-dowtxt" wx:if="{{newData == '0'}}">- 已显示全部啦 -</view>
+		<view class="admin_limit_allocation-ul-dowtxt" wx:if="{{newData == '0' && num > 10}}">- 已显示全部啦 -</view>
 	</view>
 
 	<!-- 暂无数据 -->

测试小程序分包/miniprogram-2/packageA/pages/admin_limits/admin_limit_allocation/admin_limit_allocation.wxss

@@ -95,7 +95,8 @@
 
 /* 信息 */
 .container-right-box-meg {
-  margin: 0 200rpx 0 0;
+  /* margin: 0 200rpx 0 0; */
+  margin: 0 150rpx 0 0;
 }
 
 .container-right-box-meg-id {
@@ -112,7 +113,8 @@
   font-weight: 500;
   line-height: 40rpx;
   text-align: left;
-  width: 105rpx;
+  /* width: 105rpx; */
+  width: 220rpx;
   overflow: hidden;
   text-overflow: ellipsis;
   display: -webkit-box;

测试小程序分包/miniprogram-2/packageA/pages/admin_limits/admin_limit_allocation_details_facility/admin_limit_allocation_details_facility.js

@@ -40,7 +40,9 @@ Page({
         page: that.data.page,
       },
       success: function (res) {
+        console.log(res.data.dat)
         var list = that.data.list;
+        var list = [];
         for (var i = 0; i < res.data.dat.length; i++) {
           list.push(res.data.dat[i]);
           array.push(res.data.dat[i].equipid)

测试小程序分包/miniprogram-2/packageA/pages/admin_limits/admin_limits_user/admin_limits_user.js

@@ -133,11 +133,13 @@ Page({
               if (res.data.nums != 0) {
                 wx.hideLoading()
                 var list = that.data.list;
+                var list = []
                 for (var i = 0; i < res.data.dat.length; i++) {
                   list.push(res.data.dat[i]);
                 }
                 that.setData({
-                  list: list
+                  list: list,
+                  num: res.data.nums
                 });
                 if (res.data.dat.length < that.data.pageSize) {
                   // 没有数据了，已经是最后一页
@@ -188,7 +190,7 @@ Page({
                 listA.push(res.data.dat[i]);
               }
               that.setData({
-                userdata: listA
+                userdata: listA,
               });
               //判断当前是否有数据
               if (res.data.nums != 0) {
@@ -196,7 +198,8 @@ Page({
                 if (res.data.dat.length < that.data.pageSize) {
                   // 没有数据了，已经是最后一页
                   that.setData({
-                    newData: '0'
+                    newData: '0',
+                    num: res.data.num
                   })
                 }
               } else {

测试小程序分包/miniprogram-2/packageA/pages/admin_limits/admin_limits_user/admin_limits_user.wxml

@@ -29,7 +29,7 @@
 					</view>
 
 					<!-- 显示全部 -->
-					<view class="admin_limits_user-ul-dowtxt" wx:if="{{newData == '0'}}">- 已显示全部啦 -</view>
+					<view class="admin_limits_user-ul-dowtxt" wx:if="{{newData == '0' && num > 10}}">- 已显示全部啦 -</view>
 				</view>
 
 				<!-- 暂无数据 -->
@@ -70,6 +70,9 @@
 						<image class="container-right-box-right-img" src="https://wx.yfzhwlw.com/wechat_photo/equip/xcx_42.png"></image>
 
 					</view>
+
+						<!-- 显示全部 -->
+					<view class="admin_limits_user-ul-dowtxt" wx:if="{{newData == '0' && num > 10}}">- 已显示全部啦 -</view>
 				</view>
 
 				<!-- 暂无数据 -->

测试小程序分包/miniprogram-2/packageA/pages/admin_limits/admin_limits_user_detailsB/admin_limits_user_detailsB.wxss

@@ -45,6 +45,7 @@ label {
 .admin_limits_user_detailsB-img {
   width: 610rpx;
   height: 480rpx;
+  background: #000;
 }
 
 /* 按钮 */

测试小程序分包/miniprogram-2/packageA/pages/admin_limits/admin_limits_user_detailsB_edit/admin_limits_user_detailsB_edit.js

@@ -104,7 +104,7 @@ Page({
    */
   onLoad: function (options) {
     var that = this
-    var img = 'http://47.104.218.216:8000' + options.img
+    var img = 'https://wx.yfzhwlw.com/' + options.img
     var txt = options.txt
     var name = options.name
     that.setData({

测试小程序分包/miniprogram-2/packageA/pages/admin_limits/admin_limits_user_detailsB_edit/admin_limits_user_detailsB_edit.wxss

@@ -57,4 +57,5 @@ label {
   height: 150rpx;
   border-radius: 20rpx;
   margin: 20rpx 0 0 20rpx;
+  background: #000;
 }

测试小程序分包/miniprogram-2/packageA/pages/list_facility/list_facility/list_facility.js

@@ -9,9 +9,7 @@ Page({
     // lists: [
     //   "杀虫灯", "虫情测报", "气象站", "孢子仪", "监控"
     // ],
-    lists: [
-      "杀虫灯", "虫情测报", "气象站", "孢子仪"
-    ],
+    lists: [],
     indexId: 0,
     list: [],
     page: 1,
@@ -25,28 +23,30 @@ Page({
   // 左侧点击事件
   jumpIndex(e) {
     let index = e.currentTarget.dataset.menuindex
+    let id = e.currentTarget.dataset.id
     let that = this
+    let name = id[index]
     that.setData({
       indexId: index
     });
     //判断当前要请求什么数据
-    if (index == '0') {
+    if (name == '杀虫灯') {
       //杀虫灯
       var type = '2'
       var img = 'wechat_photo/index/scd_2.png'
-    } else if (index == '1') {
+    } else if (name == '测报灯') {
       //虫情测报
       var type = '3'
       var img = 'wechat_photo/index/cbd_2.png'
-    } else if (index == '2') {
+    } else if (name == '气象站') {
       //气象站
       var type = '5'
       var img = 'wechat_photo/index/qxz_2.png'
-    } else if (index == '3') {
+    } else if (name == '孢子仪') {
       //孢子仪
       var type = '7'
       var img = 'wechat_photo/index/bzy_2.png'
-    } else if (index == '4') {
+    } else if (name == '监控') {
       //监控
       var type = '6'
       var img = 'wechat_photo/index/jk_2.png'
@@ -55,7 +55,7 @@ Page({
       img: img
     })
 
-    var thaa = this;
+
     wx.getStorage({
       key: 'login',
       success(res) {
@@ -224,22 +224,29 @@ Page({
               console.log(res.data.dat)
               wx.hideLoading()
               var data = res.data.dat
+              var lists = that.data.lists
+              var lists = []
               for (var i = 0; i < data.length; i++) {
                 if (data[i] == 2) {
                   var scd = 'scd'
                   //杀虫灯
+                  lists.push('杀虫灯')
                 } else if (data[i] == 3) {
                   var cbd = 'cbd'
                   //测报灯
+                  lists.push('测报灯')
                 } else if (data[i] == 5) {
                   var qxz = 'qxz'
                   //气象站
+                  lists.push('气象站')
                 } else if (data[i] == 6) {
                   //监控
                   var jk = 'jk'
+                  lists.push('监控')
                 } else if (data[i] == 7) {
                   var bzy = 'bzy'
                   //孢子仪
+                  lists.push('孢子仪')
                 }
                 // } else if (data[i] == 8) {
                 //   var xy = 'xy'
@@ -247,6 +254,10 @@ Page({
                 //   console.log('性诱')
                 // }
               }
+              that.setData({
+                lists: lists
+              })
+              that.requestVideos(1)
             }
           }
         })
@@ -259,7 +270,7 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-    this.requestVideos(1)
+    // this.requestVideos(1)
     //判断当前账号
     this.ceshi()
     wx.showLoading({
@@ -327,24 +338,26 @@ Page({
   requestVideos: function () {
     var that = this;
     var indexId = that.data.indexId
+    var lists = that.data.lists
+    var name = lists[indexId]
     //判断当前要请求什么数据
-    if (indexId == '0') {
+    if (name == '杀虫灯') {
       //杀虫灯
       var type = '2'
       var img = 'wechat_photo/index/scd_2.png'
-    } else if (indexId == '1') {
+    } else if (name == '测报灯') {
       //虫情测报
       var type = '3'
       var img = 'wechat_photo/index/cbd_2.png'
-    } else if (indexId == '2') {
+    } else if (name == '气象站') {
       //气象站
       var type = '5'
       var img = 'wechat_photo/index/qxz_2.png'
-    } else if (indexId == '3') {
+    } else if (name == '孢子仪') {
       //孢子仪
       var type = '7'
       var img = 'wechat_photo/index/bzy_2.png'
-    } else if (indexId == '4') {
+    } else if (name == '监控') {
       //监控
       var type = '6'
       var img = 'wechat_photo/index/jk_2.png'

测试小程序分包/miniprogram-2/packageA/pages/list_facility/list_facility/list_facility.wxml

@@ -19,7 +19,7 @@
 			<scroll-view scroll-y scroll-with-animation scroll-left="{{scrollLength}}" class='scrollY' style='height: {{winHeight}}px'>
 				<view class='all clear'>
 					<block wx:key="lists" wx:for="{{lists}}">
-						<view bindtap='jumpIndex' data-menuindex='{{index}}'>
+						<view bindtap='jumpIndex' data-menuindex='{{index}}' data-id='{{lists}}'>
 							<view class='text-style'>
 								<view class="{{indexId==index?'active1':''}}">{{item}}</view>
 								<text class="{{indexId==index?'active':''}}"></text>

测试小程序分包/miniprogram-2/packageB/pages/bzy_forms/bzbz_forms/bzbz_forms.js

@@ -28,55 +28,64 @@ Page({
     })
     var that = this;
     var searchID = that.data.searchID //获取到用户搜索的ID值
-    wx.request({
-      url: 'https://wx.yfzhwlw.com/wechat_equip_search',
-      header: {
-        "Content-Type": "application/x-www-form-urlencoded"
-      },
-      method: "post",
-      data: {
-        equip_id: searchID,
-        type: '7'
-      },
-      success: function (res) {
-        //判断当前请求到的数据是否为空
-        if (res.data.dat.length == '0') {
-          wx.showToast({
-            title: '暂无该设备,请确定您输入的ID是否有误',
-            icon: 'none',
-            duration: 2000
-          })
-        } else {
-          var list = [];
-          for (var i = 0; i < res.data.dat.length; i++) {
-            list.push(res.data.dat[i]);
-          }
-          that.setData({
-            list: list
-          });
-          if (res.statusCode != 200) {
-            app.showError()
-          } else {
-            wx.hideLoading()
-            var num = that.data.pageSize //限制数据条数
-            var nums = res.data.nums
-            var bb = nums / num
-            var aa = Math.ceil(bb) //最后得到的页数
-            if (aa == that.data.page) {
-              //后端数据条数大于限制数据条数时显示提示
-              if (res.data.nums >= num) {
-                that.setData({
-                  newData: '0'
-                })
+    wx.getStorage({
+      key: 'login',
+      success(res) {
+        wx.request({
+          url: 'https://wx.yfzhwlw.com/wechat_equip_search',
+          header: {
+            "Content-Type": "application/x-www-form-urlencoded"
+          },
+          method: "post",
+          data: {
+            equip_id: searchID,
+            type: '7',
+            page: '1',
+            username: res.data,
+            ret: 'set'
+          },
+          success: function (res) {
+            //判断当前请求到的数据是否为空
+            if (res.data.dat.length == '0') {
+              wx.showToast({
+                title: '暂无该设备,请确定您输入的ID是否有误',
+                icon: 'none',
+                duration: 2000
+              })
+            } else {
+              var list = [];
+              for (var i = 0; i < res.data.dat.length; i++) {
+                list.push(res.data.dat[i]);
+              }
+              that.setData({
+                list: list
+              });
+              if (res.statusCode != 200) {
+                app.showError()
+              } else {
+                wx.hideLoading()
+                var num = that.data.pageSize //限制数据条数
+                var nums = res.data.nums
+                var bb = nums / num
+                var aa = Math.ceil(bb) //最后得到的页数
+                if (aa == that.data.page) {
+                  //后端数据条数大于限制数据条数时显示提示
+                  if (res.data.nums >= num) {
+                    that.setData({
+                      newData: '0'
+                    })
+                  }
+                }
               }
             }
+          },
+          fail: function (res) {
+            app.showError()
           }
-        }
-      },
-      fail: function (res) {
-        app.showError()
+        });
       }
-    });
+    })
+
   },
 
   //点击进入孢子仪报表管理详情页面
@@ -170,7 +179,8 @@ Page({
           data: {
             username: res.data,
             type: '7',
-            page: that.data.page
+            page: that.data.page,
+            ret: 'list'
           },
           success: function (res) {
             var list = that.data.list;

测试小程序分包/miniprogram-2/packageB/pages/bzy_list/bzbz_list/bzbz_list.js

@@ -28,55 +28,63 @@ Page({
     })
     var that = this;
     var searchID = that.data.searchID //获取到用户搜索的ID值
-    wx.request({
-      url: 'https://wx.yfzhwlw.com/wechat_equip_search',
-      header: {
-        "Content-Type": "application/x-www-form-urlencoded"
-      },
-      method: "post",
-      data: {
-        equip_id: searchID,
-        type: '7'
-      },
-      success: function (res) {
-        //判断当前请求到的数据是否为空
-        if (res.data.dat.length == '0') {
-          wx.showToast({
-            title: '暂无该设备,请确定您输入的ID是否有误',
-            icon: 'none',
-            duration: 2000
-          })
-        } else {
-          var list = [];
-          for (var i = 0; i < res.data.dat.length; i++) {
-            list.push(res.data.dat[i]);
-          }
-          that.setData({
-            list: list
-          });
-          if (res.statusCode != 200) {
-            app.showError()
-          } else {
-            wx.hideLoading()
-            var num = that.data.pageSize //限制数据条数
-              var nums = res.data.nums
-              var bb = nums / num
-              var aa = Math.ceil(bb) //最后得到的页数
-              if (aa == that.data.page) {
-                //后端数据条数大于限制数据条数时显示提示
-                if (res.data.nums >= num) {
-                  that.setData({
-                    newData: '0'
-                  })
+    wx.getStorage({
+      key: 'login',
+      success(res) {
+        wx.request({
+          url: 'https://wx.yfzhwlw.com/wechat_equip_search',
+          header: {
+            "Content-Type": "application/x-www-form-urlencoded"
+          },
+          method: "post",
+          data: {
+            equip_id: searchID,
+            type: '7',
+            username: res.data,
+            ret: 'set'
+          },
+          success: function (res) {
+            //判断当前请求到的数据是否为空
+            if (res.data.dat.length == '0') {
+              wx.showToast({
+                title: '暂无该设备,请确定您输入的ID是否有误',
+                icon: 'none',
+                duration: 2000
+              })
+            } else {
+              var list = [];
+              for (var i = 0; i < res.data.dat.length; i++) {
+                list.push(res.data.dat[i]);
+              }
+              that.setData({
+                list: list
+              });
+              if (res.statusCode != 200) {
+                app.showError()
+              } else {
+                wx.hideLoading()
+                var num = that.data.pageSize //限制数据条数
+                var nums = res.data.nums
+                var bb = nums / num
+                var aa = Math.ceil(bb) //最后得到的页数
+                if (aa == that.data.page) {
+                  //后端数据条数大于限制数据条数时显示提示
+                  if (res.data.nums >= num) {
+                    that.setData({
+                      newData: '0'
+                    })
+                  }
                 }
               }
+            }
+          },
+          fail: function (res) {
+            app.showError()
           }
-        }
-      },
-      fail: function (res) {
-        app.showError()
+        });
       }
-    });
+    })
+
   },
 
   //点击进入详情
@@ -169,7 +177,8 @@ Page({
           data: {
             username: res.data,
             type: '7',
-            page: that.data.page
+            page: that.data.page,
+            ret: 'list'
           },
           success: function (res) {
             if (res.statusCode != 200) {

测试小程序分包/miniprogram-2/packageB/pages/cbd_forms/cbd_forms/cbd_forms.js

@@ -28,55 +28,64 @@ Page({
     })
     var that = this;
     var searchID = that.data.searchID //获取到用户搜索的ID值
-    wx.request({
-      url: 'https://wx.yfzhwlw.com/wechat_equip_search',
-      header: {
-        "Content-Type": "application/x-www-form-urlencoded"
-      },
-      method: "post",
-      data: {
-        equip_id: searchID,
-        type: '3'
-      },
-      success: function (res) {
-        //判断当前请求到的数据是否为空
-        if (res.data.dat.length == '0') {
-          wx.showToast({
-            title: '暂无该设备,请确定您输入的ID是否有误',
-            icon: 'none',
-            duration: 2000
-          })
-        } else {
-          var list = [];
-          for (var i = 0; i < res.data.dat.length; i++) {
-            list.push(res.data.dat[i]);
-          }
-          that.setData({
-            list: list
-          });
-          if (res.statusCode != 200) {
-            app.showError()
-          } else {
-            wx.hideLoading()
-            var num = that.data.pageSize //限制数据条数
-            var nums = res.data.nums
-            var bb = nums / num
-            var aa = Math.ceil(bb) //最后得到的页数
-            if (aa == that.data.page) {
-              //后端数据条数大于限制数据条数时显示提示
-              if (res.data.nums >= num) {
-                that.setData({
-                  newData: '0'
-                })
+    wx.getStorage({
+      key: 'login',
+      success(res) {
+        wx.request({
+          url: 'https://wx.yfzhwlw.com/wechat_equip_list',
+          header: {
+            "Content-Type": "application/x-www-form-urlencoded"
+          },
+          method: "post",
+          data: {
+            equip_id: searchID,
+            type: '3',
+            ret: 'set',
+            page: '1',
+            username: res.data
+          },
+          success: function (res) {
+            //判断当前请求到的数据是否为空
+            if (res.data.dat.length == '0') {
+              wx.showToast({
+                title: '暂无该设备,请确定您输入的ID是否有误',
+                icon: 'none',
+                duration: 2000
+              })
+            } else {
+              var list = [];
+              for (var i = 0; i < res.data.dat.length; i++) {
+                list.push(res.data.dat[i]);
+              }
+              that.setData({
+                list: list
+              });
+              if (res.statusCode != 200) {
+                app.showError()
+              } else {
+                wx.hideLoading()
+                var num = that.data.pageSize //限制数据条数
+                var nums = res.data.nums
+                var bb = nums / num
+                var aa = Math.ceil(bb) //最后得到的页数
+                if (aa == that.data.page) {
+                  //后端数据条数大于限制数据条数时显示提示
+                  if (res.data.nums >= num) {
+                    that.setData({
+                      newData: '0'
+                    })
+                  }
+                }
               }
             }
+          },
+          fail: function (res) {
+            app.showError()
           }
-        }
-      },
-      fail: function (res) {
-        app.showError()
+        });
       }
-    });
+    })
+
   },
 
   //点击进入测报灯报表管理详情
@@ -170,7 +179,8 @@ Page({
           data: {
             username: res.data,
             type: '3',
-            page: that.data.page
+            page: that.data.page,
+            ret: 'list'
           },
           success: function (res) {
             var list = that.data.list;

测试小程序分包/miniprogram-2/packageB/pages/cbd_list/cbd_list/cbd_list.js

@@ -28,55 +28,63 @@ Page({
     })
     var that = this;
     var searchID = that.data.searchID //获取到用户搜索的ID值
-    wx.request({
-      url: 'https://wx.yfzhwlw.com/wechat_equip_search',
-      header: {
-        "Content-Type": "application/x-www-form-urlencoded"
-      },
-      method: "post",
-      data: {
-        equip_id: searchID,
-        type: '3'
-      },
-      success: function (res) {
-        //判断当前请求到的数据是否为空
-        if (res.data.dat.length == '0') {
-          wx.showToast({
-            title: '暂无该设备,请确定您输入的ID是否有误',
-            icon: 'none',
-            duration: 2000
-          })
-        } else {
-          var list = [];
-          for (var i = 0; i < res.data.dat.length; i++) {
-            list.push(res.data.dat[i]);
-          }
-          that.setData({
-            list: list
-          });
-          if (res.statusCode != 200) {
-            app.showError()
-          } else {
-            wx.hideLoading()
-            var num = that.data.pageSize //限制数据条数
-            var nums = res.data.nums
-            var bb = nums / num
-            var aa = Math.ceil(bb) //最后得到的页数
-            if (aa == that.data.page) {
-              //后端数据条数大于限制数据条数时显示提示
-              if (res.data.nums >= num) {
-                that.setData({
-                  newData: '0'
-                })
+    wx.getStorage({
+      key: 'login',
+      success(res) {
+        wx.request({
+          url: 'https://wx.yfzhwlw.com/wechat_equip_search',
+          header: {
+            "Content-Type": "application/x-www-form-urlencoded"
+          },
+          method: "post",
+          data: {
+            equip_id: searchID,
+            type: '3',
+            ret: 'set',
+            page: '1',
+            username: res.data
+          },
+          success: function (res) {
+            //判断当前请求到的数据是否为空
+            if (res.data.dat.length == '0') {
+              wx.showToast({
+                title: '暂无该设备,请确定您输入的ID是否有误',
+                icon: 'none',
+                duration: 2000
+              })
+            } else {
+              var list = [];
+              for (var i = 0; i < res.data.dat.length; i++) {
+                list.push(res.data.dat[i]);
+              }
+              that.setData({
+                list: list
+              });
+              if (res.statusCode != 200) {
+                app.showError()
+              } else {
+                wx.hideLoading()
+                var num = that.data.pageSize //限制数据条数
+                var nums = res.data.nums
+                var bb = nums / num
+                var aa = Math.ceil(bb) //最后得到的页数
+                if (aa == that.data.page) {
+                  //后端数据条数大于限制数据条数时显示提示
+                  if (res.data.nums >= num) {
+                    that.setData({
+                      newData: '0'
+                    })
+                  }
+                }
               }
             }
+          },
+          fail: function (res) {
+            app.showError()
           }
-        }
-      },
-      fail: function (res) {
-        app.showError()
+        });
       }
-    });
+    })
   },
 
   //点击进入测报灯详情
@@ -169,7 +177,9 @@ Page({
           data: {
             username: res.data,
             type: '3',
-            page: that.data.page
+            page: that.data.page,
+            username: res.data,
+            ret: 'list'
           },
           success: function (res) {
             var list = that.data.list;

测试小程序分包/miniprogram-2/packageB/pages/qxz_forms/weather-forms/weather-forms.js

@@ -28,55 +28,63 @@ Page({
     })
     var that = this;
     var searchID = that.data.searchID //获取到用户搜索的ID值
-    wx.request({
-      url: 'https://wx.yfzhwlw.com/wechat_equip_search',
-      header: {
-        "Content-Type": "application/x-www-form-urlencoded"
-      },
-      method: "post",
-      data: {
-        equip_id: searchID,
-        type: '5'
-      },
-      success: function (res) {
-        //判断当前请求到的数据是否为空
-        if (res.data.dat.length == '0') {
-          wx.showToast({
-            title: '暂无该设备,请确定您输入的ID是否有误',
-            icon: 'none',
-            duration: 2000
-          })
-        } else {
-          var list = [];
-          for (var i = 0; i < res.data.dat.length; i++) {
-            list.push(res.data.dat[i]);
-          }
-          that.setData({
-            list: list
-          });
-          if (res.statusCode != 200) {
-            app.showError()
-          } else {
-            wx.hideLoading()
-            var num = that.data.pageSize //限制数据条数
-            var nums = res.data.nums
-            var bb = nums / num
-            var aa = Math.ceil(bb) //最后得到的页数
-            if (aa == that.data.page) {
-              //后端数据条数大于限制数据条数时显示提示
-              if (res.data.nums >= num) {
-                that.setData({
-                  newData: '0'
-                })
+    wx.getStorage({
+      key: 'login',
+      success(res) {
+        wx.request({
+          url: 'https://wx.yfzhwlw.com/wechat_equip_search',
+          header: {
+            "Content-Type": "application/x-www-form-urlencoded"
+          },
+          method: "post",
+          data: {
+            equip_id: searchID,
+            type: '5',
+            ret: 'set',
+            username: res.data
+          },
+          success: function (res) {
+            //判断当前请求到的数据是否为空
+            if (res.data.dat.length == '0') {
+              wx.showToast({
+                title: '暂无该设备,请确定您输入的ID是否有误',
+                icon: 'none',
+                duration: 2000
+              })
+            } else {
+              var list = [];
+              for (var i = 0; i < res.data.dat.length; i++) {
+                list.push(res.data.dat[i]);
+              }
+              that.setData({
+                list: list
+              });
+              if (res.statusCode != 200) {
+                app.showError()
+              } else {
+                wx.hideLoading()
+                var num = that.data.pageSize //限制数据条数
+                var nums = res.data.nums
+                var bb = nums / num
+                var aa = Math.ceil(bb) //最后得到的页数
+                if (aa == that.data.page) {
+                  //后端数据条数大于限制数据条数时显示提示
+                  if (res.data.nums >= num) {
+                    that.setData({
+                      newData: '0'
+                    })
+                  }
+                }
               }
             }
+          },
+          fail: function (res) {
+            app.showError()
           }
-        }
-      },
-      fail: function (res) {
-        app.showError()
+        });
       }
-    });
+    })
+
   },
 
   //点击进入详情
@@ -168,7 +176,8 @@ Page({
           data: {
             username: res.data,
             type: '5',
-            page: that.data.page
+            page: that.data.page,
+            ret: 'list'
           },
           success: function (res) {
             var list = that.data.list;

测试小程序分包/miniprogram-2/packageB/pages/qxz_list/weather-list/weather-list.js

@@ -1,6 +1,5 @@
-
 //获取应用实例
-const app = getApp()    
+const app = getApp()
 Page({
 
   /** 
@@ -12,7 +11,7 @@ Page({
     pageSize: 10,
     isLastPage: false,
     tips: '上拉加载更多',
-    windowHeight: app.globalData.windowHeight  
+    windowHeight: app.globalData.windowHeight
   },
 
   // 点击进入详情页面
@@ -38,55 +37,65 @@ Page({
     })
     var that = this;
     var searchID = that.data.searchID //获取到用户搜索的ID值
-    wx.request({
-      url: 'https://wx.yfzhwlw.com/wechat_equip_search',
-      header: {
-        "Content-Type": "application/x-www-form-urlencoded"
-      },
-      method: "post",
-      data: {
-        equip_id: searchID,
-        type: '5'
-      },
-      success: function (res) {
-        //判断当前请求到的数据是否为空
-        if (res.data.dat.length == '0') {
-          wx.showToast({
-            title: '暂无该设备,请确定您输入的ID是否有误',
-            icon: 'none',
-            duration: 2000
-          })
-        } else {
-          var list = [];
-          for (var i = 0; i < res.data.dat.length; i++) {
-            list.push(res.data.dat[i]);
-          }
-          that.setData({
-            list: list
-          });
-          if (res.statusCode != 200) {
-            app.showError()
-          } else {
-            wx.hideLoading()
-            var num = that.data.pageSize //限制数据条数
-            var nums = res.data.nums
-            var bb = nums / num
-            var aa = Math.ceil(bb) //最后得到的页数
-            if (aa == that.data.page) {
-              //后端数据条数大于限制数据条数时显示提示
-              if (res.data.nums >= num) {
-                that.setData({
-                  newData: '0'
-                })
+    wx.getStorage({
+      key: 'login',
+      success(res) {
+        wx.request({
+          // url: 'https://wx.yfzhwlw.com/wechat_equip_search',
+          url: 'https://wx.yfzhwlw.com/wechat_equip_list',
+          header: {
+            "Content-Type": "application/x-www-form-urlencoded"
+          },
+          method: "post",
+          data: {
+            equip_id: searchID,
+            type: '5',
+            ret: 'set',
+            page: '1',
+            username: res.data
+          },
+          success: function (res) {
+            //判断当前请求到的数据是否为空
+            if (res.data.dat.length == '0') {
+              wx.showToast({
+                title: '暂无该设备,请确定您输入的ID是否有误',
+                icon: 'none',
+                duration: 2000
+              })
+            } else {
+              var list = [];
+              for (var i = 0; i < res.data.dat.length; i++) {
+                list.push(res.data.dat[i]);
+              }
+              that.setData({
+                list: list
+              });
+              if (res.statusCode != 200) {
+                app.showError()
+              } else {
+                wx.hideLoading()
+                var num = that.data.pageSize //限制数据条数
+                var nums = res.data.nums
+                var bb = nums / num
+                var aa = Math.ceil(bb) //最后得到的页数
+                if (aa == that.data.page) {
+                  //后端数据条数大于限制数据条数时显示提示
+                  if (res.data.nums >= num) {
+                    that.setData({
+                      newData: '0'
+                    })
+                  }
+                }
               }
             }
+          },
+          fail: function (res) {
+            app.showError()
           }
-        }
-      },
-      fail: function (res) {
-        app.showError()
+        });
       }
-    });
+    })
+
   },
 
   /**
@@ -100,28 +109,28 @@ Page({
    * 生命周期函数--监听页面初次渲染完成
    */
   onReady: function () {
-    
+
   },
 
   /**
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-    
+
   },
 
   /**
    * 生命周期函数--监听页面隐藏
    */
   onHide: function () {
-    
+
   },
 
   /**
    * 生命周期函数--监听页面卸载
    */
   onUnload: function () {
-    
+
   },
 
   /**
@@ -149,7 +158,7 @@ Page({
    * 用户点击右上角分享
    */
   onShareAppMessage: function () {
-    
+
   },
 
   //请求数据
@@ -170,7 +179,8 @@ Page({
           data: {
             username: res.data,
             type: '5',
-            page: that.data.page
+            page: that.data.page,
+            ret: 'list'
           },
           success: function (res) {
             var list = that.data.list;

测试小程序分包/miniprogram-2/packageB/pages/scd_forms/scd_forms/scd_forms.js

@@ -28,55 +28,62 @@ Page({
     })
     var that = this;
     var searchID = that.data.searchID //获取到用户搜索的ID值
-    wx.request({
-      url: 'https://wx.yfzhwlw.com/wechat_equip_search',
-      header: {
-        "Content-Type": "application/x-www-form-urlencoded"
-      },
-      method: "post",
-      data: {
-        equip_id: searchID,
-        type: '2'
-      },
-      success: function (res) {
-        //判断当前请求到的数据是否为空
-        if (res.data.dat.length == '0') {
-          wx.showToast({
-            title: '暂无该设备,请确定您输入的ID是否有误',
-            icon: 'none',
-            duration: 2000
-          })
-        } else {
-          var list = [];
-          for (var i = 0; i < res.data.dat.length; i++) {
-            list.push(res.data.dat[i]);
-          }
-          that.setData({
-            list: list
-          });
-          if (res.statusCode != 200) {
-            app.showError()
-          } else {
-            wx.hideLoading()
-            var num = that.data.pageSize //限制数据条数
-            var nums = res.data.nums
-            var bb = nums / num
-            var aa = Math.ceil(bb) //最后得到的页数
-            if (aa == that.data.page) {
-              //后端数据条数大于限制数据条数时显示提示
-              if (res.data.nums >= num) {
-                that.setData({
-                  newData: '0'
-                })
+    wx.getStorage({
+      key: 'login',
+      success(res) {
+        wx.request({
+          url: 'https://wx.yfzhwlw.com/wechat_equip_search',
+          header: {
+            "Content-Type": "application/x-www-form-urlencoded"
+          },
+          method: "post",
+          data: {
+            equip_id: searchID,
+            type: '2',
+            ret: 'set',
+            username: res.data
+          },
+          success: function (res) {
+            //判断当前请求到的数据是否为空
+            if (res.data.dat.length == '0') {
+              wx.showToast({
+                title: '暂无该设备,请确定您输入的ID是否有误',
+                icon: 'none',
+                duration: 2000
+              })
+            } else {
+              var list = [];
+              for (var i = 0; i < res.data.dat.length; i++) {
+                list.push(res.data.dat[i]);
+              }
+              that.setData({
+                list: list
+              });
+              if (res.statusCode != 200) {
+                app.showError()
+              } else {
+                wx.hideLoading()
+                var num = that.data.pageSize //限制数据条数
+                var nums = res.data.nums
+                var bb = nums / num
+                var aa = Math.ceil(bb) //最后得到的页数
+                if (aa == that.data.page) {
+                  //后端数据条数大于限制数据条数时显示提示
+                  if (res.data.nums >= num) {
+                    that.setData({
+                      newData: '0'
+                    })
+                  }
+                }
               }
             }
+          },
+          fail: function (res) {
+            app.showError()
           }
-        }
-      },
-      fail: function (res) {
-        app.showError()
+        });
       }
-    });
+    })
   },
 
   //点击进入详情
@@ -190,7 +197,8 @@ Page({
           data: {
             username: res.data,
             type: '2',
-            page: that.data.page
+            page: that.data.page,
+            ret: 'list'
           },
           success: function (res) {
             if (res.statusCode != 200) {

测试小程序分包/miniprogram-2/packageB/pages/scd_list/scd_list/scd_list.js

@@ -28,55 +28,64 @@ Page({
     })
     var that = this;
     var searchID = that.data.searchID //获取到用户搜索的ID值
-    wx.request({
-      url: 'https://wx.yfzhwlw.com/wechat_equip_search',
-      header: {
-        "Content-Type": "application/x-www-form-urlencoded"
-      },
-      method: "post",
-      data: {
-        equip_id: searchID,
-        type: '2'
-      },
-      success: function (res) {
-        //判断当前请求到的数据是否为空
-        if (res.data.dat.length == '0') {
-          wx.showToast({
-            title: '暂无该设备,请确定您输入的ID是否有误',
-            icon: 'none',
-            duration: 2000
-          })
-        } else {
-          var list = [];
-          for (var i = 0; i < res.data.dat.length; i++) {
-            list.push(res.data.dat[i]);
-          }
-          that.setData({
-            list: list
-          });
-          if (res.statusCode != 200) {
-            app.showError()
-          } else {
-            wx.hideLoading()
-            var num = that.data.pageSize //限制数据条数
-            var nums = res.data.nums
-            var bb = nums / num
-            var aa = Math.ceil(bb) //最后得到的页数
-            if (aa == that.data.page) {
-              //后端数据条数大于限制数据条数时显示提示
-              if (res.data.nums >= num) {
-                that.setData({
-                  newData: '0'
-                })
+    wx.getStorage({
+      key: 'login',
+      success(res) {
+        wx.request({
+          url: 'https://wx.yfzhwlw.com/wechat_equip_list',
+          header: {
+            "Content-Type": "application/x-www-form-urlencoded"
+          },
+          method: "post",
+          data: {
+            equip_id: searchID,
+            type: '2',
+            ret: 'set',
+            page: '1',
+            username: res.data
+          },
+          success: function (res) {
+            //判断当前请求到的数据是否为空
+            if (res.data.dat.length == '0') {
+              wx.showToast({
+                title: '暂无该设备,请确定您输入的ID是否有误',
+                icon: 'none',
+                duration: 2000
+              })
+            } else {
+              var list = [];
+              for (var i = 0; i < res.data.dat.length; i++) {
+                list.push(res.data.dat[i]);
+              }
+              that.setData({
+                list: list
+              });
+              if (res.statusCode != 200) {
+                app.showError()
+              } else {
+                wx.hideLoading()
+                var num = that.data.pageSize //限制数据条数
+                var nums = res.data.nums
+                var bb = nums / num
+                var aa = Math.ceil(bb) //最后得到的页数
+                if (aa == that.data.page) {
+                  //后端数据条数大于限制数据条数时显示提示
+                  if (res.data.nums >= num) {
+                    that.setData({
+                      newData: '0'
+                    })
+                  }
+                }
               }
             }
+          },
+          fail: function (res) {
+            app.showError()
           }
-        }
-      },
-      fail: function (res) {
-        app.showError()
+        });
       }
-    });
+    })
+
   },
 
   //点击进入详情
@@ -168,7 +177,8 @@ Page({
           data: {
             username: res.data,
             type: '2',
-            page: that.data.page
+            page: that.data.page,
+            ret: 'list'
           },
           success: function (res) {
 

测试小程序分包/miniprogram-2/pages/warning/warning.js

@@ -28,55 +28,64 @@ Page({
     })
     var that = this;
     var searchID = that.data.searchID //获取到用户搜索的ID值
-    wx.request({
-      url: 'https://wx.yfzhwlw.com/wechat_equip_search',
-      header: {
-        "Content-Type": "application/x-www-form-urlencoded"
-      },
-      method: "post",
-      data: {
-        equip_id: searchID,
-        type: '3'
-      },
-      success: function (res) {
-        //判断当前请求到的数据是否为空
-        if (res.data.dat.length == '0') {
-          wx.showToast({
-            title: '暂无该设备,请确定您输入的ID是否有误',
-            icon: 'none',
-            duration: 2000
-          })
-        } else {
-          var list = [];
-          for (var i = 0; i < res.data.dat.length; i++) {
-            list.push(res.data.dat[i]);
-          }
-          that.setData({
-            list: list
-          });
-          if (res.statusCode != 200) {
-            app.showError()
-          } else {
-            wx.hideLoading()
-            var num = that.data.pageSize //限制数据条数
-            var nums = res.data.nums
-            var bb = nums / num
-            var aa = Math.ceil(bb) //最后得到的页数
-            if (aa == that.data.page) {
-              //后端数据条数大于限制数据条数时显示提示
-              if (res.data.nums >= num) {
-                that.setData({
-                  newData: '0'
-                })
+    wx.getStorage({
+      key: 'login',
+      success(res) {
+        wx.request({
+          url: 'https://wx.yfzhwlw.com/wechat_equip_list',
+          header: {
+            "Content-Type": "application/x-www-form-urlencoded"
+          },
+          method: "post",
+          data: {
+            equip_id: searchID,
+            type: '3',
+            ret: 'set',
+            username: res.data,
+            page: '1'
+          },
+          success: function (res) {
+            //判断当前请求到的数据是否为空
+            if (res.data.dat.length == '0') {
+              wx.showToast({
+                title: '暂无该设备,请确定您输入的ID是否有误',
+                icon: 'none',
+                duration: 2000
+              })
+            } else {
+              var list = [];
+              for (var i = 0; i < res.data.dat.length; i++) {
+                list.push(res.data.dat[i]);
+              }
+              that.setData({
+                list: list
+              });
+              if (res.statusCode != 200) {
+                app.showError()
+              } else {
+                wx.hideLoading()
+                var num = that.data.pageSize //限制数据条数
+                var nums = res.data.nums
+                var bb = nums / num
+                var aa = Math.ceil(bb) //最后得到的页数
+                if (aa == that.data.page) {
+                  //后端数据条数大于限制数据条数时显示提示
+                  if (res.data.nums >= num) {
+                    that.setData({
+                      newData: '0'
+                    })
+                  }
+                }
               }
             }
+          },
+          fail: function (res) {
+            app.showError()
           }
-        }
-      },
-      fail: function (res) {
-        app.showError()
+        });
       }
-    });
+    })
+
   },
 
   //点击进入测报灯详情
@@ -169,7 +178,8 @@ Page({
           data: {
             username: res.data,
             type: '3',
-            page: that.data.page
+            page: that.data.page,
+            ret: 'list'
           },
           success: function (res) {
             var list = that.data.list;