diff --git a/page_components/bindsz.vue b/page_components/bindsz.vue
index b2224cc..44c26f1 100644
--- a/page_components/bindsz.vue
+++ b/page_components/bindsz.vue
@@ -122,12 +122,14 @@
token: '',
userImgs: '',
url: '',
- modelid:[]
+ modelid:[],
+ sn:''
}
},
onLoad(option) {
let id = option.id
this.id = id
+ this.sn = option.sn
this.getDevice(id)
},
@@ -185,12 +187,12 @@
if (this.modelid.some(item => item == 2)) {
console.log('wifi');
uni.navigateTo({
- url: '/page_components/bindsztwo?id=' + this.id
+ url: '/page_components/bindsztwo?id=' + this.id + '&sn=' + this.sn
});
} else {
console.log('4g');
uni.navigateTo({
- url: '/page_components/bindszthr?id=' + this.id
+ url: '/page_components/bindszthr?id=' + this.id + '&sn=' + this.sn
});
}
}
@@ -198,11 +200,6 @@
}
- },
- btntiao() {
- uni.navigateTo({
- url: '/page_components/bindsztwo?id=' + this.id
- })
},
btnlyqx() {
this.shibaiflag = false
diff --git a/page_components/bindszthr.vue b/page_components/bindszthr.vue
index 276e6c4..5e2be32 100644
--- a/page_components/bindszthr.vue
+++ b/page_components/bindszthr.vue
@@ -153,12 +153,14 @@
isActive: [],
countdown: 10, // 初始倒计时时间
intervalId: null,
- contwz:''
+ contwz:'',
+ sn:''
}
},
onLoad(option) {
let id = option.id
this.id = id
+ this.sn = option.sn
},
onShow() {
this.wateringList = []
@@ -349,6 +351,9 @@
duration: 1000,
})
this.getao()
+ let data = {
+ deviceNo: this.sn
+ }
setTimeout(() => {
this.btnmsk = false
uni.reLaunch({
diff --git a/page_components/bindsztwo.vue b/page_components/bindsztwo.vue
index 02e5af3..3970b2f 100644
--- a/page_components/bindsztwo.vue
+++ b/page_components/bindsztwo.vue
@@ -132,12 +132,14 @@
token: '',
userImgs: '',
url: '',
- wifi: ''
+ wifi: '',
+ sn:''
}
},
onLoad(option) {
let id = option.id
this.id = id
+ this.sn = option.sn
},
onShow() {
this.wateringList = []
@@ -193,7 +195,7 @@
// 点击进行下一步
btnxia() {
uni.navigateTo({
- url: '/page_components/bindszthr?id=' + this.id
+ url: '/page_components/bindszthr?id=' + this.id + '&sn=' + this.sn
})
},
btnlyqx() {
diff --git a/page_components/fuwu/index.vue b/page_components/fuwu/index.vue
index bfc1493..20a800a 100644
--- a/page_components/fuwu/index.vue
+++ b/page_components/fuwu/index.vue
@@ -146,7 +146,7 @@
-
+
我已知晓
@@ -202,7 +202,8 @@
swindleflag:true,
phonenumber:'',
mchShowBillMobile:'',
- telslag:false
+ telslag:false,
+ userId:''
}
},
onLoad(option) {
@@ -246,6 +247,7 @@
this.$u.get("/app/user/userInfo").then((res) => {
if (res.code == 200) {
this.phonenumber = res.data.phonenumber
+ this.userId = res.data.userId
this.getone()
} else {
uni.navigateTo({
@@ -279,6 +281,26 @@
})
},
methods: {
+ // 点击我已知晓
+ btnswindleflag(){
+ this.swindleflag = false
+ if(this.userId == this.deviceobj.userId && this.deviceobj.suitList == null || this.deviceobj.suitList.length == 0){
+ uni.showModal({
+ title: '提示',
+ content: '该设备暂无套餐,是否前去配置？',
+ success: function(res) {
+ if (res.confirm) {
+ uni.navigateTo({
+ url: '/page_components/newtaocan'
+ })
+ } else if (res.cancel) {
+
+ }
+ }
+ })
+ }
+ },
+
getzfqd(){
this.$u.get(`/app/channel/recharge/enabledList`).then(res =>{
if(res.code == 200){
diff --git a/page_fenbao/statulist/taocanlist/addtaocan/index.vue b/page_fenbao/statulist/taocanlist/addtaocan/index.vue
index 82f5f8f..b5daaca 100644
--- a/page_fenbao/statulist/taocanlist/addtaocan/index.vue
+++ b/page_fenbao/statulist/taocanlist/addtaocan/index.vue
@@ -24,6 +24,25 @@
+
+
+
+ 预存
+
+
+ 元
+
+
+
+
+
+ 套餐说明
+
+
+
+
+
+
@@ -64,53 +83,42 @@
-
-
- 购买时间
+
+
+
+
+ 单价
+
+
+ 元
+
-
-
-
-
- {{item.name}}
-
-
+
+
+ 时间
+
+
+
+
+
+ {{item.name}}
+
+
+
+
+
+
+
+ 购买度数
+
+
+ 度
-
-
- 购买度数
-
-
- 度
-
-
-
-
- 押金
-
-
- 元
-
-
-
-
- 金额
-
-
- 元
-
-
-
-
- 详细说明
-
-
-
-
-
+
+ 消费金额为单价的倍数，结束订单后将返回剩余预存款
@@ -295,7 +303,7 @@
剩余时长 分钟
- 该功能仅在在线状态下才能正常使用！
+ 仅限于语音版设备并在线状态才能正常使用！
@@ -327,16 +335,6 @@
-
-
-
@@ -522,16 +520,6 @@
}
})
},
- // 点击我已知晓
- btnzx(){
- this.$u.put(`/app/user/readMchLicence`).then((res) => {
- if (res.code == 200) {
- this.getuser()
- this.btnmsk = false
- this.contwzflag = false
- }
- })
- },
// 获取用户信息
getuser(){
this.$u.get("/app/user/userInfo").then((res) => {
@@ -549,7 +537,7 @@
let regexs = /^\d+$/
if (this.description == '') {
uni.showToast({
- title: '详细说明不能为空',
+ title: '套餐说明不能为空',
icon: 'none',
duration: 1000,
})
@@ -1070,7 +1058,53 @@
}
}
}
-
+ .feems1 {
+
+ padding-bottom: 20rpx;
+ box-sizing: border-box;
+ background: #fff;
+ width: 654rpx;
+ margin: auto;
+ padding: 15rpx 24rpx;
+ // margin-top: 20rpx;
+ border-radius:0 0 20rpx 20rpx;
+ .one{
+ display: flex;
+ align-items: center;
+ }
+ .feert {
+ width: 430rpx;
+ display: flex;
+ align-items: center;
+
+ .yj {
+ width: 172rpx;
+ height: 58rpx;
+ background: #D8D8D8;
+ border-radius: 6rpx 6rpx 6rpx 6rpx;
+ // padding-left: 30rpx;
+ text-align: center;
+ box-sizing: border-box;
+ margin-right: 20rpx;
+ }
+ }
+
+ .feelt {
+ width: 174rpx;
+ height: 42rpx;
+ font-size: 30rpx;
+ color: #000000;
+
+ input {
+ width: 172rpx;
+ height: 58rpx;
+ background: #D8D8D8;
+ border-radius: 6rpx 6rpx 6rpx 6rpx;
+ text-align: center;
+ margin-right: 20rpx;
+ }
+ }
+ }
.feebox {
width: 654rpx;
max-height: 100%;
@@ -1307,7 +1341,7 @@
margin-top: 24rpx;
background: #FFFFFF;
box-shadow: 0rpx 16rpx 40rpx 0rpx rgba(42, 130, 228, 0.1);
- border-radius: 20rpx;
+ border-radius: 20rpx 20rpx 0 0;
display: flex;
padding-left: 28rpx;
box-sizing: border-box;
diff --git a/pages/shouye/index.vue b/pages/shouye/index.vue
index c6f72d9..906c28b 100644
--- a/pages/shouye/index.vue
+++ b/pages/shouye/index.vue
@@ -373,8 +373,7 @@
that.$u.get(`/app/device/${id}/withSuitList`).then((res) => {
if (res.code == 200) {
uni.navigateTo({
- url: '/page_components/fuwu/index?id=' +
- id
+ url: '/page_components/fuwu/index?id=' + id
})
}
})
@@ -384,19 +383,19 @@
content: '该设备未绑定,你需进行绑定吗？',
success: function(res) {
if (res.confirm) {
- that.$u.put("/app/device/bind", data).then(
- res => {
+ // that.$u.get(`/app/device/${id}/bySn`).then((res) => {
+ // if (res.code == 200) {
+ // uni.navigateTo({
+ // url: '/page_components/bindsz?id=' + res.data.deviceId + '&sn=' + id
+ // })
+ // }
+ // })
+ that.$u.put("/app/device/bind", data).then(res => {
if (res.code == 200) {
- that.$u.get(
- `/app/device/${id}/bySn`
- ).then((res) => {
- if (res.code ==
- 200) {
+ that.$u.get(`/app/device/${id}/bySn`).then((res) => {
+ if (res.code == 200) {
uni.navigateTo({
- url: '/page_components/bindsz?id=' +
- res
- .data
- .deviceId
+ url: '/page_components/bindsz?id=' + res.data.deviceId
})
}
})