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

Merge branch 'develop'

Browse Source
master
taylor.dang 6 years ago
parent e33b0e6f85 3f55c636a6
commit 3a69c7a076
2 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File

3
src/main/ui/static/payment/partner/partner-manage.js
Unescape View File

@ -2061,6 +2061,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
$scope.rate.jd_rate_value = parseFloat($scope.sysRateConfig.t1.JDpay);
$scope.rate.hf_rate_value = parseFloat($scope.sysRateConfig.t1.HFpay);
$scope.rate.Rpay_rate_value = parseFloat($scope.sysRateConfig.t1.Rpay);
$scope.rate.yeepay_rate_value = parseFloat($scope.sysRateConfig.t1.Yeepay);
break;
}
case '2': {
@ -2071,6 +2072,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
$scope.rate.jd_rate_value = parseFloat($scope.sysRateConfig.t2.JDpay);
$scope.rate.hf_rate_value = parseFloat($scope.sysRateConfig.t2.HFpay);
$scope.rate.Rpay_rate_value = parseFloat($scope.sysRateConfig.t2.Rpay);
$scope.rate.yeepay_rate_value = parseFloat($scope.sysRateConfig.t2.Yeepay);
break;
}
case '3': {
@ -2081,6 +2083,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
$scope.rate.jd_rate_value = parseFloat($scope.sysRateConfig.t3.JDpay);
$scope.rate.hf_rate_value = parseFloat($scope.sysRateConfig.t3.HFpay);
$scope.rate.Rpay_rate_value = parseFloat($scope.sysRateConfig.t3.Rpay);
$scope.rate.yeepay_rate_value = parseFloat($scope.sysRateConfig.t3.Yeepay);
break;
}
}

39
src/main/ui/static/payment/partner/templates/partner_payment_info.html
Unescape View File

@ -484,25 +484,26 @@
</div>
</div>
<div class="form-group col-sm-6">
<label class="col-sm-4 control-label">Select Version</label>
<div class="col-sm-6">
<select class="form-control" ng-change="changePaySuccessPage()" ng-model="paymentInfo.paysuccess_version"
title="Payment Success Page">
<option value="v1">v1</option>
<option value="v2">v2</option>
</select>
</div>
<div class="col-sm-12">
<label class="col-sm-4 control-label"></label>
<div class="col-sm-8" style="margin-top: 10px;">
<img style="width: 200px" ng-if="paymentInfo.paysuccess_version=='v1'"
src="/static/images/paysuccess_v1.png">
<img style="width: 200px" ng-if="paymentInfo.paysuccess_version=='v2'"
src="/static/images/paysuccess_v2.png">
</div>
</div>
</div>
<!--先注释支付成功页选项-->
<!--<div class="form-group col-sm-6">-->
<!--<label class="col-sm-4 control-label">Select Version</label>-->
<!--<div class="col-sm-6">-->
<!--<select class="form-control" ng-change="changePaySuccessPage()" ng-model="paymentInfo.paysuccess_version"-->
<!--title="Payment Success Page">-->
<!--<option value="v1">v1</option>-->
<!--<option value="v2">v2</option>-->
<!--</select>-->
<!--</div>-->
<!--<div class="col-sm-12">-->
<!--<label class="col-sm-4 control-label"></label>-->
<!--<div class="col-sm-8" style="margin-top: 10px;">-->
<!--<img style="width: 200px" ng-if="paymentInfo.paysuccess_version=='v1'"-->
<!--src="/static/images/paysuccess_v1.png">-->
<!--<img style="width: 200px" ng-if="paymentInfo.paysuccess_version=='v2'"-->
<!--src="/static/images/paysuccess_v2.png">-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
</div>
</div>
</div>

Write Preview
Loading…
Cancel
Save