测试-床垫
This commit is contained in:
parent
3bd17e7245
commit
3dfd82456e
|
|
@ -16,12 +16,11 @@ const install = (Vue, vm) => {
|
|||
// // 配置请求头信息
|
||||
// header: {
|
||||
// 'content-type': 'application/json;charset=UTF-8',
|
||||
|
||||
// },
|
||||
// });
|
||||
Vue.prototype.$u.http.setConfig({
|
||||
baseUrl: 'http://192.168.2.81:3302',
|
||||
// baseUrl: 'https://kang.chuangtewl.com/prod-api',
|
||||
// baseUrl: 'http://192.168.2.81:3302',
|
||||
baseUrl: 'https://kang.chuangtewl.com/prod-api',
|
||||
loadingText: '努力加载中~',
|
||||
loadingTime: 800,
|
||||
// 设置自定义头部content-type
|
||||
|
|
|
|||
|
|
@ -200,7 +200,7 @@
|
|||
}
|
||||
// console.log(that.tcidlist,indexInTcidList,'0202');
|
||||
that.tcidlist = that.tcidlist.filter(item => item !== undefined)
|
||||
console.log(that.tcidlist,'10101010');
|
||||
// console.log(that.tcidlist,'10101010');
|
||||
let data = {
|
||||
storeIds: that.tcidlist,
|
||||
suitId: that.suitId
|
||||
|
|
@ -443,7 +443,6 @@
|
|||
.time_item {
|
||||
width: 134rpx;
|
||||
height: 48rpx;
|
||||
// background: #64B6A7;
|
||||
border-radius: 6rpx 6rpx 6rpx 6rpx;
|
||||
margin-top: 18rpx;
|
||||
color: #fff;
|
||||
|
|
@ -531,7 +530,6 @@
|
|||
height: 58rpx;
|
||||
background: #D8D8D8;
|
||||
border-radius: 6rpx 6rpx 6rpx 6rpx;
|
||||
// padding-left: 30rpx;
|
||||
text-align: center;
|
||||
box-sizing: border-box;
|
||||
margin-right: 20rpx;
|
||||
|
|
@ -539,7 +537,6 @@
|
|||
}
|
||||
|
||||
.feelt {
|
||||
// width: 174rpx;
|
||||
height: 42rpx;
|
||||
font-size: 30rpx;
|
||||
color: #000000;
|
||||
|
|
@ -575,7 +572,6 @@
|
|||
height: 58rpx;
|
||||
background: #D8D8D8;
|
||||
border-radius: 6rpx 6rpx 6rpx 6rpx;
|
||||
// padding-left: 30rpx;
|
||||
text-align: center;
|
||||
box-sizing: border-box;
|
||||
margin-right: 20rpx;
|
||||
|
|
@ -721,7 +717,6 @@
|
|||
box-sizing: border-box;
|
||||
height: 100vh;
|
||||
overflow: scroll;
|
||||
// overflow: hidden;
|
||||
|
||||
.tcname {
|
||||
width: 654rpx;
|
||||
|
|
@ -783,8 +778,6 @@
|
|||
}
|
||||
|
||||
input {
|
||||
// margin-top: 30rpx;
|
||||
// padding-left: 100rpx;
|
||||
text-align: right;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -236,7 +236,6 @@
|
|||
box-sizing: border-box;
|
||||
.toptime{
|
||||
font-size: 32rpx;
|
||||
// color: #000000;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -239,13 +239,6 @@
|
|||
</script>
|
||||
|
||||
<style lang="scss">
|
||||
// /deep/ .u-title {
|
||||
// padding-bottom: 22rpx;
|
||||
// }
|
||||
|
||||
// /deep/ .u-icon__icon {
|
||||
// padding-bottom: 22rpx;
|
||||
// }
|
||||
.active {
|
||||
background-color: #8883F0 !important;
|
||||
border-radius: 20rpx;
|
||||
|
|
@ -267,7 +260,6 @@
|
|||
height: 200rpx;
|
||||
padding-top: 40rpx;
|
||||
background-color: #fff;
|
||||
// justify-content: space-between;
|
||||
width: 100%;
|
||||
padding-left: 50rpx;
|
||||
padding-right: 50rpx;
|
||||
|
|
|
|||
|
|
@ -3,10 +3,10 @@
|
|||
<u-navbar :title="tit" :border-bottom="false" :background="bgc" title-color='#3D3D3D' back-icon-color="#3D3D3D"
|
||||
title-size='38' height='44'></u-navbar>
|
||||
|
||||
<!-- <view class="cont" v-html="cont">
|
||||
<view class="cont" v-html="cont">
|
||||
|
||||
</view> -->
|
||||
<rich-text class="cont" :nodes="cont"></rich-text>
|
||||
</view>
|
||||
<!-- <rich-text class="cont" :nodes="cont"></rich-text> -->
|
||||
|
||||
|
||||
<view class="" style="position: fixed;top: 0;left: 0;width: 100%;height: 100vh;z-index: -1;">
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@
|
|||
<view class="thr">{{obj.storeName == undefined ? '--' : obj.storeName}}</view>
|
||||
</view>
|
||||
<view class="jy">
|
||||
<view class="one" style="width: 160rpx;">经营地址：</view>
|
||||
<view class="one" style="width: 180rpx;">经营地址：</view>
|
||||
<view class="two">{{obj.storeAddress == undefined ? '--' : obj.storeAddress}}</view>
|
||||
</view>
|
||||
<view class="jy">
|
||||
|
|
@ -105,7 +105,7 @@
|
|||
收益明细
|
||||
</view>
|
||||
<view class="jy" 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 ? '--' : otem.amount}}</view> -->
|
||||
</view>
|
||||
</view>
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@
|
|||
<view class="wbd" v-else style="color: #8883F0;" @click.stop="btnbds(item.deviceId)">未绑定</view>
|
||||
</view>
|
||||
<view class="bd">
|
||||
<view class="one" style="width: 160rpx;">经营地址</view>
|
||||
<view class="one" style="width: 180rpx;">经营地址</view>
|
||||
<view class="one">{{item.storeAddress == undefined ? '--' : item.storeAddress}}</view>
|
||||
</view>
|
||||
<view class="cen" v-if="type == 2">
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -65,12 +65,20 @@
|
|||
￥{{detailobj.money == undefined ? '--' : detailobj.money}}
|
||||
</view>
|
||||
</view>
|
||||
<view class="item_xx" v-if="detailobj.status == 3">
|
||||
<view class="">
|
||||
退款金额
|
||||
</view>
|
||||
<view class="">
|
||||
￥{{detailobj.refundAmount == undefined ? '--' : detailobj.refundAmount}}
|
||||
</view>
|
||||
</view>
|
||||
<view class="item_xx">
|
||||
<view class="">
|
||||
经营场所：
|
||||
</view>
|
||||
<view class="">
|
||||
{{detailobj.storeName == undefined ? '--' : detailobj.storeName}}
|
||||
{{detailobj.storeName == undefined ? '--' : detailobj.storeName}} {{detailobj.deviceRoom == undefined ? '' : detailobj.deviceRoom + '室'}}
|
||||
</view>
|
||||
</view>
|
||||
<view class="item_xx">
|
||||
|
|
@ -197,6 +205,7 @@
|
|||
isUsing: false,
|
||||
timer: null,
|
||||
timers: null,
|
||||
pictrim:true
|
||||
}
|
||||
},
|
||||
onShow() {
|
||||
|
|
@ -363,7 +372,7 @@
|
|||
success(res) {
|
||||
setTimeout(() => {
|
||||
xBlufi.notifySendCustomData({
|
||||
customData: 'time0@'
|
||||
customData: '11time0@'
|
||||
})
|
||||
uni.showToast({
|
||||
title: '操作成功',
|
||||
|
|
@ -405,145 +414,169 @@
|
|||
|
||||
// 点击临时开关
|
||||
btnimg() {
|
||||
if (this.detailobj.deviceOnlineStatus == 1) {
|
||||
this.$u.put(`/app/bill/switchDevice?billId=${this.billId}&open=false`).then(res => {
|
||||
if (res.code == 200) {
|
||||
this.imgflag = false
|
||||
} else {
|
||||
uni.showToast({
|
||||
title: res.msg,
|
||||
icon: 'none',
|
||||
duration: 1000
|
||||
})
|
||||
}
|
||||
})
|
||||
} else {
|
||||
if (this.setMode == null) {
|
||||
this.btnmsk = false
|
||||
this.shibaiflag = false
|
||||
this.bluetoothflag = true
|
||||
xBlufi.initXBlufi(1)
|
||||
xBlufi.listenDeviceMsgEvent(true, this.funListenDeviceMsgEvent)
|
||||
xBlufi.notifyStartDiscoverBle({
|
||||
'isStart': true
|
||||
})
|
||||
// 停止蓝牙搜索
|
||||
setTimeout(() => {
|
||||
xBlufi.notifyStartDiscoverBle({
|
||||
'isStart': false
|
||||
})
|
||||
xBlufi.notifyConnectBle({
|
||||
isStart: true,
|
||||
deviceId: this.deviceId,
|
||||
name: this.name
|
||||
})
|
||||
xBlufi.notifyInitBleEsp32({
|
||||
deviceId: this.deviceId
|
||||
})
|
||||
}, 1000)
|
||||
} else {
|
||||
let that = this
|
||||
uni.getNetworkType({
|
||||
success(res) {
|
||||
if (res.networkType !== 'none') {
|
||||
uni.getConnectedBluetoothDevices({
|
||||
success(res) {
|
||||
setTimeout(() => {
|
||||
xBlufi.notifySendCustomData({
|
||||
customData: 'close'
|
||||
})
|
||||
uni.showToast({
|
||||
title: '操作成功',
|
||||
icon: 'success',
|
||||
duration: 1000
|
||||
})
|
||||
this.imgflag = false
|
||||
that.getlist()
|
||||
that.msakflag = false
|
||||
that.btnmsk = false
|
||||
that.shibaiflag = false
|
||||
that.bluetoothflag = false
|
||||
}, 1000)
|
||||
},
|
||||
fail(err) {
|
||||
console.error('获取已连接蓝牙设备信息失败：', err)
|
||||
}
|
||||
})
|
||||
}
|
||||
if(this.pictrim == true){ //防止频繁点击
|
||||
this.pictrim = false
|
||||
setTimeout(()=>{
|
||||
this.pictrim = true
|
||||
},5000)
|
||||
if (this.detailobj.deviceOnlineStatus == 1) {
|
||||
this.$u.put(`/app/bill/switchDevice?billId=${this.billId}&open=false`).then(res => {
|
||||
if (res.code == 200) {
|
||||
this.imgflag = false
|
||||
} else {
|
||||
uni.showToast({
|
||||
title: res.msg,
|
||||
icon: 'none',
|
||||
duration: 1000
|
||||
})
|
||||
}
|
||||
})
|
||||
} else {
|
||||
if (this.setMode == null) {
|
||||
this.btnmsk = false
|
||||
this.shibaiflag = false
|
||||
this.bluetoothflag = true
|
||||
xBlufi.initXBlufi(1)
|
||||
xBlufi.listenDeviceMsgEvent(true, this.funListenDeviceMsgEvent)
|
||||
xBlufi.notifyStartDiscoverBle({
|
||||
'isStart': true
|
||||
})
|
||||
// 停止蓝牙搜索
|
||||
setTimeout(() => {
|
||||
xBlufi.notifyStartDiscoverBle({
|
||||
'isStart': false
|
||||
})
|
||||
xBlufi.notifyConnectBle({
|
||||
isStart: true,
|
||||
deviceId: this.deviceId,
|
||||
name: this.name
|
||||
})
|
||||
xBlufi.notifyInitBleEsp32({
|
||||
deviceId: this.deviceId
|
||||
})
|
||||
}, 1000)
|
||||
} else {
|
||||
let that = this
|
||||
uni.getNetworkType({
|
||||
success(res) {
|
||||
if (res.networkType !== 'none') {
|
||||
uni.getConnectedBluetoothDevices({
|
||||
success(res) {
|
||||
setTimeout(() => {
|
||||
xBlufi.notifySendCustomData({
|
||||
customData: '11close'
|
||||
})
|
||||
uni.showToast({
|
||||
title: '操作成功',
|
||||
icon: 'success',
|
||||
duration: 1000
|
||||
})
|
||||
this.imgflag = false
|
||||
that.getlist()
|
||||
that.msakflag = false
|
||||
that.btnmsk = false
|
||||
that.shibaiflag = false
|
||||
that.bluetoothflag = false
|
||||
}, 1000)
|
||||
},
|
||||
fail(err) {
|
||||
console.error('获取已连接蓝牙设备信息失败：', err)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
}else{
|
||||
uni.showToast({
|
||||
title: '请不要频繁点击',
|
||||
icon: 'none',
|
||||
duration: 1000
|
||||
})
|
||||
}
|
||||
},
|
||||
btnimgs() {
|
||||
if (this.detailobj.deviceOnlineStatus == 1) {
|
||||
this.$u.put(`/app/bill/switchDevice?billId=${this.billId}&open=true`).then(res => {
|
||||
if (res.code == 200) {
|
||||
this.imgflag = true
|
||||
} else {
|
||||
uni.showToast({
|
||||
title: res.msg,
|
||||
icon: 'none',
|
||||
duration: 1000
|
||||
})
|
||||
}
|
||||
})
|
||||
} else {
|
||||
if (this.setMode == null) {
|
||||
this.btnmsk = false
|
||||
this.shibaiflag = false
|
||||
this.bluetoothflag = true
|
||||
xBlufi.initXBlufi(1)
|
||||
xBlufi.listenDeviceMsgEvent(true, this.funListenDeviceMsgEvent)
|
||||
xBlufi.notifyStartDiscoverBle({
|
||||
'isStart': true
|
||||
})
|
||||
// 停止蓝牙搜索
|
||||
setTimeout(() => {
|
||||
xBlufi.notifyStartDiscoverBle({
|
||||
'isStart': false
|
||||
})
|
||||
xBlufi.notifyConnectBle({
|
||||
isStart: true,
|
||||
deviceId: this.deviceId,
|
||||
name: this.name
|
||||
})
|
||||
xBlufi.notifyInitBleEsp32({
|
||||
deviceId: this.deviceId
|
||||
})
|
||||
}, 1000)
|
||||
} else {
|
||||
let that = this
|
||||
uni.getNetworkType({
|
||||
success(res) {
|
||||
if (res.networkType !== 'none') {
|
||||
uni.getConnectedBluetoothDevices({
|
||||
success(res) {
|
||||
setTimeout(() => {
|
||||
xBlufi.notifySendCustomData({
|
||||
customData: 'open'
|
||||
})
|
||||
uni.showToast({
|
||||
title: '操作成功',
|
||||
icon: 'success',
|
||||
duration: 1000
|
||||
})
|
||||
this.imgflag = true
|
||||
that.getlist()
|
||||
that.msakflag = false
|
||||
that.btnmsk = false
|
||||
that.shibaiflag = false
|
||||
that.bluetoothflag = false
|
||||
}, 1000)
|
||||
},
|
||||
fail(err) {
|
||||
console.error('获取已连接蓝牙设备信息失败：', err)
|
||||
}
|
||||
})
|
||||
}
|
||||
if(this.pictrim == true){ //防止频繁点击
|
||||
this.pictrim = false
|
||||
setTimeout(()=>{
|
||||
this.pictrim = true
|
||||
},5000)
|
||||
if (this.detailobj.deviceOnlineStatus == 1) {
|
||||
this.$u.put(`/app/bill/switchDevice?billId=${this.billId}&open=true`).then(res => {
|
||||
if (res.code == 200) {
|
||||
this.imgflag = true
|
||||
} else {
|
||||
uni.showToast({
|
||||
title: res.msg,
|
||||
icon: 'none',
|
||||
duration: 1000
|
||||
})
|
||||
}
|
||||
})
|
||||
} else {
|
||||
if (this.setMode == null) {
|
||||
this.btnmsk = false
|
||||
this.shibaiflag = false
|
||||
this.bluetoothflag = true
|
||||
xBlufi.initXBlufi(1)
|
||||
xBlufi.listenDeviceMsgEvent(true, this.funListenDeviceMsgEvent)
|
||||
xBlufi.notifyStartDiscoverBle({
|
||||
'isStart': true
|
||||
})
|
||||
// 停止蓝牙搜索
|
||||
setTimeout(() => {
|
||||
xBlufi.notifyStartDiscoverBle({
|
||||
'isStart': false
|
||||
})
|
||||
xBlufi.notifyConnectBle({
|
||||
isStart: true,
|
||||
deviceId: this.deviceId,
|
||||
name: this.name
|
||||
})
|
||||
xBlufi.notifyInitBleEsp32({
|
||||
deviceId: this.deviceId
|
||||
})
|
||||
}, 1000)
|
||||
} else {
|
||||
let that = this
|
||||
uni.getNetworkType({
|
||||
success(res) {
|
||||
if (res.networkType !== 'none') {
|
||||
uni.getConnectedBluetoothDevices({
|
||||
success(res) {
|
||||
setTimeout(() => {
|
||||
xBlufi.notifySendCustomData({
|
||||
customData: '11open'
|
||||
})
|
||||
uni.showToast({
|
||||
title: '操作成功',
|
||||
icon: 'success',
|
||||
duration: 1000
|
||||
})
|
||||
this.imgflag = true
|
||||
that.getlist()
|
||||
that.msakflag = false
|
||||
that.btnmsk = false
|
||||
that.shibaiflag = false
|
||||
that.bluetoothflag = false
|
||||
}, 1000)
|
||||
},
|
||||
fail(err) {
|
||||
console.error('获取已连接蓝牙设备信息失败：', err)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
}else{
|
||||
uni.showToast({
|
||||
title: '请不要频繁点击',
|
||||
icon: 'none',
|
||||
duration: 1000
|
||||
})
|
||||
}
|
||||
},
|
||||
|
||||
|
|
@ -1036,7 +1069,7 @@
|
|||
|
||||
.list_item {
|
||||
width: 658rpx;
|
||||
max-height: 380rpx;
|
||||
max-height: 410rpx;
|
||||
background: #FFFFFF;
|
||||
box-shadow: 0rpx 16rpx 40rpx 0rpx rgba(42, 130, 228, 0.1);
|
||||
border-radius: 24rpx 24rpx 24rpx 24rpx;
|
||||
|
|
|
|||
|
|
@ -9,41 +9,19 @@
|
|||
<view class="bh">
|
||||
设备编号：{{item.deviceNo}}
|
||||
</view>
|
||||
<!-- <view class="wc" v-if="item.status == 2" style="color: #e6b000;">
|
||||
已支付
|
||||
</view>
|
||||
<view class="wc" v-if="item.status == 1" style="color: #004fd8;">
|
||||
未支付
|
||||
</view>
|
||||
<view class="wc" v-if="item.status == 3" style="color: #e10328;">
|
||||
已退款
|
||||
</view>
|
||||
<view class="wc" v-if="item.status == 4" style="color: #5d5d5d;">
|
||||
已取消(用户)
|
||||
</view>
|
||||
<view class="wc" v-if="item.status == 5" style="color: #5d5d5d;">
|
||||
已取消(系统)
|
||||
</view>
|
||||
<view class="wc" v-if="item.status == 6" style="color: #e6b000;">
|
||||
支付中
|
||||
</view>
|
||||
<view class="wc" v-if="item.status == 7" style="color: #e10328;">
|
||||
退款中
|
||||
</view> -->
|
||||
<view style="color: #17b402;" v-if="item.isUsing == true"> <text
|
||||
style="background-color: #17b402;"></text> 进行中 </view>
|
||||
<view style="color: #8883F0;" v-if="item.isFinished == true"> <text
|
||||
<view style="color: #8883F0;" v-if="item.isFinished == true && item.status != 3"> <text
|
||||
style="background-color: #8883F0;"></text> 已完成 </view>
|
||||
<view class="" v-if="item.isUsing == false && item.isFinished == false">
|
||||
<view v-if="item.status == 3" style="color: #e10328;"><text style="background-color: #e10328;"></text> 已退款</view>
|
||||
<view class="" v-if="item.isUsing == false && item.isFinished == false && item.status != 3">
|
||||
<view v-if="item.status == 1" style="color: #004fd8;"><text
|
||||
style="background-color: #004fd8;"></text> 未支付</view>
|
||||
<view v-if="item.status == 2" style="color: #e6b000;"><text
|
||||
style="background-color: #e6b000;"></text> 支付成功</view>
|
||||
<view v-if="item.status == 3" style="color: #e10328;"><text
|
||||
style="background-color: #e10328;"></text> 已退款</view>
|
||||
<view v-if="item.status == 4" style="color: #5d5d5d;"><text
|
||||
style="background-color: #5d5d5d;"></text> 用户取消</view>
|
||||
<view v-if="item.status == 5" style="color: #5d5d5d;"><text
|
||||
<view v-if="item.status == 5" style="color: #5d5d5d;"><text
|
||||
style="background-color: #5d5d5d;"></text> 系统超时取消</view>
|
||||
<view v-if="item.status == 6" style="color: #e6b000;"><text
|
||||
style="background-color: #e6b000;"></text> 支付中</view>
|
||||
|
|
@ -81,10 +59,10 @@
|
|||
</view>
|
||||
<view class="item_xx">
|
||||
<view class="">
|
||||
租借店铺：
|
||||
经营场所：
|
||||
</view>
|
||||
<view class="">
|
||||
{{item.storeName}}
|
||||
{{item.storeName}} {{item.deviceRoom == undefined ? '' : item.deviceRoom + '室'}}
|
||||
</view>
|
||||
</view>
|
||||
<view class="bot">
|
||||
|
|
|
|||
|
|
@ -24,12 +24,12 @@
|
|||
<view style="color: #8883F0;">{{obj.storeName == undefined ? '--' : obj.storeName}}</view>
|
||||
</view>
|
||||
<view class="xiao">
|
||||
<view style="width: 160rpx;">经营地址</view>
|
||||
<view style="width: 180rpx;">经营地址</view>
|
||||
<view>{{obj.storeAddress == undefined ? '--' : obj.storeAddress}}</view>
|
||||
</view>
|
||||
<view class="xiao">
|
||||
<view>房间号</view>
|
||||
<view>{{obj.room == undefined ? '--' : obj.storeAddress}}号</view>
|
||||
<view>{{obj.deviceRoom == undefined ? '--' : obj.deviceRoom}}号</view>
|
||||
</view>
|
||||
<view class="xiao">
|
||||
<view>支付时间</view>
|
||||
|
|
@ -51,13 +51,32 @@
|
|||
<view>套餐金额</view>
|
||||
<view>￥{{obj.money == undefined ? '--' : obj.money}}</view>
|
||||
</view>
|
||||
<view class="xiao" v-if="obj.status == 3">
|
||||
<view>退款金额</view>
|
||||
<view style="color: red;">￥{{obj.refundAmount == undefined ? '--' : obj.refundAmount}}</view>
|
||||
</view>
|
||||
<view class="xiao">
|
||||
<view>结束时间</view>
|
||||
<view>{{obj.suitEndTime == undefined ? '--' : obj.suitEndTime}}</view>
|
||||
</view>
|
||||
<view class="xiao">
|
||||
<view>订单状态</view>
|
||||
<view>使用中</view>
|
||||
<view style="color: #17b402;" v-if="obj.isUsing == true"> <text
|
||||
style="background-color: #17b402;"></text> 进行中 </view>
|
||||
<view style="color: #8883F0;" v-if="obj.isFinished == true && obj.status != 3"> <text
|
||||
style="background-color: #8883F0;"></text> 已完成 </view>
|
||||
<view v-if="obj.status == 3" style="color: #e10328;"><text style="background-color: #e10328;"></text> 已退款</view>
|
||||
<view class="" v-if="obj.isUsing == false && obj.isFinished == false && obj.status != 3">
|
||||
<view v-if="obj.status == 1" style="color: rgb(99, 178, 168);"><text style="background-color: rgb(99, 178, 168);"></text> 未支付</view>
|
||||
<view v-if="obj.status == 2" style="color: #e6b000;"><text style="background-color: #e6b000;"></text> 支付成功</view>
|
||||
<view v-if="obj.status == 3" style="color: #e10328;"><text style="background-color: #e10328;"></text> 已退款</view>
|
||||
<view v-if="obj.status == 4" style="color: #5d5d5d;"><text style="background-color: #5d5d5d;"></text> 用户取消</view>
|
||||
<view v-if="obj.status == 5" style="color: #5d5d5d;"><text style="background-color: #5d5d5d;"></text> 系统超时取消</view>
|
||||
<view v-if="obj.status == 6" style="color: #e6b000;"><text style="background-color: #e6b000;"></text> 支付中</view>
|
||||
<view v-if="obj.status == 7" style="color: #e10328;"><text style="background-color: #e10328;"></text> 退款中</view>
|
||||
<view v-if="obj.status == 8" style="color: rgb(99, 178, 168);"><text style="background-color: rgb(99, 178, 168);"></text> 押金未支付</view>
|
||||
<view v-if="obj.status == 9" style="color: #e6b000;"><text style="background-color: #e6b000;"></text> 押金已支付</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="xiao">
|
||||
<view>直属合作伙伴</view>
|
||||
|
|
@ -75,8 +94,8 @@
|
|||
收益明细
|
||||
</view>
|
||||
<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="two">￥{{item.amount == undefined ? '--' : item.amount}}</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>
|
||||
</view>
|
||||
<view class="sb" v-if="userflag" @click="btntz" style="width:680rpx;height: 100rpx;display: flex;justify-content: space-between;background: #FFFFFF;
|
||||
|
|
@ -268,9 +287,7 @@
|
|||
.shuzhi {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
// justify-content: space-between;
|
||||
justify-content: center;
|
||||
// padding: 0 60rpx;
|
||||
margin-top: 50rpx;
|
||||
box-sizing: border-box;
|
||||
|
||||
|
|
|
|||
|
|
@ -26,9 +26,12 @@
|
|||
<view class="order_item" v-for="(item,index) in wateringList" :key="index" @click="btndetail(item.billId)">
|
||||
<view class="tops">
|
||||
<view>订单编号：{{item.billNo}}</view>
|
||||
<view style="color: #17b402;" v-if="item.isUsing == true"> <text style="background-color: #17b402;"></text> 进行中 </view>
|
||||
<view style="color: #8883F0;" v-if="item.isFinished == true"> <text style="background-color: #8883F0;"></text> 已完成 </view>
|
||||
<view class="" v-if="item.isUsing == false && item.isFinished == false">
|
||||
<view style="color: #17b402;" v-if="item.isUsing == true"> <text
|
||||
style="background-color: #17b402;"></text> 进行中 </view>
|
||||
<view style="color: #8883F0;" v-if="item.isFinished == true && item.status != 3"> <text
|
||||
style="background-color: #8883F0;"></text> 已完成 </view>
|
||||
<view v-if="item.status == 3" style="color: #e10328;"><text style="background-color: #e10328;"></text> 已退款</view>
|
||||
<view class="" v-if="item.isUsing == false && item.isFinished == false && item.status != 3">
|
||||
<view v-if="item.status == 1" style="color: rgb(99, 178, 168);"><text style="background-color: rgb(99, 178, 168);"></text> 未支付</view>
|
||||
<view v-if="item.status == 2" style="color: #e6b000;"><text style="background-color: #e6b000;"></text> 支付成功</view>
|
||||
<view v-if="item.status == 3" style="color: #e10328;"><text style="background-color: #e10328;"></text> 已退款</view>
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@
|
|||
-提现额度：单笔提现金额最低20元
|
||||
</view>
|
||||
<view class="tx_wz">
|
||||
-到账时间：3个工作日内
|
||||
-到账时间：1个工作日内
|
||||
</view>
|
||||
<view class="tx_wz" v-if="serviceType == 1">
|
||||
-提现手续费：{{serviceRate}}%
|
||||
|
|
|
|||
|
|
@ -947,7 +947,6 @@
|
|||
color: #8883F0;
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -971,7 +970,6 @@
|
|||
height: 50px;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
.ordertongji {
|
||||
|
|
@ -1177,18 +1175,14 @@
|
|||
.ditu {
|
||||
width: 100%;
|
||||
height: 980rpx;
|
||||
// background: #FFFFFF;
|
||||
border-radius: 38rpx 38rpx 38rpx 38rpx;
|
||||
// padding-top: 16rpx;
|
||||
position: relative;
|
||||
|
||||
.ongoing_order {
|
||||
width: 622rpx;
|
||||
max-height: 100%;
|
||||
// background-color: rgba(0, 0, 0, 0.4);
|
||||
background: linear-gradient(to right, #FFEFEF 20%, #D9F6FF 100%);
|
||||
border-radius: 40rpx 40rpx 40rpx 40rpx;
|
||||
// opacity: 0.6;
|
||||
position: absolute;
|
||||
top: 48rpx;
|
||||
left: 50%;
|
||||
|
|
@ -1197,7 +1191,6 @@
|
|||
.order_list {
|
||||
width: 100%;
|
||||
height: 110rpx;
|
||||
// background-color: rgba(0, 0, 0, 0.6);
|
||||
border-radius: 40rpx 40rpx 40rpx 40rpx;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
|
|
@ -1221,7 +1214,6 @@
|
|||
height: 94rpx;
|
||||
background: rgba(0, 0, 0, 0.4);
|
||||
background: linear-gradient(to right, #FFEFEF 20%, #D9F6FF 100%);
|
||||
// box-shadow: 0rpx 4rpx 10rpx 0rpx rgba(0, 0, 0, 0.3);
|
||||
border-radius: 40rpx 40rpx 40rpx 40rpx;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
|
|
@ -1268,7 +1260,6 @@
|
|||
width: 100%;
|
||||
height: 1000rpx;
|
||||
margin: auto;
|
||||
// border-radius: 30rpx;
|
||||
overflow: hidden;
|
||||
position: relative;
|
||||
|
||||
|
|
@ -1288,7 +1279,6 @@
|
|||
padding: 30rpx 0;
|
||||
box-sizing: border-box;
|
||||
|
||||
// padding-bottom: ;
|
||||
.gr {
|
||||
text-align: center;
|
||||
width: 100%;
|
||||
|
|
@ -1299,7 +1289,6 @@
|
|||
image {
|
||||
display: block;
|
||||
margin: auto;
|
||||
// margin-bottom: 14rpx;
|
||||
width: 104rpx;
|
||||
height: 122rpx;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -357,11 +357,11 @@
|
|||
success(res) {
|
||||
setTimeout(() => { //一秒后发送开启命令
|
||||
xBlufi.notifySendCustomData({
|
||||
customData: 'open'
|
||||
customData: '11open'
|
||||
})
|
||||
setTimeout(()=>{ //发送开启命令两秒后发送关闭命令
|
||||
xBlufi.notifySendCustomData({
|
||||
customData: 'close'
|
||||
customData: '11close'
|
||||
})
|
||||
setTimeout(()=>{ //发送关闭命令后一秒后断开连接
|
||||
uni.hideLoading()
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user