1

components/cwg-header.vue

@@ -75,7 +75,7 @@ function handleBack() {
 
 .pages-header {
   width: 100%;
-  z-index: 1111;
+  // z-index: 1111;
   display: flex;
   align-items: center;
   justify-content: space-between;
@@ -86,7 +86,7 @@ function handleBack() {
 .header {
   position: relative;
   text-align: left;
-  font-size: px2rpx(32);
+  font-size: px2rpx(24);
   color: #141d22;
   font-weight: 700;
   margin: px2rpx(10) 0;
@@ -102,7 +102,7 @@ function handleBack() {
     width: px2rpx(24);
     height: px2rpx(24);
     border-radius: 50%;
-    margin-right: px2rpx(20);
+    margin-right: px2rpx(12);
   }
 
   .back-icon {

pages/customer/deposit-select.vue

@@ -7,7 +7,7 @@
                 <view class="b-card">
                     <view class="card-top">
                         <text class="tit"><text class="iconfont icon-caret-right"></text>{{ t('Custom.Deposit.Title1')
-                        }}</text>
+                            }}</text>
                         <cwg-combox :clearable="false" v-model:value="loginValue" :options="loginComboxOptions"
                             :placeholder="t('placeholder.choose')" />
                     </view>
@@ -18,7 +18,7 @@
                 <view class="b-card">
                     <view class="card-top">
                         <text class="tit"><text class="iconfont icon-caret-right"></text>{{ t('Custom.Deposit.Title2')
-                        }}</text>
+                            }}</text>
                         <uni-loading v-if="currentTableData.length == 0" />
                         <template v-if="currentTableData.length">
                             <cwg-asset-tabs v-if="tabsConfig.length > 0" v-model="activeTab" :tabs="tabsConfig" />
@@ -50,7 +50,7 @@
                             </view>
                             <view class="btn-bottom">
                                 <text class="btn crm-cursor" @click="isStep3Open()">{{ t('Btn.Confirm')
-                                    }}</text>
+                                }}</text>
                             </view>
 
                         </view>
@@ -88,7 +88,7 @@
                                     <uni-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
                                         <text class="tit"><text class="iconfont icon-caret-right"></text>{{
                                             t('news_add_field.Label.Title4')
-                                            }}</text>
+                                        }}</text>
                                     </uni-col>
                                     <uni-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
                                         <uni-forms-item>
@@ -120,7 +120,7 @@
                                                         WireTransferAccount.bankUname || '--'
                                                     }}</text></view>
                                             <view class="row"><text class="label">{{ t('Custom.Deposit.bankName')
-                                                    }}</text><text class="content">{{ WireTransferAccount.bankName ||
+                                            }}</text><text class="content">{{ WireTransferAccount.bankName ||
                                                         '--'
                                                     }}</text></view>
                                             <view class="row"><text class="label SpecialColor">{{
@@ -129,7 +129,7 @@
                                                         WireTransferAccount.bankCardNum || '--'
                                                     }}</text></view>
                                             <view class="row"><text class="label">{{ t('Custom.Deposit.bankAddr')
-                                                    }}</text><text class="content">{{ WireTransferAccount.bankAddr ||
+                                            }}</text><text class="content">{{ WireTransferAccount.bankAddr ||
                                                         '--'
                                                     }}</text></view>
                                             <view class="row"><text class="label SpecialColor">{{
@@ -138,7 +138,7 @@
                                                         WireTransferAccount.swiftCode || '--'
                                                     }}</text></view>
                                             <view class="row"><text class="label">{{ t('Custom.Deposit.bankCode')
-                                                    }}</text><text class="content">{{ WireTransferAccount.bankCode ||
+                                            }}</text><text class="content">{{ WireTransferAccount.bankCode ||
                                                         '--'
                                                     }}</text></view>
                                             <view class="row"><text class="label SpecialColor">{{
@@ -165,7 +165,7 @@
                                                         + '-' +
                                                         WireTransferAccount.type }}</text></view>
                                             <view class="row"><text class="label">{{ t('Custom.Withdraw.Title6')
-                                                    }}</text><text class="content">{{ WireTransferAccount.address ||
+                                            }}</text><text class="content">{{ WireTransferAccount.address ||
                                                         '--'
                                                     }}</text></view>
                                             <view class="row"><text class="label">QR Code</text>
@@ -267,7 +267,7 @@
                                                     <text>{{ t('news_add_field1.activitiesNZ.itemDeposit2') }}</text>
                                                     <text class="clause crm-cursor" @click="dialogClauseNZ = true">{{
                                                         t('news_add_field1.activitiesNZ.itemDeposit3')
-                                                    }}</text>
+                                                        }}</text>
                                                     <text>{{ t('news_add_field1.activitiesNZ.itemDeposit4') }}</text>
                                                 </view>
                                             </uni-forms-item>
@@ -1581,9 +1581,9 @@ const doShowStep3 = (row) => {
 }
 //选择支付方式
 const isShowStep3 = (row) => {
-    router.push(`/pages/customer/deposit?login=${loginValue.value}`)
     userStore.savePaymentChannel(row.code)
     userStore.saveChannelList(tableData)
+    router.push(`/pages/customer/deposit?login=${loginValue.value}`)
 
     return
     if (row.kycChannel != 1) {

pages/customer/deposit.vue

@@ -1628,6 +1628,7 @@ const bankOptions = computed(() => {
         value: item.code
     }))
 })
+console.log(bankOptions.value, 1111);
 
 // 获取账户信息
 const getDateList = async () => {
@@ -1877,8 +1878,11 @@ function formatChannels(data) {
 }
 // 生命周期
 onMounted(() => {
+	console.log(userInfo.value,121212)
+	console.log(channelList.value,userStore.channelList, 12121212);
     if (channelList.value) {
         channelListOptions.value = formatChannels(channelList.value)
+        console.log(channelListOptions.value, 12121212);
     }
     channelId.value = channel.value
     getDateList()
@@ -1894,8 +1898,8 @@ onMounted(() => {
     }, 800);
 })
 onUnmounted(() => {
-    userStore.savePaymentChannel('')
-    userStore.saveChannelList('')
+    // userStore.savePaymentChannel('')
+    // userStore.saveChannelList('')
 })
 
 watch(channelId, async (newVal) => {

pages/customer/withdrawal-select.vue

@@ -29,7 +29,7 @@
             </view>
             <view v-if="step3" class="reselect-btn">
               <button class="s-btn reselect" type="primary" @click="showTable">{{ t('Custom.Deposit.Reselect')
-                }}</button>
+              }}</button>
             </view>
           </view>
         </view>
@@ -149,7 +149,7 @@
                       </text>
                       <text v-if="channelData.type == 'BANK'">{{
                         t('Custom.Withdraw.addBank')
-                        }}</text>
+                      }}</text>
                       <text v-if="channelData.type == 'BANK'" class="add-btn crm-cursor"
                         @click="openAddBankCard('add_bankCard')">
                         {{ t('Custom.Withdraw.addBank1') }}
@@ -274,7 +274,7 @@
                 <uni-col :span="24" v-if="channelData.type != 'BANK_TELEGRAPHIC' && isStep3">
                   <view class="tit">
                     <text>{{ t('Custom.Withdraw.Title3') + '(' + channelData.currency + ')'
-                      }}</text>
+                    }}</text>
                   </view>
                 </uni-col>
                 <uni-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12" v-if="channelData.type !== 'BANK_TELEGRAPHIC'">
@@ -1467,9 +1467,9 @@ function toShop() {
 
 //选择支付方式
 function isShowStep3(row) {
-  router.push(`/pages/customer/withdrawal?login=${loginValue.value}`)
   userStore.savePaymentChannel(row.code)
   userStore.saveChannelList(tableData)
+  router.push(`/pages/customer/withdrawal?login=${loginValue.value}`)
   return
   dialogCheckWait.value = false;
   dialogVisible.value = false;

pages/follow/account-management.vue

@@ -72,7 +72,7 @@ const { t, locale } = useI18n();
 import { documentaryApi } from '@/service/documentary';
 import { useFilters } from '@/composables/useFilters'
 const { numberFormat, numberDecimal } = useFilters()
-import { useRouter } from 'vue-router'
+import useRouter from "@/hooks/useRouter";
 const router = useRouter()
 // 账户类型
 function groupTypeName(type) {
@@ -87,7 +87,9 @@ function groupTypeName(type) {
     }
     return typeMap[type] || ''
 }
-const toSubscribeList = async () => {
+const toSubscribeList = () => {
+    console.log(111111);
+
     router.push('/pages/follow/trading-center')
 }
 //获取客户信号源账户

pages/follow/subscribe-list.vue

@@ -798,7 +798,6 @@ const dialogSubscribeDataCancelRef = ref(null)
 //取消订阅
 const ToUnSubscribe = async () => {
     try {
-        await dialogSubscribeDataCancelRef.value.validate()
         if (flag.value) {
             return;
         } else {
@@ -814,6 +813,7 @@ const ToUnSubscribe = async () => {
                 icon: 'none'
             })
             ToUnSubscribeCancel();
+            ToUnSubscribeCancelTip();
             tableRef.value.refreshTable()
             getSubscribeLoginDown();
             flag.value = false;
@@ -829,7 +829,7 @@ const ToUnSubscribe = async () => {
     }
 }
 const ToUnSubscribeCancel = () => {
-    dialogSubscribeDataCancelRef.value.clearValidate()
+    dialogSubscribeDataCancelRef?.value?.clearValidate()
     dialogSubscribeCancel.value = false;
 }
 const dialogSubscribeCancelTipOpen = () => {

pages/follow/trading-management.vue

@@ -1070,8 +1070,6 @@ onMounted(() => {
 @import "@/uni.scss";
 
 .content-container {
-
-
     .field-container {
         display: grid;
         grid-template-columns: repeat(3, 1fr);
@@ -1418,6 +1416,9 @@ onMounted(() => {
         grid-template-columns: 1fr 1fr;
         gap: px2rpx(20);
         margin-top: px2rpx(16);
+        @media screen and (max-width: 768px) {
+            grid-template-columns: 1fr;
+        }
     }
 
     .form-item {