1

components/cwg-page-wrapper.vue

@@ -43,8 +43,6 @@
       </view>
       <view :style="{ height: isTabBarPage ? '60px' : '0px' }" />
     </view>
-    <cwg-right-drawer v-if="!isLoginPage" ref="rightDrawerRef" @navigate="handleDrawerNavigate"
-      @logout="handleDrawerLogout" />
   </view>
 </template>
 
@@ -290,7 +288,7 @@ onShow(() => {
 /* 页面切换动画 */
 .fade-enter-active,
 .fade-leave-active {
-  transition: opacity 0.3s ease;
+  transition: opacity 0.2s ease;
 }
 
 .fade-enter-from,
@@ -309,7 +307,7 @@ onShow(() => {
 
 /* 内容区域动画 */
 .content-wrapper {
-  animation: slideIn 0.3s ease-out;
+  animation: slideIn 0.2s ease-out;
 }
 
 @keyframes slideIn {

manifest.json

@@ -195,7 +195,7 @@
             }
         },
         "async" : {
-            "delay": 10000,
+            "delay": 0,
             "loading": "",
             "timeout" : 20000
         },

pages/customer/components/VietnamNoticePopup.vue

@@ -32,6 +32,8 @@ import { useI18n } from 'vue-i18n';
 const props = defineProps({
     visible: { type: Boolean, default: false }
 });
+console.log(props, 1212);
+
 const emit = defineEmits(['update:visible']);
 
 const { t } = useI18n();

pages/customer/deposit-select.vue

@@ -1,13 +1,14 @@
 <template>
     <cwg-page-wrapper class="create-page" :isHeaderFixed="true">
         <cwg-header :title="t('Home.page_customer.item2')" />
-        <view class="custom-deposit">
+        <uni-loading v-if="loading" />
+        <view class="custom-deposit" v-else>
             <!-- 步骤1：选择账户 -->
             <view class="box box-step1">
                 <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,9 +19,8 @@
                 <view class="b-card">
                     <view class="card-top">
                         <text class="tit"><text class="iconfont icon-caret-right"></text>{{ t('Custom.Deposit.Title2')
-                        }}</text>
+                            }}</text>
                         <cwg-asset-tabs v-if="tabsConfig.length > 0" v-model="activeTab" :tabs="tabsConfig" />
-                        <uni-loading v-if="currentTableData.length == 0" />
                         <view v-if="currentTableData.length">
                             <PaymentMethodsList :list="currentTableData" @select="isShowStep3" />
                         </view>
@@ -47,7 +47,7 @@
                             </view>
                             <view class="btn-bottom">
                                 <text class="btn crm-cursor" @click="isStep3Open()">{{ t('Btn.Confirm')
-                                    }}</text>
+                                }}</text>
                             </view>
 
                         </view>
@@ -85,7 +85,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>
@@ -117,7 +117,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">{{
@@ -126,7 +126,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">{{
@@ -135,7 +135,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">{{
@@ -162,7 +162,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>
@@ -264,7 +264,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>
@@ -1642,8 +1642,10 @@ const bankOptions = computed(() => {
     }))
 })
 
+const loading = ref(false)
 // 获取账户信息
 const getDateList = async () => {
+    loading.value = true
     let res = await customApi.CustomDropdown({ platform: "" })
     if (res.code == Code.StatusOK) {
         loginOptions.value = res.data.map(item => ({
@@ -1661,6 +1663,7 @@ const getDateList = async () => {
     } else {
         $pigeon.MessageError(res.msg)
     }
+    loading.value = false
 }
 //获取入金通道
 const getDepositList = async () => {
@@ -1843,14 +1846,10 @@ const toIncome = () => {
 
 // 生命周期
 onMounted(() => {
-    if (country.value === "VN") dialogVietnamNotice.value = true
-    is20Open()
     getDateList()
     // Activity24nianzhongInfo();
     // Activity24nianzhongTwoInfo();
     // dealResult({ "type": 7, "result": "/krad/pin?serial=123123" })
-    isNewYear24Open()
-    ActivityRequiteInfo()
 })
 watch(isStep3, async (newVal) => {
     if (newVal) {

pages/customer/deposit.vue

@@ -365,49 +365,7 @@
                         </view>
                     </view>
                 </view>
-                <!-- 不参加活动弹出框 -->
-                <cwg-dont-active-popup v-model:visible="dialogDontActive" :showFooters="true"
-                    @confirm="tosubmitConfirm" />
-                <!-- 新年24用户提示弹窗 -->
-                <NewYear24Popup v-model:visible="tableDataNewYear24Flag" />
-                <!-- 越南用户提示弹窗 -->
-                <VietnamNoticePopup v-model:visible="dialogVietnamNotice" />
-                <!-- 提交后确认弹窗 -->
-                <cwg-check-confirm-popup v-model:visible="dialogCheckConfirm" :title="t('Home.page_customer.item2')"
-                    :channelData="channelData" :code="code" :selectCodes="selectCodes" :params="params"
-                    :userName="userName" :login="loginValue" :loginDoc="loginValueDoc" @confirm="submit" />
-                <!--提交后的弹出框-->
-                <CheckPopup v-model:visible="dialogCheckSuccess" :goPayLink="goPayLink" @close="closeDia" />
-                <!-- 提交后失败弹窗 -->
-                <cwg-error-popup v-model:visible="dialogCheckError" :responseMessage="RES" />
-                <!-- 最后失败弹窗 -->
-                <cwg-error-popup v-model:visible="dialogError" @confirm="closeDia" :responseMessage="RES" />
-                <!-- 最后成功弹窗 -->
-                <cwg-success-popup v-model:visible="dialogSuccess" @confirm="closeDia" />
-                <!-- 等待弹窗 -->
-                <cwg-wait-popup v-model:visible="dialogCheckWait" :showFooters="false" />
-                <!-- 赠金协议 -->
-                <ClausePopup v-model:visible="dialogClause" country="CN" :isGuoQin="isGuoQin" />
-                <!-- 赠金协议20 -->
-                <Clause20Popup v-model:visible="dialogClause1" />
-                <!--  赠金协议10年中 -->
-                <ClauseNZPopup v-model:visible="dialogClauseNZ" :title="t('news_add_field1.activitiesNZ.item6')"
-                    :startDate="tableData4.applicationStartTime" :endDate="tableData4.applicationEndTime" />
-                <!-- 赠金协议20年中 -->
-                <ClauseNZTwoPopup v-model:visible="dialogClauseNZTwo"
-                    :title="t('news_add_field1.activitiesNZTwo.item6')" :startDate="tableData4Two.applicationStartTime"
-                    :endDate="tableData4Two.applicationEndTime" />
-                <!-- 赠送活动详情-协议 -->
-                <ClauseNewListPopup v-model:visible="dialogClauseNewList" :content="tableDataNewList.content"
-                    :title="tableDataNewList.title" />
-                <!--提交后完成弹出框-->
-                <ChinaUnionPayPopup v-model:visible="dialogChinaUnionPay" />
-                <!-- 重新提交弹窗 -->
-                <DealResultPopup v-model:visible="dialogDealResult" :responseMessage="responseMessage"
-                    :title="dialogDealResultTitle" :initialData="dialogDealResult_form" :type="DealResultType"
-                    @confirm="submitDealResult" />
-                <!-- KYC成功弹窗 -->
-                <cwg-kyc-popup v-model:visible="dialogKyc" :qrText="text1" />
+
             </view>
 
             <view class="step3-attention">
@@ -419,6 +377,47 @@
                 </view>
             </view>
         </view>
+        <!-- 不参加活动弹出框 -->
+        <cwg-dont-active-popup v-model:visible="dialogDontActive" :showFooters="true" @confirm="tosubmitConfirm" />
+        <!-- 新年24用户提示弹窗 -->
+        <NewYear24Popup v-model:visible="tableDataNewYear24Flag" />
+        <!-- 越南用户提示弹窗 -->
+        <VietnamNoticePopup v-model:visible="dialogVietnamNotice" />
+        <!-- 提交后确认弹窗 -->
+        <cwg-check-confirm-popup v-model:visible="dialogCheckConfirm" :title="t('Home.page_customer.item2')"
+            :channelData="channelData" :code="code" :selectCodes="selectCodes" :params="params" :userName="userName"
+            :login="loginValue" :loginDoc="loginValueDoc" @confirm="submit" />
+        <!--提交后的弹出框-->
+        <CheckPopup v-model:visible="dialogCheckSuccess" :goPayLink="goPayLink" @close="closeDia" />
+        <!-- 提交后失败弹窗 -->
+        <cwg-error-popup v-model:visible="dialogCheckError" :responseMessage="RES" />
+        <!-- 最后失败弹窗 -->
+        <cwg-error-popup v-model:visible="dialogError" @confirm="closeDia" :responseMessage="RES" />
+        <!-- 最后成功弹窗 -->
+        <cwg-success-popup v-model:visible="dialogSuccess" @confirm="closeDia" />
+        <!-- 等待弹窗 -->
+        <cwg-wait-popup v-model:visible="dialogCheckWait" :showFooters="false" />
+        <!-- 赠金协议 -->
+        <ClausePopup v-model:visible="dialogClause" country="CN" :isGuoQin="isGuoQin" />
+        <!-- 赠金协议20 -->
+        <Clause20Popup v-model:visible="dialogClause1" />
+        <!--  赠金协议10年中 -->
+        <ClauseNZPopup v-model:visible="dialogClauseNZ" :title="t('news_add_field1.activitiesNZ.item6')"
+            :startDate="tableData4.applicationStartTime" :endDate="tableData4.applicationEndTime" />
+        <!-- 赠金协议20年中 -->
+        <ClauseNZTwoPopup v-model:visible="dialogClauseNZTwo" :title="t('news_add_field1.activitiesNZTwo.item6')"
+            :startDate="tableData4Two.applicationStartTime" :endDate="tableData4Two.applicationEndTime" />
+        <!-- 赠送活动详情-协议 -->
+        <ClauseNewListPopup v-model:visible="dialogClauseNewList" :content="tableDataNewList.content"
+            :title="tableDataNewList.title" />
+        <!--提交后完成弹出框-->
+        <ChinaUnionPayPopup v-model:visible="dialogChinaUnionPay" />
+        <!-- 重新提交弹窗 -->
+        <DealResultPopup v-model:visible="dialogDealResult" :responseMessage="responseMessage"
+            :title="dialogDealResultTitle" :initialData="dialogDealResult_form" :type="DealResultType"
+            @confirm="submitDealResult" />
+        <!-- KYC成功弹窗 -->
+        <cwg-kyc-popup v-model:visible="dialogKyc" :qrText="text1" />
     </cwg-page-wrapper>
 </template>
 
@@ -1886,10 +1885,22 @@ onMounted(() => {
     channelId.value = channel.value
     getDateList()
     isStep3Open()
+    setTimeout(() => {
+        if (country.value === "VN") dialogVietnamNotice.value = true
+        is20Open()
+        // Activity24nianzhongInfo();
+        // Activity24nianzhongTwoInfo();
+        // dealResult({ "type": 7, "result": "/krad/pin?serial=123123" })
+        isNewYear24Open()
+        ActivityRequiteInfo()
+    }, 600);
+
+
+
 })
 onUnmounted(() => {
-    // userStore.savePaymentChannel('')
-    // userStore.saveChannelList('')
+    userStore.savePaymentChannel('')
+    userStore.saveChannelList('')
 })
 
 watch(channelId, async (newVal) => {

pages/customer/withdrawal.vue

@@ -1746,16 +1746,14 @@ onMounted(() => {
     channelListOptions.value = formatChannels(channelList.value)
   }
   channelId.value = channel.value
-  console.log(channelId, 121212);
-
   getDateList();
   //调用手续费减免次数接口
   getFreeNumber();
   isNewYear24Open();
 });
 onUnmounted(() => {
-  // userStore.savePaymentChannel('')
-  // userStore.saveChannelList('')
+  userStore.savePaymentChannel('')
+  userStore.saveChannelList('')
 })
 // -------------------- watch --------------------
 watch(channelId, async (newVal) => {

pages/ib/withdraw.vue

@@ -1483,8 +1483,8 @@ onMounted(() => {
     }
 })
 onUnmounted(() => {
-    // userStore.savePaymentChannel('')
-    // userStore.saveChannelList('')
+    userStore.savePaymentChannel('')
+    userStore.saveChannelList('')
 })
 
 watch(channelId, async (newVal) => {