xinyi/kaiguan-zfb
1
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-20 18:56:42 +08:00
parent 766a540075
commit 584ef9e193
11 changed files with 541 additions and 308 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
page_components/fuwu/index.vue
View File

@ -17,7 +17,7 @@
</view> </view>
<!-- 检测蓝牙未开启 --> <!-- 检测蓝牙未开启 -->
<!-- <view class="shibai" v-if="lanyaflag"> <view class="shibai" v-if="lanyaflag">
<view class="top"> <view class="top">
设备未联网 设备未联网
</view> </view>
@ -45,9 +45,9 @@
<view class="jxcz" @click="btnjxcz"> <view class="jxcz" @click="btnjxcz">
我已知晓 我已知晓
</view> </view>
</view> v-else--> </view>
<view class="box"> <view class="box" v-else>
<view class="tit"> <view class="tit">
选择服务 选择服务
</view> </view>
@ -57,7 +57,7 @@
v-for="(item,index) in deviceobj.suitList" :key="index" @click="btnactive(item)"> v-for="(item,index) in deviceobj.suitList" :key="index" @click="btnactive(item)">
<view class="lt"> <view class="lt">
<view class="tc"> <view class="tc">
{{item.name}} {{item.name.length > 5 ? item.name.substring(0,5) + '...' : item.name}}
</view> </view>
<view class="date"> <view class="date">
{{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> {{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>
@ -128,7 +128,8 @@
onlineStatus: '', onlineStatus: '',
jine: '', jine: '',
dingobj: {}, dingobj: {},
suitTimeUnit:'' suitTimeUnit:'',
zfflag:true
} }
}, },
onLoad(option) { onLoad(option) {
@ -362,7 +363,6 @@
duration: 1000 duration: 1000
}) })
} else if (this.onlineStatus == 1) { } else if (this.onlineStatus == 1) {
let that = this let that = this
let data = { let data = {
deviceNo: that.id, deviceNo: that.id,
@ -414,7 +414,6 @@
} }
}) })
} else { } else {
if (this.ver_data == '') { if (this.ver_data == '') {
this.czflag = true this.czflag = true
uni.showLoading({ uni.showLoading({

263
page_components/newtaocan.vue
View File

@ -1,45 +1,28 @@
<template> <template>
<view class="page"> <view class="page">
<u-navbar title="选择套餐" :border-bottom="false" :background="bgc" title-color='#fff' back-icon-color="#fff" <u-navbar title="套餐管理" :border-bottom="false" :background="bgc" title-color='#fff' back-icon-color="#fff" title-size='36'
title-size='36' height='42'></u-navbar> height='50'></u-navbar>
<view class="box" v-if="loading"> <view class="box" v-if="loading">
<view class="box_list" v-for="(item, index) in list" :key="index" @click="btnactive(item.suitId,index)"> <u-swipe-action :show="item.show" :index="index" v-for="(item, index) in list" :key="item.suitId" @click="click(item)" @open="open" :options="options">
<view :class="['boxlist', { active: tcidlist.includes(item.suitId) }]"> <view class="boxlist" @click="btnedit(item)">
<view :class="['toptime', { activewz: tcidlist.includes(item.suitId) }]"> <view class="toptime">
<text>{{item.name}}（通电时长：{{item.value}} <text v-if="item.timeUnit == 1">日</text> <text <text>{{item.name.length > 5 ? item.name.substring(0,4) + '...' : 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>
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 class="ccc">
<view class="bumday" v-if="item.description == null">
<text class="shi"></text></text>
</view> </view>
<view class="bumday" v-else> <view class="bumday" v-if="item.description">
<text <text class="shi">{{item.description.length > 20 ? item.description.substring(0, 20) + '...' : item.description}}</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 v-model="item.checked"></u-checkbox>
</u-checkbox-group> -->
</view>
</view> </view>
</view> </u-swipe-action>
<view class="" v-if="list.length == 0" style="color: #ccc;font-size: 36rpx;margin-top: 200rpx;text-align: center;">
<view class="" v-if="list == ''"
style="color: #ccc;font-size: 36rpx;margin-top: 200rpx;text-align: center;">
该设备暂无套餐 该设备暂无套餐
</view> </view>
<view class="anniu"> <view class="anniu">
<view class="xinz" @click="btnadd"> <view class="xinz" @click="btnadd">
新建套餐 新增套餐
</view>
<view class="xinz" @click="btnqd">
确定
</view> </view>
</view> </view>
</view> </view>
</view> </view>
</template> </template>
@ -48,8 +31,8 @@
export default { export default {
data() { data() {
return { return {
list: '', list: [],
loading: false, loading:false,
disabled: false, disabled: false,
btnWidth: 180, btnWidth: 180,
show: false, show: false,
@ -59,105 +42,37 @@
backgroundColor: '#dd524d' backgroundColor: '#dd524d'
} }
}], }],
deviceId: '', deviceId:'',
bgc: { bgc: {
backgroundColor: "#8883f0", backgroundColor: "#8883f0",
}, },
activeid: '',
checkboxes: [],
tcidlist: [],
titaoc: []
}; };
}, },
onLoad(option) { onLoad(option) {
console.log(option);
this.deviceId = option.id this.deviceId = option.id
},
created() {
// 初始化checkboxes数组，每个元素都设为false（表示初始时不显示复选框）
this.checkboxes = new Array(this.list.length).fill(false);
}, },
onShow() { onShow() {
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) {
const indexInTcidList = this.tcidlist.indexOf(id);
if (indexInTcidList !== -1) {
this.tcidlist.splice(indexInTcidList, 1);
} else {
this.tcidlist.push(id);
}
console.log(this.tcidlist);
},
// 点击确定
btnqd() {
this.$u.delete(`/app/suit/delByDevice/${this.deviceId}`).then(res=>{})
let numArr = this.tcidlist.map(item => parseInt(item, 10))
let data = {
deviceId: this.deviceId,
suitIds: numArr
}
this.$u.post(`/app/suit/copy`, data).then((res) => {
if (res.code == 200) {
uni.showToast({
title: res.msg,
icon: 'success',
duration: 1000,
})
setTimeout(() => {
uni.navigateBack()
}, 1000)
}
})
},
getlist() { getlist() {
let data = { let data = {
pageNum: 1, pageNum: 1,
@ -166,6 +81,7 @@
this.$u.get(`/app/suit/tempList`, data).then((res) => { this.$u.get(`/app/suit/tempList`, data).then((res) => {
if (res.code == 200) { if (res.code == 200) {
this.list = res.rows this.list = res.rows
this.loading = true
this.list = this.list.map(item => ({ this.list = this.list.map(item => ({
...item, ...item,
checked: false, checked: false,
@ -174,22 +90,21 @@
console.log(this.list); console.log(this.list);
this.loading = true this.loading = true
} }
});
},
btnedit(item) {
uni.navigateTo({
url: '/page_fenbao/statulist/taocanlist/addtaocan/index?id=' + this.deviceId + '&suitId=' +
item.suitId
}) })
}, },
click(item) { btnedit(item){
uni.navigateTo({
url:'/page_fenbao/statulist/taocanlist/addtaocan/index?id=' + this.deviceId + '&suitId=' + item.suitId
})
},
click(item) {
this.$u.delete(`/app/suit/${item.suitId}`).then((res) => { this.$u.delete(`/app/suit/${item.suitId}`).then((res) => {
if (res.code == 200) { if (res.code == 200) {
this.$u.toast(`删除成功`); this.$u.toast(`删除成功`);
this.getlist() this.getlist()
} else { }else{
uni.showToast({ uni.showToast({
title: res.msg, title: res.msg,
icon: 'none', icon: 'none',
@ -197,7 +112,7 @@
}) })
} }
}); });
}, },
open(index) { open(index) {
this.list[index].show = true this.list[index].show = true
@ -205,9 +120,9 @@
if (index != idx) this.list[idx].show = false; if (index != idx) this.list[idx].show = false;
}) })
}, },
btnadd() { btnadd(){
uni.navigateTo({ uni.navigateTo({
url: '/page_fenbao/statulist/taocanlist/addtaocan/index?id=' + '' url:'/page_fenbao/statulist/taocanlist/addtaocan/index?id=' + this.deviceId
}) })
} }
} }
@ -215,22 +130,12 @@
</script> </script>
<style lang="scss"> <style lang="scss">
// /deep/ .u-title { /deep/ .u-title{
// padding-bottom: 22rpx; padding-bottom: 22rpx;
// }
// /deep/ .u-icon__icon {
// padding-bottom: 22rpx;
// }
.active {
background-color: #8883F0 !important;
border-radius: 20rpx;
} }
/deep/ .u-icon__icon{
.activewz { padding-bottom: 22rpx;
color: #fff !important;
} }
page { page {
background: #F4F5F7; background: #F4F5F7;
} }
@ -238,69 +143,53 @@
.page { .page {
width: 750rpx; width: 750rpx;
padding-bottom: 400rpx; padding-bottom: 400rpx;
.box { .box {
width: 750rpx; width: 750rpx;
height: 100%; height:100%;
background: #F4F5F7; background: #F4F5F7;
border-radius: 0rpx 0rpx 0rpx 0rpx; border-radius: 0rpx 0rpx 0rpx 0rpx;
padding: 50rpx; padding: 50rpx;
.anniu{
.box_list {
background-color: #fff;
margin-top: 20rpx;
border-radius: 20rpx;
}
.anniu {
position: fixed; position: fixed;
bottom: 76rpx; bottom: 0;
left: 50%; left: 50%;
transform: translateX(-50%); transform: translateX(-50%);
display: flex; width: 100%;
justify-content: space-between; height: 200rpx;
width: 80%; padding-top: 40rpx;
background-color: #fff;
padding-left: 50rpx;
padding-right: 50rpx;
.xinz{
width: 100%;
height: 84rpx;
background: #8883F0;
filter: blur(0px);
text-align: center;
line-height: 84rpx;
font-size: 36rpx;
color: #FFFFFF;
border-radius: 50rpx;
}
} }
.xinz { .boxlist{
width: 280rpx;
height: 84rpx;
background: #8883F0;
filter: blur(0px);
text-align: center;
line-height: 84rpx;
font-size: 36rpx;
color: #FFFFFF;
border-radius: 50rpx;
}
.boxlist {
padding: 40rpx 42rpx; padding: 40rpx 42rpx;
box-sizing: border-box; box-sizing: border-box;
.toptime{
.ccc {
display: flex;
align-items: center;
justify-content: space-between;
}
.toptime {
font-size: 32rpx; font-size: 32rpx;
color: #000000; // color: #000000;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
} }
.bumday{
.bumday {
margin-top: 10rpx; margin-top: 10rpx;
text{
text {
font-size: 32rpx; font-size: 32rpx;
color: #95989D; color: #95989D;
} }
} }
} }
/deep/ .u-swipe-action { /deep/ .u-swipe-action {
margin-top: 30rpx; margin-top: 30rpx;
border-radius: 20rpx; border-radius: 20rpx;
@ -317,4 +206,4 @@
} }
} }
} }
</style> </style>

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

@ -15,13 +15,18 @@
<view class="title" style="margin-top: 50rpx;"> <view class="title" style="margin-top: 50rpx;">
通电时长 通电时长
</view> </view>
<view class="" style="display: flex;justify-content: space-between;"> <view class="" style="display: flex;justify-content: space-between;position: relative;">
<input style="width: 80%;" type="text" v-model="value" placeholder="输入通电时长" /> <input style="width: 80%;" type="number" v-model="value" placeholder="输入通电时长" />
<picker style="margin-top: 24rpx;border: 1px solid;padding: 5rpx 10rpx;border-radius: 10rpx;height: 40rpx;" mode="selector" :range="array" @change="bindPickerChange"> <!-- <picker style="margin-top: 24rpx;border: 1px solid;padding: 5rpx 10rpx;border-radius: 10rpx;height: 40rpx;" mode="selector" :range="array" @change="bindPickerChange"> -->
<view class="picker"> <view class="picker" @click="btnxz">
{{array[index]}} <u-icon name="arrow-right" color="#000" size="28"></u-icon> {{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>
</view> </view>
</picker> <view class="arr_list" v-if="arrflag">
<view class="arr_item" v-for="(item,index) in array" :key="index" @click="btnxl(index)">
{{item}}
</view>
</view>
<!-- </picker> -->
</view> </view>
<view class="title" style="margin-top: 50rpx;margin-bottom: 20rpx;"> <view class="title" style="margin-top: 50rpx;margin-bottom: 20rpx;">
详细说明 详细说明
@ -47,9 +52,10 @@
price: '', price: '',
title: '', title: '',
suitId: '', suitId: '',
array: ['日', '时', '分钟', '秒'], array: ['天', '时', '分钟', '秒'],
index: 2, index: 2,
timewz:'' timewz:'',
arrflag:false
} }
}, },
onLoad(option) { onLoad(option) {
@ -80,8 +86,19 @@
} }
}, },
methods: { methods: {
bindPickerChange(e) { // bindPickerChange(e) {
this.index = e.detail.value // this.index = e.detail.value
// },
btnxl(index){
this.index = index
this.arrflag = false
},
btnxz(){
if(this.arrflag == true){
this.arrflag = false
}else{
this.arrflag = true
}
}, },
gettaocan(suitId) { gettaocan(suitId) {
@ -138,7 +155,7 @@
} else { } else {
if (this.title == '确定') { if (this.title == '确定') {
let data = { let data = {
deviceId: this.deviceId, // deviceId: this.deviceId,
name: this.name, name: this.name,
value: this.value, value: this.value,
price: this.price, price: this.price,
@ -160,7 +177,7 @@
} else { } else {
let data = { let data = {
suitId: this.suitId, suitId: this.suitId,
deviceId: this.deviceId, // deviceId: this.deviceId,
name: this.name, name: this.name,
value: this.value, value: this.value,
price: this.price, price: this.price,
@ -204,13 +221,37 @@
page { page {
background: linear-gradient(180deg, #8883F0 0%, rgba(255, 255, 255, 0) 100%); background: linear-gradient(180deg, #8883F0 0%, rgba(255, 255, 255, 0) 100%);
} }
.arr_list{
position: absolute;
top: 80rpx;
right: -20rpx;
background: #FFFFFF;
width: 140rpx;
height:320rpx;
box-shadow: 0rpx 16rpx 40rpx 0rpx rgba(42, 130, 228, 0.1);
padding: 5rpx 0;
box-sizing: border-box;
border-radius: 10rpx;
z-index: 99;
.arr_item:last-child{
border: none !important;
}
.arr_item{
text-align: center;
height: 80rpx;
line-height: 80rpx;
border-bottom:1px solid #ccc;
}
}
.picker{
margin-top: 30rpx;
}
.page { .page {
width: 750rpx; width: 750rpx;
position: fixed; position: fixed;
top: 0; top: 0;
left: 0; left: 0;
.box { .box {
width: 750rpx; width: 750rpx;
height: 1440rpx; height: 1440rpx;

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

@ -1,36 +1,62 @@
<template> <template>
<view class="page"> <view class="page">
<u-navbar title="套餐列表" :border-bottom="false" :background="bgc" title-color='#fff' back-icon-color="#fff" title-size='36' <u-navbar title="套餐列表" :border-bottom="false" :background="bgc" title-color='#fff' back-icon-color="#fff"
height='50'></u-navbar> title-size='36' height='42'></u-navbar>
<view class="box" v-if="loading"> <view class="box" v-if="loading">
<u-swipe-action :show="item.show" :index="index" v-for="(item, index) in list" :key="item.suitId" @click="click(item)" @open="open" :options="options"> <view class="" style="width: 100%;color: #ccc;font-weight: 600;">
<view class="boxlist" @click="btnedit(item)"> 长按拖动可更改排序
<view class="toptime"> </view>
<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 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="['toptime', { activewz: tcidlist.includes(item.suitId) }]">
<text>{{item.name.length > 5 ? item.name.substring(0,4) + '...' : 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 class="ccc">
<view class="bumday" v-if="item.description == null">
<text class="shi"></text></text>
</view> </view>
<view class="bumday" v-if="item.description"> <view class="bumday" v-else>
<text class="shi">{{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>
</view>
</view> </view>
</u-swipe-action> </view> -->
<view class="" v-if="list.length == 0" style="color: #ccc;font-size: 36rpx;margin-top: 200rpx;text-align: center;">
<HM-dragSorts v-if="tcidlist.length > 0" ref="dragSorts" :list="newobj" :tcidlist="tcidlist" @update:tcidlist="handleTcidlistUpdate" :autoScroll="true" :feedbackGenerator="false" @newList="handleNewList" rowHeight='50'
@change="change" @confirm="confirm" @onclick="onclick" :listBackgroundColor='F7FAFE'></HM-dragSorts>
<view class="" v-if="list == ''"
style="color: #ccc;font-size: 36rpx;margin-top: 200rpx;text-align: center;">
该设备暂无套餐 该设备暂无套餐
</view> </view>
<view class="xinz" @click="btnadd"> <view class="anniu">
新增套餐 <!-- <view class="xinz" @click="btnadd">
新建套餐
</view> -->
<view class="xinz" @click="btnqd">
确定
</view>
</view> </view>
</view> </view>
</view> </view>
</template> </template>
<script> <script>
import dragSorts from '@/page_fenbao/HM-dragSorts/HM-dragSorts.vue'
export default { export default {
components: {
'HM-dragSorts': dragSorts
},
data() { data() {
return { return {
list: [], list: '',
loading:false, loading: false,
disabled: false, disabled: false,
btnWidth: 180, btnWidth: 180,
show: false, show: false,
@ -40,58 +66,176 @@
backgroundColor: '#dd524d' backgroundColor: '#dd524d'
} }
}], }],
deviceId:'', deviceId: '',
bgc: { bgc: {
backgroundColor: "#8883f0", backgroundColor: "#8883f0",
}, },
activeid: '',
checkboxes: [],
tcidlist: [],
titaoc: [],
newobj:[]
}; };
}, },
onLoad(option) { onLoad(option) {
console.log(option);
this.deviceId = option.id this.deviceId = option.id
},
created() {
// 初始化checkboxes数组，每个元素都设为false（表示初始时不显示复选框）
this.checkboxes = new Array(this.list.length).fill(false);
}, },
onShow() { onShow() {
this.tcidlist = []
this.getlist() this.getlist()
}, },
// 分享到好友（会话） // 分享到好友（会话）
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: {
handleTcidlistUpdate(newTcidlist) {
// 这里是处理接收到的新 tcidlist 的地方
console.log('接收到的 tcidlist:', newTcidlist);
this.tcidlist = newTcidlist
},
getlist(){
this.$u.get(`/app/suit/listByDeviceId/${this.deviceId}`).then((res) => { handleNewList(newList) {
let list = [this.list, ...newList];
const newSortedList = list.map((item, index) => {
return {
storeId: item.suitId,
groupSort: index + 1 // 使用索引值加 1 作为 groupSort
};
});
console.log("新的排列数据:", newSortedList);
setTimeout(()=> {
this.$u.put("/app/store/changeSort",newSortedList).then((res) => {
// this.$forceUpdate()
if (res.code == 200) {
// this.getgroup()
}
});
}, 200);
// 在这里处理新的排列数据，可以将其存储到父组件的数据中，或者进行其他操作
},
change(){
},
confirm(e) {
},
onclick(e) {
},
// 查询本人套餐
getao() {
this.$u.get(`/app/suit/listByDeviceId/${this.deviceId}`).then(res => {
if (res.code == 200) { if (res.code == 200) {
this.list = res.data if (res.data.length > 0) {
this.titaoc = res.data
let uniqueSuitIds = new Set();
this.list.forEach(item => {
if (this.titaoc.some(titaocItem => titaocItem.sourceId === item.suitId || titaocItem.suitId === item.suitId)) {
uniqueSuitIds.add(item.suitId);
}
})
this.tcidlist = Array.from(uniqueSuitIds);
let matchedItems = this.list.filter(item => uniqueSuitIds.has(item.suitId))
let unmatchedItems = this.list.filter(item => !uniqueSuitIds.has(item.suitId))
this.list = matchedItems.concat(unmatchedItems)
this.newobj = this.list
}
}
})
},
btnactive(id, index) {
const indexInTcidList = this.tcidlist.indexOf(id);
if (indexInTcidList !== -1) {
this.tcidlist.splice(indexInTcidList, 1);
} else {
this.tcidlist.push(id);
}
// console.log(this.tcidlist);
},
// 点击确定
btnqd() {
this.$u.delete(`/app/suit/delByDevice/${this.deviceId}`).then(res=>{})
let numArr = this.tcidlist.map(item => parseInt(item, 10))
let data = {
deviceId: this.deviceId,
suitIds: numArr
}
this.$u.post(`/app/suit/copy`, data).then((res) => {
if (res.code == 200) {
uni.showToast({
title: res.msg,
icon: 'success',
duration: 1000,
})
this.getao()
setTimeout(() => {
uni.navigateBack()
}, 1000)
}
})
},
getlist() {
let data = {
pageNum: 1,
pageSize: 99
}
this.$u.get(`/app/suit/tempList`, data).then((res) => {
if (res.code == 200) {
this.getao()
this.list = res.rows
this.list = this.list.map(item => ({
...item,
checked: false,
isActive: false,
tcidlist:this.tcidlist
}))
// console.log(this.list);
this.loading = true this.loading = true
} }
}); });
}, },
btnedit(item){ btnedit(item) {
uni.navigateTo({ uni.navigateTo({
url:'/page_fenbao/statulist/taocanlist/addtaocan/index?id=' + this.deviceId + '&suitId=' + item.suitId url: '/page_fenbao/statulist/taocanlist/addtaocan/index?id=' + this.deviceId + '&suitId=' +
item.suitId
}) })
}, },
click(item) { click(item) {
this.$u.delete(`/app/suit/${item.suitId}`).then((res) => { this.$u.delete(`/app/suit/${item.suitId}`).then((res) => {
if (res.code == 200) { if (res.code == 200) {
this.$u.toast(`删除成功`); this.$u.toast(`删除成功`);
this.getlist() this.getlist()
}else{ } else {
uni.showToast({ uni.showToast({
title: res.msg, title: res.msg,
icon: 'none', icon: 'none',
@ -99,7 +243,7 @@
}) })
} }
}); });
}, },
open(index) { open(index) {
this.list[index].show = true this.list[index].show = true
@ -107,9 +251,9 @@
if (index != idx) this.list[idx].show = false; if (index != idx) this.list[idx].show = false;
}) })
}, },
btnadd(){ btnadd() {
uni.navigateTo({ uni.navigateTo({
url:'/page_fenbao/statulist/taocanlist/addtaocan/index?id=' + this.deviceId url: '/page_fenbao/statulist/taocanlist/addtaocan/index?id=' + ''
}) })
} }
} }
@ -117,12 +261,22 @@
</script> </script>
<style lang="scss"> <style lang="scss">
/deep/ .u-title{ // /deep/ .u-title {
padding-bottom: 22rpx; // padding-bottom: 22rpx;
// }
// /deep/ .u-icon__icon {
// padding-bottom: 22rpx;
// }
.active {
background-color: #8883F0 !important;
border-radius: 20rpx;
} }
/deep/ .u-icon__icon{
padding-bottom: 22rpx; .activewz {
color: #fff !important;
} }
page { page {
background: #F4F5F7; background: #F4F5F7;
} }
@ -130,44 +284,74 @@
.page { .page {
width: 750rpx; width: 750rpx;
padding-bottom: 400rpx; padding-bottom: 400rpx;
.box { .box {
width: 750rpx; width: 750rpx;
height: 1440rpx; height: 100%;
background: #F4F5F7; background: #F4F5F7;
border-radius: 0rpx 0rpx 0rpx 0rpx; border-radius: 0rpx 0rpx 0rpx 0rpx;
padding: 50rpx; padding: 50rpx;
.xinz{
width: 368rpx; .box_list {
background-color: #fff;
margin-top: 20rpx;
border-radius: 20rpx;
}
.anniu {
position: fixed;
bottom: 0;
left: 50%;
transform: translateX(-50%);
display: flex;
height: 200rpx;
padding-top: 40rpx;
background-color: #fff;
// justify-content: space-between;
width: 100%;
padding-left: 50rpx;
padding-right: 50rpx;
}
.xinz {
width: 100%;
height: 84rpx; height: 84rpx;
background: #8883F0; background: #8883F0;
filter: blur(0px); filter: blur(0px);
text-align: center; text-align: center;
line-height: 84rpx; line-height: 84rpx;
font-size: 36rpx; font-size: 36rpx;
color: #FFFFFF; color: #FFFFFF;
position: fixed; border-radius: 18rpx;
bottom: 76rpx;
left: 50%;
transform: translateX(-50%);
border-radius: 50rpx;
} }
.boxlist{
.boxlist {
padding: 40rpx 42rpx; padding: 40rpx 42rpx;
box-sizing: border-box; box-sizing: border-box;
.toptime{
.ccc {
display: flex;
align-items: center;
justify-content: space-between;
}
.toptime {
font-size: 32rpx; font-size: 32rpx;
color: #000000; color: #000000;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
} }
.bumday{
.bumday {
margin-top: 10rpx; margin-top: 10rpx;
text{
text {
font-size: 32rpx; font-size: 32rpx;
color: #95989D; color: #95989D;
} }
} }
} }
/deep/ .u-swipe-action { /deep/ .u-swipe-action {
margin-top: 30rpx; margin-top: 30rpx;
border-radius: 20rpx; border-radius: 20rpx;

1
page_user/fenzu.vue
View File

@ -162,6 +162,7 @@
// console.log(this.groupList) // console.log(this.groupList)
this.firstlist= this.groupList[0] this.firstlist= this.groupList[0]
this.newobj = this.groupList.slice(1) this.newobj = this.groupList.slice(1)
console.log(this.newobj,'2121212121');
// this.newobj = this.groupList // this.newobj = this.groupList
this.remake='' this.remake=''
this.price='' this.price=''

6
page_user/sbdetail.vue
View File

@ -303,7 +303,7 @@
'isStart': false 'isStart': false
}); });
wx.closeBLEConnection({ wx.closeBLEConnection({
deviceId: this.objlist.deviceId, deviceId: this.deviceId,
}) })
}, },
onHide() { onHide() {
@ -312,7 +312,7 @@
'isStart': false 'isStart': false
}); });
wx.closeBLEConnection({ wx.closeBLEConnection({
deviceId: this.objlist.deviceId, deviceId: this.deviceId,
}) })
}, },
onBeforeUnmount() { onBeforeUnmount() {
@ -321,7 +321,7 @@
'isStart': false 'isStart': false
}); });
wx.closeBLEConnection({ wx.closeBLEConnection({
deviceId: this.objlist.deviceId, deviceId: this.deviceId,
}) })
}, },
methods: { methods: {

19
page_user/setting.vue
View File

@ -27,7 +27,7 @@
</view> </view>
<view class="li" @click.stop="sremakes()"> <view class="li" @click.stop="sremakes()">
<view class="tit"> <view class="tit">
店铺名称 所属店铺
</view> </view>
<view class="info"> <view class="info">
<view class="txt"> <view class="txt">
@ -68,7 +68,7 @@
</view> </view>
</view> </view>
<view class="li" style="padding-left: 40%;font-size: 32rpx;" @click="deldevice()"> <view class="lis" @click="deldevice()">
解除绑定 解除绑定
</view> </view>
@ -470,7 +470,20 @@
page { page {
background-color: #F7FAFE; background-color: #F7FAFE;
} }
.lis{
position: fixed;
left: 50%;
transform: translateX(-50%);
bottom: 230rpx;
width: 632rpx;
height: 90rpx;
background-color: red;
text-align: center;
line-height: 90rpx;
font-size: 36rpx;
color: #fff;
border-radius: 50rpx;
}
.page { .page {
width: 750rpx; width: 750rpx;

30
pages/index/index.vue
View File

@ -1,8 +1,13 @@
<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="true" :title="tittxt" :border-bottom="false" :background="bgc" title-color='#fff' @custom-back="btncustom" back-icon-color="#fff"
title-size='44' height='50' id="navbar"> title-size='44' height='50' id="navbar">
</u-navbar> </u-navbar> -->
<view class="title">
<image src="https://api.ccttiot.com/smartmeter/img/static/uyr6T0Vfkefty2blkDmU" mode="" style="width: 52rpx;height: 52rpx;margin-right: 10rpx;vertical-align: bottom;vertical-align: bottom;" @click="btnshouye"></image>
<text>商户中心</text>
</view>
<u-mask :show="showtip" @click="show = false" :z-index='1000' /> <u-mask :show="showtip" @click="show = false" :z-index='1000' />
<view class="tip_box" v-if="showtip"> <view class="tip_box" v-if="showtip">
<view class="top"> <view class="top">
@ -88,7 +93,7 @@
<view class="card_left_tit" @click="todetail(item.deviceId)"> <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" @click="todetail(item.deviceId)">
<image src="https://api.ccttiot.com/smartmeter/img/static/uZSiz7XWpxcXEkl6sTwj" <image src="https://api.ccttiot.com/smartmeter/img/static/uZSiz7XWpxcXEkl6sTwj"
mode=""></image> mode=""></image>
<view class="sta_txt" v-if="item.status==3"> <view class="sta_txt" v-if="item.status==3">
@ -276,6 +281,7 @@
} }
}, },
methods: { methods: {
// 获取店铺 // 获取店铺
sremakes(item) { sremakes(item) {
this.id = item.deviceId this.id = item.deviceId
@ -820,6 +826,12 @@
this.pagenum = 1 this.pagenum = 1
this.curtitidx = index this.curtitidx = index
}, },
// 点击导航栏回到首页
btnshouye(){
uni.reLaunch({
url:'/pages/shouye/index'
})
},
toydfx() { toydfx() {
uni.navigateTo({ uni.navigateTo({
@ -848,6 +860,18 @@
</script> </script>
<style lang="scss"> <style lang="scss">
.title {
padding-left: 32rpx;
font-size: 40rpx;
color: #fff;
margin-bottom: 30rpx;
padding-top: 110rpx;
height: 200rpx;
background-color: #8883F0;
text{
padding-left: 28%;
}
}
/deep/ .u-title { /deep/ .u-title {
padding-bottom: 22rpx; padding-bottom: 22rpx;
} }

113
pages/login/login.vue
View File

@ -11,31 +11,41 @@
欢迎来到共享开关 欢迎来到共享开关
</view> </view>
<view class="inputbox"> <view class="inputbox">
<!-- 在这里放置你的输入框 --> <view class="box1" v-if="!dlflag">
<!-- <view class="box1" v-if="chooseType">
<view class="input_txt">
首次使用请选择您的身份
</view>
<div class="button" style="margin-top: 162rpx;" @click="userType(1)">
我是商家
</div>
<div class="button" @click="userType(2)">
我是用户
</div>
</view> -->
<view class="box1">
<view class="input_txt" style="width: 536rpx;font-size: 24rpx;line-height: 32rpx;"> <view class="input_txt" style="width: 536rpx;font-size: 24rpx;line-height: 32rpx;">
您暂未授权共享开关小程序获取你的信息，将无法正常使用小程序的功能。如需要正常使用请点击“授权”按钮，打开头像，昵称等信息的授权。 您暂未授权共享开关小程序获取你的信息，将无法正常使用小程序的功能。如需要正常使用请点击“授权”按钮，打开头像，昵称等信息的授权。
</view> </view>
<button class="button" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber" <button class="button" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber"
style="margin-top: 280rpx;margin-left: -10rpx;"> style="margin-left: -10rpx;">
授权登录 授权登录
</button> </button>
<button class="button" style="margin-top: 50rpx;margin-left: -10rpx;" @click="btnbudl"> <view class="">
暂不授权登录 <view class="buttons" style="margin-top: 50rpx;margin-left: -10rpx;" @click="btnshoudong">
</button> —— 账号密码登录 ——
</view>
<view class="buttons" style="margin-top: 50rpx;margin-left: -10rpx;" @click="btnbudl">
—— 暂不授权登录 ——
</view>
</view>
</view> </view>
<!-- 账号密码登录 -->
<view class="zhangh" v-if="dlflag">
<view class="tit">
账号密码登录
</view>
<input type="text" v-model="zh" placeholder="请输入你的账号" />
<input type="text" v-model="mm" placeholder="请输入你的密码" />
<view class="mmdl" @click="btndl">
登录
</view>
<view class="mmdl" @click="dlflag = false" style="background-color: #fff;border: 1px solid #efefef;color: #000;margin-top: 20rpx;">
取消
</view>
</view>
</view> </view>
</view> </view>
</template> </template>
@ -51,7 +61,10 @@
chooseType: true, chooseType: true,
usertype: '', usertype: '',
login: false, login: false,
id:'' id:'',
dlflag:false,
zh:'',
mm:''
} }
}, },
onLoad(option) { onLoad(option) {
@ -76,6 +89,29 @@
} }
}, },
methods: { methods: {
// 账号密码登录
btndl(){
let data = {
username:this.zh,
password:this.mm
}
this.$u.post("/app/auth/login", data).then(res => {
if(res.code == 200){
wx.setStorageSync('token', res.token);
this.ceshi()
}else{
uni.showToast({
title: res.msg,
icon: 'none',
duration: 2000,
})
}
})
},
btnshoudong(){
this.dlflag = true
},
userType(num) { userType(num) {
this.chooseType = false this.chooseType = false
this.login = true this.login = true
@ -142,7 +178,44 @@
page { page {
background: #FFFFFF; background: #FFFFFF;
} }
.zhangh{
width: 562rpx;
text-align: center;
.tit{
font-size: 40rpx;
color: #000;
margin-bottom: 30rpx;
}
input{
width: 562rpx;
height: 90rpx;
margin-top: 20rpx;
border-radius: 20rpx;
background-color: #eeefee;
text-align: center;
padding-left: 30rpx;
box-sizing: border-box;
text-align: left;
}
.mmdl{
width: 562rpx;
height: 96rpx;
background: #8883F0;
border-radius: 52rpx 52rpx 52rpx 52rpx;
font-weight: 500;
font-size: 36rpx;
color: #FFFFFF;
line-height: 96rpx;
margin-top: 50rpx;
}
}
.buttons{
width: 562rpx;
text-align: center;
padding-bottom: 5rpx;
box-sizing: border-box;
color: #ccc;
}
.page { .page {
position: relative; position: relative;
/* 添加相对定位 */ /* 添加相对定位 */

23
pages/my.vue
View File

@ -79,14 +79,18 @@
<image src="https://api.ccttiot.com/smartmeter/img/static/uCtxeWyTyH2DHQZaRv5Q" mode=""></image> <image src="https://api.ccttiot.com/smartmeter/img/static/uCtxeWyTyH2DHQZaRv5Q" mode=""></image>
<view class="txt">秘钥管理</view> <view class="txt">秘钥管理</view>
</view> </view>
<view class="botcard" @click="btnguanli">
<image src="https://api.ccttiot.com/smartmeter/img/static/umjPUc8nDKf1JwVqRAeb" mode=""></image>
<view class="txt">套餐管理</view>
</view>
<view class="botcard" @click="topage(5)"> <view class="botcard" @click="topage(5)">
<image src="https://api.ccttiot.com/smartmeter/img/static/uYWpW30vIQ6M4svb7Vnb"></image> <image src="https://api.ccttiot.com/smartmeter/img/static/uYWpW30vIQ6M4svb7Vnb"></image>
<view class="txt">设置</view> <view class="txt">设置</view>
</view> </view>
<view class="botcard" style="padding-left: 220rpx;font-size: 40rpx;font-weight: 600;" @click="btntc"> <!-- <view class="botcard" style="padding-left: 220rpx;font-size: 40rpx;font-weight: 600;" @click="btntc">
切换用户端 切换用户端
</view> </view> -->
</view> </view>
</view> </view>
@ -131,6 +135,11 @@
} }
}, },
methods: { methods: {
btnguanli(){
uni.navigateTo({
url:'/page_components/newtaocan'
})
},
btnmy(){ btnmy(){
uni.navigateTo({ uni.navigateTo({
url:'/page_components/miyao' url:'/page_components/miyao'
@ -241,7 +250,7 @@
} }
</script> </script>
<style lang="scss" > <style lang="scss">
page{ page{
background-color: #F7FAFE; background-color: #F7FAFE;
} }
@ -331,7 +340,7 @@ page{
.top_box{ .top_box{
padding-top: 40rpx; padding-top: 40rpx;
width: 750rpx; width: 750rpx;
height: 458rpx; height: 360rpx;
background-color: #8883F0; background-color: #8883F0;
.userinfo{ .userinfo{
margin-left: 56rpx; margin-left: 56rpx;
@ -357,7 +366,7 @@ page{
} }
.num{ .num{
margin-top: 20rpx; margin-top: 20rpx;
font-size: 28rpx; font-size: 30rpx;
font-family: HarmonyOS Sans SC, HarmonyOS Sans SC; font-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
font-weight: 400; font-weight: 400;
color: #ABA8F4; color: #ABA8F4;
@ -374,7 +383,7 @@ page{
color: #FFFFFF; color: #FFFFFF;
} }
.cont_box{ .cont_box{
margin-top: 58rpx; margin-top: 30rpx;
display: flex; display: flex;
flex-wrap: nowrap; flex-wrap: nowrap;
align-items: center; align-items: center;
@ -395,7 +404,7 @@ page{
} }
.bot{ .bot{
margin-top: 20rpx; margin-top: 20rpx;
font-size: 22rpx; font-size: 26rpx;
font-family: HarmonyOS Sans SC, HarmonyOS Sans SC; font-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
font-weight: 400; font-weight: 400;
color: #FFFFFF; color: #FFFFFF;

2
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">