diff --git a/application/admin/view/default/pluginsadmin/upload.html b/application/admin/view/default/pluginsadmin/upload.html
index d6c68ba86..e2cc1629c 100755
--- a/application/admin/view/default/pluginsadmin/upload.html
+++ b/application/admin/view/default/pluginsadmin/upload.html
@@ -12,7 +12,7 @@
diff --git a/application/admin/view/default/theme/upload.html b/application/admin/view/default/theme/upload.html
index 90a18b294..48cb7446c 100755
--- a/application/admin/view/default/theme/upload.html
+++ b/application/admin/view/default/theme/upload.html
@@ -12,7 +12,7 @@
diff --git a/application/tags.php b/application/tags.php
index 7ff8a120a..c145b9e6d 100755
--- a/application/tags.php
+++ b/application/tags.php
@@ -52,5 +52,17 @@ return array (
array (
0 => 'app\\plugins\\share\\Hook',
),
+ 'plugins_service_users_center_left_menu_handle' =>
+ array (
+ 0 => 'app\\plugins\\wallet\\Hook',
+ ),
+ 'plugins_service_header_navigation_top_right_handle' =>
+ array (
+ 0 => 'app\\plugins\\wallet\\Hook',
+ ),
+ 'plugins_service_user_register_end' =>
+ array (
+ 0 => 'app\\plugins\\wallet\\Hook',
+ ),
);
?>
\ No newline at end of file
diff --git a/public/static/admin/default/css/pluginsadmin.css b/public/static/admin/default/css/pluginsadmin.css
index 3bb3117c6..17bb8bc51 100755
--- a/public/static/admin/default/css/pluginsadmin.css
+++ b/public/static/admin/default/css/pluginsadmin.css
@@ -95,16 +95,6 @@
}
}
-/**
- * 上传文件
- */
-.am-form-file input[type="file"] {
- width: 92px;
- height: 28px;
- margin-top: 5px;
- margin-left: 5px;
-}
-
/**
* 删除modal
*/
diff --git a/public/static/admin/default/css/theme.css b/public/static/admin/default/css/theme.css
index 861cd585e..7e0dd1656 100755
--- a/public/static/admin/default/css/theme.css
+++ b/public/static/admin/default/css/theme.css
@@ -2,7 +2,4 @@
.am-gallery-desc * { font-size: 12px; }
.am-gallery-item:hover { border: 1px solid #f60; }
.theme-active { border: 3px solid #5eb95e !important; }
-#form-theme-tips { }
-input[name="theme"] { width: 105px !important; height: 32px; }
-.am-gallery-title .submit-delete { color:#C13932 !important; }
-input.file-event { margin-top: 0 !important; }
\ No newline at end of file
+.am-gallery-title .submit-delete { color:#C13932 !important; }
\ No newline at end of file
diff --git a/public/static/common/css/common.css b/public/static/common/css/common.css
index 1210a926d..1c30a4daf 100755
--- a/public/static/common/css/common.css
+++ b/public/static/common/css/common.css
@@ -208,7 +208,7 @@ iframe { border: 0; }
/**
* 公共图片上传
*/
-.am-form-file input[type="file"] { overflow:hidden; }
+.am-form-file input[type="file"] { overflow:hidden; width: 96px !important; height: 28px; top: 10px; }
.am-form-file input.original-images-url { display: -webkit-inline-box !important; width: calc(100% - 110px) !important; background: #f5f5f5 !important; float: right; }
.am-form-file i.original-images-url-delete { position: absolute; right: 3px; margin-top: 5px; cursor: pointer; background: #f5f5f5; padding: 0px 10px; }
.am-form-file input.original-images-url-delete { padding-right: 35px !important; }
diff --git a/sourcecode/alipay/pages/plugins/membershiplevelvip/order/order.js b/sourcecode/alipay/pages/plugins/membershiplevelvip/order/order.js
index 7d1090cc1..c1b708363 100644
--- a/sourcecode/alipay/pages/plugins/membershiplevelvip/order/order.js
+++ b/sourcecode/alipay/pages/plugins/membershiplevelvip/order/order.js
@@ -224,8 +224,9 @@ Page({
success: res => {
my.hideLoading();
if (res.data.code == 0) {
+ var data = res.data.data.data;
my.tradePay({
- tradeNO: res.data.data,
+ tradeNO: data,
success: res => {
// 数据设置
if (res.resultCode == 9000) {
diff --git a/sourcecode/alipay/pages/plugins/wallet/user-recharge/user-recharge.js b/sourcecode/alipay/pages/plugins/wallet/user-recharge/user-recharge.js
index de3e26d30..33aea7732 100644
--- a/sourcecode/alipay/pages/plugins/wallet/user-recharge/user-recharge.js
+++ b/sourcecode/alipay/pages/plugins/wallet/user-recharge/user-recharge.js
@@ -220,8 +220,9 @@ Page({
success: res => {
my.hideLoading();
if (res.data.code == 0) {
+ var data = res.data.data.data;
my.tradePay({
- tradeNO: res.data.data,
+ tradeNO: data,
success: res => {
// 数据设置
if (res.resultCode == 9000) {
diff --git a/sourcecode/qq/pages/plugins/wallet/user-recharge/user-recharge.js b/sourcecode/qq/pages/plugins/wallet/user-recharge/user-recharge.js
index c6813a780..af6285e28 100644
--- a/sourcecode/qq/pages/plugins/wallet/user-recharge/user-recharge.js
+++ b/sourcecode/qq/pages/plugins/wallet/user-recharge/user-recharge.js
@@ -220,8 +220,9 @@ Page({
success: res => {
qq.hideLoading();
if (res.data.code == 0) {
+ var data = res.data.data.data;
qq.requestPayment({
- package: res.data.data,
+ package: data,
success: function (res) {
// 数据设置
self.order_item_pay_success_handle(index);
diff --git a/sourcecode/toutiao/pages/plugins/membershiplevelvip/order/order.js b/sourcecode/toutiao/pages/plugins/membershiplevelvip/order/order.js
index 581cee9a1..96210c59e 100644
--- a/sourcecode/toutiao/pages/plugins/membershiplevelvip/order/order.js
+++ b/sourcecode/toutiao/pages/plugins/membershiplevelvip/order/order.js
@@ -244,48 +244,33 @@ Page({
tt.hideLoading();
if (res.data.code == 0) {
- // 支付方式类型
- switch (res.data.data.is_payment_type) {
- // 正常线上支付
- case 0:
- tt.pay({
- orderInfo: res.data.data.order_info,
- service: res.data.data.service,
- success(res) {
- // if (res.code == 0) {
- // // 数据设置
- // self.order_item_pay_success_handle(index); // 跳转支付页面
+ var data = res.data.data;
+ tt.pay({
+ orderInfo: data.order_info,
+ service: data.service,
+ success(res) {
+ // if (res.code == 0) {
+ // // 数据设置
+ // self.order_item_pay_success_handle(index); // 跳转支付页面
- // tt.navigateTo({
- // url: "/pages/paytips/paytips?code=9000&total_price=" + self.data.data_list[index]['price']
- // });
- // } else {
- // app.showToast('支付失败');
- // }
+ // tt.navigateTo({
+ // url: "/pages/paytips/paytips?code=9000&total_price=" + self.data.data_list[index]['price']
+ // });
+ // } else {
+ // app.showToast('支付失败');
+ // }
- // 由于头条支付无法监听支付状态，这里就不做接口轮询了，直接刷新页面
- self.setData({
- data_page: 1
- });
- self.get_data_list(1);
- },
- fail(res) {
- console.log(res, 'pay-fail')
- app.showToast('调起收银台失败-'+res.data.code);
- }
+ // 由于头条支付无法监听支付状态，这里就不做接口轮询了，直接刷新页面
+ self.setData({
+ data_page: 1
});
- break;
-
- // 钱包支付
- case 2:
- self.order_item_pay_success_handle(index);
- app.showToast('支付成功', 'success');
- break;
-
- // 默认
- default:
- app.showToast('支付类型有误');
- }
+ self.get_data_list(1);
+ },
+ fail(res) {
+ console.log(res, 'pay-fail')
+ app.showToast('调起收银台失败-'+res.data.code);
+ }
+ });
} else {
app.showToast(res.data.msg);
}
diff --git a/sourcecode/toutiao/pages/plugins/wallet/user-recharge/user-recharge.js b/sourcecode/toutiao/pages/plugins/wallet/user-recharge/user-recharge.js
index 39441a290..d5eca8873 100644
--- a/sourcecode/toutiao/pages/plugins/wallet/user-recharge/user-recharge.js
+++ b/sourcecode/toutiao/pages/plugins/wallet/user-recharge/user-recharge.js
@@ -238,42 +238,33 @@ Page({
tt.hideLoading();
if (res.data.code == 0) {
- // 支付方式类型
- switch (res.data.data.is_payment_type) {
- // 正常线上支付
- case 0:
- tt.pay({
- orderInfo: res.data.data.order_info,
- service: res.data.data.service,
- success(res) {
- // if (res.code == 0) {
- // // 数据设置
- // self.order_item_pay_success_handle(index); // 跳转支付页面
+ var data = res.data.data;
+ tt.pay({
+ orderInfo: data.order_info,
+ service: data.service,
+ success(res) {
+ // if (res.code == 0) {
+ // // 数据设置
+ // self.order_item_pay_success_handle(index); // 跳转支付页面
- // tt.navigateTo({
- // url: "/pages/paytips/paytips?code=9000&total_price=" + self.data.data_list[index]['money']
- // });
- // } else {
- // app.showToast('支付失败');
- // }
+ // tt.navigateTo({
+ // url: "/pages/paytips/paytips?code=9000&total_price=" + self.data.data_list[index]['money']
+ // });
+ // } else {
+ // app.showToast('支付失败');
+ // }
- // 由于头条支付无法监听支付状态，这里就不做接口轮询了，直接刷新页面
- self.setData({
- data_page: 1
- });
- self.get_data_list(1);
- },
- fail: function (res) {
- console.log(res, 'pay-fail')
- app.showToast('调起收银台失败-'+res.data.code);
- }
+ // 由于头条支付无法监听支付状态，这里就不做接口轮询了，直接刷新页面
+ self.setData({
+ data_page: 1
});
- break;
-
- // 默认
- default:
- app.showToast('支付类型有误');
- }
+ self.get_data_list(1);
+ },
+ fail: function (res) {
+ console.log(res, 'pay-fail')
+ app.showToast('调起收银台失败-'+res.data.code);
+ }
+ });
} else {
app.showToast(res.data.msg);
}
diff --git a/sourcecode/weixin/pages/plugins/membershiplevelvip/order/order.js b/sourcecode/weixin/pages/plugins/membershiplevelvip/order/order.js
index 57b0e58c6..d7472ceda 100644
--- a/sourcecode/weixin/pages/plugins/membershiplevelvip/order/order.js
+++ b/sourcecode/weixin/pages/plugins/membershiplevelvip/order/order.js
@@ -222,12 +222,13 @@ Page({
success: res => {
wx.hideLoading();
if (res.data.code == 0) {
+ var data = res.data.data.data;
wx.requestPayment({
- timeStamp: res.data.data.timeStamp,
- nonceStr: res.data.data.nonceStr,
- package: res.data.data.package,
- signType: res.data.data.signType,
- paySign: res.data.data.paySign,
+ timeStamp: data.timeStamp,
+ nonceStr: data.nonceStr,
+ package: data.package,
+ signType: data.signType,
+ paySign: data.paySign,
success: function (res) {
// 数据设置
self.order_item_pay_success_handle(index);
diff --git a/sourcecode/weixin/pages/plugins/wallet/user-recharge/user-recharge.js b/sourcecode/weixin/pages/plugins/wallet/user-recharge/user-recharge.js
index c86dc6e8e..e7ca96d02 100644
--- a/sourcecode/weixin/pages/plugins/wallet/user-recharge/user-recharge.js
+++ b/sourcecode/weixin/pages/plugins/wallet/user-recharge/user-recharge.js
@@ -220,12 +220,13 @@ Page({
success: res => {
wx.hideLoading();
if (res.data.code == 0) {
+ var data = res.data.data.data;
wx.requestPayment({
- timeStamp: res.data.data.timeStamp,
- nonceStr: res.data.data.nonceStr,
- package: res.data.data.package,
- signType: res.data.data.signType,
- paySign: res.data.data.paySign,
+ timeStamp: data.timeStamp,
+ nonceStr: data.nonceStr,
+ package: data.package,
+ signType: data.signType,
+ paySign: data.paySign,
success: function (res) {
// 数据设置
self.order_item_pay_success_handle(index);