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

1.0.0.6版本

Browse Source
This commit is contained in:
3321822538@qq.com 2024-07-31 18:01:34 +08:00
parent 764c01290e
commit 05b8b98718
9 changed files with 172 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
page_components/bindsz.vue
View File

@ -193,7 +193,7 @@
<view class="bluetoothbox" v-if="bluetoothflag">
<view class="stop">
正在连接该设备蓝牙
</view>
</view>
<view class="xtop">
请将手机与设备尽量靠近
</view>
@ -957,6 +957,10 @@
</script>
<style lang="scss">
/deep/ .u-flex{
padding-top: 20rpx !important;
box-sizing: border-box;
}
/deep/ .panel{
position: fixed;
width: 100%;

2
page_components/fuwu/index.vue
View File

@ -315,7 +315,7 @@
// this.getmac()
}
} else {
uni.navigateTo({
uni.reLaunch({
url: '/pages/login/login?id=' + 1
})
}

1
page_components/newtaocan.vue
View File

@ -128,7 +128,6 @@
this.$u.get(`/app/suit/tempList`, data).then((res) => {
if (res.code == 200) {
this.list = res.rows
this.loading = true
// this.list = this.list.map(item => ({
// ...item,

63
page_components/wifilist/index.vue
View File

@ -71,11 +71,23 @@
<view class="wifiname">
{{ssid}}
</view>
<view class="" style="position: relative;" v-if="passmm == true">
<view class="" style="position: relative;color: #000;
font-size: 30rpx;
padding-left: 30rpx;
box-sizing: border-box;
background-color: #efefef;
border-radius: 10rpx;
height: 80rpx;width: 100%;" v-if="passmm == true">
<input class="uni-input" v-model="password" type="text" placeholder="输入WiFi密码" />
<u-icon name="eye-fill" style="position: absolute;top: 15rpx;right: 60rpx;z-index: 99;" @click="passmm = false" size="50"></u-icon>
</view>
<view class="" style="position: relative;" v-if="passmm == false">
<view class="" style="position: relative;color: #000;
font-size: 30rpx;
padding-left: 30rpx;
box-sizing: border-box;
background-color: #efefef;
border-radius: 10rpx;
height: 80rpx;width: 100%;" v-if="passmm == false">
<input class="uni-input" v-model="password" type="password" placeholder="输入WiFi密码" />
<u-icon name="eye-off" style="position: absolute;top: 15rpx;right: 60rpx;z-index: 99;" @click="passmm = true" size="50"></u-icon>
</view>
@ -106,12 +118,37 @@
<view class="wifitop">
手动添加
</view>
<input class="uni-input" v-model="ssid" type="text" placeholder="输入WiFi名称" />
<view class="" style="position: relative;" v-if="passmm == true">
<view class="" style="margin-top: 30rpx;
color: #000;
font-size: 30rpx;
padding-left: 30rpx;
box-sizing: border-box;
background-color: #efefef;
border-radius: 10rpx;
height: 80rpx;width: 100%;">
<input class="uni-input" v-model="ssid" type="text" placeholder="输入WiFi名称" />
</view>
<view class="" style="position: relative;width: 100%;
margin-top: 30rpx;
color: #000;
font-size: 30rpx;
padding-left: 30rpx;
box-sizing: border-box;
background-color: #efefef;
border-radius: 10rpx;
height: 80rpx;" v-if="passmm == true">
<input class="uni-input" v-model="password" type="text" placeholder="输入WiFi密码" />
<u-icon name="eye-fill" style="position: absolute;top: 15rpx;right: 60rpx;z-index: 99;" @click="passmm = false" size="50"></u-icon>
</view>
<view class="" style="position: relative;" v-if="passmm == false">
<view class="" style="position: relative;width: 100%;
margin-top: 30rpx;
color: #000;
font-size: 30rpx;
padding-left: 30rpx;
box-sizing: border-box;
background-color: #efefef;
border-radius: 10rpx;
height: 80rpx;" v-if="passmm == false">
<input class="uni-input" v-model="password" type="password" placeholder="输入WiFi密码" />
<u-icon name="eye-off" style="position: absolute;top: 15rpx;right: 60rpx;z-index: 99;" @click="passmm = true" size="50"></u-icon>
</view>
@ -562,9 +599,6 @@
content: `连接成功`,
showCancel: false,
success: function(res) {
// uni.switchTab({
// url: '/pages/index/index'
// })
let systemInfo = uni.getSystemInfoSync();
if (systemInfo.platform == 'android') {
// 当前设备是 Android
@ -575,17 +609,9 @@
delta:2
})
}
// let ids = that.$store.state.user.deviceId
wx.closeBLEConnection({
deviceId: this.objlist.deviceId,
})
// getwifi(ids).then(res => {
// console.log(res);
// uni.switchTab({
// url:'/pages/index/index'
// })
// })
}
})
}
@ -848,11 +874,10 @@
margin-top: 30rpx;
}
input{
width: 100%;
width: 400rpx;
margin-top: 30rpx;
color: #000;
font-size: 30rpx;
// margin-left: 30rpx;
padding-left: 30rpx;
box-sizing: border-box;
background-color: #efefef;
@ -1030,7 +1055,7 @@
.container {
/* padding-top: 30rpx !important; */
padding: 0 30rpx 380rpx 30rpx !important;
padding: 0 30rpx 50rpx 30rpx !important;
align-items: center;
}

112
page_fenbao/statulist/taocanlist/addtaocan/index.vue
View File

@ -11,7 +11,7 @@
<view class="title">
套餐名称
</view>
<input type="text" v-model="name" placeholder="输入套餐名称" />
<input type="text" style="padding-right: 28rpx;box-sizing: border-box;" v-model="name" placeholder="输入套餐名称" />
</view>
<view class="" style="display: flex;
justify-content: space-between;
@ -20,17 +20,20 @@
<view class="title">
价格（元）
</view>
<input type="text" v-model="price" placeholder="输入价格" />
<input type="text" style="padding-right: 28rpx;box-sizing: border-box;" v-model="price" placeholder="输入价格" />
</view>
<view class="" style="display: flex;
justify-content: space-between;
width: 100%;
align-items: center;margin-top: 30rpx;">
margin-top: 30rpx;
height: 50rpx;
line-height: 50rpx;">
<view class="title">
通电时长
</view>
<view class="" style="display: flex;justify-content: space-between;position: relative;">
<input type="number" v-model="value" placeholder="输入通电时长" />
<input type="number" style="height: 50rpx;
line-height: 50rpx;" v-model="value" placeholder="输入通电时长" />
<view class="picker" @click="btnxz">
{{array[index]}} <u-icon v-if="arrflag" name="arrow-down" color="#000" size="24"></u-icon>
<u-icon v-else name="arrow-right" color="#000" size="24"></u-icon>
@ -49,17 +52,18 @@
</view>
<!-- 应用设备 -->
<!-- <view class="shebei">
<view class="shebei">
<view class="sbtit">应用设备</view>
<view class="sbarr">
<view class="sbarrval" v-for="(item,index) in 5" :key="index">
扫码开关
<view class="sbarrval" v-for="(item,index) in deviceList" :key="index">
<text style="">{{item.deviceName}}</text>
<text style="font-size: 45rpx;" @click="sbdel(item.deviceId)">×</text>
</view>
</view>
<view class="btnsbadd" @click="btnaddsb">
+
</view>
</view> -->
</view>
<view class="trues" @click="btnadd">
{{title}}
@ -93,6 +97,19 @@
bgc: {
backgroundColor: "#8883f0",
},
deviceList:[],
list: '',
loading: false,
disabled: false,
btnWidth: 180,
show: false,
activeid: '',
checkboxes: [],
tcidlist: [],
titaoc: [],
newobj: [],
listflag:false
}
},
onLoad(option) {
@ -100,12 +117,23 @@
this.deviceId = option.id
this.title = '修改'
this.suitId = option.suitId
this.gettaocan(option.suitId)
} else {
this.deviceId = option.id
this.title = '确定'
}
},
onShow() {
if(uni.getStorageSync('tcidlist')){
this.deviceList = uni.getStorageSync('tcidlist')
}
setTimeout(()=>{
if (this.suitId) {
this.gettaocan(this.suitId)
} else {
}
},1)
},
// 分享到好友（会话）
onShareAppMessage: function() {
return {
@ -122,8 +150,55 @@
path: '/pages/shouye/index'
}
},
onUnload(){
uni.removeStorageSync('tcidlist')
},
onHide(){
uni.removeStorageSync('tcidlist')
},
methods: {
// 点击删除套餐里面的设备
sbdel(id){
if(this.title == '确定'){
this.deviceList = this.deviceList.filter(item => item.deviceId !== id)
}else{
const indexInTcidList = this.tcidlist.indexOf(id);
if (indexInTcidList !== -1) {
this.tcidlist.splice(indexInTcidList, 1);
} else {
this.tcidlist.push(id);
}
let that = this
uni.showModal({
title: '提示',
content: '您是否要将应用此套餐设备删除？',
success: function(res) {
if (res.confirm) {
let data = {
deviceIds: that.tcidlist,
suitId: that.suitId
}
that.$u.put(`/app/suit`, data).then((res) => {
if (res.code == 200) {
uni.showToast({
title: res.msg,
icon: 'success',
duration: 1000,
})
that.gettaocan(that.suitId)
}
})
} else if (res.cancel) {
}
}
})
}
},
btnqx(){
uni.removeStorageSync('tcidlist')
uni.navigateBack()
},
// bindPickerChange(e) {
@ -132,7 +207,7 @@
// 跳转选择设备
btnaddsb(){
uni.navigateTo({
url:'/page_components/shebeixz'
url:'/page_components/shebeixz?id=' + this.suitId + '&title=' + this.title
})
},
btnxl(index) {
@ -154,7 +229,11 @@
this.price = res.data.price
this.value = res.data.value
this.description = res.data.description
this.deviceList = res.data.deviceList
this.index = Number(res.data.timeUnit) - 1
this.deviceList.forEach(item => {
this.tcidlist.push(item.deviceId)
})
}
})
},
@ -231,16 +310,19 @@
})
} else {
if (this.title == '确定') {
let arrs = [...this.deviceList.map(item => item.deviceId)]
let data = {
// deviceId: this.deviceId,
name: this.name,
value: this.value,
price: this.price,
description: this.description,
timeUnit: Number(this.index) + 1
timeUnit: Number(this.index) + 1,
deviceIds:arrs
}
this.$u.post('/app/suit', data).then((res) => {
if (res.code == 200) {
uni.removeStorageSync('tcidlist')
uni.showToast({
title: '新建套餐成功',
icon: 'success',
@ -324,10 +406,16 @@
line-height: 80rpx;
background-color: #8883F0;
color: #fff;
text-align: center;
text-align: right;
border-radius: 30rpx;
margin-top: 20rpx;
font-size: 30rpx;
text-align: right;
box-sizing: border-box;
display: flex;
justify-content: space-between;
padding: 0 20rpx;
box-sizing: border-box;
}
}
.btnsbadd{

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

@ -190,7 +190,7 @@
deviceId: this.deviceId,
suitIds: numArr
}
this.$u.post(`/app/suit/copy`, data).then((res) => {
this.$u.put(`/app/device`, data).then((res) => {
if (res.code == 200) {
uni.showToast({
title: res.msg,
@ -284,7 +284,7 @@
.page {
width: 750rpx;
padding-bottom: 400rpx;
padding-bottom: 200rpx;
.box {
width: 750rpx;

4
page_user/fenzu.vue
View File

@ -323,6 +323,10 @@
</script>
<style lang="scss">
/deep/ .u-flex{
padding-top: 20rpx !important;
box-sizing: border-box;
}
/deep/ .u-title{
padding-bottom: 22rpx;
}

23
page_user/sbdetail.vue
View File

@ -88,9 +88,9 @@
<view class="cont" @click="topage(0)">
<view class="top">
<image src="https://api.ccttiot.com/smartmeter/img/static/uKrpw3p37UHW56IypPJU" mode=""
style="width: 58rpx;height: 56rpx;"></image>
style="width: 58rpx;height: 58rpx;"></image>
</view>
<view class="bot" style="margin-top: 18rpx;">充值记录</view>
<view class="bot">充值记录</view>
</view>
<view class="cont" @click="topage(1)">
<view class="top">
@ -109,36 +109,36 @@
</view> -->
<view class="cont" @click="topage(6)">
<view class="top">
<image src="https://api.ccttiot.com/smartmeter/img/static/uAnBmmayp3tVGwXntdaM" mode=""></image>
<image style="width: 58rpx;height: 58rpx;" src="https://api.ccttiot.com/smartmeter/img/static/uAnBmmayp3tVGwXntdaM" mode=""></image>
</view>
<view class="bot">充值</view>
</view>
<view class="cont" @click="topage(2)">
<view class="top">
<image src="https://api.ccttiot.com/smartmeter/img/static/ue0X00T1C3fh7TCgjopm" mode=""
style="width: 58rpx;height: 60rpx;"></image>
style="width: 58rpx;height: 58rpx;"></image>
</view>
<view class="bot">异常</view>
</view>
</view>
<view class="" style="display: flex;margin-top: 20rpx;">
<view class="" style="display: flex;margin-top: 20rpx;padding-right: 5rpx;box-sizing: border-box;">
<view class="cont" @click="topage(3)">
<view class="top">
<image src="https://api.ccttiot.com/smartmeter/img/static/umjPUc8nDKf1JwVqRAeb" mode=""
style="width: 50rpx;height: 60rpx;"></image>
style="width: 50rpx;height: 58rpx;"></image>
</view>
<view class="bot" style="margin-top: 10rpx;">收费方式</view>
<view class="bot">收费方式</view>
</view>
<view class="cont" @click="topage(5)">
<view class="top">
<image src="https://api.ccttiot.com/smartmeter/img/static/uik9veDG6pMVG5M1Vxze" mode="">
<image style="width: 58rpx;height: 58rpx;" src="https://api.ccttiot.com/smartmeter/img/static/uik9veDG6pMVG5M1Vxze" mode="">
</image>
</view>
<view class="bot">配网</view>
</view>
<view class="cont" @click="topage(4)">
<view class="top">
<image src="https://api.ccttiot.com/smartmeter/img/static/u2Uco0iXf8aure0H2ihz" mode="">
<image style="width: 58rpx;height: 58rpx;" src="https://api.ccttiot.com/smartmeter/img/static/u2Uco0iXf8aure0H2ihz" mode="">
</image>
</view>
<view class="bot">设置</view>
@ -148,7 +148,7 @@
<view class="top">
<u-switch v-model="checked" active-color="#8883F0"></u-switch>
</view>
<view class="bot">{{tdtxt}}</view>
<view class="bot" style="margin-top: 10rpx;">{{tdtxt}}</view>
</view>
</view>
@ -1035,6 +1035,7 @@
</script>
<style lang="scss">
/deep/ .panel{
position: fixed;
width: 100%;
@ -1486,7 +1487,7 @@
}
.bot {
margin-top: 15rpx;
margin-top: 8rpx;
font-size: 28rpx;
font-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
font-weight: 400;

4
page_user/setting.vue
View File

@ -544,6 +544,10 @@
</script>
<style lang="scss">
/deep/ .u-flex{
padding-top: 20rpx !important;
box-sizing: border-box;
}
/deep/ .u-title{
padding-bottom: 22rpx;
}