Browse Source

设备列表当前兼容ios问题

wangming 2 months ago
parent
commit
85369bbc5a
4 changed files with 70 additions and 12 deletions
  1. 9 0
      src/pages.json
  2. 1 1
      src/pages/home/home.vue
  3. 15 11
      src/pagesA/devices/devices.vue
  4. 45 0
      src/pagesA/myHome/myHome.vue

+ 9 - 0
src/pages.json

@@ -147,6 +147,15 @@
                         "navigationBarBackgroundColor": "#faede2",
                         "navigationBarTextStyle": "black"
                     }
+                },
+                {
+                    "path": "myHome/myHome",
+                    "style": {
+                        "enablePullDownRefresh": true,
+                        "navigationBarTitleText": "网络配置",
+                        "navigationBarBackgroundColor": "#faede2",
+                        "navigationBarTextStyle": "black"
+                    }
                 }
             ]
         }

+ 1 - 1
src/pages/home/home.vue

@@ -62,7 +62,7 @@
                     <image src="../../static/smalLn.png" mode="" />
                 </view>
             </view>
-            <view class="card" @click="goNo()">
+            <view class="card" @click="gotoPath('/pagesA/myHome/myHome')">
                 <view class="contentTitle">
                     <text>我的家庭</text>
                     <image src="../../static/rightArrow.png" />

+ 15 - 11
src/pagesA/devices/devices.vue

@@ -16,7 +16,7 @@
                 <input
                     type="text"
                     placeholder="输入设备全称或简称"
-                    v-model="keyword"
+                    v-model="keyWord"
                     placeholder-class="placeholder-style"
                 />
             </view>
@@ -69,7 +69,7 @@ import common from "../../utils/common.js";
 export default {
     data() {
         return {
-            keyword: "",
+            keyWord: "",
             option: ["全部", "在线", "离线", "报警"],
             selectValue: 0,
             devs: [],
@@ -149,7 +149,7 @@ export default {
             this.$http
                 .post("wap/device/deviceList", {
                     userId: uni.getStorageSync("userId"),
-                    keyword: this.keyword,
+                    keyWord: this.keyWord,
                     status: status,
                 })
                 .then((res) => {
@@ -164,18 +164,22 @@ export default {
                             } else {
                                 devs[i].wcTimes = 0;
                             }
-                            const signalTimeStr = devs[i].lastTargetTime;
+                            const signalTimeStr = devs[
+                                i
+                            ].lastTargetTime.replace(/-/g, "/");
                             const signalTime = new Date(
                                 signalTimeStr
                             ).getTime();
-                            const currentTime = Date.now();
-                            const diff = Math.abs(currentTime - signalTime);
-                            if (diff <= 10000) {
-                                devs[i].judge = true;
+
+                            if (isNaN(signalTime)) {
+                                devs[i].judge = false;
+                            } else {
+                                const currentTime = Date.now();
+                                const diff = Math.abs(currentTime - signalTime);
+                                devs[i].judge = diff <= 10000; // 10秒内为 true
                             }
-                            console.log(signalTime, diff);
-                            devs[i].signal_time = common.timestampToTime(
-                                devs[i].signal_time,
+                            devs[i].signalTime = common.timestampToTime(
+                                devs[i].signalTime,
                                 6
                             );
                         }

+ 45 - 0
src/pagesA/myHome/myHome.vue

@@ -0,0 +1,45 @@
+<template>
+    <view class="my-home">
+        <view class="header">
+            <text class="title">我的主页</text>
+        </view>
+        <view class="content">
+            <!-- 这里添加你的内容 -->
+        </view>
+    </view>
+</template>
+
+<script>
+export default {
+    name: "MyHome",
+    data() {
+        return {
+            // 这里添加你的数据
+        };
+    },
+    methods: {
+        // 这里添加你的方法
+    },
+};
+</script>
+
+<style scoped>
+.my-home {
+    min-height: 100vh;
+    background: #f5f5f5;
+}
+.header {
+    padding: 32rpx 0;
+    background: #fff;
+    text-align: center;
+    box-shadow: 0 2rpx 8rpx #eee;
+}
+.title {
+    font-size: 36rpx;
+    font-weight: bold;
+    color: #333;
+}
+.content {
+    padding: 32rpx;
+}
+</style>