feat：“同步10.21”

src/assets/language/en.json

@@ -650,10 +650,12 @@
     "withdrawalAccountNo": "Standby withdrawal account No",
     "merchantNameLabel": "Merchant name",
     "merchantNamePlaceholder": "Please enter the merchant name",
+    "merchantNameTips": "Must match the name on the business license",
     "merchantAccountLabel": "Merchant account",
     "merchantAccountPlaceholder": "Please enter the merchant account",
     "merchantAbbreviationLabel": "Merchant abbreviation",
     "merchantAbbreviationPlaceholder": "Please enter the short name of the merchant",
+    "merchantAbbreviationTips": "Must be related to the merchant's registered name",
     "merchantType": "Merchant type",
     "personal": "personal",
     "individualBusinesses": "Individual businesses",
@@ -676,8 +678,9 @@
     "accountType": "Account Type",
     "debitCard": "Debit Card",
     "corporateAccount": "Corporate account",
-    "bankAccountNameLabel": "Bank account name",
-    "bankAccountNamePlaceholder": "Please enter the bank account name",
+    "bankAccountNameLabel": "Account name",
+    "bankAccountNamePlaceholder": "Please enter the account holder name",
+    "bankAccountNameTips": "The name of the account holder, make sure it matches the name on the bank card!",
     "bankAccountLabel": "bank account",
     "bankAccountPlaceholder": "Please enter the bank account",
     "interBankNoLabel": "Inter bank No",

src/assets/language/zh.json

@@ -651,10 +651,12 @@
     "withdrawalAccountNo": "备用提现账号",
     "merchantNameLabel": "商户名称",
     "merchantNamePlaceholder": "请输入商户名称",
+    "merchantNameTips": "必须与商家营业执照上的名称一致",
     "merchantAccountLabel": "商户账号",
     "merchantAccountPlaceholder": "请输入商户账号",
     "merchantAbbreviationLabel": "商户简称",
     "merchantAbbreviationPlaceholder": "请输入商户简称",
+    "merchantAbbreviationTips": "需与商户注册名称相关",
     "merchantType": "商户类型",
     "personal": "个人",
     "individualBusinesses": "个体工商户",
@@ -677,10 +679,11 @@
     "accountType": "账户类型",
     "debitCard": "借记卡",
     "corporateAccount": "对公账户",
-    "bankAccountNameLabel": "银行账户名称",
-    "bankAccountNamePlaceholder": "请输入银行账户名称",
+    "bankAccountNameLabel": "账户名称",
+    "bankAccountNamePlaceholder": "请输入账户持有人姓名",
+    "bankAccountNameTips": "填写账户的持有人姓名，确保与银行卡上的姓名一致！",
     "bankAccountLabel": "银行账号",
-    "bankAccountPlaceholder": "请输入银行账号",
+    "bankAccountPlaceholder": "请输入银行账号，确保无误",
     "interBankNoLabel": "联行号",
     "interBankNoPlaceholder": "请输入联行号",
     "businessLicenseNoLabel": "营业执照编号",

src/main.js

@@ -4,7 +4,7 @@ import {
   AddressList, Field, CellGroup, Cell, SwipeCell, Icon, Stepper, Card, Checkbox, CheckboxGroup, Button, Swipe, SwipeItem,
   PullRefresh, List, Tab, Tabs, SubmitBar, Toast, Skeleton, RadioGroup, Radio, NoticeBar, ActionSheet, Cascader, Col, Row,
   Slider, DatetimePicker, Switch, Calendar, Picker, Uploader, Tag, DropdownMenu, DropdownItem, Notify, ConfigProvider, NavBar,
-  Area
+  Area, Popover
 } from 'vant';
 import { Image as VanImage } from 'vant';
 import App from './App.vue'
@@ -81,6 +81,7 @@ app.use(ActionBarButton)
   .use(ConfigProvider)
   .use(NavBar)
   .use(Area)
+  .use(Popover)
 
 
 app.use(router)

src/styles/joinpayMch/index.less

@@ -88,6 +88,36 @@
         }
     }
 
+    .custom-input {
+        .van-cell__title {
+            width: 35%;
+            position: relative;
+
+            &::after {
+                content: '*';
+                color: red;
+                position: absolute;
+                left: -.6em;
+            }
+        }
+    }
+
+    .cell-input::after {
+        box-sizing: border-box;
+        content: "";
+        pointer-events: none;
+        bottom: 0;
+        display: block;
+        border-bottom: 1px solid #ebedf0;
+        transform: scaleY(.5);
+        margin: 0 15px;
+    }
+
+
+    .van-popover__wrapper {
+        width: 100%;
+    }
+
     .upLoaderRow {
         .baseRow {
             width: 100%;
@@ -130,7 +160,7 @@
             }
         }
     }
-    
+
     .van-radio__icon--checked .van-icon {
         background-color: #2c87c8;
         border-color: #2c87c8;
@@ -169,4 +199,11 @@
     .van-field__label {
         width: 35%;
     }
+}
+
+.van-popover__content {
+    width: auto;
+    height: 25px;
+    padding: 0 10px;
+    padding-top: 8px;
 }

src/views/advertManage/adSet.vue

@@ -11,14 +11,9 @@
               message: $t('advertManage.advertisingNamePlaceholder'),
             },
           ]" />
-        <van-field required v-model="adInfo.adminId" name="adminId"
+        <van-field v-model="adInfo.adminId" name="adminId"
           :label="`${$t('advertManage.affiliatedMerchantsLabel')}:`"
-          :placeholder="$t('advertManage.affiliatedMerchantsPlaceholder')" :rules="[
-            {
-              required: true,
-              message: $t('advertManage.affiliatedMerchantsPlaceholder'),
-            },
-          ]" />
+          :placeholder="$t('advertManage.affiliatedMerchantsPlaceholder')" />
         <van-field v-model="adInfo.orders" name="orders" type="number"
           :label="`${$t('advertManage.advertisingOrderLabel')}:`"
           :placeholder="$t('advertManage.advertisingOrderPlaceholder')" />

src/views/advertManage/advertRule/add.vue

@@ -14,14 +14,9 @@
         <van-field colon :border="false" v-model="cofficentForm.userNames" clearable name="userNames"
           :label="$t('advertManage.advertRule.addRule.pushMerchant')"
           :placeholder="$t('advertManage.advertRule.addRule.pushMerchantPlace')" />
-        <van-field required readonly colon :border="false" v-model="cofficentForm.A_advertList" clearable
-          name="A_advertList" :placeholder="$t('advertManage.advertRule.addRule.AScreenPlace')"
-          :label="$t('advertManage.advertRule.addRule.AScreen')" :rules="[
-            {
-              required: true,
-              message: $t('advertManage.advertRule.addRule.AScreenPlace'),
-            },
-          ]">
+        <van-field readonly colon :border="false" v-model="cofficentForm.A_advertList" clearable name="A_advertList"
+          :placeholder="$t('advertManage.advertRule.addRule.AScreenPlace')"
+          :label="$t('advertManage.advertRule.addRule.AScreen')">
           <template #button>
             <van-button @click="searchClk(0)" type="primary">{{
               $t("advertManage.advertRule.addRule.screen")

src/views/settlement/index.vue

@@ -54,15 +54,31 @@
           </div>
           <div v-if="altMerchantType == 12" class="requiredLeft">
             <!-- 商户名称 -->
-            <van-field v-model="regNameValue" name="regNameValue" :label="$t('huifuMch.huifuRegName')"
-              :placeholder="$t('huifuMch.huifuRegNamePlaceholder')"
-              :rules="[{ required: true, message: $t('huifuMch.huifuRegNamePlaceholder') }]"
-              @update:model-value="fieldUpdate" />
+            <div class="cell-input">
+              <van-popover v-model:show="regNameVisible" trigger="manual" placement="top" popover-class="custom-popover"
+                :offset="[25, 0]" theme="dark">
+                <template #reference>
+                  <van-field v-model="regNameValue" name="regNameValue" :label="$t('huifuMch.huifuRegName')"
+                    :placeholder="$t('huifuMch.huifuRegNamePlaceholder')"
+                    :rules="[{ required: true, message: $t('huifuMch.huifuRegNamePlaceholder') }]"
+                    @update:model-value="fieldUpdate" @click="showPopover(1)" />
+                </template>
+                {{ $t('joinpayMch.merchantNameTips') }}
+              </van-popover>
+            </div>
             <!-- 商户简称 -->
-            <van-field v-model="shortNameValue" name="shortNameValue" :label="$t('huifuMch.shortNameLabel')"
-              :placeholder="$t('huifuMch.shortNamePlaceholder')"
-              :rules="[{ required: true, message: $t('huifuMch.shortNamePlaceholder') }]"
-              @update:model-value="fieldUpdate" />
+            <div class="cell-input">
+              <van-popover v-model:show="shortNameVisible" trigger="manual" placement="bottom"
+                popover-class="custom-popover" :offset="[25, 0]" theme="dark">
+                <template #reference>
+                  <van-field v-model="shortNameValue" name="shortNameValue" :label="$t('huifuMch.shortNameLabel')"
+                    :placeholder="$t('huifuMch.shortNamePlaceholder')"
+                    :rules="[{ required: true, message: $t('huifuMch.shortNamePlaceholder') }]"
+                    @update:model-value="fieldUpdate" @click="showPopover(2)" />
+                </template>
+                {{ $t('joinpayMch.merchantAbbreviationTips') }}
+              </van-popover>
+            </div>
             <!-- 注册地址 -->
             <van-field v-model="registeredAddress" is-link readonly name="registeredAddress"
               :label="$t('huifuMch.huifuRegisteredAddress')"
@@ -154,7 +170,8 @@
               <span
                 :style="{ color: signStatus == '签约成功' ? (conStat == null && huifuMchID == null ? '#00ff80' : (conStat == 5 && huifuAuditStatus == '2' ? '#00ff80' : '#FFA500')) : '#FFA500' }">
                 <!-- {{ signStatus == "签约成功" && conStat == "5" ? signStatus : "待签约" }} -->
-                {{ signStatus == '签约成功' ? (conStat == null && huifuMchID == null ? signStatus : (conStat == 5 && huifuAuditStatus == '2' ?
+                {{ signStatus == '签约成功' ? (conStat == null && huifuMchID == null ? signStatus : (conStat == 5 &&
+                  huifuAuditStatus == '2' ?
                   signStatus : '待签约')) : '待签约' }}
               </span>
               <van-button span="5" round type="primary" style="height: 2em; padding: 0 2.5em" @click='altMchSignFun()'>{{
@@ -176,10 +193,19 @@
             </div>
           </div>
           <!-- 银行账户名称 -->
-          <van-field class="requiredLeft" v-model="bankAccountName" name="bankAccountName"
-            :label="$t('joinpayMch.bankAccountNameLabel')" :placeholder="$t('joinpayMch.bankAccountNamePlaceholder')"
-            :rules="[{ required: true, message: $t('joinpayMch.bankAccountNamePlaceholder') }]"
-            @update:model-value="fieldUpdate" />
+          <div class="cell-input">
+            <van-popover v-model:show="popoverVisible" trigger="manual" placement="top" popover-class="custom-popover"
+              :offset="[25, 5]" theme="dark">
+              <template #reference>
+                <van-field class="custom-input" v-model="bankAccountName" name="bankAccountName"
+                  :label="$t('joinpayMch.bankAccountNameLabel')"
+                  :placeholder="$t('joinpayMch.bankAccountNamePlaceholder')"
+                  :rules="[{ required: true, message: $t('joinpayMch.bankAccountNamePlaceholder') }]"
+                  @update:model-value="fieldUpdate" @click="showPopover(3)" />
+              </template>
+              {{ $t('joinpayMch.bankAccountNameTips') }}
+            </van-popover>
+          </div>
           <!-- 银行账号 -->
           <van-field class="requiredLeft" v-model="bankAccountNo" name="bankAccountNo"
             :label="$t('joinpayMch.bankAccountLabel')" :placeholder="$t('joinpayMch.bankAccountPlaceholder')"
@@ -437,6 +463,25 @@ export default {
       time: 0
     });
 
+    const regNameVisible = ref(false);
+    const shortNameVisible = ref(false);
+    const popoverVisible = ref(false);
+
+    const showPopover = (value) => {
+      console.log(value);
+      switch (value) {
+        case 1:
+          regNameVisible.value = true;
+          break;
+        case 2:
+          shortNameVisible.value = true;
+          break;
+        case 3:
+          popoverVisible.value = true;
+          break;
+      }
+    }
+
     let addParams = reactive({
       adminId: user.id, // 当前登录账户的id Long 必填
       altMchName: '', // 分账方名称; string 必填
@@ -586,7 +631,6 @@ export default {
       huifuParams.areaId = areaValues[1]?.code || '';
       huifuParams.districtId = areaValues[2]?.code || '';
       huifuParams.detailAddr = addParams.manageAddr;
-      fieldUpdate();
     };
     const onConfirmBankAddress = (areaValues) => {
       showBankAddress.value = false;
@@ -596,7 +640,6 @@ export default {
         .join('');
       huifuParams.cardProvId = areaValues[0]?.code || '';
       huifuParams.cardAreaId = areaValues[1]?.code || '';
-      fieldUpdate();
     };
     const onConfirmReAddress = (areaValues) => {
       showReAddress.value = false;
@@ -608,7 +651,6 @@ export default {
       huifuParams.regAreaId = areaValues[1]?.code || '';
       huifuParams.regDistrictId = areaValues[2]?.code || '';
       huifuParams.regDetail = addParams.registeredAddress;
-      fieldUpdate();
     };
     onMounted(async () => {
       styleUrl('joinpayMch');
@@ -1199,6 +1241,10 @@ export default {
       huifuPicUpStatus,
       huifuMchID,
       joinPayMchID,
+      showPopover,
+      regNameVisible,
+      shortNameVisible,
+      popoverVisible
     };
   },
 };
@@ -1206,4 +1252,6 @@ export default {
 
 <style lang="less" scoped>
 @import "../../common/style/common.less";
+@import "../../styles/joinpayMch/index.less";
+
 </style>