diff --git a/common/http.interceptor.js b/common/http.interceptor.js
index 134b800..c3a0345 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_fenbao/shiyong.vue b/page_fenbao/shiyong.vue
index 324010b..a8121d0 100644
--- a/page_fenbao/shiyong.vue
+++ b/page_fenbao/shiyong.vue
@@ -24,11 +24,15 @@
// background:'linear-gradient(to right, #FFEFEF 20%, #D9F6FF 100%)'
},
cont:'',
- tit:''
+ tit:'',
+ type:''
}
},
onLoad(option) {
this.tit = option.tit
+ if(option.type){
+ this.type = option.type
+ }
this.getwz()
},
// 分享到好友（会话）
@@ -44,17 +48,25 @@
return {
title: '创亿康',
query: '',
- path: '/pages/index/index'
+ path: '/pages/index/index'
}
},
methods: {
getwz(){
- this.$u.get(`/app/article/useInfo`).then(res => {
- if(res.code == 200){
- this.cont = res.data.content
- }
- })
- }
+ if(this.type == 'user'){
+ this.$u.get(`/app/article/licence/${this.type}`).then(res => {
+ if(res.code == 200){
+ this.cont = res.data.content
+ }
+ })
+ }else{
+ this.$u.get(`/app/article/useInfo`).then(res => {
+ if(res.code == 200){
+ this.cont = res.data.content
+ }
+ })
+ }
+ },
}
}
diff --git a/page_user/caiwu.vue b/page_user/caiwu.vue
index ddf23f6..1c1ecfd 100644
--- a/page_user/caiwu.vue
+++ b/page_user/caiwu.vue
@@ -39,7 +39,8 @@
充值订单
订单退款
提现申请
- ￥{{item.amount}}
+ ￥{{item.amount}}
+ ￥{{item.amount}}
{{item.createTime}}
diff --git a/page_user/changsuo.vue b/page_user/changsuo.vue
index 2b68acf..560e123 100644
--- a/page_user/changsuo.vue
+++ b/page_user/changsuo.vue
@@ -223,7 +223,7 @@
// 经营场所
getlistcs() {
this.isLoading = true
- this.$u.get(`/store/device/list?isDefault=true&pageNum=${this.pagenum}&pageSize=${this.pagesize}&keyword=${this.keyword}`).then(res => {
+ this.$u.get(`/app/store/list?isDefault=true&pageNum=${this.pagenum}&pageSize=${this.pagesize}&keyword=${this.keyword}`).then(res => {
if (res.code == 200) {
this.total = res.total
if (this.total > 0) {
@@ -292,7 +292,7 @@
}
.list{
width: 680rpx;
- height: 590rpx;
+ max-height: 590rpx;
background: #FFFFFF;
border-radius: 38rpx 38rpx 38rpx 38rpx;
margin: auto;
diff --git a/page_user/changsuoxq.vue b/page_user/changsuoxq.vue
index 79209c9..2e7249a 100644
--- a/page_user/changsuoxq.vue
+++ b/page_user/changsuoxq.vue
@@ -198,7 +198,7 @@
.jiben {
width: 680rpx;
- height: 400rpx;
+ max-height: 400rpx;
background: #FFFFFF;
border-radius: 24rpx 24rpx 24rpx 24rpx;
margin: auto;
diff --git a/page_user/daili.vue b/page_user/daili.vue
index 893474e..f1f54f1 100644
--- a/page_user/daili.vue
+++ b/page_user/daili.vue
@@ -17,7 +17,7 @@
- {{item.userName == undefined ? '--' : item.userName}} {{item.phonenumber == undefined ? '--' : item.phonenumber}}
+ {{item.realOrUserName == undefined ? '--' : item.realOrUserName}} {{item.phonenumber == undefined ? '--' : item.phonenumber}}
查看详情
@@ -41,7 +41,7 @@
订单总额
- ￥{{item.totalIncome == undefined ? '--' : item.totalIncome}}
+ ￥{{item.billAmount == undefined ? '--' : item.billAmount}}
提供分成
@@ -155,7 +155,7 @@
// overflow: scroll;
.order_item {
width: 672rpx;
- height: 458rpx;
+ max-height: 458rpx;
background: #FFFFFF;
box-shadow: 0rpx 4rpx 22rpx 0rpx rgba(0, 0, 0, 0.07);
border-radius: 20rpx 20rpx 20rpx 20rpx;
diff --git a/page_user/dailixq.vue b/page_user/dailixq.vue
index 0b3f4c4..c29de42 100644
--- a/page_user/dailixq.vue
+++ b/page_user/dailixq.vue
@@ -4,7 +4,7 @@
title-size='36' height='44'>
- {{obj.userName == undefined ? '--' : obj.userName}}
+ {{obj.realOrUserName == undefined ? '--' : obj.realOrUserName}}
推广人：
@@ -154,7 +154,7 @@
}
.jiben{
width: 680rpx;
- height: 480rpx;
+ max-height: 480rpx;
background: #FFFFFF;
border-radius: 24rpx 24rpx 24rpx 24rpx;
margin: auto;
diff --git a/page_user/deviceedit.vue b/page_user/deviceedit.vue
index 1c44051..6edee2f 100644
--- a/page_user/deviceedit.vue
+++ b/page_user/deviceedit.vue
@@ -17,8 +17,8 @@
设备状态
- 使用中
- 正常
+ 使用中
+ 正常
不可用
diff --git a/page_user/devicelist.vue b/page_user/devicelist.vue
index ff2cd35..55e5ff8 100644
--- a/page_user/devicelist.vue
+++ b/page_user/devicelist.vue
@@ -55,8 +55,8 @@
设备状态
- 使用中
- 正常
+ 使用中
+ 正常
不可用
@@ -132,7 +132,8 @@
keyword: '',
statusList: '',
deviceId: '',
- type:''
+ type:'',
+ isUsing:''
}
},
onLoad(option) {
@@ -165,26 +166,31 @@
this.wateringList = []
this.pagenum = 1
this.statusList = ''
+ this.isUsing = ''
this.getlist()
} else if (num == 2) {
this.wateringList = []
this.pagenum = 1
this.statusList = 2
+ this.isUsing = true
this.getlist()
} else if (num == 3) {
this.wateringList = []
this.pagenum = 1
this.statusList = 1
+ this.isUsing = false
this.getlist()
} else if (num == 4) {
this.wateringList = []
this.pagenum = 1
this.statusList = 3
+ this.isUsing = ''
this.getlist()
} else {
this.wateringList = []
this.pagenum = 1
this.statusList = '2,3'
+ this.isUsing = ''
this.getlist()
}
},
@@ -290,7 +296,7 @@
// 合作伙伴（代理）
if(this.type == 2){
this.$u.get(
- `/agent/device/list?pageNum=${this.pagenum}&pageSize=${this.pagesize}&statusList=${this.statusList}&keyword=${this.keyword}`
+ `/agent/device/list?pageNum=${this.pagenum}&pageSize=${this.pagesize}&statusList=${this.statusList}&keyword=${this.keyword}&isUsing=${this.isUsing}`
).then(res => {
if (res.code == 200) {
this.total = res.total
@@ -304,7 +310,7 @@
// 创业者（投资人）
}else if(this.type == 4){
this.$u.get(
- `/app/device/list?pageNum=${this.pagenum}&pageSize=${this.pagesize}&statusList=${this.statusList}&keyword=${this.keyword}`
+ `/app/device/list?pageNum=${this.pagenum}&pageSize=${this.pagesize}&statusList=${this.statusList}&keyword=${this.keyword}&isUsing=${this.isUsing}`
).then(res => {
if (res.code == 200) {
this.total = res.total
@@ -318,7 +324,7 @@
// 渠道商（业务员）
}else if(this.type == 3){
this.$u.get(
- `/biz/device/list?pageNum=${this.pagenum}&pageSize=${this.pagesize}&statusList=${this.statusList}&keyword=${this.keyword}`
+ `/biz/device/list?pageNum=${this.pagenum}&pageSize=${this.pagesize}&statusList=${this.statusList}&keyword=${this.keyword}&isUsing=${this.isUsing}`
).then(res => {
if (res.code == 200) {
this.total = res.total
@@ -332,7 +338,7 @@
// 经营场所
}else if(this.type == 5){
this.$u.get(
- `store/device/list?pageNum=${this.pagenum}&pageSize=${this.pagesize}&statusList=${this.statusList}&keyword=${this.keyword}`
+ `store/device/list?pageNum=${this.pagenum}&pageSize=${this.pagesize}&statusList=${this.statusList}&keyword=${this.keyword}&isUsing=${this.isUsing}`
).then(res => {
if (res.code == 200) {
this.total = res.total
@@ -445,7 +451,7 @@
box-sizing: border-box;
.list_item {
- height: 618rpx;
+ max-height: 618rpx;
padding: 24rpx 28rpx;
box-sizing: border-box;
background-color: #fff;
diff --git a/page_user/fuwu.vue b/page_user/fuwu.vue
index 02dc1bc..b3f2da3 100644
--- a/page_user/fuwu.vue
+++ b/page_user/fuwu.vue
@@ -18,37 +18,6 @@
-
-
-
@@ -74,19 +43,21 @@
功能介绍
-
- {{obj.funcInfo == undefined ? '' : obj.funcInfo}}
+
+ {{obj.funcInfo == undefined ? '暂无介绍...' : obj.funcInfo}}
-
+
设备地址
- {{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}}
+
+ {{obj.storeAddress ? (obj.storeAddress.length > 18 ? obj.storeAddress.substring(0, 18) + '...' : obj.storeAddress) : '' }}
@@ -261,31 +232,10 @@
}
},
methods: {
- // 点击我已知晓
- // btnjxcz() {
- // this.czflag = false
- // xBlufi.initXBlufi(1)
- // xBlufi.listenDeviceMsgEvent(true, this.funListenDeviceMsgEvent);
- // xBlufi.notifyStartDiscoverBle({
- // 'isStart': true
- // })
- // setTimeout(() => {
- // xBlufi.notifyStartDiscoverBle({
- // 'isStart': false
- // })
- // if (this.devicesList.length > 0) {
- // xBlufi.notifyConnectBle({
- // isStart: true,
- // deviceId: this.deviceId,
- // name: this.name
- // })
- // }
- // }, 2000)
- // },
// 点击协议跳转
btnxieyi(){
uni.navigateTo({
- url: '/page_fenbao/shiyong?tit=' + '用户服务协议'
+ url: '/page_fenbao/shiyong?tit=' + '用户服务协议' + '&type=' + 'user'
})
},
// 获取设备客服
diff --git a/page_user/mydetail.vue b/page_user/mydetail.vue
index 66bd336..d4a4354 100644
--- a/page_user/mydetail.vue
+++ b/page_user/mydetail.vue
@@ -96,15 +96,17 @@
-
- 温馨提示
-
-
-
-
-
- 结束订单后，设备也将被关闭
- 套餐费用不予退还，是否结束?
+
+
+ 温馨提示
+
+
+
+
+
+ 结束订单后，设备也将被关闭
+ 套餐费用不予退还，是否结束?
+
@@ -841,18 +843,19 @@
}
.jieshu {
- width: 500rpx;
- height: 436rpx;
- border-radius: 20rpx;
- padding: 20rpx;
- box-sizing: border-box;
position: fixed;
top: 30%;
left: 50%;
transform: translateX(-50%);
- background-color: #fff;
z-index: 2;
-
+ .jieshus{
+ width: 500rpx;
+ max-height: 430rpx;
+ border-radius: 20rpx 20rpx 0 0;
+ padding: 20rpx;
+ box-sizing: border-box;
+ background-color: #fff;
+ }
.tishi {
font-size: 32rpx;
width: 100%;
@@ -881,8 +884,8 @@
display: flex;
justify-content: space-between;
align-items: center;
- margin-top: 30rpx;
-
+ background-color: #fff;
+ border-radius: 0 0 20rpx 20rpx;
.qux {
text-align: center;
width: 100%;
@@ -1002,7 +1005,7 @@
.list_item {
width: 658rpx;
- height: 380rpx;
+ max-height: 380rpx;
background: #FFFFFF;
box-shadow: 0rpx 16rpx 40rpx 0rpx rgba(42, 130, 228, 0.1);
border-radius: 24rpx 24rpx 24rpx 24rpx;
diff --git a/page_user/mydingdan.vue b/page_user/mydingdan.vue
index 2897bd4..ed57650 100644
--- a/page_user/mydingdan.vue
+++ b/page_user/mydingdan.vue
@@ -8,29 +8,29 @@
设备编号：{{item.deviceNo}}
-
+
已支付
-
+
未支付
-
+
已退款
-
+
已取消(用户)
-
+
已取消(系统)
-
+
支付中
-
+
退款中
-
+
订单号
@@ -192,7 +192,7 @@
.list_item {
width: 658rpx;
- height: 418rpx;
+ max-height: 418rpx;
background: #FFFFFF;
box-shadow: 0rpx 16rpx 40rpx 0rpx rgba(42, 130, 228, 0.1);
border-radius: 24rpx 24rpx 24rpx 24rpx;
diff --git a/page_user/orderlist.vue b/page_user/orderlist.vue
index 76d98ff..030af7a 100644
--- a/page_user/orderlist.vue
+++ b/page_user/orderlist.vue
@@ -26,18 +26,18 @@
订单编号：{{item.billNo}}
- 进行中
- 已完成
+ 进行中
+ 已完成
- 未支付
- 支付成功
- 已退款
- 用户取消
- 系统超时取消
- 支付中
- 退款中
- 押金未支付
- 押金已支付
+ 未支付
+ 支付成功
+ 已退款
+ 用户取消
+ 系统超时取消
+ 支付中
+ 退款中
+ 押金未支付
+ 押金已支付
@@ -264,7 +264,7 @@
overflow: scroll;
.order_item{
width: 672rpx;
- height: 512rpx;
+ max-height: 512rpx;
background: #FFFFFF;
box-shadow: 0rpx 4rpx 22rpx 0rpx rgba(0,0,0,0.07);
border-radius: 20rpx 20rpx 20rpx 20rpx;
diff --git a/page_user/sjhezuo.vue b/page_user/sjhezuo.vue
index 0fc1ff9..8cd1766 100644
--- a/page_user/sjhezuo.vue
+++ b/page_user/sjhezuo.vue
@@ -189,7 +189,7 @@
.botwz{
margin-top: 20rpx;
color: #8883F0;
- font-size: 28rpx;
+ font-size: 32rpx;
width: 100%;
text-align: center;
}
diff --git a/page_user/tixian.vue b/page_user/tixian.vue
index b4a5470..ab87866 100644
--- a/page_user/tixian.vue
+++ b/page_user/tixian.vue
@@ -107,7 +107,7 @@
sjmeoey:'',
txlist:'',
channelId:'',
- btnmsk:false,
+ btnmsk:true,
listflag:true
}
},
diff --git a/page_user/touzi.vue b/page_user/touzi.vue
index 8d6d88a..6f98dc3 100644
--- a/page_user/touzi.vue
+++ b/page_user/touzi.vue
@@ -17,7 +17,7 @@
- {{item.userName == undefined ? '--' : item.userName}} {{item.phonenumber == undefined ? '--' : item.phonenumber}}
+ {{item.realOrUserName == undefined ? '--' : item.realOrUserName}} {{item.phonenumber == undefined ? '--' : item.phonenumber}}
查看详情
@@ -174,7 +174,7 @@
// overflow: scroll;
.order_item {
width: 672rpx;
- height: 370rpx;
+ max-height: 370rpx;
background: #FFFFFF;
box-shadow: 0rpx 4rpx 22rpx 0rpx rgba(0, 0, 0, 0.07);
border-radius: 20rpx 20rpx 20rpx 20rpx;
diff --git a/page_user/touzixq.vue b/page_user/touzixq.vue
index 18a804a..9766aa8 100644
--- a/page_user/touzixq.vue
+++ b/page_user/touzixq.vue
@@ -4,7 +4,7 @@
title-size='36' height='44'>
- {{obj.userName == undefined ? '--' : obj.userName}}
+ {{obj.realOrUserName == undefined ? '--' : obj.realOrUserName}}
直属合作伙伴：
@@ -142,7 +142,7 @@
}
.jiben{
width: 680rpx;
- height: 390rpx;
+ max-height: 390rpx;
background: #FFFFFF;
border-radius: 24rpx 24rpx 24rpx 24rpx;
margin: auto;
diff --git a/page_user/yewuyuan.vue b/page_user/yewuyuan.vue
index 314198e..ff18b90 100644
--- a/page_user/yewuyuan.vue
+++ b/page_user/yewuyuan.vue
@@ -17,7 +17,7 @@
- {{item.userName == undefined ? '--' : item.userName}} {{item.phonenumber == undefined ? '--' : item.phonenumber}}
+ {{item.realOrUserName == undefined ? '--' : item.realOrUserName}} {{item.phonenumber == undefined ? '--' : item.phonenumber}}
查看详情
@@ -41,7 +41,7 @@
订单总额
- ￥{{item.totalIncome == undefined ? '--' : item.totalIncome}}
+ ￥{{item.billAmount == undefined ? '--' : item.billAmount}}
提供分成
@@ -185,7 +185,7 @@
// overflow: scroll;
.order_item {
width: 672rpx;
- height: 458rpx;
+ max-height: 458rpx;
background: #FFFFFF;
box-shadow: 0rpx 4rpx 22rpx 0rpx rgba(0, 0, 0, 0.07);
border-radius: 20rpx 20rpx 20rpx 20rpx;
diff --git a/page_user/yewuyuanxq.vue b/page_user/yewuyuanxq.vue
index 5cbf4de..64d6ab7 100644
--- a/page_user/yewuyuanxq.vue
+++ b/page_user/yewuyuanxq.vue
@@ -4,7 +4,7 @@
title-size='36' height='44'>
- {{obj.userName == undefined ? '--' : obj.userName}}
+ {{obj.realOrUserName == undefined ? '--' : obj.realOrUserName}}
推广人：
@@ -150,7 +150,7 @@
}
.jiben{
width: 680rpx;
- height: 480rpx;
+ max-height: 480rpx;
background: #FFFFFF;
border-radius: 24rpx 24rpx 24rpx 24rpx;
margin: auto;
diff --git a/pages/myorder/index.vue b/pages/myorder/index.vue
index b85abfb..50c01c2 100644
--- a/pages/myorder/index.vue
+++ b/pages/myorder/index.vue
@@ -44,7 +44,7 @@
- 本店共有：{{listobj.deviceCount == undefined ? '--' : listobj.deviceCount}}个设备
+ 本店共有：{{listobj.deviceCount == undefined ? '--' : listobj.deviceCount}}
查看
@@ -144,7 +144,7 @@
},
addMarkersWithoutLabels() {
this.listmap.forEach((item) => {
- // if (item.deviceCount !== null && item.deviceCount > 0){
+ // if (item.deviceCount !== null && item.deviceCount > 0){
const shopCover = {
id: parseFloat(item.storeId),
latitude: item.lat,
@@ -252,8 +252,7 @@
(res) => {
if (res.code == 200) {
uni.navigateTo({
- url: '/page_user/fuwu?id=' +
- id
+ url: '/page_user/fuwu?id=' + id
})
}
})
@@ -264,12 +263,9 @@
success: function(res) {
if (res.confirm) {
uni.navigateTo({
- url: '/pages/zhuce?sn=' +
- id
+ url: '/pages/zhuce?sn=' + id
})
- } else if (res.cancel) {
-
- }
+ }
}
})
}
diff --git a/pages/myorder/returned/index.vue b/pages/myorder/returned/index.vue
index aa73a7a..d692405 100644
--- a/pages/myorder/returned/index.vue
+++ b/pages/myorder/returned/index.vue
@@ -14,10 +14,10 @@
{{item.deviceName == null ? '--' : item.deviceName}}
-
+
可使用
-
+
使用中
diff --git a/pages/nearbystores/index.vue b/pages/nearbystores/index.vue
index 21656ba..f7d52f7 100644
--- a/pages/nearbystores/index.vue
+++ b/pages/nearbystores/index.vue
@@ -29,7 +29,7 @@
{{item.address}}
- 经营时间：{{item.businessTimeStart}}-{{item.businessTimeEnd}}可使用：{{item.deviceCount}}
+ 经营时间：{{item.businessTimeStart}}-{{item.businessTimeEnd}}总数量：{{item.deviceCount}}