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

components/cwg-improve-popup.vue

@@ -0,0 +1,54 @@
+<template>
+    <cwg-popup v-model:visible="visible" type="center" :mask-click="false" :show-footers="true">
+        <view class="popup-content">
+            <view class="des1" v-t="'Home.msg.content1'"></view>
+            <view class="icon">
+                <cwg-icon name="mdi-shield-lock-outline" :size="80" color="#303133" />
+            </view>
+            <view class="des2" v-t="'Home.msg.content2'"></view>
+            <view class="des2" v-t="'Home.msg.content3'"></view>
+        </view>
+        <template #footer>
+            <button @click="closeDia">{{ t('Btn.Cancel') }}</button>
+            <button type="primary" @click="confirm">{{ t('Home.msg.btnImmediately') }}</button>
+        </template>
+    </cwg-popup>
+</template>
+
+<script setup>
+import { computed } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+const props = defineProps({
+    visible: {
+        type: Boolean,
+        default: false
+    },
+});
+
+const emit = defineEmits(['update:visible', 'confirm']);
+
+const { t } = useI18n();
+
+// Watch for changes in visible prop and emit update event
+const visible = computed({
+    get: () => props.visible,
+    set: (value) => emit('update:visible', value)
+});
+const closeDia = () => {
+    visible.value = false;
+}
+const confirm = () => {
+    visible.value = false;
+    emit('confirm');
+}
+</script>
+
+<style lang="scss" scoped>
+.des1{
+    font-size: px2rpx(16);
+    line-height: 1.6;
+    margin: px2rpx(30) 0 px2rpx(50);
+    color: #303133;
+}
+</style>

pages/customer/components/AccountList.vue

@@ -34,6 +34,7 @@
         </view>
         <cwg-empty-state v-if="!loading && accounts.length == 0" />
         <DeleteAccountDialogs ref="deleteAccountDialogRef" v-model:visible="deleteAccountDialogVisible" />
+        <cwg-improve-popup v-model:visible="dialogCheck" @confirm="confirm" />
     </view>
 </template>
 
@@ -188,6 +189,7 @@ watch(cativeIndex, (newVal) => {
 })
 const loading = ref(false)
 // 获取客户登录信息
+const dialogCheck = ref(false)
 async function getCustomLoginInfo() {
     try {
         const res = await userApi.getUserInfo();
@@ -199,13 +201,19 @@ async function getCustomLoginInfo() {
             ) {
                 router.push(`/pages/customer/account-select?server=${cativeIndex.value == 1 ? 'demo' : 'real'}`)
             } else {
-                // this.dialogCheck = true;
+                dialogCheck.value = true;
             }
         }
     } catch (error) {
         //  console.log(error, 111);
     }
 }
+
+const confirm = () => {
+    dialogCheck.value = false;
+    router.push(`/pages/mine/improveImmediately`)
+}
+
 const AccountList = ref([])
 const getAccountList = async () => {
     AccountList.value = []

pages/ib/withdraw.vue

@@ -520,6 +520,7 @@ const form = reactive({
     expiryYearMonth: '',   // 过期年（电汇专用，可编辑）
     agree2: false,
     agree3: false,
+    login: ''
 
 })
 const mAmount = reactive({
@@ -964,7 +965,6 @@ const selectChange = () => {
 // 新增银行信息
 const addBankDialogRef = ref(null);
 function openAddBankCard(type) {
-    console.log(type, 121212)
     switch (type) {
         case 'add_bankBlockchain':
             openAddCrypto()
@@ -982,7 +982,6 @@ function openAddBankCard(type) {
 }
 function openAddCrypto() {
     const wallets = bankCardOptions.value || []
-    console.log(wallets, 12121212);
     // 1️⃣ 没有钱包
     if (wallets.length === 0) {
         addBankDialogRef.value?.open(4);
@@ -1012,8 +1011,6 @@ function openAddCrypto() {
 }
 function openAddUnionpay() {
     const wallets = bankCardOptions.value || []
-    console.log(wallets, 12121212);
-
     if (wallets.length === 0) {
         addBankDialogRef.value?.open(1);
         return;
@@ -1029,7 +1026,6 @@ function openAddUnionpay() {
 }
 function openAddBank() {
     const wallets = bankCardOptions.value || []
-    console.log(wallets, 121212)
     if (wallets.length === 0) {
         addBankDialogRef.value?.open(2);
         return;
@@ -1045,7 +1041,6 @@ function openAddBank() {
 }
 function openAddCredit() {
     const wallets = bankCardOptions.value || []
-    console.log(wallets, 12121212);
     if (wallets.length === 0) {
         addBankDialogRef.value?.open(3);
         return;

static/scss/global/global.scss

@@ -1324,6 +1324,14 @@ uni-content.collapsed {
         padding: 0 px2rpx(10);
     }
 
+    .des2 {
+        font-size: px2rpx(14);
+        margin: px2rpx(15) 0 px2rpx(15);
+        color: #303133;
+        line-height: 1.4;
+        padding: 0 px2rpx(10);
+    }
+
 }
 
 
@@ -1455,6 +1463,11 @@ uni-content.collapsed {
             margin: px2rpx(15) 0 px2rpx(10);
         }
 
+        .des2 {
+            font-size: px2rpx(13);
+            margin: px2rpx(15) 0 px2rpx(10);
+        }
+
         .dialog-footer {
             button {
                 min-width: px2rpx(80);

windows/left-window.vue

@@ -28,7 +28,7 @@
         <cwg-icon name="crm-trade" :size="20" color="#6c8595" />
         <view class="menu-label" v-t="'Home.msg.Custom'" />
       </view>
-      <view class="menu-item zy-box" @click="handleFixedMenuClick">
+      <view class="menu-item zy-box" @click="handleFixedMenuClick" :class="{ 'active': isCollapsed }">
         <cwg-icon name="crm-zy" :size="20" color="#6c8595" />
       </view>
     </view>
@@ -36,7 +36,7 @@
 </template>
 
 <script lang="ts" setup>
-import { ref,computed } from 'vue'
+import { ref, computed } from 'vue'
 import useUserStore from '@/stores/use-user-store'
 import { useMenuSplit } from '@/composables/useMenuSplit'
 const { menus, setSubmenuRef, setMode, handleClick, handleSubmenuClick, mode } = useMenuSplit()
@@ -162,6 +162,10 @@ function handleFixedMenuClick() {
     justify-content: center;
   }
 
+  .zy-box.active {
+    transform: rotate(180deg);
+  }
+
   .fixed {
     position: relative;
     width: 100%;