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

fix html

Browse Source
master
yuan 7 years ago
parent ae88cf1a10
commit 3c79262ccd
6 changed files with 179 additions and 5 deletions
Show Stats Download Patch File Download Diff File

7
src/db/modify.sql
Unescape View File

@ -394,3 +394,10 @@ CREATE TABLE `cli_sub_merchant_id` (
`create_time` datetime DEFAULT NULL, `create_time` datetime DEFAULT NULL,
PRIMARY KEY (`sub_merchant_id`) PRIMARY KEY (`sub_merchant_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
ALTER TABLE `sys_clients` ADD COLUMN `business_hours` varchar(100) DEFAULT '';
ALTER TABLE `sys_clients` ADD COLUMN `merchant_introduction` varchar(500) DEFAULT '';
ALTER TABLE `sys_clients` ADD COLUMN `merchant_tag` varchar(100) DEFAULT '';
ALTER TABLE `sys_clients` ADD COLUMN `merchant_video_url` varchar(200) DEFAULT '';

37
src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientRegisterInfo.java
Unescape View File

@ -69,6 +69,11 @@ public class ClientRegisterInfo {
private String client_apply_id; private String client_apply_id;
private String business_hours;
private String merchant_introduction;
private String merchant_tag;
private String merchant_video_url;
public JSONObject insertObject() { public JSONObject insertObject() {
JSONObject res = (JSONObject) JSON.toJSON(this); JSONObject res = (JSONObject) JSON.toJSON(this);
if (client_apply_id==null){ if (client_apply_id==null){
@ -330,4 +335,36 @@ public class ClientRegisterInfo {
public void setRoyalpayindustry(String royalpayindustry) { public void setRoyalpayindustry(String royalpayindustry) {
this.royalpayindustry = royalpayindustry; this.royalpayindustry = royalpayindustry;
} }
public String getBusiness_hours() {
return business_hours;
}
public void setBusiness_hours(String business_hours) {
this.business_hours = business_hours;
}
public String getMerchant_introduction() {
return merchant_introduction;
}
public void setMerchant_introduction(String merchant_introduction) {
this.merchant_introduction = merchant_introduction;
}
public String getMerchant_tag() {
return merchant_tag;
}
public void setMerchant_tag(String merchant_tag) {
this.merchant_tag = merchant_tag;
}
public String getMerchant_video_url() {
return merchant_video_url;
}
public void setMerchant_video_url(String merchant_video_url) {
this.merchant_video_url = merchant_video_url;
}
} }

25
src/main/ui/static/payment/merchantid/templates/client_sub_merchant_id.html
Unescape View File

@ -1,11 +1,26 @@
<div class="modal-header"> <style>
<h4>Clients</h4> .padding-size{
padding-top: 5px;
padding-right: 5px;
padding-bottom: 5px;
padding-left: 15px;
}
.padding-top-size{
padding-top: 10px;
}
</style>
<div class="modal-header padding-size">
<h5>Clients</h5>
</div> </div>
<div class="modal-body"> <div class="modal-body" padding-top-size>
<div> <div>
<a ng-repeat="client in clients" <a ng-repeat="client in clients track by $index" ng-show="$index<clients.length-1"
ui-sref="partners.detail({clientMoniker:client.client_moniker})"> ui-sref="partners.detail({clientMoniker:client.client_moniker})">
{{client.client_moniker}}, {{client.client_moniker}}<span class="text-black">,</span>&nbsp;
</a>
<a ng-repeat="client in clients" ng-if="$last"
ui-sref="partners.detail({clientMoniker:client.client_moniker})">
{{client.client_moniker}}
</a> </a>
</div> </div>
</div> </div>

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

@ -371,6 +371,42 @@
</div> </div>
</div> </div>
<!--end 商户基本资料--> <!--end 商户基本资料-->
<div class="panel panel-default">
<div class="panel-heading">Alipay Information</div>
<div class="panel-body">
<div class="form-horizontal">
<div class="form-group">
<label class="control-label col-sm-2">
Business Hours</label>
<div class="col-sm-8">
<input type="text" class="form-control" ng-model="partner.business_hours">
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-2">
Merchant Introduction</label>
<div class="col-sm-8">
<input type="text" class="form-control" ng-model="partner.merchant_introduction">
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-2">
Merchant Tag</label>
<div class="col-sm-8">
<input type="text" class="form-control" ng-model="partner.merchant_tag">
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-2">
Merchant Introduction<br><em class="small">(Video connection)</em></label>
<div class="col-sm-8">
<input type="url" class="form-control" ng-model="partner.merchant_video_url">
</div>
</div>
</div>
</div>
</div>
<!--支付宝资料-->
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading">Contact Information</div> <div class="panel-heading">Contact Information</div>
<div class="panel-body"> <div class="panel-body">

36
src/main/ui/static/payment/partner/templates/partner_detail.html
Unescape View File

@ -452,6 +452,42 @@
</div> </div>
</div> </div>
<!--end 商户基本资料--> <!--end 商户基本资料-->
<!--支付宝资料-->
<div class="panel panel-default">
<div class="panel-heading">Alipay Information</div>
<div class="panel-body">
<div class="form-horizontal">
<div class="form-group">
<label class="control-label col-sm-2">
Business Hours</label>
<div class="col-sm-8">
<p class="form-control-static" ng-bind="partner.business_hours"></p>
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-2">
Merchant Introduction</label>
<div class="col-sm-8">
<p class="form-control-static" ng-bind="partner.merchant_introduction"></p>
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-2">
Merchant Tag</label>
<div class="col-sm-8">
<p class="form-control-static" ng-bind="partner.merchant_tag"></p>
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-2">
Merchant Introduction<br><em class="small">(Video connection)</em></label>
<div class="col-sm-8">
<p class="form-control-static" ng-bind="partner.merchant_video_url"></p>
</div>
</div>
</div>
</div>
</div>
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading">Partner Contact Information</div> <div class="panel-heading">Partner Contact Information</div>
<div class="panel-body"> <div class="panel-body">

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

@ -263,6 +263,48 @@
</div> </div>
</div> </div>
<!--end 商户基本资料--> <!--end 商户基本资料-->
<div class="panel panel-default">
<div class="panel-heading">Alipay Information</div>
<div class="panel-body">
<div class="form-horizontal">
<div class="form-group">
<label class="control-label col-sm-2">
Business Hours</label>
<div class="col-sm-8">
<input type="text" class="form-control" ng-model="partner.business_hours"
name="business_hours">
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-2">
Merchant Introduction</label>
<div class="col-sm-8">
<input type="text" class="form-control" ng-model="partner.merchant_introduction"
name="merchant_introduction">
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-2">
Merchant Tag</label>
<div class="col-sm-8">
<input type="text" class="form-control" ng-model="partner.merchant_tag"
name="merchant_tag"
>
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-2">
Merchant Introduction<br><em class="small">(Video connection)</em></label>
<div class="col-sm-8">
<input type="url" class="form-control" ng-model="partner.merchant_video_url"
name="merchant_video_url"
>
</div>
</div>
</div>
</div>
</div>
<!--支付宝资料-->
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading">Contact Information</div> <div class="panel-heading">Contact Information</div>
<div class="panel-body"> <div class="panel-body">
@ -314,6 +356,7 @@
</div> </div>
</div> </div>
</div> </div>
<!--end 商户联系资料--> <!--end 商户联系资料-->
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading">Address Information</div> <div class="panel-heading">Address Information</div>

Write Preview
Loading…
Cancel
Save