diff --git a/application/service/UserService.php b/application/service/UserService.php index 55f575c97..f0af8dcaf 100755 --- a/application/service/UserService.php +++ b/application/service/UserService.php @@ -837,9 +837,9 @@ class UserService } // 邮箱/手机 - if(isset($user['email'])) + if(isset($user['mobile'])) { - $user['mobile_security']= empty($user['mobile']) ? '' : substr($user['mobile'], 0, 3).'***'.substr($user['email'], -3); + $user['mobile_security']= empty($user['mobile']) ? '' : substr($user['mobile'], 0, 3).'***'.substr($user['mobile'], -3); } if(isset($user['email'])) { diff --git a/public/appmini/old/alipay/app.json b/public/appmini/old/alipay/app.json index cb7d4acfd..2adac9a16 100644 --- a/public/appmini/old/alipay/app.json +++ b/public/appmini/old/alipay/app.json @@ -1,5 +1,5 @@ { - "pages": ["pages/plugins/wallet/user/user", + "pages": [ "pages/index/index", "pages/goods-category/goods-category", "pages/cart/cart", @@ -53,7 +53,7 @@ "pages/plugins/distribution/extraction-apply/extraction-apply", "pages/plugins/distribution/extraction-order/extraction-order", "pages/plugins/distribution/introduce/introduce", - + "pages/plugins/wallet/user/user", "pages/plugins/wallet/recharge/recharge", "pages/plugins/wallet/cash-auth/cash-auth", "pages/plugins/wallet/cash-create/cash-create", diff --git a/public/appmini/old/alipay/pages/plugins/distribution/extraction-apply/extraction-apply.axml b/public/appmini/old/alipay/pages/plugins/distribution/extraction-apply/extraction-apply.axml index 1fdfb2783..3b5c882f3 100644 --- a/public/appmini/old/alipay/pages/plugins/distribution/extraction-apply/extraction-apply.axml +++ b/public/appmini/old/alipay/pages/plugins/distribution/extraction-apply/extraction-apply.axml @@ -1,4 +1,4 @@ -
+ 别名选填 diff --git a/public/appmini/old/alipay/pages/plugins/wallet/cash-auth/cash-auth.axml b/public/appmini/old/alipay/pages/plugins/wallet/cash-auth/cash-auth.axml index e0b78a25e..f59fb3fe4 100644 --- a/public/appmini/old/alipay/pages/plugins/wallet/cash-auth/cash-auth.axml +++ b/public/appmini/old/alipay/pages/plugins/wallet/cash-auth/cash-auth.axml @@ -1,5 +1,5 @@ - + 选择身份认证方式必选 @@ -27,7 +27,7 @@ - + 操作提示 1. 请选择 "绑定邮箱" 或 "绑定手机" 方式其一作为安全校验码的获取方式并正确输入。 diff --git a/public/appmini/old/alipay/pages/plugins/wallet/cash-auth/cash-auth.js b/public/appmini/old/alipay/pages/plugins/wallet/cash-auth/cash-auth.js index c55e309f7..64dd5a0b1 100644 --- a/public/appmini/old/alipay/pages/plugins/wallet/cash-auth/cash-auth.js +++ b/public/appmini/old/alipay/pages/plugins/wallet/cash-auth/cash-auth.js @@ -164,7 +164,7 @@ Page({ self.setData({ form_submit_disabled_status: false }); my.hideLoading(); if (res.data.code == 0) { - my.navigateTo({ + my.redirectTo({ url: '/pages/plugins/wallet/cash-create/cash-create', }); } else { diff --git a/public/appmini/old/alipay/pages/plugins/wallet/cash-auth/cash-auth.json b/public/appmini/old/alipay/pages/plugins/wallet/cash-auth/cash-auth.json index 367ec079d..716713ed5 100644 --- a/public/appmini/old/alipay/pages/plugins/wallet/cash-auth/cash-auth.json +++ b/public/appmini/old/alipay/pages/plugins/wallet/cash-auth/cash-auth.json @@ -1,8 +1,4 @@ { "pullRefresh": false, - "navigationBarBackgroundColor": "#d2364c", - "titleBarColor": "#d2364c", - "backgroundColorBottom": "#f5f5f5", - "backgroundTextStyle": "light", "defaultTitle": "余额提现" } \ No newline at end of file diff --git a/public/appmini/old/alipay/pages/plugins/wallet/cash-create/cash-create.axml b/public/appmini/old/alipay/pages/plugins/wallet/cash-create/cash-create.axml index 1953d341c..5be17ac48 100644 --- a/public/appmini/old/alipay/pages/plugins/wallet/cash-create/cash-create.axml +++ b/public/appmini/old/alipay/pages/plugins/wallet/cash-create/cash-create.axml @@ -1,9 +1,9 @@ -
+ 提现金额必填 - 赠送金额不可提现 + 赠送金额不可提现 当前可提现金额 {{can_cash_max_money}} 当前可用金额 {{user_wallet.normal_money}} 当前赠送金额 {{user_wallet.give_money}} diff --git a/public/appmini/old/alipay/pages/plugins/wallet/cash-create/cash-create.js b/public/appmini/old/alipay/pages/plugins/wallet/cash-create/cash-create.js index 9fb48f940..ca027cbd3 100644 --- a/public/appmini/old/alipay/pages/plugins/wallet/cash-create/cash-create.js +++ b/public/appmini/old/alipay/pages/plugins/wallet/cash-create/cash-create.js @@ -128,7 +128,9 @@ Page({ if (res.data.code == 0) { app.showToast(res.data.msg, "success"); setTimeout(function () { - my.navigateBack(); + my.redirectTo({ + url: '/pages/plugins/wallet/user-cash/user-cash', + }); }, 1000); } else { self.setData({ form_submit_disabled_status: false }); diff --git a/public/appmini/old/alipay/pages/plugins/wallet/cash-create/cash-create.json b/public/appmini/old/alipay/pages/plugins/wallet/cash-create/cash-create.json index 070d50044..c5003fcab 100644 --- a/public/appmini/old/alipay/pages/plugins/wallet/cash-create/cash-create.json +++ b/public/appmini/old/alipay/pages/plugins/wallet/cash-create/cash-create.json @@ -1,8 +1,4 @@ { "pullRefresh": true, - "navigationBarBackgroundColor": "#d2364c", - "titleBarColor": "#d2364c", - "backgroundColorBottom": "#f5f5f5", - "backgroundTextStyle": "light", "defaultTitle": "余额提现" } \ No newline at end of file diff --git a/public/appmini/old/alipay/pages/plugins/wallet/recharge/recharge.json b/public/appmini/old/alipay/pages/plugins/wallet/recharge/recharge.json index 29e8b7e00..2812da274 100644 --- a/public/appmini/old/alipay/pages/plugins/wallet/recharge/recharge.json +++ b/public/appmini/old/alipay/pages/plugins/wallet/recharge/recharge.json @@ -1,8 +1,4 @@ { "pullRefresh": false, - "navigationBarBackgroundColor": "#d2364c", - "titleBarColor": "#d2364c", - "backgroundColorBottom": "#f5f5f5", - "backgroundTextStyle": "light", "defaultTitle": "充值" } \ No newline at end of file diff --git a/public/appmini/old/alipay/pages/plugins/wallet/user-cash-detail/user-cash-detail.json b/public/appmini/old/alipay/pages/plugins/wallet/user-cash-detail/user-cash-detail.json index a12262827..b3e6df95f 100644 --- a/public/appmini/old/alipay/pages/plugins/wallet/user-cash-detail/user-cash-detail.json +++ b/public/appmini/old/alipay/pages/plugins/wallet/user-cash-detail/user-cash-detail.json @@ -1,8 +1,4 @@ { "pullRefresh": true, - "navigationBarBackgroundColor": "#d2364c", - "titleBarColor": "#d2364c", - "backgroundColorBottom": "#f5f5f5", - "backgroundTextStyle": "light", "defaultTitle": "提现详情" } \ No newline at end of file diff --git a/public/appmini/old/alipay/pages/plugins/wallet/user-cash/user-cash.json b/public/appmini/old/alipay/pages/plugins/wallet/user-cash/user-cash.json index 55ef30c61..28de714db 100644 --- a/public/appmini/old/alipay/pages/plugins/wallet/user-cash/user-cash.json +++ b/public/appmini/old/alipay/pages/plugins/wallet/user-cash/user-cash.json @@ -1,8 +1,4 @@ { "pullRefresh": true, - "navigationBarBackgroundColor": "#d2364c", - "titleBarColor": "#d2364c", - "backgroundColorBottom": "#f5f5f5", - "backgroundTextStyle": "light", "defaultTitle": "提现记录" } \ No newline at end of file diff --git a/public/appmini/old/alipay/pages/plugins/wallet/user-recharge-detail/user-recharge-detail.json b/public/appmini/old/alipay/pages/plugins/wallet/user-recharge-detail/user-recharge-detail.json index 615e94863..14ae932a8 100644 --- a/public/appmini/old/alipay/pages/plugins/wallet/user-recharge-detail/user-recharge-detail.json +++ b/public/appmini/old/alipay/pages/plugins/wallet/user-recharge-detail/user-recharge-detail.json @@ -1,8 +1,4 @@ { "pullRefresh": true, - "navigationBarBackgroundColor": "#d2364c", - "titleBarColor": "#d2364c", - "backgroundColorBottom": "#f5f5f5", - "backgroundTextStyle": "light", "defaultTitle": "充值详情" } \ No newline at end of file diff --git a/public/appmini/old/alipay/pages/plugins/wallet/user-recharge/user-recharge.js b/public/appmini/old/alipay/pages/plugins/wallet/user-recharge/user-recharge.js index 46b67c1da..de3e26d30 100644 --- a/public/appmini/old/alipay/pages/plugins/wallet/user-recharge/user-recharge.js +++ b/public/appmini/old/alipay/pages/plugins/wallet/user-recharge/user-recharge.js @@ -221,7 +221,7 @@ Page({ my.hideLoading(); if (res.data.code == 0) { my.tradePay({ - tradeNO: res.data.data.data, + tradeNO: res.data.data, success: res => { // 数据设置 if (res.resultCode == 9000) { diff --git a/public/appmini/old/alipay/pages/plugins/wallet/user-recharge/user-recharge.json b/public/appmini/old/alipay/pages/plugins/wallet/user-recharge/user-recharge.json index be716990e..83622a952 100644 --- a/public/appmini/old/alipay/pages/plugins/wallet/user-recharge/user-recharge.json +++ b/public/appmini/old/alipay/pages/plugins/wallet/user-recharge/user-recharge.json @@ -1,9 +1,5 @@ { "pullRefresh": true, - "navigationBarBackgroundColor": "#d2364c", - "titleBarColor": "#d2364c", - "backgroundColorBottom": "#f5f5f5", - "backgroundTextStyle": "light", "defaultTitle": "充值记录", "usingComponents": { "component-popup": "/components/popup/popup" diff --git a/public/appmini/old/alipay/pages/plugins/wallet/user/user.json b/public/appmini/old/alipay/pages/plugins/wallet/user/user.json index 8b2621ea6..e9a5e128c 100644 --- a/public/appmini/old/alipay/pages/plugins/wallet/user/user.json +++ b/public/appmini/old/alipay/pages/plugins/wallet/user/user.json @@ -1,8 +1,4 @@ { "pullRefresh": true, - "navigationBarBackgroundColor": "#d2364c", - "titleBarColor": "#d2364c", - "backgroundColorBottom": "#f5f5f5", - "backgroundTextStyle": "light", "defaultTitle": "我的钱包" } \ No newline at end of file diff --git a/public/appmini/old/alipay/pages/plugins/wallet/wallet-log-detail/wallet-log-detail.json b/public/appmini/old/alipay/pages/plugins/wallet/wallet-log-detail/wallet-log-detail.json index ce377edec..d5beba09d 100644 --- a/public/appmini/old/alipay/pages/plugins/wallet/wallet-log-detail/wallet-log-detail.json +++ b/public/appmini/old/alipay/pages/plugins/wallet/wallet-log-detail/wallet-log-detail.json @@ -1,8 +1,4 @@ { "pullRefresh": true, - "navigationBarBackgroundColor": "#d2364c", - "titleBarColor": "#d2364c", - "backgroundColorBottom": "#f5f5f5", - "backgroundTextStyle": "light", "defaultTitle": "明细详情" } \ No newline at end of file diff --git a/public/appmini/old/alipay/pages/plugins/wallet/wallet-log/wallet-log.json b/public/appmini/old/alipay/pages/plugins/wallet/wallet-log/wallet-log.json index 34ea59b74..3040bed31 100644 --- a/public/appmini/old/alipay/pages/plugins/wallet/wallet-log/wallet-log.json +++ b/public/appmini/old/alipay/pages/plugins/wallet/wallet-log/wallet-log.json @@ -1,8 +1,4 @@ { "pullRefresh": true, - "navigationBarBackgroundColor": "#d2364c", - "titleBarColor": "#d2364c", - "backgroundColorBottom": "#f5f5f5", - "backgroundTextStyle": "light", "defaultTitle": "账户明细" } \ No newline at end of file diff --git a/public/appmini/old/weixin/pages/plugins/distribution/extraction-apply/extraction-apply.wxml b/public/appmini/old/weixin/pages/plugins/distribution/extraction-apply/extraction-apply.wxml index bb79029e7..9844fe81f 100644 --- a/public/appmini/old/weixin/pages/plugins/distribution/extraction-apply/extraction-apply.wxml +++ b/public/appmini/old/weixin/pages/plugins/distribution/extraction-apply/extraction-apply.wxml @@ -1,4 +1,4 @@ - + 别名选填 diff --git a/public/appmini/old/weixin/pages/plugins/wallet/cash-auth/cash-auth.js b/public/appmini/old/weixin/pages/plugins/wallet/cash-auth/cash-auth.js index d74ecbad4..02b2ed711 100644 --- a/public/appmini/old/weixin/pages/plugins/wallet/cash-auth/cash-auth.js +++ b/public/appmini/old/weixin/pages/plugins/wallet/cash-auth/cash-auth.js @@ -164,7 +164,7 @@ Page({ self.setData({ form_submit_disabled_status: false }); wx.hideLoading(); if (res.data.code == 0) { - wx.navigateTo({ + wx.redirectTo({ url: '/pages/plugins/wallet/cash-create/cash-create', }); } else { diff --git a/public/appmini/old/weixin/pages/plugins/wallet/cash-auth/cash-auth.json b/public/appmini/old/weixin/pages/plugins/wallet/cash-auth/cash-auth.json index 7afce2f28..2efe674ce 100644 --- a/public/appmini/old/weixin/pages/plugins/wallet/cash-auth/cash-auth.json +++ b/public/appmini/old/weixin/pages/plugins/wallet/cash-auth/cash-auth.json @@ -1,8 +1,4 @@ { "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#d2364c", - "backgroundColorTop": "#d2364c", - "backgroundColorBottom": "#f5f5f5", - "backgroundTextStyle": "light", "navigationBarTitleText": "余额提现" } \ No newline at end of file diff --git a/public/appmini/old/weixin/pages/plugins/wallet/cash-auth/cash-auth.wxml b/public/appmini/old/weixin/pages/plugins/wallet/cash-auth/cash-auth.wxml index b2552f5bb..0c2085234 100644 --- a/public/appmini/old/weixin/pages/plugins/wallet/cash-auth/cash-auth.wxml +++ b/public/appmini/old/weixin/pages/plugins/wallet/cash-auth/cash-auth.wxml @@ -1,5 +1,5 @@ - + 选择身份认证方式必选 @@ -27,7 +27,7 @@ - + 操作提示 1. 请选择 "绑定邮箱" 或 "绑定手机" 方式其一作为安全校验码的获取方式并正确输入。 diff --git a/public/appmini/old/weixin/pages/plugins/wallet/cash-create/cash-create.js b/public/appmini/old/weixin/pages/plugins/wallet/cash-create/cash-create.js index 99d16aaf4..f44b66540 100644 --- a/public/appmini/old/weixin/pages/plugins/wallet/cash-create/cash-create.js +++ b/public/appmini/old/weixin/pages/plugins/wallet/cash-create/cash-create.js @@ -128,7 +128,9 @@ Page({ if (res.data.code == 0) { app.showToast(res.data.msg, "success"); setTimeout(function () { - wx.navigateBack(); + wx.redirectTo({ + url: '/pages/plugins/wallet/user-cash/user-cash', + }); }, 1000); } else { self.setData({ form_submit_disabled_status: false }); diff --git a/public/appmini/old/weixin/pages/plugins/wallet/cash-create/cash-create.json b/public/appmini/old/weixin/pages/plugins/wallet/cash-create/cash-create.json index 537336747..e62fa0a65 100644 --- a/public/appmini/old/weixin/pages/plugins/wallet/cash-create/cash-create.json +++ b/public/appmini/old/weixin/pages/plugins/wallet/cash-create/cash-create.json @@ -1,8 +1,4 @@ { "enablePullDownRefresh": true, - "navigationBarBackgroundColor": "#d2364c", - "backgroundColorTop": "#d2364c", - "backgroundColorBottom": "#f5f5f5", - "backgroundTextStyle": "light", "navigationBarTitleText": "余额提现" } \ No newline at end of file diff --git a/public/appmini/old/weixin/pages/plugins/wallet/cash-create/cash-create.wxml b/public/appmini/old/weixin/pages/plugins/wallet/cash-create/cash-create.wxml index 057dce023..53974bd89 100644 --- a/public/appmini/old/weixin/pages/plugins/wallet/cash-create/cash-create.wxml +++ b/public/appmini/old/weixin/pages/plugins/wallet/cash-create/cash-create.wxml @@ -1,9 +1,9 @@ -
+ 提现金额必填 - 赠送金额不可提现 + 赠送金额不可提现 当前可提现金额 {{can_cash_max_money}} 当前可用金额 {{user_wallet.normal_money}} 当前赠送金额 {{user_wallet.give_money}} diff --git a/public/appmini/old/weixin/pages/plugins/wallet/recharge/recharge.json b/public/appmini/old/weixin/pages/plugins/wallet/recharge/recharge.json index 401c0ed25..d59e74016 100644 --- a/public/appmini/old/weixin/pages/plugins/wallet/recharge/recharge.json +++ b/public/appmini/old/weixin/pages/plugins/wallet/recharge/recharge.json @@ -1,8 +1,4 @@ { "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#d2364c", - "backgroundColorTop": "#d2364c", - "backgroundColorBottom": "#f5f5f5", - "backgroundTextStyle": "light", "navigationBarTitleText": "充值" } \ No newline at end of file diff --git a/public/appmini/old/weixin/pages/plugins/wallet/user-cash-detail/user-cash-detail.json b/public/appmini/old/weixin/pages/plugins/wallet/user-cash-detail/user-cash-detail.json index eb3608ded..e885e4f7b 100644 --- a/public/appmini/old/weixin/pages/plugins/wallet/user-cash-detail/user-cash-detail.json +++ b/public/appmini/old/weixin/pages/plugins/wallet/user-cash-detail/user-cash-detail.json @@ -1,8 +1,4 @@ { "enablePullDownRefresh": true, - "navigationBarBackgroundColor": "#d2364c", - "backgroundColorTop": "#d2364c", - "backgroundColorBottom": "#f5f5f5", - "backgroundTextStyle": "light", "navigationBarTitleText": "提现详情" } \ No newline at end of file diff --git a/public/appmini/old/weixin/pages/plugins/wallet/user-cash/user-cash.json b/public/appmini/old/weixin/pages/plugins/wallet/user-cash/user-cash.json index 34e545740..6ae520bfc 100644 --- a/public/appmini/old/weixin/pages/plugins/wallet/user-cash/user-cash.json +++ b/public/appmini/old/weixin/pages/plugins/wallet/user-cash/user-cash.json @@ -1,8 +1,4 @@ { "enablePullDownRefresh": true, - "navigationBarBackgroundColor": "#d2364c", - "backgroundColorTop": "#d2364c", - "backgroundColorBottom": "#f5f5f5", - "backgroundTextStyle": "light", "navigationBarTitleText": "提现记录" } \ No newline at end of file diff --git a/public/appmini/old/weixin/pages/plugins/wallet/user-recharge-detail/user-recharge-detail.json b/public/appmini/old/weixin/pages/plugins/wallet/user-recharge-detail/user-recharge-detail.json index dcd0d496e..0ff6551e1 100644 --- a/public/appmini/old/weixin/pages/plugins/wallet/user-recharge-detail/user-recharge-detail.json +++ b/public/appmini/old/weixin/pages/plugins/wallet/user-recharge-detail/user-recharge-detail.json @@ -1,8 +1,4 @@ { "enablePullDownRefresh": true, - "navigationBarBackgroundColor": "#d2364c", - "backgroundColorTop": "#d2364c", - "backgroundColorBottom": "#f5f5f5", - "backgroundTextStyle": "light", "navigationBarTitleText": "充值详情" } \ No newline at end of file diff --git a/public/appmini/old/weixin/pages/plugins/wallet/user-recharge/user-recharge.json b/public/appmini/old/weixin/pages/plugins/wallet/user-recharge/user-recharge.json index d22e681ff..1b53b943a 100644 --- a/public/appmini/old/weixin/pages/plugins/wallet/user-recharge/user-recharge.json +++ b/public/appmini/old/weixin/pages/plugins/wallet/user-recharge/user-recharge.json @@ -1,9 +1,5 @@ { "enablePullDownRefresh": true, - "navigationBarBackgroundColor": "#d2364c", - "backgroundColorTop": "#d2364c", - "backgroundColorBottom": "#f5f5f5", - "backgroundTextStyle": "light", "navigationBarTitleText": "充值记录", "usingComponents": { "component-popup": "/components/popup/popup" diff --git a/public/appmini/old/weixin/pages/plugins/wallet/user/user.json b/public/appmini/old/weixin/pages/plugins/wallet/user/user.json index 61993331d..8bd6db9b9 100644 --- a/public/appmini/old/weixin/pages/plugins/wallet/user/user.json +++ b/public/appmini/old/weixin/pages/plugins/wallet/user/user.json @@ -1,8 +1,4 @@ { "enablePullDownRefresh": true, - "navigationBarBackgroundColor": "#d2364c", - "backgroundColorTop": "#d2364c", - "backgroundColorBottom": "#f5f5f5", - "backgroundTextStyle": "light", "navigationBarTitleText": "我的钱包" } \ No newline at end of file diff --git a/public/appmini/old/weixin/pages/plugins/wallet/wallet-log-detail/wallet-log-detail.json b/public/appmini/old/weixin/pages/plugins/wallet/wallet-log-detail/wallet-log-detail.json index bf69e92c6..2817778ed 100644 --- a/public/appmini/old/weixin/pages/plugins/wallet/wallet-log-detail/wallet-log-detail.json +++ b/public/appmini/old/weixin/pages/plugins/wallet/wallet-log-detail/wallet-log-detail.json @@ -1,8 +1,4 @@ { "enablePullDownRefresh": true, - "navigationBarBackgroundColor": "#d2364c", - "backgroundColorTop": "#d2364c", - "backgroundColorBottom": "#f5f5f5", - "backgroundTextStyle": "light", "navigationBarTitleText": "明细详情" } \ No newline at end of file diff --git a/public/appmini/old/weixin/pages/plugins/wallet/wallet-log/wallet-log.json b/public/appmini/old/weixin/pages/plugins/wallet/wallet-log/wallet-log.json index d112c085d..91088155c 100644 --- a/public/appmini/old/weixin/pages/plugins/wallet/wallet-log/wallet-log.json +++ b/public/appmini/old/weixin/pages/plugins/wallet/wallet-log/wallet-log.json @@ -1,8 +1,4 @@ { "enablePullDownRefresh": true, - "navigationBarBackgroundColor": "#d2364c", - "backgroundColorTop": "#d2364c", - "backgroundColorBottom": "#f5f5f5", - "backgroundTextStyle": "light", "navigationBarTitleText": "账户明细" } \ No newline at end of file