From dbe47fbd67ebb8c29c182a2b68dfdbea28c0132b Mon Sep 17 00:00:00 2001
From: lujian <jian.lu@globalfreepay.com>
Date: Thu, 29 Nov 2018 20:18:45 +0800
Subject: [PATCH 1/2] =?UTF-8?q?[fix]=E6=B3=A8=E9=87=8A=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E6=88=90=E5=8A=9F=E9=A1=B5=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/partner_payment_info.html       | 39 ++++++++++---------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/src/main/ui/static/payment/partner/templates/partner_payment_info.html b/src/main/ui/static/payment/partner/templates/partner_payment_info.html
index 581f53caa..b7a2a6c5e 100644
--- a/src/main/ui/static/payment/partner/templates/partner_payment_info.html
+++ b/src/main/ui/static/payment/partner/templates/partner_payment_info.html
@@ -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>

From 3f55c636a621d6fe099ab3c326233047d53dbfc5 Mon Sep 17 00:00:00 2001
From: "taylor.dang" <taylor.dang@globalfreepay.com>
Date: Thu, 29 Nov 2018 23:50:44 +0800
Subject: [PATCH 2/2] yeepay

---
 src/main/ui/static/payment/partner/partner-manage.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js
index 7e9d00720..4e675f3bc 100644
--- a/src/main/ui/static/payment/partner/partner-manage.js
+++ b/src/main/ui/static/payment/partner/partner-manage.js
@@ -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;
                     }
                 }