From d3c488c8d1b5251c8bc8219bc3ab79d1e0d958b7 Mon Sep 17 00:00:00 2001 From: "3321822538@qq.com" <3321822538@qq.com> Date: Fri, 11 Oct 2024 18:03:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AE=89=E5=85=A8=E4=B8=AD?= =?UTF-8?q?=E5=BF=83=20=E5=BE=85=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/http.interceptor.js | 4 +- page_components/HM-dragSorts/HM-dragSorts.vue | 2 +- page_components/eletj.vue | 19 +- page_components/fuwu/index.vue | 5 +- page_fenbao/statulist/fault/anquan.vue | 123 +++++++++ page_fenbao/statulist/fault/bangwx.vue | 124 +++++++++ page_fenbao/statulist/fault/dangqiantel.vue | 116 ++++++++ page_fenbao/statulist/fault/edittel.vue | 255 ++++++++++++++++++ page_fenbao/statulist/fault/index.vue | 250 +++++++---------- page_fenbao/statulist/fault/newpass.vue | 143 ++++++++++ page_fenbao/statulist/fault/yzmhq.vue | 187 +++++++++++++ .../statulist/myorder/detailxq/index.vue | 3 + .../statulist/taocanlist/addtaocan/index.vue | 28 +- page_user/mapditu/orderxq.vue | 5 +- page_user/sbdetail.vue | 20 +- pages.json | 50 +++- pages/shanghudd.vue | 9 +- pages/shouye/index.vue | 34 ++- 18 files changed, 1170 insertions(+), 207 deletions(-) create mode 100644 page_fenbao/statulist/fault/anquan.vue create mode 100644 page_fenbao/statulist/fault/bangwx.vue create mode 100644 page_fenbao/statulist/fault/dangqiantel.vue create mode 100644 page_fenbao/statulist/fault/edittel.vue create mode 100644 page_fenbao/statulist/fault/newpass.vue create mode 100644 page_fenbao/statulist/fault/yzmhq.vue diff --git a/common/http.interceptor.js b/common/http.interceptor.js index dec621d..9c734f5 100644 --- a/common/http.interceptor.js +++ b/common/http.interceptor.js @@ -19,8 +19,8 @@ const install = (Vue, vm) => { // }, // }); Vue.prototype.$u.http.setConfig({ - baseUrl: 'http://192.168.2.81:10002', - // baseUrl: 'https://kg.chuangtewl.com/prod-api', + // baseUrl: 'http://192.168.2.81:10002', + baseUrl: 'https://kg.chuangtewl.com/prod-api', // loadingText: '努力加载中~', // loadingTime: 1000, // 设置自定义头部content-type diff --git a/page_components/HM-dragSorts/HM-dragSorts.vue b/page_components/HM-dragSorts/HM-dragSorts.vue index 9663ca8..00d4ac8 100644 --- a/page_components/HM-dragSorts/HM-dragSorts.vue +++ b/page_components/HM-dragSorts/HM-dragSorts.vue @@ -70,10 +70,10 @@ (单次收费 智能收费) - 押金{{row.price}} {{row.value}}时 {{row.price}}元 {{row.value}}分 {{row.price}}元 {{row.value}}秒 {{row.price}}元 + 押金{{row.deposit}}元 diff --git a/page_components/eletj.vue b/page_components/eletj.vue index 20c70b7..564e201 100644 --- a/page_components/eletj.vue +++ b/page_components/eletj.vue @@ -43,7 +43,7 @@ - 时 分钟 秒 {{detaobj.suitTime}}度 - 押金 + 押金 - + + {{detaobj.suitDeposit == null ? '--' : detaobj.suitDeposit}}元 + + {{detaobj.suitPrice == null ? '--' : detaobj.suitPrice}}元 @@ -210,7 +213,7 @@ 您要提前结束此订单吗？ - 当前预估消费金额为{{Number(feeprice) < 0.01 ? '0.01' : feeprice}}元,实际消费以实际金额为准 用电量为{{Number(totalElectriQuantity) - Number(suitStartEle)}}度 @@ -305,6 +308,9 @@ if (option.flag) { this.opflag = option.flag } + setTimeout(()=>{ + this.shuaxin() + },1500) }, computed: { // 计算剩余时间 @@ -400,7 +406,7 @@ btnkq() { if (this.onlineStatus == 1) { if (this.tdtxt == '开启') { - this.$u.put(`/app/device/${this.sbid}/changePower?status=0`).then((res) => { + this.$u.put(`/app/bill/switchDevice?billId=${this.billId}&open=false`).then((res) => { if (res.code == 200) { this.tdtxt = '关闭' this.imgflag = false @@ -420,7 +426,7 @@ } }) } else { - this.$u.put(`/app/device/${this.sbid}/changePower?status=1`).then((res) => { + this.$u.put(`/app/bill/switchDevice?billId=${this.billId}&open=true`).then((res) => { if (res.code == 200) { this.imgflag = true this.tdtxt = '开启' @@ -630,6 +636,7 @@ // 点击结束订单 btnjieshu() { this.getzfqd() + this.getprice() if (this.detaobj.suitFeeMode == 1) { if (this.onlineStatus == 1) { let that = this diff --git a/page_components/fuwu/index.vue b/page_components/fuwu/index.vue index 0fb0d39..42d71fa 100644 --- a/page_components/fuwu/index.vue +++ b/page_components/fuwu/index.vue @@ -59,7 +59,7 @@ v-for="(item,index) in deviceobj.suitList" :key="index" @click="btnactive(item)"> - {{item.name.length > 4 ? item.name.substring(0,4) + '...' : item.name}} + {{item.name}} + 押金{{item.deposit}}元 diff --git a/page_fenbao/statulist/fault/anquan.vue b/page_fenbao/statulist/fault/anquan.vue new file mode 100644 index 0000000..6149b0c --- /dev/null +++ b/page_fenbao/statulist/fault/anquan.vue @@ -0,0 +1,123 @@ + + + + + \ No newline at end of file diff --git a/page_fenbao/statulist/fault/bangwx.vue b/page_fenbao/statulist/fault/bangwx.vue new file mode 100644 index 0000000..d57ba7e --- /dev/null +++ b/page_fenbao/statulist/fault/bangwx.vue @@ -0,0 +1,124 @@ + + + + + \ No newline at end of file diff --git a/page_fenbao/statulist/fault/dangqiantel.vue b/page_fenbao/statulist/fault/dangqiantel.vue new file mode 100644 index 0000000..061038a --- /dev/null +++ b/page_fenbao/statulist/fault/dangqiantel.vue @@ -0,0 +1,116 @@ + + + + + \ No newline at end of file diff --git a/page_fenbao/statulist/fault/edittel.vue b/page_fenbao/statulist/fault/edittel.vue new file mode 100644 index 0000000..800a490 --- /dev/null +++ b/page_fenbao/statulist/fault/edittel.vue @@ -0,0 +1,255 @@ + + + + + \ No newline at end of file diff --git a/page_fenbao/statulist/fault/index.vue b/page_fenbao/statulist/fault/index.vue index 67d7905..69acab7 100644 --- a/page_fenbao/statulist/fault/index.vue +++ b/page_fenbao/statulist/fault/index.vue @@ -1,32 +1,37 @@ @@ -37,14 +42,7 @@ bgc: { backgroundColor: " #8883F0", }, - pagenum: 1, - wateringList: [], - pagesize: 10, // 一页多少数据 - isLoading: false, // 是否正在加载数据 - noMoreData: false, // 是否没有更多数据 - total: 0, - keyword:'', - showflag: false + teltxt:'未绑定1' } }, onLoad() { @@ -67,80 +65,39 @@ } }, onShow() { - this.wateringList = [] - this.pagenum = 1 - this.getlist() + }, methods: { - change(index) { - this.current = index; - }, - getlist(){ this.$u.get('/app/abnormal/list?pageNum=' + this.pagenum + '&pageSize='+this.pagesize + '&keyword='+this.keyword).then((res) => { if (res.code == 200) { - this.total = res.total - if (this.total > 0) { - this.showflag = false - } else { - this.showflag = true - } - if (res.rows.length > 0) { - // 有数据，追加到列表 - this.wateringList = this.wateringList.concat(res.rows) - this.pagenum++ - } else { - // 没有更多数据 - this.noMoreData = true; - } - this.isLoading = false; + } }) }, - onReachBottom() { - let sum = this.total / this.pagesize - if (this.pagenum-1 < sum) { - this.getlist(); // 上拉加载更多 - } else { - uni.showToast({ - title: '没有更多记录了', - icon: 'none', - duration: 1000 - }); + //点击进行跳转 + btn(num){ + if(num == 1){ + if(this.teltxt == '未绑定'){ + uni.navigateTo({ + url:'/page_fenbao/statulist/fault/edittel?txt=' + this.teltxt + }) + }else{ + uni.navigateTo({ + url:'/page_fenbao/statulist/fault/dangqiantel?txt=' + this.teltxt + }) + } + }else if(num == 2){ + uni.navigateTo({ + url:'/page_fenbao/statulist/fault/bangwx' + }) + }else if(num == 3){ + uni.navigateTo({ + url:'/page_fenbao/statulist/fault/anquan' + }) } - }, - sousuo(){ - this.keyword = String(this.keyword) - this.pagenum = 1 - console.log(this.keyword); - this.$u.get('/app/abnormal/list?pageNum=' + this.pagenum + '&pageSize='+this.pagesize + '&keyword='+this.keyword).then((res) => { - if (res.code == 200) { - this.total = res.total - if (res.rows.length > 0) { - // 有数据，追加到列表 - this.wateringList = [] - this.wateringList = this.wateringList.concat(res.rows) - this.pagenum++ - } else { - this.wateringList = [] - uni.showToast({ - title: '没有相关记录了', - icon: 'none', - duration: 1000 - }); - // 没有更多数据 - this.noMoreData = true; - } - this.isLoading = false; - } - }) - }, - - btnyc(){ - uni.navigateTo({ - url:'/page_fenbao/statulist/fault/yichang/index' - }) } + } } @@ -159,79 +116,52 @@ .page { width: 750rpx; - // position: fixed; - // top: 0; - // left: 0; - .box{ - width: 750rpx; - // height: 1624rpx; - background: #F4F5F7; - padding-top: 170rpx; - padding-bottom: 200rpx; + } + .list{ + width: 668rpx; + height: 320rpx; + background: #FFFFFF; + box-shadow: 0rpx 16rpx 40rpx 0rpx rgba(42,130,228,0.1); + border-radius: 30rpx 30rpx 30rpx 30rpx; + margin: auto; + margin-top: 158rpx; + padding: 42rpx 34rpx; + box-sizing: border-box; + .list_val{ + width: 100%; + display: flex; + justify-content: space-between; + align-items: center; + border-bottom:1rpx solid #D8D8D8; + padding-bottom: 24rpx; box-sizing: border-box; - .lists{ - width: 680rpx; - height: 228rpx; - background: #FFFFFF; - border-radius: 20rpx 20rpx 20rpx 20rpx; - margin: auto; - padding: 32rpx 24rpx; - padding-top: 6rpx !important; - box-sizing: border-box; - margin-top: 20rpx; - .dahe{ - display: flex; - justify-content: space-between; - margin-top: 26rpx; - .shen{ - font-size: 28rpx; - color: #3D3D3D; - } - .qian{ - font-size: 26rpx; - color: #808080; - } + margin-top: 22rpx; + .lt{ + display: flex; + align-items: center; + font-size: 36rpx; + color: #3D3D3D; + image{ + width: 50rpx; + height: 50rpx; + margin-right: 10rpx; } } - .nav{ - width: 750rpx; - // height: 180rpx; - background: #FFFFFF; - padding: 50rpx 36rpx; - box-sizing: border-box; - // margin-bottom: 26rpx; - position: fixed; - top: 170rpx; - .top{ - .yc{ - width: 178rpx; - height: 68rpx; - background: #8883F0; - border-radius: 20rpx; - color: #FFFFFF; - line-height: 68rpx; - text-align: center; - margin-left: 28rpx; - } - display: flex; - justify-content: space-between; - /deep/ .u-content{ - border: 1px solid #ccc; - border-radius: 50rpx 0 0 50rpx !important; - } - /deep/ .u-action{ - border-radius: 0 50rpx 50rpx 0 !important; - width: 112rpx; - height: 65rpx; - line-height: 65rpx; - border: 2rpx solid #ccc; - margin-left: 0; - color: #3D3D3D; - background-color: #f2f2f2; - } - } - + .rt{ + font-size: 28rpx; + color: #808080; } } } + .biglogo{ + width: 468rpx; + height: 468rpx; + margin: auto; + margin-top: 60rpx; + image{ + margin-top: 0; + } + } + + \ No newline at end of file diff --git a/page_fenbao/statulist/fault/newpass.vue b/page_fenbao/statulist/fault/newpass.vue new file mode 100644 index 0000000..187ca60 --- /dev/null +++ b/page_fenbao/statulist/fault/newpass.vue @@ -0,0 +1,143 @@ + + + + + \ No newline at end of file diff --git a/page_fenbao/statulist/fault/yzmhq.vue b/page_fenbao/statulist/fault/yzmhq.vue new file mode 100644 index 0000000..a77bf2e --- /dev/null +++ b/page_fenbao/statulist/fault/yzmhq.vue @@ -0,0 +1,187 @@ + + + + + \ No newline at end of file diff --git a/page_fenbao/statulist/myorder/detailxq/index.vue b/page_fenbao/statulist/myorder/detailxq/index.vue index af7fb5f..4c291a9 100644 --- a/page_fenbao/statulist/myorder/detailxq/index.vue +++ b/page_fenbao/statulist/myorder/detailxq/index.vue @@ -64,6 +64,9 @@ 套餐金额￥{{detailobj.money == undefined ? '--' : detailobj.money}} + + 套餐押金￥{{detailobj.suitDeposit == undefined ? '--' : detailobj.suitDeposit}} + 退款金额￥{{detailobj.refundAmount == undefined ? '--' : detailobj.refundAmount}} diff --git a/page_fenbao/statulist/taocanlist/addtaocan/index.vue b/page_fenbao/statulist/taocanlist/addtaocan/index.vue index 3fa355f..82f5f8f 100644 --- a/page_fenbao/statulist/taocanlist/addtaocan/index.vue +++ b/page_fenbao/statulist/taocanlist/addtaocan/index.vue @@ -842,7 +842,7 @@ if (res.code == 200) { this.name = res.data.name this.qianvalue = res.data.price - this.yajinvalue = res.dangflag.deposit + this.yajinvalue = res.data.deposit this.duvalue = res.data.value this.description = res.data.description this.deviceList = res.data.deviceList @@ -873,9 +873,11 @@ if (res.data.feeMode == 1) { this.valueone = '单次收费' this.feeMode = 1 + this.yjflag = false } else { this.valueone = '智能收费' this.feeMode = 2 + this.yjflag = true } if (res.data.feeType == 1) { this.valuetwo = '计时收费' @@ -883,11 +885,11 @@ this.gmsjflag = true this.jeflag = true this.duflag = false - if(this.feeMode = 1){ - this.yjflag = false - }else{ - this.yjflag = true - } + // if(this.feeMode = 1){ + // this.yjflag = false + // }else{ + // this.yjflag = true + // } this.djflag = false this.dangflag = false } else if (res.data.feeType == 2) { @@ -896,11 +898,11 @@ this.duflag = true this.jeflag = true this.gmsjflag = false - if(this.feeMode = 1){ - this.yjflag = false - }else{ - this.yjflag = true - } + // if(this.feeMode = 1){ + // this.yjflag = false + // }else{ + // this.yjflag = true + // } this.djflag = false this.dangflag = false } else if (res.data.feeType == 3) { @@ -909,7 +911,7 @@ this.gmsjflag = false this.jeflag = false this.duflag = false - this.yjflag = true + // this.yjflag = true this.djflag = true this.dangflag = false } else if (res.data.feeType == 4) { @@ -919,7 +921,7 @@ this.dangflag = true this.jeflag = false this.duflag = false - this.yjflag = true + // this.yjflag = true this.djflag = false } if (res.data.gearTime.length > 0) { diff --git a/page_user/mapditu/orderxq.vue b/page_user/mapditu/orderxq.vue index c1a79e9..33015cf 100644 --- a/page_user/mapditu/orderxq.vue +++ b/page_user/mapditu/orderxq.vue @@ -33,7 +33,7 @@ - 用户{{detailobj.userMobile == undefined ? '--' : detailobj.userMobile}} + 用户{{detailobj.userName == undefined ? '--' : detailobj.userName}} 设备名称{{detailobj.deviceName == undefined ? '--' : detailobj.deviceName}} @@ -68,6 +68,9 @@ 套餐金额￥{{detailobj.money == undefined ? '--' : detailobj.money}} + + 套餐押金￥{{detailobj.suitDeposit == undefined ? '--' : detailobj.suitDeposit}} + 退款金额￥{{detailobj.refundAmount == undefined ? '--' : detailobj.refundAmount}} diff --git a/page_user/sbdetail.vue b/page_user/sbdetail.vue index 85ad9fa..cb33088 100644 --- a/page_user/sbdetail.vue +++ b/page_user/sbdetail.vue @@ -1252,6 +1252,11 @@ } // } } else if (num == 6) { + uni.pageScrollTo({ + scrollTop: 0,//滚动到距离顶部为0 + duration: 0//滚动时长 + }) + this.btnmsk = false this.vipflag = true this.focus = true @@ -1569,6 +1574,9 @@