feat(royalpay): MID Management小屏幕适配

master
xiao.tang 4 years ago
parent 14eba4d82a
commit 7f8ba7f3df

@ -5845,7 +5845,6 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
}]); }]);
// 修改sub_merchant_id // 修改sub_merchant_id
app.controller('ModifysubMerchantIdCtrl', ['$scope', '$http', '$uibModal', '$state', 'commonDialog', 'clientMoniker', 'merchantId', 'channel', function ($scope, $http, $uibModal, $state, commonDialog, clientMoniker, merchantId, channel) { app.controller('ModifysubMerchantIdCtrl', ['$scope', '$http', '$uibModal', '$state', 'commonDialog', 'clientMoniker', 'merchantId', 'channel', function ($scope, $http, $uibModal, $state, commonDialog, clientMoniker, merchantId, channel) {
console.log(merchantId, channel);
$scope.merchantId = merchantId $scope.merchantId = merchantId
$scope.flag = false $scope.flag = false
$scope.confirm = function () { $scope.confirm = function () {
@ -5857,14 +5856,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
$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' || channel === 'AlipayOnline') {
$http.put('/sys/partners/' + clientMoniker + '/ali_sub_merchant_id', { ali_sub_merchant_id: $scope.merchantId }).then(function (resp) {
$scope.$close();
}, function (resp) {
$scope.flag = false
commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' })
});
} else if (channel = 'AlipayOnline') {
$http.put('/sys/partners/' + clientMoniker + '/ali_sub_merchant_id', { ali_sub_merchant_id: $scope.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) {

@ -45,8 +45,24 @@
min-height: unset; min-height: unset;
margin: unset; margin: unset;
} }
.flex-container {
display: flex;
flex-wrap: wrap;
}
@media (max-width:1400px) {
.flex-container {
display: flex;
flex-direction: column;
}
.content-mine {
width: 100%;
}
}
</style> </style>
<div style="display: flex;flex-wrap: wrap;"> <div class="flex-container">
<!-- Wechat --> <!-- Wechat -->
<div class="content content-mine"> <div class="content content-mine">
<div class="row"> <div class="row">

Loading…
Cancel
Save