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

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

Browse Source
master
yixian 4 years ago
parent 5b7bae6caf 46783b0a6d
commit 78a2d1468c
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File

2
pom.xml
Unescape View File

@ -9,7 +9,7 @@
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>manage</artifactId> <artifactId>manage</artifactId>
<version>2.3.77-SNAPSHOT</version> <version>2.3.77</version>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jib-maven-plugin.version>2.4.0</jib-maven-plugin.version> <jib-maven-plugin.version>2.4.0</jib-maven-plugin.version>

14
src/main/ui/static/payment/partner/templates/new_apply_wx_sub_merchant_id.html
Unescape View File

@ -43,10 +43,10 @@
<label class="control-label col-sm-3" for="merchant_storename_input">* Merchant Short Name</label> <label class="control-label col-sm-3" for="merchant_storename_input">* Merchant Short Name</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input class="form-control" ng-model="subMerchantInfo.short_name" <input class="form-control" ng-model="subMerchantInfo.short_name"
type="text" name="merchant_storename" id="merchant_storename_input" required maxlength="50"> type="text" name="merchant_storename" id="merchant_storename_input" required maxlength="20">
<div ng-messages="subForm.merchant_storename.$error" ng-if="subForm.merchant_storename.$dirty"> <div ng-messages="subForm.merchant_storename.$error" ng-if="subForm.merchant_storename.$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 50</p> <p class="small text-danger" ng-message="maxlength">Length is more than 20</p>
</div> </div>
</div> </div>
</div> </div>
@ -92,7 +92,7 @@
<label class="control-label col-sm-3" for="website_input">* Website</label> <label class="control-label col-sm-3" for="website_input">* Website</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input class="form-control" ng-model="subMerchantInfo.company_website" <input class="form-control" ng-model="subMerchantInfo.company_website"
type="url" name="company_website" id="website_input" required maxlength="128"> type="url" name="company_website" id="website_input" required maxlength="100">
<p class="small " >( Not required when business type is Offline scenario)</p> <p class="small " >( Not required when business type is Offline scenario)</p>
<div ng-messages="subForm.company_website.$error" ng-if="subForm.company_website.$dirty"> <div ng-messages="subForm.company_website.$error" ng-if="subForm.company_website.$dirty">
@ -122,10 +122,12 @@
ng-class="{'has-error':subForm.office_phone.$invalid && subForm.office_phone.$dirty}"> ng-class="{'has-error':subForm.office_phone.$invalid && subForm.office_phone.$dirty}">
<label class="control-label col-sm-3" for="office_phone_input">* Office Phone</label> <label class="control-label col-sm-3" for="office_phone_input">* Office Phone</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input class="form-control" ng-model="subMerchantInfo.company_phone" <input class="form-control" ng-model="subMerchantInfo.company_phone" maxlength="20"
type="tel" name="office_phone" id="office_phone_input" required> type="tel" name="office_phone" id="office_phone_input" required>
<div ng-messages="subForm.office_phone.$error" ng-if="subForm.office_phone.$dirty"> <div ng-messages="subForm.office_phone.$error" ng-if="subForm.office_phone.$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 20</p>
</div> </div>
</div> </div>
@ -162,10 +164,10 @@
<label class="control-label col-sm-3" for="contact_email_input">* Contact Email</label> <label class="control-label col-sm-3" for="contact_email_input">* Contact Email</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input class="form-control" ng-model="subMerchantInfo.contact_email" <input class="form-control" ng-model="subMerchantInfo.contact_email"
type="text" name="contact_email" id="contact_email_input" required maxlength="128"> type="text" name="contact_email" id="contact_email_input" required maxlength="50">
<div ng-messages="subForm.contact_email.$error" ng-if="subForm.contact_email.$dirty"> <div ng-messages="subForm.contact_email.$error" ng-if="subForm.contact_email.$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 50</p>
</div> </div>
</div> </div>
</div> </div>

6
src/main/ui/static/payment/partner/templates/update_apply_wx_sub_merchant_id.html
Unescape View File

@ -94,7 +94,7 @@
<label class="control-label col-sm-3" for="website_input">* Website</label> <label class="control-label col-sm-3" for="website_input">* Website</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input class="form-control" ng-model="subMerchantInfo.company_website" <input class="form-control" ng-model="subMerchantInfo.company_website"
type="url" name="website" id="website_input" required maxlength="128"> type="url" name="website" id="website_input" required maxlength="100">
<p class="small " >(Not required when business type is Offline scenario)</p> <p class="small " >(Not required when business type is Offline scenario)</p>
<div ng-messages="subForm.company_website.$error" ng-if="subForm.company_website.$dirty"> <div ng-messages="subForm.company_website.$error" ng-if="subForm.company_website.$dirty">
<p class="small text-danger" ng-message="required">Required Field</p> <p class="small text-danger" ng-message="required">Required Field</p>
@ -162,10 +162,10 @@
<label class="control-label col-sm-3" for="contact_email_input">* Contact Email</label> <label class="control-label col-sm-3" for="contact_email_input">* Contact Email</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input class="form-control" ng-model="subMerchantInfo.contact_email" <input class="form-control" ng-model="subMerchantInfo.contact_email"
type="text" name="contact_email" id="contact_email_input" required maxlength="128"> type="text" name="contact_email" id="contact_email_input" required maxlength="50">
<div ng-messages="subForm.contact_email.$error" ng-if="subForm.contact_email.$dirty"> <div ng-messages="subForm.contact_email.$error" ng-if="subForm.contact_email.$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 50</p>
</div> </div>
</div> </div>
</div> </div>

Write Preview
Loading…
Cancel
Save