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

components/AddBankDialog.vue

@@ -51,20 +51,20 @@
               </uni-forms-item>
             </uni-col>
             <uni-col :xs="24">
-              <uni-forms-item :label="t('PersonalManagement.Label.BankName')" name="bankName">
+              <uni-forms-item required :label="t('PersonalManagement.Label.BankName')" name="bankName">
                 <cwg-combox :clearable="false" :filterable="true" v-model:value="form.bankName"
                             :options="bankOptions" :placeholder="t('placeholder.choose')"
                 />
               </uni-forms-item>
             </uni-col>
             <uni-col :xs="24">
-              <uni-forms-item :label="t('PersonalManagement.Label.BankAccount')" name="bankCardNum">
+              <uni-forms-item required :label="t('PersonalManagement.Label.BankAccount')" name="bankCardNum">
                 <uni-easyinput :clearable="false" v-model="form.bankCardNum"
                                :placeholder="t('placeholder.input')" />
               </uni-forms-item>
             </uni-col>
             <uni-col :xs="24">
-              <uni-forms-item :label="t('PersonalManagement.Label.AccountOpeningBranch')"
+              <uni-forms-item required :label="t('PersonalManagement.Label.AccountOpeningBranch')"
                               name="bankBranchName">
                 <uni-easyinput :clearable="false" v-model="form.bankBranchName"
                                :placeholder="t('placeholder.input')" />
@@ -74,14 +74,14 @@
           <template v-if="form.type === 4">
             <!-- 区块链名称 -->
             <uni-col :xs="24">
-              <uni-forms-item name="addressName" :label="t('blockchain.item3')">
+              <uni-forms-item required name="addressName" :label="t('blockchain.item3')">
                 <uni-easyinput :clearable="false" v-model="form.addressName"
                                :placeholder="t('placeholder.input')" />
               </uni-forms-item>
             </uni-col>
             <!-- 钱包地址 -->
             <uni-col :xs="24">
-              <uni-forms-item name="address" :label="t('blockchain.item4')">
+              <uni-forms-item required name="address" :label="t('blockchain.item4')">
                 <uni-easyinput :clearable="false" v-model="form.address"
                                :placeholder="t('placeholder.input')" />
               </uni-forms-item>
@@ -95,31 +95,31 @@
               </uni-forms-item>
             </uni-col>
             <uni-col :xs="24">
-              <uni-forms-item :label="t('PersonalManagement.Label.BankAccount')" name="bankCardNum">
+              <uni-forms-item required :label="t('PersonalManagement.Label.BankAccount')" name="bankCardNum">
                 <uni-easyinput :clearable="false" v-model="form.bankCardNum"
                                :placeholder="locale == 'es' ? 'Introduzca la dirección de la billetera' : t('placeholder.input')" />
               </uni-forms-item>
             </uni-col>
             <uni-col :xs="24">
-              <uni-forms-item :label="t('PersonalManagement.Label.BankName')" name="bankName">
+              <uni-forms-item required :label="t('PersonalManagement.Label.BankName')" name="bankName">
                 <uni-easyinput :clearable="false" v-model="form.bankName"
                                :placeholder="locale == 'es' ? 'Introduzca el nombre del banco' : t('placeholder.input')" />
               </uni-forms-item>
             </uni-col>
             <uni-col :xs="24">
-              <uni-forms-item :label="t('PersonalManagement.Label.BankAddress')" name="bankAddr">
+              <uni-forms-item required :label="t('PersonalManagement.Label.BankAddress')" name="bankAddr">
                 <uni-easyinput :clearable="false" v-model="form.bankAddr"
                                :placeholder="locale == 'es' ? 'Introduzca la dirección del banco' : t('placeholder.input')" />
               </uni-forms-item>
             </uni-col>
             <uni-col :xs="24">
-              <uni-forms-item :label="t('PersonalManagement.Label.SwiftBIC')" name="swiftCode">
+              <uni-forms-item required :label="t('PersonalManagement.Label.SwiftBIC')" name="swiftCode">
                 <uni-easyinput :clearable="false" v-model="form.swiftCode"
                                :placeholder="locale == 'es' ? 'Introduzca el SWIFT/BIC' : t('placeholder.input')" />
               </uni-forms-item>
             </uni-col>
             <uni-col :xs="24">
-              <uni-forms-item :label="t('PersonalManagement.Label.BankCode')" name="bankCode">
+              <uni-forms-item required :label="t('PersonalManagement.Label.BankCode')" name="bankCode">
                 <uni-easyinput :clearable="false" v-model="form.bankCode"
                                :placeholder="locale == 'es' ? 'Introduzca el código del banco' : t('placeholder.input')" />
               </uni-forms-item>
@@ -140,13 +140,13 @@
               </uni-forms-item>
             </uni-col>
             <uni-col :xs="24">
-              <uni-forms-item :label="t('PersonalManagement.Label.CreditCardAccount')" name="bankCardNum">
+              <uni-forms-item required :label="t('PersonalManagement.Label.CreditCardAccount')" name="bankCardNum">
                 <uni-easyinput :clearable="false" v-model="form.bankCardNum"
                                :placeholder="locale == 'es' ? 'Introduzca el número de tarjeta' : t('placeholder.input')" />
               </uni-forms-item>
             </uni-col>
             <uni-col :xs="24">
-              <uni-forms-item :label="t('PersonalManagement.Label.ExpirationYear')"
+              <uni-forms-item required :label="t('PersonalManagement.Label.ExpirationYear')"
                               name="expiryYearMonth">
                 <uni-easyinput :clearable="false" v-model="form.expiryYearMonth"
                                :placeholder="locale == 'es' ? 'Introduzca MM/AA' : t('placeholder.input')" />

locale/cn.json

@@ -1195,6 +1195,7 @@
       "SwiftBIC": "Swift/BIC",
       "BankCode": "银行代码",
       "FileName": "文件名称",
+      "Document": "文件",
       "UploadDate": "上传日期",
       "State": "状态",
       "Operation": "操作",

pages/login/index.vue

@@ -167,9 +167,18 @@
         <uni-col :xs="24" :sm="24" :md="12" :lg="14" :xl="16">
           <view class="left-bg">
             <view class="left-box">
-              <view>
-
+              <view class="inner">
+                <view class="section-title">
+                  <text class="bg-secondary-opacity subtitle w-40" v-t="'newLoop.item11'"></text>
+                </view>
+                <view class="title w-700">
+                  <text v-t="'newLoop.item12'"></text>
+                  <text>&nbsp;</text>
+                  <text class="color-white" v-t="'newLoop.item13'"></text>
+                </view>
+                <view class="text-white" v-t="'newLoop.item14'"></view>
               </view>
+              <image src="/static/images/trust-pilot.png" class="img-fluid mt--10" mode="widthFix"></image>
               <view class="left-content">
                 <view class="des text-white">
                   <text v-html="t('newSignin.item12')"></text>
@@ -301,6 +310,64 @@
         width: 60%;
         margin-top: px2rpx(20);
 
+        .inner {
+          width: 100%;
+          text-align: start;
+          margin-bottom: px2rpx(20);
+
+          .section-title {
+            margin-bottom: px2rpx(10);
+          }
+
+
+          .title {
+            font-size: px2rpx(60);
+            line-height: 1.3;
+            color: #fff;
+            font-weight: 700;
+          }
+
+          .w-700 {
+            font-weight: 700;
+          }
+
+          .subtitle {
+            width: 45%;
+            font-size: px2rpx(18);
+            letter-spacing: px2rpx(1);
+            display: block;
+            margin-bottom: px2rpx(24);
+            color: #ffffff;
+            line-height: px2rpx(15);
+            font-weight: 500;
+            padding: px2rpx(10) px2rpx(20);
+            border-radius: px2rpx(100);
+            text-transform: uppercase;
+            background-color: #e61f1e;
+            text-align: center;
+          }
+
+          .w-40 {
+            max-width: 40%;
+          }
+
+          .text-white {
+            margin-top: px2rpx(10);
+            font-size: px2rpx(14);
+            line-height: 1.6;
+            color: #fff;
+          }
+        }
+
+        .img-fluid {
+          width: 100%;
+          max-width: px2rpx(240);
+        }
+
+        .mt--10 {
+          margin-top: px2rpx(10);
+        }
+
         .h1 {
           // text-align: center;
           color: #fff;
@@ -531,4 +598,4 @@
   .cwg-button {
     padding: px2rpx(34) 0 !important;
   }
-</style>
+</style>

pages/mine/components/CardAuthDialog.vue

@@ -507,7 +507,6 @@ defineExpose({
     right: 0;
     bottom: px2rpx(12);
     min-width: px2rpx(100);
-    background-color: var(--color-error);
     z-index: 1;
     margin-left: px2rpx(8);
 

pages/mine/components/FileManagementTab.vue

@@ -95,46 +95,46 @@ const isSHowBtn = computed(() => {
 });
 
 // 表格列配置
-const columns = ref([
-    {
-        prop: 'id',
-        label: '#',
-        align: 'left'
-    },
-    {
-        prop: 'path',
-        label: 'Document',
-        type: 'file',
-        align: 'left'
-    },
-    {
-        prop: 'type',
-        label: 'File Name/Type',
-        align: 'left',
-        slot: 'type'
-    },
-    {
-        prop: 'uploadTime',
-        label: 'Upload Date/Time',
-        type: 'date',
-        dateFormat: 'YYYY-MM-DD HH:mm',
-        align: 'left'
-    },
-    {
-        prop: 'status',
-        label: 'Status',
-        type: 'tag',
-        tagMap: { 1: '启用', 10: '禁用' },
-        tagTypeMap: { 1: 'success', 0: 'danger' },
-        slot: 'status',
-        align: 'left'
-    },
-    {
-        prop: 'status',
-        label: '操作',
-        slot: 'btn',
-        align: 'left'
-    }
+const columns = computed(() => [
+  {
+    prop: 'id',
+    label: 'ID',
+    align: 'left'
+  },
+  {
+    prop: 'path',
+    label: t('PersonalManagement.Label.Document'),
+    type: 'file',
+    align: 'left'
+  },
+  {
+    prop: 'type',
+    label: t('PersonalManagement.Label.FileName'),
+    align: 'left',
+    slot: 'type'
+  },
+  {
+    prop: 'uploadTime',
+    label: t('PersonalManagement.Label.UploadDate'),
+    type: 'date',
+    dateFormat: 'YYYY-MM-DD HH:mm',
+    align: 'left'
+  },
+  {
+    prop: 'status',
+    label: t('PersonalManagement.Label.State'),
+    type: 'tag',
+    tagMap: { 1: '启用', 10: '禁用' },
+    tagTypeMap: { 1: 'success', 0: 'danger' },
+    slot: 'status',
+    align: 'left'
+  },
+  {
+    prop: 'status',
+    label: '操作',
+    slot: 'btn',
+    align: 'left'
+  }
 ])
 
 const addFileDialog = ref(null);