diff --git a/common/http.interceptor.js b/common/http.interceptor.js index 02a1480..14b0395 100644 --- a/common/http.interceptor.js +++ b/common/http.interceptor.js @@ -5,7 +5,7 @@ const install = (Vue, vm) => { Vue.prototype.$u.http.setConfig({ // baseUrl: 'http://61.174.243.28:15861', // baseUrl: 'http://192.168.2.46:8080', - // baseUrl: 'http://124.221.246.124:2289', + // baseUrl: 'https://che.chuangtewl.com/prod-api', // baseUrl: 'https://dianche.chuantewulian.cn/prod-api', baseUrl: 'https://dche.ccttiot.com/prod-api', loadingText: '努力加载中~', diff --git a/page_vip/buyCard.vue b/page_vip/buyCard.vue new file mode 100644 index 0000000..cf60c34 --- /dev/null +++ b/page_vip/buyCard.vue @@ -0,0 +1,415 @@ + + + + + \ No newline at end of file diff --git a/page_vip/checkCard.vue b/page_vip/checkCard.vue new file mode 100644 index 0000000..f32a730 --- /dev/null +++ b/page_vip/checkCard.vue @@ -0,0 +1,56 @@ + + + + + \ No newline at end of file diff --git a/pages.json b/pages.json index 42ce1e2..a99b59d 100644 --- a/pages.json +++ b/pages.json @@ -214,6 +214,15 @@ "enablePullDownRefresh": false, "navigationStyle": "custom" } + }, + { + "path" : "checkCard", + "style" : + { + "navigationBarTitleText": "上传", + "enablePullDownRefresh": false, + "navigationStyle": "custom" + } } diff --git a/pages/index/index.vue b/pages/index/index.vue index 4701b25..e896f0d 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -1506,106 +1506,111 @@ }, deviceInfo(num) { if (uni.getStorageSync('token')) { - - this.$u.get('/app/device/info?sn=' + this.sn).then((res) => { - if (res.code === 200) { - this.isqrcode = true - this.deviceInfos = res.data; - if (!this.orderinfo.sn) { - this.mac = res.data.mac - } - if (num == 0) { - this.showdevice = true; - this.type = 0; - if (this.areaInfo.areaId != res.data.areaId) { - this.getArea() + + if(this.sn){ + this.$u.get('/app/device/info?sn=' + this.sn).then((res) => { + if (res.code === 200) { + this.isqrcode = true + this.deviceInfos = res.data; + if (!this.orderinfo.sn) { + this.mac = res.data.mac } - // this.routePlanning(res.data.latitude, res.data.longitude) - // setTimeout(() => { - - // // this.deviceIndex = 1; - // }, 600) - } else { - // if (this.deviceInfos.onlineStatus == 0) { - // wx.showToast({ - // title: '车辆离线中,请使用其他车辆', - // icon: 'none', - // duration: 4000 - // }); - // } else - if (this.deviceInfos.status == 0) { - uni.showToast({ - title: '车辆未上架,请使用其他车辆', - icon: 'none', - duration: 4000 - }); - } else if (this.deviceInfos.status == 2) { - uni.showToast({ - title: '车辆预约中,请使用其他车辆', - icon: 'none', - duration: 4000 - }); - } else if (this.deviceInfos.status == 3) { - uni.showToast({ - title: '车辆骑行中,请使用其他车辆', - icon: 'none', - duration: 4000 - }); - } else if (this.deviceInfos.status == 4) { - uni.showToast({ - title: '车辆临时锁车中,请使用其他车辆', - icon: 'none', - duration: 4000 - }); - } else if (this.deviceInfos.status == 6) { - uni.showToast({ - title: '车辆调度中,请使用其他车辆', - icon: 'none', - duration: 4000 - }); - } else if (this.deviceInfos.status == 8) { - uni.showToast({ - title: '车辆下线中,请使用其他车辆', - icon: 'none', - duration: 4000 - }); - } else if (this.deviceInfos.status == 9) { - uni.showToast({ - title: '车辆已废弃,请使用其他车辆', - icon: 'none', - duration: 4000 - }); - } else if (this.deviceInfos.status == 7) { - uni.showToast({ - title: '车辆未上线,请使用其他车辆', - icon: 'none', - duration: 4000 - }); - } else if (this.deviceInfos.status == 1) { - + if (num == 0) { + this.showdevice = true; + this.type = 0; if (this.areaInfo.areaId != res.data.areaId) { this.getArea() } // this.routePlanning(res.data.latitude, res.data.longitude) - setTimeout(() => { - this.showdevice = true - this.type = 1; - this.deviceIndex = 1; - }, 600) - + // setTimeout(() => { + + // // this.deviceIndex = 1; + // }, 600) + } else { + // if (this.deviceInfos.onlineStatus == 0) { + // wx.showToast({ + // title: '车辆离线中,请使用其他车辆', + // icon: 'none', + // duration: 4000 + // }); + // } else + if (this.deviceInfos.status == 0) { + uni.showToast({ + title: '车辆未上架,请使用其他车辆', + icon: 'none', + duration: 4000 + }); + } else if (this.deviceInfos.status == 2) { + uni.showToast({ + title: '车辆预约中,请使用其他车辆', + icon: 'none', + duration: 4000 + }); + } else if (this.deviceInfos.status == 3) { + uni.showToast({ + title: '车辆骑行中,请使用其他车辆', + icon: 'none', + duration: 4000 + }); + } else if (this.deviceInfos.status == 4) { + uni.showToast({ + title: '车辆临时锁车中,请使用其他车辆', + icon: 'none', + duration: 4000 + }); + } else if (this.deviceInfos.status == 6) { + uni.showToast({ + title: '车辆调度中,请使用其他车辆', + icon: 'none', + duration: 4000 + }); + } else if (this.deviceInfos.status == 8) { + uni.showToast({ + title: '车辆下线中,请使用其他车辆', + icon: 'none', + duration: 4000 + }); + } else if (this.deviceInfos.status == 9) { + uni.showToast({ + title: '车辆已废弃,请使用其他车辆', + icon: 'none', + duration: 4000 + }); + } else if (this.deviceInfos.status == 7) { + uni.showToast({ + title: '车辆未上线,请使用其他车辆', + icon: 'none', + duration: 4000 + }); + } else if (this.deviceInfos.status == 1) { + + if (this.areaInfo.areaId != res.data.areaId) { + this.getArea() + } + // this.routePlanning(res.data.latitude, res.data.longitude) + setTimeout(() => { + this.showdevice = true + this.type = 1; + this.deviceIndex = 1; + }, 600) + + } } + } else { + this.showdevice = false; + this.deviceIndex = 0; + this.type = 0; + uni.showToast({ + title: res.msg, + icon: 'none', + duration: 2000 + }); } - } else { - this.showdevice = false; - this.deviceIndex = 0; - this.type = 0; - uni.showToast({ - title: res.msg, - icon: 'none', - duration: 2000 - }); - } - }); + }); + + + } + } else { console.log('判断2'); wx.login({ @@ -1625,120 +1630,124 @@ if (res.code == 200) { uni.setStorageSync('token', res.token); this.getinfo() - this.$u.get('/app/device/info?sn=' + this.sn) - .then(( - res) => { - if (res.code === 200) { - this.isqrcode = true - this.deviceInfos = res.data; - - if (num == 0) { - // this.routePlanning(res.data.latitude, - // res.data.longitude) - this.showdevice = true; - this.type = 0; - } else { - // if (this.deviceInfos - // .onlineStatus == - // 0) { - // uni.showToast({ - // title: '车辆离线中,请使用其他车辆', - // icon: 'none', - // duration: 4000 - // }); - // } else - if (this.deviceInfos - .status == - 0) { - uni.showToast({ - title: '车辆未上架,请使用其他车辆', - icon: 'none', - duration: 4000 - }); - } else if (this.deviceInfos - .status == - 2) { - uni.showToast({ - title: '车辆预约中,请使用其他车辆', - icon: 'none', - duration: 4000 - }); - } else if (this.deviceInfos - .status == - 3) { - uni.showToast({ - title: '车辆骑行中,请使用其他车辆', - icon: 'none', - duration: 4000 - }); - } else if (this.deviceInfos - .status == - 4) { - uni.showToast({ - title: '车辆临时锁车中,请使用其他车辆', - icon: 'none', - duration: 4000 - }); - } else if (this.deviceInfos.status == - 6) { - uni.showToast({ - title: '车辆调度中,请使用其他车辆', - icon: 'none', - duration: 4000 - }); - } else if (this.deviceInfos - .status == - 8) { - uni.showToast({ - title: '车辆下线中,请使用其他车辆', - icon: 'none', - duration: 4000 - }); - } else if (this.deviceInfos - .status == - 9) { - uni.showToast({ - title: '车辆已废弃,请使用其他车辆', - icon: 'none', - duration: 4000 - }); - } else if (this.deviceInfos - .status == - 7) { - uni.showToast({ - title: '车辆未上线,请使用其他车辆', - icon: 'none', - duration: 4000 - }); - } else if (this.deviceInfos - .status == - 1) { - // this.routePlanning(res.data - // .latitude, res.data - // .longitude) - if (this.areaInfo != res.data - .areaId) { - this.getArea() + if(this.sn){ + this.$u.get('/app/device/info?sn=' + this.sn) + .then(( + res) => { + if (res.code === 200) { + this.isqrcode = true + this.deviceInfos = res.data; + + if (num == 0) { + // this.routePlanning(res.data.latitude, + // res.data.longitude) + this.showdevice = true; + this.type = 0; + } else { + // if (this.deviceInfos + // .onlineStatus == + // 0) { + // uni.showToast({ + // title: '车辆离线中,请使用其他车辆', + // icon: 'none', + // duration: 4000 + // }); + // } else + if (this.deviceInfos + .status == + 0) { + uni.showToast({ + title: '车辆未上架,请使用其他车辆', + icon: 'none', + duration: 4000 + }); + } else if (this.deviceInfos + .status == + 2) { + uni.showToast({ + title: '车辆预约中,请使用其他车辆', + icon: 'none', + duration: 4000 + }); + } else if (this.deviceInfos + .status == + 3) { + uni.showToast({ + title: '车辆骑行中,请使用其他车辆', + icon: 'none', + duration: 4000 + }); + } else if (this.deviceInfos + .status == + 4) { + uni.showToast({ + title: '车辆临时锁车中,请使用其他车辆', + icon: 'none', + duration: 4000 + }); + } else if (this.deviceInfos.status == + 6) { + uni.showToast({ + title: '车辆调度中,请使用其他车辆', + icon: 'none', + duration: 4000 + }); + } else if (this.deviceInfos + .status == + 8) { + uni.showToast({ + title: '车辆下线中,请使用其他车辆', + icon: 'none', + duration: 4000 + }); + } else if (this.deviceInfos + .status == + 9) { + uni.showToast({ + title: '车辆已废弃,请使用其他车辆', + icon: 'none', + duration: 4000 + }); + } else if (this.deviceInfos + .status == + 7) { + uni.showToast({ + title: '车辆未上线,请使用其他车辆', + icon: 'none', + duration: 4000 + }); + } else if (this.deviceInfos + .status == + 1) { + // this.routePlanning(res.data + // .latitude, res.data + // .longitude) + if (this.areaInfo != res.data + .areaId) { + this.getArea() + } + // this.routePlanning(res.data.latitude, res.data.longitude) + setTimeout(() => { + this.showdevice = true + this.type = 1; + this.deviceIndex = 1; + }, 600) } - // this.routePlanning(res.data.latitude, res.data.longitude) - setTimeout(() => { - this.showdevice = true - this.type = 1; - this.deviceIndex = 1; - }, 600) } + } else { + this.showdevice = false; + this.deviceIndex = 0; + this.type = 0; + uni.showToast({ + title: res.msg, + icon: 'none', + duration: 2000 + }); } - } else { - this.showdevice = false; - this.deviceIndex = 0; - this.type = 0; - uni.showToast({ - title: res.msg, - icon: 'none', - duration: 2000 - }); - } - }); + }); + + } + } else if (res.code == 501) { uni.showToast({ title: res.msg, diff --git a/pages/my.vue b/pages/my.vue index 612b45b..00df3d6 100644 --- a/pages/my.vue +++ b/pages/my.vue @@ -126,7 +126,7 @@ - + @@ -229,14 +229,14 @@ - - + + 运维人员 - + 管理人员 diff --git a/pages_admin/admin_worke.vue b/pages_admin/admin_worke.vue index 2f9be70..a38e3cf 100644 --- a/pages_admin/admin_worke.vue +++ b/pages_admin/admin_worke.vue @@ -48,7 +48,7 @@ 车辆绑定 - + 账户明细 @@ -79,7 +79,8 @@ areaInfo:{}, list: [], show: false, - info:{} + info:{}, + userinfo:{} } }, @@ -91,6 +92,7 @@ if(uni.getStorageSync('adminAreaid')){ this.areaId = uni.getStorageSync('adminAreaid') this.getArea() + this.getinfo() this.getareaList() this.getareaInfo() } @@ -102,6 +104,21 @@ }, }, methods: { + getinfo() { + this.$u.get("/getAppInfo").then((res) => { + + if (res.code == 200) { + + this.userinfo = res.user + + } else { + // setTimeout(() => { + // this.getinfo() + // }, 200) + + } + }); + }, getareaInfo() { this.$u.get('/appVerify/getDept').then((res) => { if (res.code == 200) { diff --git a/pages_admin/worke/AccountDetails.vue b/pages_admin/worke/AccountDetails.vue index 8f802a2..eec65dd 100644 --- a/pages_admin/worke/AccountDetails.vue +++ b/pages_admin/worke/AccountDetails.vue @@ -114,7 +114,8 @@ Quantity: 0, border: false, isThrottled: false, - moneyInfo:{} + moneyInfo:{}, + ownerInfo:{} } }, onLoad(e) { @@ -124,7 +125,8 @@ onShow() { if (uni.getStorageSync('adminAreaid')) { this.areaId = uni.getStorageSync('adminAreaid') - this.getlist() + + this.getowner() } this.getareaInfo() }, @@ -134,6 +136,17 @@ this.getlist(); }, methods: { + getowner(){ + this.$u.get('/appVerify/ownerType' ).then((res) => { + if (res.code == 200) { + this.ownerInfo=res.data + console.log(this.ownerInfo,'ownerTypownerTypownerTypownerTyp'); + this.getlist() + } + }).catch(error => { + console.error("Error fetching area data:", error); + }); + }, ckinpt() { if (parseFloat(this.amount) > parseFloat(this.info.withdrawableAmount)) { @@ -298,8 +311,13 @@ let data = { pageNum: this.pageNum, pageSize: this.pageSize, - areaId: this.areaId + ownerId: this.ownerInfo.ownerId, + ownerType: this.ownerInfo.ownerType, + }; + if( this.ownerInfo.ownerId==1){ + data.areaId=this.areaId + } this.$u.get('/appVerify/flowList?', data).then((res) => { if (res.code == 200) { // 确保合并新获取的数据