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-15 18:00:44 +08:00
parent f3c25f2816
commit e0cc3c7cf4
10 changed files with 122 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/http.interceptor.js
View File

@ -20,8 +20,8 @@ const install = (Vue, vm) => {
// },
// });
Vue.prototype.$u.http.setConfig({
// baseUrl: 'http://124.221.246.124:2290',
baseUrl: 'https://kg.chuantewulian.cn/prod-api',
baseUrl: 'http://192.168.2.143:10002',
// baseUrl: 'https://kg.chuantewulian.cn/prod-api',
loadingText: '努力加载中~',
loadingTime: 1000,
// 设置自定义头部content-type

10
page_components/fuwu/index.vue
View File

@ -3,7 +3,7 @@
<!-- <u-navbar :border-bottom="false" :background="bgc" title-color='#fff' back-icon-color="#fff"
title-size='36' height='50'></u-navbar> -->
<view class="title">
{{deviceobj.deviceName}}
<u-icon name="home" color="#fff" size="48" @click="btnshouye"></u-icon> {{deviceobj.deviceName}}
<view class="wz">
<!-- 该设备还剩余时长：{{expireTimeStr}}分钟 -->
</view>
@ -224,6 +224,11 @@
});
},
methods: {
btnshouye(){
uni.reLaunch({
url:'/pages/shouye/index'
})
},
btnjxcz() {
xBlufi.initXBlufi(1)
xBlufi.listenDeviceMsgEvent(true, this.funListenDeviceMsgEvent);
@ -638,6 +643,9 @@
</script>
<style lang="scss">
.u-icon__icon{
// margin-right: 20rpx;
}
.mask {
width: 100%;
height: 100vh;

11
page_fenbao/statulist/myshop/editshop/index.vue
View File

@ -46,6 +46,10 @@
size="32" @click="btnjwd"></u-icon>
</view>
</view>
<view class="listval">
<view class="tit"> 是否展示店铺</view>
<u-switch v-model="checked" active-color="#8883F0"></u-switch>
</view>
<!-- <view class="listval">
<view class="tit"> 详细地址</view>
<view class="but"> <input type="text" placeholder="请输入详细地址" v-model="xqdz" /> </view>
@ -91,6 +95,7 @@
export default {
data() {
return {
checked:false,
params: {
hour: true,
minute: true,
@ -163,6 +168,7 @@
this.city = this.listobj.city
this.area = this.listobj.county
this.storeId = this.listobj.storeId
this.checked = this.listobj.show
if (this.selectorvalue == 1) {
this.selectortext = '商场'
} else if (this.selectorvalue == 2) {
@ -286,7 +292,8 @@
contactName: this.lxname,
contactMobile: this.lxphone,
type: this.selectorvalue,
storeId: this.storeId
storeId: this.storeId,
show:this.checked
}
this.$u.put("/app/store", data).then(res => {
if (res.code == 500) {
@ -417,7 +424,7 @@
.list {
width: 680rpx;
height: 1020rpx;
height: 1080rpx;
background: #FFFFFF;
border-radius: 24rpx 24rpx 24rpx 24rpx;
margin: auto;

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

@ -46,6 +46,10 @@
size="32" @click="btnjwd"></u-icon>
</view>
</view>
<view class="listval">
<view class="tit"> 是否展示店铺</view>
<u-switch v-model="checked" active-color="#8883F0"></u-switch>
</view>
<!-- <view class="listval">
<view class="tit"> 详细地址</view>
<view class="but"> <input type="text" placeholder="请输入详细地址" v-model="xqdz" /> </view>
@ -93,6 +97,7 @@
export default {
data() {
return {
checked:false,
params: {
hour: true,
minute: true,
@ -261,7 +266,8 @@
specificAddress: this.xqdz,
contactName: this.shopname,
contactMobile: this.lxphone,
type: this.selectorvalue
type: this.selectorvalue,
show:this.checked
}
this.$u.post("/app/store", data).then(res => {
if (res.code == 200) {
@ -270,7 +276,9 @@
icon: 'success',
duration: 1000
})
uni.navigateBack()
setTimeout(()=>{
uni.navigateBack()
},1000)
}
})
}
@ -381,7 +389,7 @@
.list {
width: 680rpx;
height: 1020rpx;
height: 1080rpx;
background: #FFFFFF;
border-radius: 24rpx 24rpx 24rpx 24rpx;
margin: auto;

66
page_fenbao/zhuce.vue
View File

@ -8,7 +8,7 @@
<text class="sm"> {{texts}} </text -->
</view>
<view class="dblist" v-for="(item, index) in devicesList" :key="index">
<view class="dblist" v-for="(item, index) in devicesLists" :key="index">
<view class="lt">
<image src="https://api.ccttiot.com/smartmeter/img/static/uoQO0pUZ1UHcW5uVKkuR" mode=""></image>
</view>
@ -34,7 +34,7 @@
<view class="titles">
温馨提示
</view>
<text>无法扫描到附近设备:</text>
<text>未扫描到附近未绑定设备:</text>
<text>1.确保待连接设备在附近且蓝牙处于打开状态。</text>
<text>2.确保设备未与其他设备进行蓝牙连接。</text>
<text>确保设备未被添加过。</text>
@ -65,6 +65,7 @@
// {name:'110000',
// mac:'11111'}
],
devicesLists:[],
searching: false,
texts: '正在扫描设备...',
btnflag: true,
@ -81,10 +82,13 @@
bgc: {
backgroundColor: "#8883f0",
},
lurulist:[],
}
},
onLoad(option) {
// console.log(option);
this.getluru()
this.storeId = option.sn
xBlufi.initXBlufi(1);
console.log("xBlufi", xBlufi.XMQTT_SYSTEM);
@ -99,7 +103,7 @@
'isStart': false
});
// 判断是否存在浇花器设备
if (this.devicesList.length == 0) {
if (this.devicesLists.length == 0) {
this.tishiflag = true
this.texts = '扫描完毕，暂无发现设备'
} else {
@ -137,6 +141,14 @@
this.videoContext = uni.createVideoContext('myVideo', this)
},
methods: {
// 请求已经录入设备的mac
getluru(){
this.$u.get(`/app/device/listAllMac`).then(res => {
if(res.code == 200){
this.lurulist = res.data
}
})
},
btnyc() {
this.titleflag = false
},
@ -150,10 +162,13 @@
const mac = device.name.substring(5);
if (device.name.substring(0, 4) == "CTKG") {
this.devicesList.push(device);
console.log(this.devicesList);
let uniqueDevicesList = Array.from(new Set(this.devicesList));
this.devicesLists = uniqueDevicesList.filter(device => {
const deviceId = device.name.substring(5);
return !this.lurulist.includes(deviceId);
})
// 将去重后的数组重新赋值给 this.devicesList
this.devicesList = uniqueDevicesList;
// this.devicesList = uniqueDevicesList;
}
});
}
@ -235,29 +250,16 @@
case xBlufi.XBLUFI_TYPE.TYPE_GET_DEVICE_LISTS_STOP:
if (options.result) {
let uniqueDevicesList = Array.from(new Set(this.devicesList));
console.log(uniqueDevicesList,'uniqueDevicesListuniqueDevicesList');
// console.log(uniqueDevicesList,'uniqueDevicesListuniqueDevicesList');
// 将去重后的数组重新赋值给 this.devicesList
this.devicesList = uniqueDevicesList;
let list = []
// this.devicesList.forEach(device => {
// 从设备名称中提取 MAC 地址（假设 MAC 地址是设备名称的后6个字符）
// let macFromName = device.name.substring(device.name.length - 12);
// console.log(macFromName);
// 与 this.mac 进行比较
// this.$u.get(`/app/device/${macFromName}/isBind`).then((res) => {
// if (res.data == false) {
// list.push(device)
// } else {
// }
// })
// });
// setTimeout(() => {
// this.devicesList = list
// }, 200)
console.log('蓝牙停止搜索ok');
this.devicesLists = uniqueDevicesList.filter(device => {
const deviceId = device.name.substring(5);
return !this.lurulist.includes(deviceId);
})
console.log('蓝牙停止搜索ok')
if(this.devicesLists.length == 0){
this.titleflag = true
}
} else {
//蓝牙停止搜索失败
console.log('蓝牙停止搜索失败');
@ -312,20 +314,22 @@
},
// 点击重新搜索
Search() {
if (this.status) {
console.log(1);
// if (this.status) {
xBlufi.notifyStartDiscoverBle({
'isStart': true
});
// 重新搜索清空蓝牙数组
this.bluthlist = []
this.devicesList = []
this.devicesList = []
this.devicesLists = []
// 重新搜索
// this.startBluetoothDevicesDiscovery()
this.statusflag = true
this.texts = '正在扫描蓝牙设备...'
setTimeout(() => {
this.statusflag = false
if (this.searching) {
if (this.searching) {
xBlufi.notifyStartDiscoverBle({
'isStart': false
});
@ -342,7 +346,7 @@
});
}
}, 2000)
}
// }
},
// 点击隐藏没有设备提示
btnhd() {

3
page_user/sbdetail.vue
View File

@ -354,12 +354,9 @@
this.timeday = Math.abs(Math.floor(differenceInMs / (1000 * 60)));
}
}
this.loadings = true
}
});
},
opendevice() {
let stause = 0

18
page_user/wifijoint/index.vue
View File

@ -94,14 +94,16 @@
title: '正在配网',
mask: true
})
xBlufi.notifySendCustomData({
      customData: "ssid@" + this.name + "pass@" + this.password
 })
// xBlufi.notifySendCustomData({
// customData: "ssid@" + this.name
// })
xBlufi.notifySendCustomData({
customData: "ssid@" + this.name
})
xBlufi.notifySendCustomData({
customData: "pass@" + this.password
})
// xBlufi.notifySendCustomData({
// customData: "pass@" + this.password
// })
},
@ -112,7 +114,7 @@
console.log('状态', options.result)
uni.showModal({
title: '很抱歉提醒你！',
content: '小程序与设备异常断开',
content: '小程序与设备异常断开',
showCancel: false,
success: function(res) {
uni.navigateTo({

22
pages.json
View File

@ -433,9 +433,15 @@
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
},
{
},{
"path": "newtaocan",
"style": {
"navigationBarTitleText": "",
"navigationBarBackgroundColor": "#4473f6",
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
},{
"path": "eletj",
"style": {
"navigationBarTitleText": "",
@ -473,6 +479,16 @@
"navigationBarTextStyle": "#FFFFFF",
"navigationStyle": "custom"
}
},
{
"path": "bindsz",
"style": {
"navigationBarTitleText": "添加设备",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#3996FD",
"navigationBarTextStyle": "#FFFFFF",
"navigationStyle": "custom"
}
}
]
}

4
pages/index/index.vue
View File

@ -426,9 +426,7 @@
}
})
} else {
this.$u.get(
`/app/device/list?storeId=${this.storeId}&pageNum=${this.pagenum}&pageSize=${this.pagesize}`)
.then((res) => {
this.$u.get(`/app/device/list?storeId=${this.storeId}&pageNum=${this.pagenum}&pageSize=${this.pagesize}`).then((res) => {
if (res.code == 200) {
this.total = res.total
// this.wateringList = []

35
pages/shouye/index.vue
View File

@ -11,7 +11,7 @@
</view>
<!-- 正在进行中的订单 -->
<!-- <view class="ongoing_order">
<view class="ongoing_order">
<view class="order_top">
<view class="order_lt">
<image src="https://api.ccttiot.com/smartmeter/img/static/uFNuOet0fB5Bwe1c26sk" mode=""></image>
@ -20,12 +20,12 @@
<image @click="btnorder" v-if="!listflag" src="https://api.ccttiot.com/smartmeter/img/static/ublEB3HEjyfZbnKS2Ai9" mode=""></image>
<image @click="btnorders" v-if="listflag" style="transform: rotate(180deg);margin-top: 20rpx;" src="https://api.ccttiot.com/smartmeter/img/static/ublEB3HEjyfZbnKS2Ai9" mode=""></image>
</view>
<view class="order_list" v-for="(item,index) in 3" :key="index" v-if="listflag" @click="btnitem">
<text>共享洗衣机001</text> <image src="https://api.ccttiot.com/smartmeter/img/static/uZoBXJ0MLrGUSBFk5lGp" mode=""></image>
<view class="order_list" v-for="(item,index) in sylist" :key="index" v-if="listflag" @click="btnitem">
<text>{{item.deviceName}}</text> <image src="https://api.ccttiot.com/smartmeter/img/static/uZoBXJ0MLrGUSBFk5lGp" mode=""></image>
</view>
</view> -->
</view>
<!-- 正在进行中的订单结束 --><!-- 正在进行中的订单结束 -->
<view class="fujin">
<image src="https://api.ccttiot.com/smartmeter/img/static/uqv3e5ThWL8DqrRNBfoA" mode=""
@click="btnindex(5)"></image>
@ -120,10 +120,12 @@
backgroundColor: "#8883F0",
},
deviceobj: {},
deviceCount: 0
deviceCount: 0,
sylist:[]
};
},
onLoad(option) {
if (option.flag) {
let id = option.id
this.$u.get(`/app/device/${id}/withSuitList`).then((res) => {
@ -143,8 +145,7 @@
that.$u.put("/app/device/bind", data).then(res => {
if (res.code == 200) {
uni.navigateTo({
url: '/page_user/sbdetail?id=' + that.deviceobj
.deviceId
url: '/page_components/bindsz?id=' + that.deviceobj.deviceId
})
} else {
if (res.msg == '设备未录入') {
@ -169,10 +170,27 @@
})
}
},
// 分享到好友（会话）
onShareAppMessage: function () {
return {
title: '创想物联',
path: '/pages/shouye/index'
}
},
// 分享到朋友圈
onShareTimeline: function () {
return {
title: '创想物联',
query: '',
path: '/pages/shouye/index'
}
},
onShow() {
this.logins()
this.getad()
this.gethuidaio()
this.getshiy()
},
onReady() {
this.mapContext = uni.createMapContext('map', this)
@ -226,7 +244,6 @@
})
},
calculateAnchorX(name) {
let chineseLength = 0
let englishLength = 0