xinyi/kaiguan-zfb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

订单统计优化 新增安全中心待完善

Browse Source
This commit is contained in:
3321822538@qq.com 2024-10-10 15:07:53 +08:00
parent 2995302cfc
commit d37054abac
10 changed files with 115 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/http.interceptor.js
View File

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

91
page_components/eletj.vue
View File

@ -307,6 +307,7 @@
} }
}, },
computed: { computed: {
// 计算剩余时间
formattedTime() { formattedTime() {
if (this.timeday.days > 0) { if (this.timeday.days > 0) {
// 只展示天和小时 // 只展示天和小时
@ -376,6 +377,7 @@
this.stopTimer(); this.stopTimer();
}, },
methods: { methods: {
// 点击拨打客服电话
btncall(){ btncall(){
let phoneNumber = '' let phoneNumber = ''
phoneNumber = this.sbobj.userMobile phoneNumber = this.sbobj.userMobile
@ -534,7 +536,7 @@
// 点击进行强刷数据
shuaxin(){ shuaxin(){
this.$u.get(`/app/device/${this.sbid}/refreshIot`).then((res) => { this.$u.get(`/app/device/${this.sbid}/refreshIot`).then((res) => {
if(res.code == 200){ if(res.code == 200){
@ -555,7 +557,7 @@
}) })
}, },
// 获取channelId
getzfqd(){ getzfqd(){
this.$u.get(`/app/channel/recharge/enabledList`).then(res =>{ this.$u.get(`/app/channel/recharge/enabledList`).then(res =>{
if(res.code == 200){ if(res.code == 200){
@ -563,6 +565,7 @@
} }
}) })
}, },
// 点击默认返回首页
btns() { btns() {
// if(this.opflag){ // if(this.opflag){
// uni.navigateBack() // uni.navigateBack()
@ -572,6 +575,7 @@
}) })
// } // }
}, },
// 点击立即支付订单
btnljzf() { btnljzf() {
this.getzfqd() this.getzfqd()
let data = { let data = {
@ -623,6 +627,7 @@
} }
}) })
}, },
// 点击结束订单
btnjieshu() { btnjieshu() {
this.getzfqd() this.getzfqd()
if (this.detaobj.suitFeeMode == 1) { if (this.detaobj.suitFeeMode == 1) {
@ -754,6 +759,7 @@
this.trueboxfalg = true this.trueboxfalg = true
} }
}, },
// 分时段支付订单
btnbox() { btnbox() {
this.trueboxfalg = false this.trueboxfalg = false
this.jieshuflag = true this.jieshuflag = true
@ -802,8 +808,7 @@
signType: res.data.payParams.signType, signType: res.data.payParams.signType,
paySign: res.data.payParams.paySign, paySign: res.data.payParams.paySign,
success: (res) => { success: (res) => {
that.$u.put(`/app/bill/${that.orderno}/refreshPayResult`) that.$u.put(`/app/bill/${that.orderno}/refreshPayResult`).then(res => {})
.then(res => {})
// 支付成功逻辑 // 支付成功逻辑
uni.showToast({ uni.showToast({
title: res.msg, title: res.msg,
@ -833,7 +838,7 @@
title: res.msg, title: res.msg,
icon: 'none', icon: 'none',
duration: 2000 duration: 2000
}) })
} }
}) })
} else { } else {
@ -857,9 +862,7 @@
signType: res.data.payParams.signType, signType: res.data.payParams.signType,
paySign: res.data.payParams.paySign, paySign: res.data.payParams.paySign,
success: (res) => { success: (res) => {
that.$u.put( that.$u.put(`/app/bill/${that.orderno}/refreshPayResult`).then(res => {})
`/app/bill/${that.orderno}/refreshPayResult`
).then(res => {})
// 支付成功逻辑 // 支付成功逻辑
uni.showToast({ uni.showToast({
title: res.msg, title: res.msg,
@ -880,7 +883,7 @@
title: '支付失败', title: '支付失败',
icon: 'none', icon: 'none',
duration: 2000 duration: 2000
}); })
} }
}) })
} }
@ -1007,28 +1010,11 @@
provider: 'wxpay', provider: 'wxpay',
timeStamp: res.data.payParams.timeStamp, timeStamp: res.data.payParams.timeStamp,
nonceStr: res.data.payParams.nonceStr, nonceStr: res.data.payParams.nonceStr,
package: res package: res.data.payParams.packageVal,
.data signType: res.data.payParams.signType,
.payParams paySign: res.data.payParams.paySign,
.packageVal, success: (res) => {
signType: res that.$u.put(`/app/bill/${that.orderno}/refreshPayResult`).then(res => {})
.data
.payParams
.signType,
paySign: res
.data
.payParams
.paySign,
success: (
res
) => {
that.$u
.put(
`/app/bill/${that.orderno}/refreshPayResult`
)
.then(
res => {}
)
// 支付成功逻辑 // 支付成功逻辑
uni.showToast({ uni.showToast({
title: res title: res
@ -1036,28 +1022,21 @@
icon: 'success', icon: 'success',
duration: 1000 duration: 1000
}) })
setTimeout setTimeout(() => {
(() => { that.jieshuflag = false
that.jieshuflag =
false
uni.reLaunch({ uni.reLaunch({
url: '/pages/shouye/index' url: '/pages/shouye/index'
}) })
}, },1500)
1500
)
}, },
fail( fail(err) {
err that.jieshuflag = false
) {
that.jieshuflag =
false
// 支付失败逻辑 // 支付失败逻辑
uni.showToast({ uni.showToast({
title: '支付失败', title: '支付失败',
icon: 'none', icon: 'none',
duration: 2000 duration: 2000
}); })
} }
}) })
} }
@ -1341,7 +1320,7 @@
{ {
xBlufi.notifyInitBleEsp32({ xBlufi.notifyInitBleEsp32({
deviceId: this.deviceId deviceId: this.deviceId
}); })
xBlufi.listenDeviceMsgEvent(true, this.funListenDeviceMsgEvents); xBlufi.listenDeviceMsgEvent(true, this.funListenDeviceMsgEvents);
this.deviceIds = options.data.deviceId this.deviceIds = options.data.deviceId
this.name = this.name this.name = this.name
@ -1353,7 +1332,7 @@
break; break;
case xBlufi.XBLUFI_TYPE.TYPE_RECIEVE_CUSTON_DATA: case xBlufi.XBLUFI_TYPE.TYPE_RECIEVE_CUSTON_DATA:
this.ver_data = this.parseCustomData(options.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 this.temperature = this.ver_data.temperature / 1000
setTimeout(() => { setTimeout(() => {
// this.czflag = false // this.czflag = false
@ -1361,7 +1340,7 @@
this.jieshufalg = false this.jieshufalg = false
uni.hideLoading() uni.hideLoading()
}, 1000) }, 1000)
break; break
case xBlufi.XBLUFI_TYPE.TYPE_GET_DEVICE_LISTS_STOP: case xBlufi.XBLUFI_TYPE.TYPE_GET_DEVICE_LISTS_STOP:
if (options.result) { if (options.result) {
let uniqueDevicesList = Array.from(new Set(this.devicesList)); let uniqueDevicesList = Array.from(new Set(this.devicesList));
@ -1370,7 +1349,7 @@
// 将过滤后的数组重新赋值给 this.devicesList // 将过滤后的数组重新赋值给 this.devicesList
this.devicesList = filteredDevices; this.devicesList = filteredDevices;
} }
break; break
case xBlufi.XBLUFI_TYPE.TYPE_GET_DEVICE_LISTS_START: case xBlufi.XBLUFI_TYPE.TYPE_GET_DEVICE_LISTS_START:
if (!options.result) { if (!options.result) {
this.lanyaflag = true this.lanyaflag = true
@ -1378,20 +1357,20 @@
title: '蓝牙未开启', title: '蓝牙未开启',
icon: 'none', icon: 'none',
duration: 3000 duration: 3000
}); })
return return
} else { } else {
this.lanyaflag = false this.lanyaflag = false
} }
break; break
} }
}, },
parseCustomData(data) { parseCustomData(data) {
// 将字符串按照 "@" 分割成数组 // 将字符串按照 "@" 分割成数组
const dataArray = data.split('@'); const dataArray = data.split('@')
// 初始化一个空对象来存储解析后的数据 // 初始化一个空对象来存储解析后的数据
const parsedData = {}; const parsedData = {}
// 前缀到属性名的映射 // 前缀到属性名的映射
const prefixMap = { const prefixMap = {
'V': 'voltage', 'V': 'voltage',
@ -1409,17 +1388,17 @@
if (field.startsWith(prefix)) { if (field.startsWith(prefix)) {
// 去除前缀并将剩余部分转换为适当的类型（这里默认为浮点数或字符串） // 去除前缀并将剩余部分转换为适当的类型（这里默认为浮点数或字符串）
const value = field.substring(1); 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) { // parseCustomData(data) {

3
page_components/fuwu/index.vue
View File

@ -282,6 +282,7 @@
} }
}) })
}, },
getone(){ getone(){
let that = this let that = this
let data = { let data = {
@ -465,6 +466,7 @@
deviceNo: that.id, deviceNo: that.id,
suitId: that.zfobj.suitId, suitId: that.zfobj.suitId,
money: that.zfobj.price, money: that.zfobj.price,
suitDeposit:that.zfobj.deposit,
suitTime: that.zfobj.value, suitTime: that.zfobj.value,
suitTimeUnit:that.suitTimeUnit, suitTimeUnit:that.suitTimeUnit,
suitFeeMode:that.suitFeeMode, suitFeeMode:that.suitFeeMode,
@ -648,6 +650,7 @@
deviceNo: that.id, deviceNo: that.id,
suitId: that.zfobj.suitId, suitId: that.zfobj.suitId,
money: that.zfobj.price, money: that.zfobj.price,
suitDeposit:that.zfobj.deposit,
suitTime: that.zfobj.value, suitTime: that.zfobj.value,
suitTimeUnit:that.suitTimeUnit, suitTimeUnit:that.suitTimeUnit,
suitFeeMode:that.suitFeeMode, suitFeeMode:that.suitFeeMode,

10
page_fenbao/sbshouye.vue
View File

@ -8,7 +8,7 @@
<view> <view>
<view class="swiper-item "> <view class="swiper-item ">
<view class="card_box" v-for="(item,index) in wateringList" :key="index"> <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">
<view class="card_left_tit"> <view class="card_left_tit">
{{item.deviceName}} {{item.deviceName}}
@ -131,10 +131,12 @@
} }
}, },
btnxq(id) { btnxq(id) {
// uni.navigateTo({ uni.navigateTo({
// url: '/page_user/sbdetail?id=' + id url: '/page_components/fuwu/index?id=' + id
// }) })
}, },
} }
} }
</script> </script>

31
page_fenbao/statulist/myshop/index.vue
View File

@ -185,28 +185,19 @@
/deep/ .u-title { /deep/ .u-title {
padding-bottom: 22rpx; padding-bottom: 22rpx;
} }
/deep/ .uicon-nav-back { /deep/ .uicon-nav-back {
padding-bottom: 22rpx; padding-bottom: 22rpx;
} }
page {
// background: linear-gradient(180deg, #F4F5F7 0%, rgba(255, 255, 255, 0) 100%);
}
.page { .page {
width: 750rpx; width: 750rpx;
height: 100vh; height: 100vh;
.box { .box {
width: 750rpx; width: 750rpx;
border-radius: 0rpx 0rpx 0rpx 0rpx; border-radius: 0rpx 0rpx 0rpx 0rpx;
padding-top: 150rpx; padding-top: 150rpx;
.list { .list {
padding-bottom: 400rpx; padding-bottom: 400rpx;
margin-top: 26rpx; margin-top: 26rpx;
.listitem { .listitem {
margin-bottom: 28rpx !important; margin-bottom: 28rpx !important;
padding: 12rpx 38rpx; padding: 12rpx 38rpx;
@ -216,7 +207,6 @@
background: #FFFFFF; background: #FFFFFF;
border-radius: 38rpx 38rpx 38rpx 38rpx; border-radius: 38rpx 38rpx 38rpx 38rpx;
margin: auto; margin: auto;
.yunxing { .yunxing {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
@ -224,7 +214,6 @@
color: #808080; color: #808080;
margin-top: 26rpx; margin-top: 26rpx;
} }
.phones { .phones {
margin-top: 16rpx; margin-top: 16rpx;
font-size: 26rpx; font-size: 26rpx;
@ -232,45 +221,36 @@
border-bottom: 1px solid #ccc; border-bottom: 1px solid #ccc;
padding-bottom: 26rpx; padding-bottom: 26rpx;
box-sizing: border-box; box-sizing: border-box;
text { text {
color: #808080; color: #808080;
} }
} }
.phone { .phone {
margin-top: 16rpx; margin-top: 16rpx;
font-size: 26rpx; font-size: 26rpx;
color: #3D3D3D; color: #3D3D3D;
text { text {
color: #808080; color: #808080;
} }
} }
.gzlist { .gzlist {
margin-top: 30rpx; margin-top: 30rpx;
border-bottom: 1rpx solid #ccc; border-bottom: 1rpx solid #ccc;
padding-bottom: 26rpx; padding-bottom: 26rpx;
.jfgz { .jfgz {
font-size: 26rpx; font-size: 26rpx;
color: #3D3D3D; color: #3D3D3D;
text { text {
color: #808080; color: #808080;
} }
} }
} }
.rishou { .rishou {
margin-top: 26rpx; margin-top: 26rpx;
box-sizing: border-box; box-sizing: border-box;
.rishouwz { .rishouwz {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
text { text {
font-size: 26rpx; font-size: 26rpx;
color: #808080; color: #808080;
@ -278,12 +258,10 @@
text-align: center; text-align: center;
} }
} }
.rishouje { .rishouje {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
margin-top: 10rpx; margin-top: 10rpx;
text { text {
font-weight: 500; font-weight: 500;
font-size: 32rpx; font-size: 32rpx;
@ -293,20 +271,17 @@
} }
} }
} }
.toptit { .toptit {
border-bottom: 1px solid #ccc; border-bottom: 1px solid #ccc;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
padding-bottom: 12rpx; padding-bottom: 12rpx;
box-sizing: border-box; box-sizing: border-box;
image { image {
width: 48rpx; width: 48rpx;
height: 48rpx; height: 48rpx;
margin-top: 10rpx; margin-top: 10rpx;
} }
.tit { .tit {
width: 484rpx; width: 484rpx;
height: 68rpx; height: 68rpx;
@ -319,7 +294,6 @@
color: #3D3D3D; color: #3D3D3D;
box-sizing: border-box; box-sizing: border-box;
} }
.bd { .bd {
margin-top: 28rpx; margin-top: 28rpx;
height: 100%; height: 100%;
@ -330,14 +304,12 @@
background: #1DBE7B; background: #1DBE7B;
border-radius: 6rpx 6rpx 6rpx 6rpx; border-radius: 6rpx 6rpx 6rpx 6rpx;
} }
.yuan { .yuan {
margin-top: 10rpx; margin-top: 10rpx;
} }
} }
} }
} }
.top { .top {
width: 750rpx; width: 750rpx;
height: 150rpx; height: 150rpx;
@ -348,7 +320,6 @@
justify-content: space-between; justify-content: space-between;
position: fixed; position: fixed;
top: 170rpx; top: 170rpx;
.cjshop { .cjshop {
width: 200rpx; width: 200rpx;
height: 64rpx; height: 64rpx;
@ -360,12 +331,10 @@
font-size: 32rpx; font-size: 32rpx;
margin-left: 20rpx; margin-left: 20rpx;
} }
/deep/ .u-content { /deep/ .u-content {
border: 1px solid #ccc; border: 1px solid #ccc;
border-radius: 50rpx 0 0 50rpx !important; border-radius: 50rpx 0 0 50rpx !important;
} }
/deep/ .u-action { /deep/ .u-action {
border-radius: 0 50rpx 50rpx 0 !important; border-radius: 0 50rpx 50rpx 0 !important;
width: 112rpx; width: 112rpx;

24
page_fenbao/statulist/myshop/shopdetail/index.vue
View File

@ -40,10 +40,10 @@
<image src="https://api.ccttiot.com/smartmeter/img/static/uu7AtppWYWNucDPLkcFu" mode="" <image src="https://api.ccttiot.com/smartmeter/img/static/uu7AtppWYWNucDPLkcFu" mode=""
@click="btnpag(3)"></image> @click="btnpag(3)"></image>
</view> </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="" <image src="https://api.ccttiot.com/smartmeter/img/static/uoyO7psgUNmNuhPDoOmH" mode=""
@click="btnpag(2)"></image> @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> @click="btnpag(4)"></image>
</view> </view>
</view> </view>
@ -135,7 +135,7 @@
path: '/pages/shouye/index' path: '/pages/shouye/index'
} }
}, },
methods: { methods: {
btnsh(){ btnsh(){
uni.navigateTo({ uni.navigateTo({
url:'/page_fenbao/editshenhe?storeId=' + this.storeId url:'/page_fenbao/editshenhe?storeId=' + this.storeId
@ -260,8 +260,6 @@
}) })
} }
}) })
} else if (res.cancel) {
} }
} }
}) })
@ -395,7 +393,7 @@
} }
} }
break; break
case xBlufi.XBLUFI_TYPE.TYPE_GET_DEVICE_LISTS_START: case xBlufi.XBLUFI_TYPE.TYPE_GET_DEVICE_LISTS_START:
if (!options.result) { if (!options.result) {
@ -404,16 +402,10 @@
title: '蓝牙未开启', title: '蓝牙未开启',
icon: 'none', icon: 'none',
duration: 3000 duration: 3000
}); })
} else { }
// this.searching = true
//蓝牙搜索开始
// _this.setData({
// searching: true
// });
}
break; break
case xBlufi.XBLUFI_TYPE.TYPE_GET_DEVICE_LISTS_STOP: case xBlufi.XBLUFI_TYPE.TYPE_GET_DEVICE_LISTS_STOP:
if (options.result) { if (options.result) {
@ -435,7 +427,7 @@
} }
}) })
}); })
setTimeout(() => { setTimeout(() => {
this.devicesList = list this.devicesList = list
}, 200) }, 200)

59
page_fenbao/statulist/taocanlist/addtaocan/index.vue
View File

@ -56,7 +56,7 @@
</view> </view>
<view class="" v-else> <view class="" v-else>
<u-radio-group v-model="valuetwo" @change="radioGroupChanges"> <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"> active-color="#8883f0" :name="item.name" :disabled="item.disabled">
{{item.name}} {{item.name}}
</u-radio> </u-radio>
@ -64,14 +64,6 @@
</view> </view>
</view> </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="feemss" v-if="gmsjflag">
<view class="feelt"> <view class="feelt">
<text class="txt">购买时间</text> <input type="text" v-model="duvalue" /> <text class="txt">购买时间</text> <input type="text" v-model="duvalue" />
@ -95,6 +87,14 @@
<input type="text" class="yj" v-model="duvalue" /> <text>度</text> <input type="text" class="yj" v-model="duvalue" /> <text>度</text>
</view> </view>
</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="feems" v-if="jeflag">
<view class="feelt"> <view class="feelt">
金额 金额
@ -336,8 +336,7 @@
<view @click="btnzx" class="btnzd" style="width: 650rpx;height: 90rpx;text-align: center;line-height: 90rpx;background-color: #8883F0;color: #fff;font-size: 36rpx;border-radius: 50rpx;margin: auto;"> <view @click="btnzx" class="btnzd" style="width: 650rpx;height: 90rpx;text-align: center;line-height: 90rpx;background-color: #8883F0;color: #fff;font-size: 36rpx;border-radius: 50rpx;margin: auto;">
我已知晓 我已知晓
</view> </view>
</view> --> </view> -->
</view> </view>
</template> </template>
@ -352,6 +351,7 @@
checkes:false, checkes:false,
btnmsk: false, btnmsk: false,
deviceId: '', deviceId: '',
yajinvalue:'',
name: '', name: '',
value: '', value: '',
// description: '', // description: '',
@ -578,6 +578,7 @@
name: this.name, name: this.name,
value:this.feeType == 3 || this.feeType == 4 ? (this.duvalue = null) : this.duvalue, value:this.feeType == 3 || this.feeType == 4 ? (this.duvalue = null) : this.duvalue,
price: this.qianvalue, price: this.qianvalue,
deposit:this.yajinvalue,
description: this.description, description: this.description,
timeUnit: this.feeType == 3 || this.feeType == 4 || this.feeType == 2 ? (this.timeUnit = null) : this.timeUnit, timeUnit: this.feeType == 3 || this.feeType == 4 || this.feeType == 2 ? (this.timeUnit = null) : this.timeUnit,
deviceIds: arrs, deviceIds: arrs,
@ -635,6 +636,7 @@
name: this.name, name: this.name,
value: this.duvalue, value: this.duvalue,
price: this.qianvalue, price: this.qianvalue,
deposit:this.yajinvalue,
description: this.description, description: this.description,
timeUnit: this.timeUnit, timeUnit: this.timeUnit,
deviceIds: arrs, deviceIds: arrs,
@ -686,13 +688,14 @@
this.dangflag = false this.dangflag = false
} else { } else {
this.feeMode = 2 this.feeMode = 2
this.yjflag = true
} }
}, },
radioGroupChange(e) { radioGroupChange(e) {
// console.log(e); // console.log(e);
}, },
// 收费类型// 收费类型// 收费类型 // 收费类型// 收费类型// 收费类型
radioChanges(e) { radioChangesone(e) {
if (e == '按量收费') { if (e == '按量收费') {
this.feeType = 2 this.feeType = 2
this.duflag = true this.duflag = true
@ -709,6 +712,25 @@
this.yjflag = false this.yjflag = false
this.djflag = false this.djflag = false
this.dangflag = 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 == '分时段按量收费') { } else if (e == '分时段按量收费') {
this.feeType = 3 this.feeType = 3
this.gmsjflag = false this.gmsjflag = false
@ -820,6 +842,7 @@
if (res.code == 200) { if (res.code == 200) {
this.name = res.data.name this.name = res.data.name
this.qianvalue = res.data.price this.qianvalue = res.data.price
this.yajinvalue = res.dangflag.deposit
this.duvalue = res.data.value this.duvalue = res.data.value
this.description = res.data.description this.description = res.data.description
this.deviceList = res.data.deviceList this.deviceList = res.data.deviceList
@ -860,7 +883,11 @@
this.gmsjflag = true this.gmsjflag = true
this.jeflag = true this.jeflag = true
this.duflag = false this.duflag = false
this.yjflag = false if(this.feeMode = 1){
this.yjflag = false
}else{
this.yjflag = true
}
this.djflag = false this.djflag = false
this.dangflag = false this.dangflag = false
} else if (res.data.feeType == 2) { } else if (res.data.feeType == 2) {
@ -869,7 +896,11 @@
this.duflag = true this.duflag = true
this.jeflag = true this.jeflag = true
this.gmsjflag = false this.gmsjflag = false
this.yjflag = false if(this.feeMode = 1){
this.yjflag = false
}else{
this.yjflag = true
}
this.djflag = false this.djflag = false
this.dangflag = false this.dangflag = false
} else if (res.data.feeType == 3) { } else if (res.data.feeType == 3) {

4
pages/my.vue
View File

@ -71,12 +71,12 @@
<view class="txt">订单管理</view> <view class="txt">订单管理</view>
</view> </view>
<view class="botcard" @click="topage(10)"> <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 class="txt">订单统计</view>
</view> </view>
<view class="botcard" @click="topage(4)"> <view class="botcard" @click="topage(4)">
<image src="https://api.ccttiot.com/smartmeter/img/static/uKewAY8xvJN04yFpGEjl" mode=""></image> <image src="https://api.ccttiot.com/smartmeter/img/static/uKewAY8xvJN04yFpGEjl" mode=""></image>
<view class="txt">设备故障</view> <view class="txt">安全中心</view>
</view> </view>
<!-- <view class="botcard" @click="topage(9)"> <!-- <view class="botcard" @click="topage(9)">
<image src="https://api.ccttiot.com/smartmeter/img/static/uYOquvGtfb1sm5F60NgJ" mode=""></image> <image src="https://api.ccttiot.com/smartmeter/img/static/uYOquvGtfb1sm5F60NgJ" mode=""></image>

2
pages/tj.vue
View File

@ -168,6 +168,7 @@
this.gettime() this.gettime()
}, },
methods: { methods: {
// 点击获取时间 // 点击获取时间
confirm(e) { confirm(e) {
this.recharge = 0 this.recharge = 0
@ -210,7 +211,6 @@
} }
}) })
}, },
gettimes() { gettimes() {
let data = { let data = {

23
pages/tongji.vue
View File

@ -31,7 +31,7 @@
<u-picker mode="time" v-model="show" :params="params" @confirm="confirm"></u-picker> <u-picker mode="time" v-model="show" :params="params" @confirm="confirm"></u-picker>
<view class="tab"> <view class="tab">
<view class="">店铺</view> <!-- <view class="">店铺</view> -->
<view class="">设备</view> <view class="">设备</view>
<view class="">订单数</view> <view class="">订单数</view>
<view class="">时长</view> <view class="">时长</view>
@ -45,8 +45,11 @@
:key="row.storeId" :key="row.storeId"
class="table-row" class="table-row"
@click="toggleRow(index,row.storeId)"> @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"> <view class="row-header">
<text>{{ row.storeName }}</text>
<text class="">{{row.deviceCount}}台</text> <text class="">{{row.deviceCount}}台</text>
<text class="">{{row.orderCount}}单</text> <text class="">{{row.orderCount}}单</text>
<text class="">{{row.formattedDuration}}</text> <text class="">{{row.formattedDuration}}</text>
@ -54,12 +57,12 @@
<text class="">{{row.arrivalAmount}}元</text> <text class="">{{row.arrivalAmount}}元</text>
</view> </view>
<view v-if="!row.folded" class="row-details" v-for="(val,index) in vallist" :key="index"> <view v-if="!row.folded" class="row-details" v-for="(val,index) in vallist" :key="index">
<view></view> <!-- <view></view> -->
<view>{{ val.deviceName }}</view> <view>{{val.deviceName}}</view>
<view>{{ val.orderCount }}单</view> <view>{{val.orderCount}}单</view>
<view>{{ val.formattedDuration}}</view> <view>{{val.formattedDuration}}</view>
<view>{{ val.ele}}度</view> <view>{{val.ele}}度</view>
<view>{{ val.arrivalAmount }}元</view> <view>{{val.arrivalAmount}}元</view>
</view> </view>
</view> </view>
</view> </view>
@ -250,6 +253,7 @@
this.num = 2 this.num = 2
} }
}, },
// 清除时间 // 清除时间
btnqc() { btnqc() {
this.endtime = '' this.endtime = ''
@ -259,10 +263,8 @@
confirm(e) { confirm(e) {
if (this.num == 1) { if (this.num == 1) {
this.endtime = e.year + '-' + e.month + '-' + e.day this.endtime = e.year + '-' + e.month + '-' + e.day
} else { } else {
this.lasttime = e.year + '-' + e.month + '-' + e.day this.lasttime = e.year + '-' + e.month + '-' + e.day
} }
}, },
}, },
@ -403,6 +405,7 @@
width: 16%; width: 16%;
text-align: center; text-align: center;
overflow: scroll; overflow: scroll;
font-size: 32rpx;
} }
} }