|
@@ -275,8 +275,11 @@
|
|
|
<view class="carImg" v-if="personInfo&&personInfo.userType!=2">
|
|
|
<img @click="gotoLogin" src="@/assets/img/gologin/img.png">
|
|
|
</view>
|
|
|
- <view class="carImg3" v-else-if="carImg3Bl&&!userCardBool">
|
|
|
- <view class="carImg2" >
|
|
|
+ <view class="carImg3" :class="{
|
|
|
+ 'carImg3-yue':!prevMonthKwhBL
|
|
|
+ }"
|
|
|
+ v-else-if="carImg3Bl&&!userCardBool">
|
|
|
+ <view class="carImg2" v-if="prevMonthKwhBL" >
|
|
|
|
|
|
|
|
|
<view>
|
|
@@ -286,7 +289,18 @@
|
|
|
<span>点击购买</span>
|
|
|
</view>
|
|
|
</view>
|
|
|
- </view>
|
|
|
+ </view>
|
|
|
+ <view class="carImg2-yue" v-if="!prevMonthKwhBL" >
|
|
|
+
|
|
|
+
|
|
|
+ <view>
|
|
|
+ <view class="carImg-1">您近30天已充电{{carImg3span1}}度</view>
|
|
|
+ <view class="carImg-2">如购买月卡,可省约<span>{{carImg3span3}}</span>元</view>
|
|
|
+ <view class="carImg-3" @click="gotoUrl('pages/monthlyCardActivity/monthlyCardBuy')">
|
|
|
+ <span>点击购买</span>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
|
|
|
</view>
|
|
|
|
|
@@ -625,7 +639,7 @@
|
|
|
carImg4Bl:false,
|
|
|
carImg3span1:0,
|
|
|
carImg3span2:0,
|
|
|
-
|
|
|
+ carImg3span3:0,
|
|
|
pricesInfoCurrent: {},
|
|
|
pricesInfoCurrent2: {},
|
|
|
show3: false,
|
|
@@ -694,7 +708,13 @@
|
|
|
}
|
|
|
},
|
|
|
|
|
|
- computed: {
|
|
|
+ computed: {
|
|
|
+ prevMonthKwhBL(){
|
|
|
+ if(this.carImg3span1>=1000){
|
|
|
+ return false
|
|
|
+ }
|
|
|
+ return true
|
|
|
+ },
|
|
|
openBool() {
|
|
|
if (this.openStatus == '3') {
|
|
|
return this.isVip
|
|
@@ -1022,7 +1042,27 @@
|
|
|
}
|
|
|
return true;
|
|
|
},
|
|
|
- getChargeList(){
|
|
|
+ getChargeList(){
|
|
|
+ var obj=this.carhelp.get("carhelp_getChargeList")
|
|
|
+ var time=new Date( ).toLocaleString().substr(0,12).replace("T"," ");
|
|
|
+ if(obj&&time==obj.time){
|
|
|
+
|
|
|
+ var num1=parseInt(obj.electricQuantity);
|
|
|
+ var num2=parseInt(obj.totalServiceMoney) ;
|
|
|
+
|
|
|
+ if(num2*0.4>20){
|
|
|
+ this.carImg3span1=parseInt(num1/10000);
|
|
|
+ this.carImg3span2=parseInt(num2*0.4) ;
|
|
|
+ this.carImg3span3=parseInt(num2) ;
|
|
|
+ this.carImg3Bl=true;
|
|
|
+ }else{
|
|
|
+ this.carImg4Bl=true;
|
|
|
+ }
|
|
|
+ console.log("carhelp_getChargeList",this.carImg3span1,this.carImg3span2)
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
var date =new Date().getTime()-30*1000*60*60*24;
|
|
|
var startDate =parseUnixTime(new Date(date),'{y}-{m}-{d}');
|
|
|
API_index.chargingRecordData({
|
|
@@ -1043,10 +1083,17 @@
|
|
|
num2+=obj.totalServiceMoney
|
|
|
}
|
|
|
}
|
|
|
- console.log(num1,num2)
|
|
|
+ console.log(num1,num2)
|
|
|
+ this.carhelp.set("carhelp_getChargeList",{
|
|
|
+ time: time,
|
|
|
+ electricQuantity:num1,
|
|
|
+ totalServiceMoney:num2
|
|
|
+ })
|
|
|
+
|
|
|
if(num2*0.4>20){
|
|
|
this.carImg3span1=parseInt(num1/10000);
|
|
|
- this.carImg3span2=parseInt(num2*0.4) ;
|
|
|
+ this.carImg3span2=parseInt(num2*0.4) ;
|
|
|
+ this.carImg3span3=parseInt(num2) ;
|
|
|
this.carImg3Bl=true;
|
|
|
}else{
|
|
|
this.carImg4Bl=true;
|
|
@@ -2026,7 +2073,44 @@
|
|
|
margin: 0 40rpx;
|
|
|
background: linear-gradient(32.4deg, rgba(59,182,254,1) 20.49%,rgba(0,185,98,1) 118.87%);
|
|
|
border-radius: 8px;
|
|
|
- }
|
|
|
+ }
|
|
|
+ .carImg3-yue {
|
|
|
+ margin: 0 40rpx;
|
|
|
+ background: linear-gradient(88.81deg, rgba(219,199,167,1) 1.89%,rgba(194,154,93,1) 98%);
|
|
|
+ border-radius: 8px;
|
|
|
+ }
|
|
|
+ .carImg2-yue {
|
|
|
+ line-height: 20px;
|
|
|
+ color: rgba(255, 255, 255, 1);
|
|
|
+ font-size: 32rpx;
|
|
|
+ padding:40rpx;
|
|
|
+ //background: linear-gradient(88.81deg, rgba(219,199,167,1) 1.89%,rgba(194,154,93,1) 98%);
|
|
|
+ background: url('../../../assets/img/9-4/antFill-crown.svg');
|
|
|
+ background-repeat: repeat-y;
|
|
|
+ background-position-x: 440rpx;
|
|
|
+ .carImg-2{
|
|
|
+ span{
|
|
|
+ font-size: 48rpx;
|
|
|
+ color:red;
|
|
|
+ margin: 0 4rpx;
|
|
|
+ font-weight: bold;
|
|
|
+ padding:0rpx 4rpx;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ .carImg-3{
|
|
|
+ margin-top:8rpx ;
|
|
|
+ span{
|
|
|
+
|
|
|
+ padding:8rpx 16rpx;
|
|
|
+ border-radius: 12px;
|
|
|
+ background-color: rgba(255, 255, 255, 1);
|
|
|
+ text-align: center;
|
|
|
+ color: #795626 ;
|
|
|
+ font-size: 12px;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
.carImg2 {
|
|
|
line-height: 20px;
|
|
|
color: rgba(255, 255, 255, 1);
|
|
@@ -2039,7 +2123,10 @@
|
|
|
span{
|
|
|
font-size: 48rpx;
|
|
|
color:red;
|
|
|
- margin: 0 4rpx;
|
|
|
+ margin: 0 4rpx;
|
|
|
+
|
|
|
+ font-weight: bold;
|
|
|
+ padding:0rpx 4rpx;
|
|
|
}
|
|
|
}
|
|
|
.carImg-3{
|