设备详情大修改
This commit is contained in:
parent
a66290c5a1
commit
1b86d650af
|
@ -19,8 +19,8 @@ const install = (Vue, vm) => {
|
|||
// },
|
||||
// });
|
||||
Vue.prototype.$u.http.setConfig({
|
||||
// baseUrl: 'http://192.168.2.81:10002',
|
||||
baseUrl: 'https://kg.chuangtewl.com/prod-api',
|
||||
baseUrl: 'http://192.168.2.81:10002',
|
||||
// baseUrl: 'https://kg.chuangtewl.com/prod-api',
|
||||
// loadingText: '努力加载中~',
|
||||
// loadingTime: 1000,
|
||||
// 设置自定义头部content-type
|
||||
|
|
|
@ -113,7 +113,7 @@
|
|||
<view class="tongyi" v-if="deviceobj.suitList != null">
|
||||
<u-checkbox-group>
|
||||
<u-checkbox v-model="checked" @change="checkboxChange" active-color="#8883F0 ">我已同意
|
||||
</u-checkbox><text @click="btnyinsi">《用户服务协议》</text>
|
||||
</u-checkbox><text @click="btnyonghu">《用户服务协议》</text> <text @click="btnyinsi">《隐私政策》</text>
|
||||
</u-checkbox-group>
|
||||
<view class="zf" @click="btnzhifu" v-if="zhifuflag">
|
||||
立即支付
|
||||
|
@ -350,8 +350,13 @@
|
|||
})
|
||||
},
|
||||
|
||||
// 用户服务协议
|
||||
//
|
||||
btnyinsi(){
|
||||
uni.navigateTo({
|
||||
url: '/page_fenbao/statulist/about/index?tit=' + '隐私政策'
|
||||
})
|
||||
},
|
||||
btnyonghu(){
|
||||
uni.navigateTo({
|
||||
url: '/page_fenbao/statulist/about/index?tit=' + '用户服务协议'
|
||||
})
|
||||
|
|
|
@ -7,8 +7,11 @@
|
|||
<view class="box_list" v-for="(item, index) in list" :key="index" @click="btnactive(item.deviceId,index,item)" >
|
||||
<view :class="['boxlist', { active: tcidlist.includes(item.deviceId) }]">
|
||||
<view :class="['toptime', { activewz: tcidlist.includes(item.deviceId) }]">
|
||||
<text>{{item.deviceName.length > 5 ? item.deviceName.substring(0,4) + '...' : item.deviceName}}</text>
|
||||
<text>SN:{{item.deviceNo}}</text>
|
||||
<text>{{item.deviceName.length > 5 ? item.deviceName.substring(0,4) + '...' : item.deviceName}}
|
||||
<text style="display: block;margin-top: 10rpx;">SN:{{item.deviceNo}}</text>
|
||||
</text>
|
||||
<text v-if="tcidlist.includes(item.deviceId)">已应用</text>
|
||||
<text v-else>未应用</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="ccc">
|
||||
|
|
|
@ -535,22 +535,11 @@
|
|||
});
|
||||
return;
|
||||
}
|
||||
// uni.showLoading({
|
||||
// title: '正在配网',
|
||||
// mask: true
|
||||
// })
|
||||
this.textwifi = '连接中...'
|
||||
|
||||
xBlufi.notifySendCustomData({
|
||||
customData: "ssid@" + this.ssid + "pass@" + this.password
|
||||
})
|
||||
// xBlufi.notifySendCustomData({
|
||||
// customData: "ssid@" + this.name
|
||||
// })
|
||||
|
||||
// xBlufi.notifySendCustomData({
|
||||
// customData: "pass@" + this.password
|
||||
// })
|
||||
},
|
||||
|
||||
|
||||
|
|
|
@ -41,8 +41,10 @@
|
|||
this.tit = option.tit
|
||||
if (option.tit == '关于我们') {
|
||||
this.getabout()
|
||||
}else{
|
||||
}else if(option.tit == '隐私政策'){
|
||||
this.getabouts()
|
||||
}else if(option.tit == '用户服务协议'){
|
||||
this.getaboutss()
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
|
@ -55,7 +57,7 @@
|
|||
}
|
||||
})
|
||||
},
|
||||
// 用户隐私协议
|
||||
// 隐私政策
|
||||
getabouts() {
|
||||
let type = 'privacy'
|
||||
this.$u.get(`/app/article/licence/${type}`).then((res) => {
|
||||
|
@ -63,6 +65,15 @@
|
|||
this.obj = res.data
|
||||
}
|
||||
})
|
||||
},
|
||||
// 用户协议
|
||||
getaboutss() {
|
||||
let type = 'user'
|
||||
this.$u.get(`/app/article/licence/${type}`).then((res) => {
|
||||
if (res.code == 200) {
|
||||
this.obj = res.data
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -4,6 +4,9 @@
|
|||
height='50'></u-navbar>
|
||||
<view class="box">
|
||||
<view class="listxq">
|
||||
<view class="nav">
|
||||
<text class="shen">订单号</text><text class="qian">{{detailobj.billNo == undefined ? '--' : detailobj.billNo}}</text>
|
||||
</view>
|
||||
<view class="nav">
|
||||
<text class="shen">订单状态</text>
|
||||
<text class="qian" v-if="detailobj.status == 2">
|
||||
|
@ -29,34 +32,7 @@
|
|||
</text>
|
||||
</view>
|
||||
<view class="nav">
|
||||
<text class="shen">设备编号</text><text class="qian">{{detailobj.deviceName == undefined ? '--' : detailobj.deviceName}}</text>
|
||||
</view>
|
||||
<!-- <view class="nav">
|
||||
<text class="shen">服务模式</text><text class="qian">{{detailobj.suitName == undefined ? '--' : detailobj.suitName}}</text>
|
||||
</view> -->
|
||||
<view class="nav">
|
||||
<text class="shen">用户</text><text class="qian">{{detailobj.userName == undefined ? '--' : detailobj.userName}}</text>
|
||||
</view>
|
||||
<view class="nav">
|
||||
<text class="shen">用户手机号</text><text class="qian">{{detailobj.userMobile == undefined ? '--' : detailobj.userMobile}}</text>
|
||||
</view>
|
||||
<view class="nav">
|
||||
<text class="shen">收款人手机号</text><text class="qian" @click="call">{{detailobj.mchName == undefined ? '--' : detailobj.mchName}}</text>
|
||||
</view>
|
||||
<view class="nav">
|
||||
<text class="shen">消费时间</text><text class="qian">{{detailobj.createTime == undefined ? '--' : detailobj.createTime}}</text>
|
||||
</view>
|
||||
<view class="nav">
|
||||
<text class="shen">套餐开始时间</text><text class="qian">{{detailobj.suitStartTime == undefined ? '--' : detailobj.suitStartTime}}</text>
|
||||
</view>
|
||||
<view class="nav">
|
||||
<text class="shen">套餐结束时间</text><text class="qian">{{detailobj.suitEndTime == undefined ? '--' : detailobj.suitEndTime}}</text>
|
||||
</view>
|
||||
<view class="nav">
|
||||
<text class="shen">套餐失效时间</text><text class="qian">{{detailobj.suitExpireTime == undefined ? '--' : detailobj.suitExpireTime}}</text>
|
||||
</view>
|
||||
<view class="nav">
|
||||
<text class="shen">订单号</text><text class="qian">{{detailobj.billNo == undefined ? '--' : detailobj.billNo}}</text>
|
||||
<text class="shen">设备名称</text><text class="qian">{{detailobj.deviceName == undefined ? '--' : detailobj.deviceName}}</text>
|
||||
</view>
|
||||
<view class="nav">
|
||||
<text class="shen">支付方式</text><text class="qian">{{detailobj.channelName == undefined ? '--' : detailobj.channelName}}</text>
|
||||
|
@ -64,14 +40,17 @@
|
|||
<view class="nav">
|
||||
<text class="shen">套餐名称</text><text class="qian">{{detailobj.suitName == undefined ? '--' : detailobj.suitName}}</text>
|
||||
</view>
|
||||
<view class="nav">
|
||||
<text class="shen">套餐金额</text><text class="qian">{{detailobj.money == undefined ? '--' : detailobj.money}}</text>
|
||||
<view class="nav">
|
||||
<text class="shen">套餐金额</text><text class="qian">¥{{detailobj.money == undefined ? '--' : detailobj.money}}</text>
|
||||
</view>
|
||||
<view class="nav" v-if="detailobj.status == 3">
|
||||
<text class="shen">退款金额</text><text class="qian" style="color: red;">¥{{detailobj.refundAmount == undefined ? '--' : detailobj.refundAmount}}</text>
|
||||
</view>
|
||||
<view class="nav">
|
||||
<text class="shen">计时模式</text><text class="qian">{{detailobj.suitFeeMode == 1 ? '单次计时' : '智能计时'}}</text>
|
||||
<text class="shen">收费模式</text><text class="qian">{{detailobj.suitFeeMode == 1 ? '单次收费' : '智能收费'}}</text>
|
||||
</view>
|
||||
<view class="nav">
|
||||
<text class="shen">收费模式</text><text class="qian">
|
||||
<text class="shen">收费方式</text><text class="qian">
|
||||
<text v-if="detailobj.suitFeeType == 1">计时收费</text>
|
||||
<text v-if="detailobj.suitFeeType == 2">按量收费</text>
|
||||
<text v-if="detailobj.suitFeeType == 3">分时段按量收费</text>
|
||||
|
@ -85,25 +64,23 @@
|
|||
<text v-if="detailobj.suitTimeUnit == 1">天</text> <text v-if="detailobj.suitTimeUnit == 2">时</text> <text v-if="detailobj.suitTimeUnit == 3">分钟</text> <text v-if="detailobj.suitTimeUnit == 4">秒</text>
|
||||
</text>
|
||||
</view>
|
||||
<view class="xian"></view>
|
||||
<view class="nav">
|
||||
<text class="shen">支付时间</text><text class="qian">{{detailobj.payTime == undefined ? '--' : detailobj.payTime}}</text>
|
||||
</view>
|
||||
<view class="nav">
|
||||
<text class="shen">套餐开始时间</text><text class="qian">{{detailobj.suitStartTime == undefined ? '--' : detailobj.suitStartTime}}</text>
|
||||
</view>
|
||||
<view class="nav">
|
||||
<text class="shen">套餐结束时间</text><text class="qian">{{detailobj.suitEndTime == undefined ? '--' : detailobj.suitEndTime}}</text>
|
||||
</view>
|
||||
<!-- <view class="xian"></view>
|
||||
<view class="nav">
|
||||
<text class="shen">共计</text><text class="qian">¥{{detailobj.money == undefined ? '--' : detailobj.money}}</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;
|
||||
border-radius: 20rpx 20rpx 20rpx 20rpx;
|
||||
margin: auto;
|
||||
padding: 32rpx 24rpx;
|
||||
box-sizing: border-box; font-size: 28rpx;
|
||||
color: #3D3D3D;
|
||||
margin-top: 30rpx;align-items: center;">
|
||||
<!-- <text class="shen">设备详情</text><u-icon name="arrow-right" color="#3D3D3D" size="28"></u-icon> -->
|
||||
<text class="shen">¥{{detailobj.money == undefined ? '--' : detailobj.money}}</text> <text>退款</text>
|
||||
</view>
|
||||
|
||||
<view class="pic" @click="btnad">
|
||||
<!-- <view class="pic" @click="btnad">
|
||||
<image :src="imgad" mode="" class="pic"></image>
|
||||
</view>
|
||||
</view> -->
|
||||
</view>
|
||||
<!-- 退款弹窗 -->
|
||||
<view class="tanc" v-if="maskflag">
|
||||
|
@ -146,7 +123,7 @@
|
|||
if(option.billId){
|
||||
this.billId = option.billId
|
||||
this.getlist()
|
||||
this.getad()
|
||||
// this.getad()
|
||||
}
|
||||
},
|
||||
// 分享到好友(会话)
|
||||
|
@ -203,6 +180,9 @@
|
|||
icon: 'success',
|
||||
duration: 3000
|
||||
})
|
||||
setTimeout(()=>{
|
||||
this.getlist()
|
||||
},1000)
|
||||
}else{
|
||||
uni.showToast({
|
||||
title: res.msg,
|
||||
|
|
|
@ -4,6 +4,9 @@
|
|||
height='50'></u-navbar>
|
||||
<view class="box">
|
||||
<view class="listxq">
|
||||
<view class="nav">
|
||||
<text class="shen">订单号</text><text class="qian">{{detailobj.billNo == undefined ? '--' : detailobj.billNo}}</text>
|
||||
</view>
|
||||
<view class="nav">
|
||||
<text class="shen">订单状态</text>
|
||||
<text class="qian" v-if="detailobj.status == 2">
|
||||
|
@ -29,11 +32,8 @@
|
|||
</text>
|
||||
</view>
|
||||
<view class="nav">
|
||||
<text class="shen">设备编号</text><text class="qian">{{detailobj.deviceName == undefined ? '--' : detailobj.deviceName}}</text>
|
||||
<text class="shen">设备名称</text><text class="qian">{{detailobj.deviceName == undefined ? '--' : detailobj.deviceName}}</text>
|
||||
</view>
|
||||
<!-- <view class="nav">
|
||||
<text class="shen">服务模式</text><text class="qian">{{detailobj.suitName == undefined ? '--' : detailobj.suitName}}</text>
|
||||
</view> -->
|
||||
<view class="nav">
|
||||
<text class="shen">用户</text><text class="qian">{{detailobj.userName == undefined ? '--' : detailobj.userName}}</text>
|
||||
</view>
|
||||
|
@ -41,22 +41,7 @@
|
|||
<text class="shen">用户手机号</text><text class="qian">{{detailobj.userMobile == undefined ? '--' : detailobj.userMobile}}</text>
|
||||
</view>
|
||||
<view class="nav">
|
||||
<text class="shen">收款人手机号</text><text class="qian" @click="call">{{detailobj.mchName == undefined ? '--' : detailobj.mchName}}</text>
|
||||
</view>
|
||||
<view class="nav">
|
||||
<text class="shen">消费时间</text><text class="qian">{{detailobj.createTime == undefined ? '--' : detailobj.createTime}}</text>
|
||||
</view>
|
||||
<view class="nav">
|
||||
<text class="shen">套餐开始时间</text><text class="qian">{{detailobj.suitStartTime == undefined ? '--' : detailobj.suitStartTime}}</text>
|
||||
</view>
|
||||
<view class="nav">
|
||||
<text class="shen">套餐结束时间</text><text class="qian">{{detailobj.suitEndTime == undefined ? '--' : detailobj.suitEndTime}}</text>
|
||||
</view>
|
||||
<view class="nav">
|
||||
<text class="shen">套餐失效时间</text><text class="qian">{{detailobj.suitExpireTime == undefined ? '--' : detailobj.suitExpireTime}}</text>
|
||||
</view>
|
||||
<view class="nav">
|
||||
<text class="shen">订单号</text><text class="qian">{{detailobj.billNo == undefined ? '--' : detailobj.billNo}}</text>
|
||||
<text class="shen">支付时间</text><text class="qian">{{detailobj.payTime == undefined ? '--' : detailobj.payTime}}</text>
|
||||
</view>
|
||||
<view class="nav">
|
||||
<text class="shen">支付方式</text><text class="qian">{{detailobj.channelName == undefined ? '--' : detailobj.channelName}}</text>
|
||||
|
@ -65,13 +50,16 @@
|
|||
<text class="shen">套餐名称</text><text class="qian">{{detailobj.suitName == undefined ? '--' : detailobj.suitName}}</text>
|
||||
</view>
|
||||
<view class="nav">
|
||||
<text class="shen">套餐金额</text><text class="qian">{{detailobj.money == undefined ? '--' : detailobj.money}}</text>
|
||||
<text class="shen">套餐金额</text><text class="qian">¥{{detailobj.money == undefined ? '--' : detailobj.money}}</text>
|
||||
</view>
|
||||
<view class="nav" v-if="detailobj.status == 3">
|
||||
<text class="shen">退款金额</text><text class="qian" style="color: red;">¥{{detailobj.refundAmount == undefined ? '--' : detailobj.refundAmount}}</text>
|
||||
</view>
|
||||
<view class="nav">
|
||||
<text class="shen">计时模式</text><text class="qian">{{detailobj.suitFeeMode == 1 ? '单次计时' : '智能计时'}}</text>
|
||||
<text class="shen">收费模式</text><text class="qian">{{detailobj.suitFeeMode == 1 ? '单次计时' : '智能计时'}}</text>
|
||||
</view>
|
||||
<view class="nav">
|
||||
<text class="shen">收费模式</text><text class="qian">
|
||||
<text class="shen">收费方式</text><text class="qian">
|
||||
<text v-if="detailobj.suitFeeType == 1">计时收费</text>
|
||||
<text v-if="detailobj.suitFeeType == 2">按量收费</text>
|
||||
<text v-if="detailobj.suitFeeType == 3">分时段按量收费</text>
|
||||
|
@ -85,26 +73,28 @@
|
|||
<text v-if="detailobj.suitTimeUnit == 1">天</text> <text v-if="detailobj.suitTimeUnit == 2">时</text> <text v-if="detailobj.suitTimeUnit == 3">分钟</text> <text v-if="detailobj.suitTimeUnit == 4">秒</text>
|
||||
</text>
|
||||
</view>
|
||||
|
||||
<view class="xian"></view>
|
||||
<view class="nav">
|
||||
<text class="shen">套餐开始时间</text><text class="qian">{{detailobj.suitStartTime == undefined ? '--' : detailobj.suitStartTime}}</text>
|
||||
</view>
|
||||
<view class="nav">
|
||||
<text class="shen">套餐结束时间</text><text class="qian">{{detailobj.suitEndTime == undefined ? '--' : detailobj.suitEndTime}}</text>
|
||||
</view>
|
||||
<!-- <view class="xian"></view>
|
||||
<view class="nav">
|
||||
<text class="shen">共计</text><text class="qian">¥{{detailobj.money == undefined ? '--' : detailobj.money}}</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;
|
||||
<view class="sb" v-if="userflag && detailobj.status == 2" @click="btntz" style="width:680rpx;height: 100rpx;background: #8883F0;
|
||||
border-radius: 20rpx 20rpx 20rpx 20rpx;
|
||||
margin: auto;
|
||||
padding: 32rpx 24rpx;
|
||||
box-sizing: border-box; font-size: 28rpx;
|
||||
color: #3D3D3D;
|
||||
margin: auto;font-weight: 600;
|
||||
padding: 32rpx 24rpx;color:#fff;font-size: 32rpx;
|
||||
box-sizing: border-box;text-align: center;
|
||||
margin-top: 30rpx;align-items: center;">
|
||||
<!-- <text class="shen">设备详情</text><u-icon name="arrow-right" color="#3D3D3D" size="28"></u-icon> -->
|
||||
<text class="shen">¥{{detailobj.money == undefined ? '--' : detailobj.money}}</text> <text>退款</text>
|
||||
退款
|
||||
</view>
|
||||
|
||||
<view class="pic" @click="btnad">
|
||||
<!-- <view class="pic" @click="btnad">
|
||||
<image :src="imgad" mode="" class="pic"></image>
|
||||
</view>
|
||||
</view> -->
|
||||
</view>
|
||||
<!-- 退款弹窗 -->
|
||||
<view class="tanc" v-if="maskflag">
|
||||
|
@ -147,7 +137,7 @@
|
|||
if(option.billId){
|
||||
this.billId = option.billId
|
||||
this.getlist()
|
||||
this.getad()
|
||||
// this.getad()
|
||||
}
|
||||
},
|
||||
// 分享到好友(会话)
|
||||
|
@ -204,6 +194,9 @@
|
|||
icon: 'success',
|
||||
duration: 3000
|
||||
})
|
||||
setTimeout(()=>{
|
||||
this.getlist()
|
||||
},1000)
|
||||
}else{
|
||||
uni.showToast({
|
||||
title: res.msg,
|
||||
|
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user