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

Merge branch 'develop'

Browse Source
master
AlanFenng 5 years ago
parent e0539d4264 3e88ca685d
commit 4d3f479c7b
3 changed files with 127 additions and 129 deletions
Show Stats Download Patch File Download Diff File

2
pom.xml
Unescape View File

@ -9,7 +9,7 @@
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>manage</artifactId> <artifactId>manage</artifactId>
<version>2.3.74</version> <version>2.3.75</version>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jib-maven-plugin.version>2.4.0</jib-maven-plugin.version> <jib-maven-plugin.version>2.4.0</jib-maven-plugin.version>

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

@ -5610,7 +5610,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
} }
} }
}).result.then(function () { }).result.then(function () {
$scope.loadPartnerInfo() $state.reload();
commonDialog.alert({ commonDialog.alert({
title: 'Success', title: 'Success',
content: 'Modify successfully', content: 'Modify successfully',
@ -5851,21 +5851,21 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
$scope.confirm = function () { $scope.confirm = function () {
$scope.flag = true $scope.flag = true
if (channel === 'Wechat') { if (channel === 'Wechat') {
$http.put('/sys/partners/' + clientMoniker + '/payment_config', { sub_merchant_id: merchantId }).then(function (resp) { $http.put('/sys/partners/' + clientMoniker + '/payment_config', { sub_merchant_id: $scope.merchantId }).then(function (resp) {
$scope.$close(); $scope.$close();
}, function (resp) { }, function (resp) {
$scope.flag = false $scope.flag = false
commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' }) commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' })
}); });
} else if (channel === 'Alipay') { } else if (channel === 'Alipay') {
$http.put('/sys/partners/' + clientMoniker + '/ali_sub_merchant_id', { ali_sub_merchant_id: merchantId }).then(function (resp) { $http.put('/sys/partners/' + clientMoniker + '/ali_sub_merchant_id', { ali_sub_merchant_id: $scope.merchantId }).then(function (resp) {
$scope.$close(); $scope.$close();
}, function (resp) { }, function (resp) {
$scope.flag = false $scope.flag = false
commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' }) commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' })
}); });
} else if (channel = 'AlipayOnline') { } else if (channel = 'AlipayOnline') {
$http.put('/sys/partners/' + clientMoniker + '/ali_sub_merchant_id', { ali_sub_merchant_id: merchantId }).then(function (resp) { $http.put('/sys/partners/' + clientMoniker + '/ali_sub_merchant_id', { ali_sub_merchant_id: $scope.merchantId }).then(function (resp) {
$scope.$close(); $scope.$close();
}, function (resp) { }, function (resp) {
$scope.flag = false $scope.flag = false

6
src/main/ui/static/payment/partner/templates/sub_merchant_id_apply.html
Unescape View File

@ -87,8 +87,7 @@
<div> <div>
<button role="button" class="btn btn-info" title="Apply Sub Merchant Id" <button role="button" class="btn btn-info" title="Apply Sub Merchant Id"
ng-click="applyWxSubMerchantId()"> ng-click="applyWxSubMerchantId()">
<i class="fa fa-plus"></i> <i class="fa fa-plus"></i> Apply
Apply
</button> </button>
<button role="button" class="btn btn-info" <button role="button" class="btn btn-info"
ng-click="queryWechatSubMerchantIdStatus()"> ng-click="queryWechatSubMerchantIdStatus()">
@ -285,8 +284,7 @@
<button role="button" class="btn btn-info" title="Apply Sub Merchant Id" <button role="button" class="btn btn-info" title="Apply Sub Merchant Id"
ng-click="submitAlipayOnlineSubId()"> ng-click="submitAlipayOnlineSubId()">
<i class="fa fa-plus"></i> <i class="fa fa-plus"></i> Apply
Apply
</button> </button>
<button role="button" class="btn btn-info" ng-click="queryAlipayOnlineGms()"> <button role="button" class="btn btn-info" ng-click="queryAlipayOnlineGms()">
<i class="fa fa-search"></i> Result <i class="fa fa-search"></i> Result

Write Preview
Loading…
Cancel
Save