diff --git a/page_components/fuwu/index.vue b/page_components/fuwu/index.vue
index 9914bc4..6ea7466 100644
--- a/page_components/fuwu/index.vue
+++ b/page_components/fuwu/index.vue
@@ -1,9 +1,9 @@
-
+
- 设备名称：{{deviceobj.deviceName}}
+ {{deviceobj.deviceName}}
@@ -29,11 +29,11 @@
-
+
套餐说明
- 该设备还剩余时长：{{expireTimeStr}}分钟
+ 该设备还剩余时长：{{expireTimeStr + 1}}分钟
{{item.description == null ? '无' : item.description}}
@@ -83,6 +83,7 @@
}
},
onLoad(option) {
+ console.log(option.q)
if (option.q) {
function getQueryParam(url, paramName) {
let regex = new RegExp(`[?&]${paramName}=([^&]*)`);
@@ -96,11 +97,13 @@
this.startTimer()
this.gettaoc()
this.getmac()
+ this.gettrue()
} else {
this.id = option.id
this.startTimer()
this.gettaoc()
this.getmac()
+ this.gettrue()
}
// 一开始搜索设备
xBlufi.initXBlufi(1)
@@ -128,6 +131,7 @@
if (this.orderno) {
this.gethuidaio()
}
+ this.getuserinfo()
},
onUnload: function() {
if (this.timer) {
@@ -152,6 +156,26 @@
});
},
methods: {
+ gettrue(){
+ this.$u.get("/app/device/isBind?deviceNo=" + this.id).then((res) => {
+ if (res.data == false) {
+ uni.navigateTo({
+ url:'/pages/shouye/index?flag=' + true + '&id=' + this.id
+ })
+ }
+ })
+ },
+ getuserinfo() {
+ this.$u.get("/app/user/userInfo").then((res) => {
+ if (res.code == 200) {
+
+ } else {
+ uni.navigateTo({
+ url:'/pages/login/login?id=' + 1
+ })
+ }
+ })
+ },
startTimer() {
this.timer = setInterval(() => {
this.gettaoc();
@@ -220,8 +244,7 @@
uni.reLaunch({
url: '/pages/shouye/index'
})
- uni.setStorageSync('time',
- that.expireTimeStr)
+ uni.setStorageSync('time',that.expireTimeStr)
},
fail(err) {
// 支付失败逻辑
@@ -301,8 +324,7 @@
uni.reLaunch({
url: '/pages/shouye/index'
})
- uni.setStorageSync('time',
- that.expireTimeStr)
+ uni.setStorageSync('time',that.expireTimeStr)
},
fail(err) {
// 支付失败逻辑
@@ -434,7 +456,7 @@
// padding-bottom: 41rpx;
// }
page {
- background: linear-gradient(180deg, #8883F0 0%, rgba(255, 255, 255, 0) 100%);
+ // background: linear-gradient(180deg, #fff 0%, rgba(255, 255, 255, 0) 100%);
}
.active {
@@ -511,6 +533,7 @@
font-size: 40rpx;
color: #383838;
margin-bottom: 30rpx;
+ margin-top: 110rpx;
}
.box {
diff --git a/page_fenbao/sbshouye.vue b/page_fenbao/sbshouye.vue
index 0c6ca84..a1565e1 100644
--- a/page_fenbao/sbshouye.vue
+++ b/page_fenbao/sbshouye.vue
@@ -24,7 +24,7 @@
使用中
- 正常
+ 空闲
@@ -67,12 +67,13 @@
isLoading: false,
noMoreData: false,
total: 0,
- showflag:false
+ showflag:false,
}
},
onLoad(option) {
this.storeId = option.storeId
this.getlist()
+
},
methods: {
swiperchange(e) {
@@ -156,7 +157,7 @@
display: flex;
margin-top: 20rpx;
width: 658rpx;
- height: 282rpx;
+ height: 250rpx;
background: #fff;
box-shadow: 0rpx 16rpx 40rpx 0rpx rgba(255, 255, 255, 0);
border-radius: 24rpx 24rpx 24rpx 24rpx;
@@ -211,7 +212,7 @@
image {
width: 180rpx;
- height: 200rpx;
+ height: 180rpx;
border-radius: 20rpx;
}
}
diff --git a/page_fenbao/statulist/merchant/index.vue b/page_fenbao/statulist/merchant/index.vue
index 5614142..69c0d41 100644
--- a/page_fenbao/statulist/merchant/index.vue
+++ b/page_fenbao/statulist/merchant/index.vue
@@ -17,7 +17,7 @@
-
+
@@ -38,7 +38,22 @@
cont:''
}
},
+ onShow() {
+ this.getuserinfo()
+ },
methods: {
+ getuserinfo() {
+ this.$u.get("/app/user/userInfo").then((res) => {
+ if (res.code == 200) {
+
+ } else {
+ uni.navigateTo({
+ url:'/pages/login/login'
+ })
+ }
+ })
+ },
+
btnshenq(){
if(this.name == ''){
uni.showToast({
diff --git a/page_fenbao/statulist/myshop/editshop/index.vue b/page_fenbao/statulist/myshop/editshop/index.vue
index 64888c4..6f58b9a 100644
--- a/page_fenbao/statulist/myshop/editshop/index.vue
+++ b/page_fenbao/statulist/myshop/editshop/index.vue
@@ -37,18 +37,19 @@
- 经纬度
+ 详细地址
-
-
-
+ -->
+
+
-
+
@@ -251,15 +252,9 @@
icon: 'none',
duration: 1000
});
- } else if (this.latitude == '请输入纬度') {
+ }else if (this.longitude == '请输入经度') {
uni.showToast({
- title: '请输入纬度',
- icon: 'none',
- duration: 1000
- });
- } else if (this.longitude == '请输入经度') {
- uni.showToast({
- title: '请输入经度',
+ title: '请点击地图图标选择地址',
icon: 'none',
duration: 1000
});
@@ -337,6 +332,7 @@
success: (res) => {
this.latitude = res.latitude;
this.longitude = res.longitude;
+ this.xqdz = res.name
},
fail: function(err) {
console.log('选择位置失败', err);
@@ -421,7 +417,7 @@
.list {
width: 680rpx;
- height: 1180rpx;
+ height: 1020rpx;
background: #FFFFFF;
border-radius: 24rpx 24rpx 24rpx 24rpx;
margin: auto;
@@ -489,24 +485,25 @@
display: flex;
justify-content: space-between;
margin-top: 34rpx;
-
+
.tit {
- margin-top: 40rpx;
+ margin-top: 10rpx;
font-size: 32rpx;
color: #3D3D3D;
}
-
+
.but {
width: 462rpx;
- height: 140rpx;
+ height: 70rpx;
background: #F0F0F0;
border-radius: 12rpx 12rpx 12rpx 12rpx;
position: relative;
-
+
input {
height: 70rpx;
line-height: 70rpx;
padding-left: 22rpx;
+ padding-right: 72rpx;
}
}
}
diff --git a/page_fenbao/statulist/myshop/shebeilist/index.vue b/page_fenbao/statulist/myshop/shebeilist/index.vue
index b64d213..41a35eb 100644
--- a/page_fenbao/statulist/myshop/shebeilist/index.vue
+++ b/page_fenbao/statulist/myshop/shebeilist/index.vue
@@ -24,7 +24,7 @@
使用中
- 正常
+ 空闲
diff --git a/page_fenbao/statulist/myshop/shopdetail/index.vue b/page_fenbao/statulist/myshop/shopdetail/index.vue
index 93cc14c..aecd729 100644
--- a/page_fenbao/statulist/myshop/shopdetail/index.vue
+++ b/page_fenbao/statulist/myshop/shopdetail/index.vue
@@ -284,18 +284,12 @@
if (systemInfo.platform === 'android') {
// 当前设备是 Android
uni.navigateTo({
- url: '/page_components/wifilist/index?deviceId=' +
- options
- .data.deviceId + '&name=' +
- options.data.name
+ url: '/page_components/wifilist/index?deviceId=' +options.data.deviceId + '&name=' +options.data.name
})
} else if (systemInfo.platform === 'ios') {
// 当前设备是 iOS
uni.navigateTo({
- url: '/page_fenbao/device/wifivideo?deviceId=' +
- options
- .data.deviceId + '&name=' +
- options.data.name
+ url: '/page_fenbao/device/wifivideo?deviceId=' +options.data.deviceId + '&name=' +options.data.name
})
}
} else if (res.cancel) {
diff --git a/page_fenbao/statulist/myshop/shopxx/index.vue b/page_fenbao/statulist/myshop/shopxx/index.vue
index 64b13c4..340fd60 100644
--- a/page_fenbao/statulist/myshop/shopxx/index.vue
+++ b/page_fenbao/statulist/myshop/shopxx/index.vue
@@ -37,18 +37,19 @@
- 经纬度
+ 详细地址
-
-
-
+ -->
+
+
-
+
@@ -227,15 +228,9 @@
icon: 'none',
duration: 1000
});
- } else if (this.latitude == '请输入纬度') {
- uni.showToast({
- title: '请输入纬度',
- icon: 'none',
- duration: 1000
- });
} else if (this.longitude == '请输入经度') {
uni.showToast({
- title: '请输入经度',
+ title: '请点击地图图标选择位置',
icon: 'none',
duration: 1000
});
@@ -302,6 +297,7 @@
success: (res) => {
this.latitude = res.latitude;
this.longitude = res.longitude;
+ this.xqdz = res.name
},
fail: function(err) {
// 检查错误消息，看是否是用户取消了位置选择
@@ -385,7 +381,7 @@
.list {
width: 680rpx;
- height: 1180rpx;
+ height: 1020rpx;
background: #FFFFFF;
border-radius: 24rpx 24rpx 24rpx 24rpx;
margin: auto;
@@ -456,14 +452,14 @@
margin-top: 34rpx;
.tit {
- margin-top: 40rpx;
+ margin-top: 10rpx;
font-size: 32rpx;
color: #3D3D3D;
}
.but {
width: 462rpx;
- height: 140rpx;
+ height: 70rpx;
background: #F0F0F0;
border-radius: 12rpx 12rpx 12rpx 12rpx;
position: relative;
@@ -472,6 +468,7 @@
height: 70rpx;
line-height: 70rpx;
padding-left: 22rpx;
+ padding-right: 72rpx;
}
}
}
diff --git a/page_fenbao/statulist/nearby/index.vue b/page_fenbao/statulist/nearby/index.vue
index b2a27d1..da5aafa 100644
--- a/page_fenbao/statulist/nearby/index.vue
+++ b/page_fenbao/statulist/nearby/index.vue
@@ -351,14 +351,14 @@
.moshi {
position: fixed;
- bottom: 37vh;
+ bottom: 38vh;
left: 30rpx;
z-index: 99;
width: 100%;
image {
- width: 210rpx;
- height: 74rpx !important;
+ width: 230rpx;
+ height: 80rpx !important;
}
.img {
diff --git a/page_user/sbdetail.vue b/page_user/sbdetail.vue
index 5b1297d..501b765 100644
--- a/page_user/sbdetail.vue
+++ b/page_user/sbdetail.vue
@@ -375,23 +375,29 @@
this.deviceInfo = res.data
this.storeId = res.data.storeId
this.qrResult = 'CTKG-' + res.data.mac
- if (res.data.customPicture != '自定义图片路径') {
+ if (res.data.customPicture != null) {
this.imglist = res.data.customPicture
} else {
this.imglist = res.data.picture
}
- let expireTimeStr = this.deviceInfo.expireTime
- let expireTimeParts = expireTimeStr.split(" ");
- let expireDateParts = expireTimeParts[0].split("-");
- let expireTimePartsTime = expireTimeParts[1].split(":");
- let expireDate = new Date(expireDateParts[0], expireDateParts[1] - 1, expireDateParts[2],expireTimePartsTime[0], expireTimePartsTime[1], expireTimePartsTime[2])
- let now = new Date();
- let differenceInMs = expireDate - now;
- if (differenceInMs <= 0) {
+ if(this.deviceInfo.expireTime == null){
this.timeday = 0
- } else {
- this.timeday = Math.abs(Math.floor(differenceInMs / (1000 * 60)));
+ }else{
+ let expireTimeStr = this.deviceInfo.expireTime
+ let expireTimeParts = expireTimeStr.split(" ");
+ let expireDateParts = expireTimeParts[0].split("-");
+ let expireTimePartsTime = expireTimeParts[1].split(":");
+ let expireDate = new Date(expireDateParts[0], expireDateParts[1] - 1, expireDateParts[2],expireTimePartsTime[0], expireTimePartsTime[1], expireTimePartsTime[2])
+ let now = new Date();
+ let differenceInMs = expireDate - now;
+ if (differenceInMs <= 0) {
+ this.timeday = 0
+ } else {
+ this.timeday = Math.abs(Math.floor(differenceInMs / (1000 * 60)));
+ }
}
+
+
this.loadings = true
}
});
diff --git a/page_user/setting.vue b/page_user/setting.vue
index 8eccf08..148be81 100644
--- a/page_user/setting.vue
+++ b/page_user/setting.vue
@@ -67,6 +67,10 @@
+
+
+ 解除绑定
+
@@ -153,9 +157,9 @@
-
+
diff --git a/pages/index/index.vue b/pages/index/index.vue
index ab51bd8..89c3a39 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -98,7 +98,7 @@
使用中
- 正常
+ 空闲
@@ -1366,6 +1366,7 @@
image {
width: 180rpx;
height: 180rpx;
+ border-radius: 10rpx;
}
}
}
diff --git a/pages/login/login.vue b/pages/login/login.vue
index c73be13..2bdced5 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -29,10 +29,13 @@
-
+
+
@@ -47,7 +50,13 @@
tittxt: "授权登录",
chooseType: true,
usertype: '',
- login: false
+ login: false,
+ id:''
+ }
+ },
+ onLoad(option) {
+ if(option.id){
+ this.id = option.id
}
},
methods: {
@@ -94,11 +103,21 @@
},
async ceshi() {
this.$u.get("/app/user/userInfo").then((res) => {
- uni.navigateTo({
- url: '/pages/shouye/index'
- })
+ if(this.id == 1){
+ uni.navigateBack()
+ }else{
+ uni.navigateTo({
+ url: '/pages/shouye/index'
+ })
+ }
})
},
+
+ btnbudl(){
+ uni.navigateTo({
+ url: '/pages/shouye/index'
+ })
+ }
}
}
diff --git a/pages/shouye/index.vue b/pages/shouye/index.vue
index fe72f1b..60f2330 100644
--- a/pages/shouye/index.vue
+++ b/pages/shouye/index.vue
@@ -100,10 +100,57 @@
bgc: {
backgroundColor: "#8883F0",
},
+ deviceobj:{}
};
},
- onLoad() {
- // this.initOtherCovers(); // 初始化其他覆盖物
+ onLoad(option) {
+ if (option.flag) {
+ let id = option.id
+ this.$u.get(`/app/device/${id}/withSuitList`).then((res) => {
+ if (res.code == 200) {
+ this.deviceobj = res.data;
+ }
+ })
+ let that = this
+ uni.showModal({
+ title: '提示',
+ content: '该设备未被绑定,你需进行绑定吗？',
+ success: function(res) {
+ if (res.confirm) {
+ let data = {
+ deviceNo: id
+ }
+ that.$u.put("/app/device/bind", data).then(res => {
+ if (res.code == 200) {
+ uni.showModal({
+ title: '提示',
+ content: '绑定成功，需前去设置吗？',
+ success: function(res) {
+ if (res.confirm) {
+ uni.navigateTo({
+ url: '/page_user/sbdetail?id=' +that.deviceobj.deviceId
+ })
+ } else if (res.cancel) {
+
+ }
+ }
+ })
+ } else {
+ uni.showToast({
+ title: res.msg,
+ icon: 'none',
+ duration: 1000
+ })
+ }
+ })
+ } else if (res.cancel) {
+ uni.navigateTo({
+ url: '/pages/shouye/index'
+ })
+ }
+ }
+ })
+ }
},
onShow() {
this.logins()
@@ -474,16 +521,19 @@
.dateactive {
background: #E1F3ED;
}
+
page {
background: linear-gradient(180deg, #8883F0 10%, rgba(255, 255, 255, 0) 100%);
border-radius: 0rpx 0rpx 0rpx 0rpx;
}
+
.page {
width: 750rpx;
padding-left: 34rpx;
padding-right: 34rpx;
box-sizing: border-box;
height: 100%;
+
.tip_box {
position: fixed;
left: 72rpx;
@@ -734,7 +784,8 @@
left: -34rpx;
padding-top: 22rpx;
border-radius: 54rpx 54rpx 0 0;
- margin-top: 20rpx;
+ margin-top: 20rpx;
+
view {
text-align: center;
width: 676rpx;
@@ -781,8 +832,8 @@
width: 642rpx;
height: 812rpx;
margin: auto;
- border-radius: 30rpx;
- overflow: hidden;
+ border-radius: 30rpx;
+ overflow: hidden;
}
.tubiao {
diff --git a/pages/tj.vue b/pages/tj.vue
index ac95084..03f4efb 100644
--- a/pages/tj.vue
+++ b/pages/tj.vue
@@ -26,7 +26,7 @@
-
+
{{yeartime.year + '年' + yeartime.month + '月' + item.createDay + '日'}}
@@ -62,16 +62,16 @@
-
-
+
@@ -116,8 +116,9 @@
deviceId: '',
userType: '',
totalRecharge: 0,
-
-
+ dateday:'',
+ timelists:'',
+ monthdui:''
}
},
onLoad() {
@@ -146,6 +147,8 @@
const now = new Date();
this.yeartime.year = now.getFullYear()
this.yeartime.month = now.getMonth() + 1
+ this.monthdui = this.yeartime.month
+ this.dateday = String(now.getDate()).padStart(2, '0')
this.gettime()
},
methods: {
@@ -172,10 +175,19 @@
this.$u.get('app/bill/landlordCount', data).then((res) => {
if (res.code == 200) {
this.timelist = res.data
- this.totalRecharge = res.totalRecharge
- this.chartData = this.timelist.map(item => item.recharge);
- this.chartday = this.timelist.map(item => item.createDay + '日');
-
+ if(this.monthdui != this.yeartime.month){
+ this.timelists = this.timelist
+ this.totalRecharge = res.totalRecharge
+ this.chartData = this.timelist.map(item => item.recharge);
+ this.chartday = this.timelist.map(item => item.createDay + '日');
+ }else{
+ this.timelists = this.timelist.slice(0, 14)
+ this.timelists.reverse()
+ this.totalRecharge = res.totalRecharge
+ this.chartData = this.timelist.slice(0, this.dateday).map(item => item.recharge)
+ this.chartday = this.timelist.slice(0, this.dateday).map(item => item.createDay + '日');
+ }
+
this.loging = true
for (let i = 0; i < this.timelist.length; i++) {
this.recharge += this.timelist[i].recharge
@@ -185,6 +197,7 @@
}
})
},
+
gettimes() {
let data = {