diff --git a/page_fenbao/device/index.vue b/page_fenbao/device/index.vue index ebf8e1e..198a4cc 100644 --- a/page_fenbao/device/index.vue +++ b/page_fenbao/device/index.vue @@ -17,7 +17,7 @@ 智能开关 - MAC:{{item.localName.substring(6)}} + MAC:{{item.localName.substring(5)}} diff --git a/page_fenbao/statulist/myshop/shopxx/index.vue b/page_fenbao/statulist/myshop/shopxx/index.vue index 8b80d33..64b13c4 100644 --- a/page_fenbao/statulist/myshop/shopxx/index.vue +++ b/page_fenbao/statulist/myshop/shopxx/index.vue @@ -145,6 +145,9 @@ } }, onLoad() { + + }, + onShow() { this.getQiniuToken() }, methods: { @@ -163,9 +166,9 @@ success: function(res) { let str = JSON.parse(res.data) console.log(str.key) - _this.userImgs = 'https://api.ccttiot.com/' + str.key - _this.imglist = _this.userImgs - _this.imgflag = false + _this.userImgs = 'https://api.ccttiot.com/' + str.key + _this.imglist = _this.userImgs + _this.imgflag = false } }) }, diff --git a/page_user/sbdetail.vue b/page_user/sbdetail.vue index 8fa1de2..988d507 100644 --- a/page_user/sbdetail.vue +++ b/page_user/sbdetail.vue @@ -15,8 +15,14 @@ - - + + + @@ -447,13 +453,14 @@ url: '/page_user/cbRecord?id=' + this.id }) } else if (num == 1) { + let that = this uni.showModal({ title: '提示', content: '您确定要将电表时间归零吗?', success: function(res) { if (res.confirm) { //归零 - this.$u.put(`/app/device/${this.id}/reset`).then((res) => { + that.$u.put(`/app/device/${that.id}/reset`).then((res) => { if (res.code == 200) { console.log(res.data); uni.showToast({ @@ -461,7 +468,7 @@ icon: 'none', duration: 2000 }) - this.getDevice(this.id) + that.getDevice(that.id) } else if (res.msg == '设备剩余时间不足,无需归零') { uni.showToast({ title: '设备剩余时间不足,无需归零', @@ -998,12 +1005,12 @@ margin-left: 19rpx; // width: 38rpx; // height: 23rpx; - padding: 5rpx 10rpx; + padding: 0 10rpx; box-sizing: border-box; background: rgba(204, 204, 204, 0); opacity: 1; border: 2rpx solid #8883F0; - border-radius: 40rpx; + border-radius: 15rpx; font-size: 26rpx; font-family: HarmonyOS Sans SC, HarmonyOS Sans SC; font-weight: 400; diff --git a/page_user/wifijoint/index.vue b/page_user/wifijoint/index.vue index 9500161..d5ec550 100644 --- a/page_user/wifijoint/index.vue +++ b/page_user/wifijoint/index.vue @@ -115,9 +115,9 @@ content: '小程序与设备异常断开', showCancel: false, success: function(res) { - // uni.navigateBack({ - // url: '../search/search' - // }); + uni.navigateTo({ + url:'/pages/index/index' + }) } }); this.statusflag = false diff --git a/pages/index/index.vue b/pages/index/index.vue index 8989bcb..c0ea6f3 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -23,7 +23,7 @@ - + {{item.name.length > 5 ? item.name.slice(0, 5) + '...' : item.name}} diff --git a/pages/shouye/index.vue b/pages/shouye/index.vue index 270bb1b..fe72f1b 100644 --- a/pages/shouye/index.vue +++ b/pages/shouye/index.vue @@ -65,8 +65,6 @@ - -