订单统计优化 新增安全中心待完善
This commit is contained in:
parent
2995302cfc
commit
d37054abac
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -307,6 +307,7 @@
|
|||
}
|
||||
},
|
||||
computed: {
|
||||
// 计算剩余时间
|
||||
formattedTime() {
|
||||
if (this.timeday.days > 0) {
|
||||
// 只展示天和小时
|
||||
|
|
@ -376,6 +377,7 @@
|
|||
this.stopTimer();
|
||||
},
|
||||
methods: {
|
||||
// 点击拨打客服电话
|
||||
btncall(){
|
||||
let phoneNumber = ''
|
||||
phoneNumber = this.sbobj.userMobile
|
||||
|
|
@ -534,7 +536,7 @@
|
|||
|
||||
|
||||
|
||||
|
||||
// 点击进行强刷数据
|
||||
shuaxin(){
|
||||
this.$u.get(`/app/device/${this.sbid}/refreshIot`).then((res) => {
|
||||
if(res.code == 200){
|
||||
|
|
@ -555,7 +557,7 @@
|
|||
})
|
||||
},
|
||||
|
||||
|
||||
// 获取channelId
|
||||
getzfqd(){
|
||||
this.$u.get(`/app/channel/recharge/enabledList`).then(res =>{
|
||||
if(res.code == 200){
|
||||
|
|
@ -563,6 +565,7 @@
|
|||
}
|
||||
})
|
||||
},
|
||||
// 点击默认返回首页
|
||||
btns() {
|
||||
// if(this.opflag){
|
||||
// uni.navigateBack()
|
||||
|
|
@ -572,6 +575,7 @@
|
|||
})
|
||||
// }
|
||||
},
|
||||
// 点击立即支付订单
|
||||
btnljzf() {
|
||||
this.getzfqd()
|
||||
let data = {
|
||||
|
|
@ -623,6 +627,7 @@
|
|||
}
|
||||
})
|
||||
},
|
||||
// 点击结束订单
|
||||
btnjieshu() {
|
||||
this.getzfqd()
|
||||
if (this.detaobj.suitFeeMode == 1) {
|
||||
|
|
@ -754,6 +759,7 @@
|
|||
this.trueboxfalg = true
|
||||
}
|
||||
},
|
||||
// 分时段支付订单
|
||||
btnbox() {
|
||||
this.trueboxfalg = false
|
||||
this.jieshuflag = true
|
||||
|
|
@ -802,8 +808,7 @@
|
|||
signType: res.data.payParams.signType,
|
||||
paySign: res.data.payParams.paySign,
|
||||
success: (res) => {
|
||||
that.$u.put(`/app/bill/${that.orderno}/refreshPayResult`)
|
||||
.then(res => {})
|
||||
that.$u.put(`/app/bill/${that.orderno}/refreshPayResult`).then(res => {})
|
||||
// 支付成功逻辑
|
||||
uni.showToast({
|
||||
title: res.msg,
|
||||
|
|
@ -833,7 +838,7 @@
|
|||
title: res.msg,
|
||||
icon: 'none',
|
||||
duration: 2000
|
||||
})
|
||||
})
|
||||
}
|
||||
})
|
||||
} else {
|
||||
|
|
@ -857,9 +862,7 @@
|
|||
signType: res.data.payParams.signType,
|
||||
paySign: res.data.payParams.paySign,
|
||||
success: (res) => {
|
||||
that.$u.put(
|
||||
`/app/bill/${that.orderno}/refreshPayResult`
|
||||
).then(res => {})
|
||||
that.$u.put(`/app/bill/${that.orderno}/refreshPayResult`).then(res => {})
|
||||
// 支付成功逻辑
|
||||
uni.showToast({
|
||||
title: res.msg,
|
||||
|
|
@ -880,7 +883,7 @@
|
|||
title: '支付失败',
|
||||
icon: 'none',
|
||||
duration: 2000
|
||||
});
|
||||
})
|
||||
}
|
||||
})
|
||||
}
|
||||
|
|
@ -1007,28 +1010,11 @@
|
|||
provider: 'wxpay',
|
||||
timeStamp: res.data.payParams.timeStamp,
|
||||
nonceStr: res.data.payParams.nonceStr,
|
||||
package: res
|
||||
.data
|
||||
.payParams
|
||||
.packageVal,
|
||||
signType: res
|
||||
.data
|
||||
.payParams
|
||||
.signType,
|
||||
paySign: res
|
||||
.data
|
||||
.payParams
|
||||
.paySign,
|
||||
success: (
|
||||
res
|
||||
) => {
|
||||
that.$u
|
||||
.put(
|
||||
`/app/bill/${that.orderno}/refreshPayResult`
|
||||
)
|
||||
.then(
|
||||
res => {}
|
||||
)
|
||||
package: res.data.payParams.packageVal,
|
||||
signType: res.data.payParams.signType,
|
||||
paySign: res.data.payParams.paySign,
|
||||
success: (res) => {
|
||||
that.$u.put(`/app/bill/${that.orderno}/refreshPayResult`).then(res => {})
|
||||
// 支付成功逻辑
|
||||
uni.showToast({
|
||||
title: res
|
||||
|
|
@ -1036,28 +1022,21 @@
|
|||
icon: 'success',
|
||||
duration: 1000
|
||||
})
|
||||
setTimeout
|
||||
(() => {
|
||||
that.jieshuflag =
|
||||
false
|
||||
setTimeout(() => {
|
||||
that.jieshuflag = false
|
||||
uni.reLaunch({
|
||||
url: '/pages/shouye/index'
|
||||
})
|
||||
},
|
||||
1500
|
||||
)
|
||||
},1500)
|
||||
},
|
||||
fail(
|
||||
err
|
||||
) {
|
||||
that.jieshuflag =
|
||||
false
|
||||
fail(err) {
|
||||
that.jieshuflag = false
|
||||
// 支付失败逻辑
|
||||
uni.showToast({
|
||||
title: '支付失败',
|
||||
icon: 'none',
|
||||
duration: 2000
|
||||
});
|
||||
})
|
||||
}
|
||||
})
|
||||
}
|
||||
|
|
@ -1341,7 +1320,7 @@
|
|||
{
|
||||
xBlufi.notifyInitBleEsp32({
|
||||
deviceId: this.deviceId
|
||||
});
|
||||
})
|
||||
xBlufi.listenDeviceMsgEvent(true, this.funListenDeviceMsgEvents);
|
||||
this.deviceIds = options.data.deviceId
|
||||
this.name = this.name
|
||||
|
|
@ -1353,7 +1332,7 @@
|
|||
break;
|
||||
case xBlufi.XBLUFI_TYPE.TYPE_RECIEVE_CUSTON_DATA:
|
||||
this.ver_data = this.parseCustomData(options.data)
|
||||
console.log("1收到设备发来的自定义数据结果：", this.ver_data);
|
||||
console.log("1收到设备发来的自定义数据结果：", this.ver_data)
|
||||
this.temperature = this.ver_data.temperature / 1000
|
||||
setTimeout(() => {
|
||||
// this.czflag = false
|
||||
|
|
@ -1361,7 +1340,7 @@
|
|||
this.jieshufalg = false
|
||||
uni.hideLoading()
|
||||
}, 1000)
|
||||
break;
|
||||
break
|
||||
case xBlufi.XBLUFI_TYPE.TYPE_GET_DEVICE_LISTS_STOP:
|
||||
if (options.result) {
|
||||
let uniqueDevicesList = Array.from(new Set(this.devicesList));
|
||||
|
|
@ -1370,7 +1349,7 @@
|
|||
// 将过滤后的数组重新赋值给 this.devicesList
|
||||
this.devicesList = filteredDevices;
|
||||
}
|
||||
break;
|
||||
break
|
||||
case xBlufi.XBLUFI_TYPE.TYPE_GET_DEVICE_LISTS_START:
|
||||
if (!options.result) {
|
||||
this.lanyaflag = true
|
||||
|
|
@ -1378,20 +1357,20 @@
|
|||
title: '蓝牙未开启',
|
||||
icon: 'none',
|
||||
duration: 3000
|
||||
});
|
||||
})
|
||||
return
|
||||
} else {
|
||||
this.lanyaflag = false
|
||||
}
|
||||
break;
|
||||
break
|
||||
}
|
||||
},
|
||||
|
||||
parseCustomData(data) {
|
||||
// 将字符串按照 "@" 分割成数组
|
||||
const dataArray = data.split('@');
|
||||
const dataArray = data.split('@')
|
||||
// 初始化一个空对象来存储解析后的数据
|
||||
const parsedData = {};
|
||||
const parsedData = {}
|
||||
// 前缀到属性名的映射
|
||||
const prefixMap = {
|
||||
'V': 'voltage',
|
||||
|
|
@ -1409,17 +1388,17 @@
|
|||
if (field.startsWith(prefix)) {
|
||||
// 去除前缀并将剩余部分转换为适当的类型（这里默认为浮点数或字符串）
|
||||
const value = field.substring(1);
|
||||
const propertyName = prefixMap[prefix];
|
||||
const propertyName = prefixMap[prefix]
|
||||
// 根据需要，这里可以添加更复杂的类型转换逻辑
|
||||
// 但为了简单起见，我们总是尝试将其转换为浮点数，如果失败则保留为字符串
|
||||
parsedData[propertyName] = isNaN(parseFloat(value)) ? value : parseFloat(value);
|
||||
parsedData[propertyName] = isNaN(parseFloat(value)) ? value : parseFloat(value)
|
||||
// 找到了匹配的前缀，跳出内层循环
|
||||
break;
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
// 返回解析后的数据对象
|
||||
return parsedData;
|
||||
return parsedData
|
||||
},
|
||||
|
||||
// parseCustomData(data) {
|
||||
|
|
|
|||
|
|
@ -282,6 +282,7 @@
|
|||
}
|
||||
})
|
||||
},
|
||||
|
||||
getone(){
|
||||
let that = this
|
||||
let data = {
|
||||
|
|
@ -465,6 +466,7 @@
|
|||
deviceNo: that.id,
|
||||
suitId: that.zfobj.suitId,
|
||||
money: that.zfobj.price,
|
||||
suitDeposit:that.zfobj.deposit,
|
||||
suitTime: that.zfobj.value,
|
||||
suitTimeUnit:that.suitTimeUnit,
|
||||
suitFeeMode:that.suitFeeMode,
|
||||
|
|
@ -648,6 +650,7 @@
|
|||
deviceNo: that.id,
|
||||
suitId: that.zfobj.suitId,
|
||||
money: that.zfobj.price,
|
||||
suitDeposit:that.zfobj.deposit,
|
||||
suitTime: that.zfobj.value,
|
||||
suitTimeUnit:that.suitTimeUnit,
|
||||
suitFeeMode:that.suitFeeMode,
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
<view>
|
||||
<view class="swiper-item ">
|
||||
<view class="card_box" v-for="(item,index) in wateringList" :key="index">
|
||||
<view class="card" @click="btnxq(item.deviceId)">
|
||||
<view class="card" @click="btnxq(item.deviceNo)">
|
||||
<view class="card_left">
|
||||
<view class="card_left_tit">
|
||||
{{item.deviceName}}
|
||||
|
|
@ -131,10 +131,12 @@
|
|||
}
|
||||
},
|
||||
btnxq(id) {
|
||||
// uni.navigateTo({
|
||||
// url: '/page_user/sbdetail?id=' + id
|
||||
// })
|
||||
uni.navigateTo({
|
||||
url: '/page_components/fuwu/index?id=' + id
|
||||
})
|
||||
},
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -185,28 +185,19 @@
|
|||
/deep/ .u-title {
|
||||
padding-bottom: 22rpx;
|
||||
}
|
||||
|
||||
/deep/ .uicon-nav-back {
|
||||
padding-bottom: 22rpx;
|
||||
}
|
||||
|
||||
page {
|
||||
// background: linear-gradient(180deg, #F4F5F7 0%, rgba(255, 255, 255, 0) 100%);
|
||||
}
|
||||
|
||||
.page {
|
||||
width: 750rpx;
|
||||
height: 100vh;
|
||||
|
||||
.box {
|
||||
width: 750rpx;
|
||||
border-radius: 0rpx 0rpx 0rpx 0rpx;
|
||||
padding-top: 150rpx;
|
||||
|
||||
.list {
|
||||
padding-bottom: 400rpx;
|
||||
margin-top: 26rpx;
|
||||
|
||||
.listitem {
|
||||
margin-bottom: 28rpx !important;
|
||||
padding: 12rpx 38rpx;
|
||||
|
|
@ -216,7 +207,6 @@
|
|||
background: #FFFFFF;
|
||||
border-radius: 38rpx 38rpx 38rpx 38rpx;
|
||||
margin: auto;
|
||||
|
||||
.yunxing {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
|
|
@ -224,7 +214,6 @@
|
|||
color: #808080;
|
||||
margin-top: 26rpx;
|
||||
}
|
||||
|
||||
.phones {
|
||||
margin-top: 16rpx;
|
||||
font-size: 26rpx;
|
||||
|
|
@ -232,45 +221,36 @@
|
|||
border-bottom: 1px solid #ccc;
|
||||
padding-bottom: 26rpx;
|
||||
box-sizing: border-box;
|
||||
|
||||
text {
|
||||
color: #808080;
|
||||
}
|
||||
}
|
||||
|
||||
.phone {
|
||||
margin-top: 16rpx;
|
||||
font-size: 26rpx;
|
||||
color: #3D3D3D;
|
||||
|
||||
text {
|
||||
color: #808080;
|
||||
}
|
||||
}
|
||||
|
||||
.gzlist {
|
||||
margin-top: 30rpx;
|
||||
border-bottom: 1rpx solid #ccc;
|
||||
padding-bottom: 26rpx;
|
||||
|
||||
.jfgz {
|
||||
font-size: 26rpx;
|
||||
color: #3D3D3D;
|
||||
|
||||
text {
|
||||
color: #808080;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.rishou {
|
||||
margin-top: 26rpx;
|
||||
box-sizing: border-box;
|
||||
|
||||
.rishouwz {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
|
||||
text {
|
||||
font-size: 26rpx;
|
||||
color: #808080;
|
||||
|
|
@ -278,12 +258,10 @@
|
|||
text-align: center;
|
||||
}
|
||||
}
|
||||
|
||||
.rishouje {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
margin-top: 10rpx;
|
||||
|
||||
text {
|
||||
font-weight: 500;
|
||||
font-size: 32rpx;
|
||||
|
|
@ -293,20 +271,17 @@
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
.toptit {
|
||||
border-bottom: 1px solid #ccc;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
padding-bottom: 12rpx;
|
||||
box-sizing: border-box;
|
||||
|
||||
image {
|
||||
width: 48rpx;
|
||||
height: 48rpx;
|
||||
margin-top: 10rpx;
|
||||
}
|
||||
|
||||
.tit {
|
||||
width: 484rpx;
|
||||
height: 68rpx;
|
||||
|
|
@ -319,7 +294,6 @@
|
|||
color: #3D3D3D;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
.bd {
|
||||
margin-top: 28rpx;
|
||||
height: 100%;
|
||||
|
|
@ -330,14 +304,12 @@
|
|||
background: #1DBE7B;
|
||||
border-radius: 6rpx 6rpx 6rpx 6rpx;
|
||||
}
|
||||
|
||||
.yuan {
|
||||
margin-top: 10rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.top {
|
||||
width: 750rpx;
|
||||
height: 150rpx;
|
||||
|
|
@ -348,7 +320,6 @@
|
|||
justify-content: space-between;
|
||||
position: fixed;
|
||||
top: 170rpx;
|
||||
|
||||
.cjshop {
|
||||
width: 200rpx;
|
||||
height: 64rpx;
|
||||
|
|
@ -360,12 +331,10 @@
|
|||
font-size: 32rpx;
|
||||
margin-left: 20rpx;
|
||||
}
|
||||
|
||||
/deep/ .u-content {
|
||||
border: 1px solid #ccc;
|
||||
border-radius: 50rpx 0 0 50rpx !important;
|
||||
}
|
||||
|
||||
/deep/ .u-action {
|
||||
border-radius: 0 50rpx 50rpx 0 !important;
|
||||
width: 112rpx;
|
||||
|
|
|
|||
|
|
@ -40,10 +40,10 @@
|
|||
<image src="https://api.ccttiot.com/smartmeter/img/static/uu7AtppWYWNucDPLkcFu" mode=""
|
||||
@click="btnpag(3)"></image>
|
||||
</view>
|
||||
<view class="icons" style="margin-top: 0;border-radius: 0 0 24rpx 24rpx;padding-top: 0;height: 130rpx;">
|
||||
<view class="icons" style="margin-top: 0;border-radius: 0 0 24rpx 24rpx;padding-top: 0;height: 130rpx;display: block;">
|
||||
<image src="https://api.ccttiot.com/smartmeter/img/static/uoyO7psgUNmNuhPDoOmH" mode=""
|
||||
@click="btnpag(2)"></image>
|
||||
<image src="https://api.ccttiot.com/smartmeter/img/static/u9IYNLl7G83pOXtQbaYj" mode=""
|
||||
<image src="https://api.ccttiot.com/smartmeter/img/static/u9IYNLl7G83pOXtQbaYj" style="margin-left: 150rpx;" mode=""
|
||||
@click="btnpag(4)"></image>
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -260,8 +260,6 @@
|
|||
})
|
||||
}
|
||||
})
|
||||
} else if (res.cancel) {
|
||||
|
||||
}
|
||||
}
|
||||
})
|
||||
|
|
@ -395,7 +393,7 @@
|
|||
}
|
||||
}
|
||||
|
||||
break;
|
||||
break
|
||||
|
||||
case xBlufi.XBLUFI_TYPE.TYPE_GET_DEVICE_LISTS_START:
|
||||
if (!options.result) {
|
||||
|
|
@ -404,16 +402,10 @@
|
|||
title: '蓝牙未开启',
|
||||
icon: 'none',
|
||||
duration: 3000
|
||||
});
|
||||
} else {
|
||||
// this.searching = true
|
||||
//蓝牙搜索开始
|
||||
// _this.setData({
|
||||
// searching: true
|
||||
// });
|
||||
})
|
||||
}
|
||||
|
||||
break;
|
||||
break
|
||||
|
||||
case xBlufi.XBLUFI_TYPE.TYPE_GET_DEVICE_LISTS_STOP:
|
||||
if (options.result) {
|
||||
|
|
@ -435,7 +427,7 @@
|
|||
}
|
||||
})
|
||||
|
||||
});
|
||||
})
|
||||
setTimeout(() => {
|
||||
this.devicesList = list
|
||||
}, 200)
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@
|
|||
</view>
|
||||
<view class="" v-else>
|
||||
<u-radio-group v-model="valuetwo" @change="radioGroupChanges">
|
||||
<u-radio @change="radioChanges" v-for="(item, index) in sfdan" :key="index"
|
||||
<u-radio @change="radioChangesone" v-for="(item, index) in sfdan" :key="index"
|
||||
active-color="#8883f0" :name="item.name" :disabled="item.disabled">
|
||||
{{item.name}}
|
||||
</u-radio>
|
||||
|
|
@ -64,14 +64,6 @@
|
|||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="feems" v-if="yjflag">
|
||||
<view class="feelt">
|
||||
押金
|
||||
</view>
|
||||
<view class="feert">
|
||||
<input type="text" class="yj" v-model="qianvalue" /> <text>元</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="feemss" v-if="gmsjflag">
|
||||
<view class="feelt">
|
||||
<text class="txt">购买时间</text> <input type="text" v-model="duvalue" />
|
||||
|
|
@ -95,6 +87,14 @@
|
|||
<input type="text" class="yj" v-model="duvalue" /> <text>度</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="feems" v-if="yjflag">
|
||||
<view class="feelt">
|
||||
押金
|
||||
</view>
|
||||
<view class="feert">
|
||||
<input type="text" class="yj" v-model="yajinvalue" /> <text>元</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="feems" v-if="jeflag">
|
||||
<view class="feelt">
|
||||
金额
|
||||
|
|
@ -338,7 +338,6 @@
|
|||
</view>
|
||||
</view> -->
|
||||
|
||||
|
||||
</view>
|
||||
</template>
|
||||
|
||||
|
|
@ -352,6 +351,7 @@
|
|||
checkes:false,
|
||||
btnmsk: false,
|
||||
deviceId: '',
|
||||
yajinvalue:'',
|
||||
name: '',
|
||||
value: '',
|
||||
// description: '',
|
||||
|
|
@ -578,6 +578,7 @@
|
|||
name: this.name,
|
||||
value:this.feeType == 3 || this.feeType == 4 ? (this.duvalue = null) : this.duvalue,
|
||||
price: this.qianvalue,
|
||||
deposit:this.yajinvalue,
|
||||
description: this.description,
|
||||
timeUnit: this.feeType == 3 || this.feeType == 4 || this.feeType == 2 ? (this.timeUnit = null) : this.timeUnit,
|
||||
deviceIds: arrs,
|
||||
|
|
@ -635,6 +636,7 @@
|
|||
name: this.name,
|
||||
value: this.duvalue,
|
||||
price: this.qianvalue,
|
||||
deposit:this.yajinvalue,
|
||||
description: this.description,
|
||||
timeUnit: this.timeUnit,
|
||||
deviceIds: arrs,
|
||||
|
|
@ -686,13 +688,14 @@
|
|||
this.dangflag = false
|
||||
} else {
|
||||
this.feeMode = 2
|
||||
this.yjflag = true
|
||||
}
|
||||
},
|
||||
radioGroupChange(e) {
|
||||
// console.log(e);
|
||||
},
|
||||
// 收费类型// 收费类型// 收费类型
|
||||
radioChanges(e) {
|
||||
radioChangesone(e) {
|
||||
if (e == '按量收费') {
|
||||
this.feeType = 2
|
||||
this.duflag = true
|
||||
|
|
@ -709,6 +712,25 @@
|
|||
this.yjflag = false
|
||||
this.djflag = false
|
||||
this.dangflag = false
|
||||
}
|
||||
},
|
||||
radioChanges(e) {
|
||||
if (e == '按量收费') {
|
||||
this.feeType = 2
|
||||
this.duflag = true
|
||||
this.jeflag = true
|
||||
this.gmsjflag = false
|
||||
this.yjflag = true
|
||||
this.djflag = false
|
||||
this.dangflag = false
|
||||
} else if (e == '计时收费') {
|
||||
this.feeType = 1
|
||||
this.gmsjflag = true
|
||||
this.jeflag = true
|
||||
this.duflag = false
|
||||
this.yjflag = true
|
||||
this.djflag = false
|
||||
this.dangflag = false
|
||||
} else if (e == '分时段按量收费') {
|
||||
this.feeType = 3
|
||||
this.gmsjflag = false
|
||||
|
|
@ -820,6 +842,7 @@
|
|||
if (res.code == 200) {
|
||||
this.name = res.data.name
|
||||
this.qianvalue = res.data.price
|
||||
this.yajinvalue = res.dangflag.deposit
|
||||
this.duvalue = res.data.value
|
||||
this.description = res.data.description
|
||||
this.deviceList = res.data.deviceList
|
||||
|
|
@ -860,7 +883,11 @@
|
|||
this.gmsjflag = true
|
||||
this.jeflag = true
|
||||
this.duflag = false
|
||||
this.yjflag = false
|
||||
if(this.feeMode = 1){
|
||||
this.yjflag = false
|
||||
}else{
|
||||
this.yjflag = true
|
||||
}
|
||||
this.djflag = false
|
||||
this.dangflag = false
|
||||
} else if (res.data.feeType == 2) {
|
||||
|
|
@ -869,7 +896,11 @@
|
|||
this.duflag = true
|
||||
this.jeflag = true
|
||||
this.gmsjflag = false
|
||||
this.yjflag = false
|
||||
if(this.feeMode = 1){
|
||||
this.yjflag = false
|
||||
}else{
|
||||
this.yjflag = true
|
||||
}
|
||||
this.djflag = false
|
||||
this.dangflag = false
|
||||
} else if (res.data.feeType == 3) {
|
||||
|
|
|
|||
|
|
@ -71,12 +71,12 @@
|
|||
<view class="txt">订单管理</view>
|
||||
</view>
|
||||
<view class="botcard" @click="topage(10)">
|
||||
<image src="https://api.ccttiot.com/smartmeter/img/static/uKewAY8xvJN04yFpGEjl" mode=""></image>
|
||||
<image src="https://api.ccttiot.com/smartmeter/img/static/ui06lcaul58Y3ianRZAZ" mode=""></image>
|
||||
<view class="txt">订单统计</view>
|
||||
</view>
|
||||
<view class="botcard" @click="topage(4)">
|
||||
<image src="https://api.ccttiot.com/smartmeter/img/static/uKewAY8xvJN04yFpGEjl" mode=""></image>
|
||||
<view class="txt">设备故障</view>
|
||||
<view class="txt">安全中心</view>
|
||||
</view>
|
||||
<!-- <view class="botcard" @click="topage(9)">
|
||||
<image src="https://api.ccttiot.com/smartmeter/img/static/uYOquvGtfb1sm5F60NgJ" mode=""></image>
|
||||
|
|
|
|||
|
|
@ -168,6 +168,7 @@
|
|||
this.gettime()
|
||||
},
|
||||
methods: {
|
||||
|
||||
// 点击获取时间
|
||||
confirm(e) {
|
||||
this.recharge = 0
|
||||
|
|
@ -211,7 +212,6 @@
|
|||
})
|
||||
},
|
||||
|
||||
|
||||
gettimes() {
|
||||
let data = {
|
||||
deviceId: this.deviceId,
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@
|
|||
<u-picker mode="time" v-model="show" :params="params" @confirm="confirm"></u-picker>
|
||||
|
||||
<view class="tab">
|
||||
<view class="">店铺</view>
|
||||
<!-- <view class="">店铺</view> -->
|
||||
<view class="">设备</view>
|
||||
<view class="">订单数</view>
|
||||
<view class="">时长</view>
|
||||
|
|
@ -45,8 +45,11 @@
|
|||
:key="row.storeId"
|
||||
class="table-row"
|
||||
@click="toggleRow(index,row.storeId)">
|
||||
<view class="" style="margin-bottom: 20rpx;">
|
||||
<text style="font-size: 32rpx;font-weight: 600;">{{ row.storeId == -1 ? '未分配店铺设备' : '店铺：' + row.storeName }}</text>
|
||||
</view>
|
||||
<view class="row-header">
|
||||
<text>{{ row.storeName }}</text>
|
||||
|
||||
<text class="">{{row.deviceCount}}台</text>
|
||||
<text class="">{{row.orderCount}}单</text>
|
||||
<text class="">{{row.formattedDuration}}</text>
|
||||
|
|
@ -54,12 +57,12 @@
|
|||
<text class="">{{row.arrivalAmount}}元</text>
|
||||
</view>
|
||||
<view v-if="!row.folded" class="row-details" v-for="(val,index) in vallist" :key="index">
|
||||
<view></view>
|
||||
<view>{{ val.deviceName }}</view>
|
||||
<view>{{ val.orderCount }}单</view>
|
||||
<view>{{ val.formattedDuration}}</view>
|
||||
<view>{{ val.ele}}度</view>
|
||||
<view>{{ val.arrivalAmount }}元</view>
|
||||
<!-- <view></view> -->
|
||||
<view>{{val.deviceName}}</view>
|
||||
<view>{{val.orderCount}}单</view>
|
||||
<view>{{val.formattedDuration}}</view>
|
||||
<view>{{val.ele}}度</view>
|
||||
<view>{{val.arrivalAmount}}元</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -250,6 +253,7 @@
|
|||
this.num = 2
|
||||
}
|
||||
},
|
||||
|
||||
// 清除时间
|
||||
btnqc() {
|
||||
this.endtime = ''
|
||||
|
|
@ -259,10 +263,8 @@
|
|||
confirm(e) {
|
||||
if (this.num == 1) {
|
||||
this.endtime = e.year + '-' + e.month + '-' + e.day
|
||||
|
||||
} else {
|
||||
this.lasttime = e.year + '-' + e.month + '-' + e.day
|
||||
|
||||
}
|
||||
},
|
||||
},
|
||||
|
|
@ -403,6 +405,7 @@
|
|||
width: 16%;
|
||||
text-align: center;
|
||||
overflow: scroll;
|
||||
font-size: 32rpx;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user