diff --git a/page_user/changsuo.vue b/page_user/changsuo.vue
index 6bbc56d..054473e 100644
--- a/page_user/changsuo.vue
+++ b/page_user/changsuo.vue
@@ -157,9 +157,7 @@
onScrollToLower() {
if (this.total > this.wateringList.length) {
this.getlist() // 上拉加载更多
- } else {
-
- }
+ }
},
// 搜索
serch(){
@@ -167,8 +165,6 @@
this.getlist()
},
-
-
btnxq(storeId){
uni.navigateTo({
url:'/page_user/changsuoxq?storeId=' + storeId
diff --git a/page_user/creadtg.vue b/page_user/creadtg.vue
index 5bbf3e1..1ffa522 100644
--- a/page_user/creadtg.vue
+++ b/page_user/creadtg.vue
@@ -82,6 +82,7 @@
},
onShow() {
+ this.lists = []
this.getinfo()
},
// 分享到好友(会话)
diff --git a/page_user/devicelist.vue b/page_user/devicelist.vue
index 5e619d6..963d997 100644
--- a/page_user/devicelist.vue
+++ b/page_user/devicelist.vue
@@ -47,7 +47,7 @@
所在房间
- 修改
+ 修改
diff --git a/page_user/fuwu.vue b/page_user/fuwu.vue
index 98e0cdb..5b164b8 100644
--- a/page_user/fuwu.vue
+++ b/page_user/fuwu.vue
@@ -1,8 +1,8 @@
-
{{obj.deviceName}}
- 设备地址:{{sbobj.storeName == undefined ? '' : sbobj.storeName}} {{obj.room == undefined ? '--' : obj.room}}
+ 设备地址:{{obj.storeName == undefined ? '' : obj.storeName}} {{obj.room == undefined ? '--' : obj.room}}
@@ -103,18 +103,19 @@
suitFeeMode:'',
suitFeeType:'',
title:'',
- sbobj:{}
+ sbobj:{},
+ onlineStatus:''
}
},
onLoad(option) {
if (option.q) {
function getQueryParam(url, paramName) {
- let regex = new RegExp(`[?&]${paramName}=([^&]*)`);
+ let regex = new RegExp(`[?&]${paramName}=([^&]*)`)
let results = regex.exec(url);
return results ? decodeURIComponent(results[1].replace(/\+/g, ' ')) : null
}
this.sceneValue = option.q
- let decodedValue = decodeURIComponent(this.sceneValue);
+ let decodedValue = decodeURIComponent(this.sceneValue)
this.id = getQueryParam(decodedValue, 's')
this.$u.get(`/app/user/userInfo`).then(res => {
if(res.code == 200){
@@ -137,8 +138,6 @@
}
})
}
-
-
},
// 分享到好友(会话)
onShareAppMessage: function() {
@@ -163,7 +162,8 @@
if (res.code == 200) {
this.list = res.data.suitList
this.obj = res.data
- this.getsb(res.data.deviceId)
+ this.onlineStatus = res.data.onlineStatus
+ // this.getsb(res.data.deviceId)
}else if(res.code == 401){
uni.navigateTo({
url:'/pages/login/login'
@@ -171,17 +171,9 @@
}
})
},
- // 查询设备详情
- getsb(id){
- this.$u.get(`app/device/${id}`).then((res) => {
- if (res.code == 200) {
- this.sbobj = res.data
- }
- })
- },
// 点击支付
btnzhifu() {
- if(this.sbobj.onlineStatus == 0){
+ if(this.onlineStatus == 0){
uni.showToast({
title: '该设备离线,暂不能使用',
icon: 'none',
@@ -274,13 +266,10 @@
},2000)
}
})
-
}
}
},
-
-
btnactive(item) {
this.activeindex = item.suitId
this.prices = item.price
@@ -324,7 +313,6 @@
}
})
},
-
}
}
@@ -477,7 +465,7 @@
font-weight: 600;
font-size: 40rpx;
color: #3D3D3D;
- margin-top: 110rpx;
+ margin-top: 100rpx;
height: 126rpx;
.wz {
diff --git a/page_user/homepage.vue b/page_user/homepage.vue
index 5491810..c25452c 100644
--- a/page_user/homepage.vue
+++ b/page_user/homepage.vue
@@ -1,6 +1,6 @@
-
@@ -186,7 +186,7 @@
}
},
methods: {
- back(){
+ btnback(){
uni.reLaunch({
url:'/pages/index/index'
})
@@ -197,7 +197,7 @@
if(res.code == 200){
this.infoobj = res.data
this.type = res.data.type
- if(res.data.type == 5){
+ if(res.data.type == 5 || res.data.type == 4){
this.jytxt = '场所管理'
}else{
this.jytxt = '推广管理'
diff --git a/page_user/promote.vue b/page_user/promote.vue
index 291e66e..e1ce103 100644
--- a/page_user/promote.vue
+++ b/page_user/promote.vue
@@ -5,20 +5,21 @@
-
+
- 角色:{{txt}}
+ 角色:{{txt}}
推广人:{{obj.userName == undefined ? '' : obj.userName}}
创业者:{{obj.investorName == undefined ? '' : obj.investorName}}
可支配分成比例:{{obj.point == undefined ? '' : obj.point}}%
+ 推广号:{{obj.codeNo == undefined ? '' : obj.codeNo.slice(-4)}}