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 @@
<view>手续费</view> <view>￥{{detailobj.serviceCharge == undefined ? '--' : detailobj.serviceCharge}}</view>
</view>
<view class="xiao">
- <view>到账金额</view> <view>￥{{(detailobj.arrivalAmount == undefined || detailobj.serviceCharge == undefined) ? '--' : ((Number(detailobj.arrivalAmount) - Number(detailobj.serviceCharge)).toFixed(2))}}</view>
+ <view>到账金额</view> <view>￥{{detailobj.arrivalAmount == undefined ? '--' : detailobj.arrivalAmount}}</view>
</view>
<!-- <view class="xiao">
<view>提现总额</view> <view>￥8923.00</view>
diff --git a/page_user/changsuo.vue b/page_user/changsuo.vue
index 2257fa7..2b68acf 100644
--- a/page_user/changsuo.vue
+++ b/page_user/changsuo.vue
@@ -12,7 +12,7 @@
搜索
</view>
</view>
- <view class="chuangj" @click="btncj">
+ <view class="chuangj" @click="btncj" v-if="type == 5">
创建场所
</view>
</view>
@@ -25,7 +25,6 @@
<image src="https://api.ccttiot.com/smartmeter/img/static/uZEQ9jhFPBFSyvHQROgi" mode=""></image><view>{{item.name}}</view>
</view>
<view class="rt">
- <!-- <view class="bang">绑定设备</view> -->
<view class="yuan">
<text></text>
<text></text>
@@ -69,12 +68,11 @@
<view class="name_two">{{item.contactMobile}}</view>
</view>
<view class="name">
- <view class="name_one" style="width: 160rpx;">详细地址：</view>
+ <view class="name_one" style="width: 128rpx;">详细地址：</view>
<view class="name_two">{{item.address}}</view>
</view>
<view class="bot">
<view class="bot_one">{{item.createTime}}</view>
- <!-- <view class="bot_two">分成比例：20%</view> -->
</view>
</view>
<view class="" style="width: 100%;text-align: center;color: #ccc;margin-top: 50rpx;">
@@ -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 @@
功能介绍
</view>
<view class="cont">
- 活动时间防护额翻江倒海剪发卡都发话东风湖恶妇活动经费呵呵核打击防护好大家复合地基阿加莎打开就是大街上打卡机就啊实打实大家hiu文化大精神会计师大数据都很好绝大部分合计等哈可接受的户外i很大刷卡机和含税单价和我iU盾哈刷卡机鼎汉技术孤岛惊魂上东国际花洒山东高速结婚蛋糕
- </view>
+ {{obj.funcInfo == undefined ? '' : obj.funcInfo}}
+ </view>
</view>
- <view class="shuom" style="height: 160rpx;margin-top: 30rpx;">
+ <view class="shuom" style="max-height: 200rpx;margin-top: 30rpx;">
<view class="shuomtit">
设备地址
</view>
<view class="shuomwz">
- {{obj.storeAddress == undefined ? '' : obj.storeAddress}}
+ <image style="width: 30rpx;height: 30rpx;margin-right: 6rpx;" src="https://api.ccttiot.com/smartmeter/img/static/umUFE9oFeYo2Q7atp3jv" mode=""></image> {{obj.storeName == undefined ? '' : obj.storeName}} {{obj.room == undefined ? '--' : obj.room}}室
</view>
<view class="shuomwz">
- {{obj.storeName == undefined ? '' : obj.storeName}} {{obj.room == undefined ? '--' : obj.room}}
+ <image style="width: 30rpx;height: 30rpx;margin-right: 6rpx;" src="https://api.ccttiot.com/smartmeter/img/static/uHHgD7nRON3WTmomzKVE" mode=""></image> {{obj.storeAddress == undefined ? '' : obj.storeAddress}}
</view>
</view>
@@ -97,14 +97,15 @@
<u-checkbox v-model="checked" @change="checkboxChange" active-color="#8883F0 ">我已同意
</u-checkbox><text @click="btnxieyi">《用户服务协议》</text>
</u-checkbox-group>
- <view class="zf" @click="btnzhifu">
+ <view class="zf" v-if="zhifuflag" @click="btnzhifu">
立即支付
</view>
- <!-- <view class="zf" v-else>
- 立即支付
- </view> -->
+ <view class="zf" v-else>
+ 立即支付
+ </view>
</view>
</view>
+ <!-- <view class="mask" v-if="zfflag"></view> -->
<!-- 背景 -->
<view class="" style="position: fixed;top: 0;left: 0;width: 100%;height: 100vh;z-index: -1;">
@@ -121,19 +122,23 @@
我们根据选择为您提供服务
</view>
<view class="kfshuzu">
- <view class="item_val" v-for="(item,index) in 1" :key="index">
+ <view class="item_val" v-for="(item,index) in kefulist" :key="index" @click="btncall(item.mobile)">
<view class="lt">
- <image src="https://api.ccttiot.com/smartmeter/img/static/uruHLe3W460sdXr2lcxF" mode=""></image>
+ <image v-if="item.type == 2" src="https://api.ccttiot.com/smartmeter/img/static/urCSQTavLmUje5oTIsE6" mode=""></image>
+ <image v-if="item.type == 3" src="https://api.ccttiot.com/smartmeter/img/static/uE5rZZvVutxxUj9I06m5" mode=""></image>
+ <image v-if="item.type == 4" src="https://api.ccttiot.com/smartmeter/img/static/uruHLe3W460sdXr2lcxF" mode=""></image>
</view>
<view class="rt">
- <view class="">官方客服</view>
- <view class="" style="border-bottom: 1px solid #000;" @click="btncall">13850396941</view>
+ <view class="" v-if="item.type == 2">{{item.name}}</view>
+ <view class="" v-if="item.type == 3">运维人员：{{item.name}}</view>
+ <view class="" v-if="item.type == 4">酒店客服：{{item.name}}</view>
+ <view class="" style="margin-top: 10rpx;">{{item.mobile}}</view>
</view>
</view>
</view>
- <view class="qx" @click="kfflag = false">
- 取消
- </view>
+ </view>
+ <view class="qx" @click="kfflag = false" v-if="kfflag">
+ ×
</view>
<view class="mask" v-if="kfflag"></view>
@@ -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 @@
</view>
</view>
- <view class="lishi" v-if="detailobj.isUsing == true">
+ <view class="lishi" v-if="isUsing == true">
<view class="lt">
临时开关
</view>
@@ -100,7 +100,7 @@
温馨提示
</view>
<view class="img">
- <image src="https://api.ccttiot.com/smartmeter/img/static/uKtJsax2r7z7vKwSrlS5" mode=""></image>
+ <image src="https://api.ccttiot.com/smartmeter/img/static/uKR4t1SZuW0VrpwgyXDK" mode=""></image>
</view>
<view class="shuom">
结束订单后，设备也将被关闭<br>
@@ -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 @@
<template>
- <view class="pages">
+ <view class="pages" :style="containerStyle">
<u-navbar title="商家合作" :border-bottom="false" :background="bgc" back-icon-color="#3D3D3D" title-color='#3D3D3D'
title-size='36' height='44'></u-navbar>
- <view class="addmeng" :id="type == 1 ? 'active' : ''" @click.stop="blur">
+ <view class="addmeng" :id="type == 1 ? 'active' : ''">
<view class="addname">
<view class="">
<image src="https://api.ccttiot.com/smartmeter/img/static/uduwg26lodmeSs8K4AF3" mode=""></image>
您的姓名
</view>
- <input type="text" placeholder="请输入您的真实姓名" @click.stop="inp" @confirm="confirm" v-model="name"/>
+ <input type="text" placeholder="请输入您的真实姓名" @focus="focusone" @blur="blurone" v-model="name"/>
</view>
<view class="addname">
<view class="">
<image src="https://api.ccttiot.com/smartmeter/img/static/uduwg26lodmeSs8K4AF3" mode=""></image>
您的手机号
</view>
- <input type="text" placeholder="请输入您的手机号" @click.stop="inp" @confirm="confirm" v-model="tel"/>
+ <input type="text" placeholder="请输入您的手机号" @focus="focustwo" @blur="blurtwo" v-model="tel"/>
</view>
<view class="addname">
<view class="">
<image src="https://api.ccttiot.com/smartmeter/img/static/uduwg26lodmeSs8K4AF3" mode=""></image>
了解信息
</view>
- <input type="text" placeholder="请输入您想了解的信息" @click.stop="inp" @blur="blur" @confirm="confirm" v-model="msg"/>
+ <input type="text" placeholder="请输入您想了解的信息" @focus="focusthr" @blur="blurthr" v-model="msg"/>
</view>
<view class="tit">
请输入您的真实有效信息，我们将在第一时间联系您
@@ -40,7 +40,7 @@
</view>
- <view class="" style="position: fixed;top: 0;left: 0;width: 100%;height: 100vh;z-index: -1;" @click.stop="blur">
+ <view class="" style="position: fixed;top: 0;left: 0;width: 100%;height: 100vh;z-index: -1;">
<image style="width: 100%;height: 100vh;"
src="https://api.ccttiot.com/smartmeter/img/static/ufnAAnuAD7GhhA1EFXXL" mode=""></image>
</view>
@@ -58,11 +58,11 @@
tel:'',
msg:'',
tjflag:true,
- type:''
+ type:'',
}
},
onLoad() {
-
+ this.getuserinfo()
},
// 分享到好友（会话）
onShareAppMessage: function() {
@@ -80,21 +80,33 @@
path: '/pages/index/index'
}
},
- methods: {
+ methods: {
+ focusone(){
+ this.type = 1
+ },
+ blurone(){
+ this.type = ''
+ },
+ focustwo(){
+ this.type = 1
+ },
+ blurtwo(){
+ this.type = ''
+ },
+ focusthr(){
+ this.type = 1
+ },
+ blurthr(){
+ this.type = ''
+ },
+
+
btnxq(){
uni.navigateTo({
url:'/page_fenbao/sjhzxq'
})
},
- confirm(){
- this.type = ''
- },
- inp(){
- this.type = 1
- },
- blur(){
- this.type = ''
- },
+
getuserinfo() {
this.$u.get("/app/user/userInfo").then((res) => {
if (res.code == 200) {
diff --git a/page_user/tixian.vue b/page_user/tixian.vue
index cf6bb00..b4a5470 100644
--- a/page_user/tixian.vue
+++ b/page_user/tixian.vue
@@ -65,19 +65,22 @@
提现说明：
</view>
<view class="tx_wz">
- -提现额度：单笔提现金额最低1元
+ -提现额度：单笔提现金额最低20元
</view>
<view class="tx_wz">
-到账时间：3个工作日内
</view>
- <view class="tx_wz">
- -提现手续费：3%
+ <view class="tx_wz" v-if="serviceType == 1">
+ -提现手续费：{{serviceRate}}%
+ </view>
+ <view class="tx_wz" v-else>
+ -提现手续费：{{serviceRate}}元
</view>
</view>
<view class="butan" @click="sub" v-if="btnmsk">
确定提现
</view>
- <view class="butan" @click="sub" v-else>
+ <view class="butan" v-else>
确定提现
</view>
</view>
diff --git a/pages/myorder/returned/index.vue b/pages/myorder/returned/index.vue
index 1fa7456..aa73a7a 100644
--- a/pages/myorder/returned/index.vue
+++ b/pages/myorder/returned/index.vue
@@ -8,7 +8,7 @@
<view>
<view class="swiper-item ">
<view class="card_box" v-for="(item,index) in wateringList" :key="index">
- <view class="card" @click="btnxq(item.deviceId)">
+ <view class="card" @click="btnxq(item)">
<view class="lt">
<view class="card_left">
<view class="card_left_tit">
@@ -146,10 +146,11 @@
});
}
},
- btnxq(id) {
- // uni.navigateTo({
- // url: '/page_user/sbdetail?id=' + id
- // })
+ btnxq(item) {
+ // console.log(item.deviceNo);
+ uni.navigateTo({
+ url: '/page_user/fuwu?id=' + item.deviceNo
+ })
},
}
}