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

床垫优化

Browse Source
This commit is contained in:
3321822538@qq.com 2024-09-15 18:02:40 +08:00
parent 3dfd82456e
commit 9478d2708b
6 changed files with 160 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

180
page_user/fuwu.vue
View File

@ -179,7 +179,8 @@
timer: null, timer: null,
titflag: false, titflag: false,
kefulist: [], kefulist: [],
scrollTop:0 scrollTop:0,
billId:''
} }
}, },
onLoad(option) { onLoad(option) {
@ -289,7 +290,7 @@
}else{ }else{
this.picimg = true this.picimg = true
} }
},500) },100)
} }
}, },
btnscrll() { btnscrll() {
@ -356,7 +357,8 @@
} }
that.$u.post('/app/bill/recharge', data).then(res => { that.$u.post('/app/bill/recharge', data).then(res => {
if (res.code == 200) { if (res.code == 200) {
that.orderno = res.data that.orderno = res.data.billNo
that.billId = res.data.billId
that.$u.get(`/app/pay/wx/${that.orderno}`).then((res) => { that.$u.get(`/app/pay/wx/${that.orderno}`).then((res) => {
if (res.code == 200) { if (res.code == 200) {
uni.requestPayment({ uni.requestPayment({
@ -371,79 +373,37 @@
clearInterval(this.timer); clearInterval(this.timer);
that.timer = null; that.timer = null;
} }
// 111111111111111111111111 that.$u.put(`/app/bill/${that.orderno}/refreshPayResult`).then(res => {
that.$u.put(
`/app/bill/${that.orderno}/refreshPayResult`
).then(res => {
// if(res.code == 200){ // if(res.code == 200){
that.$u.get( that.$u.get('/app/bill/recharge/device/fail/list').then(res => {
'/app/bill/recharge/device/fail/list'
).then(res => {
if (res.code == 200) { if (res.code == 200) {
if (res.data if (res.data.length != 0) {
.length != 0) { let dingobj = res.data[0].billNo
let dingobj =
res.data[0]
.billNo
uni.getNetworkType({ uni.getNetworkType({
success( success(res) {
res if (res.networkType !== 'none') {
) {
if (res
.networkType !==
'none'
) {
uni.getConnectedBluetoothDevices({ uni.getConnectedBluetoothDevices({
success( success(res) {
res that.jzflag =true
) {
that.jzflag =
true
that.startLoading() that.startLoading()
setTimeout setTimeout(() => {
(() => { xBlufi.notifySendCustomData({
xBlufi customData: "11time@" + that.jine
.notifySendCustomData({
customData: "11time@" +
that
.jine
}) })
}, },1500)
1500
)
}, },
fail( fail(err) {
err console.error('获取已连接蓝牙设备信息失败：',err)
) {
console
.error(
'获取已连接蓝牙设备信息失败：',
err
)
} }
}) })
that.$u that.$u.get(`/app/bill/recharge/${dingobj}/bluetoothSuccess`).then(res => {
.get( if (res.code == 200) {
`/app/bill/recharge/${dingobj}/bluetoothSuccess` that.zhifuflag = true
) console.log('蓝牙离线充值成功11')
.then(
res => {
if (res
.code ==
200
) {
that.zhifuflag =
true
console
.log(
'蓝牙离线充值成功11'
)
setTimeout setTimeout
(() => { (() => {
uni.reLaunch({ uni.navigateTo({
url: '/pages/index/index?id=' + url: '/page_user/mydetail?billId=' + that.billId
that
.orderno
}) })
}, },
1000 1000
@ -451,71 +411,33 @@
} }
} }
) )
} else {
console
.log(
'手机未连接网络'
)
// this.baiflag = false
} }
} }
}) })
} else { } else {
uni.getNetworkType({ uni.getNetworkType({
success( success(res) {
res if (res.networkType !== 'none') {
) {
if (res
.networkType !==
'none'
) {
uni.getConnectedBluetoothDevices({ uni.getConnectedBluetoothDevices({
success( success(res) {
res that.jzflag = true
) {
that.jzflag =
true
that.startLoading() that.startLoading()
setTimeout setTimeout(() => {
(() => { xBlufi.notifySendCustomData({
xBlufi customData: "11time@" + that.jine
.notifySendCustomData({
customData: "11time@" +
that
.jine
}) })
}, },1500)
1500 },
) fail(err) {
}, console.error('获取已连接蓝牙设备信息失败：',err)
fail(
err
) {
console
.error(
'获取已连接蓝牙设备信息失败：',
err
)
} }
}) })
that.zhifuflag = that.zhifuflag = true
true setTimeout(() => {
setTimeout uni.navigateTo({
(() => { url: '/page_user/mydetail?billId=' + that.billId
uni.reLaunch({
url: '/pages/index/index?id=' +
that
.orderno
}) })
}, },1000)
1000
)
} else {
console
.log(
'手机未连接网络'
)
// this.baiflag = false
} }
} }
}) })
@ -580,7 +502,8 @@
} }
that.$u.post('/app/bill/recharge', data).then(res => { that.$u.post('/app/bill/recharge', data).then(res => {
if (res.code == 200) { if (res.code == 200) {
that.orderno = res.data that.orderno = res.data.billNo
that.billId = res.data.billId
let data = { let data = {
billNo: that.orderno, billNo: that.orderno,
channelId: 1 channelId: 1
@ -597,12 +520,10 @@
paySign: res.data.payParams.paySign, paySign: res.data.payParams.paySign,
success: (res) => { success: (res) => {
that.zhifuflag = true that.zhifuflag = true
that.$u.put( that.$u.put(`/app/bill/${that.payNo}/refreshPayResult`).then(res => {
`/app/bill/${that.payNo}/refreshPayResult`
).then(res => {
// 支付成功逻辑 // 支付成功逻辑
uni.reLaunch({ uni.navigateTo({
url: '/pages/index/index' url: '/page_user/mydetail?billId=' + that.billId
}) })
}) })
}, },
@ -676,6 +597,11 @@
break; break;
case xBlufi.XBLUFI_TYPE.TYPE_CONNECTED: case xBlufi.XBLUFI_TYPE.TYPE_CONNECTED:
console.log("连接回调：" + JSON.stringify(options)); console.log("连接回调：" + JSON.stringify(options));
uni.showToast({
title: '连接成功',
icon: 'none',
duration: 2000
})
if (options.result) { if (options.result) {
// console.log('125451245') // console.log('125451245')
{ {
@ -930,8 +856,8 @@
} }
.picdh { .picdh {
width: 30rpx; width: 40rpx;
height: 25rpx; height: 35rpx;
position: fixed; position: fixed;
top: 53%; top: 53%;
right: 76rpx; right: 76rpx;

11
page_user/mydetail.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<view class="page"> <view class="page">
<u-navbar title="订单详情" :border-bottom="false" :background="bgc" title-color='#3D3D3D' back-icon-color="#3D3D3D" <u-navbar title="订单详情" :custom-back="btnback" :border-bottom="false" :background="bgc" title-color='#3D3D3D' back-icon-color="#3D3D3D"
title-size='36' height='44'></u-navbar> title-size='36' height='44'></u-navbar>
<view class="shengyu"> <view class="shengyu">
@ -205,7 +205,8 @@
isUsing: false, isUsing: false,
timer: null, timer: null,
timers: null, timers: null,
pictrim:true pictrim:true,
billidflag:''
} }
}, },
onShow() { onShow() {
@ -230,6 +231,8 @@
onLoad(option) { onLoad(option) {
if (option.billId) { if (option.billId) {
this.billId = option.billId this.billId = option.billId
} else if(option.idss){
this.billidflag = 1
} else { } else {
this.billId = option.id this.billId = option.id
} }
@ -272,6 +275,10 @@
} }
}, },
methods: { methods: {
btnback(){
uni.navigateBack()
},
startTimers() { startTimers() {
if (this.timers) { if (this.timers) {
clearInterval(this.timers); // 防止重复设置定时器 clearInterval(this.timers); // 防止重复设置定时器

6
page_user/mydingdan.vue
View File

@ -13,7 +13,7 @@
style="background-color: #17b402;"></text> 进行中 </view> style="background-color: #17b402;"></text> 进行中 </view>
<view style="color: #8883F0;" v-if="item.isFinished == true && item.status != 3"> <text <view style="color: #8883F0;" v-if="item.isFinished == true && item.status != 3"> <text
style="background-color: #8883F0;"></text> 已完成 </view> style="background-color: #8883F0;"></text> 已完成 </view>
<view v-if="item.status == 3" style="color: #e10328;"><text style="background-color: #e10328;"></text> 已退款</view> <view v-if="item.status == 3" style="red"><text style="background-red"></text> 已退款</view>
<view class="" v-if="item.isUsing == false && item.isFinished == false && item.status != 3"> <view class="" v-if="item.isUsing == false && item.isFinished == false && item.status != 3">
<view v-if="item.status == 1" style="color: #004fd8;"><text <view v-if="item.status == 1" style="color: #004fd8;"><text
style="background-color: #004fd8;"></text> 未支付</view> style="background-color: #004fd8;"></text> 未支付</view>
@ -25,8 +25,8 @@
style="background-color: #5d5d5d;"></text> 系统超时取消</view> style="background-color: #5d5d5d;"></text> 系统超时取消</view>
<view v-if="item.status == 6" style="color: #e6b000;"><text <view v-if="item.status == 6" style="color: #e6b000;"><text
style="background-color: #e6b000;"></text> 支付中</view> style="background-color: #e6b000;"></text> 支付中</view>
<view v-if="item.status == 7" style="color: #e10328;"><text <view v-if="item.status == 7" style="red"><text
style="background-color: #e10328;"></text> 退款中</view> style="background-red"></text> 退款中</view>
<view v-if="item.status == 8" style="color: #004fd8;"><text <view v-if="item.status == 8" style="color: #004fd8;"><text
style="background-color: #004fd8;"></text> 押金未支付</view> style="background-color: #004fd8;"></text> 押金未支付</view>
<view v-if="item.status == 9" style="color: #e6b000;"><text <view v-if="item.status == 9" style="color: #e6b000;"><text

5
page_user/orderdetail.vue
View File

@ -53,7 +53,7 @@
</view> </view>
<view class="xiao" v-if="obj.status == 3"> <view class="xiao" v-if="obj.status == 3">
<view>退款金额</view> <view>退款金额</view>
<view style="color: red;">￥{{obj.refundAmount == undefined ? '--' : obj.refundAmount}}</view> <view style="color: #e10328;">￥{{obj.refundAmount == undefined ? '--' : obj.refundAmount}}</view>
</view> </view>
<view class="xiao"> <view class="xiao">
<view>结束时间</view> <view>结束时间</view>
@ -95,7 +95,7 @@
</view> </view>
<view class="xiao" v-for="(item,index) in obj.bonusList" :key="index"> <view class="xiao" v-for="(item,index) in obj.bonusList" :key="index">
<view class="one">{{item.arrivalName == undefined ? '--' : item.arrivalName}}（<text v-if="item.arrivalType == 1">平台</text><text v-if="item.arrivalType == 2">公司</text><text v-if="item.arrivalType == 3">合作伙伴</text><text v-if="item.arrivalType == 4">渠道商</text><text v-if="item.arrivalType == 5">创业者</text><text v-if="item.arrivalType == 6">经营场所</text>）{{item.point}}%</view> <view class="one">{{item.arrivalName == undefined ? '--' : item.arrivalName}}（<text v-if="item.arrivalType == 1">平台</text><text v-if="item.arrivalType == 2">公司</text><text v-if="item.arrivalType == 3">合作伙伴</text><text v-if="item.arrivalType == 4">渠道商</text><text v-if="item.arrivalType == 5">创业者</text><text v-if="item.arrivalType == 6">经营场所</text>）{{item.point}}%</view>
<view class="two">￥{{item.amount == undefined ? '--' : item.amount}} <text v-if="obj.status == 3" style="margin-left: 20rpx;color: red;">(已退￥{{item.refundAmount}})</text> </view> <view class="two">￥{{item.amount == undefined ? '--' : item.amount}} <text v-if="obj.status == 3" style="margin-left: 20rpx;color: #e10328;">(已退￥{{item.refundAmount}})</text> </view>
</view> </view>
</view> </view>
<view class="sb" v-if="userflag" @click="btntz" style="width:680rpx;height: 100rpx;display: flex;justify-content: space-between;background: #FFFFFF; <view class="sb" v-if="userflag" @click="btntz" style="width:680rpx;height: 100rpx;display: flex;justify-content: space-between;background: #FFFFFF;
@ -219,7 +219,6 @@
}) })
} }
}, },
} }
} }
</script> </script>

47
pages/my.vue
View File

@ -1,7 +1,8 @@
<template> <template>
<view class="page"> <view class="page">
333 <button @click="click" style="margin-top:500rpx ;">按钮</button>
<input type="text" v-model="name" placeholder="请输入您的姓名" />
<input type="text" v-model="namemobel" placeholder="请输入您的身份证号" />
</view> </view>
</template> </template>
@ -12,11 +13,43 @@
bgc: { bgc: {
backgroundColor: "#4C97E7", backgroundColor: "#4C97E7",
}, },
name:'',
namemobel:'',
paw:'',
title:'提示',
} }
}, },
methods: { methods: {
click(){
// 检查是否支持生物认证
uni.checkIsSupportSoterAuthentication({
success: (res) => {
// 调用人脸识别API
wx.startFacialRecognitionVerify({
name: this.name, // 用户名称
idCardNumber: this.namemobel, // 身份证号码
success: (result) => {
if (result.errMsg === 'startFacialRecognitionVerify:ok') {
// 处理人脸识别成功的情况
console.log('人脸识别成功');
}
},
fail: (error) => {
// 处理人脸识别失败的情况
uni.showToast({
title: '人脸识别失败',
icon: 'none',
duration: 2000
});
}
});
},
fail: (err) => {
console.log('支持生物认证失败', err);
}
});
}
} }
} }
@ -26,6 +59,14 @@
page { page {
background-color: #fff; background-color: #fff;
} }
.title{
width: 100%;
height: 100%;
background-color: #fff;
border-radius: 50rpx;
padding: 20rpx;
margin: auto;
}
</style> </style>

57
pages/zhuce.vue
View File

@ -10,7 +10,7 @@
<view class="cen"> <view class="cen">
<view class="name"> <view class="name">
<view class=""> <view class="">
状态：<text v-if="item.flags == true" style="color: red;">已录入</text> <text v-else 状态：<text v-if="item.flags == true" style="color: #e10328;">已录入</text> <text v-else
style="color:seagreen;">未录入</text> style="color:seagreen;">未录入</text>
</view> </view>
<view class="" style="display: flex;"> <view class="" style="display: flex;">
@ -31,7 +31,7 @@
</view> </view>
</view> </view>
<view class="rt"> <view class="rt">
<text style="margin-bottom: 10rpx;" :id="item.deviceId" @click="createBLEConnections(item)">开关</text> <text style="margin-bottom: 10rpx;" :id="item.deviceId" @click="createBLEConnections(item)">{{item.lj}}</text>
<text @click="scanQRCode(item)" style="margin-bottom: 10rpx;">扫码</text> <text @click="scanQRCode(item)" style="margin-bottom: 10rpx;">扫码</text>
<text :id="item.deviceId" @click="createBLEConnection(item)">录入</text> <text :id="item.deviceId" @click="createBLEConnection(item)">录入</text>
</view> </view>
@ -301,6 +301,7 @@
...device, ...device,
flags, // 直接使用 flags 变量 flags, // 直接使用 flags 变量
sn: '', sn: '',
lj:'连接'
} }
}) })
} }
@ -313,7 +314,9 @@
} else { } else {
//蓝牙停止搜索失败 //蓝牙停止搜索失败
this.mengcflag = false this.mengcflag = false
uni.hideLoading() setTimeout(()=>{
uni.hideLoading()
},2000)
console.log('蓝牙停止搜索失败'); console.log('蓝牙停止搜索失败');
} }
this.searching = false this.searching = false
@ -323,9 +326,6 @@
// 发送开关 // 发送开关
createBLEConnections(e) { createBLEConnections(e) {
uni.showLoading({
title: '执行中...'
})
this.arrs = '' this.arrs = ''
this.qrResult = e.name //拿到所点击的mac号 this.qrResult = e.name //拿到所点击的mac号
if (this.ver_data == null) { //判断是否有连接蓝牙 if (this.ver_data == null) { //判断是否有连接蓝牙
@ -334,8 +334,29 @@
xBlufi.notifyStartDiscoverBle({ xBlufi.notifyStartDiscoverBle({
'isStart': true 'isStart': true
}) })
uni.showLoading({
title: '连接准备中...'
})
// 停止蓝牙搜索 // 停止蓝牙搜索
setTimeout(() => { setTimeout(() => {
setTimeout(()=>{
uni.showLoading({
title: '连接中...'
})
setTimeout(()=>{
uni.hideLoading()
uni.showToast({
title: '连接成功',
icon: 'success',
duration: 2000
})
this.devicesLists.forEach(item => {
if (item.name == this.qrResult) {
item.lj = '开关'
}
})
},2000)
},500)
xBlufi.notifyStartDiscoverBle({ xBlufi.notifyStartDiscoverBle({
'isStart': false 'isStart': false
}) })
@ -349,6 +370,9 @@
}) })
}, 1000) }, 1000)
}else{ //有连接则发送命令 }else{ //有连接则发送命令
uni.showLoading({
title: '执行中...'
})
let that = this //改变this指向 let that = this //改变this指向
uni.getNetworkType({ uni.getNetworkType({
success(res) { success(res) {
@ -370,6 +394,11 @@
wx.closeBLEConnection({ wx.closeBLEConnection({
deviceId: that.deviceId, deviceId: that.deviceId,
}) })
that.devicesLists.forEach(item => {
if (item.name == that.qrResult) {
item.lj = '连接'
}
})
// console.log('guanbi'); // console.log('guanbi');
},1000) },1000)
},2000) },2000)
@ -478,9 +507,11 @@
uni.showLoading({ uni.showLoading({
title: '请稍后...' title: '请稍后...'
}) })
xBlufi.initXBlufi(1);
xBlufi.listenDeviceMsgEvent(true, this.funListenDeviceMsgEvent);
xBlufi.notifyStartDiscoverBle({ xBlufi.notifyStartDiscoverBle({
'isStart': true 'isStart': true
}); })
// 重新搜索清空蓝牙数组 // 重新搜索清空蓝牙数组
this.bluthlist = [] this.bluthlist = []
this.devicesList = [] this.devicesList = []
@ -492,7 +523,7 @@
this.texts = '正在扫描蓝牙设备...' this.texts = '正在扫描蓝牙设备...'
setTimeout(() => { setTimeout(() => {
this.statusflag = false this.statusflag = false
if (this.searching) { // if (this.searching) {
xBlufi.notifyStartDiscoverBle({ xBlufi.notifyStartDiscoverBle({
'isStart': false 'isStart': false
}); });
@ -503,11 +534,11 @@
} else { } else {
this.texts = '扫描到以下设备，请点击录入！' this.texts = '扫描到以下设备，请点击录入！'
} }
} else { // } else {
xBlufi.notifyStartDiscoverBle({ // xBlufi.notifyStartDiscoverBle({
'isStart': true // 'isStart': true
}) // })
} // }
}, 2000) }, 2000)
// } // }
}, },