From 49f790fd21058f0ce74d6abca1f9aba6933ba34e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E6=AF=85?= <1335909236@qq.com>
Date: Fri, 12 Dec 2025 15:25:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E6=88=B7=E8=BF=9B=E4=BB=B6=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E8=B4=B9=E7=8E=87=E7=9B=B8=E5=85=B3=E5=B1=9E=E6=80=A7?=
 =?UTF-8?q?=20=20=E4=BF=AE=E6=94=B9=E8=AF=81=E4=BB=B6=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E4=BC=A0=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/customerService/addMer/index.vue | 78 +++++++++++++++++------
 1 file changed, 59 insertions(+), 19 deletions(-)

diff --git a/packages/customerService/addMer/index.vue b/packages/customerService/addMer/index.vue
index 376e5613..bffa15ba 100644
--- a/packages/customerService/addMer/index.vue
+++ b/packages/customerService/addMer/index.vue
@@ -3,11 +3,11 @@
         <form class="acceptor-form" @submit.prevent="submitForm">
             <!-- 基本信息 -->
             <view class="form-section">
-                <view class="form-item">
+                <!-- <view class="form-item">
                     <label class="form-label required">商户ID</label>
                     <input type="number" class="form-input" v-model.number="formData.mch_id" placeholder="请输入商户ID"
                         required>
-                </view>
+                </view> -->
 
                 <view class="form-item">
                     <label class="form-label required">商户注册名称</label>
@@ -17,22 +17,20 @@
 
                 <view class="form-item">
                     <label class="form-label required">商户地区代码</label>
-                    <view class="popup-select" @click="showAreaPopup = true">
-                        <span>{{ selectedAreaLabel || '请选择商户地区代码' }}</span>
-                    </view>
+                    <input type="text" class="form-input" v-model="formData.merRegDistCode"
+                        placeholder="请输入商户地区代码" required>
                 </view>
 
                 <view class="form-item">
                     <label class="form-label required">商户详细地址</label>
                     <input type="text" class="form-input" v-model="formData.merRegAddr"
-                        placeholder="请输入去除省、市、区后的详细地址，6-200字符" required>
+                        placeholder="请输入去除省、市、区后的详细地址" required>
                 </view>
 
                 <view class="form-item">
                     <label class="form-label required">商户MCC编号</label>
-                    <view class="popup-select" @click="showMccPopup = true">
-                        <span>{{ selectedMccLabel || '请选择商户MCC编号' }}</span>
-                    </view>
+                    <input type="text" class="form-input" v-model="formData.mccCode"
+                        placeholder="请输入商户MCC编号" required>
                 </view>
 
                 <view class="form-item">
@@ -58,9 +56,8 @@
 
                 <view class="form-item">
                     <label class="form-label required">商户经营内容</label>
-                    <view class="popup-select" @click="showBusiContentPopup = true">
-                        <span>{{ selectedBusiContentLabel || '请选择商户经营内容' }}</span>
-                    </view>
+                    <input type="text" class="form-input" v-model="formData.merBusiContent"
+                        placeholder="请输入商户经营内容" required>
                 </view>
             </view>
 
@@ -148,6 +145,22 @@
                         <span>{{ selectedAcctTypeLabel || '请选择结算账户性质' }}</span>
                     </view>
                 </view>
+
+                <!-- 费率信息 -->
+                <view class="form-item">
+                    <label class="form-label required">费率类型</label>
+                    <input type="text" class="form-input" v-model="formData.feeData[0].feeRateTypeCode" placeholder="请输入费率类型" required>
+                </view>
+
+                <view class="form-item">
+                    <label class="form-label required">费率类型名称</label>
+                    <input type="text" class="form-input" v-model="formData.feeData[0].feeRateTypeName" placeholder="请输入费率类型名称" required>
+                </view>
+
+                <view class="form-item">
+                    <label class="form-label required">手续费率(%)</label>
+                    <input type="number" class="form-input" v-model="formData.feeData[0].feeRatePct" placeholder="请输入手续费率" step="0.01" required>
+                </view>
             </view>
 
             <!-- 附件上传 -->
@@ -283,7 +296,7 @@ export default {
         return {
             // 表单数据
             formData: {
-                mch_id: null, // 商户ID
+                mch_id: '000', // 商户ID
                 merRegName: '', // 商户注册名称
                 merRegDistCode: '', // 商户地区代码
                 merRegAddr: '', // 商户详细地址
@@ -306,7 +319,13 @@ export default {
                 acctNo: '', // 结算账户账号
                 acctName: '', // 结算账户名称
                 acctTypeCode: '', // 结算账户性质
-                feeData: [], // 费率数据（可选）
+                feeData: [
+                    {
+                        feeRateTypeCode: "",
+                        feeRateTypeName: "",
+                        feeRatePct: ""
+                    }
+                ], // 费率数据
                 fileData: [
                     {
                         attType: '',
@@ -354,10 +373,15 @@ export default {
             ],
 
             idTypeOptions: [
-                { value: 'IDCARD', label: '身份证' },
-                { value: 'PASSPORT', label: '护照' },
-                { value: 'MILITARY_ID', label: '军人证' },
-                { value: 'OTHER', label: '其他' }
+                { value: '01', label: '身份证' },
+                { value: '02', label: '护照' },
+                { value: '03', label: '港澳通行证' },
+                { value: '04', label: '台胞证' },
+                { value: '10', label: '外国人永久居留身份证' },
+                { value: '11', label: '港澳居民居住证' },
+                { value: '12', label: '台湾居民居住证' },
+                { value: '13', label: '执行事务合伙人' },
+                { value: '99', label: '其它证件' },
             ],
 
             acctTypeOptions: [
@@ -632,6 +656,22 @@ export default {
                 uni.showToast({ title: '请选择结算账户性质', icon: 'none' });
                 return false;
             }
+            
+            // 校验费率信息
+            if (!formData.feeData[0].feeRateTypeCode) {
+                uni.showToast({ title: '请输入费率类型', icon: 'none' });
+                return false;
+            }
+            
+            if (!formData.feeData[0].feeRateTypeName) {
+                uni.showToast({ title: '请输入费率类型名称', icon: 'none' });
+                return false;
+            }
+            
+            if (!formData.feeData[0].feeRatePct) {
+                uni.showToast({ title: '请输入手续费率', icon: 'none' });
+                return false;
+            }
 
             return true;
         },
@@ -707,7 +747,7 @@ export default {
                 acctNo: this.formData.acctNo,
                 acctName: this.formData.acctName,
                 acctTypeCode: this.formData.acctTypeCode,
-                feeData: [],
+                feeData: this.formData.feeData,
                 fileData: []
             };