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

master
yangkai 6 years ago
commit 9e6affb143

@ -488,7 +488,7 @@ public class RetailAppServiceImp implements RetailAppService {
Date date = new Date(); Date date = new Date();
couponAccuessLog.put("client_id", client_id); couponAccuessLog.put("client_id", client_id);
couponAccuessLog.put("order_id", "非平台订单"); couponAccuessLog.put("order_id", "非平台订单");
couponAccuessLog.put("coupon_id", coupon_id); couponAccuessLog.put("coupon_id", "CTRIP_"+coupon_id);
couponAccuessLog.put("customer_openid", "非平台订单"); couponAccuessLog.put("customer_openid", "非平台订单");
couponAccuessLog.put("coupon_deal_amount", 0); couponAccuessLog.put("coupon_deal_amount", 0);
couponAccuessLog.put("currency", "AUD"); couponAccuessLog.put("currency", "AUD");

@ -415,7 +415,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
//HF支付链接二维码 //HF支付链接二维码
if (client.getString("hf_pay_url") != null) { if (client.getString("hf_pay_url") != null) {
String hfQrcodeUrl = PlatformEnvironment.getEnv().concatUrl("/api/v1.0/hf_gateway/partners/" + client.getString("client_moniker") + "/jump/app"); String hfQrcodeUrl = PlatformEnvironment.getEnv().concatUrl("/api/v1.0/hf_gateway/partners/" + client.getString("client_moniker") + "/jump/app");
client.put("hfQrcodeUrl", QRCodeUtils.qrcodeImageCode(hfQrcodeUrl, 200, false)); client.put("hfQrcodeUrl", QRCodeUtils.qrcodeImageCode(hfQrcodeUrl, 250, true));
} }
return client; return client;
} }

@ -22,6 +22,7 @@
text-align: center; text-align: center;
} }
.head-bar img{ .head-bar img{
width: 396px;
height: 38px; height: 38px;
top: 60px; top: 60px;
margin-top: 40px; margin-top: 40px;

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 50 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

@ -102,8 +102,9 @@
<div class="form-group"> <div class="form-group">
<label class="control-label col-sm-2">HF Pay Link</label> <label class="control-label col-sm-2">HF Pay Link</label>
<div class="col-sm-10"> <div class="col-sm-10">
<p class="form-control-static">{{partner.hf_pay_url}} <a href={{paymentInfo.hf_pay_url}} target="_Blank">
<!-- <span id="intro"> <p class="form-control-static">{{partner.hf_pay_url}}
<span id="intro">
<a href=""><i id="carousel_id" class="glyphicon glyphicon-info-sign" ng-mouseover="toFirst();toShow()"></i></a> <a href=""><i id="carousel_id" class="glyphicon glyphicon-info-sign" ng-mouseover="toFirst();toShow()"></i></a>
<div class="pos" ng-show="show"> <div class="pos" ng-show="show">
<i class="tocancle glyphicon glyphicon-remove" ng-click="toHide()"></i> <i class="tocancle glyphicon glyphicon-remove" ng-click="toHide()"></i>
@ -116,14 +117,15 @@
</uib-slide> </uib-slide>
</uib-carousel> </uib-carousel>
</div> </div>
</span>--> </span>
</p> </p>
</a>
</div> </div>
<div class="form-group" > <div >
<label class="col-sm-2 control-label">HF Pay QR Code</label> <label class="col-sm-2 control-label">HF Pay QR Code</label>
<img ng-src="{{partner.hfQrcodeUrl}}" class="img-responsive"> <img ng-src="{{partner.hfQrcodeUrl}}" class="img-responsive" />
<div> <div>
&nbsp;&nbsp;<span style="padding-left: 18.5%;font-size:9px;">仅支持微信客户端扫描</span> <span style="padding-left: 19.3%;font-size:9px;">仅支持微信客户端扫描</span>
</div> </div>
</div> </div>
</div> </div>

@ -328,14 +328,14 @@
<label class="col-sm-2 control-label">HF Pay Link</label> <label class="col-sm-2 control-label">HF Pay Link</label>
<div class="col-sm-10"> <div class="col-sm-10">
<input type="checkbox" ng-model="paymentInfo.enable_link" bs-switch switch-change="toggleHfLink('hf')"> <input type="checkbox" ng-model="paymentInfo.enable_link" bs-switch switch-change="toggleHfLink('hf')">
&nbsp;&nbsp;<span ng-if="paymentInfo.enable_link">{{paymentInfo.hf_pay_url}}</span> &nbsp;&nbsp;<a href={{paymentInfo.hf_pay_url}} target="_Blank"><span ng-if="paymentInfo.enable_link">{{paymentInfo.hf_pay_url}}</span></a>
</div> </div>
</div> </div>
<div class="form-group" ng-if="paymentInfo.enable_link"> <div class="form-group" ng-if="paymentInfo.enable_link">
<label class="col-sm-2 control-label">HF Pay QR Code</label> <label class="col-sm-2 control-label">HF Pay QR Code</label>
<img ng-src="{{paymentInfo.hfQrcodeUrl}}" class="img-responsive"> <img ng-src="{{paymentInfo.hfQrcodeUrl}}" class="img-responsive" />
<div> <div>
&nbsp;&nbsp;<span style="padding-left: 18.5%;font-size:9px;" ng-if="paymentInfo.enable_link">仅支持微信客户端扫描</span> &nbsp;&nbsp;<span style="padding-left: 19.2%;font-size:9px;" ng-if="paymentInfo.enable_link">仅支持微信客户端扫描</span>
</div> </div>
</div> </div>
<div class="form-group" ng-if="paymentInfo.enable_hf"> <div class="form-group" ng-if="paymentInfo.enable_hf">

@ -150,12 +150,12 @@ select {
.main-middle { .main-middle {
width: 2px; width: 2px;
height: 306px; height: 400px;
border: 1px dashed #EBEBEB; border: 1px dashed #EBEBEB;
display: inline-block; display: inline-block;
box-sizing: border-box; box-sizing: border-box;
vertical-align: top; vertical-align: top;
margin: 47px 40px 0 0; margin: 10px 40px 0 0;
} }
.main-right { .main-right {
vertical-align: top; vertical-align: top;

@ -29,7 +29,6 @@ select.bind("change", function () {
}); });
var bankList = [ var bankList = [
{label:'招商银行',value:'CMB'}, {label:'招商银行',value:'CMB'},
{label:'中国工商银行',value:'ICBC'},
{label:'中国农业银行',value:'ABC'}, {label:'中国农业银行',value:'ABC'},
{label:'中国建设银行',value:'CCB'}, {label:'中国建设银行',value:'CCB'},
{label:'中国银行',value:'BOC'}, {label:'中国银行',value:'BOC'},
@ -46,11 +45,8 @@ var bankList = [
{label:'北京农商银行',value:'BJRCB'}, {label:'北京农商银行',value:'BJRCB'},
{label:'南京银行',value:'NJCB'}, {label:'南京银行',value:'NJCB'},
{label:'中国光大银行',value:'CEB'}, {label:'中国光大银行',value:'CEB'},
{label:'浙商银行',value:'CZB'},
{label:'兴业银行',value:'CIB'},
{label:'杭州银行',value:'HZB'},
{label:'平安银行',value:'PAB'}, {label:'平安银行',value:'PAB'},
{label:'上海银行',value:'SHB'}, {label:'上海银行',value:'SHB'}
]; ];
var productList = [ var productList = [
{label:'护肤品',value:'100003'}, {label:'护肤品',value:'100003'},

Binary file not shown.

After

Width:  |  Height:  |  Size: 90 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 109 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 71 KiB

Loading…
Cancel
Save