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

fix 跨境商城修改

Browse Source
master
luoyang 5 years ago
parent e32493f654
commit 3cc9623569
7 changed files with 40 additions and 21 deletions
Show Stats Download Patch File Download Diff File

2
pom.xml
Unescape View File

@ -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>

2
src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java
Unescape View File

@ -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++) {

3
src/main/ui/login.html
Unescape View File

@ -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)

3
src/main/ui/login_v1.html
Unescape View File

@ -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)

8
src/main/ui/static/incrementalService/partner-incremental-service.js
Unescape View File

@ -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";
});
};

41
src/main/ui/static/incrementalService/templates/partner_incremental_service.html
Unescape View File

@ -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" >

2
src/main/ui/static/incrementalService/templates/partner_incremental_service_info.html
Unescape View File

@ -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>

Write Preview
Loading…
Cancel
Save