diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index 607abd9..b64485b 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -127,12 +127,12 @@ path: '/subpackage/retail/pages/index/index', serverKey: 1011 // 后端对应权限编号 }, - { - id: 8, - name: '课程管理', - path: '/subpackage/course/pages/index/index', - serverKey: 1013 // 后端对应权限编号 1013 - }, + // { + // id: 8, + // name: '课程管理', + // path: '/subpackage/course/pages/index/index', + // serverKey: 1013 // 后端对应权限编号 1013 + // }, { id: 9, name: '储值卡管理', @@ -147,7 +147,7 @@ }, { id: 11, - name: '钱包', + name: '钱包提现', path: '/subpackage/wallet/pages/index/index', serverKey: 1017 // 后端对应权限编号 1017 }, diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue index 21c74dc..c6c6788 100644 --- a/src/pages/login/login.vue +++ b/src/pages/login/login.vue @@ -121,7 +121,7 @@ export default { } }, toWebView(){ - util.routeTo(`/pages/web_view/web_view`,'rL'); + util.routeTo(`/pages/web_view/web_view?src=${encodeURIComponent("https://www.ouxuanzhineng.cn")}`,'rL'); } }, } diff --git a/src/pages/merchant_login/merchant_login.vue b/src/pages/merchant_login/merchant_login.vue index a88b4d6..c8f7a1c 100644 --- a/src/pages/merchant_login/merchant_login.vue +++ b/src/pages/merchant_login/merchant_login.vue @@ -12,7 +12,7 @@ import util from '../../utils/util' export default { methods: { toWebView(){ - util.routeTo(`/pages/web_view/web_view`,'rL'); + util.routeTo(`/pages/web_view/web_view?src=${encodeURIComponent("https://www.ouxuanzhineng.cn")}`,'rL'); } } } diff --git a/src/pages/web_view/web_view.vue b/src/pages/web_view/web_view.vue index d05babe..5b8a040 100644 --- a/src/pages/web_view/web_view.vue +++ b/src/pages/web_view/web_view.vue @@ -1,10 +1,16 @@ \ No newline at end of file diff --git a/src/store/index.js b/src/store/index.js index 043eaef..198b45a 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -40,7 +40,7 @@ export default new Vuex.Store({ '1009': '场地管理', '1010': '设备管理', '1011': '商品零售', - '1013': '课程管理', + // '1013': '课程管理', '1014': '储值卡管理', '1015': '进场人数异常', '1017': '钱包提现' diff --git a/src/subpackage/wallet/pages/baofu_withdraw/modules/baofu_item.vue b/src/subpackage/wallet/pages/baofu_withdraw/modules/baofu_item.vue index 98681d5..ddb0db0 100644 --- a/src/subpackage/wallet/pages/baofu_withdraw/modules/baofu_item.vue +++ b/src/subpackage/wallet/pages/baofu_withdraw/modules/baofu_item.vue @@ -22,21 +22,21 @@ 提现 - 可提现资金(元) + 可提现资金(元) {{ accountInfo.currBal || 0 }} - 总资产(元) + 总资产(元) {{ accountInfo.pendingBal || 0 }} - 在途资金(元) + 在途资金(元) diff --git a/src/subpackage/wallet/pages/index/index.vue b/src/subpackage/wallet/pages/index/index.vue index 05ffa80..7dd37cd 100644 --- a/src/subpackage/wallet/pages/index/index.vue +++ b/src/subpackage/wallet/pages/index/index.vue @@ -4,6 +4,7 @@ :balance="balance" @click:douyin="dyBtnClick" @click:baofu="bfBtnClick" + @click:admin="toWebView" > 温馨提示: @@ -40,8 +41,17 @@ export default { onLoad(options){ this.brand_id = options.brand_id ?? ''; this.getWalletBalance(options.brand_id); + console.log(uni.getAccountInfoSync().miniProgram) }, methods: { + toWebView(){ + routeTo(`/pages/web_view/web_view?src=${encodeURIComponent(this.getAdminAddress())}`,'nT'); + }, + getAdminAddress(){ + let _appid = uni.getAccountInfoSync()?.miniProgram?.appId || ''; + if(_appid === "wx7106e84614cf0060")return 'https://testadmin.ouxuanzhineng.cn'; // 测试后台地址 + return 'https://admin.ouxuanzhineng.cn'; // 正式后台地址 + }, copyBtn(){ uni.setClipboardData({ data: this.oxAddress, diff --git a/src/subpackage/wallet/pages/index/modules/wallet_info.vue b/src/subpackage/wallet/pages/index/modules/wallet_info.vue index cb1a39a..6a90b84 100644 --- a/src/subpackage/wallet/pages/index/modules/wallet_info.vue +++ b/src/subpackage/wallet/pages/index/modules/wallet_info.vue @@ -1,6 +1,6 @@