소스 검색

feature: 处理网络请求一直弹窗加载中的问题

Damon 7 달 전
부모
커밋
1df01d643e
2개의 변경된 파일3개의 추가작업 그리고 2개의 파일을 삭제
  1. 2 1
      pages/index/index.js
  2. 1 1
      pages/index/index.wxml

+ 2 - 1
pages/index/index.js

@@ -522,7 +522,8 @@ Page({
     var deviceId = deviceList[deviceListIndex].deviceId;
 
     listByDevice({
-      clientType
+      clientType: clientType,
+      unShowLoad: true,
     }).then((res) => {
       that.setData({
         channelData: res

+ 1 - 1
pages/index/index.wxml

@@ -18,7 +18,7 @@
       <view style="color: white; margin-left: 8rpx; font-size: 32rpx;">添加设备</view>
     </view>
 
-    <scroll-view scroll-y="true" style="height: calc(100vh - 118rpx - 14rpx - 20rpx  - 88rpx - 64rpx - 58rpx - {{bannerList.length>0?296:0}}rpx -  {{navBarHeight}}px);margin-top: 22rpx;padding-top: 10rpx; ">
+    <scroll-view scroll-y="true" style="height: calc(100vh - 118rpx - 14rpx - 20rpx  - 88rpx - 64rpx - 58rpx - {{bannerList.length>0?296:0}}rpx -  {{navBarHeight}}px);margin-top: 22rpx;padding-top: 10rpx; width: 100%;">
       <view wx:if="{{deviceList}}">
         <block wx:key="key" wx:for-item="item" wx:for-index="index" wx:for="{{deviceList}}">
           <view class="item_public" style="width: calc(100vw - {{item.state && item.state === 'online'&&deviceListIndex === index ?76:70}}rpx);border: {{item.state && item.state === 'online'&&deviceListIndex === index  ? '8rpx solid #6546A3' : item.state && item.state === 'online'?'2rpx solid #6546A3':'2rpx solid #F2F5F7'}}; margin-left: {{item.state && item.state === 'online'&&deviceListIndex === index  ?0:4}}rpx;" data-item="{{item}}" data-index="{{index}}" bind:tap="onTapItem">