ylj/wechat_yxcl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
cclu 2023-03-27 17:35:27 +08:00
commit a1c15459fb
3 changed files with 71 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
pages/everdayRenven/AnhuiIndex.vue
View File

@ -94,7 +94,7 @@
<text class="type">{{childItem.data}}/{{childItem.flow}}</text>
<text class="carType">{{childItem.LargeVehicle_Count}}/{{childItem.MediumVehicle_Count}}/{{childItem.MinVehicle_Count}}</text>
</li>
</ul>
</ul>
<!-- <div class="progress">
<div class="bgO" :style="{'width':item.bili+'%'}"></div>
</div> -->
@ -487,6 +487,7 @@
}
});
this.headMsg = totalData
console.log(this.headMsg)
// 饼图分析及数据条形分析
const [progressList, pieList] = this.getProgressData(busniessTypePie, totalData.cashPay)
this.modelProgress = progressList
@ -1076,20 +1077,25 @@
overflow: auto;
-webkit-overflow-scrolling: touch;
}
.bayonet-cell-area li{
width: 100%;
}
.bayonet-cell-area li .server,.bayonet-cell-area li .carType{
width: 30%;
display: inline-block;
text-align: center;
}
.bayonet-cell-area li .type{
width: 40%;
display: inline-block;
text-align: center;
}
.bayonet-cell-area li{
width: 100%;
}
.bayonet-cell-area li .server{
width: 30%;
display: inline-block;
text-align: left;
padding-left: 15rpx;
}
.bayonet-cell-area li .type{
width: 35%;
display: inline-block;
text-align: center;
}
.bayonet-cell-area li .carType{
width: 30%;
display: inline-block;
text-align: right;
}
.bayonet-cell-area li:nth-child(2n+1):before {
content: '';
@ -1357,19 +1363,25 @@
.operation-cl-unit1 {
width: 100%;
font-size: 26rpx;
display: flex;
justify-content: space-between;
display: flex;
justify-content: space-between;
}
.operation-cl-unit1 .type{
width: 40%;
display: inline-block;
text-align: center;
}
.operation-cl-unit1 .server,.operation-cl-unit1 .carType{
width: 30%;
display: inline-block;
text-align: center;
}
.operation-cl-unit1 .server{
width: 30%;
display: inline-block;
text-align: left;
padding-left: 30rpx;
}
.operation-cl-unit1 .type{
width: 40%;
display: inline-block;
text-align: left;
}
.operation-cl-unit1 .carType{
width: 30%;
display: inline-block;
text-align: center;
}
.operation-c-list .progress {
width: 288rpx;

26
pages/everdayRenven/components/anhHead.vue
View File

@ -52,7 +52,7 @@
<div class="uni-flex jc-between" v-if="provinceCode == 340000 && groupType == 1000 && headMsg.shareShopCount > 0">
<div class="revenue-tag">
<div style="font-size: 24rpx; margin-top: 15rpx;">
分润门店
分润门店:
<span class="amount" style="font-size: 28rpx;padding-left: 0.5em;">
{{headMsg.shareShopCount}}个
</span>
@ -60,7 +60,7 @@
</div>
<div class="revenue-tag">
<div style="font-size: 24rpx; margin-top: 15rpx;">
驿达分润
驿达分润:
<span class="amount" style="font-size: 28rpx;padding-left: 0.5em;">
{{ $util.fmoney(headMsg.royaltyPrice) }}元
</span>
@ -71,6 +71,28 @@
</div> -->
</div>
</div>
<div class="uni-flex jc-between" v-if="provinceCode == 340000 && groupType == 1000 && headMsg.deliverBillCount > 0">
<div class="revenue-tag">
<div style="font-size: 24rpx; margin-top: 15rpx;">
万佳配送订单:
<span class="amount" style="font-size: 28rpx;padding-left: 0.5em;">
{{headMsg.deliverBillCount}}单
</span>
</div>
</div>
<div class="revenue-tag">
<div style="font-size: 24rpx; margin-top: 15rpx;">
采购金额:
<span class="amount" style="font-size: 28rpx;padding-left: 0.5em;">
{{ $util.fmoney(headMsg.deliverPrice) }}元
</span>
</div>
<!-- <div style="font-size: 24rpx;">
累计分润
<span class="amount" style="font-size: 28rpx;padding-left: 0.5em;">272,109.93元</span>
</div> -->
</div>
</div>
<div class="view-bottom" @click="toggleCard">
<text class="uni-icon uni-icon-arrowup" :class="{'up':isup}"></text>
</div>

9
pages/everdayRenven/components/anhuiYestodayRevenueData.js
View File

@ -25,7 +25,6 @@ const methods = {
// Revenue_Include: 1
}
this.provinceCode = obj.ProvinceCode
console.log('requestParamas',requestParamas)
// 营收数据
const data = await request.$webGet('CommercialApi/Revenue/GetRevenuePushList', requestParamas)
if (data.Result_Code != 100) return
@ -236,7 +235,7 @@ const methods = {
}
return [ totalShow, busniessTypePie, busniessTradePie,busniessTradeFathPie ]
},
getReginList(data, shopCountList,tradeList,budgetAmount,bayonetCount, mobileShare) {
getReginList(data, shopCountList,tradeList,budgetAmount,bayonetCount, mobileShare, mallDeliver) {
let _this = this
let totalShow = {} // 总营收数据统计
@ -321,6 +320,12 @@ const methods = {
totalShow.subRoyaltyPrice = mobileShare.SubRoyalty_Price
totalShow.ticketFee = mobileShare.Ticket_Fee
}
// 获取移动支付分账数据
if (mallDeliver) {
totalShow.deliverBillCount = mallDeliver.DeliverBill_Count
totalShow.deliverPrice = mallDeliver.Deliver_Price
totalShow.deliverRate = mallDeliver.Deliver_Rate
}
// 片区车流量数据
bayonetCount.map(async (n, index) => {
bayonetPie = _this.getBayonetPie('Serverpart_Name', n, bayonetPie)