diff --git a/common/http.interceptor.js b/common/http.interceptor.js index 146db5e..f07521f 100644 --- a/common/http.interceptor.js +++ b/common/http.interceptor.js @@ -20,7 +20,7 @@ const install = (Vue, vm) => { // }, // }); Vue.prototype.$u.http.setConfig({ - baseUrl: 'http://192.168.2.87/dev-api', + baseUrl: 'https://znb.ccttiot.com/dev-api', loadingText: '努力加载中~', loadingTime: 800, // 设置自定义头部content-type @@ -81,29 +81,29 @@ const install = (Vue, vm) => { // }) // // return res.result; // } - if(res.code == 30003) { + if(res.code == 401) { // res为服务端返回值，可能有code，result等字段 // 这里对res.result进行返回，将会在this.$u.post(url).then(res => {})的then回调中的res的到 // 如果配置了originalData为true，请留意这里的返回值 - + // return res.result; - - uni.login({ - success: function(ret) { - console.log("main.js==>res", ret) - vm.$u.post('/user/login',{"js_code": ret.code}).then(res=>{ - if (res.code == 10003) { - // console.log("新用户登录") - uni.setStorageSync('token', res.data); + + // uni.login({ + // success: function(ret) { + // console.log("main.js==>res", ret) + // vm.$u.post('/user/login',{"js_code": ret.code}).then(res=>{ + // if (res.code == 10003) { + // // console.log("新用户登录") + // uni.setStorageSync('token', res.data); - } else if (res.code == 200) { - // console.log("老用户登录",res.data) - uni.setStorageSync('token', res.data); + // } else if (res.code == 200) { + // // console.log("老用户登录",res.data) + // uni.setStorageSync('token', res.data); - } - }); - } - }); + // } + // }); + // } + // }); } return res; diff --git a/pages.json b/pages.json index 3c3eecb..2b9f72d 100644 --- a/pages.json +++ b/pages.json @@ -2,7 +2,7 @@ "easycom": { "^u-(.*)": "uview-ui/components/u-$1/u-$1.vue" }, - "lazyCodeLoading": "requiredComponents", + "lazyCodeLoading": "requiredComponents", "pages": [{ "path": "pages/index/index", "style": { @@ -14,9 +14,38 @@ } }, { - "path" : "pages/tj", - "style" : - { + "path": "pages/device/index", + "style": { + "navigationBarTitleText": "添加设备", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#3996FD", + "navigationBarTextStyle": "#FFFFFF", + "navigationStyle": "custom" + } + }, + { + "path": "pages/wifilist/index", + "style": { + "navigationBarTitleText": "添加设备", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#3996FD", + "navigationBarTextStyle": "#FFFFFF", + "navigationStyle": "custom" + } + }, + { + "path": "pages/wifilist/connect/index", + "style": { + "navigationBarTitleText": "添加设备", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#3996FD", + "navigationBarTextStyle": "#FFFFFF", + "navigationStyle": "custom" + } + }, + { + "path": "pages/tj", + "style": { "navigationBarTitleText": "我的", "enablePullDownRefresh": false, "navigationBarBackgroundColor": "#3996FD", @@ -25,19 +54,37 @@ } }, { - "path" : "pages/upload/upload", - "style" : - { - "navigationBarTitleText": "上传", - "enablePullDownRefresh": false, - "navigationStyle": "custom" - } - + "path": "pages/opinion/index", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#3996FD", + "navigationBarTextStyle": "#FFFFFF", + "navigationStyle": "custom" + } }, { - "path" : "pages/my", - "style" : - { + "path": "pages/userpage/switchs", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#3996FD", + "navigationBarTextStyle": "#FFFFFF", + "navigationStyle": "custom" + } + }, + { + "path": "pages/upload/upload", + "style": { + "navigationBarTitleText": "上传", + "enablePullDownRefresh": false, + "navigationStyle": "custom" + } + + }, + { + "path": "pages/my", + "style": { "navigationBarTitleText": "我的", "enablePullDownRefresh": false, "navigationBarBackgroundColor": "#3996FD", @@ -46,9 +93,8 @@ } }, { - "path" : "pages/userpage/chongzhi", - "style" : - { + "path": "pages/userpage/chongzhi", + "style": { "navigationBarTitleText": "", "navigationBarBackgroundColor": "#4473f6", "enablePullDownRefresh": false, @@ -56,9 +102,8 @@ } }, { - "path" : "pages/userpage/shouzhi", - "style" : - { + "path": "pages/userpage/shouzhi", + "style": { "navigationBarTitleText": "", "navigationBarBackgroundColor": "#4473f6", "enablePullDownRefresh": false, @@ -66,9 +111,8 @@ } }, { - "path" : "pages/shebei/ewm", - "style" : - { + "path": "pages/shebei/ewm", + "style": { "navigationBarTitleText": "", "navigationBarBackgroundColor": "#4473f6", "enablePullDownRefresh": false, @@ -76,9 +120,8 @@ } }, { - "path" : "pages/shebei/fenzu", - "style" : - { + "path": "pages/shebei/fenzu", + "style": { "navigationBarTitleText": "", "navigationBarBackgroundColor": "#4473f6", "enablePullDownRefresh": false, @@ -86,9 +129,8 @@ } }, { - "path" : "pages/shebei/setting", - "style" : - { + "path": "pages/shebei/setting", + "style": { "navigationBarTitleText": "", "navigationBarBackgroundColor": "#4473f6", "enablePullDownRefresh": false, @@ -96,9 +138,8 @@ } }, { - "path" : "pages/userpage/fztx", - "style" : - { + "path": "pages/userpage/fztx", + "style": { "navigationBarTitleText": "", "navigationBarBackgroundColor": "#4473f6", "enablePullDownRefresh": false, @@ -106,9 +147,8 @@ } }, { - "path" : "pages/shebei/eletj", - "style" : - { + "path": "pages/shebei/eletj", + "style": { "navigationBarTitleText": "", "navigationBarBackgroundColor": "#4473f6", "enablePullDownRefresh": false, @@ -116,9 +156,8 @@ } }, { - "path" : "pages/shebei/sbdetail", - "style" : - { + "path": "pages/shebei/sbdetail", + "style": { "navigationBarTitleText": "", "navigationBarBackgroundColor": "#4473f6", "enablePullDownRefresh": false, @@ -126,9 +165,8 @@ } }, { - "path" : "pages/userpage/skzh", - "style" : - { + "path": "pages/userpage/skzh", + "style": { "navigationBarTitleText": "", "navigationBarBackgroundColor": "#4473f6", "enablePullDownRefresh": false, @@ -136,9 +174,8 @@ } }, { - "path" : "pages/userpage/bdcard", - "style" : - { + "path": "pages/userpage/bdcard", + "style": { "navigationBarTitleText": "", "navigationBarBackgroundColor": "#4473f6", "enablePullDownRefresh": false, @@ -146,9 +183,8 @@ } }, { - "path" : "pages/userpage/order_detail", - "style" : - { + "path": "pages/userpage/order_detail", + "style": { "navigationBarTitleText": "", "navigationBarBackgroundColor": "#4473f6", "enablePullDownRefresh": false, @@ -156,9 +192,8 @@ } }, { - "path" : "pages/userpage/cbRecord", - "style" : - { + "path": "pages/userpage/cbRecord", + "style": { "navigationBarTitleText": "", "navigationBarBackgroundColor": "#4473f6", "enablePullDownRefresh": false, @@ -166,9 +201,8 @@ } }, { - "path" : "pages/userpage/czRecord", - "style" : - { + "path": "pages/userpage/czRecord", + "style": { "navigationBarTitleText": "", "navigationBarBackgroundColor": "#4473f6", "enablePullDownRefresh": false, @@ -176,9 +210,8 @@ } }, { - "path" : "pages/userpage/glRecord", - "style" : - { + "path": "pages/userpage/glRecord", + "style": { "navigationBarTitleText": "", "navigationBarBackgroundColor": "#4473f6", "enablePullDownRefresh": false, @@ -186,9 +219,8 @@ } }, { - "path" : "pages/userpage/userSet", - "style" : - { + "path": "pages/userpage/userSet", + "style": { "navigationBarTitleText": "", "navigationBarBackgroundColor": "#4473f6", "enablePullDownRefresh": false, @@ -196,9 +228,8 @@ } }, { - "path" : "pages/userpage/czindex", - "style" : - { + "path": "pages/userpage/czindex", + "style": { "navigationBarTitleText": "", "navigationBarBackgroundColor": "#4473f6", "enablePullDownRefresh": false, @@ -206,15 +237,14 @@ } }, { - "path" : "pages/login/login", - "style" : - { - "navigationBarTitleText" : "", - "enablePullDownRefresh" : false, + "path": "pages/login/login", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": false, "navigationStyle": "custom" } } - + ], // "subPackages": [{ diff --git a/pages/device/index.vue b/pages/device/index.vue new file mode 100644 index 0000000..914d7ed --- /dev/null +++ b/pages/device/index.vue @@ -0,0 +1,229 @@ + + + + + \ No newline at end of file diff --git a/pages/index/index.vue b/pages/index/index.vue index 48f5812..86fd254 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -3,13 +3,14 @@ - + 设备 + @@ -23,7 +24,7 @@ {{ deviceInfo.deviceName }} - 电表号：{{ deviceInfo.deviceId }} + 电表号：{{ deviceInfo.deviceId }}
在线
离线
 @@ -40,15 +41,15 @@ - 150KWH + {{deviceInfo.totalElectriQuantity}}KWH - 总电量 + 总用电量 - 0.5元/度 + {{deviceInfo.price}}元/度 电价 @@ -78,24 +79,30 @@ 其他 - + 异常 - + + + + + 抄表 + + @@ -104,21 +111,24 @@ - + + - + {{item}} - + + - + - - - - + + + + {{item.deviceName}}电表 @@ -134,7 +144,7 @@ - + @@ -148,9 +158,10 @@ - + - + + @@ -160,12 +171,22 @@ 扫码添加 - + 添加方式 需要添加设备后方可使用 + + + + + 添加方式 + 扫码添加 + 搜索附近设备添加 + + @@ -177,48 +198,59 @@ return { bgc: { backgroundColor: "#F7FAFE", - + }, - deviceInfo:{}, - loadings:false, - info:'', - tittxt:"首页", + deviceInfo: {}, + loadings: false, + info: '', + tittxt: "首页", titlist: [ - "全部", - "电表", - "水表", - - ], - curtitidx:0, - background: ['color1', 'color2', 'color3'], - indicatorDots: true, - autoplay: true, - interval: 2000, - duration: 500, - deviceList:[], - userType:'' + "全部", + "电表", + "水表", + + ], + curtitidx: 0, + background: ['color1', 'color2', 'color3'], + indicatorDots: true, + autoplay: true, + interval: 2000, + duration: 500, + deviceList: [], + userType: '', + addflag: false, + sbflag: true, + show: false } }, onLoad() { - if(uni.getStorageSync('userType')){ - - - this.userType=uni.getStorageSync('userType') - if(this.userType=='01'){ - this.getDeviceList() - }else if(this.userType=='00'){ - this.getdevice() - } - - }else{ - this.getuserinfo() - } - - - - + this.logins() + + + }, methods: { + logins(){ + if (uni.getStorageSync('userType')) { + this.userType = uni.getStorageSync('userType') + this.userType='01' + if (this.userType == '01') { + this.getDeviceList() + } else if (this.userType == '00') { + this.getdevice() + } + } else { + + } + this.getuserinfo() + }, + // 点击搜索附近设备进行跳转 + btnserch() { + uni.navigateTo({ + url: '/pages/device/index' + }) + }, + async initChart() { let value = 100; let value2 = this.deviceInfo.surplusElectriQuantity @@ -341,79 +373,120 @@ return chart }, // 获取设备详情 - getDevice(){ + getDevice() { this.$u.get("app/device/1").then((res) => { - - - - - // this.$forceUpdate() + // this.$forceUpdate() if (res.code == 200) { - this.deviceInfo=res.data - - this.loadings=true + this.deviceInfo = res.data + console.log(this.deviceInfo, 1111); + this.loadings = true } }); - + }, - getuserinfo(){ + getuserinfo() { this.$u.get("/app/user/userInfo").then((res) => { - - - - - // this.$forceUpdate() + // this.$forceUpdate() if (res.code == 200) { - - uni.setStorageSync('userType',res.data.userType) - this.userType=res.data.userType - if(this.userType=='01'){ + + uni.setStorageSync('userType', res.data.userType) + this.userType = res.data.userType + if (this.userType == '01') { this.getDeviceList() - }else if(this.userType=='00'){ + } else if (this.userType == '00') { this.getdevice() } - + + }else{ + this.jmlogin() } }); }, - getDeviceList(){ - + jmlogin(){ + let taht =this + wx.login({ + success(res) { + if (res.code) { + console.log('登录！', res); + let data = { + wxOpenId: res.code, + + }; + taht.$u.post('/app/auth/wxLogin',data).then(res=>{ + if (res.code == 10003) { + uni.navigateTo({ + url:'/pages/login/login' + }) + + } else if (res.code == 200) { + // console.log("老用户登录",res.data) + uni.setStorageSync('token', res.token); + taht.logins() + } + }); + } + }, + + }); + }, + getDeviceList() { this.$u.get("/app/device/list").then((res) => { - - // this.$forceUpdate() + // this.$forceUpdate() if (res.code == 200) { - this.deviceList=res.rows + this.deviceList = res.rows + console.log(this.deviceList, '10101010'); + if (this.deviceList == '') { + this.addflag = true + this.sbflag = false + } else { + this.addflag = false + this.sbflag = true + } + // this.addflag = false + // this.sbflag = true - } + } }); - + }, - swiperchange(e){ - this.curtitidx=e.detail.current - console.log(e,'aaaa'); + swiperchange(e) { + this.curtitidx = e.detail.current + console.log(e, 'aaaa'); }, - getdevice(){ + getdevice() { this.$u.get("/app/device/tenant").then((res) => { - this.deviceInfo=res.data + this.deviceInfo = res.rows[0] this.initChart() }); }, - changeidx(index){ - this.curtitidx=index + changeidx(index) { + this.curtitidx = index }, - toewm(){ + toewm() { uni.navigateTo({ - url:"/pages/shebei/ewm" + url: "/pages/shebei/ewm" }) }, - toydfx(){ + toydfx() { uni.navigateTo({ - url:"/pages/shebei/eletj" + url: "/pages/shebei/eletj" }) }, - todetail(id){ + todetail(id) { uni.navigateTo({ - url:"/pages/shebei/sbdetail?id="+id + url: "/pages/shebei/sbdetail?id=" + id + }) + }, + // 跳转到抄表 + tochaobiao(){ + uni.navigateTo({ + url:'/pages/userpage/cbRecord' + }) + }, + // 点击切换设备 + switchs(){ + uni.navigateTo({ + url:'/pages/userpage/switchs' }) } } @@ -426,22 +499,25 @@ } .page { - .noDevice{ + .noDevice { margin-top: 432rpx; display: flex; align-items: center; justify-content: center; flex-wrap: wrap; - .img_box{ + + .img_box { width: 100%; display: flex; flex-wrap: wrap; justify-content: center; - image{ + + image { width: 252rpx; height: 252rpx; } - .tps{ + + .tps { margin-top: 4rpx; width: 100%; text-align: center; @@ -450,8 +526,8 @@ color: #BDBCBC; } } - - .addbutn{ + + .addbutn { margin-top: 32rpx; display: flex; align-items: center; @@ -460,12 +536,13 @@ height: 96rpx; background: #8883F0; border-radius: 16rpx; - + font-weight: 500; font-size: 36rpx; color: #FFFFFF; } - .tip{ + + .tip { margin-top: 30rpx; width: 100%; text-align: center; @@ -474,6 +551,7 @@ color: #BDBCBC; } } + .zhuhu { margin-top: 20rpx; padding: 0 40rpx; @@ -501,7 +579,11 @@ .right { margin-right: 56rpx; - + .imgs{ + width: 94rpx; + height: 94rpx; + vertical-align: bottom; + } .img1 { width: 76rpx; height: 76rpx; @@ -576,6 +658,7 @@ .bot_left { width: 210rpx; height: 190.14rpx; + margin-right: 34rpx; .echarts { width: 210rpx; @@ -631,6 +714,7 @@ display: flex; flex-wrap: nowrap; justify-content: space-around; + text-align: center; .cont { width: 110rpx; @@ -644,6 +728,7 @@ font-family: HarmonyOS Sans SC, HarmonyOS Sans SC; font-weight: 400; color: #262B37; + width: 110rpx; } .bot { @@ -679,15 +764,16 @@ margin-top: 32rpx; display: flex; flex-wrap: nowrap; - justify-content: space-around; - + // justify-content: space-around; + padding-left: 96rpx; + box-sizing: border-box; .cont { - width: 112rpx; + width: 100rpx; display: flex; flex-wrap: wrap; align-items: center; justify-content: center; - + margin-right: 92rpx; .top { image { width: 56rpx; @@ -724,79 +810,93 @@ color: #FFFFFF; } } - - .fd{ + + .fd { margin-top: 20rpx; padding: 0 40rpx; padding-bottom: 200rpx; height: 100%; - .fd_top{ + + .fd_top { display: flex; flex-wrap: nowrap; // justify-content: space-between; align-items: center; - .fd_tit{ + + .fd_tit { // width: 40%; - + margin-right: 20rpx; font-size: 36rpx; font-weight: 400; color: #95989D; } - .act1{ + + .act1 { color: #000000; } - .fd_set{ + + .fd_set { margin-left: auto; + font-size: 60rpx; } } - .swiper{ - .swiper-item{ - + + .swiper { + .swiper-item { + height: 100%; - .card_box{ + + .card_box { margin-top: 34rpx; display: flex; flex-wrap: wrap; - .card{ + + .card { display: flex; // align-items: center; margin-top: 20rpx; width: 658rpx; height: 282rpx; background: #fff; - box-shadow: 0rpx 16rpx 40rpx 0rpx rgba(255,255,255,0); + box-shadow: 0rpx 16rpx 40rpx 0rpx rgba(255, 255, 255, 0); border-radius: 24rpx 24rpx 24rpx 24rpx; - .card_left{ + + .card_left { width: 310rpx; margin-top: 46rpx; margin-left: 50rpx; - .card_left_tit{ + + .card_left_tit { font-size: 44rpx; font-family: AlibabaPuHuiTi, AlibabaPuHuiTi; font-weight: 500; color: #8883F0; } - .card_left_sta{ - - margin-top: 15rpx; - display: flex; - flex-wrap: nowrap; - align-items: center; - image{ - width: 23.32rpx; - height: 36.47rpx; - + + .card_left_sta { + + margin-top: 15rpx; + display: flex; + flex-wrap: nowrap; + align-items: center; + + image { + width: 23.32rpx; + height: 36.47rpx; + + } + + .sta_txt { + margin-left: 15rpx; + color: #262B37; + font-size: 24rpx; + font-family: HarmonyOS Sans SC, HarmonyOS Sans SC; + font-weight: 400; + } } - .sta_txt{ - margin-left: 15rpx; - color: #262B37; - font-size: 24rpx; - font-family: HarmonyOS Sans SC, HarmonyOS Sans SC; - font-weight: 400; - } - } - .card_left_no{ + + .card_left_no { margin-top: 15rpx; font-size: 24rpx; font-family: AlibabaPuHuiTi, AlibabaPuHuiTi; @@ -804,20 +904,57 @@ color: #95989D; } } - .card_right{ + + .card_right { margin-top: 60rpx; margin-left: auto; margin-right: 94rpx; - image{ + + image { width: 63.04rpx; - height:167.48rpx ; + height: 167.48rpx; } } } } } } - + + } + } + + .popup-content { + text-align: center; + + text { + display: block; + } + + .add { + margin-top: 10rpx; + font-size: 36rpx; + color: #000000; + line-height: 80rpx; + } + + .saoma { + margin-top: 68rpx; + font-size: 40rpx; + color: #000000; + line-height: 54rpx; + border: 1px solid #ccc; + padding: 30rpx 0; + box-sizing: border-box; + } + + .sousuo { + margin-top: 46rpx; + font-size: 40rpx; + color: #000000; + line-height: 54rpx; + border: 1px solid #ccc; + padding: 30rpx 0; + box-sizing: border-box; } } \ No newline at end of file diff --git a/pages/login/login.vue b/pages/login/login.vue index 52d03b5..2ccbf5f 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -53,9 +53,9 @@ this.chooseType=false this.login=true if(num==1){ - this.usertype='00' - }else{ this.usertype='01' + }else{ + this.usertype='00' } }, getPhoneNumber(e) { @@ -106,9 +106,9 @@ async ceshi() { this.$u.get("/app/user/userInfo").then((res) => { console.log('进入跳转'); - // uni.switchTab({ - // url: '/pages/index/index' - // }) + uni.switchTab({ + url: '/pages/index/index' + }) }); }, } diff --git a/pages/opinion/index.vue b/pages/opinion/index.vue new file mode 100644 index 0000000..b4c95ef --- /dev/null +++ b/pages/opinion/index.vue @@ -0,0 +1,260 @@ + + + + + \ No newline at end of file diff --git a/pages/shebei/sbdetail.vue b/pages/shebei/sbdetail.vue index a8916b0..9f52c26 100644 --- a/pages/shebei/sbdetail.vue +++ b/pages/shebei/sbdetail.vue @@ -40,15 +40,15 @@ - 150KWH + {{deviceInfo.totalElectriQuantity}}KWH - 总电量 + 总用电量 - 0.5元/度 + {{deviceInfo.price}}元/度 电价 @@ -78,19 +78,19 @@ 其他 - + 抄表 - + 归零 - + @@ -106,21 +106,18 @@ - + 房租提醒 - + 设置 - - - @@ -276,7 +273,7 @@ // console.log( this.$refs.chartRef,'1111'); const chart = await this.$refs.chart.init(echarts); - console.log(option); + console.log(option,11); chart.setOption(option) // chart.resize({ // width: uni.upx2px(210), // Convert 210rpx to pixels @@ -288,15 +285,12 @@ // 获取设备详情 getDevice(id){ this.$u.get("/app/device/"+id).then((res) => { - - - - // this.$forceUpdate() if (res.code == 200) { this.deviceInfo=res.data - console.log(this.deviceInfo.deviceId,'resres'); + console.log(this.deviceInfo,'resres'); this.loadings=true + this.initChart() } }); @@ -324,6 +318,29 @@ }) }, + // 其他部分 点击进行跳转 + topage(num){ + if(num == 0){ + uni.navigateTo({ //抄表 + url:'/pages/userpage/cbRecord' + }) + }else if(num == 1){ //归零 + uni.navigateTo({ + url:'/pages/userpage/glRecord' + }) + }else if(num == 2){ //异常 + + }else if(num == 3){ + uni.navigateTo({ //房租提醒 + url:'/pages/userpage/fztx' + }) + }else if(num == 4){ //设置 + uni.navigateTo({ + url:'/pages/userpage/userSet' + }) + } + } + } } @@ -436,7 +453,7 @@ .bot_left { width: 210rpx; height: 190.14rpx; - + margin-right: 34rpx; .echarts { width: 210rpx; height: 190.14rpx; @@ -498,8 +515,9 @@ flex-wrap: wrap; align-items: center; justify-content: center; - + text-align: center; .top { + width: 110rpx; font-size: 32rpx; font-family: HarmonyOS Sans SC, HarmonyOS Sans SC; font-weight: 400; diff --git a/pages/shebei/setting.vue b/pages/shebei/setting.vue index c32a210..f12c932 100644 --- a/pages/shebei/setting.vue +++ b/pages/shebei/setting.vue @@ -124,7 +124,7 @@ bgc: { backgroundColor: "#F7FAFE", }, - showloading: true, + showloading: false, showfz: false, show: true, list: [{ diff --git a/pages/tj.vue b/pages/tj.vue index abdcc04..e304379 100644 --- a/pages/tj.vue +++ b/pages/tj.vue @@ -4,28 +4,30 @@ 统计
- - 2024年01月 + + + + + {{yeartime.year + '年' + yeartime.month + '月'}} 本月用电量（度）
- 25.36 + {{quantity}}
-
- + - 2023年04月 + {{yeartime.year + '年' + yeartime.month + '月' + item.createDay + '日'}} - 5.30 度 + {{item.recharge}}元 @@ -42,7 +44,23 @@ }, data() { return { - + params: { + year: true, + month: true, + day: false, + hour: false, + minute: false, + second: false + }, + show: false, + yeartime: { + year: '', + month: '' + }, + timelist: '', + quantity: 0, //电量 + chartData: [], + chartday:[] } }, onLoad() { @@ -51,124 +69,177 @@ // this.initChart() // }, 300); // this.initChart() + + // 首次加载页面给现在的时间 + const now = new Date(); + this.yeartime.year = now.getFullYear() + this.yeartime.month = now.getMonth() + 1 + this.gettime() }, + onShow() { + + }, + methods: { - generateWaveData(length) { - const data = []; - for (let i = 0; i < length; i++) { - const y = Math.sin((i / (length - 1)) * Math.PI * 2); // 正弦函数生成波浪形状的y值 - data.push((y + 1) * 50); // 映射到0-100的范围 - } - return data; + // 点击获取时间 + confirm(e) { + this.yeartime = e + this.gettime() }, + // 进行获取用电量请求 + gettime() { + let data = { + year: this.yeartime.year, + month: this.yeartime.month, + groupBy: 'create_day' + } + this.$u.get('app/bill/landlordCount', data).then((res) => { + if (res.code == 200) { + this.timelist = res.data + this.chartData = this.timelist.map(item => item.recharge / 0.5) + this.chartday = this.timelist.map(item => item.createDay + '日') + console.log('用电' +this.chartData,'时间' + this.chartday) + // 求用电总度数 + this.quantity = 0 + for (let i = 0; i < this.timelist.length; i++) { + this.quantity += this.timelist[i].recharge / 0.5 + } + return this.quantity + } + }) + }, + + + generateWaveData(length) { + const data = [] + for (let i = 0; i < length; i++) { + const y = Math.sin((i / (length - 1)) * Math.PI * 2) // 正弦函数生成波浪形状的y值 + data.push((y + 1) * 50) // 映射到0-100的范围 + } + return data + }, + async initChart() { console.log('111111'); // let _this = this - - const option = { - grid: { - left: 50, - right: 10, - top: 10, - bottom: 30, - }, - xAxis: { - type: 'category', - boundaryGap: false, - axisLine: { - show: false, - }, - axisTick: { - show: false, - }, - axisLabel: { - show: true, - color: '#fff', - fontSize: 11, - rotate: 0, - }, - splitLine: { - show: false, - }, - data: ['1日', '2日', '3日', '4日', '5日', '6日', '7日'], - }, - yAxis: { - show: true, - axisLine: { - show: false, - }, - axisTick: { - show: false, - }, - axisLabel: { - show: true, - color: '#fff', - fontSize: 11, - formatter: function (value) { - // 保留两位小数，没有小数时显示00 - return value+'.00'+ '度' - }, - }, - splitLine: { - show: false, - }, - }, - visualMap: { - type: 'piecewise', - show: false, - dimension: 0, - seriesIndex: 0, - pieces: [{ - gt: 1, - lt: 3, - color: 'rgba(0, 0, 180, 0.4)', - }, - { - gt: 5, - lt: 7, - color: 'rgba(0, 0, 180, 0.4)', - }, - ], - }, - series: [{ - type: 'line', - smooth: 0.6, - symbol: 'none', - lineStyle: { - color: '#E0DBFF', - width: 4, - }, - areaStyle: { - normal: { - color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{ - offset: 0, - color: '#B4B0F7' - }, ]), - }, - }, - data: [20.00, 56.00, 30.00, 58.00, 25.00, 30.00, 45.00], - }], - }; - // console.log( this.$refs.chartRef,'1111'); - const chart = await this.$refs.chart.init(echarts); - console.log(option); + const option = { + grid: { + left: 60, + right: 10, + top: 10, + bottom: 30, + }, + xAxis: { + type: 'category', + boundaryGap: false, + axisLine: { + show: false, + }, + axisTick: { + show: false, + }, + axisLabel: { + show: true, + color: '#fff', + fontSize: 11, + rotate: 0, + }, + splitLine: { + show: false, + }, + data: ['1日', '2日', '3日', '4日', '5日', '6日', '7日'], + }, + yAxis: { + show: true, + axisLine: { + show: false, + }, + axisTick: { + show: false, + }, + axisLabel: { + show: true, + color: '#fff', + fontSize: 11, + formatter: function(value) { + // 保留两位小数，没有小数时显示00 + return value + '.00' + '度' + }, + }, + splitLine: { + show: false, + }, + }, + visualMap: { + type: 'piecewise', + show: false, + dimension: 0, + seriesIndex: 0, + pieces: [{ + gt: 1, + lt: 3, + color: 'rgba(0, 0, 180, 0.4)', + }, + { + gt: 5, + lt: 7, + color: 'rgba(0, 0, 180, 0.4)', + }, + ], + }, + series: [{ + type: 'line', + smooth: 0.6, + symbol: 'none', + lineStyle: { + color: '#E0DBFF', + width: 4, + }, + areaStyle: { + normal: { + color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{ + offset: 0, + color: '#B4B0F7' + }, ]), + }, + }, + data:[10,20,30,50,20,10,60], + }], + }; + const chart = await this.$refs.chart.init(echarts) + console.log(option,'111'); + // 给折线图赋值 + option.series[0].data = this.chartData + option.xAxis.data = this.chartday chart.setOption(option) - return chart - }, + return chart + }, + } } + \ No newline at end of file diff --git a/pages/userpage/shouzhi.vue b/pages/userpage/shouzhi.vue index c7b497e..a7c5d46 100644 --- a/pages/userpage/shouzhi.vue +++ b/pages/userpage/shouzhi.vue @@ -4,17 +4,17 @@ height='36'> - + 用户充值 - 2023-12-11 15:12:11 + {{item.createTime}} - +220.00度 + +{{item.money / item.unitPrice}}度 - ￥60.00 + ￥{{item.money}} @@ -33,14 +33,29 @@ bgc: { backgroundColor: "#F7FAFE", }, - obj:{} + obj:{}, + list:'' } }, onLoad() { - + this.getList() }, methods: { - + // 请求收支列表 + getList(){ + this.$u.get("/app/bill/list").then((res) => { + if (res.code == 200) { + this.list = res.rows + console.log(this.list,'000'); + } + }); + }, + // 点击查询收支详情 + btndetail(id){ + uni.navigateTo({ + url:'/pages/userpage/order_detail?id=' + id + }) + } } } diff --git a/pages/userpage/switchs.vue b/pages/userpage/switchs.vue new file mode 100644 index 0000000..5b04f8c --- /dev/null +++ b/pages/userpage/switchs.vue @@ -0,0 +1,58 @@ + + + + + \ No newline at end of file diff --git a/pages/userpage/userSet.vue b/pages/userpage/userSet.vue index 9d0386a..94bae78 100644 --- a/pages/userpage/userSet.vue +++ b/pages/userpage/userSet.vue @@ -88,7 +88,7 @@ - 当前为房东模式 + 当前为{{mode}} @@ -123,7 +123,7 @@ - + 退出登录 @@ -150,10 +150,30 @@ label: '用户模式' } ], + mode:'房东模式', } }, methods: { - + // 点击更换用户模式 + confirm(e){ + // console.log(e); + this.mode = e[0].label + this.gettype() + }, + // 请求修改用户类型 + gettype() { + let type = '' + if(this.mode == '房东模式'){ + type = '01' + }else if(this.mode == '用户模式'){ + type = '00' + } + this.$u.put('/app/user/changeType?userType=' + type).then((res) => { + if (res.code == 200) { + console.log(res) + } + }) + }, } } diff --git a/pages/wifilist/connect/index.vue b/pages/wifilist/connect/index.vue new file mode 100644 index 0000000..439c538 --- /dev/null +++ b/pages/wifilist/connect/index.vue @@ -0,0 +1,123 @@ + + + + + \ No newline at end of file diff --git a/pages/wifilist/index.vue b/pages/wifilist/index.vue new file mode 100644 index 0000000..e4350c8 --- /dev/null +++ b/pages/wifilist/index.vue @@ -0,0 +1,142 @@ + + + + + \ No newline at end of file diff --git a/static/dianbiao.png b/static/dianbiao.png new file mode 100644 index 0000000..4c14bf0 Binary files /dev/null and b/static/dianbiao.png differ diff --git a/static/gjsb.png b/static/gjsb.png new file mode 100644 index 0000000..beb5292 Binary files /dev/null and b/static/gjsb.png differ diff --git a/static/pz.png b/static/pz.png new file mode 100644 index 0000000..4a92232 Binary files /dev/null and b/static/pz.png differ diff --git a/static/pzs.png b/static/pzs.png new file mode 100644 index 0000000..059b60b Binary files /dev/null and b/static/pzs.png differ diff --git a/static/qiehuan.png b/static/qiehuan.png new file mode 100644 index 0000000..dda7544 Binary files /dev/null and b/static/qiehuan.png differ diff --git a/static/sm.png b/static/sm.png new file mode 100644 index 0000000..43d0c69 Binary files /dev/null and b/static/sm.png differ diff --git a/static/txx.jpg b/static/txx.jpg new file mode 100644 index 0000000..4c9e1e1 Binary files /dev/null and b/static/txx.jpg differ diff --git a/static/wifi/gx.png b/static/wifi/gx.png new file mode 100644 index 0000000..1318829 Binary files /dev/null and b/static/wifi/gx.png differ diff --git a/static/wifi/pwd.png b/static/wifi/pwd.png new file mode 100644 index 0000000..2ac4c5e Binary files /dev/null and b/static/wifi/pwd.png differ diff --git a/static/wifi/redian.png b/static/wifi/redian.png new file mode 100644 index 0000000..bc21309 Binary files /dev/null and b/static/wifi/redian.png differ diff --git a/static/wifi/wifi1.png b/static/wifi/wifi1.png new file mode 100644 index 0000000..953b110 Binary files /dev/null and b/static/wifi/wifi1.png differ