From 22013aeb5c39f1f39cbc95553a314b924425c4ba Mon Sep 17 00:00:00 2001 From: "3321822538@qq.com" <3321822538@qq.com> Date: Mon, 13 May 2024 15:32:48 +0800 Subject: [PATCH] aa --- common/http.interceptor.js | 4 +- page_components/eletj.vue | 8 +- page_components/fuwu/index.vue | 2 +- page_fenbao/statulist/fault/yichang/index.vue | 2 +- page_fenbao/statulist/merchant/index.vue | 2 +- .../statulist/myorder/detailxq/index.vue | 15 +- page_fenbao/statulist/myorder/index.vue | 2 +- page_fenbao/statulist/nearby/index.vue | 6 +- page_user/fenzu.vue | 15 +- page_user/mapditu/index.vue | 4 +- page_user/sbdetail.vue | 524 ++++++++---------- page_user/setting.vue | 66 +-- page_user/switchs.vue | 3 +- page_user/upload.vue | 114 ++-- page_user/userSet.vue | 2 +- page_user/wifijoint/index.vue | 2 +- pages/index/index.vue | 117 ++-- pages/shouye/index.vue | 30 +- 18 files changed, 447 insertions(+), 471 deletions(-) diff --git a/common/http.interceptor.js b/common/http.interceptor.js index c5bd91f..6e2ff30 100644 --- a/common/http.interceptor.js +++ b/common/http.interceptor.js @@ -20,10 +20,10 @@ const install = (Vue, vm) => { // }, // }); Vue.prototype.$u.http.setConfig({ - // baseUrl: 'http://192.168.2.71:3000/dev-api', + // baseUrl: 'http://192.168.2.184:3000/dev-api', baseUrl: 'https://kaiguan.chuantewulian.cn/prod-api', loadingText: '努力加载中~', - loadingTime: 800, + loadingTime: 1000, // 设置自定义头部content-type header: { 'content-type': 'application/json;charset=UTF-8', diff --git a/page_components/eletj.vue b/page_components/eletj.vue index 7085a79..65c05ea 100644 --- a/page_components/eletj.vue +++ b/page_components/eletj.vue @@ -7,7 +7,7 @@ - {{yeartime.year + '年' + yeartime.month + '月'}} + {{yeartime.year + '年' + yeartime.month + '月'}} 本月用电量（度） @@ -83,7 +83,7 @@ // }, 300); // this.initChart() setTimeout(() => { - console.log(this.$refs) + // console.log(this.$refs) this.$refs.canvas.init(this.initChart) }, 1000) this.deviceId = e.id @@ -95,6 +95,10 @@ }, methods: { confirm(e) { + setTimeout(() => { + // console.log(this.$refs) + this.$refs.canvas.init(this.initChart) + }, 1000) this.yeartime = e this.gettimes() }, diff --git a/page_components/fuwu/index.vue b/page_components/fuwu/index.vue index c30a839..21d9d07 100644 --- a/page_components/fuwu/index.vue +++ b/page_components/fuwu/index.vue @@ -148,7 +148,7 @@ } }) }else if(res.code == 401){ - uni.navigateTo({ + uni.reLaunch({ url:'/pages/login/login' }) } diff --git a/page_fenbao/statulist/fault/yichang/index.vue b/page_fenbao/statulist/fault/yichang/index.vue index 24419a0..f480b36 100644 --- a/page_fenbao/statulist/fault/yichang/index.vue +++ b/page_fenbao/statulist/fault/yichang/index.vue @@ -112,7 +112,7 @@ uni.navigateBack() },1000) } else if (res.code == 401) { - uni.navigateTo({ + uni.reLaunch({ url:'/pages/login/login' }) }else if(res.code == 500){ diff --git a/page_fenbao/statulist/merchant/index.vue b/page_fenbao/statulist/merchant/index.vue index 1d0bba4..290c66d 100644 --- a/page_fenbao/statulist/merchant/index.vue +++ b/page_fenbao/statulist/merchant/index.vue @@ -60,7 +60,7 @@ } this.$u.post("/app/mchApply/submit",data).then(res => { if(res.code == 401){ - uni.navigateTo({ + uni.reLaunch({ url:'/pages/login/login' }) }else if(res.msg == '商家不允许重复申请') { diff --git a/page_fenbao/statulist/myorder/detailxq/index.vue b/page_fenbao/statulist/myorder/detailxq/index.vue index fcc53b6..8ef1468 100644 --- a/page_fenbao/statulist/myorder/detailxq/index.vue +++ b/page_fenbao/statulist/myorder/detailxq/index.vue @@ -50,7 +50,7 @@ - + @@ -61,12 +61,14 @@ data() { return { billId:'', - detailobj:{} + detailobj:{}, + imgad:'' } }, onLoad(option) { this.billId = option.billId this.getlist() + this.getad() }, methods: { getlist(){ @@ -76,6 +78,14 @@ } }) }, + getad(){ + this.$u.get("/app/ad").then((res) => { + if (res.code == 200) { + this.imgad = res.data.picture + } + }) + }, + } } @@ -101,6 +111,7 @@ height: 238rpx; margin: auto; margin-top: 36rpx; + border-radius: 30rpx; } .listxq{ width: 680rpx; diff --git a/page_fenbao/statulist/myorder/index.vue b/page_fenbao/statulist/myorder/index.vue index 036260e..fe0d30d 100644 --- a/page_fenbao/statulist/myorder/index.vue +++ b/page_fenbao/statulist/myorder/index.vue @@ -75,7 +75,7 @@ } this.isLoading = false; }else if(res.code == 401){ - uni.navigateTo({ + uni.reLaunch({ url:'/pages/login/login' }) } diff --git a/page_fenbao/statulist/nearby/index.vue b/page_fenbao/statulist/nearby/index.vue index 9e5cf79..381d02e 100644 --- a/page_fenbao/statulist/nearby/index.vue +++ b/page_fenbao/statulist/nearby/index.vue @@ -90,8 +90,8 @@ id: parseFloat(item.storeId), latitude: item.lat, longitude: item.lng, - width: 30, - height: 40, + width: 25, + height: 30, iconPath: 'https://api.ccttiot.com/smartmeter/img/static/uZXgsJE6hXbRSwbKILB4', distance: distance // 可以在这里也添加距离到覆盖物对象中，但通常只需要在店铺对象中 }; @@ -188,7 +188,7 @@ padding-bottom: 400rpx; .moshi{ position: fixed; - top: 588rpx; + top: 570rpx; left: 30rpx; z-index: 99; image{ diff --git a/page_user/fenzu.vue b/page_user/fenzu.vue index bbeda56..cb89d6c 100644 --- a/page_user/fenzu.vue +++ b/page_user/fenzu.vue @@ -4,7 +4,7 @@ height='36'> - + @@ -142,14 +142,14 @@ } }, getgroup(){ - this.$u.get("/app/store/list").then((res) => { + this.$u.get("app/store/listCount").then((res) => { // this.$forceUpdate() if (res.code == 200) { - this.groupList=res.rows - console.log(this.groupList) + this.groupList=res.data + // console.log(this.groupList) this.firstlist= this.groupList[0] - // this.newobj = this.groupList.slice(1); - this.newobj = this.groupList + this.newobj = this.groupList.slice(1) + // this.newobj = this.groupList this.remake='' this.price='' // this.loadings=true @@ -296,6 +296,7 @@ .page { width: 750rpx; + padding-bottom: 200rpx; .popcard{ display: flex; justify-content: center; diff --git a/page_user/mapditu/index.vue b/page_user/mapditu/index.vue index 68ab422..621151a 100644 --- a/page_user/mapditu/index.vue +++ b/page_user/mapditu/index.vue @@ -149,8 +149,8 @@ id:parseFloat(item.storeId), latitude: item.lat, longitude: item.lng, - width: 30, - height: 40, + width: 25, + height: 30, iconPath: 'https://api.ccttiot.com/smartmeter/img/static/uZXgsJE6hXbRSwbKILB4' // 你可以为每个店铺指定不同的图标 }; this.covers.push(shopCover); // 将店铺覆盖物添加到数组中 diff --git a/page_user/sbdetail.vue b/page_user/sbdetail.vue index a9e0d6a..786e322 100644 --- a/page_user/sbdetail.vue +++ b/page_user/sbdetail.vue @@ -1,9 +1,9 @@ @@ -151,159 +153,45 @@ return { bgc: { backgroundColor: "#F7FAFE", - + }, ec: { lazyLoad: true }, - deviceInfo:{}, - loadings:false, - info:'', - tittxt:"设备列表", + deviceInfo: {}, + loadings: false, + info: '', + tittxt: "设备列表", titlist: [ - "全部", - "电表", - "水表", - - ], - curtitidx:0, - id:'', - timeday:'', - + "全部", + "电表", + "水表", + + ], + curtitidx: 0, + id: '', + timeday: '', + imglist: '', + token: '', + userImgs: '', + imgflag: true, } }, onLoad(option) { setTimeout(() => { - console.log(this.$refs) this.$refs.canvas.init(this.initChart) }, 1000) let id = option.id - this.id=id + this.id = id this.getDevice(id) }, + onShow() { + setTimeout(() => { + this.getDevice(this.id) + }, 1000) + this.getQiniuToken() + }, methods: { - // initChart(canvas, width, height, canvasDpr) { - // let that = this - // console.log(canvas, width, height, canvasDpr) - // let value = 100; - // let value2 = this.deviceInfo.orderAmount - // const option = { - // // backgroundColor:"#061740", - // title: { - // show: false, - // text: `历史请求满意度`, // 图表标题 - // x: 'center', - // y: '20', - // textStyle: { - // color: '#333', //'#fff', - // fontSize: 20, - // }, - // }, - // series: [{ - // type: 'pie', // 饼图类型 - // radius: ['98%', '70%'], // 饼图半径，第一个值是内半径，第二个值是外半径 - // silent: true, - // clockwise: true, - // startAngle: 90, // 起始角度 - // z: 0, - // zlevel: 0, - // data: [{ - // value: value, - // name: '占比', // 数据项名称 - // itemStyle: { - // normal: { - // color: '#8883F0', // 数据项颜色 - // }, - // }, - // label: { - // normal: { - // position: 'center', - // formatter: ` {a|${value2}}\n\n{b|订单金额}`, // 标签内容格式 - // rich: { - // a: { - // fontSize: 15, - // fontWeight: '700', - // color: '#333', - // }, - // b: { - // fontSize: 11, - // color: '#888', - // }, - // }, - // }, - // }, - // }, - // { - // value: 100 - value, - // name: '', - // label: { - // normal: { - // show: false, - // }, - // }, - // itemStyle: { - // normal: { - // color: '#173164', - // }, - // }, - // }, - // ], - // }, - // { - // type: 'gauge', // 仪表盘类型 - // radius: '130%', // 仪表盘半径，占图表容器的百分比 - // center: ['50%', '50%'], // 仪表盘中心位置 - // startAngle: 359, - // endAngle: 359.9, - // splitNumber: 2, // 刻度分割段数 - // hoverAnimation: true, - // axisTick: { - // show: true, // 是否显示刻度线 - // length: 10, // 刻度线长度 - // lineStyle: { - // color: 'auto', - // width: 1, - // }, - // }, - // splitLine: { - // length: 0, // 刻度线分隔线长度 - // lineStyle: { - // width: 1, - // color: '#061740', - // }, - // }, - // axisLabel: { - // show: true, // 是否显示刻度标签 - // }, - // pointer: { - // show: false, // 是否显示指针 - // }, - // axisLine: { - // lineStyle: { - // opacity: 0, - // }, - // }, - // detail: { - // show: false, // 是否显示仪表盘详情 - // }, - // data: [{ - // value: 0, - // name: '', - // }, ], - // }, - // ], - // }; - // chart = echarts.init(canvas, null, { - // width: width, - // height: height, - // devicePixelRatio: canvasDpr - // }) - // console.log(chart); - // // option.series[0].data = that.chartData - // canvas.setChart(chart) - // chart.setOption(option) - // return chart - // }, async initChart() { let value = 100; let value2 = this.deviceInfo.orderAmount @@ -425,127 +313,184 @@ return chart }, + getQiniuToken() { + this.$u.get("/common/qiniu/uploadInfo").then((res) => { + if (res.code == 200) { + this.token = res.token + } + }); + }, + btnpic() { + let _this = this + let math = 'static/' + _this.$u.guid(20) + uni.chooseImage({ + count: 1, + type: 'all', + success(res) { + const tempFilePaths = res.tempFiles + wx.uploadFile({ + url: 'https://up-z2.qiniup.com', + name: 'file', + filePath: tempFilePaths[0].path, + formData: { + token: _this.token, //后端返回的token + key: 'smartmeter/img/' + math + }, + success: function(res) { + let str = JSON.parse(res.data) + _this.userImgs = 'https://api.ccttiot.com/' + str.key + _this.imglist = _this.userImgs + let data = { + deviceId: _this.id, + customPicture: _this.imglist + } + _this.putdevice(data) + // setTimeout(()=>{ + // this.imglist = '' + // _this.getDevice(_this.id) + // },1000) + } + }); + } + }) + }, + putdevice(data) { + this.$u.put('/app/device', data).then((res) => { + if (res.code == 200) { + uni.showToast({ + title: '修改成功', + icon: 'none', + duration: 2000 + }) + } + }) + }, + // 获取设备详情 - getDevice(id){ - this.$u.get("/app/device/"+id).then((res) => { - // this.$forceUpdate() + getDevice(id) { + this.$u.get("/app/device/" + id).then((res) => { + // this.$forceUpdate() if (res.code == 200) { - this.deviceInfo=res.data - - let expireTimeStr = this.deviceInfo.expireTime - let expireTimeParts = expireTimeStr.split(" "); - let expireDateParts = expireTimeParts[0].split("-"); - let expireTimePartsTime = expireTimeParts[1].split(":"); - let expireDate = new Date(expireDateParts[0], expireDateParts[1]-1, expireDateParts[2], expireTimePartsTime[0], expireTimePartsTime[1], expireTimePartsTime[2]); // 注意月份是从0开始的，所以要减1 - let now = new Date(); - let differenceInMs = expireDate - now; - if(differenceInMs <= 0){ - this.timeday = 0 - }else{ - this.timeday = Math.abs(Math.floor(differenceInMs / (1000 * 60))); - } - - - this.loadings=true - this.initChart() + this.deviceInfo = res.data + if (res.data.customPicture != '自定义图片路径') { + this.imglist = res.data.customPicture + } else { + this.imglist = res.data.picture + } + let expireTimeStr = this.deviceInfo.expireTime + let expireTimeParts = expireTimeStr.split(" "); + let expireDateParts = expireTimeParts[0].split("-"); + let expireTimePartsTime = expireTimeParts[1].split(":"); + let expireDate = new Date(expireDateParts[0], expireDateParts[1] - 1, expireDateParts[2], + expireTimePartsTime[0], expireTimePartsTime[1], expireTimePartsTime[2] + ); // 注意月份是从0开始的，所以要减1 + let now = new Date(); + let differenceInMs = expireDate - now; + if (differenceInMs <= 0) { + this.timeday = 0 + } else { + this.timeday = Math.abs(Math.floor(differenceInMs / (1000 * 60))); + } + this.loadings = true + this.initChart() } }); - + }, - opendevice(){ - let stause=0 - if(this.deviceInfo.powerStatus==1){ - stause= 0 - }else{ - stause=1 + opendevice() { + let stause = 0 + if (this.deviceInfo.powerStatus == 1) { + stause = 0 + } else { + stause = 1 } - console.log(stause,'stausestause'); - this.$u.put(`/app/device/${this.deviceInfo.deviceId}/changePower?status=`+stause).then((res) => { - // this.$forceUpdate() + console.log(stause, 'stausestause'); + this.$u.put(`/app/device/${this.deviceInfo.deviceId}/changePower?status=` + stause).then((res) => { + // this.$forceUpdate() if (res.code == 200) { - // this.groupList=res.rows - setTimeout(()=>{ - this.getDevice(this.id) - },2000) - - // this.loadings=true - // this.initChart() - }else{ + // this.groupList=res.rows + setTimeout(() => { + this.getDevice(this.id) + }, 2000) + + // this.loadings=true + // this.initChart() + } else { uni.showToast({ - title: res.msg, - icon: 'none' + title: res.msg, + icon: 'none' }); } }); }, - opendevices(){ - + opendevices() { + }, - swiperchange(e){ - this.curtitidx=e.detail.current - console.log(e,'aaaa'); + swiperchange(e) { + this.curtitidx = e.detail.current + console.log(e, 'aaaa'); }, - changeidx(index){ - this.curtitidx=index + changeidx(index) { + this.curtitidx = index }, - - toydfx(){ + + toydfx() { uni.navigateTo({ - url:"/page_components/eletj?id="+this.id + url: "/page_components/eletj?id=" + this.id }) }, - - + + // 其他部分 点击进行跳转 - topage(num){ - if(num == 0){ + topage(num) { + if (num == 0) { uni.navigateTo({ //抄表 - url:'/page_user/cbRecord?id='+this.id + url: '/page_user/cbRecord?id=' + this.id }) - }else if(num == 1){ + } else if (num == 1) { //归零 - this.$u.put(`/app/device/${this.id}/reset`).then((res) => { - if (res.code == 200) { - console.log(res.data); - uni.showToast({ - title: res.data, - icon: 'none', - duration: 2000 - }); - this.getDevice(this.id) - }else if(res.msg == '设备剩余时间不足，无需归零'){ - uni.showToast({ - title: '设备剩余时间不足，无需归零', - icon: 'none', - duration: 2000 - }); - this.getDevice(this.id) - } - }) - - }else if(num == 2){ //异常 - uni.navigateTo({ - url:'/page_fenbao/statulist/fault/yichang/index' + this.$u.put(`/app/device/${this.id}/reset`).then((res) => { + if (res.code == 200) { + console.log(res.data); + uni.showToast({ + title: res.data, + icon: 'none', + duration: 2000 + }); + this.getDevice(this.id) + } else if (res.msg == '设备剩余时间不足，无需归零') { + uni.showToast({ + title: '设备剩余时间不足，无需归零', + icon: 'none', + duration: 2000 + }); + this.getDevice(this.id) + } }) - }else if(num == 3){ - - uni.navigateTo({ - url:"/page_fenbao/statulist/taocanlist/index?id="+this.id - }) - }else if(num == 4){ //设置 + + } else if (num == 2) { //异常 uni.navigateTo({ - url:'/page_user/setting?id='+this.id + url: '/page_fenbao/statulist/fault/yichang/index' + }) + } else if (num == 3) { + + uni.navigateTo({ + url: "/page_fenbao/statulist/taocanlist/index?id=" + this.id + }) + } else if (num == 4) { //设置 + uni.navigateTo({ + url: '/page_user/setting?id=' + this.id }) } } - + } } \ No newline at end of file diff --git a/page_user/setting.vue b/page_user/setting.vue index ba33a50..53a3784 100644 --- a/page_user/setting.vue +++ b/page_user/setting.vue @@ -45,7 +45,6 @@ {{listobj.deviceNo}} - @@ -56,7 +55,6 @@ {{listobj.model}} - @@ -67,7 +65,6 @@ {{listobj.wifi}} - @@ -150,7 +147,7 @@ 取消 - + 确定 @@ -195,18 +192,23 @@ price: '', showpeice: false, showremake: false, - listobj: {}, + listobj: { + deviceName:'', + storeName:'', + deviceNo:'', + model:'', + wifi:'', + }, showmc:false, pagenum: 1, wateringList: [], - pagesize: 10, // 一页多少数据 - isLoading: false, // 是否正在加载数据 - noMoreData: false, // 是否没有更多数据 + pagesize: 10, + isLoading: false, + noMoreData: false, total: 0 } }, onLoad(option) { - let id = option.id this.id = id this.getDevice(id) @@ -221,26 +223,29 @@ this.showshop = true }, confirms(e){ - console.log(e[0].label); + console.log(e); let data = { deviceId: this.id, storeId:e[0].value } - this.getlistobj(this.id) this.putdevice(data) + setTimeout(()=>{ + this.getlistobj(this.id) + },1000) }, gettanc(){ - this.$u.get('/app/store/list?pageNum=' + this.pagenum + '&pageSize=' + this.pagesize).then((res) => { + this.$u.get('/app/store/listCount').then((res) => { if (res.code == 200) { this.total = res.total - if (res.rows.length > 0) { + if (res.data.length > 0) { // 有数据，追加到列表 - let arr = res.rows.map(row => ({ + let arr = res.data.map(row => ({ value: row.storeId, // 将storeId赋值给value label: row.name // 将name赋值给label })); this.wateringList = this.wateringList.concat(arr) + this.wateringList = this.wateringList.slice(1) this.pagenum++ console.log(this.wateringList); } else { @@ -266,7 +271,6 @@ }, changeGp(item) { - console.log(item, 'changeGp'); let data = { deviceId: this.id, groupId: item.groupId @@ -298,12 +302,25 @@ } else if (num == 2) { let data = { deviceId: this.id, - price: this.price + price: this.price, } this.showpopup = false this.showpeice = false this.showmc = false this.putdevice(data) + }else if(num == 3){ + console.log(this.xgname); + let data = { + deviceId: this.id, + deviceName: this.xgname, + } + this.showpopup = false + this.showpeice = false + this.showmc = false + this.putdevice(data) + setTimeout(()=>{ + this.getlistobj(this.id) + },1000) } }, deldevice() { @@ -375,10 +392,10 @@ }, getgroup() { - this.$u.get("/app/store/list").then((res) => { + this.$u.get("/app/store/listCount").then((res) => { // this.$forceUpdate() if (res.code == 200) { - this.groupList = res.rows + this.groupList = res.data // this.loadings=true // this.initChart() @@ -409,7 +426,6 @@ display: flex; justify-content: center; flex-wrap: wrap; - // padding: 40rpx; width: 550rpx; height: 400rpx; border-radius: 20rpx; @@ -427,7 +443,6 @@ margin-top: 60rpx; width: 80%; - // width: 60%; .u-input::placeholder { font-size: 20px; color: red; @@ -445,11 +460,6 @@ align-items: center; justify-content: center; width: 50%; - // justify-content: center; - - // width: 200rpx; - // height: 70rpx; - // border-radius: 20rpx; font-size: 32rpx; font-family: HarmonyOS Sans SC, HarmonyOS Sans SC; font-weight: 400; @@ -462,11 +472,6 @@ align-items: center; justify-content: center; width: 50%; - // justify-content: center; - - // width: 200rpx; - // height: 70rpx; - // border-radius: 20rpx; font-size: 32rpx; font-family: HarmonyOS Sans SC, HarmonyOS Sans SC; font-weight: 400; @@ -482,7 +487,6 @@ padding: 16rpx 38rpx; margin: 60rpx auto 0; width: 654rpx; - // height: 734rpx; background: #FFFFFF; border-radius: 30rpx; box-shadow: 0rpx 16rpx 40rpx 0rpx rgba(42, 130, 228, 0.1); diff --git a/page_user/switchs.vue b/page_user/switchs.vue index 8a5978b..cef4f88 100644 --- a/page_user/switchs.vue +++ b/page_user/switchs.vue @@ -69,7 +69,7 @@ onLoad() { this.getdevice() }, - methods: { + methods: { confirm(e){ console.log(e,'eeeeeeeeee'); let type =e[0].value @@ -88,7 +88,6 @@ this.$u.get("/app/device/tenant").then((res) => { this.deviceList = res.rows // uni.setStorageSync('deviceId', this.deviceInfo.deviceId); - }); }, changedefort(item){ diff --git a/page_user/upload.vue b/page_user/upload.vue index 6637345..910c8f6 100644 --- a/page_user/upload.vue +++ b/page_user/upload.vue @@ -1,53 +1,46 @@