msb_52843
/
dalong_mall
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/alipayplus_aps' into alipayplus_aps

Browse Source
master
yixian 3 years ago
parent 259ae73c98 50da3e565f
commit 2127309ed3
5 changed files with 65 additions and 70 deletions
Show Stats Download Patch File Download Diff File

5
src/main/ui/static/payment/partner/templates/add_partner.html
Unescape View File

@ -856,17 +856,14 @@
</div> </div>
<div class="form-group" <div class="form-group"
ng-class="{'has-error':partnerForm.legal_representative_id.$invalid && partnerForm.legal_representative_id.$dirty}"> 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> Representative ID</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input class="form-control" ng-model="partner.legal_representative_id" <input class="form-control" ng-model="partner.legal_representative_id"
required
name="legal_representative_person" name="legal_representative_person"
id="legal_representative_id-input" maxlength="50"> id="legal_representative_id-input" maxlength="50">
<div ng-messages="partnerForm.legal_representative_id.$error" <div ng-messages="partnerForm.legal_representative_id.$error"
ng-if="partnerForm.legal_representative_id.$dirty"> 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 <p class="small text-danger" ng-message="maxlength">Less
Than 50 Than 50
Characters(including symbols and spaces)</p> Characters(including symbols and spaces)</p>

3
src/main/ui/static/payment/partner/templates/add_sub_partner_dialog.html
Unescape View File

@ -714,11 +714,10 @@
</div> </div>
<div class="form-group" <div class="form-group"
ng-class="{'has-error':partnerForm.legal_representative_id.$invalid && partnerForm.legal_representative_id.$dirty}"> 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> Representative ID</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input class="form-control" ng-model="partner.legal_representative_id" <input class="form-control" ng-model="partner.legal_representative_id"
required
name="legal_representative_id" name="legal_representative_id"
id="legal_representative_id-input" maxlength="50"> id="legal_representative_id-input" maxlength="50">
<div ng-messages="partnerForm.legal_representative_id.$error" <div ng-messages="partnerForm.legal_representative_id.$error"

117
src/main/ui/static/payment/partner/templates/apply_alipayplus_sub_merchant_id.html
Unescape View File

@ -151,6 +151,57 @@
</div> </div>
</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" <div class="form-group"
ng-class="{'has-error':subForm.businessType.$invalid && subForm.businessType.$dirty}"> ng-class="{'has-error':subForm.businessType.$invalid && subForm.businessType.$dirty}">
<label class="control-label col-sm-4" <label class="control-label col-sm-4"
@ -171,10 +222,10 @@
<!--ng-if="subMerchantInfo.businessType == 'ENTERPRISE'"--> <!--ng-if="subMerchantInfo.businessType == 'ENTERPRISE'"-->
<div class="form-group" ng-if="subMerchantInfo.businessType == 'ENTERPRISE'" <div class="form-group" ng-if="subMerchantInfo.businessType == 'ENTERPRISE'"
ng-class="{'has-error':subForm.shareholderName.$invalid && subForm.shareholderName.$dirty}"> 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"> <div class="col-sm-8">
<input class="form-control" ng-model="subMerchantInfo.shareholderName" <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"> <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="required">Required Field</p>
<p class="small text-danger" ng-message="maxlength">Length is more than 128</p> <p class="small text-danger" ng-message="maxlength">Length is more than 128</p>
@ -183,10 +234,10 @@
</div> </div>
<div class="form-group" ng-if="subMerchantInfo.businessType == 'ENTERPRISE'" <div class="form-group" ng-if="subMerchantInfo.businessType == 'ENTERPRISE'"
ng-class="{'has-error':subForm.shareholderId.$invalid && subForm.shareholderId.$dirty}"> 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"> <div class="col-sm-8">
<input class="form-control" ng-model="subMerchantInfo.shareholderId" <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"> <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="required">Required Field</p>
<p class="small text-danger" ng-message="maxlength">Length is more than 128</p> <p class="small text-danger" ng-message="maxlength">Length is more than 128</p>
@ -195,10 +246,10 @@
</div> </div>
<div class="form-group" ng-if="subMerchantInfo.businessType == 'INDIVIDUAL'" <div class="form-group" ng-if="subMerchantInfo.businessType == 'INDIVIDUAL'"
ng-class="{'has-error':subForm.representativeName.$invalid && subForm.representativeName.$dirty}"> 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"> <div class="col-sm-8">
<input class="form-control" ng-model="subMerchantInfo.representativeName" <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"> <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="required">Required Field</p>
<p class="small text-danger" ng-message="maxlength">Length is more than 128</p> <p class="small text-danger" ng-message="maxlength">Length is more than 128</p>
@ -207,10 +258,10 @@
</div> </div>
<div class="form-group" ng-if="subMerchantInfo.businessType == 'INDIVIDUAL'" <div class="form-group" ng-if="subMerchantInfo.businessType == 'INDIVIDUAL'"
ng-class="{'has-error':subForm.representativeId.$invalid && subForm.representativeId.$dirty}"> 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"> <div class="col-sm-8">
<input class="form-control" ng-model="subMerchantInfo.representativeId" <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"> <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="required">Required Field</p>
<p class="small text-danger" ng-message="maxlength">Length is more than 128</p> <p class="small text-danger" ng-message="maxlength">Length is more than 128</p>
@ -219,56 +270,6 @@
</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> </div>
</div> </div>
</div> </div>

3
src/main/ui/static/payment/partner/templates/client_partner_edit.html
Unescape View File

@ -460,11 +460,10 @@
</div> </div>
<div class="form-group" <div class="form-group"
ng-class="{'has-error':partnerForm.legal_representative_id.$invalid && partnerForm.legal_representative_id.$dirty}"> 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> Representative ID</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input class="form-control" ng-model="partner.legal_representative_id" <input class="form-control" ng-model="partner.legal_representative_id"
required
name="legal_representative_id" name="legal_representative_id"
id="legal_representative_id-input" maxlength="50"> id="legal_representative_id-input" maxlength="50">
<div ng-messages="partnerForm.legal_representative_id.$error" <div ng-messages="partnerForm.legal_representative_id.$error"

7
src/main/ui/static/payment/partner/templates/partner_edit.html
Unescape View File

@ -797,19 +797,18 @@
</div> </div>
<div class="form-group" <div class="form-group"
ng-class="{'has-error':partnerForm.legal_representative_id.$invalid && partnerForm.legal_representative_id.$dirty}"> 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> Representative ID</label>
<div class="col-sm-8"> <div class="col-sm-8">
<div > <div >
<input class="form-control" ng-model="partner.legal_representative_id" <input class="form-control" ng-model="partner.legal_representative_id"
required
name="legal_representative_id" name="legal_representative_id"
id="legal_representative_id-input" maxlength="50"> id="legal_representative_id-input" maxlength="50">
</div> </div>
<div ng-messages="partnerForm.legal_representative_id.$error" <div ng-messages="partnerForm.legal_representative_id.$error"
ng-if="partnerForm.legal_representative_id.$dirty"> 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 <p class="small text-danger" ng-message="maxlength">Less
Than 50 Than 50
</p> </p>

Write Preview
Loading…
Cancel
Save