diff --git a/common/http.interceptor.js b/common/http.interceptor.js index c3a0345..134b800 100644 --- a/common/http.interceptor.js +++ b/common/http.interceptor.js @@ -20,8 +20,8 @@ const install = (Vue, vm) => { // }, // }); Vue.prototype.$u.http.setConfig({ - // baseUrl: 'http://192.168.2.81:3302', - baseUrl: 'https://kang.chuangtewl.com/prod-api', + baseUrl: 'http://192.168.2.81:3302', + // baseUrl: 'https://kang.chuangtewl.com/prod-api', loadingText: '努力加载中~', loadingTime: 800, // 设置自定义头部content-type diff --git a/page_user/caiwudetail.vue b/page_user/caiwudetail.vue index 842d89e..1bc445d 100644 --- a/page_user/caiwudetail.vue +++ b/page_user/caiwudetail.vue @@ -20,7 +20,7 @@ 手续费 ￥{{detailobj.serviceCharge == undefined ? '--' : detailobj.serviceCharge}} - 到账金额 ￥{{(detailobj.arrivalAmount == undefined || detailobj.serviceCharge == undefined) ? '--' : ((Number(detailobj.arrivalAmount) - Number(detailobj.serviceCharge)).toFixed(2))}} + 到账金额 ￥{{detailobj.arrivalAmount == undefined ? '--' : detailobj.arrivalAmount}} @@ -69,12 +68,11 @@ {{item.contactMobile}} - 详细地址： + 详细地址： {{item.address}} {{item.createTime}} - @@ -123,6 +121,17 @@ onShow() { this.pagenum = 1 this.wateringList = [] + if(this.type == 2){ + this.getlist() + }else if(this.type == 4){ + this.getlistcyz() + }else if(this.type == 3){ + this.getlistywy() + }else if(this.type == 5){ + this.getlistcs() + }else{ + console.log('11'); + } // this.getlist() }, // 分享到好友（会话） @@ -280,8 +289,6 @@ .listbox{ padding-bottom: 100rpx; box-sizing: border-box; - // height: 1260rpx; - // overflow: scroll; } .list{ width: 680rpx; @@ -407,14 +414,12 @@ .inp { display: flex; align-items: center; - // margin-top: 26rpx; margin-right: 20rpx; height: 68rpx; border: 2rpx solid #C7C7C7; width: 100%; border-radius: 20rpx; justify-content: space-between; - // padding-right: 24rpx; box-sizing: border-box; .sousuo { diff --git a/page_user/fuwu.vue b/page_user/fuwu.vue index 6d97bdd..02dc1bc 100644 --- a/page_user/fuwu.vue +++ b/page_user/fuwu.vue @@ -75,18 +75,18 @@ 功能介绍 - 活动时间防护额翻江倒海剪发卡都发话东风湖恶妇活动经费呵呵核打击防护好大家复合地基阿加莎打开就是大街上打卡机就啊实打实大家hiu文化大精神会计师大数据都很好绝大部分合计等哈可接受的户外i很大刷卡机和含税单价和我iU盾哈刷卡机鼎汉技术孤岛惊魂上东国际花洒山东高速结婚蛋糕 - + {{obj.funcInfo == undefined ? '' : obj.funcInfo}} + - + 设备地址 - {{obj.storeAddress == undefined ? '' : obj.storeAddress}} + {{obj.storeName == undefined ? '' : obj.storeName}} {{obj.room == undefined ? '--' : obj.room}}室 - {{obj.storeName == undefined ? '' : obj.storeName}} {{obj.room == undefined ? '--' : obj.room}} + {{obj.storeAddress == undefined ? '' : obj.storeAddress}} @@ -97,14 +97,15 @@ 我已同意 《用户服务协议》 - + 立即支付 - + + 立即支付 + + @@ -121,19 +122,23 @@ 我们根据选择为您提供服务 - + - + + + - 官方客服 - 13850396941 + {{item.name}} + 运维人员：{{item.name}} + 酒店客服：{{item.name}} + {{item.mobile}} - - 取消 - + + + × @@ -158,6 +163,7 @@ data() { return { jine:'', + zfflag:false, jzflag:false, progress: 0, mac:'', @@ -192,7 +198,8 @@ onlineStatus:'', kfflag:false, timer:null, - titflag:false + titflag:false, + kefulist:[] } }, onLoad(option) { @@ -273,7 +280,7 @@ // name: this.name // }) // } - // }, 2000) + // }, 2000) // }, // 点击协议跳转 btnxieyi(){ @@ -281,6 +288,14 @@ url: '/page_fenbao/shiyong?tit=' + '用户服务协议' }) }, + // 获取设备客服 + getkefu(){ + this.$u.get(`/app/device/${this.obj.deviceId}/service`).then(res => { + if(res.code == 200){ + this.kefulist = res.data + } + }) + }, // 获取设备套餐列表 getlist() { @@ -290,6 +305,7 @@ this.obj = res.data this.onlineStatus = res.data.onlineStatus this.mac = 'CTKG-' + res.data.mac + this.getkefu() }else if(res.code == 401){ uni.navigateTo({ url:'/pages/login/login' @@ -700,9 +716,9 @@ this.kfflag = true }, // 拨打客服电话 - btncall(){ + btncall(mobile){ uni.makePhoneCall({ - phoneNumber: '13850396941', + phoneNumber: mobile, success: function(res) { console.log('拨打电话成功', res) }, @@ -763,9 +779,25 @@ } } } + .qx{ + width: 68rpx; + height: 68rpx; + background: #fff; + border-radius: 50%; + text-align: center; + line-height: 68rpx; + font-size: 50rpx; + color: #3D3D3D; + margin: auto; + bottom: 420rpx; + z-index: 1; + position: fixed; + left: 50%; + transform: translateX(-50%); + } .kflist{ width: 590rpx; - height: 874rpx; + height: 778rpx; background: #FFFFFF; border-radius: 28rpx 28rpx 28rpx 28rpx; position: fixed; @@ -775,22 +807,10 @@ z-index: 1; padding-top: 48rpx; box-sizing: border-box; - .qx{ - width: 436rpx; - height: 68rpx; - background: #A29EFF; - border-radius: 40rpx 40rpx 40rpx 40rpx; - text-align: center; - line-height: 68rpx; - font-size: 32rpx; - color: #FFFFFF; - margin: auto; - margin-top: 52rpx; - } .kftit{ font-size: 40rpx; color: #3D3D3D; - font-size: 500; + font-weight: 600; width: 100%; text-align: center; } @@ -802,6 +822,8 @@ text-align: center; } .kfshuzu{ + height: 580rpx; + overflow: scroll; .item_val{ display: flex; align-items: center; @@ -816,6 +838,8 @@ margin-top: 42rpx; .lt{ margin-right: 34rpx; + padding-top: 10rpx; + box-sizing: border-box; image{ width: 76rpx; height: 78rpx; @@ -902,8 +926,9 @@ box-sizing: border-box; .cont{ margin-top: 10rpx; - max-height: 142rpx; + max-height: 120rpx; overflow: scroll; + line-height: 40rpx; } .shuomtit { font-weight: 700; @@ -915,6 +940,8 @@ font-size: 28rpx; color: #383838; margin-top: 16rpx; + display: flex; + align-items: center; } } diff --git a/page_user/mydetail.vue b/page_user/mydetail.vue index 8e4a196..66bd336 100644 --- a/page_user/mydetail.vue +++ b/page_user/mydetail.vue @@ -83,7 +83,7 @@ - + 临时开关 @@ -100,7 +100,7 @@ 温馨提示 - + 结束订单后，设备也将被关闭
@@ -191,7 +191,8 @@ deviceId: '', name: '', setMode: null, - qrResult: '' + qrResult: '', + isUsing:false } }, onLoad(option) { @@ -232,8 +233,11 @@ } else if (this.timeday.minutes > 0) { // 展示分钟和秒 return `${this.timeday.minutes}分钟${this.timeday.seconds}秒` - } else { - // 展示秒或0（如果秒也为0） + } else if(this.timeday.seconds == 0){ + this.getlist() + }else{ + // 展示秒或0（如果秒也为0） + this.isUsing = false return this.timeday.seconds > 0 ? `${this.timeday.seconds}秒` : '0' } } @@ -556,6 +560,7 @@ this.$u.get(`/app/bill/${this.billId}`).then((res) => { if (res.code == 200) { this.detailobj = res.data + this.isUsing = res.data.isUsing this.qrResult = res.data.deviceMac if (res.data.devicePowerStatus == 1) { this.imgflag = true @@ -586,6 +591,7 @@ } }) }, + // 订单倒计时定时器 startTimer() { this.timer = setInterval(() => { if (this.timeday.seconds > 0) { @@ -644,7 +650,7 @@ case xBlufi.XBLUFI_TYPE.TYPE_GET_DEVICE_LISTS: if (options.result) { let devicesarr = options.data - console.log(devicesarr,'000'); + // console.log(devicesarr,'000'); devicesarr.forEach(device => { const mac = device.name.substring(5) if (device.name.slice(5, 17) == this.qrResult) { @@ -836,7 +842,7 @@ .jieshu { width: 500rpx; - height: 530rpx; + height: 436rpx; border-radius: 20rpx; padding: 20rpx; box-sizing: border-box; @@ -855,11 +861,12 @@ .img { width: 100%; - text-align: center; - + margin-top: 20rpx; + text-align: center; + margin-bottom: 20rpx; image { - width: 260rpx; - height: 260rpx; + width: 160rpx; + height: 140rpx; } } @@ -884,6 +891,7 @@ line-height: 80rpx; border-top: 1px solid #ccc; border-right: 1px solid #ccc; + font-weight: 600; } .qued { @@ -893,6 +901,8 @@ height: 80rpx; line-height: 80rpx; border-top: 1px solid #ccc; + color: red; + font-weight: 600; } } } diff --git a/page_user/sjhezuo.vue b/page_user/sjhezuo.vue index 398dd6d..0fc1ff9 100644 --- a/page_user/sjhezuo.vue +++ b/page_user/sjhezuo.vue @@ -1,29 +1,29 @@