diff --git a/pages/everdayRenven/components/anhuiYestodayRevenueData.js b/pages/everdayRenven/components/anhuiYestodayRevenueData.js
index 5585925..ac33d5e 100644
--- a/pages/everdayRenven/components/anhuiYestodayRevenueData.js
+++ b/pages/everdayRenven/components/anhuiYestodayRevenueData.js
@@ -1,6 +1,6 @@
import request from '@/util/index.js'
const methods = {
- async getData(obj,isServerPartDetail) { // 获取远程数据
+ async getData(obj,isServerPartDetail,value) { // 获取远程数据 value判断是不是正常进来 是的话俩接口不调
let _this = this
/* ts 数据类型声明
type serverpartRegion = {
@@ -44,9 +44,18 @@ const methods = {
const tradeData = await request.$webGet('CommercialApi/BaseInfo/GetBusinessTradeList', requestParamas)
if (tradeData.Result_Code != 100) return
- // 计划营收金额
- const budgetAmount = await request.$webGet('CommercialApi/Revenue/GetBudgetExpenseList', requestParamasBudget)
- if (budgetAmount.Result_Code != 100) return
+
+ // 计划营收金额
+ let budgetAmount = {
+ Result_Data:{
+ List:[]
+ }
+ }
+ if (!value){
+ budgetAmount = await request.$webGet('CommercialApi/Revenue/GetBudgetExpenseList', requestParamasBudget)
+ if (budgetAmount.Result_Code != 100) return
+ }
+
// 移动支付分账数据
const mobileShare = await request.$webGet('CommercialApi/Revenue/GetMobileShare', requestParamas)
@@ -57,8 +66,16 @@ const methods = {
if (mallDeliver.Result_Code != 100) return
// 片区车流量
- const bayonetCount = await request.$webGet('CommercialApi/Revenue/GetSPBayonetList', requestParamas)
- if (bayonetCount.Result_Code != 100) return
+ let bayonetCount = {
+ Result_Data:{
+ List:[]
+ }
+ }
+ if (!value){
+ bayonetCount = await request.$webGet('CommercialApi/Revenue/GetSPBayonetList', requestParamas)
+ if (bayonetCount.Result_Code != 100) return
+ }
+
if (isServerPartDetail) { // 是服务区营收推送页面
return _this.getSeverpartReginList(data.Result_Data.List, busniessCounts.Result_Data.List,
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 0673af6..6d306cd 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -16,8 +16,11 @@
- 对客营收(门店上传 {{showHeadMsg.uploadState?showHeadMsg.uploadState:''}})
-
+
+ 对客营收:
+ 门店上传 {{showHeadMsg.uploadState?showHeadMsg.uploadState:''}}
+
+
{{showHeadMsg.totalMoneyShow|| '0.00'}}
@@ -95,15 +98,15 @@
- 入区率
+ 入区率/%
- {{carInfo.Entry_Rate?carInfo.Entry_Rate + '%':'' }}
+ {{carInfo.Entry_Rate?carInfo.Entry_Rate :'' }}
- 停留时长
+ 停留时长/分钟
- {{carInfo.Stay_Times?carInfo.Stay_Times + '分钟':'' }}
+ {{carInfo.Stay_Times?carInfo.Stay_Times:'' }}
@@ -131,9 +134,9 @@
{{ item.value }}
-
- {{ item.add }}
- (相比昨日)
+
+ {{ item.add }}
+ (相比昨日)
本月累计
@@ -347,6 +350,7 @@ export default {
selectTab:1,
single:timestampToTime((new Date(lastDay).getTime())),
thisDay:'',
+ isBig:false,//判断门店上传的前一个数字是否比后一个数字大
showPage: false,
opacity: 0, // 背景颜色透明度
customBarH: this.CustomBar,
@@ -484,7 +488,7 @@ export default {
this.theRequest = this.defaultMsg() || {}
this.theRequest.time = this.lastDay
this.theRequest.month = this.$util.cutDate(this.lastDay, 'YYYYMM')
- this.initData()
+ this.initData(true)
this.initYesterdayData()
//车流分析
this.getCarInfo()
@@ -799,10 +803,10 @@ export default {
})
return [_data2, _data1];
},
- async initData() { // 初始化营收数据
+ async initData(value) { // 初始化营收数据
let _this = this
const [reginList, totalData, busniessTypePie, busniessTradePie, busniessAreaPie, bayonetPie] =
- await anhuiYestodayRevenueData.getData(this.theRequest) // 获取实时数据
+ await anhuiYestodayRevenueData.getData(this.theRequest,null,value) // 获取实时数据
this.nowDayAllPay=totalData.cashPay
console.log('totalData',totalData)
@@ -928,7 +932,13 @@ export default {
this.showHeadMsg[i] = this.$util.fmoney(this.showHeadMsg[i], 2)
}
}
- console.log(this.showHeadMsg)
+
+ let index = this.showHeadMsg.uploadState.indexOf('/')
+ let first = this.showHeadMsg.uploadState.slice(0,index)
+ let second = this.showHeadMsg.uploadState.slice(index+1,1000)
+ if (Number(first)-Number(second)>0){
+ this.isBig = true
+ }
_this.$forceUpdate()
},
@@ -1041,12 +1051,18 @@ $iphoneHeight: env(safe-area-inset-bottom);
width: calc(100% - 32px);
position: absolute;
top: 104px;
- .title {
- font-size: 28rpx;
- font-family: PingFangSC-Semibold, PingFang SC;
- font-weight: 600;
- color: #782717;
- line-height: 40rpx;
+ .topTitle{
+ width: 100%;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ .title {
+ font-size: 28rpx;
+ font-family: PingFangSC-Semibold, PingFang SC;
+ font-weight: 600;
+ color: #782717;
+ line-height: 40rpx;
+ }
.text {
font-size: 28rpx;
font-family: PingFangSC-Regular, PingFang SC;
@@ -1056,6 +1072,7 @@ $iphoneHeight: env(safe-area-inset-bottom);
margin-left: 8px;
}
}
+
.box {
display: flex;
align-items: center;
@@ -1416,7 +1433,7 @@ $iphoneHeight: env(safe-area-inset-bottom);
}
}
.name{
- font-size: 28rpx;
+ font-size: 32rpx;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #160002;
@@ -1424,8 +1441,8 @@ $iphoneHeight: env(safe-area-inset-bottom);
}
}
.price{
- font-size: 28rpx;
- font-family: PingFangSC-Semibold, PingFang SC;
+ font-size: 32rpx;
+ font-family: DINAlternate-Bold, DINAlternate;
font-weight: 600;
color: #160002;
line-height: 40rpx;
diff --git a/pages/userCenter/components/userList.vue b/pages/userCenter/components/userList.vue
index 3d79c17..113bcfd 100644
--- a/pages/userCenter/components/userList.vue
+++ b/pages/userCenter/components/userList.vue
@@ -35,7 +35,12 @@
-
+
+
+
+
+
+
{{ item.name }}
{{item.notice}}
@@ -238,10 +243,24 @@ export default {
justify-content: center;
align-items: center;
position: relative;
- .img {
+ .imgParent{
width: 30px;
height: 30px;
- margin-bottom: 8px;
+ margin-bottom: 6px;
+ overflow: hidden;
+ .img {
+ width: 30px;
+ height: 30px;
+ margin-bottom: 6px;
+ transform: translateX(30px);
+ border-right: 30px solid transparent;
+ filter: drop-shadow(-30px 0px #ccc);
+ }
+ }
+ .img_normal{
+ width: 30px;
+ height: 30px;
+ margin-bottom: 6px;
}
.name {
font-size: 28rpx;
diff --git a/pages/userCenter/userCenter.vue b/pages/userCenter/userCenter.vue
index 4a321b3..d0e2850 100644
--- a/pages/userCenter/userCenter.vue
+++ b/pages/userCenter/userCenter.vue
@@ -413,7 +413,7 @@ import Tabbar from "../../components/tabbar/tabbar.vue";
font-weight: 400;
color: #782717;
line-height: 36rpx;
- width: 95%;
+ width: 98%;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;