Merge remote-tracking branch 'origin/admin_dev' into admin_dev

pages/customer/components/DepositCheckConfirmPopup.vue

@@ -2,7 +2,7 @@
   <cwg-popup v-model:visible="visible" type="center" :mask-click="false" :showFooters="true" :showClose="false" :title="t('Home.page_customer.item2')">
     <view class="popup-content">
       <view class="info-section">
-        <cwg-label-line-value :label="t('Custom.Deposit.Title1')" :value="login" v-if="login" />
+        <cwg-label-line-value :label="t('Custom.Deposit.Title1')" :value="loginDoc" v-if="loginDoc" />
         <cwg-label-line-value :label="t('Custom.Deposit.Title2')"
           :value="locale == 'cn' ? channelData.name : channelData.enName" v-if="channelData.code" />
         <cwg-label-line-value :label="t('news_add_field.Label.Title4')" :value="selectCodes" v-if="code" />
@@ -166,7 +166,7 @@ import { useI18n } from 'vue-i18n';
 
 const props = defineProps({
   visible: { type: Boolean, default: false },
-  login: String,
+  loginDoc: String,
   channelData: Object,
   code: String,
   selectCodes: String,

pages/customer/components/TerminalChangePasswordDialog.vue

@@ -24,7 +24,7 @@
             </view>
 
             <view class="save-btn">
-                <view class="btn primary" @click="save" :disabled="!isFormValid" v-t="'Btn.Save'" />
+                <view class="btn primary" @click="save" v-t="'Btn.Save'" />
             </view>
         </view>
     </cwg-popup>
@@ -69,7 +69,7 @@ const rule3 = computed(() => {
 });
 const rule4 = computed(() => {
     return /^(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9])(?=.*[~!@&%$^*./\\(\\)\\+\\=#_-])[A-Za-z0-9~!@&%$^*./\\(\\)\\+\\=#_-]{8,16}$/.test(
-        formData.password
+        passwordInfo.value.newPassword
     );
 });
 
@@ -79,17 +79,14 @@ const noticeItems = computed(() => [
     { label: t('signup.form.rules.4rd'), valid: rule4.value }
 ]);
 
-const isFormValid = computed(() => {
-    return rule1.value && rule2.value && rule4.value && passwordInfo.value.oldPassword && passwordInfo.value.newPassword;
-});
+
 
 const flag = ref(false); // 防止重复提交
 
 const save = async () => {
-    if (!isFormValid.value) {
+    if (!rule1.value || !rule2.value || !rule4.value) {
         return;
     }
-
     if (flag.value) return;
     flag.value = true;
 
@@ -122,7 +119,8 @@ const save = async () => {
             showToast(res.msg);
         }
     } catch (error) {
-        console.error(error);
+        showToast(error.msg);
+        emit('update:visible', false);
     } finally {
         flag.value = false;
     }
@@ -144,6 +142,7 @@ const save = async () => {
 }
 
 .account-number {
+    text-align: left;
     display: block;
     font-size: px2rpx(14);
     color: #141d22;
@@ -166,6 +165,7 @@ const save = async () => {
     padding: 0 px2rpx(12) px2rpx(12) 0;
 
     .notice-item {
+        text-align: left;
         font-size: px2rpx(14);
         color: var(--color-yellow-800);
         line-height: px2rpx(24);

pages/customer/components/WithdrawCheckConfirmPopup.vue

@@ -3,12 +3,12 @@
     :title="title">
     <view class="popup-content">
       <view class="info-section">
-        <cwg-label-line-value :label="t('Custom.Deposit.Title11')" :value="login" v-if="login" />
+        <cwg-label-line-value :label="t('Custom.Deposit.Title11')" :value="loginDoc" v-if="loginDoc" />
         <cwg-label-line-value :label="t('Custom.Deposit.Title22')"
           :value="locale == 'cn' ? channelData.name : channelData.enName" v-if="channelData.code" />
         <cwg-label-line-value :label="t('news_add_field.Label.Title4')" :value="selectCodes" v-if="code" />
-        <cwg-label-line-value :label="t('Custom.Withdraw.Title3')" :value="params.amount + ' (' + channelData.currency + ')'"
-          v-if="params.amount" />
+        <cwg-label-line-value :label="t('Custom.Withdraw.Title3')"
+          :value="params.amount + ' (' + channelData.currency + ')'" v-if="params.amount" />
         <cwg-label-line-value :label="t('Custom.Withdraw.item7')" :value="''" v-if="type !== 'IB'">
           <template #operation1>
             <view v-if="FreeNumber > 0 && dialogCheckConfirm_form.feeAmount > 0">
@@ -40,7 +40,7 @@ import { useI18n } from 'vue-i18n';
 
 const props = defineProps({
   visible: { type: Boolean, default: false },
-  login: String,
+  loginDoc: String,
   channelData: Object,
   code: String,
   selectCodes: String,

pages/customer/deposit.vue

@@ -388,7 +388,7 @@
             <!-- 提交后确认弹窗 -->
             <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" @confirm="submit" />
+                :login="loginValue" :loginDoc="loginValueDoc" @confirm="submit" />
             <!--提交后的弹出框-->
             <CheckPopup v-model:visible="dialogCheckSuccess" :goPayLink="goPayLink" @close="closeDia" />
             <!-- 提交后失败弹窗 -->
@@ -487,6 +487,7 @@ const $route = { query: {} } // 需从外部注入
 
 // 响应式数据
 const loginValue = ref("")
+const loginValueDoc = ref("")
 const metaInfo = ref(null)
 const text1 = ref("")
 const dialogKyc = ref(false)
@@ -1586,6 +1587,7 @@ const getDateList = async () => {
         if (route.login) {
             const found = loginOptions.value.find(opt => opt.login === Number(route.login))
             loginValue.value = found.login
+            loginValueDoc.value = found.label
             step2.value = true
         }
     } else {
@@ -1805,11 +1807,8 @@ watch(loginValue, (login) => {
         loginOptions.value.forEach(item => {
             if (item.login == login) ACCType.value = item.type
         })
-
-
-        setTimeout(() => {
-            console.log(sortedTableData.value, 1212);
-        }, 3000)
+        const found = loginOptions.value.find(opt => opt.login === Number(newVal))
+        loginValueDoc.value = found.label
     }
 })
 watch(() => params.amount, (newVal) => {

pages/customer/withdrawal.vue

@@ -245,7 +245,8 @@
       <!-- 弹窗：确认信息 -->
       <cwg-check-confirm-popup v-model:visible="dialogCheckConfirm" :title="t('Home.page_customer.item3')"
         :channelData="channelData" :code="code" :selectCodes="selectCodes" :params="form" :FreeNumber="FreeNumber"
-        :userName="userName" :dialogCheckConfirm_form="dialogCheckConfirm_form" :login="loginValue" @confirm="submit" />
+        :userName="userName" :dialogCheckConfirm_form="dialogCheckConfirm_form" :login="loginValue"
+        :loginDoc="loginValueDoc" @confirm="submit" />
       <!-- 协议弹窗 -->
       <cwg-tips-popup v-model:visible="dialogCheckTip"
         :introduce="isZh.value ? introduce.introduce : introduce.enIntroduce" />
@@ -293,6 +294,7 @@ const { proxy } = getCurrentInstance()
 
 // -------------------- data --------------------
 const loginValue = ref("")
+const loginValueDoc = ref("")
 const hiddenSelect = ref(false)
 const metaInfo = ref(null)
 const text1 = ref("")
@@ -1408,14 +1410,9 @@ async function getDateList() {
     }))
     const route = getCurrentPages().pop().$page.options
     if (route.login) {
-      loginValue.value =
-        route.login +
-        " - " +
-        groupTypeName(route.type) +
-        " - " +
-        t("Custom.Deposit.AvailableBalance") +
-        groupCurrency(route.currency) +
-        route.balance;
+      const found = loginOptions.value.find(opt => opt.login === Number(route.login))
+      loginValue.value = found.login
+      loginValueDoc.value = found.label
       step2.value = true;
       // showTable();
     }
@@ -1585,6 +1582,8 @@ function getFirstDayOfNextMonth() {
 watch(loginValue, (newVal) => {
   if (newVal) {
     step2.value = true;
+    const found = loginOptions.value.find(opt => opt.login === Number(newVal))
+    loginValueDoc.value = found.label
     showTable();
   }
 });