Merge branch 'master' of https://gitea.anxinyun.cn/free-sun/Inspection

weapp/pages/index/index.js

@@ -1,11 +1,71 @@
 // pages/index/index.js
+import { getProjectList } from "../../utils/getApiUrl";
+import { Request } from "../../common";
+
 Page({
 
   /**
    * 页面的初始数据
    */
   data: {
-    dataList: [1, 2, 3, 4]
+    dataList: [],
+    limit: 10, //条数
+    page: 0, //当前页
+    count: '', //总条数
+    keyName: '', //结构物名称
+    hidden: true,
+  },
+
+  // 输入框
+  formInp(e) {
+    let that = this;
+    that.setData({
+      keyName: e.detail.value
+    })
+  },
+
+  // 手机键盘点击完成按钮（回车事件）
+  bindconfirm() {
+    let that = this;
+    that.setData({
+      page: 0, //当前页
+      count: '', //总条数
+    })
+    that.getProjectList();
+  },
+
+  // 搜索表单
+  goSearch() {
+    let that = this;
+    that.setData({
+      page: 0, //当前页
+      count: '', //总条数
+    })
+    that.getProjectList();
+  },
+
+  // 获取结构物列表
+  getProjectList: function () {
+    let that = this;
+    let { page, limit, keyName } = that.data;
+    Request.get(getProjectList(), { limit, page, name: keyName }).then(res => {
+      console.log(res);
+      if (res.rows.length == 0) {
+        that.setData({
+          dataList: res.rows,
+          hidden: false
+        })
+        return;
+      }
+      var arr1 = that.data.dataList; //从data获取当前dataList数组
+      var arr2 = res.rows; //从此次请求返回的数据中获取新数组
+      arr1 = arr1.concat(arr2); //合并数组
+      that.setData({
+        dataList: arr1,
+        count: res.count, //总条数
+        hidden: true
+      })
+    })
   },
 
   /**
@@ -36,6 +96,8 @@ Page({
       wx.reLaunch({
         url: '/pages/login/login'
       });
+    } else {
+      this.getProjectList();
     }
   },
 
@@ -57,14 +119,33 @@ Page({
    * 页面相关事件处理函数--监听用户下拉动作
    */
   onPullDownRefresh() {
-
+    let that = this;
+    that.setData({
+      dataList: [],
+      keyName: '',
+      page: 0, //当前页
+      count: '', //总条数
+    })
+    that.getProjectList()
+    // 手动控制回弹
+    wx.stopPullDownRefresh();
   },
 
   /**
    * 页面上拉触底事件的处理函数
    */
   onReachBottom() {
-
+    let _that = this;
+    let page = _that.data.page + 1; //获取当前页数并+1
+    let { dataList, count } = _that.data;
+    if (dataList.length == count) {
+      showToast('没有更多数据了...');
+      return;
+    }
+    _that.setData({
+      page: page, //更新当前页数
+    })
+    _that.getProjectList()
   },
 
   /**

weapp/pages/index/index.json

@@ -2,5 +2,5 @@
   "navigationBarBackgroundColor": "#1979ff",
   "navigationBarTextStyle": "white",
   "navigationBarTitleText": "巡检总览",
-  "enablePullDownRefresh": false
+  "enablePullDownRefresh": true
 }

weapp/pages/index/index.wxml

@@ -7,7 +7,7 @@
     </view>
   </view>
 
-  <view style="margin-top: 117rpx;">
+  <view style="margin-top: 140rpx;">
     <block wx:for="{{dataList}}" wx:key='*this'>
       <view style="padding-bottom: 60rpx;">
         <image style="width: 100%;height: 372rpx;display: block;" src="https://dingyue.ws.126.net/2021/0428/099be11ej00qs9xld006bc000xc00m7m.jpg"></image>
@@ -23,4 +23,9 @@
     </block>
   </view>
 
+  <!-- 暂无数据 -->
+  <view hidden="{{hidden}}">
+    <image class="noData" src="../../images/noData.png"></image>
+    <view class="noTxt">暂无数据~</view>
+  </view>
 </view>

weapp/pages/index/index.wxss

@@ -52,4 +52,19 @@ page {
   overflow: hidden;
   line-height: 50rpx;
   background: #fff;
+}
+
+/* 暂无数据 */
+.noData {
+  width: 254rpx;
+  height: 298rpx;
+  display: block;
+  margin: 450rpx auto 16rpx;
+}
+
+.noTxt {
+  font-size: 30rpx;
+  color: #999;
+  font-weight: bold;
+  text-align: center;
 }

weapp/project.config.json

@@ -41,7 +41,7 @@
   },
   "compileType": "miniprogram",
   "libVersion": "2.19.4",
-  "appid": "wxe9595234589a0147",
+  "appid": "wxdd82ae635b22ccdb",
   "projectname": "miniprogram-92",
   "condition": {},
   "editorSetting": {

weapp/utils/getApiUrl.js

@@ -6,4 +6,9 @@ exports.loginUrl = () => {
 // 登出
 exports.logoutUrl = () => {
   return `/logout`
+}
+
+// 登出
+exports.getProjectList = () => {
+  return `/projectList`
 }