Merge branch 'admin_dev' of http://112.213.107.185:3000/cwg-crm/gypsy-crm-frontend-vu into admin_dev

components/AddBankDialog.vue

@@ -12,7 +12,7 @@
         <uni-row class="form-row uni-row1">
           <template v-if="form.type === 1">
             <uni-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
-              <uni-forms-item>
+              <uni-forms-item required name="bankFront" :label="t('PersonalManagement.Label.BankCardImage')">
                 <cwg-file-picker-wrapper v-model:value="form.bankFront" :limit="1" uploadUrl="/custom/bank/upload"
                   :baseUrl="updateUrl" :imageWidth="200" :imageHeight="200" uploadText="点击上传" replaceText="点击替换"
                   noImageText="暂无图片" @update:modelValue="(val) => handleFileUpdate(val, form, 'bankFront')" />
@@ -229,6 +229,15 @@ const form = ref({
 })
 
 const rules = computed(() => ({
+  bankFront: {
+    rules: [
+      {
+        required: true,
+        errorMessage: t('vaildate.select.empty'),
+        trigger: 'blur',
+      },
+    ],
+  },
   bankName: {
     rules: [
       {

locale/cn.json

@@ -1226,7 +1226,8 @@
       "Men": "男",
       "Women": "女",
       "CertificationPhoto": "认证照片",
-      "AccountAgencyNO": "代理机构编号"
+      "AccountAgencyNO": "代理机构编号",
+      "BankCardImage": "银行卡图片"
     },
     "CardVerify": {
       "Title": "证件认证",

locale/en.json

@@ -1196,7 +1196,8 @@
       "Men": "Male",
       "Women": "Female",
       "CertificationPhoto": "Certification Photo",
-      "AccountAgencyNO": "Account Agency NO"
+      "AccountAgencyNO": "Account Agency NO",
+      "BankCardImage": "Bank Card Image"
     },
     "CardVerify": {
       "Title": "Card Verification",

pages/follow/components/applySignalDialog.vue

@@ -55,7 +55,7 @@
           <view class="form-col">
             <view class="form-item">
               <uni-forms-item :label="t('Label.PlatformType')" name="platform">
-                <cwg-combox disabled v-model:value="formData.platform"
+                <cwg-combox v-model:value="formData.platform"
                   :options="[{ text: 'MT4', value: 'MT4' }, { text: 'MT5', value: 'MT5' }]"
                   :placeholder="t('placeholder.choose')" />
               </uni-forms-item>

pages/ib/linkList.vue

@@ -100,7 +100,7 @@
           <QrCode ref="dialogQrCode" v-if="currentQrCodeLink" :text="currentQrCodeLink" :width="300" :height="300">
           </QrCode>
           <view v-if="currentQrCodeLink" class="qr-code-btn">
-            <button @click="downloadDialogQrCode">
+            <button class="crm-cursor btn btn-dark btn-sm waves-effect waves-light btn-outline-dark1" @click="downloadDialogQrCode">
               {{ t('Btn.item9') }}
             </button>
           </view>

static/scss/global/global.scss

@@ -1807,7 +1807,7 @@ uni-content.collapsed {
 
         &.primary {
             background-color: #e61f1e;
-            color: var(--bs-emphasis-color);
+            color: #fff;
         }
 
         &.danger {