From 3cc9623569e882479fc2d27d24ea714bbd889a06 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Thu, 27 Feb 2020 17:33:50 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E8=B7=A8=E5=A2=83=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |  2 +-
 .../core/impls/RetailAppServiceImp.java       |  2 +-
 src/main/ui/login.html                        |  3 +-
 src/main/ui/login_v1.html                     |  3 +-
 .../partner-incremental-service.js            |  8 ++--
 .../partner_incremental_service.html          | 41 +++++++++++++++----
 .../partner_incremental_service_info.html     |  2 -
 7 files changed, 40 insertions(+), 21 deletions(-)

diff --git a/pom.xml b/pom.xml
index 980a5eab5..e5b8ca2b2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>1.3.65</version>
+    <version>1.3.66</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>1.8.0</jib-maven-plugin.version>
diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java
index 108bcf969..5265493aa 100644
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java
@@ -3071,7 +3071,7 @@ public class RetailAppServiceImp implements RetailAppService {
 
     private boolean geekShowActVersion(String version) {
         boolean result = false;
-        String geekShowVersion = "2.10.11";
+        String geekShowVersion = "2.12.11";
         String[] nowAppVersion = version.split("\\.");
         String[] geekVersion = geekShowVersion.split("\\.");
         for (int i = 0; i < geekVersion.length; i++) {
diff --git a/src/main/ui/login.html b/src/main/ui/login.html
index 942c6f54c..6481fe9af 100644
--- a/src/main/ui/login.html
+++ b/src/main/ui/login.html
@@ -362,8 +362,7 @@
                 method: 'get',
                 success: function (res) {
                     url += res.token;
-                    window.open(url, '_blank');
-                    location.href = '/index.html';
+                    location.href = url;
                 },
                 error: function (resp) {
                     console.log(resp.message)
diff --git a/src/main/ui/login_v1.html b/src/main/ui/login_v1.html
index e4da93947..a7d2ae33f 100644
--- a/src/main/ui/login_v1.html
+++ b/src/main/ui/login_v1.html
@@ -343,8 +343,7 @@
                 method: 'get',
                 success: function (res) {
                     url += res.token;
-                    window.open(url, '_blank');
-                    location.href = '/index.html';
+                    location.href = url;
                 },
                 error: function (resp) {
                     console.log(resp.message)
diff --git a/src/main/ui/static/incrementalService/partner-incremental-service.js b/src/main/ui/static/incrementalService/partner-incremental-service.js
index 0b9d80a1a..544a398c6 100644
--- a/src/main/ui/static/incrementalService/partner-incremental-service.js
+++ b/src/main/ui/static/incrementalService/partner-incremental-service.js
@@ -46,10 +46,10 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
             var url = "https://mch.royalpay.com.au/#/sso_login?token=";
             $http.get("/client/partner_info/incremental_service/RYCBSM/login_token").then(function (res) {
                 url += res.data.token;
-                window.open(url, '_blank');
+                location.href = url;
             }, function (resp) {
                 console.log(resp.data.message)
-                window.open("https://mch.geekforbest.com/#/login", '_blank');
+                location.href = "https://mch.geekforbest.com/#/login";
             });
         };
 
@@ -95,10 +95,10 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
             var url = "https://mch.royalpay.com.au/#/sso_login?token=";
             $http.get("/client/partner_info/incremental_service/RYCBSM/login_token").then(function (res) {
                 url += res.data.token;
-                window.open(url, '_blank');
+                location.href = url;
             }, function (resp) {
                 console.log(resp.data.message)
-                window.open("https://mch.geekforbest.com/#/login", '_blank');
+                location.href = "https://mch.geekforbest.com/#/login";
             });
         };
 
diff --git a/src/main/ui/static/incrementalService/templates/partner_incremental_service.html b/src/main/ui/static/incrementalService/templates/partner_incremental_service.html
index bcc9316f0..0b5656eef 100644
--- a/src/main/ui/static/incrementalService/templates/partner_incremental_service.html
+++ b/src/main/ui/static/incrementalService/templates/partner_incremental_service.html
@@ -109,12 +109,23 @@
                                         <span ng-style="{'color':service.is_valid?'#00A65A':'#DD4B39'}">{{service.is_valid?'已启用':'未启用' }}</span>
                                     </div>
                                 </div>
-                                <div class="row border-show" style="background-color: #F06101;margin: -5px 0px -1px 0px; border-radius: 2px 1px 8px 8px; width: 100%;margin-left: 0px" >
+                                <div style="background-color: #F06101">
+                                <div class="row border-show" style="background-color: #F06101;margin: 0; width: 100%;margin-left: 0px" >
                                     <a class="col-md-12 col-sm-12 col-xs-12 service-info-button"
                                          title="点击查看交易详情" ui-sref="partnerIncrementalServiceInfo({channel:service.channel})">
-                                       查看详情
+                                        查看交易情况
                                     </a>
                                 </div>
+                                <div ng-if="service.channel=='RP跨境商城'" style="background-color: #F06101">
+                                    <hr style="border-top: 1px solid #fff;margin: 2px 54px">
+                                </div>
+                                <div ng-if="service.channel=='RP跨境商城'" class="row border-show" style="background-color: #F06101;margin: 0; border-radius: 2px 1px 8px 8px; width: 100%;margin-left: 0px" >
+                                    <a class="col-md-12 col-sm-12 col-xs-12 service-info-button"
+                                       title="点击跳转到我的商城" type="button" ng-click="getGeekSsoLoginUrl()">
+                                        跳转到我的商城
+                                    </a>
+                                </div>
+                                </div>
                             </div>
                         </div>
                         <!-- 未开通服务展示 -->
@@ -147,14 +158,26 @@
                                         <span >一站式跨境进口电商SaaS平台，帮您快速构建自己的品牌自营商城系统，直达10亿+中国消费者，快速实现获客和交易变现。</span>
                                     </div>
                                 </div>
-                                <div class="row border-show"
-                                     ng-if="currentUser.geek_shop_status"
-                                     style="background-color: #F06101;margin: -5px 0px -1px 0px; border-radius: 2px 1px 8px 8px; width: 100%;margin-left: 0px" >
-                                    <a class="col-md-12 col-sm-12 col-xs-12 service-info-button"
-                                       title="查看详情" ui-sref="partnerIncrementalServiceInfo({channel:'RP跨境商城'})">
-                                        查看详情
-                                    </a>
+                                <div style="background-color: #F06101">
+                                    <div class="row border-show"
+                                         ng-if="currentUser.geek_shop_status"
+                                         style="background-color: #F06101;margin: 0; width: 100%;margin-left: 0px" >
+                                        <a class="col-md-12 col-sm-12 col-xs-12 service-info-button"
+                                           title="点击查看交易详情" ui-sref="partnerIncrementalServiceInfo({channel:'RP跨境商城'})">
+                                            查看交易情况
+                                        </a>
+                                    </div>
+                                    <div style="background-color: #F06101">
+                                        <hr style="border-top: 1px solid #fff;margin: 2px 54px">
+                                    </div>
+                                    <div ng-if="currentUser.geek_shop_status" class="row border-show" style="background-color: #F06101;margin: 0; border-radius: 2px 1px 8px 8px; width: 100%;margin-left: 0px" >
+                                        <a class="col-md-12 col-sm-12 col-xs-12 service-info-button"
+                                           title="点击跳转到我的商城" type="button" ng-click="getGeekSsoLoginUrl()">
+                                            跳转到我的商城
+                                        </a>
+                                    </div>
                                 </div>
+
                                 <div class="row border-show"
                                      ng-if="!currentUser.geek_shop_status"
                                      style="background-color: #F06101;margin: -5px 0px -1px 0px; border-radius: 2px 1px 8px 8px; width: 100%;margin-left: 0px" >
diff --git a/src/main/ui/static/incrementalService/templates/partner_incremental_service_info.html b/src/main/ui/static/incrementalService/templates/partner_incremental_service_info.html
index 72859b52f..678a51955 100644
--- a/src/main/ui/static/incrementalService/templates/partner_incremental_service_info.html
+++ b/src/main/ui/static/incrementalService/templates/partner_incremental_service_info.html
@@ -84,8 +84,6 @@
         <img height="40px" ng-src="{{serviceInfo.logo_url}}">
         <span style="color:#F06101">{{serviceInfo.channel}}</span>
         Service Info
-        <a ng-if="serviceInfo.channel=='RP跨境商城' || !serviceInfo.incremental_id" type="button" ng-click="getGeekSsoLoginUrl()"
-           style="cursor: pointer;text-decoration: underline;padding-left: 20px"> 前去跨境商城</a>
     </h1>
     <ol class="breadcrumb">
         <li>