chuangte/smartswrtch-app
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化套餐 设备 录入 绑定 设备排版等问题

Browse Source
This commit is contained in:
3321822538@qq.com 2024-07-19 18:07:24 +08:00
parent bda070dd89
commit 766a540075
12 changed files with 213 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/http.interceptor.js
View File

@ -19,9 +19,9 @@ const install = (Vue, vm) => {
// }, // },
// }); // });
Vue.prototype.$u.http.setConfig({ Vue.prototype.$u.http.setConfig({
// baseUrl: 'http://192.168.2.143:10002', // baseUrl: 'http://192.168.2.143:10002',
baseUrl: 'https://kg.chuantewulian.cn/prod-api', baseUrl: 'https://kg.chuangtewl.com/prod-api',
loadingText: '努力加载中~', loadingText: '努力加载中~',
loadingTime: 1000, loadingTime: 1000,
// 设置自定义头部content-type // 设置自定义头部content-type
@ -123,11 +123,11 @@ const install = (Vue, vm) => {
// }) // })
uni.setStorageSync('token', res.token) uni.setStorageSync('token', res.token)
} }
}); })
} }
}, },
}); })
} }
return res; return res;

24
page_components/bindsz.vue
View File

@ -38,7 +38,7 @@
</view> </view>
<view class="li"> <view class="li">
<view class="tit"> <view class="tit">
类型 型号
</view> </view>
<view class="info"> <view class="info">
<view class="txt"> <view class="txt">
@ -61,14 +61,14 @@
套餐设置 套餐设置
</view> </view>
<view class="info"> <view class="info">
<view class="txt"> <view class="txt" style="display: flex;">
<view class="iconfont icon-xiangyou1"></view> <view class="">{{taocan.length > 5 ? taocan.slice(0,5) + '...' : taocan}}</view> <view style="padding-top: 6rpx;" class="iconfont icon-xiangyou1"></view>
</view> </view>
</view> </view>
</view> </view>
<view class="li" @click.stop="sremakes()" v-if="isMch"> <view class="li" @click.stop="sremakes()" v-if="isMch">
<view class="tit"> <view class="tit">
店铺名称 归属店铺
</view> </view>
<view class="info"> <view class="info">
<view class="txt"> <view class="txt">
@ -223,7 +223,8 @@
mac:'', mac:'',
name:'', name:'',
deviceId:'', deviceId:'',
isMch:false isMch:false,
taocan:''
} }
}, },
onLoad(option) { onLoad(option) {
@ -234,8 +235,10 @@
this.gettanc() this.gettanc()
}, },
onShow() { onShow() {
this.taocan = ''
this.getgroup() this.getgroup()
this.getuserinfo() this.getuserinfo()
this.getao()
}, },
// 分享到好友（会话） // 分享到好友（会话）
onShareAppMessage: function () { onShareAppMessage: function () {
@ -254,6 +257,17 @@
} }
}, },
methods: { methods: {
getao(){
this.$u.get(`/app/suit/listByDeviceId/${this.id}`).then(res => {
if(res.code == 200){
if(res.data.length > 0){
res.data.forEach(item => {
this.taocan += item.name + ','
})
}
}
})
},
// 点击设置套餐 // 点击设置套餐
btntc(){ btntc(){
uni.navigateTo({ uni.navigateTo({

70
page_components/newtaocan.vue
View File

@ -7,14 +7,17 @@
<view class="box_list" v-for="(item, index) in list" :key="index" @click="btnactive(item.suitId,index)"> <view class="box_list" v-for="(item, index) in list" :key="index" @click="btnactive(item.suitId,index)">
<view :class="['boxlist', { active: tcidlist.includes(item.suitId) }]"> <view :class="['boxlist', { active: tcidlist.includes(item.suitId) }]">
<view :class="['toptime', { activewz: tcidlist.includes(item.suitId) }]"> <view :class="['toptime', { activewz: tcidlist.includes(item.suitId) }]">
<text>{{item.name}}（通电时长：{{item.value}} <text v-if="item.timeUnit == 1">日</text> <text v-if="item.timeUnit == 2">时</text> <text v-if="item.timeUnit == 3">分钟</text> <text v-if="item.timeUnit == 4">秒</text> ）</text> <text>￥{{item.price}}</text> <text>{{item.name}}（通电时长：{{item.value}} <text v-if="item.timeUnit == 1">日</text> <text
v-if="item.timeUnit == 2">时</text> <text v-if="item.timeUnit == 3">分钟</text> <text
v-if="item.timeUnit == 4">秒</text> ）</text> <text>￥{{item.price}}</text>
</view> </view>
<view class="ccc"> <view class="ccc">
<view class="bumday" v-if="item.description == null"> <view class="bumday" v-if="item.description == null">
<text class="shi"></text></text> <text class="shi"></text></text>
</view> </view>
<view class="bumday" v-else> <view class="bumday" v-else>
<text :class="['shi', { activewz: tcidlist.includes(item.suitId) }]">{{item.description.length > 20 ? item.description.substring(0, 20) + '...' : item.description}}</text></text> <text
:class="['shi', { activewz: tcidlist.includes(item.suitId) }]">{{item.description.length > 20 ? item.description.substring(0, 20) + '...' : item.description}}</text></text>
</view> </view>
<!-- <u-checkbox-group> <!-- <u-checkbox-group>
<u-checkbox v-model="item.checked"></u-checkbox> <u-checkbox v-model="item.checked"></u-checkbox>
@ -62,11 +65,13 @@
}, },
activeid: '', activeid: '',
checkboxes: [], checkboxes: [],
tcidlist: [] tcidlist: [],
titaoc: []
}; };
}, },
onLoad(option) { onLoad(option) {
this.deviceId = option.id this.deviceId = option.id
}, },
created() { created() {
// 初始化checkboxes数组，每个元素都设为false（表示初始时不显示复选框） // 初始化checkboxes数组，每个元素都设为false（表示初始时不显示复选框）
@ -75,24 +80,51 @@
onShow() { onShow() {
this.tcidlist = [] this.tcidlist = []
this.getlist() this.getlist()
setTimeout(() => {
this.getao()
}, 100)
}, },
// 分享到好友（会话） // 分享到好友（会话）
onShareAppMessage: function () { onShareAppMessage: function() {
return { return {
title: '创想物联', title: '创想物联',
path: '/pages/shouye/index' path: '/pages/shouye/index'
} }
}, },
// 分享到朋友圈 // 分享到朋友圈
onShareTimeline: function () { onShareTimeline: function() {
return { return {
title: '创想物联', title: '创想物联',
query: '', query: '',
path: '/pages/shouye/index' path: '/pages/shouye/index'
} }
}, },
methods: { methods: {
// 查询本人套餐
getao() {
this.$u.get(`/app/suit/listByDeviceId/${this.deviceId}`).then(res => {
if (res.code == 200) {
if (res.data.length > 0) {
this.titaoc = res.data
this.list.forEach(item => {
if (this.titaoc.some(titaocItem => titaocItem.sourceId === item.suitId)) {
this.titaoc.forEach(titaocItem => {
if (titaocItem.sourceId === item.suitId) {
this.tcidlist.push(item.suitId)
}
})
let uniqueTcidlist = [...new Set(this.tcidlist)];
this.tcidlist = uniqueTcidlist
}
})
}
}
})
},
btnactive(id, index) { btnactive(id, index) {
const indexInTcidList = this.tcidlist.indexOf(id); const indexInTcidList = this.tcidlist.indexOf(id);
if (indexInTcidList !== -1) { if (indexInTcidList !== -1) {
@ -105,6 +137,8 @@
// 点击确定 // 点击确定
btnqd() { btnqd() {
this.$u.delete(`/app/suit/delByDevice/${this.deviceId}`).then(res=>{})
let numArr = this.tcidlist.map(item => parseInt(item, 10)) let numArr = this.tcidlist.map(item => parseInt(item, 10))
let data = { let data = {
deviceId: this.deviceId, deviceId: this.deviceId,

15
page_components/wifilist/index.vue
View File

@ -8,7 +8,7 @@
<span class="device-list-title">WIFI选择</span> <span class="device-list-title">WIFI选择</span>
</view> </view>
<view class="flex-row items-center flex-1 group"> <view class="flex-row items-center flex-1 group">
<text class="text_3 ml-3">请选择您需要连接的wifi名称</text> <text class="text_3 ml-3">请选择您需要连接的2.4Gwifi名称</text>
</view> </view>
<!-- wifi列表 --> <!-- wifi列表 -->
@ -43,7 +43,7 @@
<view class="content"> <view class="content">
<view class="bt">{{item.SSID}}</view> <view class="bt">{{item.SSID}}</view>
<view class="wz" style="color: #8883F0 ;">{{item.BSSID}}</view> <!-- <view class="wz" style="color: #8883F0 ;">{{item.BSSID}}</view> -->
</view> </view>
</view> </view>
<image src="https://api.ccttiot.com/smartmeter/img/static/uLrArPv3OrIodtWZ3gri" mode="" <image src="https://api.ccttiot.com/smartmeter/img/static/uLrArPv3OrIodtWZ3gri" mode=""
@ -52,7 +52,7 @@
</view> </view>
</view> </view>
<view class="annius" style="display: flex;justify-content: space-between;"> <view class="annius" style="display: flex;justify-content: space-between;">
<view class="" @click="btnsd">手动输入WIFI</view> <view class="" @click="btnsd">手动输入WiFi</view>
<view class="" @click="btnxyb">下一步</view> <view class="" @click="btnxyb">下一步</view>
</view> </view>
@ -297,7 +297,7 @@
display: inline-block; display: inline-block;
margin-top: 10rpx; margin-top: 10rpx;
width: 50rpx; width: 50rpx;
height: 46rpx; height: 42rpx;
} }
} }
.annius{ .annius{
@ -307,8 +307,8 @@
transform: translateX(-50%); transform: translateX(-50%);
bottom: 50rpx; bottom: 50rpx;
border-radius: 52rpx 52rpx 52rpx 52rpx; border-radius: 52rpx 52rpx 52rpx 52rpx;
font-weight: 700; // font-weight: 700;
font-size: 20px; font-size: 38rpx;
width: 90%; width: 90%;
view{ view{
color: #FFFFFF; color: #FFFFFF;
@ -446,6 +446,7 @@
view { view {
height: 40rpx; height: 40rpx;
margin-top: 20rpx;
} }
.wz { .wz {
@ -467,7 +468,7 @@
.device-list-title { .device-list-title {
color: #50565a; color: #50565a;
font-size: 96rpx; font-size: 86rpx;
font-family: SourceHanSansCN; font-family: SourceHanSansCN;
margin-top: 100rpx; margin-top: 100rpx;
} }

6
page_fenbao/chongzhi.vue
View File

@ -350,18 +350,13 @@
}, },
bind() { bind() {
if (this.ishave && this.isband) { if (this.ishave && this.isband) {
let that = this let that = this
setTimeout(() => { setTimeout(() => {
uni.switchTab({ uni.switchTab({
url: '/pages/index/index' url: '/pages/index/index'
}) })
}, ) }, )
} }
}, },
// 解析自定义数据 // 解析自定义数据
parseCustomData(data) { parseCustomData(data) {
@ -418,7 +413,6 @@
// icon: 'none' // icon: 'none'
// }); // });
{ {
xBlufi.notifyInitBleEsp32({ xBlufi.notifyInitBleEsp32({
deviceId: this.deviceId deviceId: this.deviceId
}); });

2
page_fenbao/statulist/myshop/shopxx/index.vue
View File

@ -97,7 +97,7 @@
export default { export default {
data() { data() {
return { return {
checked:false, checked:true,
params: { params: {
hour: true, hour: true,
minute: true, minute: true,

14
page_fenbao/zhuce.vue
View File

@ -316,9 +316,9 @@
xBlufi.notifyStartDiscoverBle({ xBlufi.notifyStartDiscoverBle({
'isStart': false 'isStart': false
}); });
console.log(e, '蓝牙信息101010') // console.log(e, '蓝牙信息101010')
this.mac = e.name.substring(5) this.mac = e.name.substring(5)
console.log(this.mac, '54545454'); // console.log(this.mac, '54545454');
// xBlufi.notifyConnectBle({ // xBlufi.notifyConnectBle({
// isStart: true, // isStart: true,
// deviceId: e.deviceId, // deviceId: e.deviceId,
@ -332,15 +332,15 @@
this.$u.post('/app/device', data).then((res) => { this.$u.post('/app/device', data).then((res) => {
if (res.code == 200) { if (res.code == 200) {
uni.showToast({ uni.showToast({
title: '录入成功', title: '设备录入成功',
icon: 'success', icon: 'success',
duration: 2000 duration: 2000
}) })
this.mengcflag = false this.mengcflag = false
uni.hideLoading() uni.hideLoading()
setTimeout(()=>{ setTimeout(()=>{
uni.navigateBack() uni.navigateBack()
},500) },2000)
uni.removeStorageSync('mac'); uni.removeStorageSync('mac');
// uni.showModal({ // uni.showModal({
// title: '提示', // title: '提示',
@ -371,7 +371,7 @@
}, },
// 点击重新搜索 // 点击重新搜索
Search() { Search() {
console.log(1); // console.log(1);
// if (this.status) { // if (this.status) {
xBlufi.notifyStartDiscoverBle({ xBlufi.notifyStartDiscoverBle({
'isStart': true 'isStart': true

8
page_user/mapditu/index.vue
View File

@ -28,21 +28,21 @@
</view> </view>
<view class="cen"> <view class="cen">
<view class="cena" style="font-weight: 600;"> <view class="cena" style="font-weight: 600;">
{{listobj.name}} {{listobj.name == undefined ? '--' : listobj.name}}
</view> </view>
<view class="cenb"> <view class="cenb">
<image src="https://api.ccttiot.com/smartmeter/img/static/uHK2aJHvzEm3nbOPwpdr" mode=""></image> <image src="https://api.ccttiot.com/smartmeter/img/static/uHK2aJHvzEm3nbOPwpdr" mode=""></image>
{{listobj.address}} {{listobj.address == undefined ? '--' : listobj.address}}
</view> </view>
<view class="cenc"> <view class="cenc">
共享时间：{{listobj.businessTimeStart}}-{{listobj.businessTimeEnd}} <text 共享时间：{{listobj.businessTimeStart == undefined ? '--' : listobj.businessTimeStart}}-{{listobj.businessTimeEnd == undefined ? '--' : listobj.businessTimeEnd}} <text
class="bu">{{listobj.availableDeviceCount}}台可共享</text> class="bu">{{listobj.availableDeviceCount}}台可共享</text>
</view> </view>
</view> </view>
</view> </view>
<view class="chakan" @click="btnchak(listobj.storeId)"> <view class="chakan" @click="btnchak(listobj.storeId)">
<view class=""> <view class="">
本店共有{{listobj.deviceCount}}台共享设备 本店共有{{listobj.deviceCount == undefined ? '--' : listobj.deviceCount}}台共享设备
</view> </view>
<view class=""> <view class="">
查看 <u-icon name="arrow-right" color="#6863D9" size="24" style="margin-left: 10rpx;"></u-icon> 查看 <u-icon name="arrow-right" color="#6863D9" size="24" style="margin-left: 10rpx;"></u-icon>

116
page_user/sbdetail.vue
View File

@ -86,7 +86,7 @@
<image src="https://api.ccttiot.com/smartmeter/img/static/uKrpw3p37UHW56IypPJU" mode="" <image src="https://api.ccttiot.com/smartmeter/img/static/uKrpw3p37UHW56IypPJU" mode=""
style="width: 58rpx;height: 56rpx;"></image> style="width: 58rpx;height: 56rpx;"></image>
</view> </view>
<view class="bot">充值记录</view> <view class="bot" style="margin-top: 18rpx;">充值记录</view>
</view> </view>
<view class="cont" @click="topage(1)"> <view class="cont" @click="topage(1)">
<view class="top"> <view class="top">
@ -122,7 +122,7 @@
<image src="https://api.ccttiot.com/smartmeter/img/static/umjPUc8nDKf1JwVqRAeb" mode="" <image src="https://api.ccttiot.com/smartmeter/img/static/umjPUc8nDKf1JwVqRAeb" mode=""
style="width: 58rpx;height: 60rpx;"></image> style="width: 58rpx;height: 60rpx;"></image>
</view> </view>
<view class="bot">收费方式</view> <view class="bot" style="margin-top: 10rpx;">收费方式</view>
</view> </view>
<view class="cont" @click="topage(4)"> <view class="cont" @click="topage(4)">
<view class="top"> <view class="top">
@ -328,16 +328,17 @@
// 开启和关闭 // 开启和关闭
btnkq(){ btnkq(){
if(this.tdtxt == '开启'){ if(this.tdtxt == '开启'){
this.$u.put(`/app/device/${this.id}/changePower?status=1`).then((res) => { this.$u.put(`/app/device/${this.id}/changePower?status=0`).then((res) => {
if (res.code == 200) { if (res.code == 200) {
this.tdtxt = '关闭' this.tdtxt = '关闭'
this.checked = true this.checked = false
uni.showToast({ uni.showToast({
title: res.msg, title: res.msg,
icon: 'success', icon: 'success',
duration: 2000 duration: 2000
}) })
}else{ }else{
this.checked = false
uni.showToast({ uni.showToast({
title: res.msg, title: res.msg,
icon: 'none', icon: 'none',
@ -346,9 +347,9 @@
} }
}) })
}else{ }else{
this.$u.put(`/app/device/${this.id}/changePower?status=0`).then((res) => { this.$u.put(`/app/device/${this.id}/changePower?status=1`).then((res) => {
if (res.code == 200) { if (res.code == 200) {
this.checked = false this.checked = true
this.tdtxt = '开启' this.tdtxt = '开启'
uni.showToast({ uni.showToast({
title: res.msg, title: res.msg,
@ -356,6 +357,7 @@
duration: 2000 duration: 2000
}) })
}else{ }else{
this.checked = false
uni.showToast({ uni.showToast({
title: res.msg, title: res.msg,
icon: 'none', icon: 'none',
@ -446,31 +448,38 @@
this.startTimer() this.startTimer()
} }
} }
if(res.data.powerStatus == 0){
this.checked = false
this.tdtxt = '关闭'
}else{
this.checked = true
this.tdtxt = '开启'
}
this.loadings = true this.loadings = true
} }
}); })
}, },
startTimer() { startTimer() {
this.timer = setInterval(() => { this.timer = setInterval(() => {
if (this.timeday.seconds > 0) { if (this.timeday.seconds > 0) {
this.timeday.seconds--; this.timeday.seconds--
} else if (this.timeday.minutes > 0) { } else if (this.timeday.minutes > 0) {
this.timeday.seconds = 59; // 重置秒数为59 this.timeday.seconds = 59 // 重置秒数为59
this.timeday.minutes--; this.timeday.minutes--
} else if (this.timeday.hours > 0) { } else if (this.timeday.hours > 0) {
this.timeday.minutes = 59; // 重置分钟数为59 this.timeday.minutes = 59 // 重置分钟数为59
this.timeday.hours--; this.timeday.hours--
this.timeday.seconds = 0; // 同时重置秒数为0 this.timeday.seconds = 0 // 同时重置秒数为0
} else if (this.timeday.days > 0) { } else if (this.timeday.days > 0) {
this.timeday.hours = 23; // 重置小时数为23 this.timeday.hours = 23 // 重置小时数为23
this.timeday.minutes = 59; // 重置分钟数为59 this.timeday.minutes = 59 // 重置分钟数为59
this.timeday.seconds = 0; // 重置秒数为0 this.timeday.seconds = 0 // 重置秒数为0
this.timeday.days--; this.timeday.days--
} else { } else {
// 所有时间单位都已减为0，停止定时器 // 所有时间单位都已减为0，停止定时器
clearInterval(this.timer); clearInterval(this.timer)
this.timer = null; this.timer = null;
console.log('时间已到期'); // console.log('时间已到期')
} }
}, 1000); // 每秒执行一次 }, 1000); // 每秒执行一次
}, },
@ -499,7 +508,7 @@
} else { } else {
stause = 1 stause = 1
} }
console.log(stause, 'stausestause'); // console.log(stause, 'stausestause');
this.$u.put(`/app/device/${this.deviceInfo.deviceId}/changePower?status=` + stause).then((res) => { this.$u.put(`/app/device/${this.deviceInfo.deviceId}/changePower?status=` + stause).then((res) => {
// this.$forceUpdate() // this.$forceUpdate()
if (res.code == 200) { if (res.code == 200) {
@ -559,6 +568,8 @@
duration: 2000 duration: 2000
}) })
that.getDevice(that.id) that.getDevice(that.id)
this.checked = false
this.tdtxt = '关闭'
} else if (res.msg == '设备剩余时间不足，无需归零') { } else if (res.msg == '设备剩余时间不足，无需归零') {
uni.showToast({ uni.showToast({
title: '设备剩余时间不足，无需归零', title: '设备剩余时间不足，无需归零',
@ -624,7 +635,10 @@
url: '/page_user/setting?id=' + this.id url: '/page_user/setting?id=' + this.id
}) })
} else if (num == 5) { } else if (num == 5) {
console.log(this.deviceId,'idididididdidii'); uni.showLoading({
title: '蓝牙连接中...'
})
// console.log(this.deviceId,'idididididdidii');
if(this.deviceId == ''){ if(this.deviceId == ''){
xBlufi.initXBlufi(1); xBlufi.initXBlufi(1);
xBlufi.listenDeviceMsgEvent(true, this.funListenDeviceMsgEvent); xBlufi.listenDeviceMsgEvent(true, this.funListenDeviceMsgEvent);
@ -636,8 +650,7 @@
setTimeout(() => { setTimeout(() => {
xBlufi.notifyStartDiscoverBle({ xBlufi.notifyStartDiscoverBle({
'isStart': false 'isStart': false
}); })
xBlufi.notifyConnectBle({ xBlufi.notifyConnectBle({
isStart: true, isStart: true,
deviceId: this.deviceId, deviceId: this.deviceId,
@ -704,15 +717,15 @@
} }
this.$u.put('/app/device/bind', data).then((res) => { this.$u.put('/app/device/bind', data).then((res) => {
if (res.code == 200) { if (res.code == 200) {
uni.showToast({ // uni.showToast({
title: '绑定成功', // title: '绑定成功',
icon: 'none', // icon: 'none',
duration: 2000 // duration: 2000
}) // })
uni.hideLoading(); uni.hideLoading();
uni.removeStorageSync('mac'); uni.removeStorageSync('mac');
let systemInfo = uni.getSystemInfoSync(); let systemInfo = uni.getSystemInfoSync();
if (systemInfo.platform == 'android') { if (systemInfo.platform == 'android') {
// 当前设备是 Android // 当前设备是 Android
uni.navigateTo({ uni.navigateTo({
url: '/page_components/wifilist/index?deviceId=' +this.deviceId + '&name=' +this.name url: '/page_components/wifilist/index?deviceId=' +this.deviceId + '&name=' +this.name
@ -723,19 +736,23 @@
url: '/page_fenbao/device/wifivideo?deviceId=' +this.deviceId + '&name=' +this.name url: '/page_fenbao/device/wifivideo?deviceId=' +this.deviceId + '&name=' +this.name
}) })
} }
}else if(res.msg == '设备编号和mac不能同时为空'){ }else {
if(res.msg == '设备编号和mac不能同时为空'){
uni.hideLoading()
uni.showToast({
title: '未找到设备',
icon: 'none',
duration: 2000
})
} else {
uni.hideLoading()
uni.showToast({ uni.showToast({
title: '未找到设备', title:res.msg,
icon: 'none', icon: 'none',
duration: 2000 duration: 2000
}); })
} else { // uni.navigateBack()
uni.showToast({ }
title:res.msg,
icon: 'none',
duration: 2000
});
// uni.navigateBack()
} }
}) })
} }
@ -746,7 +763,7 @@
}, },
trueje(){ trueje(){
if (this.timer) { if (this.timer) {
clearInterval(this.timer); clearInterval(this.timer)
this.timer = null; this.timer = null;
} }
let id = this.deviceInfo.deviceId let id = this.deviceInfo.deviceId
@ -811,18 +828,16 @@
// console.log("文件读取中", options.data); // console.log("文件读取中", options.data);
break; break;
case xBlufi.XBLUFI_TYPE.TYPE_RECIEVE_CUSTON_DATA: case xBlufi.XBLUFI_TYPE.TYPE_RECIEVE_CUSTON_DATA:
let ver_data = this.parseCustomData(options.data) let ver_data = this.parseCustomData(options.data)
this.setMode = Math.floor(ver_data.setMode / 60) this.setMode = Math.floor(ver_data.setMode / 60)
console.log("1收到设备发来的自定义数据结果：", ver_data,this.setMode); console.log("1收到设备发来的自定义数据结果：", ver_data,this.setMode)
break; break;
case xBlufi.XBLUFI_TYPE.TYPE_GET_DEVICE_LISTS: case xBlufi.XBLUFI_TYPE.TYPE_GET_DEVICE_LISTS:
if (options.result) { if (options.result) {
let devicesarr = options.data let devicesarr = options.data
// console.log(devicesarr,'devicesarrdevicesarr'); // console.log(devicesarr,'devicesarrdevicesarr');
devicesarr.forEach(device => { devicesarr.forEach(device => {
const mac = device.name.substring(5); const mac = device.name.substring(5)
if (device.name == this.qrResult) { if (device.name == this.qrResult) {
this.deviceId = device.deviceId this.deviceId = device.deviceId
this.name = device.name this.name = device.name
@ -848,17 +863,20 @@
} }
} else { } else {
uni.hideLoading() uni.hideLoading()
uni.showToast({ // uni.showToast({
title: '设备离线或不在范围内', // title: '设备离线或不在范围内',
icon: 'none', // icon: 'none',
duration: 2000 // duration: 2000
}) // })
} }
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) {
setTimeout(()=>{
uni.hideLoading()
},3000)
console.log("蓝牙未开启", options); console.log("蓝牙未开启", options);
// uni.showToast({ // uni.showToast({
// title: '蓝牙未开启', // title: '蓝牙未开启',

4
page_user/wifijoint/index.vue
View File

@ -7,7 +7,7 @@
<span class="device-list-title">WIFI连接</span> <span class="device-list-title">WIFI连接</span>
</view> </view>
<view class="flex-row items-center flex-1 group"> <view class="flex-row items-center flex-1 group">
<text class="text_3 ml-3">请选择您的WiFi网络详细信息</text> <text class="text_3 ml-3">请输入您的WiFi名称和密码</text>
</view> </view>
<!-- wifi信息 --> <!-- wifi信息 -->
@ -282,7 +282,7 @@
.device-list-title { .device-list-title {
color: #50565a; color: #50565a;
font-size: 96rpx; font-size: 86rpx;
font-family: SourceHanSansCN; font-family: SourceHanSansCN;
// margin-top: 100rpx; // margin-top: 100rpx;
} }

43
pages/index/index.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<view class="page"> <view class="page">
<u-navbar :is-back="false" :title="tittxt" :border-bottom="false" :background="bgc" title-color='#fff' <u-navbar :is-back="false" :title="tittxt" :border-bottom="false" :background="bgc" title-color='#fff'
title-size='44' height='50' id="navbar"> title-size='44' height='50' id="navbar">
</u-navbar> </u-navbar>
<u-mask :show="showtip" @click="show = false" :z-index='1000' /> <u-mask :show="showtip" @click="show = false" :z-index='1000' />
@ -100,14 +100,15 @@
<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: 180rpx;border-radius: 20rpx;color: #8883F0;text-align: center;margin-left: 20rpx;">
未分配店铺
</view>
</view> </view>
<view class="card_left_no" @click="todetail(item.deviceId)"> <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;" @click="todetail(item.deviceId)"> <view @click="sremakes(item)" v-if="item.storeId == null" class="dianpu" style="border: 1px solid #8883F0;padding: 5rpx;box-sizing: border-box;width: 180rpx;border-radius: 20rpx;color: #8883F0;text-align: center;margin-top: 20rpx;">
未分配店铺
</view>
<view v-else style="color: #ccc;margin-top: 20rpx;" @click="todetail(item.deviceId)">
归属店铺: {{item.storeName == null ? '--' : item.storeName}} 归属店铺: {{item.storeName == null ? '--' : item.storeName}}
</view> </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 @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;">
@ -732,14 +733,12 @@
this.deviceInfo = res.data this.deviceInfo = res.data
this.loadings = true this.loadings = true
} }
}); })
}, },
getuserinfo() { getuserinfo() {
this.$u.get("/app/user/userInfo").then((res) => { this.$u.get("/app/user/userInfo").then((res) => {
// this.$forceUpdate() // this.$forceUpdate()
if (res.code == 200) { if (res.code == 200) {
// uni.setStorageSync('userType', res.data.userType) // uni.setStorageSync('userType', res.data.userType)
this.userType = res.data.userType this.userType = res.data.userType
if (this.userType == '01') { if (this.userType == '01') {
@ -747,7 +746,6 @@
} else if (this.userType == '00') { } else if (this.userType == '00') {
this.getdevice() this.getdevice()
} }
} else { } else {
this.jmlogin() this.jmlogin()
} }
@ -767,22 +765,20 @@
url: '/pages/login/login' url: '/pages/login/login'
}) })
} else if (res.code == 200) { } else if (res.code == 200) {
uni.setStorageSync('token', res.token); uni.setStorageSync('token', res.token)
taht.logins() taht.logins()
} }
}); })
} }
}, },
})
});
}, },
getDeviceList() { getDeviceList() {
this.$u.get("/app/device/list").then((res) => { this.$u.get("/app/device/list").then((res) => {
// this.$forceUpdate() // this.$forceUpdate()
if (res.code == 200) { if (res.code == 200) {
this.deviceList = res.rows.filter(row => row.isDefault === true) this.deviceList = res.rows.filter(row => row.isDefault === true)
console.log(this.deviceList); // console.log(this.deviceList)
this.total = res.total this.total = res.total
if (this.deviceList == '') { if (this.deviceList == '') {
this.addflag = true this.addflag = true
@ -792,8 +788,7 @@
this.sbflag = true this.sbflag = true
} }
} }
}); })
}, },
swiperchange(e) { swiperchange(e) {
uni.showLoading({ uni.showLoading({
@ -819,7 +814,7 @@
uni.setStorageSync('deviceId', this.deviceInfo.deviceId) uni.setStorageSync('deviceId', this.deviceInfo.deviceId)
// this.initChart() // this.initChart()
this.order() this.order()
}); })
}, },
changeidx(index) { changeidx(index) {
this.pagenum = 1 this.pagenum = 1
@ -875,7 +870,6 @@
left: 72rpx; left: 72rpx;
top: 788rpx; top: 788rpx;
width: 610rpx; width: 610rpx;
// height: 282rpx;
background: #F7FAFE; background: #F7FAFE;
border-radius: 30rpx 30rpx 30rpx 30rpx; border-radius: 30rpx 30rpx 30rpx 30rpx;
z-index: 10000000; z-index: 10000000;
@ -1322,12 +1316,10 @@
.fd_top { .fd_top {
display: flex; display: flex;
flex-wrap: nowrap; flex-wrap: nowrap;
// justify-content: space-between;
align-items: center; align-items: center;
.fd_da { .fd_da {
width: 600rpx; width: 600rpx;
// overflow-x: scroll;
overflow: hidden; overflow: hidden;
overflow-x: auto; overflow-x: auto;
white-space: nowrap; white-space: nowrap;
@ -1341,7 +1333,6 @@
} }
.fd_lt { .fd_lt {
// width: 100vh;
display: flex; display: flex;
transition: transform 0.3s ease; transition: transform 0.3s ease;
padding-top: 10rpx; padding-top: 10rpx;
@ -1373,9 +1364,6 @@
align-items: center; align-items: center;
.fd_set { .fd_set {
// margin-bottom: 10rpx;
// margin-left: 200rpx;
// margin-left: auto;
font-size: 60rpx; font-size: 60rpx;
} }
@ -1402,7 +1390,6 @@
.swiper { .swiper {
// height: 100vh;
.swiper-item { .swiper-item {
height: 100vh; height: 100vh;
overflow-y: auto; overflow-y: auto;
@ -1415,7 +1402,6 @@
.card { .card {
display: flex; display: flex;
// align-items: center;
margin-top: 20rpx; margin-top: 20rpx;
width: 658rpx; width: 658rpx;
max-height: 300rpx; max-height: 300rpx;
@ -1427,7 +1413,7 @@
.card_left { .card_left {
width: 310rpx; width: 310rpx;
margin-top: 46rpx; margin-top: 20rpx;
margin-left: 50rpx; margin-left: 50rpx;
.card_left_tit { .card_left_tit {
@ -1521,4 +1507,5 @@
box-sizing: border-box; box-sizing: border-box;
} }
} }
</style> </style>

49
pages/shouye/index.vue
View File

@ -130,24 +130,45 @@
this.deviceobj = res.data this.deviceobj = res.data
} }
}) })
let that = this let that = this
uni.showModal({ // uni.showModal({
title: '提示', // title: '提示',
content: '该设备未被绑定,你需进行绑定吗？', // content: '该设备未被绑定,你需进行绑定吗？',
success: function(res) { // success: function(res) {
if (res.confirm) { // if (res.confirm) {
let data = { let data = {
deviceNo: id deviceNo: id
} }
that.$u.put("/app/device/bind", data).then(res => { that.$u.put("/app/device/bind", data).then(res => {
if (res.code == 200) { if (res.code == 200) {
uni.navigateTo({ uni.showModal({
url: '/page_components/bindsz?id=' + that.deviceobj.deviceId title: '提示',
content: '该设备未绑定,你需进行绑定吗？',
success: function(res) {
if (res.confirm) {
uni.navigateTo({
url: '/page_components/bindsz?id=' + that.deviceobj.deviceId
})
} else if (res.cancel) {
}
}
}) })
} else { } else {
if (res.msg == '设备未录入') { if (res.msg == '设备未录入') {
uni.navigateTo({ uni.showModal({
url: '/page_fenbao/zhuce?sn=' + id title: '提示',
content: '该设备未录入,你需进行录入吗？',
success: function(res) {
if (res.confirm) {
uni.navigateTo({
url: '/page_fenbao/zhuce?sn=' + id
})
} else if (res.cancel) {
}
}
}) })
} else { } else {
uni.showToast({ uni.showToast({
@ -158,13 +179,13 @@
} }
} }
}) })
} else if (res.cancel) { // } else if (res.cancel) {
// uni.navigateTo({ // uni.navigateTo({
// url: '/pages/shouye/index' // url: '/pages/shouye/index'
// }) // })
} // }
} // }
}) // })
} }
}, },
// 分享到好友（会话） // 分享到好友（会话）
@ -210,8 +231,6 @@
}) })
}, },
btnitem(deviceId){ btnitem(deviceId){
uni.navigateTo({ uni.navigateTo({
url:'/page_components/eletj?id=' + deviceId url:'/page_components/eletj?id=' + deviceId