Merge branch 'admin_dev' into admin_dev_ocr

# Conflicts:
#	pages/mine/improveImmediately.vue

components/PrefectInfo.vue

@@ -98,7 +98,12 @@
       background-color: #ffde02;
       line-height: px2rpx(40);
       font-size: px2rpx(14);
+      overflow: hidden;
+      border-radius: px2rpx(10);
       margin: 0;
+      &:after{
+        border: none;
+      }
     }
   }
   .content-wrapper {

hooks/useAppUpdate.ts

@@ -294,7 +294,8 @@ export function useAppUpdate() {
     } catch (error) {
       //  console.error('检查更新失败:', error)
       const errorMsg = error instanceof Error ? error.msg : String(error)
-      showToast(t('mine.p28') || `检查更新失败: ${errorMsg}`)
+      console.log(errorMsg)
+      // showToast(t('mine.p28') || `检查更新失败: ${errorMsg}`)
     } finally {
       checking.value = false
     }

pages/follow/trading-center.vue

@@ -385,7 +385,7 @@ const currentColumns = computed(() => [
   { prop: 'winRate', label: t('TradingCenter.item6'), align: 'center', sortable: true },
   { prop: 'maxDdRate', label: t('TradingCenter.item7'), align: 'center', sortable: true },
   { prop: 'activity', label: t('TradingCenter.item8'), slot: 'activity', align: 'center', sortable: true },
-  { prop: 'view', label: t('Documentary.tradingCenter.item23'), slot: 'view', align: 'center', width: 80 },
+  { prop: 'view', label: t('Documentary.tradingCenter.item23'), slot: 'view', align: 'center' },
   // { prop: 'recommendReason', label: t('Documentary.tradingCenter.item142'), align: 'center', width: 100 },
   { prop: 'subscribe', label: t('Documentary.tradingCenter.item24'), slot: 'subscribe', align: 'center' },
 ])
@@ -614,7 +614,7 @@ const applyFllowCancel = () => {
 }
 
 .btn-primary {
-  min-width: px2rpx(50);
+  min-width: px2rpx(70);
   background-color: #4497ff;
   color: white;
   padding: 0 px2rpx(12);
@@ -624,6 +624,7 @@ const applyFllowCancel = () => {
   height: 28px;
   line-height: 28px;
   border-radius: 4px;
+  cursor: pointer;
 }
 
 .dia-content {

pages/mine/improveImmediately.vue

@@ -1467,32 +1467,16 @@
     return flag
   }
 
-  // div大小改变重载
-  function divInit() {
-    // 由于elementResizeDetectorMaker在UniApp中可能不可用，这里简化处理
-    const width = window.innerWidth
-    if (width <= 1100 && width > 800) {
-      divActiveHelf.value = true
-      divActiveAll.value = false
-    } else if (width <= 800) {
-      divActiveAll.value = true
-      divActiveHelf.value = false
-    } else if (1100 < width) {
-      divActiveAll.value = false
-      divActiveHelf.value = false
+// 监听表单字段变化
+watch(
+  () => formData.value.firstName,
+  () => {
+    if (localStorage.getItem('lang') == 'cn' && formData.value.firstName && formData.value.lastName) {
+      formData.value.nameEn = pinyin(`${formData.value.firstName} ${formData.value.lastName}`)
+      pinyin
     }
-  }
-
-  // 监听表单字段变化
-  watch(
-    () => formData.value.firstName,
-    () => {
-      if (localStorage.getItem('lang') == 'cn' && formData.value.firstName && formData.value.lastName) {
-        formData.value.nameEn = pinyin(`${formData.value.firstName} ${formData.value.lastName}`)
-        pinyin
-      }
-    },
-  )
+  },
+)
 
   watch(
     () => formData.value.lastName,
@@ -1511,7 +1495,6 @@
   // 生命周期
   onMounted(async () => {
     // dialogCheck.value.open()
-    divInit()
     await getLoginInfo()
     await getMobileInfo()
     await getCustomFileList()