From c08730fd60922568abacba07cc84eab4302a02d1 Mon Sep 17 00:00:00 2001
From: dalong306 <304592994@qq.com>
Date: Thu, 30 Sep 2021 15:37:57 +0800
Subject: [PATCH] =?UTF-8?q?=E8=82=A1=E4=B8=9C=20=E6=B3=95=E4=BA=BA=20id=20?=
 =?UTF-8?q?=E7=AD=89=E6=94=B9=E4=B8=BA=E9=9D=9E=E5=BF=85=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../partner/templates/add_partner.html        |   5 +-
 .../templates/add_sub_partner_dialog.html     |   3 +-
 .../apply_alipayplus_sub_merchant_id.html     | 117 +++++++++---------
 .../templates/client_partner_edit.html        |   3 +-
 .../partner/templates/partner_edit.html       |   7 +-
 5 files changed, 65 insertions(+), 70 deletions(-)

diff --git a/src/main/ui/static/payment/partner/templates/add_partner.html b/src/main/ui/static/payment/partner/templates/add_partner.html
index 5cf57baf3..c74cd5998 100644
--- a/src/main/ui/static/payment/partner/templates/add_partner.html
+++ b/src/main/ui/static/payment/partner/templates/add_partner.html
@@ -856,17 +856,14 @@
                             </div>
                             <div class="form-group"
                                  ng-class="{'has-error':partnerForm.legal_representative_id.$invalid && partnerForm.legal_representative_id.$dirty}">
-                                <label class="control-label col-sm-2" for="legal_representative_id-input">*
+                                <label class="control-label col-sm-2" for="legal_representative_id-input">
                                     Representative ID</label>
                                 <div class="col-sm-8">
                                     <input class="form-control" ng-model="partner.legal_representative_id"
-                                           required
                                            name="legal_representative_person"
                                            id="legal_representative_id-input" maxlength="50">
                                     <div ng-messages="partnerForm.legal_representative_id.$error"
                                          ng-if="partnerForm.legal_representative_id.$dirty">
-                                        <p class="small text-danger" ng-message="required">Required
-                                            Field</p>
                                         <p class="small text-danger" ng-message="maxlength">Less
                                             Than 50
                                             Characters(including symbols and spaces)</p>
diff --git a/src/main/ui/static/payment/partner/templates/add_sub_partner_dialog.html b/src/main/ui/static/payment/partner/templates/add_sub_partner_dialog.html
index 405caf8f2..350ef9e59 100644
--- a/src/main/ui/static/payment/partner/templates/add_sub_partner_dialog.html
+++ b/src/main/ui/static/payment/partner/templates/add_sub_partner_dialog.html
@@ -714,11 +714,10 @@
                                     </div>
                                     <div class="form-group"
                                          ng-class="{'has-error':partnerForm.legal_representative_id.$invalid && partnerForm.legal_representative_id.$dirty}">
-                                        <label class="control-label col-sm-2" for="legal_representative_id-input">*
+                                        <label class="control-label col-sm-2" for="legal_representative_id-input">
                                             Representative ID</label>
                                         <div class="col-sm-8">
                                             <input class="form-control" ng-model="partner.legal_representative_id"
-                                                   required
                                                    name="legal_representative_id"
                                                    id="legal_representative_id-input" maxlength="50">
                                             <div ng-messages="partnerForm.legal_representative_id.$error"
diff --git a/src/main/ui/static/payment/partner/templates/apply_alipayplus_sub_merchant_id.html b/src/main/ui/static/payment/partner/templates/apply_alipayplus_sub_merchant_id.html
index fa9312472..d02cb7eda 100644
--- a/src/main/ui/static/payment/partner/templates/apply_alipayplus_sub_merchant_id.html
+++ b/src/main/ui/static/payment/partner/templates/apply_alipayplus_sub_merchant_id.html
@@ -151,6 +151,57 @@
                                 </div>
                             </div>
 
+
+
+
+
+                            <!-- 店铺名称 -->
+                            <div class="form-group" ng-if="!subMerchantInfo.online"
+                                 ng-class="{'has-error':subForm.storeName.$invalid && subForm.storeName.$dirty}">
+                                <label class="control-label col-sm-4" for="storeName_input">* Store Name</label>
+                                <div class="col-sm-8">
+                                    <input class="form-control" ng-model="subMerchantInfo.storeName"
+                                           type="text" name="storeName" id="storeName_input" required maxlength="256">
+                                    <div ng-messages="subForm.storeName.$error" ng-if="subForm.storeName.$dirty">
+                                        <p class="small text-danger" ng-message="required">Required Field</p>
+                                        <p class="small text-danger" ng-message="maxlength">Length is more than 256</p>
+                                    </div>
+                                </div>
+                            </div>
+                            <!-- 店铺MCC -->
+                            <div class="form-group" ng-if="!subMerchantInfo.online"
+                                 ng-class="{'has-error':partnerForm.storeMCC.$invalid && partnerForm.storeMCC.$dirty}">
+                                <label class="control-label col-sm-4"
+                                       for="storeMCC">*Store MCC</label>
+                                <div class="col-sm-8" >
+                                    <input class="form-control" id="storeMCC" required
+                                           name="storeMCC" readonly
+                                           ng-model="subMerchantInfo.storeMCC|partner_alipay_industry"
+                                           multi-level-select-popup="alipayMccCategory"
+                                           on-select="onAlipayStoreMccSelect($selected)"
+                                           chose-one-level="false">
+                                    <div ng-messages="partnerForm.storeMCC.$error"
+                                         ng-if="partnerForm.storeMCC.$dirty">
+                                        <p class="small text-danger" ng-message="required">Required
+                                            Field</p>
+                                    </div>
+                                </div>
+
+                            </div>
+
+                            <!-- 商店地址-->
+                            <div class="form-group" ng-if="!subMerchantInfo.online"
+                                 ng-class="{'has-error':subForm.storeAddress.$invalid && subForm.storeAddress.$dirty}">
+                                <label class="control-label col-sm-4" for="storeAddress_input">* Store Address</label>
+                                <div class="col-sm-8">
+                                    <input class="form-control" ng-model="subMerchantInfo.storeAddress"
+                                           type="text" name="storeAddress" id="storeAddress_input" maxlength="256" required>
+                                    <div ng-messages="subForm.storeAddress.$error" ng-if="subForm.storeAddress.$dirty">
+                                        <p class="small text-danger" ng-message="required">Required Field</p>
+                                        <p class="small text-danger" ng-message="maxlength">Length is more than 256</p>
+                                    </div>
+                                </div>
+                            </div>
                             <div class="form-group"
                                  ng-class="{'has-error':subForm.businessType.$invalid && subForm.businessType.$dirty}">
                                 <label class="control-label col-sm-4"
@@ -171,10 +222,10 @@
                             <!--ng-if="subMerchantInfo.businessType == 'ENTERPRISE'"-->
                             <div class="form-group" ng-if="subMerchantInfo.businessType == 'ENTERPRISE'"
                                  ng-class="{'has-error':subForm.shareholderName.$invalid && subForm.shareholderName.$dirty}">
-                                <label class="control-label col-sm-4" for="shareholderName_input">* Shareholder Name</label>
+                                <label class="control-label col-sm-4" for="shareholderName_input">Shareholder Name</label>
                                 <div class="col-sm-8">
                                     <input class="form-control" ng-model="subMerchantInfo.shareholderName"
-                                           type="text" name="shareholderName" id="shareholderName_input" required maxlength="128">
+                                           type="text" name="shareholderName" id="shareholderName_input"  maxlength="128">
                                     <div ng-messages="subForm.shareholderName.$error" ng-if="subForm.shareholderName.$dirty">
                                         <p class="small text-danger" ng-message="required">Required Field</p>
                                         <p class="small text-danger" ng-message="maxlength">Length is more than 128</p>
@@ -183,10 +234,10 @@
                             </div>
                             <div class="form-group" ng-if="subMerchantInfo.businessType == 'ENTERPRISE'"
                                  ng-class="{'has-error':subForm.shareholderId.$invalid && subForm.shareholderId.$dirty}">
-                                <label class="control-label col-sm-4" for="shareholderId_input">* Shareholder Id</label>
+                                <label class="control-label col-sm-4" for="shareholderId_input">Shareholder Id</label>
                                 <div class="col-sm-8">
                                     <input class="form-control" ng-model="subMerchantInfo.shareholderId"
-                                           type="text" name="shareholderId" id="shareholderId_input" required maxlength="128">
+                                           type="text" name="shareholderId" id="shareholderId_input"  maxlength="128">
                                     <div ng-messages="subForm.shareholderId.$error" ng-if="subForm.shareholderId.$dirty">
                                         <p class="small text-danger" ng-message="required">Required Field</p>
                                         <p class="small text-danger" ng-message="maxlength">Length is more than 128</p>
@@ -195,10 +246,10 @@
                             </div>
                             <div class="form-group" ng-if="subMerchantInfo.businessType == 'INDIVIDUAL'"
                                  ng-class="{'has-error':subForm.representativeName.$invalid && subForm.representativeName.$dirty}">
-                                <label class="control-label col-sm-4" for="representativeName_input">* Representative Name</label>
+                                <label class="control-label col-sm-4" for="representativeName_input">Representative Name</label>
                                 <div class="col-sm-8">
                                     <input class="form-control" ng-model="subMerchantInfo.representativeName"
-                                           type="text" name="representativeName" id="representativeName_input" required maxlength="128">
+                                           type="text" name="representativeName" id="representativeName_input"  maxlength="128">
                                     <div ng-messages="subForm.representativeName.$error" ng-if="subForm.representativeName.$dirty">
                                         <p class="small text-danger" ng-message="required">Required Field</p>
                                         <p class="small text-danger" ng-message="maxlength">Length is more than 128</p>
@@ -207,10 +258,10 @@
                             </div>
                             <div class="form-group" ng-if="subMerchantInfo.businessType == 'INDIVIDUAL'"
                                  ng-class="{'has-error':subForm.representativeId.$invalid && subForm.representativeId.$dirty}">
-                                <label class="control-label col-sm-4" for="representativeId_input">* Representative Id</label>
+                                <label class="control-label col-sm-4" for="representativeId_input">Representative Id</label>
                                 <div class="col-sm-8">
                                     <input class="form-control" ng-model="subMerchantInfo.representativeId"
-                                           type="text" name="representativeId" id="representativeId_input" required maxlength="128">
+                                           type="text" name="representativeId" id="representativeId_input"  maxlength="128">
                                     <div ng-messages="subForm.representativeId.$error" ng-if="subForm.representativeId.$dirty">
                                         <p class="small text-danger" ng-message="required">Required Field</p>
                                         <p class="small text-danger" ng-message="maxlength">Length is more than 128</p>
@@ -219,56 +270,6 @@
                             </div>
 
 
-
-                            <!-- 店铺名称 -->
-                            <div class="form-group" ng-if="!subMerchantInfo.online"
-                                 ng-class="{'has-error':subForm.storeName.$invalid && subForm.storeName.$dirty}">
-                                <label class="control-label col-sm-4" for="storeName_input">* Store Name</label>
-                                <div class="col-sm-8">
-                                    <input class="form-control" ng-model="subMerchantInfo.storeName"
-                                           type="text" name="storeName" id="storeName_input" required maxlength="256">
-                                    <div ng-messages="subForm.storeName.$error" ng-if="subForm.storeName.$dirty">
-                                        <p class="small text-danger" ng-message="required">Required Field</p>
-                                        <p class="small text-danger" ng-message="maxlength">Length is more than 256</p>
-                                    </div>
-                                </div>
-                            </div>
-                            <!-- 店铺MCC -->
-                            <div class="form-group" ng-if="!subMerchantInfo.online"
-                                 ng-class="{'has-error':partnerForm.storeMCC.$invalid && partnerForm.storeMCC.$dirty}">
-                                <label class="control-label col-sm-4"
-                                       for="storeMCC">*Store MCC</label>
-                                <div class="col-sm-8" >
-                                    <input class="form-control" id="storeMCC" required
-                                           name="storeMCC" readonly
-                                           ng-model="subMerchantInfo.storeMCC|partner_alipay_industry"
-                                           multi-level-select-popup="alipayMccCategory"
-                                           on-select="onAlipayStoreMccSelect($selected)"
-                                           chose-one-level="false">
-                                    <div ng-messages="partnerForm.storeMCC.$error"
-                                         ng-if="partnerForm.storeMCC.$dirty">
-                                        <p class="small text-danger" ng-message="required">Required
-                                            Field</p>
-                                    </div>
-                                </div>
-
-                            </div>
-
-                            <!-- 商店地址-->
-                            <div class="form-group" ng-if="!subMerchantInfo.online"
-                                 ng-class="{'has-error':subForm.storeAddress.$invalid && subForm.storeAddress.$dirty}">
-                                <label class="control-label col-sm-4" for="storeAddress_input">* Store Address</label>
-                                <div class="col-sm-8">
-                                    <input class="form-control" ng-model="subMerchantInfo.storeAddress"
-                                           type="text" name="storeAddress" id="storeAddress_input" maxlength="256" required>
-                                    <div ng-messages="subForm.storeAddress.$error" ng-if="subForm.storeAddress.$dirty">
-                                        <p class="small text-danger" ng-message="required">Required Field</p>
-                                        <p class="small text-danger" ng-message="maxlength">Length is more than 256</p>
-                                    </div>
-                                </div>
-                            </div>
-
-
                         </div>
                     </div>
                 </div>
diff --git a/src/main/ui/static/payment/partner/templates/client_partner_edit.html b/src/main/ui/static/payment/partner/templates/client_partner_edit.html
index 1417c4255..d73ee76d3 100644
--- a/src/main/ui/static/payment/partner/templates/client_partner_edit.html
+++ b/src/main/ui/static/payment/partner/templates/client_partner_edit.html
@@ -460,11 +460,10 @@
                             </div>
                             <div class="form-group"
                                  ng-class="{'has-error':partnerForm.legal_representative_id.$invalid && partnerForm.legal_representative_id.$dirty}">
-                                <label class="control-label col-sm-2" for="legal_representative_id-input">*
+                                <label class="control-label col-sm-2" for="legal_representative_id-input">
                                     Representative ID</label>
                                 <div class="col-sm-8">
                                     <input class="form-control" ng-model="partner.legal_representative_id"
-                                           required
                                            name="legal_representative_id"
                                            id="legal_representative_id-input" maxlength="50">
                                     <div ng-messages="partnerForm.legal_representative_id.$error"
diff --git a/src/main/ui/static/payment/partner/templates/partner_edit.html b/src/main/ui/static/payment/partner/templates/partner_edit.html
index 1f14b0c1f..8a1f1e890 100644
--- a/src/main/ui/static/payment/partner/templates/partner_edit.html
+++ b/src/main/ui/static/payment/partner/templates/partner_edit.html
@@ -797,19 +797,18 @@
                             </div>
                             <div class="form-group"
                                  ng-class="{'has-error':partnerForm.legal_representative_id.$invalid && partnerForm.legal_representative_id.$dirty}">
-                                <label class="control-label col-sm-2" for="legal_representative_id-input">*
+                                <label class="control-label col-sm-2" for="legal_representative_id-input">
                                     Representative ID</label>
                                 <div class="col-sm-8">
                                     <div >
                                     <input class="form-control" ng-model="partner.legal_representative_id"
-                                           required
+
                                            name="legal_representative_id"
                                            id="legal_representative_id-input" maxlength="50">
                                     </div>
                                     <div ng-messages="partnerForm.legal_representative_id.$error"
                                          ng-if="partnerForm.legal_representative_id.$dirty">
-                                        <p class="small text-danger" ng-message="required">Required
-                                            Field</p>
+
                                         <p class="small text-danger" ng-message="maxlength">Less
                                             Than 50
                                             </p>