From befff9a050091ccf61dda099cba968202da1542c Mon Sep 17 00:00:00 2001
From: mo-bai <1873032855@qq.com>
Date: Fri, 15 Apr 2022 11:45:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E6=88=B7=E8=A1=8C=E7=BC=96=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/merchant-list/index.vue    |  2 +-
 pages/merchant-setting/index.vue | 51 +++++++++++++++++++++-----------
 utils/index.js                   |  9 +++++-
 3 files changed, 43 insertions(+), 19 deletions(-)

diff --git a/pages/merchant-list/index.vue b/pages/merchant-list/index.vue
index 3fcac85..eaa80d2 100644
--- a/pages/merchant-list/index.vue
+++ b/pages/merchant-list/index.vue
@@ -5,7 +5,7 @@
       <view class="flex-col section_1">
         <view class="flex-row group_4 justify-between">
           <view class="flex-row">
-            <text class="text_4">广西印刷有限公司</text>
+            <text class="text_4">{{ merchant.name }}</text>
             <image v-if="showIcon(merchant.applymentState).img" :src="showIcon(merchant.applymentState).img" class="image_4" />
           </view>
           <view v-if="showIcon(merchant.applymentState).text" class="button" @click="checkInfo(merchant)">{{ showIcon(merchant.applymentState).text }}</view>
diff --git a/pages/merchant-setting/index.vue b/pages/merchant-setting/index.vue
index 9391319..055151e 100644
--- a/pages/merchant-setting/index.vue
+++ b/pages/merchant-setting/index.vue
@@ -7,7 +7,7 @@
     </view>
     <qn-form-item label="商户信息" type="title"></qn-form-item>
     <qn-form-item label="商户名称">
-      <text>{{ form.name }}</text>
+      <text class="text">{{ form.name }}</text>
     </qn-form-item>
     <qn-form-item label="商户类型" required>
       <qn-select
@@ -18,7 +18,7 @@
       ></qn-select>
     </qn-form-item>
     <qn-form-item label="客服电话" required>
-      <qn-easyinput :maxlength="11" v-model="form.servicePhone" :inputBorder="false" text="right" placeholder="请输入客服电话"></qn-easyinput>
+      <qn-easyinput type="number" :maxlength="11" v-model="form.servicePhone" :inputBorder="false" text="right" placeholder="请输入客服电话"></qn-easyinput>
     </qn-form-item>
     <qn-form-item label="联系邮箱" required>
       <qn-easyinput :maxlength="25" v-model="form.contactEmail" :inputBorder="false" text="right" placeholder="请输入联系邮箱"></qn-easyinput>
@@ -30,26 +30,32 @@
     </qn-form-item>
     <qn-form-item label="结算账户" type="title"></qn-form-item>
     <qn-form-item label="账户类型">
-      <text>{{ accountTypeName }}</text>
+      <text class="text">{{ accountTypeName }}</text>
     </qn-form-item>
     <qn-form-item label="账户名">
-      <text>{{ form.accountName }}</text>
+      <text class="text">{{ form.accountName }}</text>
     </qn-form-item>
     <qn-form-item label="账户号码">
-      <text>{{ form.accountNumber }}</text>
+      <text class="text">{{ form.accountNumber }}</text>
     </qn-form-item>
     <qn-form-item label="开户行">
-      <text>{{ form.accountBank }}</text>
+      <text class="text">{{ form.accountBank }}</text>
+    </qn-form-item>
+    <qn-form-item label="开户行所属市编码" required>
+      <qn-easyinput type="number" v-model="form.bankAddressCode" :inputBorder="false" text="right" placeholder="请输入开户行所属市编码"></qn-easyinput>
+    </qn-form-item>
+    <qn-form-item label="开户行联行号" required>
+      <qn-easyinput type="number" v-model="form.bankBranchId" :inputBorder="false" text="right" placeholder="请输入开户行联行号"></qn-easyinput>
     </qn-form-item>
     <qn-form-item label="法人信息" type="title"></qn-form-item>
     <qn-form-item label="法人姓名">
-      <text>{{ form.contactName }}</text>
+      <text class="text">{{ form.contactName }}</text>
     </qn-form-item>
     <qn-form-item label="法人身份证号">
-      <text>{{ form.contactIdNumber }}</text>
+      <text class="text">{{ form.contactIdNumber }}</text>
     </qn-form-item>
     <qn-form-item label="法人手机号">
-      <text>{{ form.mobilePhone }}</text>
+      <text class="text">{{ form.mobilePhone }}</text>
     </qn-form-item>
     <qn-footer fixed height="120rpx">
       <view class="button-area">
@@ -92,15 +98,15 @@ const accountFields = [
   {
     label: '银行账号',
     key: 'accountNumber'
-  },
-  {
-    label: '开户银行省市编码',
-    key: 'bankAddressCode'
-  },
-  {
-    label: '开户银行联行号',
-    key: 'bankBranchId'
   }
+  // {
+  //   label: '开户银行省市编码',
+  //   key: 'bankAddressCode'
+  // },
+  // {
+  //   label: '开户银行联行号',
+  //   key: 'bankBranchId'
+  // }
 ]
 
 const validateFields = [
@@ -114,6 +120,14 @@ const validateFields = [
       { required: true, message: '请输入客服电话' },
       { type: 'phone', message: '请输入正确的手机号' }
     ]
+  },
+  {
+    name: 'bankAddressCode',
+    rules: [{ required: true, message: '请输入开户行所属市编码' }]
+  },
+  {
+    name: 'bankBranchId',
+    rules: [{ required: true, message: '请输入开户行联行号' }]
   }
 ]
 export default {
@@ -244,6 +258,9 @@ export default {
     height: 120rpx;
     border: 1px solid #f7f8fa;
   }
+  .text {
+    font-size: 28rpx;
+  }
 }
 .section_1 {
   width: 750rpx;
diff --git a/utils/index.js b/utils/index.js
index 049c92b..f5b35fe 100644
--- a/utils/index.js
+++ b/utils/index.js
@@ -313,7 +313,7 @@ export const validateField = (value, rules) => {
   let msg = ''
   for (let rule of rules) {
     if (rule.required) {
-      if (value === '' || value === undefined || value === null) {
+      if (value === undefined || value === null) {
         isValid = false
         msg = rule.message
         break
@@ -323,6 +323,13 @@ export const validateField = (value, rules) => {
         msg = rule.message
         break
       }
+      if (isString(value)) {
+        if (value.trim() === '') {
+          isValid = false
+          msg = rule.message
+          break
+        }
+      }
     }
     if (rule.type === 'phone' && value !== '' && !/^1[3456789]\d{9}$/.test(value)) {
       isValid = false