Merge branch 'dev' of http://192.168.0.115:3000/zhangyupeng/zfb_mp into dev

src/components/Cropper/src/CropperAvatar.vue

@@ -143,6 +143,8 @@
 
       img {
         width: 100%;
+        height: 100%;
+        object-fit: cover;
       }
     }
 

src/views/dashboard/analysis/index.vue

@@ -105,7 +105,7 @@
       customRender: ({ record }) => {
         const { userName } = record;
         let reg = /(\d{3})\d{4}(\d{4})/;
-        const macthUserName = userName.replace(reg, '$1****$2');
+        const macthUserName = userName && userName.replace(reg, '$1****$2');
         return macthUserName;
       },
     },
@@ -235,8 +235,8 @@
 
   const searchInfo = ref({
     liveRoomId: '',
-    limit: 20,
-    page: 1,
+    // limit: 20,
+    // page: 1,
     time: [priorDate, today],
   });
 
@@ -251,7 +251,10 @@
       console.log('beforeFetch', data);
       data.time = data.time.map((item) => formatToDate(item));
       handleStatic(data);
-      searchInfo.value = data;
+      searchInfo.value = {
+        liveRoomId: data.liveRoomId,
+        time: data.time,
+      };
       return data;
     },
     afterFetch: function (data) {
@@ -307,8 +310,8 @@
   async function handleReset() {
     searchInfo.value = {
       liveRoomId: '',
-      limit: 20,
-      page: 1,
+      // limit: 20,
+      // page: 1,
       time: [priorDate, today],
     };
   }