From f6f3e8197d9105a2d82b47907cc1bf506dfb4313 Mon Sep 17 00:00:00 2001
From: ihzero <ihzero@163.com>
Date: Sat, 30 Dec 2023 23:06:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/basics/basics-base.vue |  4 ++--
 src/pages/basics/profile.vue     | 12 ++++++------
 src/pages/index/monitor.vue      |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/pages/basics/basics-base.vue b/src/pages/basics/basics-base.vue
index 213d024..9e1184b 100644
--- a/src/pages/basics/basics-base.vue
+++ b/src/pages/basics/basics-base.vue
@@ -185,7 +185,7 @@ export default {
           },
         },
         {
-          field: 'type',
+          field: 'industry',
           label: '农业类型',
           component: 'ApiSelect',
           componentProps: ({ formActionType }) => {
@@ -197,7 +197,7 @@ export default {
                 return data.data
               },
               labelField: 'name',
-              valueField: 'id',
+              valueField: 'key',
             }
           },
         },
diff --git a/src/pages/basics/profile.vue b/src/pages/basics/profile.vue
index 156a1f3..0fa07e4 100644
--- a/src/pages/basics/profile.vue
+++ b/src/pages/basics/profile.vue
@@ -157,7 +157,7 @@ export default {
           },
         },
         {
-          field: 'type',
+          field: 'industry',
           label: '农业类型',
           component: 'ApiSelect',
           componentProps: ({ formActionType }) => {
@@ -169,7 +169,7 @@ export default {
                 return data.data
               },
               labelField: 'name',
-              valueField: 'id',
+              valueField: 'key',
             }
           },
         },
@@ -178,15 +178,15 @@ export default {
   },
   computed: {
     options() {
-      return [
-        
-      ].filter((e) => checkPermission(e.permission))
+      return [].filter((e) => checkPermission(e.permission))
     },
   },
   methods: {
     handleSubmit(e) {
       this.filterParmas = e
-      this.mescroll.resetUpScroll()
+      this.$nextTick(() => {
+        this.mescroll.resetUpScroll()
+      })
     },
     upCallback({ num, size }) {
       this.getData({
diff --git a/src/pages/index/monitor.vue b/src/pages/index/monitor.vue
index aff2d00..495f10b 100644
--- a/src/pages/index/monitor.vue
+++ b/src/pages/index/monitor.vue
@@ -135,7 +135,7 @@
     </view>
     <view class="content-box">
       <view class="video_ul" v-show="current == 0">
-        <view class="video_li" v-for="(video, index) in videoList" :key="video.video_url+index">
+        <view class="video_li" v-for="(video, index) in videoList" :key="index+'s'">
           <view class="video_cd">
             <!-- #ifdef H5 -->
             <!-- {{ video.video_url }} -->
@@ -165,7 +165,7 @@
         <view
           class="video_li"
           v-for="(video, index) in videoList2"
-          :key="video.video_url+index"
+          :key="index+'s2'"
         >
           <view class="video_cd">
             <!-- #ifdef H5 -->