提交优化代码

src/pagesA/deviceDetail/deviceDetail.vue

@@ -106,7 +106,7 @@
                 }}</text>
                 <image src="../../static/rightArrow.png"></image>
             </view>
-            <!-- <view
+            <view
                 @click="getFrenEcharts()"
                 class="title"
                 v-if="
@@ -145,19 +145,9 @@
                         style="margin-left: auto; width: 30rpx; height: 30rpx"
                     ></image>
                 </view>
-            </view> -->
-
-            <view class="title" v-if="devInfo.installPosition == 'Toilet'">
-                <view class="title-text" style="color: #22dea7"
-                    >今日卫生间使用频次</view
-                >
-                <view class="title-btn" style="color: #22dea7"
-                    >{{
-                        freQuenceList.length == "" ? "0" : freQuenceList.length
-                    }}次</view
-                >
             </view>
-            <view class="title" v-if="devInfo.installPosition != 'Toilet'">
+
+            <view class="title">
                 <view class="title-text" style="color: #22dea7"
                     >今日进出频次</view
                 >
@@ -375,7 +365,7 @@
     </view>
 </template>
 <script>
-// import * as echarts from "../../uni_modules/lime-echart/static/echarts.min";
+import * as echarts from "../../uni_modules/lime-echart/static/echarts.min";
 import MqttService from "../../utils/globalMqtt.js";
 
 export default {

src/pagesA/devices/devices.vue

@@ -220,18 +220,6 @@ export default {
                 ? name.slice(0, 6) + "..."
                 : name;
         },
-        onPullDownRefresh() {
-            uni.showLoading({
-                title: "加载中...",
-                icon: "none",
-                duration: 1500,
-            });
-            this.queryList();
-            setTimeout(() => {
-                uni.hideLoading();
-                uni.stopPullDownRefresh();
-            }, 2000);
-        },
     },
     onLoad() {},
     onShow() {
@@ -246,13 +234,15 @@ export default {
         }
     },
     onUnload() {},
-
     onPullDownRefresh() {
-        uni.showNavigationBarLoading();
+        uni.showLoading({
+            title: "加载中...",
+            icon: "none",
+            duration: 1500,
+        });
         this.queryList();
         setTimeout(() => {
             uni.hideLoading();
-            uni.hideNavigationBarLoading();
             uni.stopPullDownRefresh();
         }, 2000);
     },