|
|
@@ -225,8 +225,8 @@
|
|
|
'charging b ':item.enableShare&&item.workStatus!=0,
|
|
|
'charging c ':item.workStatus==2,
|
|
|
//插枪
|
|
|
- 'charging d ':(item.workStatus == 0&&item.insertStatus&&stationDetail.station.stationType!=50),
|
|
|
- 'off-line':item.isRed&&item.workStatus!=2,
|
|
|
+ 'off-line a ':(item.workStatus == 0&&item.insertStatus&&stationDetail.station.stationType!=50),
|
|
|
+ 'off-line b':item.isRed&&item.workStatus!=2,
|
|
|
}">
|
|
|
<view class="state-icon">
|
|
|
<img src="../../../assets/img/pileIcon.png" alt="">
|
|
|
@@ -235,7 +235,12 @@
|
|
|
已插枪
|
|
|
</view>
|
|
|
<view class="state-text" v-else>
|
|
|
- {{item.workStatusText}}
|
|
|
+ <span v-if="item.workStatusText.length<4">{{item.workStatusText}}</span>
|
|
|
+ <span v-else-if="item.workStatusText.length==4" style=" display: flex; flex-direction: column;">
|
|
|
+ <span>{{item.workStatusText.substring(0,2)}}</span>
|
|
|
+ <span>{{item.workStatusText.substring(2)}}</span>
|
|
|
+ </span>
|
|
|
+ <span v-else>{{item.workStatusText}}</span>
|
|
|
</view>
|
|
|
</view>
|
|
|
<view class="state off-line" v-else>
|
|
|
@@ -295,7 +300,12 @@
|
|
|
</view>
|
|
|
</template>
|
|
|
<!-- 电量 -->
|
|
|
- <view class="electric-quantity" v-if="item.workStatus == 2 ">
|
|
|
+ <view class="electric-quantity"
|
|
|
+ :class="{
|
|
|
+
|
|
|
+ 'not-enable-Appointment2':enableAppointmentBl(item)
|
|
|
+ }"
|
|
|
+ v-if="item.workStatus == 2 ">
|
|
|
<img src="../../../assets/img/electricQuantity.png" alt="">
|
|
|
<view class="percentage">
|
|
|
{{item.soc?item.soc+'%':'充电中'}}
|
|
|
@@ -306,10 +316,11 @@
|
|
|
<view class="open-time" v-show="openlist&&openlist.get(item.id)" >
|
|
|
<table>
|
|
|
<tr v-if="pricesInfoCurrent">
|
|
|
- <td colspan="2">当前电价:<b
|
|
|
- style="color:#080808;margin-left: 4px;">{{pricesInfoCurrent.costPrice.toFixed(2)}}元/度</b>
|
|
|
- <span style=" text-decoration: line-through;"
|
|
|
- v-if="station&&station.giveDiscount">{{((pricesInfoCurrent.servicePrice*1000+pricesInfoCurrent.electricityPrice*1000)/1000).toFixed(2)}}元/度</span>
|
|
|
+ <td colspan="2">当前电价:
|
|
|
+ <b style="color:#080808;margin-left: 4px;"
|
|
|
+ v-if="(station&&station.giveDiscount||pricesInfoCurrent2.discountServicePrice)&&(!personInfo||personInfo.userType==1)">{{((pricesInfoCurrent.servicePrice*1000+pricesInfoCurrent.electricityPrice*1000)/1000).toFixed(2)}}元/度</b>
|
|
|
+ <b v-else style="color:#080808;margin-left: 4px;">{{pricesInfoCurrent.costPrice.toFixed(2)}}元/度</b>
|
|
|
+
|
|
|
</td>
|
|
|
|
|
|
</tr>
|
|
|
@@ -378,7 +389,7 @@
|
|
|
</view>
|
|
|
|
|
|
<!-- 价格信息 -->
|
|
|
- <view class="price-infos">
|
|
|
+ <view class="price-infos" v-if="pricesInfoCurrent">
|
|
|
<view class="title">
|
|
|
价格信息<text>（{{pricesInfoCurrent.startTime}}-{{pricesInfoCurrent.endTime}}）</text>
|
|
|
</view>
|
|
|
@@ -388,7 +399,7 @@
|
|
|
游客价
|
|
|
</view>
|
|
|
<view class="unit-price">
|
|
|
- <text>{{pricesInfoCurrent.servicePrice+pricesInfoCurrent.electricityPrice}}</text>
|
|
|
+ <text>{{(pricesInfoCurrent.servicePrice+pricesInfoCurrent.electricityPrice).toFixed(2)}}</text>
|
|
|
|
|
|
<text class="unit">元/度</text>
|
|
|
</view>
|
|
|
@@ -450,12 +461,12 @@
|
|
|
服务费
|
|
|
</view>
|
|
|
</view>
|
|
|
- <view class="value" v-if="station&&station.giveDiscount||(pricesInfoCurrent2.discountServicePrice)">
|
|
|
- {{pricesInfoCurrent2.discountServicePrice.toFixed(2)}}元/度
|
|
|
- </view>
|
|
|
- <view class="value" v-if="station&&!station.giveDiscount&&(!pricesInfoCurrent2.discountServicePrice)">
|
|
|
- {{pricesInfoCurrent2.servicePrice.toFixed(2)}}元/度
|
|
|
+ <view class="value" v-if="station">
|
|
|
+ <span v-if="(personInfo&&personInfo.userType==2)&&(station.giveDiscount||(pricesInfoCurrent2.discountServicePrice))">
|
|
|
+ {{pricesInfoCurrent2.discountServicePrice.toFixed(2)}}元/度</span>
|
|
|
+ <span v-else>{{pricesInfoCurrent2.servicePrice.toFixed(2)}}元/度</span>
|
|
|
</view>
|
|
|
+
|
|
|
</view>
|
|
|
</view>
|
|
|
|
|
|
@@ -470,30 +481,42 @@
|
|
|
}"
|
|
|
@click="pricesInfoCurrent2=item"
|
|
|
>
|
|
|
- <span class="chats0" v-if="pricesInfoCurrent.startTime==item.startTime" >
|
|
|
- <span>当前</span>
|
|
|
- <span>时段</span>
|
|
|
-
|
|
|
- </span>
|
|
|
|
|
|
- <template v-if="station&&station.giveDiscount||(item.discountServicePrice)">
|
|
|
- <span class="chats1" :style="'height:'+getH(item.discountServicePrice)">{{item.discountServicePrice}}</span>
|
|
|
-
|
|
|
- </template>
|
|
|
- <template v-if="station&&!station.giveDiscount&&(!item.discountServicePrice)">
|
|
|
- <span class="chats1" :style="'height:'+getH(item.servicePrice)">{{item.servicePrice}}</span>
|
|
|
-
|
|
|
+ <template v-if="station">
|
|
|
+ <template v-if="(personInfo&&personInfo.userType==2)&&(station.giveDiscount||(pricesInfoCurrent2.discountServicePrice))">
|
|
|
+ <span class="chats1" :style="'height:'+getH(item.discountServicePrice)">{{item.discountServicePrice}}</span>
|
|
|
+
|
|
|
+ </template>
|
|
|
+ <template v-else>
|
|
|
+ <span class="chats1" :style="'height:'+getH(item.servicePrice)">{{item.servicePrice}}</span>
|
|
|
+
|
|
|
+ </template>
|
|
|
</template>
|
|
|
|
|
|
|
|
|
+
|
|
|
<span class="chats2" :style="'height:'+getH(item.electricityPrice)">
|
|
|
<span>{{item.electricityPrice}}</span>
|
|
|
-
|
|
|
- <span style="text-align: start;color: #9E9E9E;" v-if="i%2==0" >{{item.startTime}}</span>
|
|
|
+ <span class="chats0" v-if="pricesInfoCurrent.startTime==item.startTime" >
|
|
|
+ <span>当前</span>
|
|
|
+ <span>时段</span>
|
|
|
+
|
|
|
+ </span>
|
|
|
+ <span class="chats9" v-else >
|
|
|
+ <span>当前</span>
|
|
|
+ <span>时段</span>
|
|
|
+
|
|
|
+ </span>
|
|
|
</span>
|
|
|
</view>
|
|
|
+ </view>
|
|
|
+ <view class="chat_hhh_time">
|
|
|
+ <span>00:00</span>
|
|
|
+ <span>12:00</span>
|
|
|
+ <span>24:00</span>
|
|
|
</view>
|
|
|
- </view>
|
|
|
+ </view>
|
|
|
+
|
|
|
<!-- 附加信息 -->
|
|
|
<view class="overhead-infos">
|
|
|
<view class="item" v-if="stationDetail.station.describe" >
|
|
|
@@ -585,7 +608,7 @@
|
|
|
|
|
|
},
|
|
|
openlist: null,
|
|
|
- personInfo: {},
|
|
|
+ personInfo: null,
|
|
|
info: {
|
|
|
station: {
|
|
|
|
|
|
@@ -1504,7 +1527,7 @@
|
|
|
|
|
|
// 总计
|
|
|
.statistics {
|
|
|
- width: 316rpx;
|
|
|
+ width: 406rpx;
|
|
|
border: 1px solid rgba(204, 204, 204, 1);
|
|
|
padding: 0 16rpx;
|
|
|
height: 48rpx;
|
|
|
@@ -1525,8 +1548,10 @@
|
|
|
.item{
|
|
|
.open-time{
|
|
|
border-bottom: 1px solid rgba(238, 242, 240, 100);
|
|
|
- padding-left: 150rpx;
|
|
|
- padding-bottom: 40rpx;
|
|
|
+ // padding-left: 150rpx;
|
|
|
+ // padding-bottom: 40rpx;
|
|
|
+ display: flex;
|
|
|
+ justify-content: center;
|
|
|
line-height: 18px;
|
|
|
font-size: 14px;
|
|
|
color: rgb(136, 136, 136);
|
|
|
@@ -1577,7 +1602,11 @@
|
|
|
color: rgba(51, 51, 51, 1);
|
|
|
font-size: 36rpx;
|
|
|
font-weight: bold;
|
|
|
-
|
|
|
+ width: 320rpx;
|
|
|
+ white-space: nowrap;
|
|
|
+ overflow: hidden;
|
|
|
+ text-overflow: ellipsis;
|
|
|
+
|
|
|
text {
|
|
|
color: #D6D6D6;
|
|
|
font-weight: normal;
|
|
|
@@ -1611,17 +1640,30 @@
|
|
|
background-color: rgba(0, 185, 98, 1);
|
|
|
color: rgba(255, 255, 255, 1);
|
|
|
|
|
|
- text-align: center;
|
|
|
+ text-align: center;
|
|
|
+
|
|
|
|
|
|
+ }
|
|
|
+ .not-open-tag {
|
|
|
+ background-color: rgba(192, 196, 208, 100);
|
|
|
+
|
|
|
+ }
|
|
|
+ .not-enable-Appointment{
|
|
|
+ width: 168rpx ;
|
|
|
+ height: 56rpx ;
|
|
|
+ line-height: 56rpx;
|
|
|
+ font-size: 32rpx;
|
|
|
}
|
|
|
|
|
|
.electric-quantity {
|
|
|
- width: 96rpx;
|
|
|
+ width: 126rpx;
|
|
|
height: 52rpx;
|
|
|
|
|
|
position: relative;
|
|
|
|
|
|
- img {}
|
|
|
+ img {
|
|
|
+ width: 100%;
|
|
|
+ }
|
|
|
|
|
|
.percentage {
|
|
|
text-align: center;
|
|
|
@@ -1633,8 +1675,10 @@
|
|
|
top: 50%;
|
|
|
transform: translate(-50%, -50%);
|
|
|
|
|
|
- }
|
|
|
- }
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -1665,7 +1709,7 @@
|
|
|
border-radius: 4px;
|
|
|
background-color: rgba(230, 245, 237, 1);
|
|
|
padding: 22rpx;
|
|
|
-
|
|
|
+
|
|
|
.unit-price {
|
|
|
font-size: 56rpx;
|
|
|
}
|
|
|
@@ -1679,12 +1723,13 @@
|
|
|
// 游客价
|
|
|
.item-visitor {
|
|
|
color: #333333;
|
|
|
-
|
|
|
+ width: 39%;
|
|
|
}
|
|
|
|
|
|
// 会员价
|
|
|
.item-member {
|
|
|
- color: #27B148;
|
|
|
+ color: #27B148;
|
|
|
+ width: 60%;
|
|
|
}
|
|
|
|
|
|
.register {
|
|
|
@@ -1761,6 +1806,10 @@
|
|
|
|
|
|
}
|
|
|
|
|
|
+ }
|
|
|
+ .chat_hhh_time{
|
|
|
+ display: flex;
|
|
|
+ justify-content: space-between;
|
|
|
}
|
|
|
.chat_hhh {
|
|
|
background: #f9f9f9;
|
|
|
@@ -1774,9 +1823,17 @@
|
|
|
}
|
|
|
}
|
|
|
.current2{
|
|
|
+ .chats1{
|
|
|
+ border: 1px solid #333333;
|
|
|
+
|
|
|
+
|
|
|
+ border-bottom: 0px;
|
|
|
+ }
|
|
|
.chats2{
|
|
|
border: 1px solid #333333;
|
|
|
background: #26FF6B !important;
|
|
|
+
|
|
|
+ border-top: 0px;
|
|
|
}
|
|
|
|
|
|
}
|
|
|
@@ -1787,16 +1844,25 @@
|
|
|
justify-content: flex-end;
|
|
|
border :1px solid #f9f9f9;
|
|
|
.chats0{
|
|
|
- background-color: #ffecdd;
|
|
|
- color: #ff8b17;
|
|
|
+ background-color: #ff8b17;
|
|
|
+ color: #ffecdd;
|
|
|
+ display: flex;
|
|
|
+ justify-content: center;
|
|
|
+
|
|
|
+ flex-wrap:wrap;
|
|
|
+ flex-direction: column;
|
|
|
+ }
|
|
|
+ .chats9{
|
|
|
+ opacity: 0;
|
|
|
display: flex;
|
|
|
justify-content: center;
|
|
|
-
|
|
|
- flex-wrap:wrap
|
|
|
+
|
|
|
+ flex-wrap:wrap;
|
|
|
+ flex-direction: column;
|
|
|
}
|
|
|
.chats1{
|
|
|
background: #dcdcdc;
|
|
|
- min-height: 30rpx
|
|
|
+ min-height: 40rpx
|
|
|
}
|
|
|
.chats2{
|
|
|
background: #80e0a6;
|
zhengkaixin