私人桩调整

pages/MyInvoice/invoiceManagement.vue

@@ -16,7 +16,7 @@
 <!-- 未开票 -->
       <view class="not-invoiced" v-show="current==0">
 		  
-        <view class="not-invoiced-item flex" v-for="(item,index) in list[current].list" :key="index">
+        <view class="not-invoiced-item flex" v-for="(item,index) in list[0].list" :key="index">
 			<view class="radio">
 				<u-checkbox v-model="item.ck" @change="changeitem($event,item)" ></u-checkbox>
 			</view>
@@ -56,7 +56,7 @@
       </view>
 	  <!-- 已开票 -->
 	  <view class="invoiced" v-show="current==1">
-	  	<view class="invoiced-item" v-for="(item,index) in list[current].list" :key="index"  @click="view(item.id)" >
+	  	<view class="invoiced-item" v-for="(item,index) in list[1].list" :key="index"  @click="view(item.id)" >
 	  		<view class="content oldTextjp2" 
 			 oldstyle="font-size: 14px;" >
 	  			<view class="title">
@@ -65,7 +65,7 @@
 						'have-invoiced':item.status==2
 					}">{{item.statusText}}</text>
 	  			</view>
-	  			<p><text class="text-1">发票金额</text> <text class="text-2">{{item.amount.toFixed(2)}}元</text></p>
+	  			<p><text class="text-1">发票金额</text> <text class="text-2">{{item.amount?item.amount.toFixed(2):0}}元</text></p>
 	  			<p><text class="text-1">发票抬头</text><text class="text-2">{{item.title}}</text></p>
 	  			<p><text class="text-1">申请时间</text> <text class="text-2">{{item.createTime}}</text></p>
 	  		</view>

pages/index/index.vue

@@ -241,6 +241,9 @@
 					<view class="distance oldTextjp2" oldstyle="font-size: 16px;">
 						<text class="iconfont" style="color:#666666">&#xe615;</text>{{stationData.distance!=null&&stationData.distance>0.1 ? stationData.distance.toFixed(1)+'公里':'小于100米'}}
 					</view>
+				</view>	
+				<view class="sign" v-if="stationData.stationType==50">
+					{{stationData.address}}
 				</view>
 				<view class="sign">
 					<view class="sign-1" v-if="stationData.giveDiscount&&stationData.discountRatio">服务费{{stationData.discountRatio/10}}折</view>
@@ -429,7 +432,7 @@
 				
 				showTop:false,
 				showTopImg:'',
-				showTopIndex:'',
+				showTopIndex:0,
 				
 				show: false,
 				list: [{
@@ -752,7 +755,7 @@
 						this.showTop=true;
 						this.showTopImg=this.bannerListTop[0].picUrl;
 						this.showTopIndex=0;
-						//this.carhelp.set("bannerListTop",nowtime);
+						this.carhelp.set("bannerListTop",nowtime);
 					}
 					if (this.userId) {
 						API.readCoupon().then((res2) => {
@@ -772,7 +775,7 @@
 									this.showTop=true;
 									this.showTopImg=this.bannerListTop[0].picUrl;
 									this.showTopIndex=0;
-									//this.carhelp.set("bannerListTop",nowtime);
+									this.carhelp.set("bannerListTop",nowtime);
 								}
 							}
 						}).catch(error2 => {

pages/searchPile/searchPile.vue

@@ -109,30 +109,7 @@
 				<u-mask :show="show" @click="show = false"></u-mask>
 			<view v-show="!viewMode" >
 				 
-				<!-- <view v-for="(item,index) in stationslist" :key="item.id" class="charing-slow"   @click="stationDetail(item)">
-					<text :class="item.type == '快充' ? 'fast-charge':(item.type == '慢充' ? 'trickle-charge':'fast-trickle-charge')">{{item.type}}</text> <text class="station-items">{{item.name}}</text>
-					<view class="address">
-						{{item.position}}
-					</view>
-					<view class="price">
-						<view class="num">{{item.price}}</view>
-						<view class="unit">
-							 元/度 起
-						</view>
-					</view>
-					<view class="park">
-						<text class="park-p" style="color: #FFFFFF;">p</text>
-						<text class="park-text">2小时免费停车</text>
-					</view>
-					<view class="free">
-						<view class="free-num">
-							<text style="color:#009143;">空闲{{item.idleNum}}</text>/总数{{item.total}}
-						</view>
-						<view class="distance">
-							<text class="iconfont distance-font">&#xe615;</text>{{item.distance.toFixed(1)}}公里 {{item.time.toFixed(0)}}分钟
-						</view>
-					</view>
-				</view> -->
+			 
 				<view class="carNone" v-if="stationslist.length == 0">
 					<img src="static/img/暂无数据-缺省页.png" alt="">
 					<p class="oldTextjp2" oldstyle="font-size: 18px;">暂无可用充电站</p>
@@ -155,6 +132,9 @@
 								<text class="iconfont" style="color:#666666">&#xe615;</text>
 								暂无定位
 							</view>
+						</view>
+						<view class="sign" v-if="item.stationType==50">
+							{{item.address}}
 						</view>
 						<view class="sign">
 							<view class="sign-1" v-if="item.giveDiscount">服务费{{item.discountRatio/10}}折</view>

pages/searchPile/stationAndPile/chargePriceDetails.vue

@@ -102,7 +102,7 @@
 							if (date_str >= obj.startTime && date_str <= obj.endTime) {
 								obj.current = true;
 								
-								if(obj.electricityPrice==0){
+								if(obj.electricityPrice==0||_self.stationDetail.stationType == 50){
 									this.showtips=false
 								}
 							}

pages/searchPile/stationAndPile/chargingPileDetails.vue

@@ -81,9 +81,12 @@
 					<view class="text-1">
 						{{isInsert?'可充电':'未插枪'}}
 					</view>
-					<view class="text-2">
-						{{isInsert?'充电枪已连接，可进行充电':'未检测到充电枪，若已插枪，请拔出重插'}}
-						
+					<view class="text-2"  v-if="station.stationType==50" >
+						可进行充电
+					</view>	
+					<view class="text-2"  v-else >
+						{{isInsert?'充电枪已连接，可进行充电':'未检测到充电枪，若已插枪，请拔出重插'}}
+						
 					</view>	
 				</view>
 				
@@ -100,7 +103,7 @@
 					<!-- <text class="explain" @click="step=1">费用说明</text> -->
 				</view>
 				<view class="name">
-					{{gun.sortNo}}号/{{detail.name}}枪{{gun.channelNo}}
+					<span v-if="station.stationType!=50">{{gun.sortNo}}号/</span>{{detail.name}}<span v-if="station.stationType!=50">枪{{gun.channelNo}}</span>
 					
 					<text class="free" v-if="gunDetail.chargingAppointment&&gunDetail.isMeAppoint">您已预约</text>
 					<text class="free" v-else-if="gunDetail.chargingAppointment&&!gunDetail.isMeAppoint">已被预约</text>

pages/searchPile/stationAndPile/stationDetails.vue

@@ -157,7 +157,7 @@
 						:key="i+'_'+index">
 						
 						
-						<view v-if="item.workStatus == 0&&item.insertStatus"
+						<view v-if="item.workStatus == 0&&item.insertStatus&&stationDetail.station.stationType!=50"
 								style=" font-size:14px;height: 50px;"
 								:class="{
 									'not-open':item.isRed
@@ -192,7 +192,7 @@
 							</view>
 						<view class="info">
 							<view class="name " >
-								{{item.sortNo}}号/{{device.name}}{{device.gunList.length>1?'枪'+item.channelNo:''}}
+								<span v-if="stationDetail.station.stationType!=50">{{item.sortNo}}号/</span>{{device.name}}{{device.gunList.length>1?'枪'+item.channelNo:''}}
 							</view>
 							<view class="details" @click="setOpen(item)"
 								 >
@@ -801,7 +801,7 @@
 
 							if (date_str >= obj.startTime && date_str <= obj.endTime) {
 								obj.current = true;
-								if(obj.electricityPrice==0){
+								if(obj.electricityPrice==0||this.station.stationType == 50){
 									this.showtips=false
 								}
 							}