xinyi/kaiguan-zfb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aaa

Browse Source
This commit is contained in:
3321822538@qq.com 2024-07-12 18:13:59 +08:00
parent 20ddd6de97
commit f3c25f2816
8 changed files with 272 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/http.interceptor.js
View File

@ -89,7 +89,7 @@ const install = (Vue, vm) => {
uni.login({ uni.login({
success: function(ret) { success: function(ret) {
console.log("main.js==>res", ret) // console.log("main.js==>res", ret)
// vm.$u.post('/user/login',{"js_code": ret.code}).then(res=>{ // vm.$u.post('/user/login',{"js_code": ret.code}).then(res=>{
// if (res.code == 10003) { // if (res.code == 10003) {
// // console.log("新用户登录") // // console.log("新用户登录")

233
page_components/fuwu/index.vue
View File

@ -14,34 +14,38 @@
联系客服：<text @click="call">{{deviceobj.storeContactMobile}}</text> 联系客服：<text @click="call">{{deviceobj.storeContactMobile}}</text>
</view> </view>
</view> </view>
<!-- 检测蓝牙未开启 --> <!-- 检测蓝牙未开启 -->
<view class="shibai" v-if="lanyaflag"> <view class="shibai" v-if="lanyaflag">
<view class="top"> <view class="top">
充值失败 设备未联网
</view> </view>
<view class="tishi"> <view class="tishi">
充值失败请查看手机蓝牙是否打开 检测到该设备未联网,请打开蓝牙进行蓝牙模式
</view> </view>
<view class="li"> <view class="li">
<view class="wz"> <view class="wz">
第一：检查手机蓝牙是否打开 第一：检查手机蓝牙是否打开
</view> </view>
<image style="width: 386rpx;height: 263rpx;" src="https://api.ccttiot.com/smartmeter/img/static/uM4DY4Ee9AgFHLv4bIDR" mode=""></image> <image style="width: 386rpx;height: 263rpx;"
src="https://api.ccttiot.com/smartmeter/img/static/uM4DY4Ee9AgFHLv4bIDR" mode=""></image>
</view> </view>
<view class="li"> <view class="li">
<view class="wz"> <view class="wz">
第二：设置小程序蓝牙授权 第二：设置小程序蓝牙授权
</view> </view>
<image style="width: 368rpx;height: 151rpx;" src="https://api.ccttiot.com/smartmeter/img/static/uAj06uo9qysixLrcFHBn" mode=""></image> <image style="width: 368rpx;height: 151rpx;"
<image style="width: 386rpx;height: 301rpx;" src="https://api.ccttiot.com/smartmeter/img/static/ugFSKFZn4mzJJHQx3K2Z" mode=""></image> src="https://api.ccttiot.com/smartmeter/img/static/uAj06uo9qysixLrcFHBn" mode=""></image>
<image style="width: 386rpx;height: 330rpx;" src="https://api.ccttiot.com/smartmeter/img/static/uZ4XoCI2KNQzcPKbwGLN" mode=""></image> <image style="width: 386rpx;height: 301rpx;"
src="https://api.ccttiot.com/smartmeter/img/static/ugFSKFZn4mzJJHQx3K2Z" mode=""></image>
<image style="width: 386rpx;height: 330rpx;"
src="https://api.ccttiot.com/smartmeter/img/static/uZ4XoCI2KNQzcPKbwGLN" mode=""></image>
</view> </view>
<view class="jxcz" @click="btnjxcz"> <view class="jxcz" @click="btnjxcz">
我已知晓 我已知晓
</view> </view>
</view> </view>
<view class="box" v-else> <view class="box" v-else>
<view class="tit"> <view class="tit">
选择服务 选择服务
@ -74,16 +78,11 @@
</view> </view>
<view class="" style="margin-top: 30rpx;"> <view class="" style="margin-top: 30rpx;">
<textarea <textarea :readonly="isReadOnly" v-model="item.description == null ? '无' : item.description"
:readonly="isReadOnly" id="myTextarea" cols="30" rows="10" style="pointer-events: none;"></textarea>
v-model="item.description == null ? '无' : item.description"
id="myTextarea"
cols="30"
rows="10"
style="pointer-events: none;"></textarea>
<!-- <textarea name="" v-model="item.description == null ? '无' : item.description" id="" cols="30" rows="10"></textarea> --> <!-- <textarea name="" v-model="item.description == null ? '无' : item.description" id="" cols="30" rows="10"></textarea> -->
</view> </view>
</view> </view>
<view class="tongyi" v-if="deviceobj.suitList.length > 0"> <view class="tongyi" v-if="deviceobj.suitList.length > 0">
@ -96,9 +95,9 @@
</view> </view>
</view> </view>
<view class="mask" v-if="czflag"></view> <view class="mask" v-if="czflag"></view>
</view> </view>
</view> </view>
@ -111,7 +110,7 @@
return { return {
indexactive: -1, indexactive: -1,
checked: false, checked: false,
lanyaflag:false, lanyaflag: false,
deviceobj: {}, deviceobj: {},
timer: null, timer: null,
expireTimeStr: '', expireTimeStr: '',
@ -127,8 +126,8 @@
ver_data: '', ver_data: '',
devicesList: [], devicesList: [],
onlineStatus: '', onlineStatus: '',
jine:'', jine: '',
dingobj:{} dingobj: {}
} }
}, },
onLoad(option) { onLoad(option) {
@ -141,11 +140,11 @@
let sceneValue = option.q let sceneValue = option.q
let decodedValue = decodeURIComponent(sceneValue); let decodedValue = decodeURIComponent(sceneValue);
this.id = getQueryParam(decodedValue, 's') this.id = getQueryParam(decodedValue, 's')
console.log(this.id)
this.startTimer() this.startTimer()
this.gettaoc() this.gettaoc()
this.getmac() this.getmac()
if(this.onlineStatus == 0){ if (this.onlineStatus == 0) {
// 一开始搜索设备 // 一开始搜索设备
xBlufi.initXBlufi(1) xBlufi.initXBlufi(1)
xBlufi.listenDeviceMsgEvent(true, this.funListenDeviceMsgEvent); xBlufi.listenDeviceMsgEvent(true, this.funListenDeviceMsgEvent);
@ -170,7 +169,7 @@
this.startTimer() this.startTimer()
this.gettaoc() this.gettaoc()
this.getmac() this.getmac()
if(this.onlineStatus == 0){ if (this.onlineStatus == 0) {
// 一开始搜索设备 // 一开始搜索设备
xBlufi.initXBlufi(1) xBlufi.initXBlufi(1)
xBlufi.listenDeviceMsgEvent(true, this.funListenDeviceMsgEvent); xBlufi.listenDeviceMsgEvent(true, this.funListenDeviceMsgEvent);
@ -191,7 +190,7 @@
}, 2000) }, 2000)
} }
} }
}, },
computed: { computed: {
@ -225,7 +224,7 @@
}); });
}, },
methods: { methods: {
btnjxcz(){ btnjxcz() {
xBlufi.initXBlufi(1) xBlufi.initXBlufi(1)
xBlufi.listenDeviceMsgEvent(true, this.funListenDeviceMsgEvent); xBlufi.listenDeviceMsgEvent(true, this.funListenDeviceMsgEvent);
xBlufi.notifyStartDiscoverBle({ xBlufi.notifyStartDiscoverBle({
@ -244,16 +243,16 @@
} }
}, 2000) }, 2000)
}, },
call() { call() {
let phoneNumber = '' let phoneNumber = ''
if(this.deviceobj.storeContactMobile == null){ if (this.deviceobj.storeContactMobile == null) {
phoneNumber = this.deviceobj.userMobile phoneNumber = this.deviceobj.userMobile
}else{ } else {
phoneNumber = this.deviceobj.storeContactMobile phoneNumber = this.deviceobj.storeContactMobile
} }
uni.makePhoneCall({ uni.makePhoneCall({
phoneNumber: phoneNumber, phoneNumber: phoneNumber,
success: function(res) { success: function(res) {
console.log('拨打电话成功', res); console.log('拨打电话成功', res);
}, },
@ -265,7 +264,7 @@
}) })
} }
}) })
}, },
gettrue() { gettrue() {
@ -315,15 +314,16 @@
// let differenceInMs = targetDate - now; // let differenceInMs = targetDate - now;
// let differenceInMinutes = Math.floor(differenceInMs / (1000 * 60)); // let differenceInMinutes = Math.floor(differenceInMs / (1000 * 60));
// this.expireTimeStr = parseInt(differenceInMinutes) <= 0 ? '0' : differenceInMinutes // this.expireTimeStr = parseInt(differenceInMinutes) <= 0 ? '0' : differenceInMinutes
let targetDateStr = this.deviceobj.expireTime; let targetDateStr = this.deviceobj.expireTime;
let targetParts = targetDateStr.split(/[- :]/); let targetParts = targetDateStr.split(/[- :]/);
let targetDate = new Date(targetParts[0], targetParts[1] - 1, targetParts[2], targetParts[3], targetParts[4], targetParts[5]); let targetDate = new Date(targetParts[0], targetParts[1] - 1, targetParts[2], targetParts[
let now = new Date(); 3], targetParts[4], targetParts[5]);
let differenceInMs = targetDate - now; let now = new Date();
if (differenceInMs <= 0) { let differenceInMs = targetDate - now;
this.expireTimeStr = '0'; if (differenceInMs <= 0) {
} else { this.expireTimeStr = '0';
this.expireTimeStr = '1' } else {
this.expireTimeStr = '1'
} }
} }
}) })
@ -335,7 +335,7 @@
icon: 'none', icon: 'none',
duration: 1000 duration: 1000
}) })
}else if(this.indexactive == -1){ } else if (this.indexactive == -1) {
uni.showToast({ uni.showToast({
title: '请选择套餐 !', title: '请选择套餐 !',
icon: 'none', icon: 'none',
@ -391,11 +391,12 @@
} }
}) })
} else { } else {
this.czflag = true
uni.showLoading({
title:'支付准备中'
})
if (this.ver_data == '') { if (this.ver_data == '') {
this.czflag = true
uni.showLoading({
title: '切换中'
})
let that = this let that = this
xBlufi.initXBlufi(1); xBlufi.initXBlufi(1);
xBlufi.listenDeviceMsgEvent(true, that.funListenDeviceMsgEvent); xBlufi.listenDeviceMsgEvent(true, that.funListenDeviceMsgEvent);
@ -406,7 +407,7 @@
xBlufi.notifyStartDiscoverBle({ xBlufi.notifyStartDiscoverBle({
'isStart': false 'isStart': false
}) })
if (that.devicesList.length > 0) { if (that.devicesList.length > 0) {
xBlufi.notifyConnectBle({ xBlufi.notifyConnectBle({
isStart: true, isStart: true,
deviceId: that.deviceId, deviceId: that.deviceId,
@ -416,10 +417,10 @@
}, 2000) }, 2000)
uni.showModal({ uni.showModal({
title: '温馨提示', title: '温馨提示',
content: '支付失败,支付的时候需要靠近设备,并打开蓝牙', content: '检测到该设备未联网,为您切换为蓝牙模式,支付的时候靠近该设备,并打开蓝牙',
success: function(res) { success: function(res) {
if (res.confirm) { if (res.confirm) {
} else if (res.cancel) { } else if (res.cancel) {
console.log('用户点击了取消'); console.log('用户点击了取消');
} }
@ -446,60 +447,61 @@
signType: res.data.signType, signType: res.data.signType,
paySign: res.data.paySign, paySign: res.data.paySign,
success: (res) => { success: (res) => {
console.log(res, '支付成功'); // console.log(res, '支付成功');
if (that.timer) { if (that.timer) {
clearInterval(this.timer); clearInterval(this.timer);
that.timer = null; that.timer = null;
} }
// 111111111111111111111111 // 111111111111111111111111
that.$u.get('/app/bill/recharge/device/fail/list').then(res => { that.$u.get('/app/bill/recharge/device/fail/list').then(res => {
if (res.code == 200) { if (res.code == 200) {
console.log('获取订单状态',res); // console.log('获取订单状态',res);
let dingobj = res.data[0].billNo let dingobj = res.data[0].billNo
console.log(dingobj); // console.log(dingobj);
uni.getNetworkType({ uni.getNetworkType({
success(res) { success(res) {
if (res.networkType !== 'none') { if (res.networkType !== 'none') {
uni.getConnectedBluetoothDevices({ uni.getConnectedBluetoothDevices({
success(res) { success(res) {
xBlufi.notifySendCustomData({ xBlufi.notifySendCustomData({
customData: "time@" + that.jine * 60 customData: "time@" + that.jine * 60
}); })
}, },
fail(err) { fail(err) {
console.error('获取已连接蓝牙设备信息失败：', err); console.error('获取已连接蓝牙设备信息失败：',err)
} }
}) })
that.$u.get(`/app/bill/recharge/${dingobj}/bluetoothSuccess`).then(res => { that.$u.get(`/app/bill/recharge/${dingobj}/bluetoothSuccess`).then(res => {
if(res.code == 200){ if (res.code == 200) {
console.log('蓝牙离线充值成功'); console.log('蓝牙离线充值成功')
setTimeout(()=>{ setTimeout(() => {
uni.reLaunch({ uni.reLaunch({
url: '/pages/shouye/index' url: '/pages/shouye/index'
}) })
},1000) },1000)
} }
}) })
} else { } else {
console.log('手机未连接网络'); console.log('手机未连接网络')
// this.baiflag = false // this.baiflag = false
}
} }
}) }
})
} }
}) })
// 11111111111111111111111 // 11111111111111111111111
// 支付成功逻辑 // 支付成功逻辑
uni.setStorageSync('time', that.expireTimeStr) uni.setStorageSync('time', that.expireTimeStr)
},fail(err) { },
setTimeout(()=>{ fail(err) {
setTimeout(() => {
this.czflag = false this.czflag = false
uni.hideLoading() uni.hideLoading()
},500) }, 500)
// 支付失败逻辑 // 支付失败逻辑
uni.showToast({ uni.showToast({
title: '支付失败', title: '支付失败',
@ -514,7 +516,7 @@
uni.reLaunch({ uni.reLaunch({
url: '/pages/login/login' url: '/pages/login/login'
}) })
}else{ } else {
this.czflag = false this.czflag = false
} }
}) })
@ -550,19 +552,21 @@
let uniqueDevicesList = Array.from(new Set(this.devicesList)); let uniqueDevicesList = Array.from(new Set(this.devicesList));
// 将去重后的数组重新赋值给 this.devicesList // 将去重后的数组重新赋值给 this.devicesList
this.devicesList = uniqueDevicesList; this.devicesList = uniqueDevicesList;
}else{ } else {
// uni.showToast({ // uni.showToast({
// title: '未找到该设备，请确认该设备在附近', // title: '未找到该设备，请确认该设备在附近',
// icon: 'none', // icon: 'none',
// duration: 3000 // duration: 3000
// }) // })
} }
}); })
} }
break; break;
case xBlufi.XBLUFI_TYPE.TYPE_CONNECTED: case xBlufi.XBLUFI_TYPE.TYPE_CONNECTED:
console.log("连接回调：" + JSON.stringify(options)); console.log("连接回调：" + JSON.stringify(options));
if (options.result) { if (options.result) {
// console.log('125451245')
{ {
xBlufi.notifyInitBleEsp32({ xBlufi.notifyInitBleEsp32({
deviceId: this.deviceId deviceId: this.deviceId
@ -571,14 +575,18 @@
this.deviceIds = options.data.deviceId this.deviceIds = options.data.deviceId
this.name = this.name this.name = this.name
} }
}else{
} }
break; break;
case xBlufi.XBLUFI_TYPE.TYPE_RECIEVE_CUSTON_DATA: case xBlufi.XBLUFI_TYPE.TYPE_RECIEVE_CUSTON_DATA:
this.ver_data = this.parseCustomData(options.data) this.ver_data = this.parseCustomData(options.data)
console.log("1收到设备发来的自定义数据结果：", this.ver_data); console.log("1收到设备发来的自定义数据结果：", this.ver_data);
this.czflag = false setTimeout(()=>{
uni.hideLoading() this.czflag = false
uni.hideLoading()
},1000)
break; break;
case xBlufi.XBLUFI_TYPE.TYPE_GET_DEVICE_LISTS_STOP: case xBlufi.XBLUFI_TYPE.TYPE_GET_DEVICE_LISTS_STOP:
if (options.result) { if (options.result) {
@ -590,14 +598,14 @@
break; break;
case xBlufi.XBLUFI_TYPE.TYPE_GET_DEVICE_LISTS_START: case xBlufi.XBLUFI_TYPE.TYPE_GET_DEVICE_LISTS_START:
if (!options.result) { if (!options.result) {
this.lanyaflag = true this.lanyaflag = true
uni.showToast({ uni.showToast({
title: '蓝牙未开启', title: '蓝牙未开启',
icon: 'none', icon: 'none',
duration: 3000 duration: 3000
}); });
return return
}else{ } else {
this.lanyaflag = false this.lanyaflag = false
} }
break; break;
@ -630,7 +638,7 @@
</script> </script>
<style lang="scss"> <style lang="scss">
.mask{ .mask {
width: 100%; width: 100%;
height: 100vh; height: 100vh;
position: fixed; position: fixed;
@ -639,14 +647,16 @@
transform: translateX(-50%); transform: translateX(-50%);
background-color: #000; background-color: #000;
opacity: .6; opacity: .6;
} }
.shibai{
.shibai {
margin-top: 50rpx; margin-top: 50rpx;
text-align: center; text-align: center;
padding-bottom: 600rpx; padding-bottom: 600rpx;
height: 100vh; height: 100vh;
overflow: scroll; overflow: scroll;
.jxcz{
.jxcz {
width: 563rpx; width: 563rpx;
height: 100rpx; height: 100rpx;
background: #8883F0; background: #8883F0;
@ -660,25 +670,29 @@
left: 50%; left: 50%;
transform: translateX(-50%); transform: translateX(-50%);
} }
.top{
.top {
font-size: 40rpx; font-size: 40rpx;
color: #3D3D3D; color: #3D3D3D;
} }
.tishi{
.tishi {
font-size: 31rpx; font-size: 31rpx;
color: #3D3D3D; color: #3D3D3D;
margin-top: 50rpx; margin-top: 50rpx;
} }
.li{
.li {
margin-top: 50rpx; margin-top: 50rpx;
font-size: 31rpx; font-size: 31rpx;
color: #3D3D3D; color: #3D3D3D;
image{
image {
margin-top: 30rpx; margin-top: 30rpx;
} }
} }
} }
/deep/ .u-title { /deep/ .u-title {
padding-bottom: 22rpx; padding-bottom: 22rpx;
} }
@ -771,7 +785,8 @@
color: #fff; color: #fff;
margin-bottom: 30rpx; margin-bottom: 30rpx;
margin-top: 110rpx; margin-top: 110rpx;
height: 200rpx; height: 200rpx;
.wz { .wz {
font-weight: 400; font-weight: 400;
font-size: 32rpx; font-size: 32rpx;
@ -786,7 +801,8 @@
border-radius: 0rpx 0rpx 0rpx 0rpx; border-radius: 0rpx 0rpx 0rpx 0rpx;
padding: 36rpx 54rpx; padding: 36rpx 54rpx;
box-sizing: border-box; box-sizing: border-box;
border-radius: 30rpx 30rpx 0 0; border-radius: 30rpx 30rpx 0 0;
.tongyi { .tongyi {
width: 590rpx; width: 590rpx;
position: fixed; position: fixed;
@ -832,8 +848,9 @@
margin-top: 30rpx; margin-top: 30rpx;
} }
} }
.wz { .wz {
font-size: 28rpx; font-size: 28rpx;
color: #ccc; color: #ccc;

8
page_fenbao/statulist/about/index.vue
View File

@ -53,9 +53,10 @@
.page { .page {
width: 750rpx; width: 750rpx;
position: fixed; // position: fixed;
top: 0; // top: 0;
left: 0; // left: 0;
overflow: hidden;
.box{ .box{
width: 750rpx; width: 750rpx;
height: 1440rpx; height: 1440rpx;
@ -63,6 +64,7 @@
border-radius: 0rpx 0rpx 0rpx 0rpx; border-radius: 0rpx 0rpx 0rpx 0rpx;
padding: 40rpx 34rpx; padding: 40rpx 34rpx;
box-sizing: border-box; box-sizing: border-box;
overflow: scroll;
.title{ .title{
font-weight: 600; font-weight: 600;
font-size: 36rpx; font-size: 36rpx;

4
page_fenbao/statulist/question/index.vue
View File

@ -6,7 +6,7 @@
<u-search placeholder="搜索问题" height="72" :showAction="false" v-model="keyword" @change="sousuo" shape="square"></u-search> <u-search placeholder="搜索问题" height="72" :showAction="false" v-model="keyword" @change="sousuo" shape="square"></u-search>
</view> </view>
<view class="list" v-if="!listitem.length == 0"> <view class="list" >
<view class="tab"> <view class="tab">
<u-tabs :list="list" :is-scroll="true" :current="current" active-color="#8883F0" bar-width="80" <u-tabs :list="list" :is-scroll="true" :current="current" active-color="#8883F0" bar-width="80"
gutter="40" item-width="200" @change="change"></u-tabs> gutter="40" item-width="200" @change="change"></u-tabs>
@ -17,7 +17,7 @@
</view> </view>
</view> </view>
<view class="huan" @click="btnhuan" v-if="list[0].name == '猜你想问'"> <view class="huan" @click="btnhuan" v-if="current == 0">
<image src="https://api.ccttiot.com/smartmeter/img/static/uQyHxbK49U3S5f4uLU6m" mode=""></image> 换一换 <image src="https://api.ccttiot.com/smartmeter/img/static/uQyHxbK49U3S5f4uLU6m" mode=""></image> 换一换
</view> </view>
</view> </view>

2
page_fenbao/zhuce.vue
View File

@ -21,7 +21,7 @@
</view> </view>
</view> </view>
<view class="rt"> <view class="rt">
<text style="margin-bottom: 10rpx;" :id="item.deviceId" @tap="createBLEConnections(item)">响铃</text> <!-- <text style="margin-bottom: 10rpx;" :id="item.deviceId" @tap="createBLEConnections(item)">响铃</text> -->
<text :id="item.deviceId" @tap="createBLEConnection(item)">录入</text> <text :id="item.deviceId" @tap="createBLEConnection(item)">录入</text>
</view> </view>
</view> </view>

2
page_user/setting.vue
View File

@ -59,7 +59,7 @@
</view> </view>
<view class="li"> <view class="li">
<view class="tit"> <view class="tit">
Wifi配网 Wifi名称
</view> </view>
<view class="info"> <view class="info">
<view class="txt"> <view class="txt">

148
pages/index/index.vue
View File

@ -81,11 +81,11 @@
</view> </view>
<view class="swiper-item "> <view class="swiper-item ">
<view class="card_box" @click="todetail(item.deviceId)" v-for="(item,index) in wateringList" <view class="card_box" v-for="(item,index) in wateringList"
:key="index"> :key="index">
<view class="card"> <view class="card">
<view class="card_left"> <view class="card_left">
<view class="card_left_tit"> <view class="card_left_tit" @click="todetail(item.deviceId)">
{{item.deviceName}} {{item.deviceName}}
</view> </view>
<view class="card_left_sta"> <view class="card_left_sta">
@ -100,12 +100,21 @@
<view class="sta_txt" v-if="item.status==1" style="color:seagreen;"> <view class="sta_txt" v-if="item.status==1" style="color:seagreen;">
空闲 空闲
</view> </view>
<view @click="sremakes(item)" v-if="item.storeId == null" class="dianpu" style="border: 1px solid #8883F0;padding: 5rpx;box-sizing: border-box;width: 200rpx;border-radius: 20rpx;color: #8883F0;text-align: center;margin-left: 20rpx;">
未分配店铺
</view>
</view> </view>
<view class="card_left_no"> <view class="card_left_no" @click="todetail(item.deviceId)">
S/N码：{{item.deviceNo}} S/N码：{{item.deviceNo}}
</view> </view>
<view v-if="curtitidx==0" style="color: #ccc;margin-top: 20rpx;">
归属店铺: {{item.storeName == null ? '--' : item.storeName}}
</view>
<!-- <view @click="sremakes(item)" v-else class="dianpu" style="border: 1px solid #8883F0;padding: 5rpx;box-sizing: border-box;width: 200rpx;border-radius: 20rpx;color: #8883F0;text-align: center;margin-top: 20rpx;">
已分配店铺
</view> -->
</view> </view>
<view class="card_right"> <view class="card_right" @click="todetail(item.deviceId)">
<image v-if="item.customPicture" :src="item.customPicture" mode="" <image v-if="item.customPicture" :src="item.customPicture" mode=""
style="border-radius: 20rpx;"></image> style="border-radius: 20rpx;"></image>
<image v-else :src="item.picture" mode=""></image> <image v-else :src="item.picture" mode=""></image>
@ -115,10 +124,12 @@
</view> </view>
</swiper-item> </swiper-item>
</swiper> </swiper>
</view> </view>
<view class="noDevice" v-if="addflag"> <!-- 选择店铺 -->
<u-select v-model="showshop" :list="shoplist" @confirm="confirms"></u-select>
<!-- <view class="noDevice" v-if="addflag">
<view class="img_box"> <view class="img_box">
<image src="https://api.ccttiot.com/smartmeter/img/static/uD3h9FDe458MjVW5H7VB" mode=""></image> <image src="https://api.ccttiot.com/smartmeter/img/static/uD3h9FDe458MjVW5H7VB" mode=""></image>
<view class="tps"> <view class="tps">
@ -130,7 +141,7 @@
添加方式 添加方式
</view> </view>
<view class="tip">需要添加设备后方可使用</view> <view class="tip">需要添加设备后方可使用</view>
</view> </view> -->
<tab-bar :indexs='0'></tab-bar> <tab-bar :indexs='0'></tab-bar>
@ -147,6 +158,8 @@
export default { export default {
data() { data() {
return { return {
showshop: false,
shoplist: [],
bgc: { bgc: {
backgroundColor: "#8883f0", backgroundColor: "#8883f0",
}, },
@ -196,14 +209,17 @@
noMoreData: false, noMoreData: false,
total: 0, total: 0,
shujuflag: false, shujuflag: false,
id:''
} }
}, },
onLoad() { onLoad() {
}, },
onShow() { onShow() {
this.gettanc()
this.pagenum = 1 this.pagenum = 1
this.wateringList = [] this.curtitidx = 0
// this.wateringList = []
this.logins() this.logins()
this.getgroup(); this.getgroup();
this.deviceId = uni.getStorageSync('deviceIds') this.deviceId = uni.getStorageSync('deviceIds')
@ -243,6 +259,54 @@
}, 2000); }, 2000);
}, },
methods: { methods: {
// 获取店铺
sremakes(item) {
this.id = item.deviceId
this.showshop = true
},
gettanc(){
this.$u.get('/app/store/listCount').then((res) => {
if (res.code == 200) {
this.total = res.total
if (res.data.length > 0) {
// 有数据，追加到列表
let arr = res.data.map(row => ({
value: row.storeId, // 将storeId赋值给value
label: row.name // 将name赋值给label
}))
this.shoplist = arr
this.shoplist = this.shoplist.slice(1)
}
}
})
},
confirms(e){
this.pagenum = 1
let data = {
deviceId: this.id,
storeId:e[0].value
}
this.putdevice(data)
setTimeout(()=>{
this.getlist()
},1000)
},
putdevice(data) {
this.$u.put('/app/device', data).then((res) => {
if (res.code == 200) {
this.getlist()
uni.showToast({
title: '修改成功',
icon: 'none',
duration: 2000
});
}
})
},
tocz() { tocz() {
this.showtip = false this.showtip = false
uni.navigateTo({ uni.navigateTo({
@ -342,8 +406,8 @@
// this.wateringList = [] // this.wateringList = []
if (res.rows.length > 0) { if (res.rows.length > 0) {
// 有数据，追加到列表 // 有数据，追加到列表
this.wateringList = this.wateringList.concat(res.rows) // this.wateringList = this.wateringList.concat(res.rows)
this.pagenum++ // this.pagenum++
this.shujuflag = false this.shujuflag = false
uni.hideLoading() uni.hideLoading()
} else { } else {
@ -351,6 +415,13 @@
this.shujuflag = true this.shujuflag = true
uni.hideLoading() uni.hideLoading()
} }
if(this.pagesum > 1){
this.wateringList = this.wateringList .concat(res.rows)
this.shujuflag = false
}else{
this.wateringList = res.rows
}
this.pagenum++
this.isLoading = false; this.isLoading = false;
} }
}) })
@ -363,8 +434,8 @@
// this.wateringList = [] // this.wateringList = []
if (res.rows.length > 0) { if (res.rows.length > 0) {
// 有数据，追加到列表 // 有数据，追加到列表
this.wateringList = this.wateringList.concat(res.rows) // this.wateringList = this.wateringList.concat(res.rows)
this.pagenum++ // this.pagenum++
this.shujuflag = false this.shujuflag = false
uni.hideLoading() uni.hideLoading()
} else { } else {
@ -372,6 +443,13 @@
this.shujuflag = true this.shujuflag = true
uni.hideLoading() uni.hideLoading()
} }
if(this.pagesum > 1){
this.wateringList = this.wateringList .concat(res.rows)
this.shujuflag = false
}else{
this.wateringList = res.rows
}
this.pagenum++
this.isLoading = false; this.isLoading = false;
} }
}) })
@ -393,31 +471,42 @@
changeGp(item, index) { changeGp(item, index) {
// console.log(item); // console.log(item);
this.pagenum = 1
this.showfz = false this.showfz = false
if (item == 1) { if (item == 1) {
this.getDeviceList() this.getDeviceList()
} else { } else {
if (item.storeId == null) { if (item.storeId == null) {
this.pagenum = 1 this.pagenum = 1
this.wateringList = [] // this.wateringList = []
this.titlist = item.name this.titlist = item.name
this.$u.get(`/app/device/list?pageNum=${this.pagenum}&pageSize=${this.pagesize}`).then((res) => { this.$u.get(`/app/device/list?pageNum=${this.pagenum}&pageSize=${this.pagesize}`).then((res) => {
if (res.code == 200) { if (res.code == 200) {
this.total = res.total this.total = res.total
if (res.rows.length > 0) { if (res.rows.length > 0) {
// 有数据，追加到列表 // 有数据，追加到列表
this.wateringList = this.wateringList.concat(res.rows) // this.wateringList = this.wateringList.concat(res.rows)
this.pagenum++ // this.pagenum++
this.shujuflag = false
uni.hideLoading()
} else { } else {
// 没有更多数据 // 没有更多数据
this.noMoreData = true this.shujuflag = true
uni.hideLoading()
} }
if(this.pagesum > 1){
this.wateringList = this.wateringList .concat(res.rows)
this.shujuflag = false
}else{
this.wateringList = res.rows
}
this.pagenum++
this.isLoading = false this.isLoading = false
} }
}) })
} else { } else {
this.pagenum = 1 this.pagenum = 1
this.wateringList = [] // this.wateringList = []
this.titlist = item.name this.titlist = item.name
this.$u.get(`/app/device/list?storeId=${item.storeId}&pageNum=${this.pagenum}&pageSize=${this.pagesize}`).then((res) => { this.$u.get(`/app/device/list?storeId=${item.storeId}&pageNum=${this.pagenum}&pageSize=${this.pagesize}`).then((res) => {
if (res.code == 200) { if (res.code == 200) {
@ -429,12 +518,22 @@
// } // }
if (res.rows.length > 0) { if (res.rows.length > 0) {
// 有数据，追加到列表 // 有数据，追加到列表
this.wateringList = this.wateringList.concat(res.rows) // this.wateringList = this.wateringList.concat(res.rows)
this.pagenum++ // this.pagenum++
this.shujuflag = false
uni.hideLoading()
} else { } else {
// 没有更多数据 // 没有更多数据
this.noMoreData = true this.shujuflag = true
uni.hideLoading()
} }
if(this.pagesum > 1){
this.wateringList = this.wateringList .concat(res.rows)
this.shujuflag = false
}else{
this.wateringList = res.rows
}
this.pagenum++
this.isLoading = false this.isLoading = false
} }
}) })
@ -695,7 +794,7 @@
uni.showLoading({ uni.showLoading({
title: '加载中...' title: '加载中...'
}); });
this.wateringList = [] // this.wateringList = []
this.pagenum = 1 this.pagenum = 1
this.curtitidx = e.detail.current this.curtitidx = e.detail.current
this.storeId = this.groupLists[this.curtitidx].storeId this.storeId = this.groupLists[this.curtitidx].storeId
@ -718,6 +817,7 @@
}); });
}, },
changeidx(index) { changeidx(index) {
this.pagenum = 1
this.curtitidx = index this.curtitidx = index
}, },
@ -1313,7 +1413,9 @@
// align-items: center; // align-items: center;
margin-top: 20rpx; margin-top: 20rpx;
width: 658rpx; width: 658rpx;
height: 250rpx; max-height: 300rpx;
padding-bottom: 20rpx;
box-sizing: border-box;
background: #fff; background: #fff;
box-shadow: 0rpx 16rpx 40rpx 0rpx rgba(255, 255, 255, 0); box-shadow: 0rpx 16rpx 40rpx 0rpx rgba(255, 255, 255, 0);
border-radius: 24rpx 24rpx 24rpx 24rpx; border-radius: 24rpx 24rpx 24rpx 24rpx;

13
pages/shouye/index.vue
View File

@ -2,7 +2,7 @@
<view class="page"> <view class="page">
<!-- 用户首页显示 --> <!-- 用户首页显示 -->
<view class="useryonghu"> <view class="useryonghu">
<u-navbar :is-back="false" title="首页" :border-bottom="false" :background="bgc" title-color='#fff' <u-navbar :is-back="false" title="创想物联" :border-bottom="false" :background="bgc" title-color='#fff'
title-size='44' height='50'></u-navbar> title-size='44' height='50'></u-navbar>
<view class="ditu"> <view class="ditu">
<view class="dtxs"> <view class="dtxs">
@ -186,6 +186,17 @@
} }
}, },
methods: { methods: {
// 请求正在使用的设备列表
getshiy(){
this.$u.get("/app/device/usingDevice").then((res) => {
if (res.code == 200) {
this.sylist = res.data
}
})
},
btnitem(){ btnitem(){
uni.navigateTo({ uni.navigateTo({
url:'/page_components/eletj' url:'/page_components/eletj'