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.jd_rate_value = parseFloat($scope.sysRateConfig.t1.JDpay);
$scope.rate.hf_rate_value = parseFloat($scope.sysRateConfig.t1.HFpay); $scope.rate.hf_rate_value = parseFloat($scope.sysRateConfig.t1.HFpay);
$scope.rate.Rpay_rate_value = parseFloat($scope.sysRateConfig.t1.Rpay); $scope.rate.Rpay_rate_value = parseFloat($scope.sysRateConfig.t1.Rpay);
$scope.rate.yeepay_rate_value = parseFloat($scope.sysRateConfig.t1.Yeepay);
break; break;
} }
case '2': { 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.jd_rate_value = parseFloat($scope.sysRateConfig.t2.JDpay);
$scope.rate.hf_rate_value = parseFloat($scope.sysRateConfig.t2.HFpay); $scope.rate.hf_rate_value = parseFloat($scope.sysRateConfig.t2.HFpay);
$scope.rate.Rpay_rate_value = parseFloat($scope.sysRateConfig.t2.Rpay); $scope.rate.Rpay_rate_value = parseFloat($scope.sysRateConfig.t2.Rpay);
$scope.rate.yeepay_rate_value = parseFloat($scope.sysRateConfig.t2.Yeepay);
break; break;
} }
case '3': { 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.jd_rate_value = parseFloat($scope.sysRateConfig.t3.JDpay);
$scope.rate.hf_rate_value = parseFloat($scope.sysRateConfig.t3.HFpay); $scope.rate.hf_rate_value = parseFloat($scope.sysRateConfig.t3.HFpay);
$scope.rate.Rpay_rate_value = parseFloat($scope.sysRateConfig.t3.Rpay); $scope.rate.Rpay_rate_value = parseFloat($scope.sysRateConfig.t3.Rpay);
$scope.rate.yeepay_rate_value = parseFloat($scope.sysRateConfig.t3.Yeepay);
break; break;
} }
} }

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

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

Write Preview
Loading…
Cancel
Save