新增分享账户，跌倒事件

src/pagesA/deviceSetting/deviceSetting.vue

@@ -26,17 +26,17 @@
                     style="width: 40rpx; height: 40rpx"
                 ></image>
             </view>
-            <view class="wifItem">
+            <!-- <view class="wifItem">
                 <text>紧急联系人</text>
                 <text>{{}}</text>
-            </view>
-            <view class="wifItem">
+            </view> -->
+            <!-- <view class="wifItem">
                 <text>撤销分享</text>
                 <image
                     src="../../static/rightArrow.png"
                     style="width: 40rpx; height: 40rpx"
                 ></image>
-            </view>
+            </view> -->
             <view class="wifItem" @click="goFailDetail">
                 <text>跌倒事件</text>
                 <image

src/pagesA/failDetail/failDetail.vue

@@ -34,9 +34,7 @@
                     <view class="meanLeft">
                         <text>事件类型</text>
                     </view>
-                    <view class="meanRight">
-                        <text>{{ item.eventType }}</text></view
-                    >
+                    <view class="meanRight"> <text>确认跌倒</text></view>
                 </view>
 
                 <view class="menu-item">
@@ -49,6 +47,9 @@
                 </view>
             </view>
         </template>
+        <template v-else>
+            <view class="noShare">暂无跌倒事件</view>
+        </template>
     </view>
 </template>
 
@@ -60,13 +61,15 @@ export default {
             devInfo: "",
             failDetaiList: [],
             pageNo: 1,
+            onReachJudge: true,
         };
     },
     methods: {
         getFailDetaiList() {
+            if (!this.onReachJudge) return;
             this.$http
                 .post(
-                    "web/stats/fallQuery",
+                    "wap/stats/fallQuery",
                     {
                         pageNo: 1,
                         pageSize: 10,
@@ -80,23 +83,16 @@ export default {
                     }
                 )
                 .then((res) => {
-                    console.log(res, 9999);
-                    // if (res.data.data) {
-                    //     this.failDetaiList = res.data.data;
-                    //     if (this.failDetaiList) {
-                    //         const hasStatusZero = this.failDetaiList.some(
-                    //             (item) => item.state === 0
-                    //         );
-                    //         console.log(hasStatusZero);
-                    //         if (!hasStatusZero) {
-                    //             this.state = null;
-                    //             this.getFailDetaiList();
-                    //         }
-                    //     }
-                    // } else {
-                    //     this.state = null;
-                    //     this.getFailDetaiList();
-                    // }
+                    if (res.data.data) {
+                        if (res.data.data.rows.length > 0) {
+                            this.failDetaiList = this.failDetaiList.concat(
+                                res.data.data.rows
+                            );
+                        }
+                        if (this.failDetaiList.length == res.data.data.total) {
+                            this.onReachJudge = false;
+                        }
+                    }
                 });
         },
         searchFailDetail() {
@@ -116,6 +112,10 @@ export default {
             uni.stopPullDownRefresh();
         }, 1000);
     },
+    onReachBottom() {
+        this.pageNo += 1;
+        this.getFailDetaiList();
+    },
 };
 </script>
 

src/pagesA/shareCountList/shareCountList.vue

@@ -66,6 +66,9 @@
                 </view>
             </view>
         </template>
+        <template v-else>
+            <view class="noShare">暂无分享记录</view>
+        </template>
     </view>
 </template>
 
@@ -113,10 +116,20 @@ export default {
             this.getShareList();
         },
     },
-    onShow() {},
+    onShow() {
+        this.searchShareList();
+    },
     onLoad(options) {
         this.devInfo = JSON.parse(options.devInfo);
+    },
+    onPullDownRefresh() {
+        uni.showNavigationBarLoading();
         this.searchShareList();
+        setTimeout(() => {
+            uni.hideLoading();
+            uni.hideNavigationBarLoading();
+            uni.stopPullDownRefresh();
+        }, 2000);
     },
 };
 </script>
@@ -202,5 +215,12 @@ export default {
             }
         }
     }
+
+    .noShare {
+        margin: 20rpx 20rpx;
+        color: #999;
+        font-size: 28rpx;
+        text-align: center;
+    }
 }
 </style>

src/pagesA/shareDetail/shareDetail.vue

@@ -1,71 +1,60 @@
 <template>
     <view class="box">
-        <template>
-            <view class="meauList">
-                <view class="menu-item">
-                    <view class="meanLeft">
-                        <text>设备名称</text>
-                    </view>
-                    <view class="meanRight">
-                        <text>{{ shareDetail.devName }}</text></view
-                    >
+        <view class="meauList">
+            <view class="menu-item">
+                <view class="meanLeft">
+                    <text>设备名称</text>
                 </view>
-                <view class="menu-item">
-                    <view class="meanLeft">
-                        <text>设备序列号</text>
-                    </view>
-                    <view class="meanRight">
-                        <text>{{ shareDetail.clientId }}</text></view
-                    >
+                <view class="meanRight">
+                    <text>{{ shareDetail.devName }}</text></view
+                >
+            </view>
+            <view class="menu-item">
+                <view class="meanLeft">
+                    <text>设备序列号</text>
                 </view>
-                <view class="menu-item">
-                    <view class="meanLeft">
-                        <text>分享人手机号</text>
-                    </view>
-                    <view class="meanRight">
-                        <text>{{ shareDetail.sharerPhone }}</text></view
-                    >
+                <view class="meanRight">
+                    <text>{{ shareDetail.clientId }}</text></view
+                >
+            </view>
+            <view class="menu-item">
+                <view class="meanLeft">
+                    <text>分享人手机号</text>
                 </view>
-                <view class="menu-item">
-                    <view class="meanLeft">
-                        <text>被分享人手机号</text>
-                    </view>
-                    <view class="meanRight">
-                        <text>{{ shareDetail.sharedPhone }}</text></view
-                    >
+                <view class="meanRight">
+                    <text>{{ shareDetail.sharerPhone }}</text></view
+                >
+            </view>
+            <view class="menu-item">
+                <view class="meanLeft">
+                    <text>被分享人手机号</text>
                 </view>
-                <view class="menu-item">
-                    <view class="meanLeft">
-                        <text>分享时间</text>
-                    </view>
-                    <view class="meanRight">
-                        <text>{{ shareDetail.shareTime }}</text></view
-                    >
+                <view class="meanRight">
+                    <text>{{ shareDetail.sharedPhone }}</text></view
+                >
+            </view>
+            <view class="menu-item">
+                <view class="meanLeft">
+                    <text>分享时间</text>
                 </view>
-                <view class="menu-item">
-                    <view class="meanLeft">
-                        <text>分享状态</text>
-                    </view>
-                    <view class="meanRight">
-                        <text v-show="shareDetail.state == 0"> 待确认 </text>
-                        <text v-show="shareDetail.state == 1"> 已确认 </text>
-                        <text v-show="shareDetail.state == 2"> 已拒绝 </text>
-                    </view>
+                <view class="meanRight">
+                    <text>{{ shareDetail.shareTime }}</text></view
+                >
+            </view>
+            <view class="menu-item">
+                <view class="meanLeft">
+                    <text>分享状态</text>
                 </view>
-
-                <view class="menu-item" @click="cancleShare()">
-                    <view class="meanLeft">
-                        <text>撤销分享</text>
-                    </view>
-                    <view class="meanRight">
-                        <image
-                            src="../../static/rightArrow.png"
-                            style="width: 30rpx; height: 30rpx"
-                        ></image>
-                    </view>
+                <view class="meanRight">
+                    <text v-show="shareDetail.state == 0"> 待确认 </text>
+                    <text v-show="shareDetail.state == 1"> 已确认 </text>
+                    <text v-show="shareDetail.state == 2"> 已拒绝 </text>
                 </view>
             </view>
-        </template>
+        </view>
+        <view class="menu-bottom">
+            <view class="meanLeft" @click="cancleShare()">撤销分享</view>
+        </view>
     </view>
 </template>
 
@@ -86,9 +75,7 @@ export default {
                     JSON.stringify(item),
             });
         },
-        cancleShare(item) {
-            console.log(item, 99999);
-
+        cancleShare() {
             uni.showModal({
                 title: "提示",
                 content: "确定要撤销该条分享记录？",
@@ -220,5 +207,26 @@ export default {
             }
         }
     }
+    .menu-bottom {
+        display: flex;
+        border-top: 1rpx solid #f0f0f0;
+        margin-top: 30rpx;
+        .meanLeft {
+            width: 700rpx;
+            height: 80rpx;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            font-size: 30rpx;
+            border-radius: 35rpx;
+            font-weight: 500;
+        }
+
+        .meanLeft {
+            background: #7b5245;
+            color: white;
+            margin-right: 16rpx;
+        }
+    }
 }
 </style>