1

components/cwg-complex-search.vue

@@ -41,7 +41,7 @@
                     </view>
                 </view>
                 <view class="form-actions">
-                    <button class="reset-btn" @click="resetForm" v-t="'Documentary.tradingCenter.item4'" />
+                    <!-- <button class="reset-btn" @click="resetForm" v-t="'Documentary.tradingCenter.item4'" /> -->
                     <button class="search-btn" type="primary" @click="handleSearch" v-t="'Btn.Search'" />
                 </view>
             </view>
@@ -107,7 +107,7 @@
                 </view>
             </scroll-view>
             <template #footer>
-                <button class="reset-btn" @click="resetTempForm" v-t="'Documentary.tradingCenter.item4'" />
+                <!-- <button class="reset-btn" @click="resetTempForm" v-t="'Documentary.tradingCenter.item4'" /> -->
                 <button class="search-btn" type="primary" @click="applyFilter" v-t="'Btn.Search'" />
             </template>
         </cwg-popup>

pages/follow/record.vue

@@ -30,6 +30,8 @@ const userStore = useUserStore();
 const userInfo = computed(() => userStore.userInfo);
 import { useAccountOptions } from '@/composables/useAccountOptions'
 const { loginOptions, isLoaded, isSuccess } = useAccountOptions()
+import { useFilters } from '@/composables/useFilters'
+const { numberFormat, numberDesensitization, numberDecimal } = useFilters()
 const search = ref({
     type: 1, followLogin: null,
 
@@ -61,7 +63,7 @@ const getColumnsByType = (type: number) => {
                     label: t('Documentary.TundManagement.item25'),
                     align: 'center',
                     headerAlign: 'center',
-                    formatter: ({ row }) => row.dealLogin || '--'
+                    formatter: ({ row }) => numberDesensitization(row.dealLogin) || '--'
                 },
                 {
                     prop: 'dealPlatform',
@@ -136,7 +138,7 @@ const getColumnsByType = (type: number) => {
                     label: t('Documentary.tradingCenter.item18'),
                     align: 'center',
                     headerAlign: 'center',
-                    formatter: ({ row }) => row.dealLogin || '--'
+                    formatter: ({ row }) => numberDesensitization(row.dealLogin) || '--'
                 },
                 {
                     prop: 'followLogin',

pages/login/index.vue

@@ -92,7 +92,20 @@ async function getCustomLoginInfo() {
     const res = await userApi.getUserInfo()
     userStore.saveUserInfo(res.data)
     if (res.code === 200) {
-      router.reLaunch(modeStore.value === 'customer' ? '/pages/customer/index' : '/pages/ib/index')
+      switch (modeStore.value) {
+        case 'customer':
+          router.reLaunch('/pages/customer/index')
+          break;
+        case 'ib':
+          router.reLaunch('/pages/ib/index')
+          break;
+        case 'follow':
+          router.reLaunch('/pages/follow/index')
+          break;
+      
+        default:
+          break;
+      }
     } else {
       uni.$u.toast(res.msg || t('login.msg0'))
     }

uni_modules/uni-popup/components/uni-popup/uni-popup.vue

@@ -508,7 +508,7 @@
 
 	.fixforpc-z-index {
 		/* #ifndef APP-NVUE */
-		z-index: 999;
+		z-index: 1112;
 		/* #endif */
 	}
 

utils/noteHelper.ts

@@ -12,6 +12,8 @@ export function getNoteText(row: any, locale: string, userStore: any): string {
             return locale === 'cn' || locale === 'zhHant'
                 ? option.content
                 : option.enContent;
+        }else {
+            return row.approveDesc;
         }
     }
     return '--';