From da31e3091db515fae93f0788617bdc0c760e3b6b Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Sat, 18 Jun 2022 23:31:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96diamante?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/property/addSmallWeChat/addSmallWeChat.html  | 6 ++++++
 public/components/property/addSmallWeChat/addSmallWeChat.js | 2 ++
 .../property/editSmallWeChat/editSmallWeChat.html           | 6 ++++++
 .../components/property/editSmallWeChat/editSmallWeChat.js  | 2 ++
 .../property/publicWeChatManage/publicWeChatManage.html     | 2 ++
 5 files changed, 18 insertions(+)

diff --git a/public/components/property/addSmallWeChat/addSmallWeChat.html b/public/components/property/addSmallWeChat/addSmallWeChat.html
index ed3bb7a40..278284e8a 100755
--- a/public/components/property/addSmallWeChat/addSmallWeChat.html
+++ b/public/components/property/addSmallWeChat/addSmallWeChat.html
@@ -39,6 +39,12 @@
                                     <input v-model="addSmallWeChatInfo.mchId" type="text" :placeholder="vc.i18n('必填，请填写商户ID','addSmallWeChat')" class="form-control">
                                 </div>
                             </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label"><span><vc:i18n name="商户名称" namespace="addSmallWeChat"></vc:i18n></span></label>
+                                <div class="col-sm-10">
+                                    <input v-model="addSmallWeChatInfo.mchName" type="text" :placeholder="vc.i18n('必填，请填写商户名称','addSmallWeChat')" class="form-control">
+                                </div>
+                            </div>
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label"><span><vc:i18n name="商户证书" namespace="addSmallWeChat"></vc:i18n></span></label>
                                 <div class="col-sm-10">
diff --git a/public/components/property/addSmallWeChat/addSmallWeChat.js b/public/components/property/addSmallWeChat/addSmallWeChat.js
index 7d9c18a30..e375927af 100755
--- a/public/components/property/addSmallWeChat/addSmallWeChat.js
+++ b/public/components/property/addSmallWeChat/addSmallWeChat.js
@@ -15,6 +15,7 @@
                 objType: '1000',
                 objId: '',
                 mchId: '',
+                mchName:'',
                 remarks: '',
                 objTypes: '',
                 types: '',
@@ -150,6 +151,7 @@
                     objType: '',
                     objId: '',
                     mchId: '',
+                    mchName:'',
                     weChatType: '',
                     types: vc.component.addSmallWeChatInfo.types,
                     remarks: '',
diff --git a/public/components/property/editSmallWeChat/editSmallWeChat.html b/public/components/property/editSmallWeChat/editSmallWeChat.html
index a2bf92d89..e68321310 100755
--- a/public/components/property/editSmallWeChat/editSmallWeChat.html
+++ b/public/components/property/editSmallWeChat/editSmallWeChat.html
@@ -39,6 +39,12 @@
                                     <input v-model="editSmallWeChatInfo.mchId" type="text" :placeholder="vc.i18n('必填，请填写商户ID','editSmallWeChat')" class="form-control">
                                 </div>
                             </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label"><span><vc:i18n name="商户名称" namespace="editSmallWeChat"></vc:i18n></span></label>
+                                <div class="col-sm-10">
+                                    <input v-model="editSmallWeChatInfo.mchName" type="text" :placeholder="vc.i18n('必填，请填写商户名称','editSmallWeChat')" class="form-control">
+                                </div>
+                            </div>
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label"><span><vc:i18n name="商户证书" namespace="editSmallWeChat"></vc:i18n></span></label>
                                 <div class="col-sm-10">
diff --git a/public/components/property/editSmallWeChat/editSmallWeChat.js b/public/components/property/editSmallWeChat/editSmallWeChat.js
index 76acb23b7..c59201609 100755
--- a/public/components/property/editSmallWeChat/editSmallWeChat.js
+++ b/public/components/property/editSmallWeChat/editSmallWeChat.js
@@ -13,6 +13,7 @@
                 objType: '',
                 objId: '',
                 mchId: '',
+                mchName:'',
                 remarks: '',
                 objTypes: '1000',
                 certPath: ''
@@ -145,6 +146,7 @@
                     objType: '',
                     objId: '',
                     mchId: '',
+                    mchName:'',
                     remarks: '',
                     objTypes: '1000',
                     certPath: ''
diff --git a/public/pages/property/publicWeChatManage/publicWeChatManage.html b/public/pages/property/publicWeChatManage/publicWeChatManage.html
index 242288a46..9359a9af6 100755
--- a/public/pages/property/publicWeChatManage/publicWeChatManage.html
+++ b/public/pages/property/publicWeChatManage/publicWeChatManage.html
@@ -22,6 +22,7 @@
                             <th class="text-center"><span><vc:i18n name="应用密钥" namespace="publicWeChatManage"></vc:i18n></span></th>
                             <th class="text-center"><span><vc:i18n name="支付密码" namespace="publicWeChatManage"></vc:i18n></span></th>
                             <th class="text-center"><span><vc:i18n name="商户" namespace="publicWeChatManage"></vc:i18n></span>ID</th>
+                            <th class="text-center"><span><vc:i18n name="商户名称" namespace="publicWeChatManage"></vc:i18n></span></th>
                             <th class="text-center"><span><vc:i18n name="描述" namespace="publicWeChatManage"></vc:i18n></span></th>
                             <th class="text-right"><span><vc:i18n name="操作" namespace="publicWeChatManage"></vc:i18n></span></th>
                         </tr>
@@ -33,6 +34,7 @@
                             <td class="text-center">********</td>
                             <td class="text-center">**********</td>
                             <td class="text-center">{{smallWeChat.mchId}}</td>
+                            <td class="text-center">{{smallWeChat.mchName}}</td>
                             <td class="text-center">{{smallWeChat.remarks}}</td>
                             <td class="text-right">
                                 <div class="btn-group">