xinyi/chuangte_bike_newxcx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v2.36.6 优化统计数值

Browse Source
This commit is contained in:
磷叶 2026-05-21 17:56:56 +08:00
parent 4176b7fb32
commit f87d09ee68
7 changed files with 674 additions and 960 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/http.interceptor.js
View File

@ -1,9 +1,9 @@
const install = (Vue, vm) => { const install = (Vue, vm) => {
uni.setStorageSync('deptId', 100); uni.setStorageSync('deptId', 100);
Vue.prototype.$u.http.setConfig({ Vue.prototype.$u.http.setConfig({
// baseUrl: 'http://192.168.1.14:4101', //键辉本地 baseUrl: 'http://192.168.1.6:4101', //键辉本地
// baseUrl: 'http://192.168.2.221:4101', //景森本地 // baseUrl: 'http://192.168.2.221:4101', //景森本地
baseUrl: 'https://ele.ccttiot.com/prod-api', //线上 小鹿appid： wx8a05cf95418a6859 小兔骑骑appid：wx38f96c87621a87ab 遇福兴https://fu.chuantewulian.cn wxcb1d6a5d9dca8bbe // baseUrl: 'https://ele.ccttiot.com/prod-api', //线上 小鹿appid： wx8a05cf95418a6859 小兔骑骑appid：wx38f96c87621a87ab 遇福兴https://fu.chuantewulian.cn wxcb1d6a5d9dca8bbe
// baseUrl: 'https://cc.ccttiot.com/prod-api', //叉车线上 // baseUrl: 'https://cc.ccttiot.com/prod-api', //叉车线上
// baseUrl:'https://ysd.chuantewulian.cn/prod-api', //嵛山岛线上api 嵛山岛appid：wx4d178f8c80348214 // baseUrl:'https://ysd.chuantewulian.cn/prod-api', //嵛山岛线上api 嵛山岛appid：wx4d178f8c80348214
loadingText: '努力加载中~', loadingText: '努力加载中~',

24
page_shanghu/admin_index.vue
View File

@ -46,7 +46,7 @@
仓库中 仓库中
</view> </view>
<view class="text" :class="statusidx=='-0'?'act1':''"> <view class="text" :class="statusidx=='-0'?'act1':''">
{{qbobj.device.statusCount[0] == null ? '0' : qbobj.device.statusCount[0]}} {{(qbobj.deviceStatusMap && qbobj.deviceStatusMap[0]) || '0'}}
</view> </view>
</view> </view>
<view hover-class="app-tap-hover" class="cont" @click="changeidx('1')"> <view hover-class="app-tap-hover" class="cont" @click="changeidx('1')">
@ -54,7 +54,7 @@
待租 待租
</view> </view>
<view class="text" :class="statusidx==1?'act1':''"> <view class="text" :class="statusidx==1?'act1':''">
{{qbobj.device.statusCount[1] == null ? '0' : qbobj.device.statusCount[1]}} {{(qbobj.deviceStatusMap && qbobj.deviceStatusMap[1]) || '0'}}
</view> </view>
</view> </view>
<view hover-class="app-tap-hover" class="cont" @click="changeidx('3')"> <view hover-class="app-tap-hover" class="cont" @click="changeidx('3')">
@ -62,7 +62,7 @@
骑行中 骑行中
</view> </view>
<view class="text" :class="statusidx==3?'act1':''"> <view class="text" :class="statusidx==3?'act1':''">
{{qbobj.device.statusCount[3] == null ? '0' : qbobj.device.statusCount[3]}} {{(qbobj.deviceStatusMap && qbobj.deviceStatusMap[3]) || '0'}}
</view> </view>
</view> </view>
<view hover-class="app-tap-hover" class="cont" @click="changeidx('4')"> <view hover-class="app-tap-hover" class="cont" @click="changeidx('4')">
@ -70,7 +70,7 @@
临时锁车 临时锁车
</view> </view>
<view class="text" :class="statusidx==4?'act1':''"> <view class="text" :class="statusidx==4?'act1':''">
{{qbobj.device.statusCount[4] == null ? '0' : qbobj.device.statusCount[4]}} {{(qbobj.deviceStatusMap && qbobj.deviceStatusMap[4]) || '0'}}
</view> </view>
</view> </view>
<view hover-class="app-tap-hover" class="cont" @click="changeidx('8')"> <view hover-class="app-tap-hover" class="cont" @click="changeidx('8')">
@ -78,7 +78,7 @@
禁用中 禁用中
</view> </view>
<view class="text" :class="statusidx==8?'act1':''"> <view class="text" :class="statusidx==8?'act1':''">
{{qbobj.device.statusCount[8] == null ? '0' : qbobj.device.statusCount[8]}} {{(qbobj.deviceStatusMap && qbobj.deviceStatusMap[8]) || '0'}}
</view> </view>
</view> </view>
<view hover-class="app-tap-hover" class="cont" @click="changeidx('6')"> <view hover-class="app-tap-hover" class="cont" @click="changeidx('6')">
@ -86,7 +86,7 @@
调度中 调度中
</view> </view>
<view class="text" :class="statusidx==6?'act1':''"> <view class="text" :class="statusidx==6?'act1':''">
{{qbobj.device.statusCount[6] == null ? '0' : qbobj.device.statusCount[6]}} {{(qbobj.deviceStatusMap && qbobj.deviceStatusMap[6]) || '0'}}
</view> </view>
</view> </view>
@ -95,7 +95,7 @@
离线 离线
</view> </view>
<view class="text" :class="statusidx==20?'act1':''"> <view class="text" :class="statusidx==20?'act1':''">
{{qbobj.device.onlineStatusCount[0] == null ? '0' : qbobj.device.onlineStatusCount[0]}} {{(qbobj.deviceOnlineStatusMap && qbobj.deviceOnlineStatusMap[0]) || '0'}}
</view> </view>
</view> </view>
<view hover-class="app-tap-hover" class="cont" @click="changeidx('10')"> <view hover-class="app-tap-hover" class="cont" @click="changeidx('10')">
@ -103,7 +103,7 @@
在线 在线
</view> </view>
<view class="text" :class="statusidx==10?'act1':''"> <view class="text" :class="statusidx==10?'act1':''">
{{qbobj.device.onlineStatusCount[1] == null ? '0' : qbobj.device.onlineStatusCount[1]}} {{(qbobj.deviceOnlineStatusMap && qbobj.deviceOnlineStatusMap[1]) || '0'}}
</view> </view>
</view> </view>
<view hover-class="app-tap-hover" class="cont" @click="changeidx('9')"> <view hover-class="app-tap-hover" class="cont" @click="changeidx('9')">
@ -111,7 +111,7 @@
强制锁车 强制锁车
</view> </view>
<view class="text" :class="statusidx==9?'act1':''"> <view class="text" :class="statusidx==9?'act1':''">
{{qbobj.device.statusCount[9] == null ? '0' : qbobj.device.statusCount[9]}} {{(qbobj.deviceStatusMap && qbobj.deviceStatusMap[9]) || '0'}}
</view> </view>
</view> </view>
<view hover-class="app-tap-hover" class="cont" @click="changeidx('7')"> <view hover-class="app-tap-hover" class="cont" @click="changeidx('7')">
@ -119,7 +119,7 @@
全部设备 全部设备
</view> </view>
<view class="text" :class="statusidx==7?'act1':''"> <view class="text" :class="statusidx==7?'act1':''">
{{qbobj.device.count == null ? '--' : qbobj.device.count}} {{qbobj.deviceCount == null ? '--' : qbobj.deviceCount}}
</view> </view>
</view> </view>
</view> </view>
@ -278,8 +278,8 @@ let rangeDebounceId = null; // 滑动筛选debounce
}, },
// 请求全部运营统计数据 // 请求全部运营统计数据
getqb() { getqb() {
let StatKeys = 'device_status_count,device_online_status_count,device_count' const keys = 'device_status_count,device_online_status_count,device_count'
this.$u.get(`/dashboard/stat?keys=${StatKeys}&areaId=${this.areaId}`).then(res => { this.$u.get(`/dashboard/revenueStat?keys=${keys}&areaId=${this.areaId}`).then(res => {
if (res.code== 200) { if (res.code== 200) {
this.qbobj = res.data this.qbobj = res.data
} }

8
page_shanghu/gongzuotai/AccountDetails.vue
View File

@ -272,8 +272,12 @@
if (res.code == 200) { if (res.code == 200) {
this.userInfo = res.user this.userInfo = res.user
this.gettxfs() this.gettxfs()
this.successAmount = res.stat.withdraw.successAmount == null ? 0 : res.stat.withdraw.successAmount }
this.waitDivideAmount = res.stat.bonus.waitDivideAmount == null ? 0 : res.stat.bonus.waitDivideAmount })
this.$u.get('/app/dashboard/userStat').then((res) => {
if (res.code == 200) {
this.successAmount = res.data.withdrawSuccessAmount == null ? 0 : res.data.withdrawSuccessAmount
this.waitDivideAmount = res.data.bonusWaitDivideAmount == null ? 0 : res.data.bonusWaitDivideAmount
} }
}) })
}, },

7
page_shanghu/guanli/admin_worke.vue
View File

@ -265,9 +265,8 @@ export default {
return v == null ? 0 : v return v == null ? 0 : v
}, },
statProcessing() { statProcessing() {
const m = this.yunyingobj.orderStatusMap const v = this.yunyingobj.orderProcessingCount
if (!m || m.PROCESSING == null) return 0 return v == null ? 0 : v
return m.PROCESSING
}, },
complaintBadge() { complaintBadge() {
const n = Number(this.weinum) const n = Number(this.weinum)
@ -380,7 +379,7 @@ export default {
if (!this.areaId || !this.userinfo.userId) { if (!this.areaId || !this.userinfo.userId) {
return Promise.resolve() return Promise.resolve()
} }
let StatKeys = 'order_actual_amount,order_count,order_end_status_count,order_status_count,bonus_actual_amount,order_ridding_fee,order_deduction_fee,order_dispatch_fee,order_manage_fee,order_refund_amount' let StatKeys = 'order_actual_amount,order_count,order_finished_count,order_processing_count,bonus_actual_amount,order_ridding_fee,order_deduction_fee,order_dispatch_fee,order_manage_fee,order_refund_amount'
const url = `/dashboard/revenueStat?keys=${StatKeys}&dateRange=${this.kstime + ',' + this.jstime}&userId=${this.userinfo.userId}&areaId=${this.areaId}` const url = `/dashboard/revenueStat?keys=${StatKeys}&dateRange=${this.kstime + ',' + this.jstime}&userId=${this.userinfo.userId}&areaId=${this.areaId}`
this._beginStatsLoading() this._beginStatsLoading()
return this.$u return this.$u

1323
page_shanghu/guanli/yunying.vue
View File

File diff suppressed because it is too large Load Diff

18
page_shanghu/shmy.vue
View File

@ -26,7 +26,7 @@
账户余额（元） 账户余额（元）
</view> </view>
<view class="price"> <view class="price">
￥{{user.balance == null ? '0.00' : (Number(user.balance) + Number(waitDivideAmount)).toFixed(2)}} ￥{{(currentBalance + waitDivideAmount).toFixed(2)}}
</view> </view>
</view> </view>
<view class="rt"> <view class="rt">
@ -35,7 +35,7 @@
</view> </view>
<view class="bot"> <view class="bot">
<view class="botlt"> <view class="botlt">
可提现 ￥{{user.balance == null ? '0.00' : user.balance.toFixed(2)}} 可提现 ￥{{currentBalance.toFixed(2)}}
</view> </view>
<view class="botrt"> <view class="botrt">
累计提现 ￥{{successAmount == null ? '0.00' : Number(successAmount).toFixed(2)}} 累计提现 ￥{{successAmount == null ? '0.00' : Number(successAmount).toFixed(2)}}
@ -116,8 +116,9 @@
fuwuewm:false, fuwuewm:false,
appimg: this.$store.state.app.imgConfig, appimg: this.$store.state.app.imgConfig,
user:{}, user:{},
waitDivideAmount:'', currentBalance: 0,
successAmount:'', waitDivideAmount: 0,
successAmount: 0,
licenseInfo: null, // 营业执照信息 licenseInfo: null, // 营业执照信息
authTypes: [] // 认证类型数组 authTypes: [] // 认证类型数组
} }
@ -191,8 +192,13 @@
if(res.code == 200){ if(res.code == 200){
this.user = res.user this.user = res.user
this.authTypes = res.user.authTypes || [] this.authTypes = res.user.authTypes || []
this.waitDivideAmount = res.stat.bonus.waitDivideAmount == null ? 0 : res.stat.bonus.waitDivideAmount }
this.successAmount = res.stat.withdraw.successAmount == null ? 0 : Number(res.stat.withdraw.successAmount) })
this.$u.get("/app/dashboard/userStat").then((res) => {
if(res.code == 200){
this.currentBalance = res.data.currentBalance == null ? 0 : Number(res.data.currentBalance)
this.waitDivideAmount = res.data.bonusWaitDivideAmount == null ? 0 : Number(res.data.bonusWaitDivideAmount)
this.successAmount = res.data.withdrawSuccessAmount == null ? 0 : Number(res.data.withdrawSuccessAmount)
} }
}) })
}, },

2
pages.json
View File

@ -665,7 +665,7 @@
"path": "guanli/yunying", "path": "guanli/yunying",
"style": { "style": {
"navigationBarTitleText": "", "navigationBarTitleText": "",
"enablePullDownRefresh": false, "enablePullDownRefresh": true,
"navigationStyle": "custom" "navigationStyle": "custom"
} }
},{ },{