Browse Source

站点卡片更新

wkyy 2 years ago
parent
commit
6557abea91
2 changed files with 116 additions and 110 deletions
  1. 61 55
      pages/searchPile/searchPile.vue
  2. 55 55
      pages/searchPile/stationAndPile/stationDetailsMap.vue

+ 61 - 55
pages/searchPile/searchPile.vue

@@ -228,61 +228,67 @@
 					 
 				</view>
 			<!-- 新版卡片 -->	
-			<view  class="chargerCard" >
-				<view  class="charing-slow charing-slow-2" >
-														<view class="address">
-															<view class="name oldTextjp" oldstyle="font-size: 20px;">
-																荆鹏软件园充电站B01
-															</view>
-															<view class="distance oldTextjp2" oldstyle="font-size: 16px;" >
-																<text class="iconfont" style="color:#666666">&#xe615;</text>
-																小于100米
-															</view>
-															<!-- <view class="distance oldTextjp2" oldstyle="font-size: 16px;">
-																<text class="iconfont" style="color:#666666">&#xe615;</text>
-																暂无定位
-															</view> -->
-														</view>
-														<view class="sign">
-															<view class="sign-1" >会员享服务费8.5折</view>
-															<view class="sign-2">2小时停车免费</view>
-															<view class="sign-2">服务费代金券</view>
-															<view class="sign-2">包月卡</view>
-															<view class="sign-2">超级代金券</view>
-														</view>
-														<view class="price-free">
-														<view class="price">
-															<view class="price-1">
-																<view class="num">1.21</view>
-																<view class="unit oldTextjp2" oldstyle="font-size: 14px;">
-																	 元/度 起
-																</view>
-															</view>
-															<view class="price-2 oldTextjp2" oldstyle="font-size: 14px;" >
-																<text class="num">1.23</text>
-																<text class="unit">元/度 起</text>
-															</view>
-														</view>
-														<view class="free">
-															<view class="fast" >
-																<view class="fast-font">
-																	快
-																</view>
-																<view class="num">
-																	1/2
-																</view>
-															</view>
-															<view class="slow" >
-																<view class="slow-font">
-																	慢
-																</view>
-																<view class="num">
-																	1/2
-																</view>
-															</view>
-														</view>
-													</view>
-													</view>
+			<view class="chargerCard" v-if="stationsmap.length>0">
+				<swiper v-if="stationsmap.length>0" :current="currentIndex" @change="swiperChange" slide-change-transition-end='swiperTransitionEnd' @transition="swiperTransition">
+					<swiper-item v-for="(item,index) in stationsmap" :key="item.id" style="height: 100%;">
+						<view class="swiper-item" style="height: 100%; background-color: #ffffff;" @click="stationDetail(item)">
+							<view class="charing-slow charing-slow-2" @click="stationDetail(item)">
+								<view class="address">
+									<view class="name oldTextjp" oldstyle="font-size: 20px;">
+										{{item.name}}
+									</view>
+									<view class="distance oldTextjp2" oldstyle="font-size: 16px;" >
+										<text class="iconfont" style="color:#666666">&#xe615;</text>
+										{{item.distance!=null && item.distance>0.1 ? item.distance.toFixed(1)+'公里' : '小于100米'}}
+									</view>
+									<!-- <view class="distance oldTextjp2" oldstyle="font-size: 16px;">
+										<text class="iconfont" style="color:#666666">&#xe615;</text>
+										暂无定位
+									</view> -->
+								</view>
+								<view class="sign">
+									<view class="sign-1" v-if="item.giveDiscount">服务费{{item.discountRatio/10}}折</view>
+									<view class="sign-2" v-if="item.tagList.length != 0" v-for="(tagName,tagIndex) in item.tagList" 
+										:key="tagIndex">{{tagName}}</view>
+								</view>
+								<view class="price-free">
+									<view class="price">
+										<view class="price-1">
+											<view class="num">
+											{{!item.giveDiscount ? (item.electricityPrice+item.servicePrice).toFixed(2)
+												: (item.electricityPrice+item.discountServicePrice).toFixed(2)}}</view>
+											<view class="unit oldTextjp2" oldstyle="font-size: 14px;">
+												 元/度 起
+											</view>
+										</view>
+										<view class="price-2 oldTextjp2" oldstyle="font-size: 14px;" v-if="item.giveDiscount">
+											<text class="num">{{(item.electricityPrice+item.servicePrice).toFixed(2)}}</text>
+											<text class="unit">元/度 起</text>
+										</view>
+									</view>
+									<view class="free">
+										<view class="fast" v-if="item.type == '快充' || item.type == '快/慢'">
+											<view class="fast-font">
+												快
+											</view>
+											<view class="num">
+												{{item.fastAvailableNum}}/{{item.fastNum}}
+											</view>
+										</view>
+										<view class="slow" v-if="item.type == '慢充' || item.type == '快/慢'">
+											<view class="slow-font">
+												慢
+											</view>
+											<view class="num">
+												{{item.slowAvailableNum}}/{{item.slowNum}}
+											</view>
+										</view>
+									</view>
+								</view>
+							</view>
+						</view>
+					</swiper-item>
+				</swiper>
 			</view>
 <!-- 老版卡片-->
 				<!-- <view v-if="stationsmap.length>0" class="chargerCard" >

+ 55 - 55
pages/searchPile/stationAndPile/stationDetailsMap.vue

@@ -8,61 +8,61 @@
 				<u-image style='position:absolute;z-index:1023;right:40rpx;bottom:440rpx;' src="@/static/img/location.png" width="30px" height="30px" @click="setCenter"></u-image>
 			</view>
 			<!-- 新版 卡片-->
-			<view  class="chargerCard" >
-				<view  class="charing-slow charing-slow-2" >
-														<view class="address">
-															<view class="name oldTextjp" oldstyle="font-size: 20px;">
-																荆鹏软件园充电站B01
-															</view>
-															<view class="distance oldTextjp2" oldstyle="font-size: 16px;" >
-																<text class="iconfont" style="color:#666666">&#xe615;</text>
-																小于100米
-															</view>
-															<!-- <view class="distance oldTextjp2" oldstyle="font-size: 16px;">
-																<text class="iconfont" style="color:#666666">&#xe615;</text>
-																暂无定位
-															</view> -->
-														</view>
-														<view class="sign">
-															<view class="sign-1" >会员享服务费8.5折</view>
-															<view class="sign-2">2小时停车免费</view>
-															<view class="sign-2">服务费代金券</view>
-															<view class="sign-2">包月卡</view>
-															<view class="sign-2">超级代金券</view>
-														</view>
-														<view class="price-free">
-														<view class="price">
-															<view class="price-1">
-																<view class="num">1.21</view>
-																<view class="unit oldTextjp2" oldstyle="font-size: 14px;">
-																	 元/度 起
-																</view>
-															</view>
-															<view class="price-2 oldTextjp2" oldstyle="font-size: 14px;" >
-																<text class="num">1.23</text>
-																<text class="unit">元/度 起</text>
-															</view>
-														</view>
-														<view class="free">
-															<view class="fast" >
-																<view class="fast-font">
-																	
-																</view>
-																<view class="num">
-																	1/2
-																</view>
-															</view>
-															<view class="slow" >
-																<view class="slow-font">
-																	
-																</view>
-																<view class="num">
-																	1/2
-																</view>
-															</view>
-														</view>
-													</view>
-													</view>
+			<view class="chargerCard" @click="stationDetail(item)">
+				<view class="charing-slow charing-slow-2">
+					<view class="address">
+						<view class="name oldTextjp" oldstyle="font-size: 20px;">
+							{{item.name}}
+						</view>
+						<view class="distance oldTextjp2" oldstyle="font-size: 16px;">
+							<text class="iconfont" style="color:#666666">&#xe615;</text>
+							{{item.distance!=null&&item.distance>0.1 ? item.distance.toFixed(1)+'公里':'小于100米'}}
+						</view>
+						<!-- <view class="distance oldTextjp2" oldstyle="font-size: 16px;">
+							<text class="iconfont" style="color:#666666">&#xe615;</text>
+							暂无定位
+						</view> -->
+					</view>
+					<view class="sign">
+						<view class="sign-1" v-if="item.giveDiscount">服务费{{item.discountRatio/10}}折</view>
+						<view class="sign-2" v-if="item.tagList.length != 0" v-for="(tagName,tagIndex) in item.tagList" 
+							:key="tagIndex">{{tagName}}</view>
+					</view>
+					<view class="price-free">
+						<view class="price">
+							<view class="price-1">
+								<view class="num">
+								{{!item.giveDiscount ? (item.electricityPrice+item.servicePrice).toFixed(2)
+									: (item.electricityPrice+item.discountServicePrice).toFixed(2)}}</view>
+								<view class="unit oldTextjp2" oldstyle="font-size: 14px;">
+									 元/度 起
+								</view>
+							</view>
+							<view class="price-2 oldTextjp2" oldstyle="font-size: 14px;" v-if="item.giveDiscount">
+								<text class="num">{{(item.electricityPrice+item.servicePrice).toFixed(2)}}</text>
+								<text class="unit">元/度 起</text>
+							</view>
+						</view>
+						<view class="free">
+							<view class="fast" v-if="item.type == '快充' || item.type == '快/慢'">
+								<view class="fast-font">
+									快
+								</view>
+								<view class="num">
+									{{item.fastAvailableNum}}/{{item.fastNum}}
+								</view>
+							</view>
+							<view class="slow" v-if="item.type == '慢充' || item.type == '快/慢'">
+								<view class="slow-font">
+									慢
+								</view>
+								<view class="num">
+									{{item.slowAvailableNum}}/{{item.slowNum}}
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
 			</view>
 			 <!--老版卡片  -->
 			 <!-- <view class="chargerCard" @click="stationDetail(item)">