ZaiZai 2 år sedan
förälder
incheckning
8b82878456
4 ändrade filer med 16 tillägg och 8 borttagningar
  1. 1 1
      App.vue
  2. 2 0
      components/hc-tree/style.scss
  3. 2 5
      components/hc-tree/tree-node.vue
  4. 11 2
      pages/image/view.vue

+ 1 - 1
App.vue

@@ -88,11 +88,11 @@
                 uni.connectSocket({
                     url: getWssApiUrl() + user_id,
                     complete: ()=> {
+                        _this.isSocket = true
                         console.log('websocket链接成功')
                     }
                 });
                 uni.onSocketOpen((res) => {
-                    _this.isSocket = true
                     console.log('WebSocket连接已打开!');
                     _this.sendSocketMessage();
                 });

+ 2 - 0
components/hc-tree/style.scss

@@ -4,6 +4,8 @@
     color: #606266;
     font-size: 28rpx;
     padding: 18rpx;
+    width: 100%;
+    overflow: auto;
     .no-data {
         position: relative;
         text-align: center;

+ 2 - 5
components/hc-tree/tree-node.vue

@@ -13,11 +13,8 @@
                 <text class="i-ri-checkbox-blank-circle-line c1" v-if="!nodeItem.isRadio"/>
                 <text class="i-ri-checkbox-circle-fill c2" v-else/>
             </view>
-            <text class="i-ri-loader-line cuIconfont-spin" v-if="nodeItem.loading"/>
-            <view class="label">
-                <text>{{nodeItem.label}}</text>
-                <text class="text-gray-4" v-if="isCounts">【{{nodeItem.data?.submitCounts ?? 0}}】</text>
-            </view>
+            <view class="i-ri-loader-line cuIconfont-spin" v-if="nodeItem.loading"/>
+            <view class="label">{{nodeItem.label}} {{ isCounts? `【${nodeItem.data?.submitCounts ?? 0}】` : '' }}</view>
         </view>
         <template v-if="nodeItem.isExpand">
             <view class="children-bar" v-if="nodeItem.childNodes && nodeItem.childNodes.length > 0">

+ 11 - 2
pages/image/view.vue

@@ -126,8 +126,17 @@ const getDataList = async (pageNo, pageSize) => {
         isApp: 1,
     })
     //处理数据
-    const res = getArrValue(data?.records)
-    pageRef.value?.complete(res);
+    /*const res = getArrValue(data)
+    console.log(res)
+    let newArr = [];
+    for (let i = 0; i < res.length; i++) {
+        const item = res[i];
+        for (let j = 0; j < item.length; j++) {
+            newArr.push(item[j])
+        }
+    }
+    console.log(newArr)*/
+    pageRef.value?.complete([]);
     uni.hideLoading();
 }