diff --git a/App.vue b/App.vue index 82a2902..1c99cb8 100644 --- a/App.vue +++ b/App.vue @@ -4,15 +4,16 @@ // url: 'http://192.168.3.4:9301/crest', // imgUrl: 'https://192.168.3.4:9301/filesystem/', //正式 - // url: 'https://pay.dctpay.com/crest', - // imgUrl: 'https://gratia-pay.obs.cn-southwest-2.myhuaweicloud.com', - // redirectUrl:'https://pay.dctpay.com/cweb', - // hsgUrl:'https://hsg.dctpay.com', + url: 'https://pay.dctpay.com/crest', + imgUrl: 'https://gratia-pay.obs.cn-southwest-2.myhuaweicloud.com', + redirectUrl:'https://pay.dctpay.com/cweb', + hsgUrl:'https://hsg.dctpay.com', //测试 - url: 'https://gratia-pay.dctpay.com/crest', + /* url: 'https://gratia-pay.dctpay.com/crest', imgUrl: 'https://gratia-pay-test.obs.cn-east-3.myhuaweicloud.com', redirectUrl:'https://gratia-pay.dctpay.com/cweb', - hsgUrl:'https://hsgcs.dctpay.com', + hsgUrl:'https://hsgcs.dctpay.com', */ + userInfo: "", openId: '', h5code: '', diff --git a/Utils/Api.js b/Utils/Api.js index 63b247a..55df57b 100644 --- a/Utils/Api.js +++ b/Utils/Api.js @@ -202,6 +202,12 @@ export const mermoveHomeCount = params => { export const storemoveHomeCount = params => { return POST('POST', `${base}/store/moveHomeCount`, params).then(res => res.data); } + +//管理员查询统计 +export const AdimoveHomeCount = params => { + return POST('POST', `${base}/company/moveHomeCount`, params).then(res => res.data); +} + // 查询交易订单列表 export const getTradeOrderList = params => { return POST('GET', `${base}/tradeOrder/getTradeOrderList`, params).then(res => res.data); diff --git a/node_modules/.package-lock.json b/node_modules/.package-lock.json index e95e399..c124e4d 100644 --- a/node_modules/.package-lock.json +++ b/node_modules/.package-lock.json @@ -1,7 +1,7 @@ { "name": "基于uview职位分类选择,具备模糊搜索功能,使用更方便", "version": "1.1.1", - "lockfileVersion": 2, + "lockfileVersion": 3, "requires": true, "packages": { "node_modules/jweixin-module": { diff --git a/pages/tabBar/home/home.vue b/pages/tabBar/home/home.vue index 6ac8738..07a7f8a 100644 --- a/pages/tabBar/home/home.vue +++ b/pages/tabBar/home/home.vue @@ -72,7 +72,8 @@ moveHomeCount, mermoveHomeCount, storemoveHomeCount, - getDictionaries + getDictionaries, + AdimoveHomeCount } from '../../../Utils/Api.js' let app = getApp(); export default { @@ -85,6 +86,18 @@ }; }, onLoad() { + //管理员 + if (this.userInfo.secUser.objectType == 1) { + this.funcList = [{ + title: '收款记录', + url: '../../index/collectNotes/collectNotes', + img: '../../../static/img/home6.png' + } + ] + return; + } + + //业务员 if (this.userInfo.secUser.objectType == 3) { this.funcList = [{ @@ -196,6 +209,9 @@ if (this.userInfo.secUser.objectType == 5) { this.storemoveHomeCount(); } + if(this.userInfo.secUser.objectType == 1){ + this.AdimoveHomeCount(); + } this.getDictionaries(); }, methods: { @@ -219,6 +235,14 @@ } }) }, + //管理员统计 + AdimoveHomeCount(){ + AdimoveHomeCount().then(res => { + if (res.return_code == '000000') { + this.auditnum = res.return_data.today; + } + }) + }, // 业务员查询统计 moveHomeCount() { moveHomeCount().then(res => {