|
|
@@ -33,7 +33,7 @@
|
|
|
今日电量 (度)
|
|
|
</view>
|
|
|
</view>
|
|
|
- <view class="item">
|
|
|
+ <view class="item" v-if="showMonthlyCard">
|
|
|
<view class="item-number">
|
|
|
{{showTopobj.discountCardBuyNum}} / {{showTopobj.monthCardBuyNum}}
|
|
|
</view>
|
|
|
@@ -662,7 +662,8 @@
|
|
|
startTime: '',
|
|
|
stepid: 0,
|
|
|
windowWidth:0,
|
|
|
- showTopobj:{}
|
|
|
+ showTopobj:{},
|
|
|
+ showMonthlyCard:false,
|
|
|
|
|
|
}
|
|
|
},
|
|
|
@@ -684,7 +685,12 @@
|
|
|
onLoad() {
|
|
|
|
|
|
|
|
|
- this.info = this.carhelp.getPersonInfo()
|
|
|
+ this.info = this.carhelp.getPersonInfo()
|
|
|
+ this.info = this.carhelp.getPersonInfo()
|
|
|
+ if(this.info &&this.info.showMonthlyCard){
|
|
|
+ this.showMonthlyCard=this.info.showMonthlyCard;
|
|
|
+
|
|
|
+ }
|
|
|
this.title = this.info.merchantAccountName
|
|
|
uni.getSystemInfo().then(e=>{
|
|
|
this.windowWidth=e[1].windowWidth
|
|
|
@@ -1300,9 +1306,14 @@
|
|
|
var markerU="";
|
|
|
if(value[i].seriesName == "收入"){
|
|
|
|
|
|
+ }
|
|
|
+ if (this.type_head == 2&&(value[i].seriesName == "利润"||value[i].seriesName == "收入")&&this.showMonthlyCard) {
|
|
|
+ markerU="（含卡）"
|
|
|
+
|
|
|
+
|
|
|
}
|
|
|
if (this.type_head == 2&&value[i].seriesName == "收入") {
|
|
|
- markerU="（含卡）"
|
|
|
+
|
|
|
u="万元"
|
|
|
num=info.todayAmountW
|
|
|
if(!num){
|
|
|
@@ -1351,7 +1362,7 @@
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- if(i==value.length-1){
|
|
|
+ if(i==value.length-1 && this.showMonthlyCard){
|
|
|
|
|
|
text1 += "<p><span style='display:inline-block;margin-right:4px;border-radius:10px;width:10px;height:10px;background-color:#FF3D00;'></span>6折卡数量"+ '<span style="' + style +
|
|
|
'">' +(info.discountCardBuyNum?info.discountCardBuyNum:0) + '张</span></p>';
|
zhengkaixin