缓存

.env.dev.js

@@ -16,7 +16,7 @@ const UNI_APP = {
 	openId:"zkxtest23",//zkx
 	
 	openId:"oK9Wr54VbEh3xvWYmD_zT5NbH4AY",//zkx
-	//openId:"oK9Wr59rru-i3bm7dtTtxnkR-i4s",//杨所
+	openId:"oK9Wr59rru-i3bm7dtTtxnkR-i4s",//杨所
 	//openId:"oK9Wr56vX9nP_B56_Pyigg5n5Ce8",//
 	//openId:"oK9Wr5_2USr1yP4MRew9KbJA0-ng",//老板
 	//openId:"oK9Wr5-ViXQMUP2cjiW3bGIABj1Q",

pages/MyInvoice/invoiceManagement.vue

@@ -1,460 +1,460 @@
-<template>
-	<view >
-		<ujp-navbar title="我的发票">
-			<text class="management" @click="gotoUrl('pages/MyInvoice/invoiceTitleManagement')">抬头管理</text>
-		</ujp-navbar>
-		<u-alert-tips type="warning"  v-if="personInfo&&personInfo.userType==1" 
-		 :descStyle="{
-			     fontSize: '28rpx',
-			     color: '#ef7a30',
-		 }" @click="alerttipsCk"
-		 :show-icon="true"  :description="description"></u-alert-tips>
-	
-			<u-tabs  inactive-color="#888888" active-color="#101010" :list="list" :is-scroll="true"
-					:current="current" @change="change"></u-tabs>
-	
-	
-		<view class="carNone" v-if="list[current].list.length == 0">
-				<img src="static/img/暂无数据-缺省页.png" alt="">
-				<p class="oldTextjp2" oldstyle="font-size: 18px;">暂无记录</p>
-			</view>
-
-<!-- 未开票 -->
-      <view class="not-invoiced" v-show="current==0">
-		  
-        <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>
-			<view class="content oldTextjp2" 
-			 oldstyle="font-size: 14px;"
-			 @click="submit(item.id)">
-				<view class="title">
-					{{item.stationName}} <text class="price">{{item.actualFee?item.actualFee.toFixed(2):'0.00'}}元</text>
-				</view>
-				<p><text class="text-1">充电电量</text> <text class="text-2">{{item.electricQuantity/10000}}度</text></p>
-				<p><text class="text-1">开始时间</text> <text class="text-2">{{item.startTime?item.startTime:item.endTime}}</text></p>
-				 <p><text class="text-1">结束时间</text> <text class="text-2">{{item.endTime}}</text></p>
-				 <p><text class="text-1">车牌号</text> <text class="text-2">{{item.carNumber}}</text></p>
-				 
-			</view>
-			
-        	
-        </view>
-		
-       <p class="tips" v-if="list[current].list.length == list[current].recordsTotal && list[current].recordsTotal != 0" > 已经到底了</p>
-       
-		
-      	
-		<view class="bottom">
-			<view class="radio">
-				<u-checkbox v-model="allck" @change="allckBtn"></u-checkbox>
-			</view>
-			<view class="check-all">
-				全选
-			</view>
-			<view class="total">
-				<p class="total-price">共<text style="color: #FF7300;" >{{sumActualFee.toFixed(2)}}元</text></p>
-				<p class="order">{{selectcount}}个订单</p>
-			</view>
-			<u-button type="success" @click="submit()" shape="circle">去开票</u-button>
-		</view>
-      </view>
-	  <!-- 已开票 -->
-	  <view class="invoiced" v-show="current==1">
-	  	<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">
-	  				{{item.stationName}} <text :class="{
-						invoice:item.status==1,
-						'have-invoiced':item.status==2
-					}">{{item.statusText}}</text>
-	  			</view>
-	  			<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>
-	  	</view>
-	<!-- 	<view class="invoiced-item">
-			<view class="content">
-				<view class="title">
-					玉桥公园充电站 <text class="have-invoiced">开票成功</text>
-				</view>
-				<p><text>发票抬头</text> <text class="text-2">50.00元</text></p>
-				<p><text class="text-1">发票抬头</text> <text class="text-2">刘德华</text></p>
-				<p><text class="text-1">申请时间</text> <text class="text-2">2022-06-23 16：00：00</text></p>
-			</view>
-		</view> -->
-		<p class="tips"> 仅展示最近12个月的发票信息</p>
-	  </view>
-	</view>
-</template>
-
-<script>
-	import * as API from '@/apis/invoiceApi.js'
-	
-	export default {
-		data() {
-			return {
-				allck:false,
-				list: [{
-					value:0,
-					name: '未开发票',
-					pageIndex: 1,
-					recordsTotal: 0,
-					list:[],
-				}, {
-					value:1,
-					name: '已开发票',
-					pageIndex: 1,
-					recordsTotal: 0,
-					list:[],
-				}],
-				current: 0,
-				personInfo:{},
-				description:"游客模式下需要补全手机号信息,点击前往",
-				
-			}
-		},
-		onReachBottom() {
-			var list=this.list[this.current].list;
-			var recordsTotal=this.list[this.current].recordsTotal;
-			
-			if (list.length < recordsTotal) {			
-				this.myLoadmore();
-			}
-		},
-		onShow(){
-			this.personInfo=this.carhelp.getPersonInfo()
-			this.getlist(true);
-		},
-		computed:{
-			
-			sumActualFee(){
-				try{
-					var list=this.list[0].list;
-					var sum=0;
-					 
-					for(var i in list ){
-						var obj=list[i];
-						if(obj.ck){
-						 
-							sum+=obj.actualFee*100
-						}
-					}
-								 
-					return sum/100
-				}catch(e){
-					//TODO handle the exception
-					return 0
-				}
-			
-			},
-			selectIds(){
-				var list=this.list[0].list;
-				var sz=[]
-				for(var i in list ){
-					var obj=list[i];
-					if(obj.ck){
-						sz.push(obj.id);
-					}
-				}
-							
-				return sz.join();
-			},
-			selectcount(){
-				var list=this.list[0].list;		 
-				var count=0
-				for(var i in list ){
-					var obj=list[i];
-					if(obj.ck){
-						count++;
-					}
-				}
-			
-				return count;
-			}
-		},
-		 
-		methods: {
-			alerttipsCk(){
-				uni.redirectTo({
-					url:"/pages/login/login?jpcode2=invoice"
-				})
-			},
-			view(id){
-				uni.navigateTo({
-					url:"/pages/MyInvoice/invoiceDetail?id="+id
-				})
-			},
-			changeitem(e,item){
-				
-				item.ck=e.value
-				if(!e.value){
-					this.allck=false
-				}
-			},
-			allckBtn(e){
-				console.log(e.value)
-					var list=this.list[0].list;	
-				if(e.value){
-					for(var i in list ){
-						var obj=list[i];
-						if(obj.ck){
-							 
-						}else{
-							obj.ck=true
-						}
-					}
-						this.$forceUpdate()
-				}
-			
-			},
-			getlist(bl) {
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				var current=this.current;
-				var pageIndex=this.list[current].pageIndex;
-				var list=this.list[current].list;
-				if (bl) {
-					 list = [];
-					 this.list[current].pageIndex=1;
-					pageIndex = 1;
-				}
-			 
-				API.invoiceList({
-					pageIndex: pageIndex,
-					status:current,
-				
-				}).then((res) => {
-					uni.hideLoading();
-					
-					var datalist=[]
-					// if(current==0){
-					// 	datalist=res.data.station;
-					// }
-					// if(current==1){
-					// 	datalist=res.data.data;
-					// }
-					datalist=res.data.data;
-					
-					for(var i in datalist){
-						var obj=datalist[i]
-						obj.ck=false;
-						this.allck=false;
-					}
-					this.list[current].list = [
-						...list,
-						...datalist
-					];
-					this.list[current].recordsTotal = res.data.recordsTotal;
-				}).catch(error => {
-					uni.showToast({
-						title: error,
-						icon: "none"
-					})
-				})
-			},
-			myLoadmore() {
-				var pageIndex=this.list[this.current].pageIndex;
-				
-				pageIndex += 1;
-				this.list[this.current].pageIndex=pageIndex;
-				
-				this.getlist()
-			},
-			change(index) {
-				this.current = index;
-				var list =this.list[this.current].list
-				this.getlist(true);
-			},
-			submit(id){
-				if(this.personInfo&&this.personInfo.userType==1 ){
-					uni.showModal({
-						title: "提示",
-						content: "游客模式下需要补全手机号信息,点击前往",
-						confirmText: "补全手机号",
-						success: res1 => {
-							if (res1.confirm) {
-								this.alerttipsCk()
-							} else if (res1.cancel) {
-								//('用户点击取消');
-							}
-						}
-					})
-					return
-				}
-				if(!id){
-					id=this.selectIds
-				}
-				if(!id){
-					uni.showToast({
-						title:"请至少勾选一条记录"
-					})
-					return
-				}
-				
-				uni.navigateTo({
-					url:'/pages/MyInvoice/issueInvoice?ids='+id
-				})
-			}
-				
-		},
-	}
-</script>
-
-<style lang="scss" scoped>
-	.carNone{
-		display: flex;
-		flex-direction: column;
-		justify-content: center;
-		align-items: center;
-		img{
-			width: 100%;
-			height: 100%;
-		}
-		p{
-			margin-top: -60px;
-		}
-	}
-	page{
-		padding-bottom: 100px;
-	}
-	.management{
-		position: absolute;
-		right: 16px;
-		font-size: 12px
-	}
-	/deep/.u-scroll-box{
-		 width: 65.8% !important;
-		 margin: 0 auto;
-		 display: flex;
-		 
-	}
-	/deep/.u-tab-bar{
-		width: 24% !important;
-		left: -8% !important;
-		background-color: #00B962 !important; }
-	
-	// 未开票
-	.flex{
-		display: flex;
-	}
-	.not-invoiced-item,.invoiced-item{
-		width: 91.4%;
-		border-radius: 12px;
-		background-color: rgba(255, 255, 255, 100);
-		border: 1px solid rgba(235, 235, 235, 100);
-		padding: 16px 0;
-		padding-left: 18px;
-		margin:12px auto;
-		
-	}
-	.content{
-		width: 100%;
-		margin-left: 4px;
-		.title{
-			line-height: 18px;
-			color: rgba(16, 16, 16, 100);
-			font-size: 16px;
-			margin-bottom: 12px;
-			padding-right: 12px;
-			display: flex;
-			justify-content: space-between;
-			.price,.invoice,.have-invoiced{
-				height: 18px;
-				color: rgba(255, 61, 0, 100);
-				font-size: 18px;
-				
-			}
-			
-		}
-		
-		p{
-			color: rgba(102, 102, 102, 100);
-			line-height: 26px;
-			
-		}
-		.text-1{
-			display: inline-block;
-			width: 22vw;
-			color: #666666;
-		}
-		.text-2{
-			display: inline-block;
-			margin-left:4px;
-			width:50vw;
-			color: #101010;
-			
-		}
-		// .order-box{
-			
-		// 	display: flex;
-		// 	.order{
-		// 		width: 17vw;
-		// 	}
-		// 	.order-num{
-				
-		// 		width:55vw;
-		// 		margin-left:4px;
-		// 		overflow: hidden;
-		// 		white-space: nowrap;
-		// 		text-overflow: ellipsis;
-				
-		// 	}
-		// }
-		
-	}
-	.radio{
-		margin: auto 0;
-		/deep/.uni-radio-input{
-			width: 20px !important;
-			height: 20px !important;
-		}
-	}
-	
-	.bottom{
-		width: 100%;
-		padding: 14px 13px;
-		background-color: rgba(255, 255, 255, 100);
-		position: fixed;
-		bottom: 0;
-		left: 0;
-		display: flex;
-		.check-all{
-			font-size: 16px;
-			margin: auto 5px;
-		}
-		.total{
-			flex: 1;
-			// margin-left: 80px;
-			text-align: right;
-			.total-price{
-				font-size:16px
-			}
-			.order{
-				font-size: 12px;
-				
-			}
-		}
-		/deep/.u-btn{
-			width: 27.7%;
-			line-height: 40px;
-			font-size: 18px;
-			margin-left:20px;
-		}
-	}
-	.invoice{
-		color: rgba(255, 97, 0, 100) !important;
-	}
-	.have-invoiced{
-		color: rgba(0, 185, 98, 100) !important;
-	}
-	.tips{
-		color: rgba(153, 153, 153, 100);
-		text-align: center;
-	}
+<template>
+	<view >
+		<ujp-navbar title="我的发票">
+			<text class="management" @click="gotoUrl('pages/MyInvoice/invoiceTitleManagement')">抬头管理</text>
+		</ujp-navbar>
+		<u-alert-tips type="warning"  v-if="personInfo&&personInfo.userType==1" 
+		 :descStyle="{
+			     fontSize: '28rpx',
+			     color: '#ef7a30',
+		 }" @click="alerttipsCk"
+		 :show-icon="true"  :description="description"></u-alert-tips>
+	
+			<u-tabs  inactive-color="#888888" active-color="#101010" :list="list" :is-scroll="true"
+					:current="current" @change="change"></u-tabs>
+	
+	
+		<view class="carNone" v-if="list[current].list.length == 0">
+				<img src="@/assets/static/img/暂无数据-缺省页.png" alt="">
+				<p class="oldTextjp2" oldstyle="font-size: 18px;">暂无记录</p>
+			</view>
+
+<!-- 未开票 -->
+      <view class="not-invoiced" v-show="current==0">
+		  
+        <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>
+			<view class="content oldTextjp2" 
+			 oldstyle="font-size: 14px;"
+			 @click="submit(item.id)">
+				<view class="title">
+					{{item.stationName}} <text class="price">{{item.actualFee?item.actualFee.toFixed(2):'0.00'}}元</text>
+				</view>
+				<p><text class="text-1">充电电量</text> <text class="text-2">{{item.electricQuantity/10000}}度</text></p>
+				<p><text class="text-1">开始时间</text> <text class="text-2">{{item.startTime?item.startTime:item.endTime}}</text></p>
+				 <p><text class="text-1">结束时间</text> <text class="text-2">{{item.endTime}}</text></p>
+				 <p><text class="text-1">车牌号</text> <text class="text-2">{{item.carNumber}}</text></p>
+				 
+			</view>
+			
+        	
+        </view>
+		
+       <p class="tips" v-if="list[current].list.length == list[current].recordsTotal && list[current].recordsTotal != 0" > 已经到底了</p>
+       
+		
+      	
+		<view class="bottom">
+			<view class="radio">
+				<u-checkbox v-model="allck" @change="allckBtn"></u-checkbox>
+			</view>
+			<view class="check-all">
+				全选
+			</view>
+			<view class="total">
+				<p class="total-price">共<text style="color: #FF7300;" >{{sumActualFee.toFixed(2)}}元</text></p>
+				<p class="order">{{selectcount}}个订单</p>
+			</view>
+			<u-button type="success" @click="submit()" shape="circle">去开票</u-button>
+		</view>
+      </view>
+	  <!-- 已开票 -->
+	  <view class="invoiced" v-show="current==1">
+	  	<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">
+	  				{{item.stationName}} <text :class="{
+						invoice:item.status==1,
+						'have-invoiced':item.status==2
+					}">{{item.statusText}}</text>
+	  			</view>
+	  			<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>
+	  	</view>
+	<!-- 	<view class="invoiced-item">
+			<view class="content">
+				<view class="title">
+					玉桥公园充电站 <text class="have-invoiced">开票成功</text>
+				</view>
+				<p><text>发票抬头</text> <text class="text-2">50.00元</text></p>
+				<p><text class="text-1">发票抬头</text> <text class="text-2">刘德华</text></p>
+				<p><text class="text-1">申请时间</text> <text class="text-2">2022-06-23 16：00：00</text></p>
+			</view>
+		</view> -->
+		<p class="tips"> 仅展示最近12个月的发票信息</p>
+	  </view>
+	</view>
+</template>
+
+<script>
+	import * as API from '@/apis/invoiceApi.js'
+	
+	export default {
+		data() {
+			return {
+				allck:false,
+				list: [{
+					value:0,
+					name: '未开发票',
+					pageIndex: 1,
+					recordsTotal: 0,
+					list:[],
+				}, {
+					value:1,
+					name: '已开发票',
+					pageIndex: 1,
+					recordsTotal: 0,
+					list:[],
+				}],
+				current: 0,
+				personInfo:{},
+				description:"游客模式下需要补全手机号信息,点击前往",
+				
+			}
+		},
+		onReachBottom() {
+			var list=this.list[this.current].list;
+			var recordsTotal=this.list[this.current].recordsTotal;
+			
+			if (list.length < recordsTotal) {			
+				this.myLoadmore();
+			}
+		},
+		onShow(){
+			this.personInfo=this.carhelp.getPersonInfo()
+			this.getlist(true);
+		},
+		computed:{
+			
+			sumActualFee(){
+				try{
+					var list=this.list[0].list;
+					var sum=0;
+					 
+					for(var i in list ){
+						var obj=list[i];
+						if(obj.ck){
+						 
+							sum+=obj.actualFee*100
+						}
+					}
+								 
+					return sum/100
+				}catch(e){
+					//TODO handle the exception
+					return 0
+				}
+			
+			},
+			selectIds(){
+				var list=this.list[0].list;
+				var sz=[]
+				for(var i in list ){
+					var obj=list[i];
+					if(obj.ck){
+						sz.push(obj.id);
+					}
+				}
+							
+				return sz.join();
+			},
+			selectcount(){
+				var list=this.list[0].list;		 
+				var count=0
+				for(var i in list ){
+					var obj=list[i];
+					if(obj.ck){
+						count++;
+					}
+				}
+			
+				return count;
+			}
+		},
+		 
+		methods: {
+			alerttipsCk(){
+				uni.redirectTo({
+					url:"/pages/login/login?jpcode2=invoice"
+				})
+			},
+			view(id){
+				uni.navigateTo({
+					url:"/pages/MyInvoice/invoiceDetail?id="+id
+				})
+			},
+			changeitem(e,item){
+				
+				item.ck=e.value
+				if(!e.value){
+					this.allck=false
+				}
+			},
+			allckBtn(e){
+				console.log(e.value)
+					var list=this.list[0].list;	
+				if(e.value){
+					for(var i in list ){
+						var obj=list[i];
+						if(obj.ck){
+							 
+						}else{
+							obj.ck=true
+						}
+					}
+						this.$forceUpdate()
+				}
+			
+			},
+			getlist(bl) {
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				var current=this.current;
+				var pageIndex=this.list[current].pageIndex;
+				var list=this.list[current].list;
+				if (bl) {
+					 list = [];
+					 this.list[current].pageIndex=1;
+					pageIndex = 1;
+				}
+			 
+				API.invoiceList({
+					pageIndex: pageIndex,
+					status:current,
+				
+				}).then((res) => {
+					uni.hideLoading();
+					
+					var datalist=[]
+					// if(current==0){
+					// 	datalist=res.data.station;
+					// }
+					// if(current==1){
+					// 	datalist=res.data.data;
+					// }
+					datalist=res.data.data;
+					
+					for(var i in datalist){
+						var obj=datalist[i]
+						obj.ck=false;
+						this.allck=false;
+					}
+					this.list[current].list = [
+						...list,
+						...datalist
+					];
+					this.list[current].recordsTotal = res.data.recordsTotal;
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+			},
+			myLoadmore() {
+				var pageIndex=this.list[this.current].pageIndex;
+				
+				pageIndex += 1;
+				this.list[this.current].pageIndex=pageIndex;
+				
+				this.getlist()
+			},
+			change(index) {
+				this.current = index;
+				var list =this.list[this.current].list
+				this.getlist(true);
+			},
+			submit(id){
+				if(this.personInfo&&this.personInfo.userType==1 ){
+					uni.showModal({
+						title: "提示",
+						content: "游客模式下需要补全手机号信息,点击前往",
+						confirmText: "补全手机号",
+						success: res1 => {
+							if (res1.confirm) {
+								this.alerttipsCk()
+							} else if (res1.cancel) {
+								//('用户点击取消');
+							}
+						}
+					})
+					return
+				}
+				if(!id){
+					id=this.selectIds
+				}
+				if(!id){
+					uni.showToast({
+						title:"请至少勾选一条记录"
+					})
+					return
+				}
+				
+				uni.navigateTo({
+					url:'/pages/MyInvoice/issueInvoice?ids='+id
+				})
+			}
+				
+		},
+	}
+</script>
+
+<style lang="scss" scoped>
+	.carNone{
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		img{
+			width: 100%;
+			height: 100%;
+		}
+		p{
+			margin-top: -60px;
+		}
+	}
+	page{
+		padding-bottom: 100px;
+	}
+	.management{
+		position: absolute;
+		right: 16px;
+		font-size: 12px
+	}
+	/deep/.u-scroll-box{
+		 width: 65.8% !important;
+		 margin: 0 auto;
+		 display: flex;
+		 
+	}
+	/deep/.u-tab-bar{
+		width: 24% !important;
+		left: -8% !important;
+		background-color: #00B962 !important; }
+	
+	// 未开票
+	.flex{
+		display: flex;
+	}
+	.not-invoiced-item,.invoiced-item{
+		width: 91.4%;
+		border-radius: 12px;
+		background-color: rgba(255, 255, 255, 100);
+		border: 1px solid rgba(235, 235, 235, 100);
+		padding: 16px 0;
+		padding-left: 18px;
+		margin:12px auto;
+		
+	}
+	.content{
+		width: 100%;
+		margin-left: 4px;
+		.title{
+			line-height: 18px;
+			color: rgba(16, 16, 16, 100);
+			font-size: 16px;
+			margin-bottom: 12px;
+			padding-right: 12px;
+			display: flex;
+			justify-content: space-between;
+			.price,.invoice,.have-invoiced{
+				height: 18px;
+				color: rgba(255, 61, 0, 100);
+				font-size: 18px;
+				
+			}
+			
+		}
+		
+		p{
+			color: rgba(102, 102, 102, 100);
+			line-height: 26px;
+			
+		}
+		.text-1{
+			display: inline-block;
+			width: 22vw;
+			color: #666666;
+		}
+		.text-2{
+			display: inline-block;
+			margin-left:4px;
+			width:50vw;
+			color: #101010;
+			
+		}
+		// .order-box{
+			
+		// 	display: flex;
+		// 	.order{
+		// 		width: 17vw;
+		// 	}
+		// 	.order-num{
+				
+		// 		width:55vw;
+		// 		margin-left:4px;
+		// 		overflow: hidden;
+		// 		white-space: nowrap;
+		// 		text-overflow: ellipsis;
+				
+		// 	}
+		// }
+		
+	}
+	.radio{
+		margin: auto 0;
+		/deep/.uni-radio-input{
+			width: 20px !important;
+			height: 20px !important;
+		}
+	}
+	
+	.bottom{
+		width: 100%;
+		padding: 14px 13px;
+		background-color: rgba(255, 255, 255, 100);
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		display: flex;
+		.check-all{
+			font-size: 16px;
+			margin: auto 5px;
+		}
+		.total{
+			flex: 1;
+			// margin-left: 80px;
+			text-align: right;
+			.total-price{
+				font-size:16px
+			}
+			.order{
+				font-size: 12px;
+				
+			}
+		}
+		/deep/.u-btn{
+			width: 27.7%;
+			line-height: 40px;
+			font-size: 18px;
+			margin-left:20px;
+		}
+	}
+	.invoice{
+		color: rgba(255, 97, 0, 100) !important;
+	}
+	.have-invoiced{
+		color: rgba(0, 185, 98, 100) !important;
+	}
+	.tips{
+		color: rgba(153, 153, 153, 100);
+		text-align: center;
+	}
 </style>

pages/MyInvoice/invoiceTitleManagement.vue

@@ -4,7 +4,7 @@
 		<view class="main">
     <view class="item">
     	<view class="title">
-    		<img src="../../static/img/riFill-building-fill@1x.png" alt="">企业单位
+    		<img src="@/assets/static/img/riFill-building-fill@1x.png" alt="">企业单位
     	</view>
 		<template v-if="companyTypes.length">
 			<view class="content" v-for="(item, index) in companyTypes" :key="index"  >
@@ -14,7 +14,7 @@
 					<p class="num">{{item.companyTaxNo}}</p>
 				</view>
 				<view class="edit" @click="editBtn(item)" >
-					<img src="../../static/img/riFill-edit-2-fill@1x.png" alt="">
+					<img src="@/assets/static/img/riFill-edit-2-fill@1x.png" alt="">
 				</view>
 			</view>
 		</template>
@@ -29,7 +29,7 @@
     </view>
 	<view class="item">
 		<view class="title">
-			<img src="../../static/img/riFill-user-3-fill.svg" alt="">个人/非企业单位
+			<img src="@/assets/static/img/riFill-user-3-fill.svg" alt="">个人/非企业单位
 		</view>
 		<template v-if="personTypes.length">
 			<view class="content name-content"  v-for="(item, index) in personTypes" :key="index"  >
@@ -37,7 +37,7 @@
 					<p class="name">{{item.title}}<text v-if="item.defaultHeader=='1'" class="default">默认</text></p>
 				</view>
 				<view class="edit"  @click="editBtn(item)" >
-					<img src="../../static/img/riFill-edit-2-fill@1x.png" alt="">
+					<img src="@/assets/static/img/riFill-edit-2-fill@1x.png" alt="">
 				</view>
 			</view>
 		</template>

pages/cardBag/cardBag.vue

@@ -89,15 +89,15 @@
 
 
 			<view class="carNone" v-if="current==1&&businessVipList.length==0&&showList.length==0">
-				<img src="static/img/暂无数据-缺省页.png" alt="">
+				<img src="@/assets/static/img/暂无数据-缺省页.png" alt="">
 				<p class="oldTextjp2" oldstyle="font-size: 18px;">暂无数据</p>
 			</view>
 			<view class="carNone" v-if="current==2&&expireUserCardList.length==0">
-				<img src="static/img/暂无数据-缺省页.png" alt="">
+				<img src="@/assets/static/img/暂无数据-缺省页.png" alt="">
 				<p class="oldTextjp2" oldstyle="font-size: 18px;">暂无数据</p>
 			</view>
 			<view class="carNone" v-if="current==0&&notActiveCardList.length==0">
-				<img src="static/img/暂无数据-缺省页.png" alt="">
+				<img src="@/assets/static/img/暂无数据-缺省页.png" alt="">
 				<p class="oldTextjp2" oldstyle="font-size: 18px;">暂无数据</p>
 			</view>
 		</view>

pages/cardBag/cardDetail.vue

@@ -9,7 +9,7 @@
 			</view>
 		</ujp-navbar>
 		<u-mask :show="show" @click="show = false">
-			<u-image width="100%" :mode="'widthFix'" src="/static/img/guide_point2.png"></u-image>
+			<u-image width="100%" :mode="'widthFix'" src="@/assets/static/img/guide_point2.png"></u-image>
 
 		</u-mask>
 		<u-modal v-model="show2" :content="content2" @confirm="confirmShow2" :show-cancel-button="true"

pages/discountCard/myOrder.vue

@@ -1,236 +1,236 @@
-<template>
-	<view>
-		<ujp-navbar title="订单列表"></ujp-navbar>
-		<view class="tabs" v-if="false">
-			<u-tabs active-color="#00B962" :list="list" :is-scroll="false" :current="current" @change="change"></u-tabs>
-		</view>
-		<view class="card" v-for="(item,i) in list[current].list"   :key="i" >
-			<view class="state">
-				<view class="time">
-					订单生成时间：{{item.createTime}}
-				</view>
-				<view class="payment-state">
-					{{item.status=='1'?'已付款':''}}
-					{{item.status=='0'?'未付款':''}}
-				</view>
-			</view>
-			<view class="card-infos">
-				<view class="picture">
-					<img :src="item.monthlyRentCard.image" alt="">
-				</view>
-				<view class="infos">
-					<view class="name">
-						{{item.monthlyRentName}}
-					</view>
-					<view class="usable" v-if="item.monthlyRentCard.classify==2">
-						可用{{item.monthlyRentCard.chargeDegreeLimit}}度（有效期{{setValidity(item.monthlyRentCard.periodOfValidity)}}）
-					</view>
-					<view class="price">
-						{{item.monthlyRentCard.price}}元
-					</view>
-				</view>
-				<view class="amount">
-					x1
-				</view>
-			</view>
-			
-			<view class="order-amount">
-				<view class="title">
-					订单金额
-				</view>
-				<view class="value">
-					{{item.monthlyRentCard.price}}元
-				</view>
-			</view>
-			
-		</view>
-		<u-divider  bg-color="#F2F4F4" v-if="list[current].list.length&&list[current].list.length == list[current].recordsTotal" >已经到底了</u-divider>
-		
-		<view class="carNone" v-if="list[current].list.length == 0">
-				<img src="static/img/暂无数据-缺省页.png" alt="">
-				<p class="oldTextjp2" oldstyle="font-size: 18px;">暂无记录</p>
-			</view>
-			
-	</view>
-</template>
-
-<script>
-	import * as API from '@/apis/order.js'
-	
-	export default {
-		data() {
-			return {
-				list: [{
-					name: '全部',
-					pageIndex: 1,
-					pageSize: 20,
-					recordsTotal: 1,
-					status: "",
-					list: []
-				}, {
-					name: '未付款',
-					pageIndex: 1,
-					pageSize: 20,
-					recordsTotal: 1,
-					status: "0",
-					list: []
-				}, {
-					name: '已付款',
-					pageIndex: 1,
-					pageSize: 20,
-					recordsTotal: 1,
-					status: "1",
-					list: []
-					
-				}],
-				current: 2
-			}
-		},
-		onLoad(op) {
-			if (op.c) {
-				this.current = op.c
-			}
-			this.getList();
-		},
-		onReachBottom() {
-			var obj = this.list[this.current]
-			if (obj.list.length < obj.recordsTotal) {
-				this.myLoadmore();
-			}
-		},
-		methods: {
-			
-			getList() {
-			
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				var list = this.list[this.current].list
-				var obj = this.list[this.current]
-				var listForm = {
-					...obj
-				}
-				delete listForm.list
-			
-				API.buyCardList(listForm).then((res) => {
-			
-					if (listForm.pageIndex == 1) {
-						list = res.data.data;
-					} else {
-						list = [
-							...list,
-							...res.data.data
-						];
-					}
-			
-					this.list[this.current].list = list
-			
-					this.list[this.current].recordsTotal = res.data.recordsTotal;
-					uni.hideLoading();
-				}).catch(error => {
-					uni.showToast({
-						icon: 'none',
-						title: error,
-						icon: "none"
-					})
-				})
-			
-			},
-			myLoadmore() {
-				this.list[this.current].pageIndex += 1;
-				this.getList();
-			},
-			change(index) {
-				this.current = index;
-				var list = this.list[this.current].list
-				this.list[this.current].pageIndex = 1;
-				this.list[this.current].list = [];
-				this.getList();
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.carNone{
-		display: flex;
-		flex-direction: column;
-		justify-content: center;
-		align-items: center;
-		img{
-			width: 100%;
-			height: 100%;
-		}
-		p{
-			margin-top: -60px;
-		}
-	}
-	.tabs{
-		padding: 0 80rpx;
-		background-color: #fff;
-	}
-	.card{
-		margin: 24rpx;
-		padding: 24rpx;
-		background-color: #fff;
-		border-radius: 16rpx;
-		.state{
-			display: flex;
-			align-items: center;
-			justify-content: space-between;
-			.time{
-				color: rgba(119, 119, 119, 1);
-			}
-			.payment-state{
-				color: rgba(51, 51, 51, 1);
-			}
-		}
-		.card-infos{
-			margin: 32rpx 0 40rpx ;
-			display: flex;
-			align-items: center;
-			.picture{
-				width: 152rpx;
-				height: 152rpx;
-				border-radius: 4px;
-				img{
-					width: 100%;
-				}
-			}
-			.infos{
-				margin-left: 26rpx;
-				.name{
-					color: rgba(51, 51, 51, 1);
-					font-size: 32rpx;
-					font-weight: bold;
-				}
-				.usable{
-					color: rgba(119, 119, 119, 1);
-					font-size: 24rpx;
-					margin-top: 8rpx;
-				}
-				.price{
-					color: rgba(16, 16, 16, 1);
-					font-size: 32rpx;
-					margin-top: 24rpx;
-				}
-			}
-			.amount{
-				margin-left: auto;
-				color: rgba(51, 51, 51, 1);
-				font-size: 32rpx;
-			}
-		}
-		.order-amount{
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			color: rgba(51, 51, 51, 1);
-			.value{
-				font-size: 32rpx;
-			}
-		}
-	}
-
-</style>
+<template>
+	<view>
+		<ujp-navbar title="订单列表"></ujp-navbar>
+		<view class="tabs" v-if="false">
+			<u-tabs active-color="#00B962" :list="list" :is-scroll="false" :current="current" @change="change"></u-tabs>
+		</view>
+		<view class="card" v-for="(item,i) in list[current].list"   :key="i" >
+			<view class="state">
+				<view class="time">
+					订单生成时间：{{item.createTime}}
+				</view>
+				<view class="payment-state">
+					{{item.status=='1'?'已付款':''}}
+					{{item.status=='0'?'未付款':''}}
+				</view>
+			</view>
+			<view class="card-infos">
+				<view class="picture">
+					<img :src="item.monthlyRentCard.image" alt="">
+				</view>
+				<view class="infos">
+					<view class="name">
+						{{item.monthlyRentName}}
+					</view>
+					<view class="usable" v-if="item.monthlyRentCard.classify==2">
+						可用{{item.monthlyRentCard.chargeDegreeLimit}}度（有效期{{setValidity(item.monthlyRentCard.periodOfValidity)}}）
+					</view>
+					<view class="price">
+						{{item.monthlyRentCard.price}}元
+					</view>
+				</view>
+				<view class="amount">
+					x1
+				</view>
+			</view>
+			
+			<view class="order-amount">
+				<view class="title">
+					订单金额
+				</view>
+				<view class="value">
+					{{item.monthlyRentCard.price}}元
+				</view>
+			</view>
+			
+		</view>
+		<u-divider  bg-color="#F2F4F4" v-if="list[current].list.length&&list[current].list.length == list[current].recordsTotal" >已经到底了</u-divider>
+		
+		<view class="carNone" v-if="list[current].list.length == 0">
+				<img src="@/assets/static/img/暂无数据-缺省页.png" alt="">
+				<p class="oldTextjp2" oldstyle="font-size: 18px;">暂无记录</p>
+			</view>
+			
+	</view>
+</template>
+
+<script>
+	import * as API from '@/apis/order.js'
+	
+	export default {
+		data() {
+			return {
+				list: [{
+					name: '全部',
+					pageIndex: 1,
+					pageSize: 20,
+					recordsTotal: 1,
+					status: "",
+					list: []
+				}, {
+					name: '未付款',
+					pageIndex: 1,
+					pageSize: 20,
+					recordsTotal: 1,
+					status: "0",
+					list: []
+				}, {
+					name: '已付款',
+					pageIndex: 1,
+					pageSize: 20,
+					recordsTotal: 1,
+					status: "1",
+					list: []
+					
+				}],
+				current: 2
+			}
+		},
+		onLoad(op) {
+			if (op.c) {
+				this.current = op.c
+			}
+			this.getList();
+		},
+		onReachBottom() {
+			var obj = this.list[this.current]
+			if (obj.list.length < obj.recordsTotal) {
+				this.myLoadmore();
+			}
+		},
+		methods: {
+			
+			getList() {
+			
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				var list = this.list[this.current].list
+				var obj = this.list[this.current]
+				var listForm = {
+					...obj
+				}
+				delete listForm.list
+			
+				API.buyCardList(listForm).then((res) => {
+			
+					if (listForm.pageIndex == 1) {
+						list = res.data.data;
+					} else {
+						list = [
+							...list,
+							...res.data.data
+						];
+					}
+			
+					this.list[this.current].list = list
+			
+					this.list[this.current].recordsTotal = res.data.recordsTotal;
+					uni.hideLoading();
+				}).catch(error => {
+					uni.showToast({
+						icon: 'none',
+						title: error,
+						icon: "none"
+					})
+				})
+			
+			},
+			myLoadmore() {
+				this.list[this.current].pageIndex += 1;
+				this.getList();
+			},
+			change(index) {
+				this.current = index;
+				var list = this.list[this.current].list
+				this.list[this.current].pageIndex = 1;
+				this.list[this.current].list = [];
+				this.getList();
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.carNone{
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		img{
+			width: 100%;
+			height: 100%;
+		}
+		p{
+			margin-top: -60px;
+		}
+	}
+	.tabs{
+		padding: 0 80rpx;
+		background-color: #fff;
+	}
+	.card{
+		margin: 24rpx;
+		padding: 24rpx;
+		background-color: #fff;
+		border-radius: 16rpx;
+		.state{
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			.time{
+				color: rgba(119, 119, 119, 1);
+			}
+			.payment-state{
+				color: rgba(51, 51, 51, 1);
+			}
+		}
+		.card-infos{
+			margin: 32rpx 0 40rpx ;
+			display: flex;
+			align-items: center;
+			.picture{
+				width: 152rpx;
+				height: 152rpx;
+				border-radius: 4px;
+				img{
+					width: 100%;
+				}
+			}
+			.infos{
+				margin-left: 26rpx;
+				.name{
+					color: rgba(51, 51, 51, 1);
+					font-size: 32rpx;
+					font-weight: bold;
+				}
+				.usable{
+					color: rgba(119, 119, 119, 1);
+					font-size: 24rpx;
+					margin-top: 8rpx;
+				}
+				.price{
+					color: rgba(16, 16, 16, 1);
+					font-size: 32rpx;
+					margin-top: 24rpx;
+				}
+			}
+			.amount{
+				margin-left: auto;
+				color: rgba(51, 51, 51, 1);
+				font-size: 32rpx;
+			}
+		}
+		.order-amount{
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			color: rgba(51, 51, 51, 1);
+			.value{
+				font-size: 32rpx;
+			}
+		}
+	}
+
+</style>

pages/index/activity.vue

@@ -36,7 +36,8 @@
 						<view class="news-time">{{item.createTime ? item.createTime.slice(5,16) : ''}}</view>
 					</view>
 					<view class="content-img">
-						<img :src="item.pic ? item.pic : 'static/img/image_default.png'" alt="">
+						<img v-if="item.pic " :src="item.pic" alt="">
+						<img v-else src="@/assets/static/img/image_default.png" alt="">
 					</view>
 				</view>
 				<u-divider v-if="newsList.length!=0&&newsList.length ==recordsTotal">已经到底了</u-divider>

pages/index/all.vue

@@ -1,1024 +1,1024 @@
-<template>
-	<view>
-		<ujp-navbar :title="title"  ></ujp-navbar>
-		<!-- 充电状态 -->
-		<view class="state1 state" v-if="chargeList.length > 0"
-		
-		 v-for="(item,index) in chargeList"   :key="item.id"
-			@click="gotoUrl('pages/searchPile/chargeProcess/dcCharging?id=' + item.id)">
-			<view class="state-text">
-				<view class="text-1 " oldstyle="font-size: 20px;">
-					<span v-if="item.carNumber">{{item.carNumber}}</span> 
-				
-					{{item.statusText}}...
-				</view>
-				<view v-if="item.status == '0'" class="text-2 " oldstyle="font-size: 16px;">
-					 
-					启动中
-				</view>
-				<view v-if="item.status == '1'" class="text-2 " oldstyle="font-size: 16px;">
-					
-					已充
-					<span class="text-21">{{item.electricQuantity?(item.electricQuantity/10000).toFixed(1):'0.0'}}度</span>
-					合计<span class="text-22">{{item.dueFee != null ? item.dueFee.toFixed(2) : '0.00'}}元</span>
-					<view style="display: initial;" v-if="item.endSoc">电量<span class="text-21">{{item.endSoc}}%</span></view>
-				</view>
-				<!-- <view v-if="item.status == '2'" class="text-2" style="color: red;">
-				超出时间将收取占位费
-			</view> -->
-				<view v-if="item.status == '4'" class="text-2 oldTextjp2" oldstyle="font-size: 16px;">
-					<span v-if="item.waitNum==1">请耐心等待</span>
-					<span v-else >前方等待{{item.waitNum-1}}位</span>
-				</view>
-				<view class="text-3 " oldstyle="font-size: 16px;">
-				<p style=" width: 160%;">{{item.deviceName}}枪{{channelNoShow(item.channelNo,item.manufacturer)}}/{{item.stationName}}<br/>当前电价{{item.chargingCostPrice.toFixed(2)}}元/度</p>
-				</view>
-			</view>
-			<view class="img-box4" >
-				
-				<img v-if="item.status == '0'" src="static/img/等待中-缺省页.png">
-				<img v-if="item.status == '1'" src="static/img/充电中-缺省页.png">
-				<img v-if="item.status == '2'" src="static/img/已充满-缺省页.png">
-				<img v-if="item.status == '4'" src="static/img/等待中-缺省页.png">
-				<view class="img-view">
-					<view class="more-icon iconfont">查看 &#xe600;</view>
-					</view>
-				
-			</view>
-		</view>
-		<view class="bottom"   v-if="chargeList.length > 0" >
-			<view class="bot">
-				<view class="bot-line"></view>
-				<view class="bot-text oldTextjp2" oldstyle="font-size: 14px;">已经到底了</view>
-				<view class="bot-line"></view>
-			</view>
-		</view>
-		<view class="carNone" v-if="chargeList.length == 0">
-			<img src="static/img/暂无数据-缺省页.png" alt="">
-			<p class="oldTextjp2" oldstyle="font-size: 18px;">暂无充电订单</p>
-		</view>
-	</view>
-</template>
-
-<script>
-	import * as API from '@/apis/index.js'
-	export default {
-		data() {
-			return {
-				title:"充电车辆",
-				chargeList:[],
-				timeOut2: false,
-				
-			}
-		},
-		methods: {
-			onShow() {
-				if(this.timeOut2==false){
-					this.timeOut2=true;
-					this.getFindChargeData();
-				}
-				
-					
-			},
-			onUnload() {
-				this.timeOut2 = false;
-			
-			},
-			onHide() {
-				this.timeOut2 = false;
-				
-			},
-			getFindChargeData() {
-				if (!this.timeOut2) {
-					return
-				}
-				this.timeOut2=false
-				API.findChargeData().then((res) => {
-					this.chargeList = res.data.chargingRecordList;
-					if(this.chargeList.length){
-						this.title=`充电车辆（${this.chargeList.length}）`
-					}else{
-						this.title=`充电车辆`
-					}
-					var list = res.data.chargingRecordList;
-					for (var i = 0; i < list.length; i++) {
-						if (list[i].status == '1' || list[i].status == '4') {
-							this.timeOut2 = true;
-						}
-					}
-					if (this.timeOut2) {
-						setTimeout(() => {
-							this.getFindChargeData();
-						}, 5000)
-					}
-				}).catch(error => {
-					uni.showToast({
-						title: error,
-						icon: "none"
-					})
-				})
-			},
-		}
-	}
-</script>
-
-
-<style lang="scss" scoped>
-	.carNone{
-		display: flex;
-		flex-direction: column;
-		justify-content: center;
-		align-items: center;
-		img{
-			width: 100%;
-			height: 100%;
-		}
-		p{
-			margin-top: -60px;
-		}
-	}
-	.couponmain{
-		.main{
-			
-			margin: 100px auto 0;
-			position: relative;
-			.content{
-				padding: 24px;
-				padding-top: 50px;
-				background-color: #fff;
-				box-shadow: 0px 0px 0px 1px rgba(254, 229, 147, 100);
-				border: 2px solid rgba(253, 217, 141, 100);
-				border-radius: 8px;
-				.img{
-					width: 44vw;
-					height: 134px;
-					position: absolute;
-					top: -88px;
-					right: 0px;
-					img{
-						width: 100%;
-						height: 100%;
-					}
-				}
-		      .title{
-				  font-size: 16px;
-				  color: rgba(84, 45, 45, 100);
+<template>
+	<view>
+		<ujp-navbar :title="title"  ></ujp-navbar>
+		<!-- 充电状态 -->
+		<view class="state1 state" v-if="chargeList.length > 0"
+		
+		 v-for="(item,index) in chargeList"   :key="item.id"
+			@click="gotoUrl('pages/searchPile/chargeProcess/dcCharging?id=' + item.id)">
+			<view class="state-text">
+				<view class="text-1 " oldstyle="font-size: 20px;">
+					<span v-if="item.carNumber">{{item.carNumber}}</span> 
+				
+					{{item.statusText}}...
+				</view>
+				<view v-if="item.status == '0'" class="text-2 " oldstyle="font-size: 16px;">
+					 
+					启动中
+				</view>
+				<view v-if="item.status == '1'" class="text-2 " oldstyle="font-size: 16px;">
+					
+					已充
+					<span class="text-21">{{item.electricQuantity?(item.electricQuantity/10000).toFixed(1):'0.0'}}度</span>
+					合计<span class="text-22">{{item.dueFee != null ? item.dueFee.toFixed(2) : '0.00'}}元</span>
+					<view style="display: initial;" v-if="item.endSoc">电量<span class="text-21">{{item.endSoc}}%</span></view>
+				</view>
+				<!-- <view v-if="item.status == '2'" class="text-2" style="color: red;">
+				超出时间将收取占位费
+			</view> -->
+				<view v-if="item.status == '4'" class="text-2 oldTextjp2" oldstyle="font-size: 16px;">
+					<span v-if="item.waitNum==1">请耐心等待</span>
+					<span v-else >前方等待{{item.waitNum-1}}位</span>
+				</view>
+				<view class="text-3 " oldstyle="font-size: 16px;">
+				<p style=" width: 160%;">{{item.deviceName}}枪{{channelNoShow(item.channelNo,item.manufacturer)}}/{{item.stationName}}<br/>当前电价{{item.chargingCostPrice.toFixed(2)}}元/度</p>
+				</view>
+			</view>
+			<view class="img-box4" >
+				
+				<img v-if="item.status == '0'" src="@/assets/static/img/等待中-缺省页.png">
+				<img v-if="item.status == '1'" src="@/assets/static/img/充电中-缺省页.png">
+				<img v-if="item.status == '2'" src="@/assets/static/img/已充满-缺省页.png">
+				<img v-if="item.status == '4'" src="@/assets/static/img/等待中-缺省页.png">
+				<view class="img-view">
+					<view class="more-icon iconfont">查看 &#xe600;</view>
+					</view>
+				
+			</view>
+		</view>
+		<view class="bottom"   v-if="chargeList.length > 0" >
+			<view class="bot">
+				<view class="bot-line"></view>
+				<view class="bot-text oldTextjp2" oldstyle="font-size: 14px;">已经到底了</view>
+				<view class="bot-line"></view>
+			</view>
+		</view>
+		<view class="carNone" v-if="chargeList.length == 0">
+			<img src="@/assets/static/img/暂无数据-缺省页.png" alt="">
+			<p class="oldTextjp2" oldstyle="font-size: 18px;">暂无充电订单</p>
+		</view>
+	</view>
+</template>
+
+<script>
+	import * as API from '@/apis/index.js'
+	export default {
+		data() {
+			return {
+				title:"充电车辆",
+				chargeList:[],
+				timeOut2: false,
+				
+			}
+		},
+		methods: {
+			onShow() {
+				if(this.timeOut2==false){
+					this.timeOut2=true;
+					this.getFindChargeData();
+				}
+				
+					
+			},
+			onUnload() {
+				this.timeOut2 = false;
+			
+			},
+			onHide() {
+				this.timeOut2 = false;
+				
+			},
+			getFindChargeData() {
+				if (!this.timeOut2) {
+					return
+				}
+				this.timeOut2=false
+				API.findChargeData().then((res) => {
+					this.chargeList = res.data.chargingRecordList;
+					if(this.chargeList.length){
+						this.title=`充电车辆（${this.chargeList.length}）`
+					}else{
+						this.title=`充电车辆`
+					}
+					var list = res.data.chargingRecordList;
+					for (var i = 0; i < list.length; i++) {
+						if (list[i].status == '1' || list[i].status == '4') {
+							this.timeOut2 = true;
+						}
+					}
+					if (this.timeOut2) {
+						setTimeout(() => {
+							this.getFindChargeData();
+						}, 5000)
+					}
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+			},
+		}
+	}
+</script>
+
+
+<style lang="scss" scoped>
+	.carNone{
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		img{
+			width: 100%;
+			height: 100%;
+		}
+		p{
+			margin-top: -60px;
+		}
+	}
+	.couponmain{
+		.main{
+			
+			margin: 100px auto 0;
+			position: relative;
+			.content{
+				padding: 24px;
+				padding-top: 50px;
+				background-color: #fff;
+				box-shadow: 0px 0px 0px 1px rgba(254, 229, 147, 100);
+				border: 2px solid rgba(253, 217, 141, 100);
+				border-radius: 8px;
+				.img{
+					width: 44vw;
+					height: 134px;
+					position: absolute;
+					top: -88px;
+					right: 0px;
+					img{
+						width: 100%;
+						height: 100%;
+					}
+				}
+		      .title{
+				  font-size: 16px;
+				  color: rgba(84, 45, 45, 100);
 				  margin-bottom: 13px;
 				  
-					  
-			  }			
-			  .text{
-				  line-height: 24px;
-				  color: rgba(84, 45, 45, 100);
-				  font-size: 16px;
-				  text-align: justify;
-				  text-decoration:underline;
-				   text-decoration-color:#ECE3BA;
-				   text-indent: 32px;
-			  }
-			  .sign{
-				  text-align: right;
-				  margin-top: 8px;
-				  font-size: 16px;
-			  }
-			}
-			
-			// 专享优惠券
-			.exclusive{
-				background-color: #F5E4C8;
-				margin-top: 20px;
-				padding: 32rpx 32rpx 32rpx 32rpx ;
-				box-shadow: 0px 0px 0px 1px rgba(254, 229, 147, 100);
-				border: 2px solid rgba(253, 217, 141, 100);
-				border-radius: 8px;
-				.exclusive1{
-					
-					font-size: 48rpx;
-					color: rgba(51, 51, 51, 1);
-
-					font-family: SourceHanSerif-bold;
-				}
-				.exclusive2{
-					font-family: PingFangSC-regular;
-					color: rgba(51, 51, 51, 1);
-					font-size: 36rpx;
-				}
-				p{
-					width: 100%;
-					text-align: center;
-					//color: rgba(255, 73, 75, 100);
-					//font-size: 20px;
-				}
-				.img{
-					// width: 74.4vw;
-					// height: 84px;
-					margin-top: 16px;
-					position: relative;
-					img{
-						width: 100%;
-						height: 100%;
-						
-					}
-				}
-				
-					
-					
-					
-					.num{
-						font-size:54rpx;
-						color: rgba(252, 237, 179, 100);
-						position: absolute;
-						top:10px;
-						left: 8vw;
-						font-weight: 600;
-						.unit{
-							
-							font-size: 24rpx;
-							color: rgba(252, 237, 179, 100);
-						
-						}
-					}
-					
-					.unit2{
-						
-						font-size: 12px;
-						color: #FFF;
-						position: absolute;
-						top: 90rpx;
-						left: 24rpx;
-					}
-					.exclusive-text{
-						color: #333333;
-						font-size: 16rpx;
-					}
-					.exclusive-btn{
-						width: 80%;
-						margin-top: 48rpx;
-						border-radius: 50px;
-						background: linear-gradient(90.58deg, rgba(225,208,165,1) 0.05%,rgba(228,190,132,1) 98.67%);
-						color: rgba(51, 51, 51, 1);
-						font-size: 36rpx;
-						text-align: center;
-						box-shadow: 0px 8rpx 20rpx 0px rgba(184, 155, 103, 40);
-						font-family: -apple-system;
-						  //  width: 87.4%;
-						  //  margin-top: 20px;
-						  //  background-image: linear-gradient(#ffff00, #ff9600);
-						 //   color: #521e00;
-						   // font-size: 20px;
-						   // border-radius: 50px;
-					}
-					.ticket-info{
-						width: 40vw;
-						text-align: center;
-						position: absolute;
-						top: 18px;
-						right: 16rpx;
-						.ticket-name{
-							line-height: 40rpx;
-							color: rgba(16, 16, 16, 100);
-							font-size: 16rpx;
-							
-						}
-						.condition{
-							line-height: 22px;
-							color: #8a6f6f;
-							font-size: 12px;
-						}
-						
-					}
-				
-			}
-		}
-	}
-	
-	.oldTextClassF{
-		.text-2{
-			font-size: 36rpx !important;
-		}
-		.text-3{
-			font-size: 34rpx !important;
-		}
-		.station .price-free .price-1 .num{
-			
-			font-size: 48rpx !important;
-			line-height: 40rpx;
-			font-weight: bold;
-		}
-		
-	}
-	/deep/.u-image__loading{
-		 background:#ff000000;
-	 }
-	// 头部图片
-	img {
-		width: 100%;
-		// height: 100%;
-		
-	}
-     .background{
-		 background: linear-gradient(#D6EEDC,#FFFFFF );
-		 padding-top: 16px;
-	 }
-	.banner {
-		width: 91.4%;
-		margin: 0 auto ;
-		border-radius: 12px;
-		height: 120px;
-		overflow: hidden;
-         
-
-	}
-
-
-	// 选项列表
-	.option-list {
-		
-		padding-top: 15px;
-		
-		line-height: 20px;
-		border-radius: 8px;
-		text-align: center;
-		
-		margin: auto;
-		display: flex;
-		justify-content: space-around;
-
-		.list-item {
-
-			// 图标
-			.icon {
-				width: 40px;
-				height: 40px;
-				border-radius: 99px;
-				line-height: 40px;
-				font-size: 24px;
-				text-align: center;
-				margin: auto;
-				color: #ffffff;
-			}
-			.text{
-				margin-top: 4px;
-			}
-
-		}
-
-	}
-   .flex{
-	   display: flex;
-   }
-	// 站点
-	.pack-up{
-		float: right;
-		font-size: 16px;
-		color: rgba(119, 119, 119, 100);
-	}
-	
-.station,.location,.state1{
-	box-shadow: 0px 4rpx 12rpx 0px #008c4a33;
-}
-// 附近站点改版
-.station{
-	
-	width: 91.4%;
-	border-radius: 8px;
-	padding: 12px 12px 12px 11px;
-	background-color: #fff;
-	margin: 8px auto 0;
-	.head{
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		.title{
-			color: rgba(16, 16, 16, 100);
-			font-size: 32rpx;
+					  
+			  }			
+			  .text{
+				  line-height: 24px;
+				  color: rgba(84, 45, 45, 100);
+				  font-size: 16px;
+				  text-align: justify;
+				  text-decoration:underline;
+				   text-decoration-color:#ECE3BA;
+				   text-indent: 32px;
+			  }
+			  .sign{
+				  text-align: right;
+				  margin-top: 8px;
+				  font-size: 16px;
+			  }
+			}
+			
+			// 专享优惠券
+			.exclusive{
+				background-color: #F5E4C8;
+				margin-top: 20px;
+				padding: 32rpx 32rpx 32rpx 32rpx ;
+				box-shadow: 0px 0px 0px 1px rgba(254, 229, 147, 100);
+				border: 2px solid rgba(253, 217, 141, 100);
+				border-radius: 8px;
+				.exclusive1{
+					
+					font-size: 48rpx;
+					color: rgba(51, 51, 51, 1);
+
+					font-family: SourceHanSerif-bold;
+				}
+				.exclusive2{
+					font-family: PingFangSC-regular;
+					color: rgba(51, 51, 51, 1);
+					font-size: 36rpx;
+				}
+				p{
+					width: 100%;
+					text-align: center;
+					//color: rgba(255, 73, 75, 100);
+					//font-size: 20px;
+				}
+				.img{
+					// width: 74.4vw;
+					// height: 84px;
+					margin-top: 16px;
+					position: relative;
+					img{
+						width: 100%;
+						height: 100%;
+						
+					}
+				}
+				
+					
+					
+					
+					.num{
+						font-size:54rpx;
+						color: rgba(252, 237, 179, 100);
+						position: absolute;
+						top:10px;
+						left: 8vw;
+						font-weight: 600;
+						.unit{
+							
+							font-size: 24rpx;
+							color: rgba(252, 237, 179, 100);
+						
+						}
+					}
+					
+					.unit2{
+						
+						font-size: 12px;
+						color: #FFF;
+						position: absolute;
+						top: 90rpx;
+						left: 24rpx;
+					}
+					.exclusive-text{
+						color: #333333;
+						font-size: 16rpx;
+					}
+					.exclusive-btn{
+						width: 80%;
+						margin-top: 48rpx;
+						border-radius: 50px;
+						background: linear-gradient(90.58deg, rgba(225,208,165,1) 0.05%,rgba(228,190,132,1) 98.67%);
+						color: rgba(51, 51, 51, 1);
+						font-size: 36rpx;
+						text-align: center;
+						box-shadow: 0px 8rpx 20rpx 0px rgba(184, 155, 103, 40);
+						font-family: -apple-system;
+						  //  width: 87.4%;
+						  //  margin-top: 20px;
+						  //  background-image: linear-gradient(#ffff00, #ff9600);
+						 //   color: #521e00;
+						   // font-size: 20px;
+						   // border-radius: 50px;
+					}
+					.ticket-info{
+						width: 40vw;
+						text-align: center;
+						position: absolute;
+						top: 18px;
+						right: 16rpx;
+						.ticket-name{
+							line-height: 40rpx;
+							color: rgba(16, 16, 16, 100);
+							font-size: 16rpx;
+							
+						}
+						.condition{
+							line-height: 22px;
+							color: #8a6f6f;
+							font-size: 12px;
+						}
+						
+					}
+				
+			}
+		}
+	}
+	
+	.oldTextClassF{
+		.text-2{
+			font-size: 36rpx !important;
+		}
+		.text-3{
+			font-size: 34rpx !important;
+		}
+		.station .price-free .price-1 .num{
+			
+			font-size: 48rpx !important;
+			line-height: 40rpx;
+			font-weight: bold;
+		}
+		
+	}
+	/deep/.u-image__loading{
+		 background:#ff000000;
+	 }
+	// 头部图片
+	img {
+		width: 100%;
+		// height: 100%;
+		
+	}
+     .background{
+		 background: linear-gradient(#D6EEDC,#FFFFFF );
+		 padding-top: 16px;
+	 }
+	.banner {
+		width: 91.4%;
+		margin: 0 auto ;
+		border-radius: 12px;
+		height: 120px;
+		overflow: hidden;
+         
+
+	}
+
+
+	// 选项列表
+	.option-list {
+		
+		padding-top: 15px;
+		
+		line-height: 20px;
+		border-radius: 8px;
+		text-align: center;
+		
+		margin: auto;
+		display: flex;
+		justify-content: space-around;
+
+		.list-item {
+
+			// 图标
+			.icon {
+				width: 40px;
+				height: 40px;
+				border-radius: 99px;
+				line-height: 40px;
+				font-size: 24px;
+				text-align: center;
+				margin: auto;
+				color: #ffffff;
+			}
+			.text{
+				margin-top: 4px;
+			}
+
+		}
+
+	}
+   .flex{
+	   display: flex;
+   }
+	// 站点
+	.pack-up{
+		float: right;
+		font-size: 16px;
+		color: rgba(119, 119, 119, 100);
+	}
+	
+.station,.location,.state1{
+	box-shadow: 0px 4rpx 12rpx 0px #008c4a33;
+}
+// 附近站点改版
+.station{
+	
+	width: 91.4%;
+	border-radius: 8px;
+	padding: 12px 12px 12px 11px;
+	background-color: #fff;
+	margin: 8px auto 0;
+	.head{
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		.title{
+			color: rgba(16, 16, 16, 100);
+			font-size: 32rpx;
 			font-weight: 550;
-			width: 440rpx;
+			width: 440rpx;
 		text-overflow:ellipsis;
 		overflow:hidden;
-		white-space:nowrap;
-		}
-		.distance{
-			width: 180rpx;
-			color: rgba(102, 102, 102, 100);
-			font-size: 32rpx;
-			text-align: end;
-			.iconfont{
-				font-size: 24rpx;
-				margin-right: 4rpx;
-			}
-		}
-	}
-	.sign{
-		display: flex;
-		flex-wrap: wrap;
-		margin-top: 16rpx;
-		.sign-1{
-			line-height: 40rpx;
-			border-radius: 8rpx;
-			background-color: rgba(255, 255, 255, 100);
-			color: rgba(255, 139, 0, 100);
-			font-size: 24rpx;
-			text-align: center;
-			border: 1px solid rgba(255, 139, 0, 100);
-			padding: 0 8rpx;
-			margin-right:16rpx;
-			margin-bottom: 8rpx;
-		}
-		.sign-2{
-			line-height: 40rpx;
-			border-radius: 8rpx;
-			background-color: rgba(255, 255, 255, 100);
-			color: rgba(153, 153, 153, 100);
-			font-size: 24rpx;
-			text-align: center;
-			border: 1px solid rgba(204, 204, 204, 100);
-			padding: 0 8rpx;
-			margin-right: 16rpx;
-			margin-bottom: 8rpx;
-		}
-		.sign-3{
-			line-height: 40rpx;
-			border-radius: 8rpx;
-			background-color: rgba(255, 255, 255, 100);
-			color: #8161FF ;
-			font-size: 24rpx;
-			text-align: center;
-			border: 1px solid  #8161FF;
-			padding: 0 8rpx;
-			margin-right: 16rpx;
-			margin-bottom: 8rpx;
-		}
-		.sign-4{
-			line-height: 40rpx;
-			border-radius: 8rpx;
-			background-color: rgba(255, 255, 255, 100);
-			color: #00B962  ;
-			font-size: 24rpx;
-			text-align: center;
-			border: 1px solid #00B962 ;
-			padding: 0 8rpx;
-			margin-right: 16rpx;
-			margin-bottom: 8rpx;
-		}
-	}
-	.price-free{
-		display: flex;
-		justify-content: space-between;
-		margin-top: 8rpx;
-		.price{
-			display: flex;
-		    align-items: baseline;
-		}
-		.price-1{
-			.num{
-				color: rgba(255, 98, 0, 100);
-				font-size: 44rpx;
-			}
-			.unit{
-				font-size: 12px;
-				color: rgba(153, 153, 153, 100);
-			}
-		}
-		.price-2{
-			font-size: 24rpx;
-			color: rgba(153, 153, 153, 100);
-			margin-left: 8rpx;
-			text-decoration: line-through;
-		}
-	}
-
-	.free{
-		display: flex;
-	    align-items: center;
-		.slow,.fast{
-			display: flex;
-			.sp-font{
-				width: 40rpx;
-				height: 40rpx;
-				line-height: 40rpx;
-				border-radius: 4px;
-				background-color: #7a68f6;
-				color: #fff;
-				font-size: 28rpx;
-				text-align: center;
-				margin-right: 2rpx;
-			}
-			.fast-font{
-				width: 40rpx;
-				height: 40rpx;
-				line-height: 40rpx;
-				border-radius: 8rpx;
-				background-color: rgba(186, 240, 215, 100);
-				color: rgba(0, 130, 69, 100);
-				font-size: 28rpx;
-				text-align: center;
-				margin-right: 8rpx;
-			}
-			.slow-font{
-				width: 40rpx;
-				height: 40rpx;
-				line-height: 40rpx;
-				border-radius: 8rpx;
-				background-color: rgba(226, 226, 226, 100);
-				color: rgba(128, 128, 128, 100);
-				font-size: 28rpx;
-				text-align: center;
-				margin-right: 8rpx;
-			}
-			.num{
-				font-size: 32rpx;color: rgba(0, 145, 67, 100);
-				line-height: 40rpx;
-			}
-		}
-		.slow{
-			margin-left: 24rpx;
-		}
-	}
-}
-	//定位
-
-	.location {
-		width: 91.4%;
-		background-color: #ffffff;
-		height: 120px;
-		display: flex;
-		justify-content: space-between;
-		margin: 20px auto 0;
-		border-radius: 8px;
-		border: #F2F4F4 1px;
-
-		.location-text {
-			padding: 24px 0 0 28px;
-
-			.text-1 {
-				height: 16px;
-				line-height: 16px;
-				color: rgba(16, 16, 16, 100);
-				font-size: 16px;
-				text-align: left;
-			}
-
-			.text-2 {
-				height: 17px;
-				line-height: 17px;
-				color: rgba(102, 102, 102, 100);
-				font-size: 12px;
-				text-align: left;
-				margin-top: 4px;
-				white-space: nowrap; //强制不换行
-				text-overflow: ellipsis; //文本超出出现省略号
-				overflow: hidden;
-			}
-
-			.text-3 {
-				width: 80px;
-				height: 24px;
-				line-height: 22px;
-				border-radius: 50px;
-				color: rgba(0, 185, 98, 100);
-				font-size: 12px;
-				text-align: center;
-				border: 1px solid rgba(0, 185, 98, 100);
-				margin-top: 11px;
-			}
-		}
-		
-		.img-box {
-			width: 120px;
-			height: 120px;
-			margin-right: 20px;
-			
-		}
-	}
-	.img-box4{
-		padding-top: 5px;
-		height: 260rpx;
-		img{
-								 max-width: 100px;
-		}
-		.img-view{
-			color: #0293f0;
-			    float: right;
-					font-size: 10px;
-					margin-top: 3px;
-					 position: relative;
-					bottom: 30rpx;
-					 left: -15px;
-					 .iconfont{
-						 font-size: 14px;
-					 }
-					 
-					 
-		}
-	}
-	 
-	.state {
-		width: 91.4%;
-		background-color: #ffffff;
-		height: 260rpx;
-		min-height:120px;
-		max-height:130px;
-		display: flex;
-		margin: 20rpx auto 0;
-		border-radius: 8px;
-		border: #F2F4F4 1px;
-
-		.state-text {
-			    min-width: 70%;
-			padding: 48rpx 0 0 24rpx;
-			Z-INDEX: 99;
-			.text-1 {
-				height: 16px;
-				line-height: 16px;
-				color:  rgba(0, 185, 98, 1);
-				font-size: 16px;
-				text-align: left;
-				font-weight:  bold;
-				span{
-					color:rgba(16, 16, 16, 1);
-					margin-right: 12rpx;
-					
-				}
-			}
-
-			.text-2 {
-				    width: 160%;
-				height: 17px;
-				line-height: 17px;
-				color: #101010;
-				text-align: left;
-				margin-top: 12px;
-				span{
-					font-weight:  bold;
-					margin-right: 6rpx;
-					margin-left: 6rpx;
-				}
-				.text-21{
-					
-					color:  rgba(0, 185, 98, 1);
-				}
-				.text-22{
-					
-					color: #ed7847;
-				}
-			}
-
-			.text-3 {
-				font-size: 14px;
-				line-height: 20px;
-				margin-top: 6px;
-				color: #999999;
-			}
-
-		}
-
-		.img-box {
-			width: 120px;
-			height: 120px;
-			margin-right: 20px;
-			
-		}
-	}
-
-	//充值
-	.top-up {
-		
-		width: 91.4%;
-		margin: 12px auto 0 ;
-		
-
-		.top-up-title {
-			color: rgba(16, 16, 16, 100);
-			font-size: 16px;
-		}
-		.card-box{
-			display: flex;
-			justify-content: space-between;
-			padding: 0 0 16px 0;
-			.card{
-				width: 48.3%;
-				height: 65px;
-				img{
-					width: 100%;
-					height: 100%;
-				}
-			}
-		}
-
-		
-	.img-box2{
-		margin-top: 12px;
-		display: flex;
-		justify-content: space-between;
-		img{
-			width: 100%;
-			height: 100%;
-		}
-		.left-image{
-			width: 48.3%;
-			height: 166px;
-			padding: 8px 0 0 12px;
-			// background: url(@/assets/img/topup1.png);
-			    background-repeat: no-repeat;
-			    background-position: 30% 10%;
-			    background-size: cover;
-				p{
-					color: rgba(56, 47, 33, 100);
-					font-size: 24px;
-					line-height: 28px;
-					font-weight: 600;
-					
-				}
-				.time-activities{
-					color: rgba(56, 39, 14, 100);
-					font-size: 16px;
-					line-height: 22px;
-					margin-top: 4px;
-					.time{
-						margin-left: 4px;
-						color: #fa3534;
-						font-weight: bold;
-					}
-				}
-		}
-		.right-image{
-			width: 48.3%;
-			display: flex;
-			flex-direction: column;
-			justify-content: space-between;
-			
-			.margin-top{
-				margin-top: 12px;
-			}
-			
-			img{
-				height: 77px;
-				
-			}
-		};
-	}
-		
-	}
-	.lineBox{
-		background-color: rgba(0, 145, 67, 100);
-		padding:  0px 3px;
-		background-color: rgba(0, 185, 98, 1);
-		color: rgba(255, 255, 255, 1);
-		margin-left: 6px;
-		border-radius: 3px;
-	}
-	// 小竖线
-	.line {
-		display: inline-block;
-		width: 3px;
-		height: 12px;
-		margin-right: 7px;
-		background-color: rgba(0, 145, 67, 100);
-	}
-
-	// 新闻公告
-	.news-title {
-		padding: 0 16px;
-		margin-top: 12px;
-		color: rgba(16, 16, 16, 100);
-		font-size: 16px;
-		display: flex;
-		justify-content: space-between;
-		background-color: #F2F4F4;
-
-		.news-title-left {
-			display: flex;
-		}
-
-		.more {
-			font-size: 14px;
-			color: #777777;
-			display: flex;
-			line-height: 20px;
-
-			.more-icon {
-				font-size: 24px
-			}
-		}
-	}
-
-	.news {
-		background-color: #fff;
-		width: 91.4%;
-		margin: 12px auto 0;
-		border-radius: 8px;
-
-		.news-content {
-			display: flex;
-			justify-content: space-between;
-			padding: 12px;
-
-			.content-text {
-				width: 56.2%;
-				height: 100%;
-				line-height: 21px;
-				color: #101010;
-				text-align: left;
-				font-size: 14px;
-			}
-
-			.content-title {
-				width: 100%;
-				overflow: hidden;
-				text-overflow: ellipsis;
-				display: -webkit-box;
-				-webkit-box-orient: vertical;
-				-webkit-line-clamp: 3;
-			}
-
-			.content-img {
-				width: 40.57%;
-				height: 100%;
-				border-radius: 4px;
-				overflow: hidden;
-
-				img {
-					width: 100%;
-					height: 80%;
-				}
-			}
-
-			.news-time {
-				margin-top: 5%;
-				color: #999999;
-				width: 80px;
-				height: 20px;
-				font-size: 14px;
-			}
-		}
-	}
-
-	.bottom {
-		width: 100%;
-		height: 60px;
-
-		.bot {
-			width: 100%;
-			margin: 0 auto;
-			padding: 0 17.3%;
-			justify-content: space-between;
-			display: flex;
-
-			.bot-line {
-				margin-top: 20px;
-				width: 21.3%;
-				height: 0px;
-				border: 1px solid rgba(207, 210, 213, 100);
-			}
-
-			.bot-text {
-				white-space: nowrap;
-				height: 17px;
-				margin-top: 13px;
-				margin-left: 12px;
-				margin-right: 12px;
-				font-size: 12px;
-				text-align: center;
-				color: rgba(182, 189, 195, 100);
-			}
-		}
-	}
-
-	// 导航栏
-	.navigation {
-		width: 100%;
-		// height: 40px;
-		padding: 10px 0;
-		background-color: #fff;
-		position: fixed;
-		bottom: 0;
-		left: 0;
-		display: flex;
-		justify-content: space-around;
-		text-align: center;
-		color: #999999;
-
-		.nav-icon {
-			width: 54px;
-			font-size: 24px
-		}
-
-		.nav-text {
-			font-size: 14px;
-		}
-	}
-
-
-
-	.shema {
-		width: 70%;
-		padding-bottom: 20px;
-		border-radius: 16px;
-		background-color: #fff;
-		position: fixed;
-		top: 100px;
-		left: 0;
-		right: 0;
-		margin: 0 auto;
-		z-index: 9999;
-
-		.title {
-			height: 33px;
-			color: rgba(16, 16, 16, 100);
-			font-size: 24px;
-			text-align: center;
-			padding: 16px 0;
-		}
-
-		.u-radio-group {
-			margin: 16px 5vw;
-		}
-
-		/deep/.u-radio {
-			width: 60vw !important;
-
-			padding: 24px 24px 40px;
-			line-height: 20px;
-			border-radius: 16px;
-			text-align: center;
-			border: #101010 1px solid;
-			margin-top: 12px;
-
-		}
-
-		/deep/ .u-radio__label {
-			text-align: left;
-			height: 24px;
-			// color: rgba(0, 185, 98, 100);
-			font-size: 24px;
-
-		}
-
-		p {
-
-			height: 22px;
-			color: rgba(102, 102, 102, 100);
-			font-size: 14px;
-			margin-top: 12px;
-			white-space: nowrap
-		}
-
-		.hint {
-			text-align: center;
-
-		}
-
-		.btn-box {
-			margin-top: 20px;
-
-			.choice-btn {
-				width: 80%;
-			}
-		}
-	}
-
-	.wrap {
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		height: 100%;
-
-	}
-
-
-
-
-	// 登录提示
-	.login-prompt {
-		width: 91.4%;
-		height: 40px;
-		line-height: 40px;
-		border-radius: 50px;
-		text-align: left;
-		padding-left: 16px;
-		padding-right: 4px;
-		background-color: rgba(0, 0, 0, 0.6);
-		position: fixed;
-		bottom: 75px;
-		color: #ffffff;
-
-		.button {
-			width: 88px;
-			height: 32px;
-			line-height: 32px;
-			border-radius: 50px;
-			background-color: rgba(0, 185, 98, 100);
-			text-align: center;
-			float: right;
-			margin-top: 4px;
-		}
-	}
-	.showOss{
-		/deep/.u-model,/deep/.u-mode-center-box{
-			background-color: transparent;
-		}
-	}
-	
-</style>
-
+		white-space:nowrap;
+		}
+		.distance{
+			width: 180rpx;
+			color: rgba(102, 102, 102, 100);
+			font-size: 32rpx;
+			text-align: end;
+			.iconfont{
+				font-size: 24rpx;
+				margin-right: 4rpx;
+			}
+		}
+	}
+	.sign{
+		display: flex;
+		flex-wrap: wrap;
+		margin-top: 16rpx;
+		.sign-1{
+			line-height: 40rpx;
+			border-radius: 8rpx;
+			background-color: rgba(255, 255, 255, 100);
+			color: rgba(255, 139, 0, 100);
+			font-size: 24rpx;
+			text-align: center;
+			border: 1px solid rgba(255, 139, 0, 100);
+			padding: 0 8rpx;
+			margin-right:16rpx;
+			margin-bottom: 8rpx;
+		}
+		.sign-2{
+			line-height: 40rpx;
+			border-radius: 8rpx;
+			background-color: rgba(255, 255, 255, 100);
+			color: rgba(153, 153, 153, 100);
+			font-size: 24rpx;
+			text-align: center;
+			border: 1px solid rgba(204, 204, 204, 100);
+			padding: 0 8rpx;
+			margin-right: 16rpx;
+			margin-bottom: 8rpx;
+		}
+		.sign-3{
+			line-height: 40rpx;
+			border-radius: 8rpx;
+			background-color: rgba(255, 255, 255, 100);
+			color: #8161FF ;
+			font-size: 24rpx;
+			text-align: center;
+			border: 1px solid  #8161FF;
+			padding: 0 8rpx;
+			margin-right: 16rpx;
+			margin-bottom: 8rpx;
+		}
+		.sign-4{
+			line-height: 40rpx;
+			border-radius: 8rpx;
+			background-color: rgba(255, 255, 255, 100);
+			color: #00B962  ;
+			font-size: 24rpx;
+			text-align: center;
+			border: 1px solid #00B962 ;
+			padding: 0 8rpx;
+			margin-right: 16rpx;
+			margin-bottom: 8rpx;
+		}
+	}
+	.price-free{
+		display: flex;
+		justify-content: space-between;
+		margin-top: 8rpx;
+		.price{
+			display: flex;
+		    align-items: baseline;
+		}
+		.price-1{
+			.num{
+				color: rgba(255, 98, 0, 100);
+				font-size: 44rpx;
+			}
+			.unit{
+				font-size: 12px;
+				color: rgba(153, 153, 153, 100);
+			}
+		}
+		.price-2{
+			font-size: 24rpx;
+			color: rgba(153, 153, 153, 100);
+			margin-left: 8rpx;
+			text-decoration: line-through;
+		}
+	}
+
+	.free{
+		display: flex;
+	    align-items: center;
+		.slow,.fast{
+			display: flex;
+			.sp-font{
+				width: 40rpx;
+				height: 40rpx;
+				line-height: 40rpx;
+				border-radius: 4px;
+				background-color: #7a68f6;
+				color: #fff;
+				font-size: 28rpx;
+				text-align: center;
+				margin-right: 2rpx;
+			}
+			.fast-font{
+				width: 40rpx;
+				height: 40rpx;
+				line-height: 40rpx;
+				border-radius: 8rpx;
+				background-color: rgba(186, 240, 215, 100);
+				color: rgba(0, 130, 69, 100);
+				font-size: 28rpx;
+				text-align: center;
+				margin-right: 8rpx;
+			}
+			.slow-font{
+				width: 40rpx;
+				height: 40rpx;
+				line-height: 40rpx;
+				border-radius: 8rpx;
+				background-color: rgba(226, 226, 226, 100);
+				color: rgba(128, 128, 128, 100);
+				font-size: 28rpx;
+				text-align: center;
+				margin-right: 8rpx;
+			}
+			.num{
+				font-size: 32rpx;color: rgba(0, 145, 67, 100);
+				line-height: 40rpx;
+			}
+		}
+		.slow{
+			margin-left: 24rpx;
+		}
+	}
+}
+	//定位
+
+	.location {
+		width: 91.4%;
+		background-color: #ffffff;
+		height: 120px;
+		display: flex;
+		justify-content: space-between;
+		margin: 20px auto 0;
+		border-radius: 8px;
+		border: #F2F4F4 1px;
+
+		.location-text {
+			padding: 24px 0 0 28px;
+
+			.text-1 {
+				height: 16px;
+				line-height: 16px;
+				color: rgba(16, 16, 16, 100);
+				font-size: 16px;
+				text-align: left;
+			}
+
+			.text-2 {
+				height: 17px;
+				line-height: 17px;
+				color: rgba(102, 102, 102, 100);
+				font-size: 12px;
+				text-align: left;
+				margin-top: 4px;
+				white-space: nowrap; //强制不换行
+				text-overflow: ellipsis; //文本超出出现省略号
+				overflow: hidden;
+			}
+
+			.text-3 {
+				width: 80px;
+				height: 24px;
+				line-height: 22px;
+				border-radius: 50px;
+				color: rgba(0, 185, 98, 100);
+				font-size: 12px;
+				text-align: center;
+				border: 1px solid rgba(0, 185, 98, 100);
+				margin-top: 11px;
+			}
+		}
+		
+		.img-box {
+			width: 120px;
+			height: 120px;
+			margin-right: 20px;
+			
+		}
+	}
+	.img-box4{
+		padding-top: 5px;
+		height: 260rpx;
+		img{
+								 max-width: 100px;
+		}
+		.img-view{
+			color: #0293f0;
+			    float: right;
+					font-size: 10px;
+					margin-top: 3px;
+					 position: relative;
+					bottom: 30rpx;
+					 left: -15px;
+					 .iconfont{
+						 font-size: 14px;
+					 }
+					 
+					 
+		}
+	}
+	 
+	.state {
+		width: 91.4%;
+		background-color: #ffffff;
+		height: 260rpx;
+		min-height:120px;
+		max-height:130px;
+		display: flex;
+		margin: 20rpx auto 0;
+		border-radius: 8px;
+		border: #F2F4F4 1px;
+
+		.state-text {
+			    min-width: 70%;
+			padding: 48rpx 0 0 24rpx;
+			Z-INDEX: 99;
+			.text-1 {
+				height: 16px;
+				line-height: 16px;
+				color:  rgba(0, 185, 98, 1);
+				font-size: 16px;
+				text-align: left;
+				font-weight:  bold;
+				span{
+					color:rgba(16, 16, 16, 1);
+					margin-right: 12rpx;
+					
+				}
+			}
+
+			.text-2 {
+				    width: 160%;
+				height: 17px;
+				line-height: 17px;
+				color: #101010;
+				text-align: left;
+				margin-top: 12px;
+				span{
+					font-weight:  bold;
+					margin-right: 6rpx;
+					margin-left: 6rpx;
+				}
+				.text-21{
+					
+					color:  rgba(0, 185, 98, 1);
+				}
+				.text-22{
+					
+					color: #ed7847;
+				}
+			}
+
+			.text-3 {
+				font-size: 14px;
+				line-height: 20px;
+				margin-top: 6px;
+				color: #999999;
+			}
+
+		}
+
+		.img-box {
+			width: 120px;
+			height: 120px;
+			margin-right: 20px;
+			
+		}
+	}
+
+	//充值
+	.top-up {
+		
+		width: 91.4%;
+		margin: 12px auto 0 ;
+		
+
+		.top-up-title {
+			color: rgba(16, 16, 16, 100);
+			font-size: 16px;
+		}
+		.card-box{
+			display: flex;
+			justify-content: space-between;
+			padding: 0 0 16px 0;
+			.card{
+				width: 48.3%;
+				height: 65px;
+				img{
+					width: 100%;
+					height: 100%;
+				}
+			}
+		}
+
+		
+	.img-box2{
+		margin-top: 12px;
+		display: flex;
+		justify-content: space-between;
+		img{
+			width: 100%;
+			height: 100%;
+		}
+		.left-image{
+			width: 48.3%;
+			height: 166px;
+			padding: 8px 0 0 12px;
+			// background: url(@/assets/img/topup1.png);
+			    background-repeat: no-repeat;
+			    background-position: 30% 10%;
+			    background-size: cover;
+				p{
+					color: rgba(56, 47, 33, 100);
+					font-size: 24px;
+					line-height: 28px;
+					font-weight: 600;
+					
+				}
+				.time-activities{
+					color: rgba(56, 39, 14, 100);
+					font-size: 16px;
+					line-height: 22px;
+					margin-top: 4px;
+					.time{
+						margin-left: 4px;
+						color: #fa3534;
+						font-weight: bold;
+					}
+				}
+		}
+		.right-image{
+			width: 48.3%;
+			display: flex;
+			flex-direction: column;
+			justify-content: space-between;
+			
+			.margin-top{
+				margin-top: 12px;
+			}
+			
+			img{
+				height: 77px;
+				
+			}
+		};
+	}
+		
+	}
+	.lineBox{
+		background-color: rgba(0, 145, 67, 100);
+		padding:  0px 3px;
+		background-color: rgba(0, 185, 98, 1);
+		color: rgba(255, 255, 255, 1);
+		margin-left: 6px;
+		border-radius: 3px;
+	}
+	// 小竖线
+	.line {
+		display: inline-block;
+		width: 3px;
+		height: 12px;
+		margin-right: 7px;
+		background-color: rgba(0, 145, 67, 100);
+	}
+
+	// 新闻公告
+	.news-title {
+		padding: 0 16px;
+		margin-top: 12px;
+		color: rgba(16, 16, 16, 100);
+		font-size: 16px;
+		display: flex;
+		justify-content: space-between;
+		background-color: #F2F4F4;
+
+		.news-title-left {
+			display: flex;
+		}
+
+		.more {
+			font-size: 14px;
+			color: #777777;
+			display: flex;
+			line-height: 20px;
+
+			.more-icon {
+				font-size: 24px
+			}
+		}
+	}
+
+	.news {
+		background-color: #fff;
+		width: 91.4%;
+		margin: 12px auto 0;
+		border-radius: 8px;
+
+		.news-content {
+			display: flex;
+			justify-content: space-between;
+			padding: 12px;
+
+			.content-text {
+				width: 56.2%;
+				height: 100%;
+				line-height: 21px;
+				color: #101010;
+				text-align: left;
+				font-size: 14px;
+			}
+
+			.content-title {
+				width: 100%;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				display: -webkit-box;
+				-webkit-box-orient: vertical;
+				-webkit-line-clamp: 3;
+			}
+
+			.content-img {
+				width: 40.57%;
+				height: 100%;
+				border-radius: 4px;
+				overflow: hidden;
+
+				img {
+					width: 100%;
+					height: 80%;
+				}
+			}
+
+			.news-time {
+				margin-top: 5%;
+				color: #999999;
+				width: 80px;
+				height: 20px;
+				font-size: 14px;
+			}
+		}
+	}
+
+	.bottom {
+		width: 100%;
+		height: 60px;
+
+		.bot {
+			width: 100%;
+			margin: 0 auto;
+			padding: 0 17.3%;
+			justify-content: space-between;
+			display: flex;
+
+			.bot-line {
+				margin-top: 20px;
+				width: 21.3%;
+				height: 0px;
+				border: 1px solid rgba(207, 210, 213, 100);
+			}
+
+			.bot-text {
+				white-space: nowrap;
+				height: 17px;
+				margin-top: 13px;
+				margin-left: 12px;
+				margin-right: 12px;
+				font-size: 12px;
+				text-align: center;
+				color: rgba(182, 189, 195, 100);
+			}
+		}
+	}
+
+	// 导航栏
+	.navigation {
+		width: 100%;
+		// height: 40px;
+		padding: 10px 0;
+		background-color: #fff;
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		display: flex;
+		justify-content: space-around;
+		text-align: center;
+		color: #999999;
+
+		.nav-icon {
+			width: 54px;
+			font-size: 24px
+		}
+
+		.nav-text {
+			font-size: 14px;
+		}
+	}
+
+
+
+	.shema {
+		width: 70%;
+		padding-bottom: 20px;
+		border-radius: 16px;
+		background-color: #fff;
+		position: fixed;
+		top: 100px;
+		left: 0;
+		right: 0;
+		margin: 0 auto;
+		z-index: 9999;
+
+		.title {
+			height: 33px;
+			color: rgba(16, 16, 16, 100);
+			font-size: 24px;
+			text-align: center;
+			padding: 16px 0;
+		}
+
+		.u-radio-group {
+			margin: 16px 5vw;
+		}
+
+		/deep/.u-radio {
+			width: 60vw !important;
+
+			padding: 24px 24px 40px;
+			line-height: 20px;
+			border-radius: 16px;
+			text-align: center;
+			border: #101010 1px solid;
+			margin-top: 12px;
+
+		}
+
+		/deep/ .u-radio__label {
+			text-align: left;
+			height: 24px;
+			// color: rgba(0, 185, 98, 100);
+			font-size: 24px;
+
+		}
+
+		p {
+
+			height: 22px;
+			color: rgba(102, 102, 102, 100);
+			font-size: 14px;
+			margin-top: 12px;
+			white-space: nowrap
+		}
+
+		.hint {
+			text-align: center;
+
+		}
+
+		.btn-box {
+			margin-top: 20px;
+
+			.choice-btn {
+				width: 80%;
+			}
+		}
+	}
+
+	.wrap {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		height: 100%;
+
+	}
+
+
+
+
+	// 登录提示
+	.login-prompt {
+		width: 91.4%;
+		height: 40px;
+		line-height: 40px;
+		border-radius: 50px;
+		text-align: left;
+		padding-left: 16px;
+		padding-right: 4px;
+		background-color: rgba(0, 0, 0, 0.6);
+		position: fixed;
+		bottom: 75px;
+		color: #ffffff;
+
+		.button {
+			width: 88px;
+			height: 32px;
+			line-height: 32px;
+			border-radius: 50px;
+			background-color: rgba(0, 185, 98, 100);
+			text-align: center;
+			float: right;
+			margin-top: 4px;
+		}
+	}
+	.showOss{
+		/deep/.u-model,/deep/.u-mode-center-box{
+			background-color: transparent;
+		}
+	}
+	
+</style>
+

pages/index/index.vue

@@ -452,7 +452,7 @@
 						</view>
 					</view>
 					<view class="img-box">
-						<img src="static/img/暂无网络信号-缺省页 1.png">
+						<img src="@/assets/static/img/暂无网络信号-缺省页 1.png">
 					</view>
 				</view>
 
@@ -476,7 +476,7 @@
 					</view>
 				</view>
 				<view class="img-box">
-					<img src="static/img/暂无网络信号-缺省页 1.png">
+					<img src="@/assets/static/img/暂无网络信号-缺省页 1.png">
 				</view>
 			</view>
 
@@ -630,10 +630,10 @@
 			</view>
 			<view class="img-box4">
 
-				<img v-if="item.status == '0'" src="static/img/等待中-缺省页.png">
-				<img v-if="item.status == '1'" src="static/img/充电中-缺省页.png">
-				<img v-if="item.status == '2'" src="static/img/已充满-缺省页.png">
-				<img v-if="item.status == '4'" src="static/img/等待中-缺省页.png">
+				<img v-if="item.status == '0'" src="@/assets/static/img/等待中-缺省页.png">
+				<img v-if="item.status == '1'" src="@/assets/static/img/充电中-缺省页.png">
+				<img v-if="item.status == '2'" src="@/assets/static/img/已充满-缺省页.png">
+				<img v-if="item.status == '4'" src="@/assets/static/img/等待中-缺省页.png">
 				<view class="img-view">
 					<view class="more-icon iconfont">查看 &#xe600;</view>
 				</view>
@@ -690,13 +690,13 @@
 				@click="gotoUrl('pages/store/commodityDetails?id='+item.id)" :key="i">
 				<view class="shopItemImg">
 					
-					<u-image v-if="item.pic"
-					 width="308"
-					 height="308" 
-					 :src="item.pic"  mode="scaleToFill" ></u-image>
-					<u-image v-else 
-					width="308"
-					height="308" 
+					<u-image v-if="item.pic"
+					 width="308"
+					 height="308" 
+					 :src="item.pic"  mode="scaleToFill" ></u-image>
+					<u-image v-else 
+					width="308"
+					height="308" 
 					src="@/assets/img/chargesite_default.png"  ></u-image>
 				</view>
 				<view class="shopItemNameView">
@@ -3068,9 +3068,9 @@
 			width: 45%;
 			margin: 3px;
 			margin-bottom: 32rpx;
-			.shopItemImg{
-				// width: 288rpx;
-				// height:288rpx ;
+			.shopItemImg{
+				// width: 288rpx;
+				// height:288rpx ;
 			}
 			.shopItemPrice {
 				display: flex;

pages/login/welcome.vue

@@ -1,311 +1,311 @@
-<template>
-	<view>
-		
-		
-		<view class="welcome">
-			
-			<view class="welcome-state1" >
-				<view class="welcome-next" style="z-index: 999;" @click="gotoIndex()">{{step?step+'|':''}}跳过</view>
-				
-			</view>
-			
-			<u-image  id="imgw" v-if="imgmode"   @load="imgsload" ref="imgw"   mode="widthFix">
-				<view slot="loading"></view>
-				<view slot="error"></view>
-			</u-image>
-			
-			<u-image   v-if="!imgmode"  :height="imgH"   mode="aspectFill">
-				<view slot="loading"></view>
-				<view slot="error"></view>
-			</u-image>
-			
- 			<view class="welcome-foot">
-				<u-image width="185px" height="48px" src="../../static/img/logo.png"></u-image>
-			</view>
-		
-		</view>
-	</view>
-</template>
-
-<script>
-	import * as loginApi from '@/apis/login.js'
-	import * as API from '@/apis/index.js'
-		import {
-			// newDate,
-			// secondsDistance,
-			// hourDistanceArr
-			currentTimeStamp,
-			parseUnixTime,
-			
-		} from '@/utils'
-
-	export default {
-		data() {
-			return {
-				src:"",
-				isReady:true,
-				isReady2:false,
-				step:2,
-				imgH:'',
-				imgmode:true
-			}
-		},
-		methods: {
-			
-			imgsload(e){
-				 
-				
-				uni.getSystemInfo({
-					success: (res) => {
-						//(res)
-						
-						const query = uni.createSelectorQuery().in(this);
-						query.select('#imgw').boundingClientRect(data => {
-						  //("得到布局位置信息" + JSON.stringify(data));
-						  //("节点离页面顶部的距离为" + data.height);
-						  var windowH=res.windowHeight;
-						  var imgH= data.height;
-						  var value=windowH-imgH;
-						  //(value)
-						  if(value>=100){
-							  this.imgmode=true
-							  document.getElementsByClassName("welcome-foot")[0].style="height:"+value+"px"
-						  }else{
-							  this.imgmode=false
-							  
-						  }
-						}).exec();
-						
-					}
-				})
-			},
-						getTips(){
-							var nowtime = parseUnixTime(currentTimeStamp(), '{y}-{m}-{d}  {h}')
-							var time=this.carhelp.get("getTips_$");
-							if((time&&nowtime==time)){
-								
-							}else{
-								API.getTips().then((response) => {
-									this.carhelp.get("getTips_$",nowtime);
-									this.carhelp.setConfigMessage(response.data.tipsList) 				
-								}).catch(error => {
-									
-								})
-							}
-						},
-
-			 findNoLTextConfigure(){
-				 this.getTips()
-				 
-				 loginApi.findNoLTextConfigure().then((response) => {
-				
-				 	this.carhelp.setConfig(response.data.configure) 
-				 	this.setBackImg()
-				 }).catch(error => {
-				 	uni.showToast({
-				 		title: error,
-				 		icon: "none"
-				 	})
-				 })
-			 },
-			findByOpenId(){
-				
-				var openId=this.carhelp.getOpenId()
-				if(openId==""){
-					//("--------findByOpenId----------")
-					setTimeout(()=>{
-						this.findByOpenId()
-					},1000)
-					return
-				}
-				uni.request({
-					method:'get',
-					url: process.car.BASE_URL + "/mobile/regUser/findByOpenId",
-					data: {
-						openId:openId,			
-					},
-					header: {
-						'Content-Type': 'application/x-www-form-urlencoded',
-						'X-Requested-With': 'XMLHttpRequest',
-					}
-				}).then((response) => {
-					let [error, res] = response;
-					 
-					if (res.data.code == 200&&res.data.result) {			
-						var token = res ? res.data.data.token : '';					
-						this.carhelp.setPersonInfo(res.data.data.regUser );
-						this.carhelp.setToken(token);
-						
-						this.carhelp.setPersonInfoPlus(res.data.data);
-					
-					} else{
-						this.carhelp.logoff()
-					}
-					this.isReady2=true;
-					
-				}).catch(error => {
-					
-				
-				})
-			},
-			setBackImg(){
-				
-				try{
-					var  img=this.carhelp.getConfig().homepageLogo
-						
-					if(img){
-						this.$refs.imgw.src=img
-						//this.src=img
-						//document.body.style="background:url("+img+") no-repeat;background-size: 100%;"
-					}else{
-						//this.src="../../static/img/welcome_bg.png"
-						this.$refs.imgw.src="../../static/img/welcome_bg.png"
-					}
-				}catch(e){
-					//TODO handle the exception
-				}
-			
-				
-			},
-			gotoIndex(){
-				if(this.isReady){
-					this.isReady=false
-					uni.redirectTo({
-						url: '/pages/index/index'
-					});
-				}
-				
-			},
-			indexstep(){
-					setTimeout(()=>{
-						
-						this.step--;
-						if(this.step<0){
-							if(this.isReady2){
-								this.gotoIndex()
-							}else{
-								this.step=0;
-								this.indexstep()
-							}
-							
-						}else{
-							
-							this.indexstep()
-						}
-						
-					},1000)
-			},
-			onReadyIng(){
-				//let state = {};
-				uni.getSystemInfo({
-					success: (res) => {
-						 var windowH=res.windowHeight;
-						this.imgH=(windowH-100)+"px";
-						
-					}
-				})
-								
-				this.indexstep()
-				this.setBackImg( )
-			},
-			
-		},
-		onLoad(op) {
-			
-			this.findNoLTextConfigure()
-			this.findByOpenId()
-			if(op.friends){
-				
-				this.carhelp.set("friends_invitation",{
-					op:op,
-					date:new Date().getTime()
-				})
-				uni.redirectTo({
-					url:'/pages/login/login'
-				})
-					//this.onReadyIng()
-			}else  if(op.gunId){
-				var k=API.codeOperation("jp_team51_charge_id:A_"+op.gunId);
-				if(k){
-					uni.redirectTo({
-						url:k
-					})
-				}
-			
-			}else if(op.jpcode){
-				
-				var k=API.codeOperation(op.jpcode);
-				if(k){
-					uni.redirectTo({
-						url:k
-					})
-				}
-							
-			}else{
-				
-				this.onReadyIng()
-			}
-			
-			 
-		},
-		onUnload(){
-			document.body.style=""
-		},
-		onReady() {
-			
-		}
-	}
-</script>
-<style>
-	page{
-		
-		background-color: #ffffff;
-	}
-</style>
-<style  lang="scss" scoped>
-	.welcome{
-		position: relative;
-	}
-	.welcome-next{
-		position: absolute;
-		padding: 4px 15px;
-		color:#fff;
-		border-radius: 14px;
-		background:rgba(0,0,0,0.5);
-		right: 15px;
-		top: 15px;
-	}
-	.welcome-foot{
-		position:fixed;
-		left: 0;
-		right: 0;
-		bottom: 0;
-		background-color: #fff;
-		height: 100px;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-	}
-	.welcome-logo{
-		position: absolute;
-		left: 50%;
-		margin-left: -100px;
-		top: 120px;
-	}
-	.welcome-btn{
-		position: fixed;
-		left: 48px;
-		right: 48px;
-		bottom:48px;
-		text-align: center;
-		.welcomeBtn{
-			color:#009143;
-			border-color:#fff;
-		}
-		p{
-			color:#fff;
-			margin-top: 12px;
-			font-size: 16px;
-		}
-	}
-</style>
+<template>
+	<view>
+		
+		
+		<view class="welcome">
+			
+			<view class="welcome-state1" >
+				<view class="welcome-next" style="z-index: 999;" @click="gotoIndex()">{{step?step+'|':''}}跳过</view>
+				
+			</view>
+			
+			<u-image  id="imgw" v-if="imgmode"   @load="imgsload" ref="imgw"   mode="widthFix">
+				<view slot="loading"></view>
+				<view slot="error"></view>
+			</u-image>
+			
+			<u-image   v-if="!imgmode"  :height="imgH"   mode="aspectFill">
+				<view slot="loading"></view>
+				<view slot="error"></view>
+			</u-image>
+			
+ 			<view class="welcome-foot">
+				<u-image width="185px" height="48px" src="@/assets/static/img/logo.png"></u-image>
+			</view>
+		
+		</view>
+	</view>
+</template>
+
+<script>
+	import * as loginApi from '@/apis/login.js'
+	import * as API from '@/apis/index.js'
+		import {
+			// newDate,
+			// secondsDistance,
+			// hourDistanceArr
+			currentTimeStamp,
+			parseUnixTime,
+			
+		} from '@/utils'
+
+	export default {
+		data() {
+			return {
+				src:"",
+				isReady:true,
+				isReady2:false,
+				step:2,
+				imgH:'',
+				imgmode:true
+			}
+		},
+		methods: {
+			
+			imgsload(e){
+				 
+				
+				uni.getSystemInfo({
+					success: (res) => {
+						//(res)
+						
+						const query = uni.createSelectorQuery().in(this);
+						query.select('#imgw').boundingClientRect(data => {
+						  //("得到布局位置信息" + JSON.stringify(data));
+						  //("节点离页面顶部的距离为" + data.height);
+						  var windowH=res.windowHeight;
+						  var imgH= data.height;
+						  var value=windowH-imgH;
+						  //(value)
+						  if(value>=100){
+							  this.imgmode=true
+							  document.getElementsByClassName("welcome-foot")[0].style="height:"+value+"px"
+						  }else{
+							  this.imgmode=false
+							  
+						  }
+						}).exec();
+						
+					}
+				})
+			},
+						getTips(){
+							var nowtime = parseUnixTime(currentTimeStamp(), '{y}-{m}-{d}  {h}')
+							var time=this.carhelp.get("getTips_$");
+							if((time&&nowtime==time)){
+								
+							}else{
+								API.getTips().then((response) => {
+									this.carhelp.get("getTips_$",nowtime);
+									this.carhelp.setConfigMessage(response.data.tipsList) 				
+								}).catch(error => {
+									
+								})
+							}
+						},
+
+			 findNoLTextConfigure(){
+				 this.getTips()
+				 
+				 loginApi.findNoLTextConfigure().then((response) => {
+				
+				 	this.carhelp.setConfig(response.data.configure) 
+				 	this.setBackImg()
+				 }).catch(error => {
+				 	uni.showToast({
+				 		title: error,
+				 		icon: "none"
+				 	})
+				 })
+			 },
+			findByOpenId(){
+				
+				var openId=this.carhelp.getOpenId()
+				if(openId==""){
+					//("--------findByOpenId----------")
+					setTimeout(()=>{
+						this.findByOpenId()
+					},1000)
+					return
+				}
+				uni.request({
+					method:'get',
+					url: process.car.BASE_URL + "/mobile/regUser/findByOpenId",
+					data: {
+						openId:openId,			
+					},
+					header: {
+						'Content-Type': 'application/x-www-form-urlencoded',
+						'X-Requested-With': 'XMLHttpRequest',
+					}
+				}).then((response) => {
+					let [error, res] = response;
+					 
+					if (res.data.code == 200&&res.data.result) {			
+						var token = res ? res.data.data.token : '';					
+						this.carhelp.setPersonInfo(res.data.data.regUser );
+						this.carhelp.setToken(token);
+						
+						this.carhelp.setPersonInfoPlus(res.data.data);
+					
+					} else{
+						this.carhelp.logoff()
+					}
+					this.isReady2=true;
+					
+				}).catch(error => {
+					
+				
+				})
+			},
+			setBackImg(){
+				
+				try{
+					var  img=this.carhelp.getConfig().homepageLogo
+						
+					if(img){
+						this.$refs.imgw.src=img
+						//this.src=img
+						//document.body.style="background:url("+img+") no-repeat;background-size: 100%;"
+					}else{
+						//this.src="@/assets/static/img/welcome_bg.png"
+						this.$refs.imgw.src="@/assets/static/img/welcome_bg.png"
+					}
+				}catch(e){
+					//TODO handle the exception
+				}
+			
+				
+			},
+			gotoIndex(){
+				if(this.isReady){
+					this.isReady=false
+					uni.redirectTo({
+						url: '/pages/index/index'
+					});
+				}
+				
+			},
+			indexstep(){
+					setTimeout(()=>{
+						
+						this.step--;
+						if(this.step<0){
+							if(this.isReady2){
+								this.gotoIndex()
+							}else{
+								this.step=0;
+								this.indexstep()
+							}
+							
+						}else{
+							
+							this.indexstep()
+						}
+						
+					},1000)
+			},
+			onReadyIng(){
+				//let state = {};
+				uni.getSystemInfo({
+					success: (res) => {
+						 var windowH=res.windowHeight;
+						this.imgH=(windowH-100)+"px";
+						
+					}
+				})
+								
+				this.indexstep()
+				this.setBackImg( )
+			},
+			
+		},
+		onLoad(op) {
+			
+			this.findNoLTextConfigure()
+			this.findByOpenId()
+			if(op.friends){
+				
+				this.carhelp.set("friends_invitation",{
+					op:op,
+					date:new Date().getTime()
+				})
+				uni.redirectTo({
+					url:'/pages/login/login'
+				})
+					//this.onReadyIng()
+			}else  if(op.gunId){
+				var k=API.codeOperation("jp_team51_charge_id:A_"+op.gunId);
+				if(k){
+					uni.redirectTo({
+						url:k
+					})
+				}
+			
+			}else if(op.jpcode){
+				
+				var k=API.codeOperation(op.jpcode);
+				if(k){
+					uni.redirectTo({
+						url:k
+					})
+				}
+							
+			}else{
+				
+				this.onReadyIng()
+			}
+			
+			 
+		},
+		onUnload(){
+			document.body.style=""
+		},
+		onReady() {
+			
+		}
+	}
+</script>
+<style>
+	page{
+		
+		background-color: #ffffff;
+	}
+</style>
+<style  lang="scss" scoped>
+	.welcome{
+		position: relative;
+	}
+	.welcome-next{
+		position: absolute;
+		padding: 4px 15px;
+		color:#fff;
+		border-radius: 14px;
+		background:rgba(0,0,0,0.5);
+		right: 15px;
+		top: 15px;
+	}
+	.welcome-foot{
+		position:fixed;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		background-color: #fff;
+		height: 100px;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+	.welcome-logo{
+		position: absolute;
+		left: 50%;
+		margin-left: -100px;
+		top: 120px;
+	}
+	.welcome-btn{
+		position: fixed;
+		left: 48px;
+		right: 48px;
+		bottom:48px;
+		text-align: center;
+		.welcomeBtn{
+			color:#009143;
+			border-color:#fff;
+		}
+		p{
+			color:#fff;
+			margin-top: 12px;
+			font-size: 16px;
+		}
+	}
+</style>

pages/monthlyCardActivity/monthlyCardBuy.vue

@@ -1,1565 +1,1565 @@
-<template>
-	<view>
-		<ujp-navbar title="服务费包月会员"   >
-			<view class="iconfont service" @click="openModal">
-				&#xe60d;
-			</view>
-		</ujp-navbar>
-		<!-- 提示 -->
-		<!-- <template>
-			<u-alert-tips type="warning" :title="title" :description="description" :show-icon="true"></u-alert-tips>
-		</template> -->
-		<!-- 卡片 -->
-
-		<view class="main">
-			<view class="carNone" v-if="!isReady">
-				<img src="static/img/暂无数据-缺省页.png" alt="">
-				<p class="" style="color: #bfdfd5;font-size: 18px;">加载中</p>
-			</view>
-			<view class="carNone" v-if="isReady&&cardList.length == 0">
-				<img src="static/img/暂无数据-缺省页.png" alt="">
-				<p class="" style="color: #bfdfd5;font-size: 18px;">暂无月卡上架</p>
-			</view>
-			<view class="user-card" v-if="ispay">
-				<view class="head-img">
-					<img style="border-radius: 50px;" v-if="userInfo.headImg" :src="userInfo.headImg" alt="">
-					<img v-else src="../../assets/img/headPortrait.png" alt="">
-
-				</view>
-				<view class="user-name">
-					<view class="name">
-						{{userInfo.realName?userInfo.realName:userInfo.nickName}}
-					</view>
-					<view class="sign">
-
-						{{userCard&&ispay?userCard.endTime.substring(0,10):''}}到期
-					</view>
-				</view>
-			</view>
-			<ujp-swiper v-if="!ispay"  :img-mode="'scaleToFill'" height="190" 
-			:effect3d="true" :autoplay="false" :circular="false"
-				@change="checkboxChangeBtn" :name="'picUrl'">
-				
-			
-				<swiper-item class="scroll-view-item_H u-swiper-item" 
-				 
-				  v-for="(item,i) in cardList" :key="i">
-					<view 
-					:style="{
-						backgroundImage:' url('+item.monthlyRentCard.image+') ',
-						
-						transform: uCurrent != i ? 'scaleY(0.9)' : 'scaleY(1)',
-						margin: uCurrent != i ? '0 20rpx' : 0,
-						}"
-					
-				
-						:class="'cardtab ' ">
-						<view class="tag" v-if="item.monthlyRentCard.isVip">{{item.monthlyRentCard.platformText}}车主
-						</view>
-						<view class="tag" v-else-if="false&&item.monthlyRentCard.remark">{{item.monthlyRentCard.remark}}</view>
-						<view  class="priceName">
-							 {{item.monthlyRentCard.remark}}
-						</view>
-						<view class="price">
-							
-							<view class="current-price">
-								<b>{{item.monthlyRentCard.price}}</b><text>元/月</text>
-								<!--  -->
-
-								<p v-if="item.monthlyRentCard.buyNum">{{item.monthlyRentCard.buyNum}}人次购买</p>
-
-							</view>
-						</view>
-
-
-					</view>
-				</swiper-item>
-
-			</ujp-swiper>
-
-
-
-
-		</view>
-		<u-action-sheet :list="list" @click="click" v-model="show"></u-action-sheet>
-		<u-modal v-model="showModel" :show-cancel-button="true" @cancel="getUserInfo()" @confirm="confirm"
-			confirm-text="支付成功？" title="扫码支付">
-			<view style="
-								text-align: center;
-							">
-				<img id="qrcode2" :src="qrCodeImg">
-			</view>
-			<view style="
-								text-align: center;
-							">请使用支付宝扫码</view>
-
-		</u-modal>
-
-		<u-modal v-model="show1" @confirm="gotoGz" cancel-text="暂不关注" confirm-text="前往关注" confirm-color="#53b56b"
-			:show-cancel-button="true" ref="uModal2" :asyncClose="true">
-			<view style="padding: 15px;">请先关注<span style=" color:  #53b56b;">{{projectName}}</span>公众号，购买月卡</view>
-
-
-		</u-modal>
-
-
-		<u-modal v-model="infoSet1" @confirm="infoSet1=false,gotoUrl('pages/user/dataSet')" cancel-text="取消"
-			confirm-text="完善个人信息" confirm-color="#53b56b" :show-cancel-button="true" ref="uModal2" :asyncClose="true">
-			<view style="padding: 15px;">购买月卡需要完善以下2点<br />
-				1.填写真实姓名<br />
-				2.填写车牌号<br />
-			</view>
-		</u-modal>
-		<img id="qrcode" style="display: none;">
-
-
-		<!-- 须知 -->
-		<view class="notice">
-
-			<view class="title">
-				可享一个月充电服务费<span style="color:#ec4f27">全免</span>
-			</view>
-			<view class="line" >
-				<!-- <view v-show="detail.type==1">· 仅限<b>非运营车</b>车主或<b>新用户</b>购买和使用</view>
-				<view>· 在指定充电站充电时，此单服务费<b>全免</b></view>
-				<view>· 不可抵扣电费、停车费、占位费</view> -->
-				
-				<view class="lineInfo lineInfo1" >
-					<view  class="lineSvg">
-						<img src="@/assets/img/buy/bus2.svg">
-					</view>
-					<view class="lineView">
-						<view  class="lineTitle">适用车主</view>
-						<p class="linep">适合运营车车主购买和使用</p>
-					</view>
-				</view>
-			<!-- 	<view class="lineInfo lineInfo2"   >
-					<view  class="lineSvg">
-						<img src="@/assets/img/buy/bus.svg">
-					</view>
-					<view class="lineView">
-						<view  class="lineTitle">适用车主</view>
-						<p class="linep">适合运营车车主购买和使用</p>
-					</view>
-				</view> -->
-				<view class="lineInfo lineInfo1"  >
-					<view  class="lineSvg">
-						<img src="@/assets/img/buy/fee.svg">
-					</view>
-					<view class="lineView">
-						<view  class="lineTitle">充电免服务费</view>
-						<p class="linep">在指定站点充电时，此单服务费全免</p>
-					</view>
-				</view>
-				<view class="lineInfo lineInfo1"  >
-					<view  class="lineSvg">
-						<img src="@/assets/img/buy/tips.svg">
-					</view>
-					<view class="lineView">
-						<view  class="lineTitle">注意事项</view>
-						<p class="linep">不可抵扣电费、停车费、占位费</p>
-					</view>
-				</view>
-				
-				
-			</view>
-
-
-			<u-divider fontSize="36" border-color="#bbc039" color="#101010">购卡须知</u-divider>
-			<view class="text">
-				<view class="num">
-					01
-				</view>
-				<view class="">
-					充电月卡默认与购卡人账户进行关联，所涉权益仅可绑定单个车牌，即账户、月卡、车牌三者关联形成一个权益主体。
-				</view>
-			</view>
-			<view class="text">
-				<view class="num">
-					02
-				</view>
-				<view class="">
-					充电月卡有效期内，持卡人在指定充电站为绑定车辆充电，可享受充电服务费全免。持卡人给非绑定车辆充电，将正常收取充电服务费。
-				</view>
-			</view>
-			<view class="text">
-				<view class="num">
-					03
-				</view>
-				<view class="">
-					如车牌等信息填写错误，请致电售后客服进行处理。
-				</view>
-			</view>
-			<view class="text">
-				<view class="num">
-					04
-				</view>
-				<view class="">
-					本卡一经售出，不支持任何形式的退换。
-				</view>
-			</view>
-
-			<!-- <view
-			 @click="gotoUrl('pages/monthlyCardActivity/monthlyCardList?cardId='+(ispay?userCard.rentCardId:cardId))">
-								适用<br/>
-								站点
-
-			</view> -->
-
-
-
-		</view>
-		<view class="notice2">
-			<view class="titleHead">适用充电站点</view>
-
-			<!-- 附近站点 -->
-			<view class="station" v-for="(stationData,i) in pageListGetObj.list" :key="i"
-				@click="gotoUrl('pages/searchPile/stationAndPile/stationDetails?id=' + stationData.id)">
-				<view class="head">
-					<view class="title oldTextjp" oldstyle="font-size: 20px;">
-						{{stationData.name}}
-					</view>
-					<view class="distance ">
-						<!-- <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" v-else>
-					 
-						<!-- 	 -->
-						<view class="sign-1"
-							v-if="stationData.giveDiscount&&stationData.discountRatio&&stationData.discountRatio!=100">
-							会员{{discountRatio10(stationData.discountRatio)}}折</view>
-						<view class="sign-3" v-if="stationData.category=='超充'">160kW超充站</view>
-						<view class="sign-4"
-							v-if="stationData.nightLowPriceEnabled">
-							夜间超低价</view>
-							<view class="sign-2" v-if="stationData.platformType==1">自营站</view>
-						<view class="sign-2" v-if="stationData.tagList.length != 0"
-							v-for="(tagName,tagIndex) in stationData.tagList" :key="tagIndex">{{tagName}}</view>
-				 
-				</view>
-				<view class="price-free oldTextClass">
-					<view class="price" v-if="userInfo&&userInfo.userType==2">
-						<view class="price-1">
-							<text class="num">
-								{{!stationData.giveDiscount ? (stationData.electricityPrice+stationData.servicePrice).toFixed(2)
-								: (stationData.electricityPrice+stationData.discountServicePrice).toFixed(2)}}</text>
-							<text class="unit " oldstyle="font-size: 48rpx;">元/度</text>
-						</view>
-						<view class="price-2 " oldstyle="font-size: 48rpx;" v-if="stationData.giveDiscount">
-							<text
-								class="num">{{(stationData.electricityPrice+stationData.servicePrice).toFixed(2)}}</text>
-							<text class="unit ">元/度</text>
-						</view>
-					</view>
-					<!-- 游客价格-->
-					<view class="price" v-else>
-						<view class="price-1">
-							<text class="num">
-								{{(stationData.electricityPrice+stationData.servicePrice).toFixed(2)}}</text>
-							<text class="unit " oldstyle="font-size: 48rpx;">元/度</text>
-						</view>
-						<view class="price-3 " oldstyle="font-size: 48rpx;" v-if="stationData.giveDiscount">
-							<text class="num1">会员</text>
-							<text class="num">{{ (stationData.electricityPrice+stationData.discountServicePrice).toFixed(2)}}</text>
-							<text class="unit ">元/度</text>
-						</view>
-					</view>
-
-					<view class="free">
-
-						<view class="fast" v-if="stationData.fastNum">
-							<view class="fast-font">
-								快
-							</view>
-							<view class="num">
-								{{stationData.fastAvailableNum}}/{{stationData.fastNum}}
-							</view>
-						</view>
-						<view class="slow oldTextjp2" oldstyle="margin-left: 1px;" v-if="stationData.slowNum">
-							<view class="slow-font">
-								慢
-							</view>
-							<view class="num">
-								{{stationData.slowAvailableNum}}/{{stationData.slowNum}}
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-			<view class="bottom" @click="getPageList(true)"
-				v-if="pageListGetObj.recordsTotal!=pageListGetObj.list.length">
-				<view class="bot">
-					<view class="bot-line"></view>
-					<view class="bot-text " style="color: #00B962;text-align: center;margin-top: 10px">
-						点击查看更多(共{{pageListGetObj.recordsTotal}}站点)</view>
-					<view class="bot-line"></view>
-				</view>
-			</view>
-			<view class="bottom" v-else>
-				<view class="bot">
-					<view class="bot-line"></view>
-					<view class="bot-text " style="color: #00B962;text-align: center;margin-top: 10px;">已经到底了</view>
-					<view class="bot-line"></view>
-				</view>
-			</view>
-
-			<view class="upupupView" v-show="flag==1">
-				<view class="upupupImg">
-					<img src="@/assets/img/upupup.svg">
-				</view>
-
-				<p>上划查看更多内容</p>
-			</view>
-
-		</view>
-		<!-- 按钮 -->
-		<view class="button" v-if="!ispay">
-			
-			
-		<!-- 	<button class="btn  btn2" @click="show4=true" v-if="userCard&&userCard.classify==2">购买月卡 - 并<span style="color:red">废弃</span>其他卡
-			</button> -->
-			<button class="btn " v-if="userInfo.userType=='1'">游客无法购买月卡
-			</button>
-			
-			<button class="btn " v-else-if="!isReady">加载中
-			</button>
-			<button class="btn " v-else-if="ispay"> {{userCard&&ispay?userCard.endTime:''}}到期
-			</button>
-			<button class="btn " v-else-if="!endCardBool">已下架
-			</button>
-			<button class="btn " v-else-if="!show2" @click="gotoGz">关注公众号
-			</button>
-			<button class="btn " v-else-if="!infoSet" @click="gotoUrl('pages/user/dataSet')">完善个人信息
-			</button>
-
-			<button class="btn " v-else-if="!cardList.length" @click="putShelf">已下架
-			</button>
-			<button class="btn " @click="showPay" v-else-if="detail.isVip">
-
-				<text style="font-size: 14px;">￥</text>
-
-				<span>{{detail.price}}</span>
-
-				<text class="price">{{detail.oldPrice}}</text>开通充电月卡
-
-				<view class="position">
-					<view id="talkbubble">{{detail.platformText}}车主</view>
-				</view>
-			</button>
-			<button class="btn " @click="showPay" v-else>
-
-				<text style="font-size: 14px;"></text>
-
-				<span style="margin-right: 8px;">{{detail.price}}元</span>
-
-				<text v-if="detail.discount" class="price">{{detail.oldPrice}}</text> 开通服务费包月会员
-
-				<view class="position" v-if="false&&detail.remark2">
-					<view id="talkbubble">{{detail.remark2}}</view>
-				</view>
-			</button>
-
-
-
-			<view class="hint">
-				开通表示阅读并同意<span @click="gotoUrl('pages/article/details?code=FWFZKXY')"
-					style="text-decoration:underline;color: #C07C38;">《服务费折扣协议》</span>
-			</view>
-		</view>
-		<u-modal v-model="show4" title="购买须知"  @confirm="show4=false,show=true" cancel-text="取消" confirm-text="确认购买" confirm-color="red"
-			:show-cancel-button="true" ref="uModal2" :asyncClose="true">
-			<view style="padding: 15px;  " v-if="userCard">
-				<view>由于您已经购买了其他卡</view>
-				<view style="margin-top: 8px;">汽车充电同时只生效一张卡，且本<span style="color: #00b962;">月卡</span>优惠力度最高。</view>
-				<view style="margin-top: 4px;">购买成功后，将<span style="color: red;">废弃</span>您已购买的<span style="color: #00b962;">[6折卡]</span>，且<span style="color: red;">不退款、不折算</span>。</view>
-				<view style="margin-top: 4px;">同时也建议您先使用完<span style="color: #00b962;">[6折卡]</span>的充电度数，以免造成不必要的损失。</view>
+<template>
+	<view>
+		<ujp-navbar title="服务费包月会员"   >
+			<view class="iconfont service" @click="openModal">
+				&#xe60d;
+			</view>
+		</ujp-navbar>
+		<!-- 提示 -->
+		<!-- <template>
+			<u-alert-tips type="warning" :title="title" :description="description" :show-icon="true"></u-alert-tips>
+		</template> -->
+		<!-- 卡片 -->
+
+		<view class="main">
+			<view class="carNone" v-if="!isReady">
+				<img src="@/assets/static/img/暂无数据-缺省页.png" alt="">
+				<p class="" style="color: #bfdfd5;font-size: 18px;">加载中</p>
+			</view>
+			<view class="carNone" v-if="isReady&&cardList.length == 0">
+				<img src="@/assets/static/img/暂无数据-缺省页.png" alt="">
+				<p class="" style="color: #bfdfd5;font-size: 18px;">暂无月卡上架</p>
+			</view>
+			<view class="user-card" v-if="ispay">
+				<view class="head-img">
+					<img style="border-radius: 50px;" v-if="userInfo.headImg" :src="userInfo.headImg" alt="">
+					<img v-else src="../../assets/img/headPortrait.png" alt="">
+
+				</view>
+				<view class="user-name">
+					<view class="name">
+						{{userInfo.realName?userInfo.realName:userInfo.nickName}}
+					</view>
+					<view class="sign">
+
+						{{userCard&&ispay?userCard.endTime.substring(0,10):''}}到期
+					</view>
+				</view>
+			</view>
+			<ujp-swiper v-if="!ispay"  :img-mode="'scaleToFill'" height="190" 
+			:effect3d="true" :autoplay="false" :circular="false"
+				@change="checkboxChangeBtn" :name="'picUrl'">
+				
+			
+				<swiper-item class="scroll-view-item_H u-swiper-item" 
+				 
+				  v-for="(item,i) in cardList" :key="i">
+					<view 
+					:style="{
+						backgroundImage:' url('+item.monthlyRentCard.image+') ',
+						
+						transform: uCurrent != i ? 'scaleY(0.9)' : 'scaleY(1)',
+						margin: uCurrent != i ? '0 20rpx' : 0,
+						}"
+					
+				
+						:class="'cardtab ' ">
+						<view class="tag" v-if="item.monthlyRentCard.isVip">{{item.monthlyRentCard.platformText}}车主
+						</view>
+						<view class="tag" v-else-if="false&&item.monthlyRentCard.remark">{{item.monthlyRentCard.remark}}</view>
+						<view  class="priceName">
+							 {{item.monthlyRentCard.remark}}
+						</view>
+						<view class="price">
+							
+							<view class="current-price">
+								<b>{{item.monthlyRentCard.price}}</b><text>元/月</text>
+								<!--  -->
+
+								<p v-if="item.monthlyRentCard.buyNum">{{item.monthlyRentCard.buyNum}}人次购买</p>
+
+							</view>
+						</view>
+
+
+					</view>
+				</swiper-item>
+
+			</ujp-swiper>
+
+
+
+
+		</view>
+		<u-action-sheet :list="list" @click="click" v-model="show"></u-action-sheet>
+		<u-modal v-model="showModel" :show-cancel-button="true" @cancel="getUserInfo()" @confirm="confirm"
+			confirm-text="支付成功？" title="扫码支付">
+			<view style="
+								text-align: center;
+							">
+				<img id="qrcode2" :src="qrCodeImg">
+			</view>
+			<view style="
+								text-align: center;
+							">请使用支付宝扫码</view>
+
+		</u-modal>
+
+		<u-modal v-model="show1" @confirm="gotoGz" cancel-text="暂不关注" confirm-text="前往关注" confirm-color="#53b56b"
+			:show-cancel-button="true" ref="uModal2" :asyncClose="true">
+			<view style="padding: 15px;">请先关注<span style=" color:  #53b56b;">{{projectName}}</span>公众号，购买月卡</view>
+
+
+		</u-modal>
+
+
+		<u-modal v-model="infoSet1" @confirm="infoSet1=false,gotoUrl('pages/user/dataSet')" cancel-text="取消"
+			confirm-text="完善个人信息" confirm-color="#53b56b" :show-cancel-button="true" ref="uModal2" :asyncClose="true">
+			<view style="padding: 15px;">购买月卡需要完善以下2点<br />
+				1.填写真实姓名<br />
+				2.填写车牌号<br />
+			</view>
+		</u-modal>
+		<img id="qrcode" style="display: none;">
+
+
+		<!-- 须知 -->
+		<view class="notice">
+
+			<view class="title">
+				可享一个月充电服务费<span style="color:#ec4f27">全免</span>
+			</view>
+			<view class="line" >
+				<!-- <view v-show="detail.type==1">· 仅限<b>非运营车</b>车主或<b>新用户</b>购买和使用</view>
+				<view>· 在指定充电站充电时，此单服务费<b>全免</b></view>
+				<view>· 不可抵扣电费、停车费、占位费</view> -->
+				
+				<view class="lineInfo lineInfo1" >
+					<view  class="lineSvg">
+						<img src="@/assets/img/buy/bus2.svg">
+					</view>
+					<view class="lineView">
+						<view  class="lineTitle">适用车主</view>
+						<p class="linep">适合运营车车主购买和使用</p>
+					</view>
+				</view>
+			<!-- 	<view class="lineInfo lineInfo2"   >
+					<view  class="lineSvg">
+						<img src="@/assets/img/buy/bus.svg">
+					</view>
+					<view class="lineView">
+						<view  class="lineTitle">适用车主</view>
+						<p class="linep">适合运营车车主购买和使用</p>
+					</view>
+				</view> -->
+				<view class="lineInfo lineInfo1"  >
+					<view  class="lineSvg">
+						<img src="@/assets/img/buy/fee.svg">
+					</view>
+					<view class="lineView">
+						<view  class="lineTitle">充电免服务费</view>
+						<p class="linep">在指定站点充电时，此单服务费全免</p>
+					</view>
+				</view>
+				<view class="lineInfo lineInfo1"  >
+					<view  class="lineSvg">
+						<img src="@/assets/img/buy/tips.svg">
+					</view>
+					<view class="lineView">
+						<view  class="lineTitle">注意事项</view>
+						<p class="linep">不可抵扣电费、停车费、占位费</p>
+					</view>
+				</view>
+				
+				
+			</view>
+
+
+			<u-divider fontSize="36" border-color="#bbc039" color="#101010">购卡须知</u-divider>
+			<view class="text">
+				<view class="num">
+					01
+				</view>
+				<view class="">
+					充电月卡默认与购卡人账户进行关联，所涉权益仅可绑定单个车牌，即账户、月卡、车牌三者关联形成一个权益主体。
+				</view>
+			</view>
+			<view class="text">
+				<view class="num">
+					02
+				</view>
+				<view class="">
+					充电月卡有效期内，持卡人在指定充电站为绑定车辆充电，可享受充电服务费全免。持卡人给非绑定车辆充电，将正常收取充电服务费。
+				</view>
+			</view>
+			<view class="text">
+				<view class="num">
+					03
+				</view>
+				<view class="">
+					如车牌等信息填写错误，请致电售后客服进行处理。
+				</view>
+			</view>
+			<view class="text">
+				<view class="num">
+					04
+				</view>
+				<view class="">
+					本卡一经售出，不支持任何形式的退换。
+				</view>
+			</view>
+
+			<!-- <view
+			 @click="gotoUrl('pages/monthlyCardActivity/monthlyCardList?cardId='+(ispay?userCard.rentCardId:cardId))">
+								适用<br/>
+								站点
+
+			</view> -->
+
+
+
+		</view>
+		<view class="notice2">
+			<view class="titleHead">适用充电站点</view>
+
+			<!-- 附近站点 -->
+			<view class="station" v-for="(stationData,i) in pageListGetObj.list" :key="i"
+				@click="gotoUrl('pages/searchPile/stationAndPile/stationDetails?id=' + stationData.id)">
+				<view class="head">
+					<view class="title oldTextjp" oldstyle="font-size: 20px;">
+						{{stationData.name}}
+					</view>
+					<view class="distance ">
+						<!-- <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" v-else>
+					 
+						<!-- 	 -->
+						<view class="sign-1"
+							v-if="stationData.giveDiscount&&stationData.discountRatio&&stationData.discountRatio!=100">
+							会员{{discountRatio10(stationData.discountRatio)}}折</view>
+						<view class="sign-3" v-if="stationData.category=='超充'">160kW超充站</view>
+						<view class="sign-4"
+							v-if="stationData.nightLowPriceEnabled">
+							夜间超低价</view>
+							<view class="sign-2" v-if="stationData.platformType==1">自营站</view>
+						<view class="sign-2" v-if="stationData.tagList.length != 0"
+							v-for="(tagName,tagIndex) in stationData.tagList" :key="tagIndex">{{tagName}}</view>
+				 
+				</view>
+				<view class="price-free oldTextClass">
+					<view class="price" v-if="userInfo&&userInfo.userType==2">
+						<view class="price-1">
+							<text class="num">
+								{{!stationData.giveDiscount ? (stationData.electricityPrice+stationData.servicePrice).toFixed(2)
+								: (stationData.electricityPrice+stationData.discountServicePrice).toFixed(2)}}</text>
+							<text class="unit " oldstyle="font-size: 48rpx;">元/度</text>
+						</view>
+						<view class="price-2 " oldstyle="font-size: 48rpx;" v-if="stationData.giveDiscount">
+							<text
+								class="num">{{(stationData.electricityPrice+stationData.servicePrice).toFixed(2)}}</text>
+							<text class="unit ">元/度</text>
+						</view>
+					</view>
+					<!-- 游客价格-->
+					<view class="price" v-else>
+						<view class="price-1">
+							<text class="num">
+								{{(stationData.electricityPrice+stationData.servicePrice).toFixed(2)}}</text>
+							<text class="unit " oldstyle="font-size: 48rpx;">元/度</text>
+						</view>
+						<view class="price-3 " oldstyle="font-size: 48rpx;" v-if="stationData.giveDiscount">
+							<text class="num1">会员</text>
+							<text class="num">{{ (stationData.electricityPrice+stationData.discountServicePrice).toFixed(2)}}</text>
+							<text class="unit ">元/度</text>
+						</view>
+					</view>
+
+					<view class="free">
+
+						<view class="fast" v-if="stationData.fastNum">
+							<view class="fast-font">
+								快
+							</view>
+							<view class="num">
+								{{stationData.fastAvailableNum}}/{{stationData.fastNum}}
+							</view>
+						</view>
+						<view class="slow oldTextjp2" oldstyle="margin-left: 1px;" v-if="stationData.slowNum">
+							<view class="slow-font">
+								慢
+							</view>
+							<view class="num">
+								{{stationData.slowAvailableNum}}/{{stationData.slowNum}}
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="bottom" @click="getPageList(true)"
+				v-if="pageListGetObj.recordsTotal!=pageListGetObj.list.length">
+				<view class="bot">
+					<view class="bot-line"></view>
+					<view class="bot-text " style="color: #00B962;text-align: center;margin-top: 10px">
+						点击查看更多(共{{pageListGetObj.recordsTotal}}站点)</view>
+					<view class="bot-line"></view>
+				</view>
+			</view>
+			<view class="bottom" v-else>
+				<view class="bot">
+					<view class="bot-line"></view>
+					<view class="bot-text " style="color: #00B962;text-align: center;margin-top: 10px;">已经到底了</view>
+					<view class="bot-line"></view>
+				</view>
+			</view>
+
+			<view class="upupupView" v-show="flag==1">
+				<view class="upupupImg">
+					<img src="@/assets/img/upupup.svg">
+				</view>
+
+				<p>上划查看更多内容</p>
+			</view>
+
+		</view>
+		<!-- 按钮 -->
+		<view class="button" v-if="!ispay">
+			
+			
+		<!-- 	<button class="btn  btn2" @click="show4=true" v-if="userCard&&userCard.classify==2">购买月卡 - 并<span style="color:red">废弃</span>其他卡
+			</button> -->
+			<button class="btn " v-if="userInfo.userType=='1'">游客无法购买月卡
+			</button>
+			
+			<button class="btn " v-else-if="!isReady">加载中
+			</button>
+			<button class="btn " v-else-if="ispay"> {{userCard&&ispay?userCard.endTime:''}}到期
+			</button>
+			<button class="btn " v-else-if="!endCardBool">已下架
+			</button>
+			<button class="btn " v-else-if="!show2" @click="gotoGz">关注公众号
+			</button>
+			<button class="btn " v-else-if="!infoSet" @click="gotoUrl('pages/user/dataSet')">完善个人信息
+			</button>
+
+			<button class="btn " v-else-if="!cardList.length" @click="putShelf">已下架
+			</button>
+			<button class="btn " @click="showPay" v-else-if="detail.isVip">
+
+				<text style="font-size: 14px;">￥</text>
+
+				<span>{{detail.price}}</span>
+
+				<text class="price">{{detail.oldPrice}}</text>开通充电月卡
+
+				<view class="position">
+					<view id="talkbubble">{{detail.platformText}}车主</view>
+				</view>
+			</button>
+			<button class="btn " @click="showPay" v-else>
+
+				<text style="font-size: 14px;"></text>
+
+				<span style="margin-right: 8px;">{{detail.price}}元</span>
+
+				<text v-if="detail.discount" class="price">{{detail.oldPrice}}</text> 开通服务费包月会员
+
+				<view class="position" v-if="false&&detail.remark2">
+					<view id="talkbubble">{{detail.remark2}}</view>
+				</view>
+			</button>
+
+
+
+			<view class="hint">
+				开通表示阅读并同意<span @click="gotoUrl('pages/article/details?code=FWFZKXY')"
+					style="text-decoration:underline;color: #C07C38;">《服务费折扣协议》</span>
+			</view>
+		</view>
+		<u-modal v-model="show4" title="购买须知"  @confirm="show4=false,show=true" cancel-text="取消" confirm-text="确认购买" confirm-color="red"
+			:show-cancel-button="true" ref="uModal2" :asyncClose="true">
+			<view style="padding: 15px;  " v-if="userCard">
+				<view>由于您已经购买了其他卡</view>
+				<view style="margin-top: 8px;">汽车充电同时只生效一张卡，且本<span style="color: #00b962;">月卡</span>优惠力度最高。</view>
+				<view style="margin-top: 4px;">购买成功后，将<span style="color: red;">废弃</span>您已购买的<span style="color: #00b962;">[6折卡]</span>，且<span style="color: red;">不退款、不折算</span>。</view>
+				<view style="margin-top: 4px;">同时也建议您先使用完<span style="color: #00b962;">[6折卡]</span>的充电度数，以免造成不必要的损失。</view>
 				<view style="margin-top: 4px;">已购买<span style="color: #00b962;">[6折卡]</span>：于{{userCard.endTime.substring(0,10)}}到期,已用{{userCard.chargedDegree?userCard.chargedDegree.toFixed(0):0.00}}度 /
-								共{{userCard.chargeDegreeLimit}}度。</view>
-				
-				
-			</view>
-		
-		
-		</u-modal>
-		
-		<u-modal v-model="show3" @confirm="confirmPhone" confirm-text="拨打电话" confirm-color="#606266"
-			:show-cancel-button="true" ref="uModal" :asyncClose="true" title="客服电话" :content="consumerPhone"
-			:content-style="{fontSize: '24px',color: '#101010'}"></u-modal>
-
-	</view>
-</template>
-
-<script>
-	import * as API_weixin from '@/apis/weixin.js'
-	import * as API_site from '@/apis/site.js';
-
-	import * as Pay from '@/apis/weixin.js'
-	import * as API from '@/apis/card.js'
-	import * as loginApi from '@/apis/login.js'
-	import Tabbar from '@/components/Tabbar.vue';
-	import QRCode from 'qrcodejs2'
-	import {
-		newDate,
-		convertCanvasToImage,
-	} from '@/utils'
-	import {
-		wxPayJs
-	} from '@/utils/wxpay'
-	export default {
-		components: {
-			Tabbar
-		},
-		data() {
-			return {
-				description: '盟主能量包本期限时优惠活动将于9月16日结束。',
-				checked: "false",
-				cardId: '',
-				qrCodeImg: "",
-				show4:false,
-				showModel: false,
-				cardList: [],
-				pageList: [],
-				projectName: "",
-				list: [{
-					text: '微信',
-
-				}, {
-					text: '支付宝'
-				}],
-				show: false,
-				submitForm: {},
-				//ykgz: '',
-				detail: {},
-				ispay: false,
-				show3: false,
-				show2: true,
-				show1: false,
-				infoSet: true,
-				infoSet1: false,
-				userCard: null,
-				isReady: false,
-				userInfo: {},
-				elderStatus: false,
-				consumerPhone: "",
-				scrollLeftSet: 0,
-				uCurrent:0,
-				scrollLeftOldSet: 0,
-				scrollLeftSetBl: false,
-				flag: 0, //0  初始化，  1 ，开始判断， 2已经滑动
-
-			}
-		},
-		onLoad() {
-			this.projectName = process.car.ProjectName;
-
-		},
-		onReady() {
-			var consumerPhone = "400-8899-619"
-			// img="https://yktwechat.xiaoxinda.com/config/xxd2021.jpg"		
-			if (consumerPhone) {
-				this.consumerPhone = consumerPhone
-			}
-
-			//this.ykgz = this.carhelp.getConfig().ykgz
-			//this.checkSubscribe()
-			this.getCardList();
-		},
-		onShow() {
-			if (this.carhelp.get("getElderModeClass") == "长辈模式") {
-				this.elderStatus = true;
-			} else {
-				this.elderStatus = false;
-			}
-			if (this.$refs.tabbarMain) {
-				this.$refs.tabbarMain.setcount(1);
-			}
-
-			//this.checkSubscribe();
-
-			// this.getCardList();
-			// this.show2 = true;
-		},
-		computed: {
-			pageListGetObj() {
-				var cardId = this.cardId
-				if (this.ispay) {
-					cardId = this.userCard.rentCardId;
-				}
-				var i = this.pageList.findIndex(item => {
-					return item.monthlyRentCardId == cardId
-				})
-				if (i == -1)
-					return {
-						list: []
-					}
-				else
-					return this.pageList[i]
-			},
-
-			endCardBool() {
-				if (!this.cardList.length) {
-					return false;
-				}
-				var date = new Date().getTime()
-				if (!this.detail.endTime) {
-					return true;
-				}
-				var date2 = newDate(this.detail.endTime).getTime();
-
-				if (date < date2) {
-					return true;
-				} else {
-					return false;
-				}
-			}
-		},
-		onPageScroll(e) {
-
-			if (this.flag == 1) {
-				if (e.scrollTop >= 50) {
-					this.flag = 2;
-				} else {
-
-				}
-			}
-		},
-		methods: {
-			
-			showPay(){
-				// if(this.userCard&&this.userCard.classify==2){
-				// 	this.show4=true
-				// }else{
-					
-				// }
-				this.show=true
-			},
-			scrolltolower: function(e) {
-				//		
-
-			},
-			scrolltoupper: function(e) {
-
-				//this.scrollLeftSetBl=false;
-			},
-			scroll: function(e) {
-
-				if (this.scrollLeftSetBl) {
-					return
-				}
-				this.scrollLeftSetBl = true;
-				var scrollWidth = e.detail.scrollWidth
-				if (e.detail.deltaX > 0) {
-					//右移动
-					this.scrollLeftSet = 0;
-					this.checkboxChange(this.cardList[0].monthlyRentCard)
-				} else {
-					//左移动
-					this.scrollLeftSet = scrollWidth
-					if (this.cardList.length > 1) {
-						this.checkboxChange(this.cardList[1].monthlyRentCard)
-					}
-
-				}
-
-				this.scrollLeftSetBl = false;
-				//this.old.scrollTop = e.detail.scrollTop
-				this.scrollLeftOldSet = e.detail.scrollLeft
-			},
-			confirmPhone() {
-				this.show = false;
-				uni.makePhoneCall({
-					phoneNumber: this.consumerPhone //仅为示例
-				});
-			},
-			openModal() {
-				this.show3 = true;
-			},
-			checkboxChangeBtn(e){
-				this.uCurrent=e
-				this.checkboxChange(this.cardList[e].monthlyRentCard)
-			},
-			checkboxChange(monthlyRentCard) {
-
-				this.detail = monthlyRentCard;
-				this.cardId = monthlyRentCard.id
-				monthlyRentCard.checked = true
-				for (var i in this.cardList) {
-					var obj = this.cardList[i].monthlyRentCard;
-					if (this.cardId == obj.id) {
-
-					} else {
-						obj.checked = false
-					}
-				}
-				this.getPageList(false);
-			},
-			gotoGz() {
-				this.carhelp.setGzDate()
-				var url = "https://mp.weixin.qq.com/s/mCHz1nNvg0xAICiBeIyKRQ";
-				window.location.href = url
-
-			},
-			checkSubscribe() {
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				API_weixin.checkSubscribe({
-					openId: this.carhelp.getOpenId()
-				}).then((res) => {
-					uni.hideLoading()
-					if (res.data == "0") {
-						this.show1 = true
-
-					} else {
-						//this.getInfo();
-
-						this.getCardList();
-						this.show2 = true;
-						//this.carhelp.setGzDate() 
-					}
-
-					//setGzDate
-				}).catch(error => {
-					uni.showToast({
-						title: error
-					})
-				})
-
-			},
-			userCardBool(userCard) {
-
-
-				if (userCard&&userCard.classify==1) {
-					var date = new Date().getTime()
-					var date2 = newDate(userCard.endTime).getTime();
-					if (date < date2) {
-						return true;
-					}
-				}
-				return false
-			},
-			getCardList() {
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				API.cardList({
-					type:1
-				}).then((response) => {
-					
-					this.cardList = response.data.cardList;
-
-					for (var i in this.cardList) {
-						var obj = this.cardList[i].monthlyRentCard
-						//不打折的卡
-						obj.remark2 = obj.remark;
-						if (obj.oldPrice) {
-
-							if (!obj.discount && obj.couponRemark) {
-								obj.remark2 = obj.couponRemark
-								if (!obj.remark) {
-									obj.remark = "月卡优惠券"
-								}
-							}
-							obj.discount = true
-						}
-					}
-
-					if (this.cardList.length) {
-						this.detail = this.cardList[0].monthlyRentCard
-						this.cardId = this.detail.id;
-						this.cardList[0].monthlyRentCard.checked = true
-						if (this.pageList.length == 0) {
-							this.pageList = this.cardList.map(item => {
-								return {
-									recordsTotal: -1,
-									monthlyRentCardId: item.monthlyRentCard.id,
-									list: [],
-									pageIndex: 1,
-								}
-							})
-							this.getPageList(false);
-						}
-
-						//this.pageList.map(item)
-					}
-					this.getUserInfo()
-					this.isReady = true;
-					//cardId: this.cardId
-
-				}).catch(error => {
-					uni.showToast({
-						title: error
-					})
-				})
-			},
-			getPageList(bl) {
-
-				var cardId = this.cardId
-				if (this.ispay) {
-					cardId = this.userCard.rentCardId;
-				}
-				var i = this.pageList.findIndex(item => {
-					return item.monthlyRentCardId == cardId
-				})
-				var data = {
-					monthlyRentCardId: cardId,
-					online: 0,
-					pageSize: 6,
-				}
-				if (this.carhelp.getPersonInfo()) {
-					data.openId = this.carhelp.getOpenId()
-				}
-
-				if (i > -1) {
-					if (bl) {
-						this.pageList[i].pageIndex += 1;
-					} else {
-						if (this.pageList[i].recordsTotal == -1) {
-
-						} else {
-							return
-						}
-					}
-					data.pageIndex = this.pageList[i].pageIndex
-				} else {
-					return
-				}
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-
-
-				var list = this.pageList[i].list;
-				API_site.getChargingStationData(data).then((response) => {
-					console.log(response)
-					list = [
-						...list,
-						...response.data.data
-					];
-					this.pageList[i].recordsTotal = response.data.recordsTotal;
-					this.pageList[i].list = list;
-
-					uni.hideLoading()
-				}).catch(error => {
-					uni.showToast({
-						title: error
-					})
-				})
-			},
-			getUserInfo() {
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				loginApi.findByOpenId({
-					openId: this.carhelp.getOpenId(),
-					noerror: true
-				}).then((res) => {
-
-
-					if (res.code == 200 && res.result) {
-
-						if (res.data.regUser) {
-							var userInfo = res.data.regUser
-							this.userInfo = userInfo;
-							// if (userInfo.userType == "1") {
-
-							// } else if (userInfo.carId && userInfo.realName) {
-							// 	this.infoSet = true;
-
-							// } else {
-							// 	this.infoSet = false;
-							// 	if (this.endCardBool) {
-							// 		this.infoSet1 = true;
-							// 	}
-
-							// }
-
-							var userCard = res.data.userCard;
-							this.userCard = userCard
-							this.ispay = this.userCardBool(userCard)
-
-						} else {
-
-						}
-						if (this.flag == 0) {
-							this.flag = 1;
-							setTimeout(() => {
-								this.flag = 2;
-							}, 5000)
-						}
-					}
-					uni.hideLoading();
-
-
-
-
-
-				}).catch(error => {
-					uni.showToast({
-						title: error,
-						icon: "none"
-					})
-				})
-			},
-			putShelf2() {
-				uni.showToast({
-					title: "暂不支持重复购买"
-				})
-			},
-			putShelf() {
-				uni.showToast({
-					title: "已下架，暂不支持购买"
-				})
-			},
-			getInfo() {
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				API.cardDetail({
-					cardId: this.cardId
-				}).then((response) => {
-
-					this.detail = response.data.monthlyRentCard
-					uni.hideLoading()
-				}).catch(error => {
-					uni.showToast({
-						title: error
-					})
-				})
-			},
-			submit(type) {
-				if (!this.endCardBool) {
-					return
-				}
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				API.openCard({
-					cardId: this.cardId
-				}).then((response) => {
-					this.submitForm.id = response.data.orderInfoId
-
-					if (type == 0) {
-						this.wxpy()
-					}
-					if (type == 1) {
-						this.alpy()
-					}
-				}).catch(error => {
-					uni.showToast({
-						title: error
-					})
-				})
-
-			},
-			alpy() {
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				var listcanvas = document.getElementsByTagName('canvas')
-
-				if (listcanvas.length > 0) {
-					document.getElementById("qrcode").removeChild(document.getElementsByTagName('canvas')[0]);
-				}
-				Pay.alpay(this.submitForm).then((response) => {
-
-					let qrcode = new QRCode('qrcode', {
-						width: 200,
-						height: 200,
-						text: response.data.qr_code,
-						correctLevel: QRCode.CorrectLevel.M,
-
-					})
-					this.outOrderNo = response.data.outOrderNo;
-					var canvas = document.getElementsByTagName('canvas')[0];
-					this.qrCodeImg = convertCanvasToImage(canvas);
-					uni.hideLoading()
-					this.showModel = true
-
-				}).catch(error => {
-					uni.showToast({
-
-						title: error
-					})
-				})
-			},
-			wxpy() {
-
-				Pay.wxpay(this.submitForm).then((response) => {
-
-					if (!response.result) {
-						uni.showToast({
-							title: response.message
-						})
-						return
-					}
-					var data = response.data
-					uni.hideLoading()
-					//("Pay+"+new Date().getTime())		
-					wxPayJs(data);
-
-				}).catch(error => {
-					uni.showToast({
-
-						title: error
-					})
-
-				})
-			},
-			confirm() {
-				this.getUserInfo();
-				uni.redirectTo({
-					url: "/pages/user/finance/rechargeRes?id=" + this.outOrderNo
-				})
-			},
-			click(index) {
-				console.log(`点击了第${index + 1}项，内容为：${this.list[index].text}`)
-				this.submit(index);
-			}
-		}
-
-	}
-</script>
-<style>
-	@keyframes movepoint {
-		25% {
-			top: 10px;
-		}
-
-		100% {
-			top: 15px;
-		}
-	}
-
-	.upupupImg {
-		height: 80px;
-	}
-
-	.upupupView {
-		text-align: center;
-		font-size: 12px;
-		padding: 30rpx;
-		border-radius: 12px;
-		position: absolute;
-		background: rgb(0 0 0 / 70%);
-		top: 50%;
-		transform: translate(-50%);
-		left: 50%;
-		color: #fff;
-
-
-	}
-
-	.upupupView img {
-		top: 15px;
-		position: relative;
-		width: 60px;
-		animation: movepoint 2s infinite;
-		-webkit-animation: movepoint 2s infinite;
-	}
-</style>
-<style lang="scss" scoped>
-	.scroll-Y {
-		height: 300rpx;
-	}
-
-	.scroll-view_H {
-		white-space: nowrap;
-		width: 100%;
-	}
-
-	.scroll-view-item {
-		height: 300rpx;
-		line-height: 300rpx;
-		text-align: center;
-		font-size: 36rpx;
-	}
-
-	.scroll-view-item_H {
-		display: inline-block;
-		//width: 85%;
-		height: 300rpx;
-		line-height: 300rpx;
-		text-align: center;
-		font-size: 36rpx;
-	}
-
-	.service {
-		font-size: 24px;
-		//color: #fff;
-		position: absolute;
-		right: 16px;
-	}
-
-	/deep/.u-alert-desc {
-		color: #ff7300;
-	}
-
-	// 卡片
-	.main {
-		background-color: #404A5E;
-		padding: 40rpx 0 0 0;
-		z-index: 80;
-
-		.tag {
-			position: absolute;
-			background-color: rgba(255, 61, 0, 100);
-			color: #ffffff;
-			font-size: 24rpx;
-			text-align: center;
-			line-height: 40rpx;
-			padding: 0 12rpx;
-			right: 0rpx;
-			top: 0rpx;
-			border-radius: 0 12px 0 12px;
-
-		}
-
-		// @media screen and (max-width:320px) {
-		// 	.tag {
-		// 		padding: 0 4rpx;
-		// 	}
-
-		// 	.price {
-		// 		position: absolute;
-		// 		top: 24rpx !important;
-		// 		right: 32rpx !important;
-		// 	}
-
-		// 	.current-price {
-		// 		font-size: 36rpx;
-		// 	}
-		// }
-		.priceName{
-			top: -30rpx;
-			left: 30rpx;
-			position: absolute;
-			font-size: 32rpx;
-		}
-		.price {
-			top: -90rpx;
-			right: 42rpx;
-			position: absolute;
-
-			p {
-				text-align: right;
-				color: rgba(0, 0, 0, 0.5);
-				font-size: 12px;
-				position: relative;
-				top: -250rpx;
-
-			}
-		}
-
-		.current-price {
-			font-size: 58rpx;
-			color: #101010;
-			text-align: right;
-
-			text {
-				font-size: 28rpx;
-
-			}
-		}
-
-		.original-cost {
-			color: rgba(75, 65, 50, 100);
-			text-decoration: line-through;
-			margin-bottom: 6rpx;
-
-		}
-
-		/deep/.u-iconfont {
-			font-size: 36rpx !important;
-
-		}
-
-
-		.card-0 {}
-
-		// .card-0 {
-		// 	background-position-x: 40rpx;
-		// }
-
-		.cardtab {
-			margin-top: 32rpx;
-			position: relative;
-			background-size: 100% 100%;
-			background-repeat: no-repeat;
-			height: 200rpx;
-
-
-			/deep/.u-checkbox__icon-wrap {
-
-				background-color: #607d8b;
-				opacity: 0.3
-			}
-
-			.radio-box {
-				position: absolute;
-				right: 0;
-				bottom: 40rpx;
-
-			}
-		}
-
-
-
-	}
-
-	// 按钮
-	.button {
-		position: fixed;
-		margin-top: -20rpx;
-		width: 100%;
-
-		bottom: 0px;
-		border-radius: 16px 16px 0px 0px;
-
-		padding: 20px 20px 24px 20px;
-		background: linear-gradient(180deg, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 1) 67%, rgba(255, 255, 255, 1) 84%);
-
-		uni-button:after {
-			border: none;
-		}
-
-		.btn {
-			border: none !important;
-			background: linear-gradient(#D8A05B, #C07C38);
-			box-shadow: 0px 2px 6px 0px rgba(207, 175, 118, 40);
-			border-radius: 50px;
-			color: #FFF;
-			font-size: 18px !important;
-			line-height: 44px;
-			height: 44px;
-			overflow: inherit !important;
-
-			.price {
-				text-decoration: line-through;
-				margin: auto 4px;
-				font-size: 12px
-			}
-		}
-		.btn2 {
-			background: #00b962;
-		}
-		.hint {
-			color: rgba(159, 157, 154, 100);
-			line-height: 20px;
-			text-align: center;
-			margin-top: 8px;
-		}
-
-		.btn-2 {
-			position: relative;
-		}
-
-		.position {
-			position: absolute;
-			top: -16px;
-			left: 24%;
-			z-index: 999;
-		}
-
-		#talkbubble {
-			position: absolute;
-			top: 0;
-			left: 0;
-			padding: 0 10px;
-			line-height: 20px;
-			font-size: 12px;
-			color: #fff;
-			background: red;
-			position: relative;
-			border-radius: 10px;
-			text-align: center;
-		}
-
-		#talkbubble:before {
-			content: "";
-			position: absolute;
-			top: 100%;
-			//right: 45%;
-			border-top: 5px solid red;
-			border-right: 5px solid transparent;
-			border-left: 5px solid transparent;
-		}
-	}
-
-	.notice2 {
-		padding: 0 0 120px 0;
-
-		.titleHead {
-			color: #101010;
-			font-size: 40rpx;
-			text-align: center;
-			margin-bottom: 10px;
-		}
-	}
-
-	// 须知
-	.notice {
-		top: -10rpx;
-		border-radius: 15px 15px 0 0;
-		position: relative;
-
-		.title {
-			color: rgba(51, 51, 51, 1);
-			font-size: 40rpx;
-			text-align: center;
-			margin-bottom: 30rpx;
-		}
-
-		.line {
-			margin-bottom: 40rpx;
-			color: #666666;
-			font-size: 34rpx;
-			line-height: 52rpx;
-			.lineInfo1{
-				border: 1px solid #D5C5B5;
-				background-color: #fef9f5;
-			}
-			.lineInfo2{
-				border: 1px solid #79ACDB ;
-				background-color: #ffffff;
-			}
-			.lineInfo{
-				margin-right: 20rpx;
-				display: flex;
-				padding: 20rpx 15rpx 15rpx 10rpx;
-				border-radius: 10px;
-				 margin-bottom: 16rpx;
-				.lineSvg{
-					padding-top: 2px;
-					margin: auto 16rpx;
-					img{
-						width: 70rpx;
-						color:#62574C ;
-					}
-				}
-				.lineView{
-					.lineTitle{
-						color:#62574C;
-						font-size: 36rpx;
-					}
-					.linep{
-						color:#8A7B6C;
-						font-size: 28rpx;
-						line-height:  28rpx;
-					}
-				}
-			}
-			
-		}
-
-		background-color: #fff;
-
-		padding: 30rpx 30rpx 30rpx 50rpx;
-
-		/deep/.u-divider {
-			margin-bottom: 16px !important;
-		}
-
-		.text {
-			color: #666666;
-			margin-bottom: 12px;
-			line-height: 24px;
-			display: flex;
-
-			.num {
-				margin-right: 8px;
-			}
-		}
-	}
-
-	.carNone {
-		display: flex;
-		flex-direction: column;
-		justify-content: center;
-		align-items: center;
-
-		img {
-			width: 100%;
-			height: 100%;
-		}
-
-		p {
-			margin-top: -60px;
-		}
-	}
-
-	.slogan-4 {
-		margin-top: 10px;
-		/* text-decoration: underline; */
-		color: #9F9C99;
-
-		text-align: center;
-		position: fixed;
-		/* top: 40px; */
-		bottom: 40px;
-		right: 20px;
-		height: 55px;
-		width: 55px;
-		line-height: 20px;
-		font-size: 16px;
-		background: linear-gradient(45deg, #4BD2C0, rgb(72, 218, 149));
-		box-shadow: 0 4rpx 24rpx 0 rgb(72, 218, 149);
-		padding-top: 8px;
-		color: #fff;
-		border-radius: 25px;
-
-	}
-
-	.station,
-	.location,
-	.state1 {
-		box-shadow: 0px 4rpx 12rpx 0px #008c4a33;
-	}
-
-	// 附近站点改版
-	.station {
-
-		width: 91.4%;
-		border-radius: 8px;
-		padding: 12px 12px 12px 11px;
-		background-color: #fff;
-		margin: 8px auto 0;
-
-		.head {
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-
-			.title {
-				color: rgba(16, 16, 16, 100);
-				font-size: 32rpx;
-				font-weight: 550;
-				width: 440rpx;
-				text-overflow: ellipsis;
-				overflow: hidden;
-				white-space: nowrap;
-			}
-
-			.distance {
-				width: 180rpx;
-				color: rgba(102, 102, 102, 100);
-				font-size: 32rpx;
-				text-align: end;
-
-				.iconfont {
-					font-size: 24rpx;
-					margin-right: 4rpx;
-				}
-			}
-		}
-
-		.sign {
-			display: flex;
-			flex-wrap: wrap;
-			margin-top: 16rpx;
-
-			.sign-1 {
-				line-height: 40rpx;
-				border-radius: 8rpx;
-				background-color: rgba(255, 255, 255, 100);
-				color: rgba(255, 139, 0, 100);
-				font-size: 24rpx;
-				text-align: center;
-				border: 1px solid rgba(255, 139, 0, 100);
-				padding: 0 8rpx;
-				margin-right: 16rpx;
-				margin-bottom: 8rpx;
-			}
-
-			.sign-2 {
-				line-height: 40rpx;
-				border-radius: 8rpx;
-				background-color: rgba(255, 255, 255, 100);
-				color: rgba(153, 153, 153, 100);
-				font-size: 24rpx;
-				text-align: center;
-				border: 1px solid rgba(204, 204, 204, 100);
-				padding: 0 8rpx;
-				margin-right: 16rpx;
-				margin-bottom: 8rpx;
-			}
-
-			.sign-3 {
-				line-height: 40rpx;
-				border-radius: 8rpx;
-				background-color: rgba(255, 255, 255, 100);
-				color: #8161FF;
-				font-size: 24rpx;
-				text-align: center;
-				border: 1px solid #8161FF;
-				padding: 0 8rpx;
-				margin-right: 16rpx;
-				margin-bottom: 8rpx;
-			}
-
-			.sign-4 {
-				line-height: 40rpx;
-				border-radius: 8rpx;
-				background-color: rgba(255, 255, 255, 100);
-				color: #00B962;
-				font-size: 24rpx;
-				text-align: center;
-				border: 1px solid #00B962;
-				padding: 0 8rpx;
-				margin-right: 16rpx;
-				margin-bottom: 8rpx;
-			}
-		}
-
-		.price-free {
-			display: flex;
-			justify-content: space-between;
-			margin-top: 8rpx;
-
-			.price {
-				display: flex;
-				align-items: baseline;
-			}
-
-			.price-1 {
-				.num {
-					color: rgba(255, 98, 0, 100);
-					font-size: 44rpx;
-				}
-
-				.unit {
-					font-size: 12px;
-					color: rgba(153, 153, 153, 100);
-				}
-			}
-			.price-3 {
-				font-size: 24rpx;
-				color: #fff;
-				margin-left: 8rpx;
-				padding-right: 9rpx;
-				 background:#00B962 ;
-				 border-radius: 8rpx;
-				.num1{
-					 padding-left:  12rpx;
-					border-radius: 8rpx 0 8rpx 8rpx;
-					 padding-right: 18rpx;
-					 background: #121212;
-					 -webkit-clip-path: polygon(0 0, 93% 0, 84% 100%, 0% 100%);
-					 clip-path:  polygon(0 0, 93% 0, 84% 100%, 0% 100%);
-					 
-				}
-				 
-			}
-			.price-2 {
-				font-size: 24rpx;
-				color: rgba(153, 153, 153, 100);
-				margin-left: 8rpx;
-				text-decoration: line-through;
-			}
-		}
-
-		.free {
-			display: flex;
-			align-items: center;
-
-			.slow,
-			.fast {
-				display: flex;
-
-				.sp-font {
-					width: 40rpx;
-					height: 40rpx;
-					line-height: 40rpx;
-					border-radius: 4px;
-					background-color: #7a68f6;
-					color: #fff;
-					font-size: 28rpx;
-					text-align: center;
-					margin-right: 2rpx;
-				}
-
-				.fast-font {
-					width: 40rpx;
-					height: 40rpx;
-					line-height: 40rpx;
-					border-radius: 8rpx;
-					background-color: rgba(186, 240, 215, 100);
-					color: rgba(0, 130, 69, 100);
-					font-size: 28rpx;
-					text-align: center;
-					margin-right: 8rpx;
-				}
-
-				.slow-font {
-					width: 40rpx;
-					height: 40rpx;
-					line-height: 40rpx;
-					border-radius: 8rpx;
-					background-color: rgba(226, 226, 226, 100);
-					color: rgba(128, 128, 128, 100);
-					font-size: 28rpx;
-					text-align: center;
-					margin-right: 8rpx;
-				}
-
-				.num {
-					font-size: 32rpx;
-					color: rgba(0, 145, 67, 100);
-					line-height: 40rpx;
-				}
-			}
-
-			.slow {
-				margin-left: 24rpx;
-			}
-		}
-	}
-
-	.user-card {
-		padding: 19px 0 39px 20px;
-		margin: 21px 20px 0 20px;
-		background: url(@/assets/img/companyVIP.png) no-repeat right, linear-gradient(to right, #C6D4ED, #DCE6F0) no-repeat;
-		box-shadow: 0px 0px 16px 0px rgba(14, 39, 84, 28);
-		border: 2px solid rgba(236, 239, 245, 100);
-		border-radius: 16px;
-		display: flex;
-
-		.head-img {
-			width: 48px;
-			height: 48px;
-
-			img {
-				width: 100%;
-			}
-		}
-
-		.user-name {
-			margin-left: 12px;
-
-			.name {
-				line-height: 24px;
-				color: rgba(33, 41, 48, 100);
-				font-size: 24px;
-				font-weight: 550;
-			}
-
-			.sign {
-				color: rgba(76, 89, 111, 100);
-				font-size: 16px;
-				line-height: 16px;
-				margin-top: 8px;
-			}
-		}
-	}
+								共{{userCard.chargeDegreeLimit}}度。</view>
+				
+				
+			</view>
+		
+		
+		</u-modal>
+		
+		<u-modal v-model="show3" @confirm="confirmPhone" confirm-text="拨打电话" confirm-color="#606266"
+			:show-cancel-button="true" ref="uModal" :asyncClose="true" title="客服电话" :content="consumerPhone"
+			:content-style="{fontSize: '24px',color: '#101010'}"></u-modal>
+
+	</view>
+</template>
+
+<script>
+	import * as API_weixin from '@/apis/weixin.js'
+	import * as API_site from '@/apis/site.js';
+
+	import * as Pay from '@/apis/weixin.js'
+	import * as API from '@/apis/card.js'
+	import * as loginApi from '@/apis/login.js'
+	import Tabbar from '@/components/Tabbar.vue';
+	import QRCode from 'qrcodejs2'
+	import {
+		newDate,
+		convertCanvasToImage,
+	} from '@/utils'
+	import {
+		wxPayJs
+	} from '@/utils/wxpay'
+	export default {
+		components: {
+			Tabbar
+		},
+		data() {
+			return {
+				description: '盟主能量包本期限时优惠活动将于9月16日结束。',
+				checked: "false",
+				cardId: '',
+				qrCodeImg: "",
+				show4:false,
+				showModel: false,
+				cardList: [],
+				pageList: [],
+				projectName: "",
+				list: [{
+					text: '微信',
+
+				}, {
+					text: '支付宝'
+				}],
+				show: false,
+				submitForm: {},
+				//ykgz: '',
+				detail: {},
+				ispay: false,
+				show3: false,
+				show2: true,
+				show1: false,
+				infoSet: true,
+				infoSet1: false,
+				userCard: null,
+				isReady: false,
+				userInfo: {},
+				elderStatus: false,
+				consumerPhone: "",
+				scrollLeftSet: 0,
+				uCurrent:0,
+				scrollLeftOldSet: 0,
+				scrollLeftSetBl: false,
+				flag: 0, //0  初始化，  1 ，开始判断， 2已经滑动
+
+			}
+		},
+		onLoad() {
+			this.projectName = process.car.ProjectName;
+
+		},
+		onReady() {
+			var consumerPhone = "400-8899-619"
+			// img="https://yktwechat.xiaoxinda.com/config/xxd2021.jpg"		
+			if (consumerPhone) {
+				this.consumerPhone = consumerPhone
+			}
+
+			//this.ykgz = this.carhelp.getConfig().ykgz
+			//this.checkSubscribe()
+			this.getCardList();
+		},
+		onShow() {
+			if (this.carhelp.get("getElderModeClass") == "长辈模式") {
+				this.elderStatus = true;
+			} else {
+				this.elderStatus = false;
+			}
+			if (this.$refs.tabbarMain) {
+				this.$refs.tabbarMain.setcount(1);
+			}
+
+			//this.checkSubscribe();
+
+			// this.getCardList();
+			// this.show2 = true;
+		},
+		computed: {
+			pageListGetObj() {
+				var cardId = this.cardId
+				if (this.ispay) {
+					cardId = this.userCard.rentCardId;
+				}
+				var i = this.pageList.findIndex(item => {
+					return item.monthlyRentCardId == cardId
+				})
+				if (i == -1)
+					return {
+						list: []
+					}
+				else
+					return this.pageList[i]
+			},
+
+			endCardBool() {
+				if (!this.cardList.length) {
+					return false;
+				}
+				var date = new Date().getTime()
+				if (!this.detail.endTime) {
+					return true;
+				}
+				var date2 = newDate(this.detail.endTime).getTime();
+
+				if (date < date2) {
+					return true;
+				} else {
+					return false;
+				}
+			}
+		},
+		onPageScroll(e) {
+
+			if (this.flag == 1) {
+				if (e.scrollTop >= 50) {
+					this.flag = 2;
+				} else {
+
+				}
+			}
+		},
+		methods: {
+			
+			showPay(){
+				// if(this.userCard&&this.userCard.classify==2){
+				// 	this.show4=true
+				// }else{
+					
+				// }
+				this.show=true
+			},
+			scrolltolower: function(e) {
+				//		
+
+			},
+			scrolltoupper: function(e) {
+
+				//this.scrollLeftSetBl=false;
+			},
+			scroll: function(e) {
+
+				if (this.scrollLeftSetBl) {
+					return
+				}
+				this.scrollLeftSetBl = true;
+				var scrollWidth = e.detail.scrollWidth
+				if (e.detail.deltaX > 0) {
+					//右移动
+					this.scrollLeftSet = 0;
+					this.checkboxChange(this.cardList[0].monthlyRentCard)
+				} else {
+					//左移动
+					this.scrollLeftSet = scrollWidth
+					if (this.cardList.length > 1) {
+						this.checkboxChange(this.cardList[1].monthlyRentCard)
+					}
+
+				}
+
+				this.scrollLeftSetBl = false;
+				//this.old.scrollTop = e.detail.scrollTop
+				this.scrollLeftOldSet = e.detail.scrollLeft
+			},
+			confirmPhone() {
+				this.show = false;
+				uni.makePhoneCall({
+					phoneNumber: this.consumerPhone //仅为示例
+				});
+			},
+			openModal() {
+				this.show3 = true;
+			},
+			checkboxChangeBtn(e){
+				this.uCurrent=e
+				this.checkboxChange(this.cardList[e].monthlyRentCard)
+			},
+			checkboxChange(monthlyRentCard) {
+
+				this.detail = monthlyRentCard;
+				this.cardId = monthlyRentCard.id
+				monthlyRentCard.checked = true
+				for (var i in this.cardList) {
+					var obj = this.cardList[i].monthlyRentCard;
+					if (this.cardId == obj.id) {
+
+					} else {
+						obj.checked = false
+					}
+				}
+				this.getPageList(false);
+			},
+			gotoGz() {
+				this.carhelp.setGzDate()
+				var url = "https://mp.weixin.qq.com/s/mCHz1nNvg0xAICiBeIyKRQ";
+				window.location.href = url
+
+			},
+			checkSubscribe() {
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				API_weixin.checkSubscribe({
+					openId: this.carhelp.getOpenId()
+				}).then((res) => {
+					uni.hideLoading()
+					if (res.data == "0") {
+						this.show1 = true
+
+					} else {
+						//this.getInfo();
+
+						this.getCardList();
+						this.show2 = true;
+						//this.carhelp.setGzDate() 
+					}
+
+					//setGzDate
+				}).catch(error => {
+					uni.showToast({
+						title: error
+					})
+				})
+
+			},
+			userCardBool(userCard) {
+
+
+				if (userCard&&userCard.classify==1) {
+					var date = new Date().getTime()
+					var date2 = newDate(userCard.endTime).getTime();
+					if (date < date2) {
+						return true;
+					}
+				}
+				return false
+			},
+			getCardList() {
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				API.cardList({
+					type:1
+				}).then((response) => {
+					
+					this.cardList = response.data.cardList;
+
+					for (var i in this.cardList) {
+						var obj = this.cardList[i].monthlyRentCard
+						//不打折的卡
+						obj.remark2 = obj.remark;
+						if (obj.oldPrice) {
+
+							if (!obj.discount && obj.couponRemark) {
+								obj.remark2 = obj.couponRemark
+								if (!obj.remark) {
+									obj.remark = "月卡优惠券"
+								}
+							}
+							obj.discount = true
+						}
+					}
+
+					if (this.cardList.length) {
+						this.detail = this.cardList[0].monthlyRentCard
+						this.cardId = this.detail.id;
+						this.cardList[0].monthlyRentCard.checked = true
+						if (this.pageList.length == 0) {
+							this.pageList = this.cardList.map(item => {
+								return {
+									recordsTotal: -1,
+									monthlyRentCardId: item.monthlyRentCard.id,
+									list: [],
+									pageIndex: 1,
+								}
+							})
+							this.getPageList(false);
+						}
+
+						//this.pageList.map(item)
+					}
+					this.getUserInfo()
+					this.isReady = true;
+					//cardId: this.cardId
+
+				}).catch(error => {
+					uni.showToast({
+						title: error
+					})
+				})
+			},
+			getPageList(bl) {
+
+				var cardId = this.cardId
+				if (this.ispay) {
+					cardId = this.userCard.rentCardId;
+				}
+				var i = this.pageList.findIndex(item => {
+					return item.monthlyRentCardId == cardId
+				})
+				var data = {
+					monthlyRentCardId: cardId,
+					online: 0,
+					pageSize: 6,
+				}
+				if (this.carhelp.getPersonInfo()) {
+					data.openId = this.carhelp.getOpenId()
+				}
+
+				if (i > -1) {
+					if (bl) {
+						this.pageList[i].pageIndex += 1;
+					} else {
+						if (this.pageList[i].recordsTotal == -1) {
+
+						} else {
+							return
+						}
+					}
+					data.pageIndex = this.pageList[i].pageIndex
+				} else {
+					return
+				}
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+
+
+				var list = this.pageList[i].list;
+				API_site.getChargingStationData(data).then((response) => {
+					console.log(response)
+					list = [
+						...list,
+						...response.data.data
+					];
+					this.pageList[i].recordsTotal = response.data.recordsTotal;
+					this.pageList[i].list = list;
+
+					uni.hideLoading()
+				}).catch(error => {
+					uni.showToast({
+						title: error
+					})
+				})
+			},
+			getUserInfo() {
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				loginApi.findByOpenId({
+					openId: this.carhelp.getOpenId(),
+					noerror: true
+				}).then((res) => {
+
+
+					if (res.code == 200 && res.result) {
+
+						if (res.data.regUser) {
+							var userInfo = res.data.regUser
+							this.userInfo = userInfo;
+							// if (userInfo.userType == "1") {
+
+							// } else if (userInfo.carId && userInfo.realName) {
+							// 	this.infoSet = true;
+
+							// } else {
+							// 	this.infoSet = false;
+							// 	if (this.endCardBool) {
+							// 		this.infoSet1 = true;
+							// 	}
+
+							// }
+
+							var userCard = res.data.userCard;
+							this.userCard = userCard
+							this.ispay = this.userCardBool(userCard)
+
+						} else {
+
+						}
+						if (this.flag == 0) {
+							this.flag = 1;
+							setTimeout(() => {
+								this.flag = 2;
+							}, 5000)
+						}
+					}
+					uni.hideLoading();
+
+
+
+
+
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+			},
+			putShelf2() {
+				uni.showToast({
+					title: "暂不支持重复购买"
+				})
+			},
+			putShelf() {
+				uni.showToast({
+					title: "已下架，暂不支持购买"
+				})
+			},
+			getInfo() {
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				API.cardDetail({
+					cardId: this.cardId
+				}).then((response) => {
+
+					this.detail = response.data.monthlyRentCard
+					uni.hideLoading()
+				}).catch(error => {
+					uni.showToast({
+						title: error
+					})
+				})
+			},
+			submit(type) {
+				if (!this.endCardBool) {
+					return
+				}
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				API.openCard({
+					cardId: this.cardId
+				}).then((response) => {
+					this.submitForm.id = response.data.orderInfoId
+
+					if (type == 0) {
+						this.wxpy()
+					}
+					if (type == 1) {
+						this.alpy()
+					}
+				}).catch(error => {
+					uni.showToast({
+						title: error
+					})
+				})
+
+			},
+			alpy() {
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				var listcanvas = document.getElementsByTagName('canvas')
+
+				if (listcanvas.length > 0) {
+					document.getElementById("qrcode").removeChild(document.getElementsByTagName('canvas')[0]);
+				}
+				Pay.alpay(this.submitForm).then((response) => {
+
+					let qrcode = new QRCode('qrcode', {
+						width: 200,
+						height: 200,
+						text: response.data.qr_code,
+						correctLevel: QRCode.CorrectLevel.M,
+
+					})
+					this.outOrderNo = response.data.outOrderNo;
+					var canvas = document.getElementsByTagName('canvas')[0];
+					this.qrCodeImg = convertCanvasToImage(canvas);
+					uni.hideLoading()
+					this.showModel = true
+
+				}).catch(error => {
+					uni.showToast({
+
+						title: error
+					})
+				})
+			},
+			wxpy() {
+
+				Pay.wxpay(this.submitForm).then((response) => {
+
+					if (!response.result) {
+						uni.showToast({
+							title: response.message
+						})
+						return
+					}
+					var data = response.data
+					uni.hideLoading()
+					//("Pay+"+new Date().getTime())		
+					wxPayJs(data);
+
+				}).catch(error => {
+					uni.showToast({
+
+						title: error
+					})
+
+				})
+			},
+			confirm() {
+				this.getUserInfo();
+				uni.redirectTo({
+					url: "/pages/user/finance/rechargeRes?id=" + this.outOrderNo
+				})
+			},
+			click(index) {
+				console.log(`点击了第${index + 1}项，内容为：${this.list[index].text}`)
+				this.submit(index);
+			}
+		}
+
+	}
+</script>
+<style>
+	@keyframes movepoint {
+		25% {
+			top: 10px;
+		}
+
+		100% {
+			top: 15px;
+		}
+	}
+
+	.upupupImg {
+		height: 80px;
+	}
+
+	.upupupView {
+		text-align: center;
+		font-size: 12px;
+		padding: 30rpx;
+		border-radius: 12px;
+		position: absolute;
+		background: rgb(0 0 0 / 70%);
+		top: 50%;
+		transform: translate(-50%);
+		left: 50%;
+		color: #fff;
+
+
+	}
+
+	.upupupView img {
+		top: 15px;
+		position: relative;
+		width: 60px;
+		animation: movepoint 2s infinite;
+		-webkit-animation: movepoint 2s infinite;
+	}
+</style>
+<style lang="scss" scoped>
+	.scroll-Y {
+		height: 300rpx;
+	}
+
+	.scroll-view_H {
+		white-space: nowrap;
+		width: 100%;
+	}
+
+	.scroll-view-item {
+		height: 300rpx;
+		line-height: 300rpx;
+		text-align: center;
+		font-size: 36rpx;
+	}
+
+	.scroll-view-item_H {
+		display: inline-block;
+		//width: 85%;
+		height: 300rpx;
+		line-height: 300rpx;
+		text-align: center;
+		font-size: 36rpx;
+	}
+
+	.service {
+		font-size: 24px;
+		//color: #fff;
+		position: absolute;
+		right: 16px;
+	}
+
+	/deep/.u-alert-desc {
+		color: #ff7300;
+	}
+
+	// 卡片
+	.main {
+		background-color: #404A5E;
+		padding: 40rpx 0 0 0;
+		z-index: 80;
+
+		.tag {
+			position: absolute;
+			background-color: rgba(255, 61, 0, 100);
+			color: #ffffff;
+			font-size: 24rpx;
+			text-align: center;
+			line-height: 40rpx;
+			padding: 0 12rpx;
+			right: 0rpx;
+			top: 0rpx;
+			border-radius: 0 12px 0 12px;
+
+		}
+
+		// @media screen and (max-width:320px) {
+		// 	.tag {
+		// 		padding: 0 4rpx;
+		// 	}
+
+		// 	.price {
+		// 		position: absolute;
+		// 		top: 24rpx !important;
+		// 		right: 32rpx !important;
+		// 	}
+
+		// 	.current-price {
+		// 		font-size: 36rpx;
+		// 	}
+		// }
+		.priceName{
+			top: -30rpx;
+			left: 30rpx;
+			position: absolute;
+			font-size: 32rpx;
+		}
+		.price {
+			top: -90rpx;
+			right: 42rpx;
+			position: absolute;
+
+			p {
+				text-align: right;
+				color: rgba(0, 0, 0, 0.5);
+				font-size: 12px;
+				position: relative;
+				top: -250rpx;
+
+			}
+		}
+
+		.current-price {
+			font-size: 58rpx;
+			color: #101010;
+			text-align: right;
+
+			text {
+				font-size: 28rpx;
+
+			}
+		}
+
+		.original-cost {
+			color: rgba(75, 65, 50, 100);
+			text-decoration: line-through;
+			margin-bottom: 6rpx;
+
+		}
+
+		/deep/.u-iconfont {
+			font-size: 36rpx !important;
+
+		}
+
+
+		.card-0 {}
+
+		// .card-0 {
+		// 	background-position-x: 40rpx;
+		// }
+
+		.cardtab {
+			margin-top: 32rpx;
+			position: relative;
+			background-size: 100% 100%;
+			background-repeat: no-repeat;
+			height: 200rpx;
+
+
+			/deep/.u-checkbox__icon-wrap {
+
+				background-color: #607d8b;
+				opacity: 0.3
+			}
+
+			.radio-box {
+				position: absolute;
+				right: 0;
+				bottom: 40rpx;
+
+			}
+		}
+
+
+
+	}
+
+	// 按钮
+	.button {
+		position: fixed;
+		margin-top: -20rpx;
+		width: 100%;
+
+		bottom: 0px;
+		border-radius: 16px 16px 0px 0px;
+
+		padding: 20px 20px 24px 20px;
+		background: linear-gradient(180deg, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 1) 67%, rgba(255, 255, 255, 1) 84%);
+
+		uni-button:after {
+			border: none;
+		}
+
+		.btn {
+			border: none !important;
+			background: linear-gradient(#D8A05B, #C07C38);
+			box-shadow: 0px 2px 6px 0px rgba(207, 175, 118, 40);
+			border-radius: 50px;
+			color: #FFF;
+			font-size: 18px !important;
+			line-height: 44px;
+			height: 44px;
+			overflow: inherit !important;
+
+			.price {
+				text-decoration: line-through;
+				margin: auto 4px;
+				font-size: 12px
+			}
+		}
+		.btn2 {
+			background: #00b962;
+		}
+		.hint {
+			color: rgba(159, 157, 154, 100);
+			line-height: 20px;
+			text-align: center;
+			margin-top: 8px;
+		}
+
+		.btn-2 {
+			position: relative;
+		}
+
+		.position {
+			position: absolute;
+			top: -16px;
+			left: 24%;
+			z-index: 999;
+		}
+
+		#talkbubble {
+			position: absolute;
+			top: 0;
+			left: 0;
+			padding: 0 10px;
+			line-height: 20px;
+			font-size: 12px;
+			color: #fff;
+			background: red;
+			position: relative;
+			border-radius: 10px;
+			text-align: center;
+		}
+
+		#talkbubble:before {
+			content: "";
+			position: absolute;
+			top: 100%;
+			//right: 45%;
+			border-top: 5px solid red;
+			border-right: 5px solid transparent;
+			border-left: 5px solid transparent;
+		}
+	}
+
+	.notice2 {
+		padding: 0 0 120px 0;
+
+		.titleHead {
+			color: #101010;
+			font-size: 40rpx;
+			text-align: center;
+			margin-bottom: 10px;
+		}
+	}
+
+	// 须知
+	.notice {
+		top: -10rpx;
+		border-radius: 15px 15px 0 0;
+		position: relative;
+
+		.title {
+			color: rgba(51, 51, 51, 1);
+			font-size: 40rpx;
+			text-align: center;
+			margin-bottom: 30rpx;
+		}
+
+		.line {
+			margin-bottom: 40rpx;
+			color: #666666;
+			font-size: 34rpx;
+			line-height: 52rpx;
+			.lineInfo1{
+				border: 1px solid #D5C5B5;
+				background-color: #fef9f5;
+			}
+			.lineInfo2{
+				border: 1px solid #79ACDB ;
+				background-color: #ffffff;
+			}
+			.lineInfo{
+				margin-right: 20rpx;
+				display: flex;
+				padding: 20rpx 15rpx 15rpx 10rpx;
+				border-radius: 10px;
+				 margin-bottom: 16rpx;
+				.lineSvg{
+					padding-top: 2px;
+					margin: auto 16rpx;
+					img{
+						width: 70rpx;
+						color:#62574C ;
+					}
+				}
+				.lineView{
+					.lineTitle{
+						color:#62574C;
+						font-size: 36rpx;
+					}
+					.linep{
+						color:#8A7B6C;
+						font-size: 28rpx;
+						line-height:  28rpx;
+					}
+				}
+			}
+			
+		}
+
+		background-color: #fff;
+
+		padding: 30rpx 30rpx 30rpx 50rpx;
+
+		/deep/.u-divider {
+			margin-bottom: 16px !important;
+		}
+
+		.text {
+			color: #666666;
+			margin-bottom: 12px;
+			line-height: 24px;
+			display: flex;
+
+			.num {
+				margin-right: 8px;
+			}
+		}
+	}
+
+	.carNone {
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+
+		img {
+			width: 100%;
+			height: 100%;
+		}
+
+		p {
+			margin-top: -60px;
+		}
+	}
+
+	.slogan-4 {
+		margin-top: 10px;
+		/* text-decoration: underline; */
+		color: #9F9C99;
+
+		text-align: center;
+		position: fixed;
+		/* top: 40px; */
+		bottom: 40px;
+		right: 20px;
+		height: 55px;
+		width: 55px;
+		line-height: 20px;
+		font-size: 16px;
+		background: linear-gradient(45deg, #4BD2C0, rgb(72, 218, 149));
+		box-shadow: 0 4rpx 24rpx 0 rgb(72, 218, 149);
+		padding-top: 8px;
+		color: #fff;
+		border-radius: 25px;
+
+	}
+
+	.station,
+	.location,
+	.state1 {
+		box-shadow: 0px 4rpx 12rpx 0px #008c4a33;
+	}
+
+	// 附近站点改版
+	.station {
+
+		width: 91.4%;
+		border-radius: 8px;
+		padding: 12px 12px 12px 11px;
+		background-color: #fff;
+		margin: 8px auto 0;
+
+		.head {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+
+			.title {
+				color: rgba(16, 16, 16, 100);
+				font-size: 32rpx;
+				font-weight: 550;
+				width: 440rpx;
+				text-overflow: ellipsis;
+				overflow: hidden;
+				white-space: nowrap;
+			}
+
+			.distance {
+				width: 180rpx;
+				color: rgba(102, 102, 102, 100);
+				font-size: 32rpx;
+				text-align: end;
+
+				.iconfont {
+					font-size: 24rpx;
+					margin-right: 4rpx;
+				}
+			}
+		}
+
+		.sign {
+			display: flex;
+			flex-wrap: wrap;
+			margin-top: 16rpx;
+
+			.sign-1 {
+				line-height: 40rpx;
+				border-radius: 8rpx;
+				background-color: rgba(255, 255, 255, 100);
+				color: rgba(255, 139, 0, 100);
+				font-size: 24rpx;
+				text-align: center;
+				border: 1px solid rgba(255, 139, 0, 100);
+				padding: 0 8rpx;
+				margin-right: 16rpx;
+				margin-bottom: 8rpx;
+			}
+
+			.sign-2 {
+				line-height: 40rpx;
+				border-radius: 8rpx;
+				background-color: rgba(255, 255, 255, 100);
+				color: rgba(153, 153, 153, 100);
+				font-size: 24rpx;
+				text-align: center;
+				border: 1px solid rgba(204, 204, 204, 100);
+				padding: 0 8rpx;
+				margin-right: 16rpx;
+				margin-bottom: 8rpx;
+			}
+
+			.sign-3 {
+				line-height: 40rpx;
+				border-radius: 8rpx;
+				background-color: rgba(255, 255, 255, 100);
+				color: #8161FF;
+				font-size: 24rpx;
+				text-align: center;
+				border: 1px solid #8161FF;
+				padding: 0 8rpx;
+				margin-right: 16rpx;
+				margin-bottom: 8rpx;
+			}
+
+			.sign-4 {
+				line-height: 40rpx;
+				border-radius: 8rpx;
+				background-color: rgba(255, 255, 255, 100);
+				color: #00B962;
+				font-size: 24rpx;
+				text-align: center;
+				border: 1px solid #00B962;
+				padding: 0 8rpx;
+				margin-right: 16rpx;
+				margin-bottom: 8rpx;
+			}
+		}
+
+		.price-free {
+			display: flex;
+			justify-content: space-between;
+			margin-top: 8rpx;
+
+			.price {
+				display: flex;
+				align-items: baseline;
+			}
+
+			.price-1 {
+				.num {
+					color: rgba(255, 98, 0, 100);
+					font-size: 44rpx;
+				}
+
+				.unit {
+					font-size: 12px;
+					color: rgba(153, 153, 153, 100);
+				}
+			}
+			.price-3 {
+				font-size: 24rpx;
+				color: #fff;
+				margin-left: 8rpx;
+				padding-right: 9rpx;
+				 background:#00B962 ;
+				 border-radius: 8rpx;
+				.num1{
+					 padding-left:  12rpx;
+					border-radius: 8rpx 0 8rpx 8rpx;
+					 padding-right: 18rpx;
+					 background: #121212;
+					 -webkit-clip-path: polygon(0 0, 93% 0, 84% 100%, 0% 100%);
+					 clip-path:  polygon(0 0, 93% 0, 84% 100%, 0% 100%);
+					 
+				}
+				 
+			}
+			.price-2 {
+				font-size: 24rpx;
+				color: rgba(153, 153, 153, 100);
+				margin-left: 8rpx;
+				text-decoration: line-through;
+			}
+		}
+
+		.free {
+			display: flex;
+			align-items: center;
+
+			.slow,
+			.fast {
+				display: flex;
+
+				.sp-font {
+					width: 40rpx;
+					height: 40rpx;
+					line-height: 40rpx;
+					border-radius: 4px;
+					background-color: #7a68f6;
+					color: #fff;
+					font-size: 28rpx;
+					text-align: center;
+					margin-right: 2rpx;
+				}
+
+				.fast-font {
+					width: 40rpx;
+					height: 40rpx;
+					line-height: 40rpx;
+					border-radius: 8rpx;
+					background-color: rgba(186, 240, 215, 100);
+					color: rgba(0, 130, 69, 100);
+					font-size: 28rpx;
+					text-align: center;
+					margin-right: 8rpx;
+				}
+
+				.slow-font {
+					width: 40rpx;
+					height: 40rpx;
+					line-height: 40rpx;
+					border-radius: 8rpx;
+					background-color: rgba(226, 226, 226, 100);
+					color: rgba(128, 128, 128, 100);
+					font-size: 28rpx;
+					text-align: center;
+					margin-right: 8rpx;
+				}
+
+				.num {
+					font-size: 32rpx;
+					color: rgba(0, 145, 67, 100);
+					line-height: 40rpx;
+				}
+			}
+
+			.slow {
+				margin-left: 24rpx;
+			}
+		}
+	}
+
+	.user-card {
+		padding: 19px 0 39px 20px;
+		margin: 21px 20px 0 20px;
+		background: url(@/assets/img/companyVIP.png) no-repeat right, linear-gradient(to right, #C6D4ED, #DCE6F0) no-repeat;
+		box-shadow: 0px 0px 16px 0px rgba(14, 39, 84, 28);
+		border: 2px solid rgba(236, 239, 245, 100);
+		border-radius: 16px;
+		display: flex;
+
+		.head-img {
+			width: 48px;
+			height: 48px;
+
+			img {
+				width: 100%;
+			}
+		}
+
+		.user-name {
+			margin-left: 12px;
+
+			.name {
+				line-height: 24px;
+				color: rgba(33, 41, 48, 100);
+				font-size: 24px;
+				font-weight: 550;
+			}
+
+			.sign {
+				color: rgba(76, 89, 111, 100);
+				font-size: 16px;
+				line-height: 16px;
+				margin-top: 8px;
+			}
+		}
+	}
 </style>

pages/monthlyCardActivity/monthlyCardList.vue

@@ -1,101 +1,101 @@
-<template>
-	<view >
-		<ujp-navbar title="适用站点"></ujp-navbar>
-	
-		<view class="carNone" v-if="list.length == 0">
-			<img src="static/img/暂无数据-缺省页.png" alt="">
-			<p class="oldTextjp2" oldstyle="font-size: 18px;">加载中</p>
-		</view>
-		
-		<view class="charing-slow" v-for="(item,index) in list" 
-		@click="gotoUrl('pages/searchPile/stationAndPile/stationDetails?id='+item.id)"
-		
-		:key="item.id" >
-	
- <text class="trickle-charge" v-if="item.type == '1'" :style="elderStatus ? 'font-size: 14px;background-color: #9D9FFF;' : 'background-color: #9D9FFF;'">快充</text>
- <text class="trickle-charge" v-if="item.type == '2'" :style="elderStatus ? 'font-size: 14px;background-color: #00B962;' : 'background-color: #00B962;'">慢充</text>
- <text class="trickle-charge" v-if="item.type == '1,2'" :style="elderStatus ? 'font-size: 14px;background-color: #00BAC8;' : 'background-color: #00BAC8;'">快/慢</text>
- 
- 
- <text class="station-items oldTextjp" oldstyle="font-size: 20px;">{{item.name}}</text>
-			
-			<view class="address oldTextjp2" oldstyle="font-size: 14px;">
-				{{item.address}}
-			</view>
-			<view class="price">
-				<view class="num">{{item.costPrice.toFixed(2)}}</view>
-				<view class="unit oldTextjp2" oldstyle="font-size: 16px;">
-					 元/度 起
-				</view>
-			</view>
-		<!-- 	<view class="park">
-				<text class="park-p">p</text>
-				<text class="park-text">以实际费用为准</text>
-			</view> -->
-			<view class="free">
-				<view class="free-num oldTextjp2" oldstyle="font-size: 18px;">
-					<text style="color:#009143;">空闲{{item.availableNum}}</text>/总数{{item.totalNum}}
-				</view>
-				<!-- <view class="distance">
-					<text class="iconfont distance-font">&#xe615;</text>
-				</view> -->
-			</view>
-		</view>
-		<u-divider  v-if="list.length == recordsTotal && recordsTotal != 0" style="margin-top: 10px;background-color: #F2F4F4;">已经到底了</u-divider>
-		
-		
-<!-- 		<u-divider margin-top="20" bg-color="#F2F4F4">已经到底了</u-divider>
- -->	</view>
-</template>
-
-<script>
-	import * as API from '@/apis/site.js';
-	
-	export default {
-		data() {
-			return {
-				tabbarList: [{
-						iconPath: "home-3-line",
-						selectedIconPath: "home-3-fill",
-						text: '主页 ',
-						count: 0,
-						isDot: true,
-						customIcon: true,
-					},
-					{
-						iconPath: "road-map-line",
-						selectedIconPath: "road-map-fill",
-						text: '找桩',
-						midButton: true,
-						customIcon: true,
-					},
-					{
-						iconPath: "user-5-line",
-						selectedIconPath: "user-5-fill",
-						text: '我的',
-						count: 0,
-						isDot: false,
-						customIcon: true,
-
-					}
-				],
-				current: 0,
-				monthlyRentCardId:null,
-				
-				pageIndex: 1,
-				recordsTotal: 0,
+<template>
+	<view >
+		<ujp-navbar title="适用站点"></ujp-navbar>
+	
+		<view class="carNone" v-if="list.length == 0">
+			<img src="@/assets/static/img/暂无数据-缺省页.png" alt="">
+			<p class="oldTextjp2" oldstyle="font-size: 18px;">加载中</p>
+		</view>
+		
+		<view class="charing-slow" v-for="(item,index) in list" 
+		@click="gotoUrl('pages/searchPile/stationAndPile/stationDetails?id='+item.id)"
+		
+		:key="item.id" >
+	
+ <text class="trickle-charge" v-if="item.type == '1'" :style="elderStatus ? 'font-size: 14px;background-color: #9D9FFF;' : 'background-color: #9D9FFF;'">快充</text>
+ <text class="trickle-charge" v-if="item.type == '2'" :style="elderStatus ? 'font-size: 14px;background-color: #00B962;' : 'background-color: #00B962;'">慢充</text>
+ <text class="trickle-charge" v-if="item.type == '1,2'" :style="elderStatus ? 'font-size: 14px;background-color: #00BAC8;' : 'background-color: #00BAC8;'">快/慢</text>
+ 
+ 
+ <text class="station-items oldTextjp" oldstyle="font-size: 20px;">{{item.name}}</text>
+			
+			<view class="address oldTextjp2" oldstyle="font-size: 14px;">
+				{{item.address}}
+			</view>
+			<view class="price">
+				<view class="num">{{item.costPrice.toFixed(2)}}</view>
+				<view class="unit oldTextjp2" oldstyle="font-size: 16px;">
+					 元/度 起
+				</view>
+			</view>
+		<!-- 	<view class="park">
+				<text class="park-p">p</text>
+				<text class="park-text">以实际费用为准</text>
+			</view> -->
+			<view class="free">
+				<view class="free-num oldTextjp2" oldstyle="font-size: 18px;">
+					<text style="color:#009143;">空闲{{item.availableNum}}</text>/总数{{item.totalNum}}
+				</view>
+				<!-- <view class="distance">
+					<text class="iconfont distance-font">&#xe615;</text>
+				</view> -->
+			</view>
+		</view>
+		<u-divider  v-if="list.length == recordsTotal && recordsTotal != 0" style="margin-top: 10px;background-color: #F2F4F4;">已经到底了</u-divider>
+		
+		
+<!-- 		<u-divider margin-top="20" bg-color="#F2F4F4">已经到底了</u-divider>
+ -->	</view>
+</template>
+
+<script>
+	import * as API from '@/apis/site.js';
+	
+	export default {
+		data() {
+			return {
+				tabbarList: [{
+						iconPath: "home-3-line",
+						selectedIconPath: "home-3-fill",
+						text: '主页 ',
+						count: 0,
+						isDot: true,
+						customIcon: true,
+					},
+					{
+						iconPath: "road-map-line",
+						selectedIconPath: "road-map-fill",
+						text: '找桩',
+						midButton: true,
+						customIcon: true,
+					},
+					{
+						iconPath: "user-5-line",
+						selectedIconPath: "user-5-fill",
+						text: '我的',
+						count: 0,
+						isDot: false,
+						customIcon: true,
+
+					}
+				],
+				current: 0,
+				monthlyRentCardId:null,
+				
+				pageIndex: 1,
+				recordsTotal: 0,
 				list: [],
-				elderStatus: false,
-			}
-		},onLoad(op){
-			this.monthlyRentCardId=op.cardId
-			this.getInfo()
-		},
-		onReachBottom() {
-			if (this.chargeList.length < this.recordsTotal) {			
-				this.myLoadmore();
-			}
-		},
+				elderStatus: false,
+			}
+		},onLoad(op){
+			this.monthlyRentCardId=op.cardId
+			this.getInfo()
+		},
+		onReachBottom() {
+			if (this.chargeList.length < this.recordsTotal) {			
+				this.myLoadmore();
+			}
+		},
 		onReady() {
 			if(this.carhelp.get("getElderModeClass") == "长辈模式") {
 				this.elderStatus = true;
@@ -103,246 +103,246 @@
 				this.elderStatus = false;
 			}
 		},
-		methods: {
-			myLoadmore() {
-				this.pageIndex += 1;
-				this.getInfo()
-			},
-			getInfo(){
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
+		methods: {
+			myLoadmore() {
+				this.pageIndex += 1;
+				this.getInfo()
+			},
+			getInfo(){
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
 				})
-				var data={
-					monthlyRentCardId:this.monthlyRentCardId,
-					online:0
+				var data={
+					monthlyRentCardId:this.monthlyRentCardId,
+					online:0
 				}
 				if (this.carhelp.getPersonInfo()) {
 						data.openId=this.carhelp.getOpenId()
 				}
-				
-				API.getChargingStationData(data).then((response) => {
-					console.log(response)
-					this.list = [
-						...this.list,
-						...response.data.data
-					];
-					this.recordsTotal = response.data.recordsTotal;
-					//this.detail=response.data.monthlyRentCard
-					uni.hideLoading()
-				}).catch(error => {
-					uni.showToast({
-						title: error
-					})
-				})
-			}
-		}
-		
-	}
-</script>
-
-<style lang="scss" scoped>
-	.carNone{
-		display: flex;
-		flex-direction: column;
-		justify-content: center;
-		align-items: center;
-		img{
-			width: 100%;
-			height: 100%;
-		}
-		p{
-			margin-top: -60px;
-		}
-	}
-
-	.top-box {
-		width: 100%;
-		height: 88px;
-		position: fixed;
-		top: 0;
-		left: 0;
-		z-index: 999;
-	}
-	
-	.top {
-		display: flex;
-		justify-content: space-between;
-		width: 100%;
-		height: 44px;
-		color: #666666;
-		background-color: rgba(255, 255, 255, 100);
-		padding: 12px 16px;
-	
-	
-		.u-search[data-v-1a326067] {
-			flex: 0.9;
-		}
-	
-		.list {
-			margin-left: 2px;
-	
-		}
-	}
-	
-	.condition {
-		width: 100%;
-		height: 44px;
-		line-height: 20px;
-		padding: 12px 16px;
-		display: flex;
-	
-		background-color: #fff;
-	
-		.condition-type {
-			margin-left: 36px;
-		}
-	
-		.condition-screen {
-			margin-left: 159px;
-		}
-	}
-	
-
-	
-	.charing-slow {
-		background-color: #fff;
-		margin: 0 12px;
-		border-radius: 8px;
-		padding: 10px 12px 0px;
-		margin-top: 12px;
-		.trickle-charge {
-			display: inline-block;
-			width: 44px;
-			height: 20px;
-			line-height: 20px;
-			border-radius: 50px;
-			background-color: rgba(0, 185, 98, 100);
-			color: rgba(255, 255, 255, 100);
-			font-size: 12px;
-			text-align: center;
-		}
-
-		.fast-charge {
-			display: inline-block;
-			width: 44px;
-			height: 20px;
-			line-height: 20px;
-			border-radius: 50px;
-			background-color: #9d9fff;
-			color: rgba(255, 255, 255, 100);
-			font-size: 12px;
-			text-align: center;
-		}
-		.fast-slow{
-			display: inline-block;
-			width: 44px;
-			height: 20px;
-			line-height: 20px;
-			border-radius: 50px;
-			background-color: #00bac8;
-			color: rgba(255, 255, 255, 100);
-			font-size: 12px;
-			text-align: center;
-		}
-
-		.station-items {
-			display: inline-block;
-			height: 16px;
-			line-height: 16px;
-			font-size: 16px;
-			margin-left: 4px;
-			color: #101010;
-
-
-		}
-
-		.address {
-			margin-top: 8px;
-			line-height: 16px;
-			font-size: 11px;
-			color: rgba(119, 119, 119, 100);
-		}
-
-		.price {
-			display: flex;
-			height: 20px;
-			margin-top: 8px;
-
-			.num {
-				height: 20px;
-				color: rgba(255, 98, 0, 100);
-				font-size: 20px;
-				text-align: left;
-				font-family: Roboto-medium;
-			}
-
-			.unit {
-				height: 14px;
-				line-height: 14px;
-				color: rgba(102, 102, 102, 100);
-				font-size: 14px;
-				text-align: left;
-				font-family: AlibabaPuHui-regular;
-				margin-top: 6px;
-				margin-left: 4px;
-			}
-		}
-
-		.park {
-			margin-top: 10px;
-			display: flex;
-
-			.park-p {
-				display: inline-block;
-				width: 20px;
-				height: 18px;
-				line-height: 12px;
-				text-align: center;
-				background-color: rgba(125, 177, 255, 100);
-				color: #fff;
-			}
-
-			.park-text {
-				display: inline-block;
-				width: 300px;
-				height: 17px;
-				color: rgba(102, 102, 102, 100);
-				font-size: 12px;
-				text-align: left;
-				margin-left: 4px;
-				margin-top: 2px;
-			}
-		}
-
-		.free {
-			display: flex;
-			justify-content: space-between;
-			height: 52px;
-			border-top: 1px solid rgba(238, 242, 240, 100);
-			margin-top: 10px;
-
-			.free-num {
-				line-height: 52px;
-				font-size: 14px
-			}
-
-			.distance {
-				width: 130px;
-				height: 28px;
-				line-height: 28px;
-				color: rgba(255, 255, 255, 100);
-				font-size: 14px;
-				background-color: #00b962;
-				border-radius: 50px;
-				margin: 12px;
-				text-align: center;
-
-				.distance-font {
-					font-size: 16px
-				}
-
-			}
-		}
-	}
-</style>
+				
+				API.getChargingStationData(data).then((response) => {
+					console.log(response)
+					this.list = [
+						...this.list,
+						...response.data.data
+					];
+					this.recordsTotal = response.data.recordsTotal;
+					//this.detail=response.data.monthlyRentCard
+					uni.hideLoading()
+				}).catch(error => {
+					uni.showToast({
+						title: error
+					})
+				})
+			}
+		}
+		
+	}
+</script>
+
+<style lang="scss" scoped>
+	.carNone{
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		img{
+			width: 100%;
+			height: 100%;
+		}
+		p{
+			margin-top: -60px;
+		}
+	}
+
+	.top-box {
+		width: 100%;
+		height: 88px;
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 999;
+	}
+	
+	.top {
+		display: flex;
+		justify-content: space-between;
+		width: 100%;
+		height: 44px;
+		color: #666666;
+		background-color: rgba(255, 255, 255, 100);
+		padding: 12px 16px;
+	
+	
+		.u-search[data-v-1a326067] {
+			flex: 0.9;
+		}
+	
+		.list {
+			margin-left: 2px;
+	
+		}
+	}
+	
+	.condition {
+		width: 100%;
+		height: 44px;
+		line-height: 20px;
+		padding: 12px 16px;
+		display: flex;
+	
+		background-color: #fff;
+	
+		.condition-type {
+			margin-left: 36px;
+		}
+	
+		.condition-screen {
+			margin-left: 159px;
+		}
+	}
+	
+
+	
+	.charing-slow {
+		background-color: #fff;
+		margin: 0 12px;
+		border-radius: 8px;
+		padding: 10px 12px 0px;
+		margin-top: 12px;
+		.trickle-charge {
+			display: inline-block;
+			width: 44px;
+			height: 20px;
+			line-height: 20px;
+			border-radius: 50px;
+			background-color: rgba(0, 185, 98, 100);
+			color: rgba(255, 255, 255, 100);
+			font-size: 12px;
+			text-align: center;
+		}
+
+		.fast-charge {
+			display: inline-block;
+			width: 44px;
+			height: 20px;
+			line-height: 20px;
+			border-radius: 50px;
+			background-color: #9d9fff;
+			color: rgba(255, 255, 255, 100);
+			font-size: 12px;
+			text-align: center;
+		}
+		.fast-slow{
+			display: inline-block;
+			width: 44px;
+			height: 20px;
+			line-height: 20px;
+			border-radius: 50px;
+			background-color: #00bac8;
+			color: rgba(255, 255, 255, 100);
+			font-size: 12px;
+			text-align: center;
+		}
+
+		.station-items {
+			display: inline-block;
+			height: 16px;
+			line-height: 16px;
+			font-size: 16px;
+			margin-left: 4px;
+			color: #101010;
+
+
+		}
+
+		.address {
+			margin-top: 8px;
+			line-height: 16px;
+			font-size: 11px;
+			color: rgba(119, 119, 119, 100);
+		}
+
+		.price {
+			display: flex;
+			height: 20px;
+			margin-top: 8px;
+
+			.num {
+				height: 20px;
+				color: rgba(255, 98, 0, 100);
+				font-size: 20px;
+				text-align: left;
+				font-family: Roboto-medium;
+			}
+
+			.unit {
+				height: 14px;
+				line-height: 14px;
+				color: rgba(102, 102, 102, 100);
+				font-size: 14px;
+				text-align: left;
+				font-family: AlibabaPuHui-regular;
+				margin-top: 6px;
+				margin-left: 4px;
+			}
+		}
+
+		.park {
+			margin-top: 10px;
+			display: flex;
+
+			.park-p {
+				display: inline-block;
+				width: 20px;
+				height: 18px;
+				line-height: 12px;
+				text-align: center;
+				background-color: rgba(125, 177, 255, 100);
+				color: #fff;
+			}
+
+			.park-text {
+				display: inline-block;
+				width: 300px;
+				height: 17px;
+				color: rgba(102, 102, 102, 100);
+				font-size: 12px;
+				text-align: left;
+				margin-left: 4px;
+				margin-top: 2px;
+			}
+		}
+
+		.free {
+			display: flex;
+			justify-content: space-between;
+			height: 52px;
+			border-top: 1px solid rgba(238, 242, 240, 100);
+			margin-top: 10px;
+
+			.free-num {
+				line-height: 52px;
+				font-size: 14px
+			}
+
+			.distance {
+				width: 130px;
+				height: 28px;
+				line-height: 28px;
+				color: rgba(255, 255, 255, 100);
+				font-size: 14px;
+				background-color: #00b962;
+				border-radius: 50px;
+				margin: 12px;
+				text-align: center;
+
+				.distance-font {
+					font-size: 16px
+				}
+
+			}
+		}
+	}
+</style>

pages/parking/outPayment.vue

@@ -1,416 +1,416 @@
-<template>
-	<view>
-		<ujp-navbar title="无车辆扫码停车" :is-back="false"></ujp-navbar>
-		<view class="main">
-			<view class="park-name" v-if="detail.parkName">
-				<img src="../../static/img/if-location-pin@2x.png" alt="">
-				<text>{{detail.parkName}}</text>
-			</view>
-			<view class="infos"  v-if="!detail.id">
-				{{message}}
-			</view>	
-			<view class="infos" v-if="detail.id">
-				<view class="item">
-					<view class="title">
-						车牌号
-					</view>
-					<view class="content">
-						{{detail.carNum}}
-					</view>
-				</view>
-				<view class="item">
-					<view class="title">
-						停车费
-					</view>
-					<view class="content">
-						{{detail.price.toFixed(2)}}元
-					</view>
-				</view>
-				
-			</view>
-			
-		</view>
-		<view class="details"  v-if="detail.id">
-			<view class="detail-item">
-				<view class="title">
-					进场时间
-				</view>
-				<view class="content">
-					{{detail.inParkingTime}}
-				</view>
-			</view>
-			<view class="detail-item">
-				<view class="title">
-					离场时间
-				</view>
-				<view class="content">
-						{{detail.outParkingTime}}
-				</view>
-			</view>
-			<view class="detail-item">
-				<view class="title">
-					停车时长
-				</view>
-				<view class="content">
-					{{detail.parkingTimeStr}}
-				</view>
-			</view>
-			<view class="detail-item">
-				<view class="title">
-					收费标准
-				</view>
-				<view class="content">
-					{{detail.hourCost.toFixed(2)}}元/小时
-				</view>
-			</view>
-		</view>
-		<view class="payment" v-if="detail.id">
-			<p>付款方式</p>
-			<view class="methods">
-				<view class="recharge-radio" >
-					<u-radio-group v-model="value"  :wrap="true" width="100%">
-						<u-radio active-color="#0076ff"  v-for="(item, index) in list" :key="index"
-							:name="item.id" :disabled="item.disabled" width="100%">
-							<view class="recharge-radio-item">
-								<u-icon :name="item.icon" custom-prefix="custom-icon" :color="item.color" size="48">
-								</u-icon>
-								<view class="recharge-radio-name oldTextjp2" oldstyle="font-size:18px">
-									{{item.name}}
-								</view>
-							</view>
-						</u-radio>
-					</u-radio-group>
-				</view>
-			</view>
-			
-		</view>
-		
-		<u-button @click='submit()' v-if="detail.id">缴纳停车费</u-button>
-		<view class="box">
-			
-		</view>
-		<!-- //  -->
-		<u-modal v-model="showModel"
-				:show-cancel-button="false"
-				@confirm="confirm"
-				confirm-text="确定"
-				title="扫码支付" >
-					<view    style="
-							text-align: center;
-						">
-						<img id="qrcode2" :src="qrCodeImg" >
-					</view>
-					<view    style="
-							text-align: center;
-						">请使用支付宝扫码</view>
-					
-				</u-modal>
-		<img id="qrcode" style="display: none;" >
-			
-			<u-modal v-model="show" @confirm="confirmPhone" :confirm-text="confirmText" confirm-color="#606266" :show-cancel-button="true" ref="uModal"
-					:asyncClose="true" :title="title" :content="content" :content-style="{fontSize: '24px',color: '#101010'}"></u-modal>
-				
-		<view class="service"  @click="openModal">
-			联系停车场客服
-		</view>
-	</view>
-</template>
-
-<script>
-	import * as Pay from '@/apis/weixin.js'
-	import QRCode from 'qrcodejs2'
-	import * as newsApi from '@/apis/news.js'
-	
-	import {
-		convertCanvasToImage,
-		} from '@/utils'
-	import {
-		wxPayJs
-	} from '@/utils/wxpay'
-	import {
-		aliPayJs
-	} from '@/utils/alipay'
-	import * as API from '@/apis/parking.js'
-	export default {
-		data() {
-			return {
-					title:"客服电话",
-					confirmText:"拨打电话",
-				content:'',
-				show:false,
-				showModel:false,
-					qrCodeImg:"",
-				list: [{
-						id:'0',
-						name: '微信',
-						icon: 'wechat-pay-fill',
-						color: '#22ac38',
-					},
-					{
-						id:'1',
-						name: '支付宝',
-						icon: 'alipay-fill',
-						color: '#1677ff',
-					},
-				],
-				value:0,
-				channelId:'',
-				detail:{},
-				message:"已抬杆，欢迎下次光临"
-			}
-		},onLoad(op) {
-			 this.getPhone()
-			if(op.id){
-				this.channelId=op.id
-				this.getInfo()
-			}else{
-				uni.showModal({
-					content:"参数错误"
-				})
-			}
-			
-			
-		},	methods: {
-			confirm(){
-				this.getInfo();
-			},
-			getPhone(){
-				newsApi.findConfigureByKey({
-					key:'consumerPhone'
-				}).then((res) => {
-									
-					this.content = res.data.value;
-					
-				}).catch(error => {
-					uni.showToast({
-						title: error,
-						icon: "none"
-					})
-				})
-			},
-			openModal() {
-				 
-				this.show = true;
-			},
-			confirmPhone(){
-				
-				
-				this.show = false;
-				uni.makePhoneCall({
-					phoneNumber:this.content //仅为示例
-				});
-			},
-			confirm(){
-				uni.redirectTo({
-					url:"/pages/parking/paymentResult"
-				})
-			},
-			submit(){
-				if(this.value=="0"){
-					this.wxpy()
-				}else{
-					this.alpy()
-				}
-				
-			},
-			alpy(){
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				API.parkTradePrecreatePay({
-					id: this.detail.id,
-					openId: this.carhelp.getOpenId()
-				}).then((response) => {
-					
-					let qrcode = new QRCode('qrcode', {
-						width: 200,
-						height: 200,
-						text: response.data,
-						correctLevel: QRCode.CorrectLevel.M,
-					
-					})
-				//	this.outOrderNo=response.data.outOrderNo;
-					var canvas = document.getElementsByTagName('canvas')[0];
-					this.qrCodeImg = convertCanvasToImage(canvas);
-					uni.hideLoading()
-					this.showModel=true
-						
-				}).catch(error => {
-						uni.showToast({
-						
-							title: error
-						})
-				})
-			},
-			wxpy(){
-				
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				
-				API.parkingWxPay({
-					id: this.detail.id,
-					openId: this.carhelp.getOpenId()
-				}).then(data => {
-					
-					//data.data.url = window.location.href.split("#")[0] + "/#/car/payResult";
-							
-					uni.hideLoading()
-					wxPayJs(data.data)
-				}).catch(error => {
-						uni.hideLoading()
-					uni.showToast({
-						title: error,
-						icon: "none"
-					})
-				})
-			},
-			getInfo(){
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				API.generateTemporaryCarNum({
-					openId:this.carhelp.getOpenId(),
-					channelId:this.channelId
-				}).then((res) => {
-					
-					uni.hideLoading();
-					
-					this.detail = res.data;
-					
-				}).catch(error => {
-						uni.hideLoading()
-					// uni.showToast({
-					// 	title: error,
-					// 	icon: "none"
-					// })
-					this.message=error
-					// uni.showModal({
-					// 	title:"提示",
-					// 	content:error,
-					// 	showCancel:false,
-					// })
-				})
-			}
-		}
-	}
-	
-</script>
- 
-
-<style lang="scss" scoped>
-	
-	.main{
-		height: 200px;
-		padding: 20px 23px;
-		background: linear-gradient(#1F55FF,#27ABFF);
-		
-		.park-name{
-		    line-height: 20px;
-			color: rgba(255, 255, 255, 100);
-			font-size: 20px;
-			position: relative;
-			text{
-				margin-left: 25px;
-			}
-			img{
-				width: 20px;
-				height: 20px;
-				margin-right: 8px;
-				position: absolute;
-				
-			}
-		}
-		.infos{
-			margin-top: 28px;
-			color: #fff;
-			font-size: 24px;
-			.item{
-				display: flex;
-				justify-content: space-between;
-				margin-bottom: 20px;
-			}
-		}
-	}
-
-  .details{
-	  width: 89.3%;
-	  padding: 20px 20px 5px;
-	  margin: auto;
-	  border-radius: 12px;
-	  background-color: #fff;
-	  position: relative;
-	  top: -30px;
-	  left: 0;
-	  right: 0;
-	  .detail-item{
-		  display: flex;
-		  justify-content: space-between;
-		  margin-bottom: 15px;
-		  .title{
-			  color: #86898c;
-		  }
-	  }
-  }
-  .payment{
-	  width: 89.3%;
-	  margin:0 auto ;
-	  .methods{
-		  border-radius: 8px;
-		  background-color: #fff;
-		  margin-top: 12px;
-		  padding: 0px 12px;
-		  .recharge-radio {
-		
-		  	.recharge-radio-item {
-		  		display: flex;
-		  		align-items: center;
-				
-		  	}
-		  
-		  	.recharge-radio-name {
-		  		margin-left: 8px;
-		  	}
-		  }
-		  /deep/.u-radio-group {
-		  	width: 100%;
-		  }
-		  /deep/.u-radio {
-		  	position: relative;
-		  }
-		  
-		  /deep/.u-radio__icon-wrap {
-		  	position: absolute;
-		  	right: 0;
-		  }
-	  }
-	  
-  }
-  .u-btn{
-  		  width: 89.3%;
-  		  background-color: #0051db;
-  		  border-radius: 12px;
-  		  color: #fff;
-  		  margin-top: 20px;
-  }
-  .box{
-	  width: 100%;
-	  height: 14vh;
-  }
-  .service{
-  		color: rgba(0, 90, 217, 100);
-  		font-size: 16px;
-  		text-align: center;
-  		position: fixed;
-  		    bottom: 0px;
-  		    left: 0;
-  		    right: 0;
-  		    height: 40px;
-  		    background-color: #fff;
-			    z-index: 999;
-		
-  }
-</style>
+<template>
+	<view>
+		<ujp-navbar title="无车辆扫码停车" :is-back="false"></ujp-navbar>
+		<view class="main">
+			<view class="park-name" v-if="detail.parkName">
+				<img src="@/assets/static/img/if-location-pin@2x.png" alt="">
+				<text>{{detail.parkName}}</text>
+			</view>
+			<view class="infos"  v-if="!detail.id">
+				{{message}}
+			</view>	
+			<view class="infos" v-if="detail.id">
+				<view class="item">
+					<view class="title">
+						车牌号
+					</view>
+					<view class="content">
+						{{detail.carNum}}
+					</view>
+				</view>
+				<view class="item">
+					<view class="title">
+						停车费
+					</view>
+					<view class="content">
+						{{detail.price.toFixed(2)}}元
+					</view>
+				</view>
+				
+			</view>
+			
+		</view>
+		<view class="details"  v-if="detail.id">
+			<view class="detail-item">
+				<view class="title">
+					进场时间
+				</view>
+				<view class="content">
+					{{detail.inParkingTime}}
+				</view>
+			</view>
+			<view class="detail-item">
+				<view class="title">
+					离场时间
+				</view>
+				<view class="content">
+						{{detail.outParkingTime}}
+				</view>
+			</view>
+			<view class="detail-item">
+				<view class="title">
+					停车时长
+				</view>
+				<view class="content">
+					{{detail.parkingTimeStr}}
+				</view>
+			</view>
+			<view class="detail-item">
+				<view class="title">
+					收费标准
+				</view>
+				<view class="content">
+					{{detail.hourCost.toFixed(2)}}元/小时
+				</view>
+			</view>
+		</view>
+		<view class="payment" v-if="detail.id">
+			<p>付款方式</p>
+			<view class="methods">
+				<view class="recharge-radio" >
+					<u-radio-group v-model="value"  :wrap="true" width="100%">
+						<u-radio active-color="#0076ff"  v-for="(item, index) in list" :key="index"
+							:name="item.id" :disabled="item.disabled" width="100%">
+							<view class="recharge-radio-item">
+								<u-icon :name="item.icon" custom-prefix="custom-icon" :color="item.color" size="48">
+								</u-icon>
+								<view class="recharge-radio-name oldTextjp2" oldstyle="font-size:18px">
+									{{item.name}}
+								</view>
+							</view>
+						</u-radio>
+					</u-radio-group>
+				</view>
+			</view>
+			
+		</view>
+		
+		<u-button @click='submit()' v-if="detail.id">缴纳停车费</u-button>
+		<view class="box">
+			
+		</view>
+		<!-- //  -->
+		<u-modal v-model="showModel"
+				:show-cancel-button="false"
+				@confirm="confirm"
+				confirm-text="确定"
+				title="扫码支付" >
+					<view    style="
+							text-align: center;
+						">
+						<img id="qrcode2" :src="qrCodeImg" >
+					</view>
+					<view    style="
+							text-align: center;
+						">请使用支付宝扫码</view>
+					
+				</u-modal>
+		<img id="qrcode" style="display: none;" >
+			
+			<u-modal v-model="show" @confirm="confirmPhone" :confirm-text="confirmText" confirm-color="#606266" :show-cancel-button="true" ref="uModal"
+					:asyncClose="true" :title="title" :content="content" :content-style="{fontSize: '24px',color: '#101010'}"></u-modal>
+				
+		<view class="service"  @click="openModal">
+			联系停车场客服
+		</view>
+	</view>
+</template>
+
+<script>
+	import * as Pay from '@/apis/weixin.js'
+	import QRCode from 'qrcodejs2'
+	import * as newsApi from '@/apis/news.js'
+	
+	import {
+		convertCanvasToImage,
+		} from '@/utils'
+	import {
+		wxPayJs
+	} from '@/utils/wxpay'
+	import {
+		aliPayJs
+	} from '@/utils/alipay'
+	import * as API from '@/apis/parking.js'
+	export default {
+		data() {
+			return {
+					title:"客服电话",
+					confirmText:"拨打电话",
+				content:'',
+				show:false,
+				showModel:false,
+					qrCodeImg:"",
+				list: [{
+						id:'0',
+						name: '微信',
+						icon: 'wechat-pay-fill',
+						color: '#22ac38',
+					},
+					{
+						id:'1',
+						name: '支付宝',
+						icon: 'alipay-fill',
+						color: '#1677ff',
+					},
+				],
+				value:0,
+				channelId:'',
+				detail:{},
+				message:"已抬杆，欢迎下次光临"
+			}
+		},onLoad(op) {
+			 this.getPhone()
+			if(op.id){
+				this.channelId=op.id
+				this.getInfo()
+			}else{
+				uni.showModal({
+					content:"参数错误"
+				})
+			}
+			
+			
+		},	methods: {
+			confirm(){
+				this.getInfo();
+			},
+			getPhone(){
+				newsApi.findConfigureByKey({
+					key:'consumerPhone'
+				}).then((res) => {
+									
+					this.content = res.data.value;
+					
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+			},
+			openModal() {
+				 
+				this.show = true;
+			},
+			confirmPhone(){
+				
+				
+				this.show = false;
+				uni.makePhoneCall({
+					phoneNumber:this.content //仅为示例
+				});
+			},
+			confirm(){
+				uni.redirectTo({
+					url:"/pages/parking/paymentResult"
+				})
+			},
+			submit(){
+				if(this.value=="0"){
+					this.wxpy()
+				}else{
+					this.alpy()
+				}
+				
+			},
+			alpy(){
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				API.parkTradePrecreatePay({
+					id: this.detail.id,
+					openId: this.carhelp.getOpenId()
+				}).then((response) => {
+					
+					let qrcode = new QRCode('qrcode', {
+						width: 200,
+						height: 200,
+						text: response.data,
+						correctLevel: QRCode.CorrectLevel.M,
+					
+					})
+				//	this.outOrderNo=response.data.outOrderNo;
+					var canvas = document.getElementsByTagName('canvas')[0];
+					this.qrCodeImg = convertCanvasToImage(canvas);
+					uni.hideLoading()
+					this.showModel=true
+						
+				}).catch(error => {
+						uni.showToast({
+						
+							title: error
+						})
+				})
+			},
+			wxpy(){
+				
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				
+				API.parkingWxPay({
+					id: this.detail.id,
+					openId: this.carhelp.getOpenId()
+				}).then(data => {
+					
+					//data.data.url = window.location.href.split("#")[0] + "/#/car/payResult";
+							
+					uni.hideLoading()
+					wxPayJs(data.data)
+				}).catch(error => {
+						uni.hideLoading()
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+			},
+			getInfo(){
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				API.generateTemporaryCarNum({
+					openId:this.carhelp.getOpenId(),
+					channelId:this.channelId
+				}).then((res) => {
+					
+					uni.hideLoading();
+					
+					this.detail = res.data;
+					
+				}).catch(error => {
+						uni.hideLoading()
+					// uni.showToast({
+					// 	title: error,
+					// 	icon: "none"
+					// })
+					this.message=error
+					// uni.showModal({
+					// 	title:"提示",
+					// 	content:error,
+					// 	showCancel:false,
+					// })
+				})
+			}
+		}
+	}
+	
+</script>
+ 
+
+<style lang="scss" scoped>
+	
+	.main{
+		height: 200px;
+		padding: 20px 23px;
+		background: linear-gradient(#1F55FF,#27ABFF);
+		
+		.park-name{
+		    line-height: 20px;
+			color: rgba(255, 255, 255, 100);
+			font-size: 20px;
+			position: relative;
+			text{
+				margin-left: 25px;
+			}
+			img{
+				width: 20px;
+				height: 20px;
+				margin-right: 8px;
+				position: absolute;
+				
+			}
+		}
+		.infos{
+			margin-top: 28px;
+			color: #fff;
+			font-size: 24px;
+			.item{
+				display: flex;
+				justify-content: space-between;
+				margin-bottom: 20px;
+			}
+		}
+	}
+
+  .details{
+	  width: 89.3%;
+	  padding: 20px 20px 5px;
+	  margin: auto;
+	  border-radius: 12px;
+	  background-color: #fff;
+	  position: relative;
+	  top: -30px;
+	  left: 0;
+	  right: 0;
+	  .detail-item{
+		  display: flex;
+		  justify-content: space-between;
+		  margin-bottom: 15px;
+		  .title{
+			  color: #86898c;
+		  }
+	  }
+  }
+  .payment{
+	  width: 89.3%;
+	  margin:0 auto ;
+	  .methods{
+		  border-radius: 8px;
+		  background-color: #fff;
+		  margin-top: 12px;
+		  padding: 0px 12px;
+		  .recharge-radio {
+		
+		  	.recharge-radio-item {
+		  		display: flex;
+		  		align-items: center;
+				
+		  	}
+		  
+		  	.recharge-radio-name {
+		  		margin-left: 8px;
+		  	}
+		  }
+		  /deep/.u-radio-group {
+		  	width: 100%;
+		  }
+		  /deep/.u-radio {
+		  	position: relative;
+		  }
+		  
+		  /deep/.u-radio__icon-wrap {
+		  	position: absolute;
+		  	right: 0;
+		  }
+	  }
+	  
+  }
+  .u-btn{
+  		  width: 89.3%;
+  		  background-color: #0051db;
+  		  border-radius: 12px;
+  		  color: #fff;
+  		  margin-top: 20px;
+  }
+  .box{
+	  width: 100%;
+	  height: 14vh;
+  }
+  .service{
+  		color: rgba(0, 90, 217, 100);
+  		font-size: 16px;
+  		text-align: center;
+  		position: fixed;
+  		    bottom: 0px;
+  		    left: 0;
+  		    right: 0;
+  		    height: 40px;
+  		    background-color: #fff;
+			    z-index: 999;
+		
+  }
+</style>

pages/parking/pay.vue

@@ -1,321 +1,321 @@
-<template>
-	<view>
-		
-		<view class="carNone" v-if="kongResult">
-			<ujp-navbar title="停车缴费" :is-back="false">
-				
-			</ujp-navbar>
-			<img src="static/img/暂无数据-缺省页.png" alt="">
-			<p>未查询到停车数据</p>
-			<u-button class="login-btn2"  type="default" shape="circle" @click="channelPayDetail">刷新</u-button>
-			
-		</view>
-		<view class="wrap"  v-if="!kongResult"  >
-			<view >
-			
-				<view class="">
-					<h2 style="
-										    text-align: center;
-										    font-size: 36px;
-										      padding-top: 30px;
-										"> 停车缴费</h2>
-										<h2 style="
-					    text-align: center;
-					    font-size: 46px;
-					    color: #53b56b;
-					"> {{detail.price.toFixed(2)}}<span style="font-size: 16px;">元</span></h2>
-					<view class="cartitle"> 缴费信息</view>
-					<view class="info" >
-						<view class="info-name">
-							车牌号
-						</view>
-						<view class="info-text">
-							{{detail.carNumber}}			
-						
-						</view>
-					</view>
-					
-					<view class="info" >
-						<view class="info-name"  style="font-size: 16px;">
-							停车费
-						</view>
-						<view class="info-text" style="font-size: 16px;">
-							{{detail.total.toFixed(2)}}元
-						</view>
-					</view>
-					<view class="info"   >
-						<view class="info-name"  style="font-size: 16px;">
-							折扣
-						</view>
-						<view class="info-text" style="font-size: 16px;">
-							 {{detail.discountMoney.toFixed(2)}}元
-						</view>
-					</view>
-					
-					<view class="cartitle"> 停车详情</view>
-					<view class="info" >
-						<view class="info-name">
-							每小时费用
-						</view>
-						<view class="info-text">
-							 			
-							{{detail.hourCost.toFixed(2)}}元
-						</view>
-					</view>
-					<view class="info" >
-						<view class="info-name">
-							停车位置
-						</view>
-						<view class="info-text">
-							 			
-					{{detail.parkingName}}
-						</view>
-					</view>
-					<view class="info" >
-						<view class="info-name">
-							入场时间
-						</view>
-						<view class="info-text">
-							 			
-						{{detail.inParkingTime}}
-						</view>
-					</view>
-					<view class="info" >
-						<view class="info-name">
-							停车时间
-						</view>
-						<view class="info-text">
-							 			
-					{{detail.parkingTimeStr}}
-						</view>
-					</view>
-				
-				
- 			</view>
-			<u-button class="login-btn" type="success" shape="circle" @click="pay()">支付离场</u-button>
-			
-			<u-button class="login-btn2"  type="default" shape="circle" @click="channelPayDetail">刷新</u-button>
-			
-			 
-		</view>
-		
-		
-		</view>
-	</view>
-</template>
-
-<script>
-	
-	import * as API from '@/apis/parking.js'
- 
-	import {
-		wxPayJs
-	} from '@/utils/wxpay'
-	import {
-		aliPayJs
-	} from '@/utils/alipay'
-	
-	export default {
-		components: {
-			 
-		},
-		data() {
-			return {
-			 
-			
-				form: {
-				
-					channelId: "",
-				},
-				detail:{},	
-				kongResult: false,
-			}
-		},
-		onLoad(op) {
-			if(op.id){
-				this.form.channelId=op.id
-			}else{
-				uni.showModal({
-					content:"参数错误"
-				})
-			}
-			
-		},
-		onReady() {
-		 this.channelPayDetail()
-		},
-		methods: {
-			channelPayDetail(){
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				
-				API.channelPayDetail(this.form).then(data => {
-					uni.hideLoading()
-					this.detail=data.data
-					this.kongResult=false;
-				}).catch(error => {
-						this.kongResult=true;
-						uni.hideLoading()
-					uni.showToast({
-						title: error,
-						icon: "none"
-					})
-				})
-			},
-			//微信支付
-			payWx() {
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				
-				API.parkingWxPay({
-					id: this.detail.id,
-					openId: this.carhelp.getOpenId()
-				}).then(data => {
-					
-					data.data.url = window.location.href.split("#")[0] + "/#/car/payResult";
-			
-					uni.hideLoading()
-					wxPayJs(data.data)
-				}).catch(error => {
-						uni.hideLoading()
-					uni.showToast({
-						title: error,
-						icon: "none"
-					})
-				})
-			},
-			//支付宝支付
-			payAli() {
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				API.parkingTradeWebPay({
-					id: this.detail.id,
-					openId:  this.carhelp.getOpenIdALI()
-				}).then(response => {
-				 	uni.hideLoading()
-					let opthions = {
-						tradeNo: response.data.tradeOrder.tradeNo,
-						succUrl: window.location.href.split("#")[0] + "/#/pages/parking/payResult?id="+ response.data.tradeOrder.tradeNo,
-						cancelUrl: window.location.href.split("#")[0] + "/#/pages/parking/pay?id=" + this.form.channelId,
-					}
-					//(opthions);
-					aliPayJs(opthions);
-				}).catch(error => {
-						uni.hideLoading()
-					 uni.showToast({
-					 	title: error,
-					 	icon: "none"
-					 })
-				})
-			},
-			//支付
-			pay() {
-				var IS_WEIXIN = /MicroMessenger/.test(window.navigator.userAgent)
-				var IS_ALI = /AlipayClient/.test(window.navigator.userAgent)
-				
-				
-				if (IS_WEIXIN) {
-					this.payWx();
-				} else if (IS_ALI) {
-					this.payAli();
-				} else {
-					this.payWx();
-					uni.showModal({
-						content:"请用微信或支付宝打开"
-					})
-				}
-			},
-			
-			 
-		  
-			
-		}
-	}
-</script>
-<style>
-	page {
-		background-color: #fff;
-	}
-</style>
-<style lang="scss" scoped>
-	.cartitle{
-		font-size: 16px;
-		margin-left: 20px;
-		font-weight: bold;
-		 margin-top: 5px;
-	}
-	.color4fc5f7{
-		color:#4fc5f7;
-		margin-left: 5px;
-	}
-	.info {
-		    font-size: 14px;
-			display: flex;
-			justify-content: space-between;
-			margin: 0 40px;
-			// height: 48px;
-			line-height: 48px;
-			background-color: rgba(255, 255, 255, 100);
-			color: rgba(16, 16, 16, 100);
-			
-			
-			border-bottom: 1px solid #ededed;
-	
-			.info-text {
-				
-	/*			line-height: 23px;*/
-			//	padding: 13px 0 12px;
-				//width: 200px;
-				text-align: right;
-			}
-		}
-	.carNone{
-		display: flex;
-		flex-direction: column;
-		justify-content: center;
-		align-items: center;
-		img{
-			width: 100%;
-			height: 100%;
-		}
-		p{
-			margin-top: -60px;
-		}
-	}
-	.u-char-item{
-		width: 29px !important;
-	}
-	.u-drawer{
-		z-index: -1 !important;
-	}
-	/deep/.u-char-item {
-		width: 30px !important;
-		height: 40px !important;
-		font-size: 18px !important;
-	}
-
-	.key-input {
-		padding-top: 24px;
-	}
-
-	.default {
-		margin: 16px 28px;
-	}
-
-	.login-btn {
-		margin: 28px;
-		background-color: #00B962 !important;
-		border-color: #00B962 !important;
-		color: #fff !important;
-	}
-	.login-btn2 {
-		margin: 28px;
-	
-	}
-</style>
+<template>
+	<view>
+		
+		<view class="carNone" v-if="kongResult">
+			<ujp-navbar title="停车缴费" :is-back="false">
+				
+			</ujp-navbar>
+			<img src="@/assets/static/img/暂无数据-缺省页.png" alt="">
+			<p>未查询到停车数据</p>
+			<u-button class="login-btn2"  type="default" shape="circle" @click="channelPayDetail">刷新</u-button>
+			
+		</view>
+		<view class="wrap"  v-if="!kongResult"  >
+			<view >
+			
+				<view class="">
+					<h2 style="
+										    text-align: center;
+										    font-size: 36px;
+										      padding-top: 30px;
+										"> 停车缴费</h2>
+										<h2 style="
+					    text-align: center;
+					    font-size: 46px;
+					    color: #53b56b;
+					"> {{detail.price.toFixed(2)}}<span style="font-size: 16px;">元</span></h2>
+					<view class="cartitle"> 缴费信息</view>
+					<view class="info" >
+						<view class="info-name">
+							车牌号
+						</view>
+						<view class="info-text">
+							{{detail.carNumber}}			
+						
+						</view>
+					</view>
+					
+					<view class="info" >
+						<view class="info-name"  style="font-size: 16px;">
+							停车费
+						</view>
+						<view class="info-text" style="font-size: 16px;">
+							{{detail.total.toFixed(2)}}元
+						</view>
+					</view>
+					<view class="info"   >
+						<view class="info-name"  style="font-size: 16px;">
+							折扣
+						</view>
+						<view class="info-text" style="font-size: 16px;">
+							 {{detail.discountMoney.toFixed(2)}}元
+						</view>
+					</view>
+					
+					<view class="cartitle"> 停车详情</view>
+					<view class="info" >
+						<view class="info-name">
+							每小时费用
+						</view>
+						<view class="info-text">
+							 			
+							{{detail.hourCost.toFixed(2)}}元
+						</view>
+					</view>
+					<view class="info" >
+						<view class="info-name">
+							停车位置
+						</view>
+						<view class="info-text">
+							 			
+					{{detail.parkingName}}
+						</view>
+					</view>
+					<view class="info" >
+						<view class="info-name">
+							入场时间
+						</view>
+						<view class="info-text">
+							 			
+						{{detail.inParkingTime}}
+						</view>
+					</view>
+					<view class="info" >
+						<view class="info-name">
+							停车时间
+						</view>
+						<view class="info-text">
+							 			
+					{{detail.parkingTimeStr}}
+						</view>
+					</view>
+				
+				
+ 			</view>
+			<u-button class="login-btn" type="success" shape="circle" @click="pay()">支付离场</u-button>
+			
+			<u-button class="login-btn2"  type="default" shape="circle" @click="channelPayDetail">刷新</u-button>
+			
+			 
+		</view>
+		
+		
+		</view>
+	</view>
+</template>
+
+<script>
+	
+	import * as API from '@/apis/parking.js'
+ 
+	import {
+		wxPayJs
+	} from '@/utils/wxpay'
+	import {
+		aliPayJs
+	} from '@/utils/alipay'
+	
+	export default {
+		components: {
+			 
+		},
+		data() {
+			return {
+			 
+			
+				form: {
+				
+					channelId: "",
+				},
+				detail:{},	
+				kongResult: false,
+			}
+		},
+		onLoad(op) {
+			if(op.id){
+				this.form.channelId=op.id
+			}else{
+				uni.showModal({
+					content:"参数错误"
+				})
+			}
+			
+		},
+		onReady() {
+		 this.channelPayDetail()
+		},
+		methods: {
+			channelPayDetail(){
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				
+				API.channelPayDetail(this.form).then(data => {
+					uni.hideLoading()
+					this.detail=data.data
+					this.kongResult=false;
+				}).catch(error => {
+						this.kongResult=true;
+						uni.hideLoading()
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+			},
+			//微信支付
+			payWx() {
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				
+				API.parkingWxPay({
+					id: this.detail.id,
+					openId: this.carhelp.getOpenId()
+				}).then(data => {
+					
+					data.data.url = window.location.href.split("#")[0] + "/#/car/payResult";
+			
+					uni.hideLoading()
+					wxPayJs(data.data)
+				}).catch(error => {
+						uni.hideLoading()
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+			},
+			//支付宝支付
+			payAli() {
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				API.parkingTradeWebPay({
+					id: this.detail.id,
+					openId:  this.carhelp.getOpenIdALI()
+				}).then(response => {
+				 	uni.hideLoading()
+					let opthions = {
+						tradeNo: response.data.tradeOrder.tradeNo,
+						succUrl: window.location.href.split("#")[0] + "/#/pages/parking/payResult?id="+ response.data.tradeOrder.tradeNo,
+						cancelUrl: window.location.href.split("#")[0] + "/#/pages/parking/pay?id=" + this.form.channelId,
+					}
+					//(opthions);
+					aliPayJs(opthions);
+				}).catch(error => {
+						uni.hideLoading()
+					 uni.showToast({
+					 	title: error,
+					 	icon: "none"
+					 })
+				})
+			},
+			//支付
+			pay() {
+				var IS_WEIXIN = /MicroMessenger/.test(window.navigator.userAgent)
+				var IS_ALI = /AlipayClient/.test(window.navigator.userAgent)
+				
+				
+				if (IS_WEIXIN) {
+					this.payWx();
+				} else if (IS_ALI) {
+					this.payAli();
+				} else {
+					this.payWx();
+					uni.showModal({
+						content:"请用微信或支付宝打开"
+					})
+				}
+			},
+			
+			 
+		  
+			
+		}
+	}
+</script>
+<style>
+	page {
+		background-color: #fff;
+	}
+</style>
+<style lang="scss" scoped>
+	.cartitle{
+		font-size: 16px;
+		margin-left: 20px;
+		font-weight: bold;
+		 margin-top: 5px;
+	}
+	.color4fc5f7{
+		color:#4fc5f7;
+		margin-left: 5px;
+	}
+	.info {
+		    font-size: 14px;
+			display: flex;
+			justify-content: space-between;
+			margin: 0 40px;
+			// height: 48px;
+			line-height: 48px;
+			background-color: rgba(255, 255, 255, 100);
+			color: rgba(16, 16, 16, 100);
+			
+			
+			border-bottom: 1px solid #ededed;
+	
+			.info-text {
+				
+	/*			line-height: 23px;*/
+			//	padding: 13px 0 12px;
+				//width: 200px;
+				text-align: right;
+			}
+		}
+	.carNone{
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		img{
+			width: 100%;
+			height: 100%;
+		}
+		p{
+			margin-top: -60px;
+		}
+	}
+	.u-char-item{
+		width: 29px !important;
+	}
+	.u-drawer{
+		z-index: -1 !important;
+	}
+	/deep/.u-char-item {
+		width: 30px !important;
+		height: 40px !important;
+		font-size: 18px !important;
+	}
+
+	.key-input {
+		padding-top: 24px;
+	}
+
+	.default {
+		margin: 16px 28px;
+	}
+
+	.login-btn {
+		margin: 28px;
+		background-color: #00B962 !important;
+		border-color: #00B962 !important;
+		color: #fff !important;
+	}
+	.login-btn2 {
+		margin: 28px;
+	
+	}
+</style>

pages/parking/registration.vue

@@ -1,196 +1,196 @@
-<template>
-	<view >
-		<ujp-navbar title="无牌车辆扫码停车" :is-back="false" ></ujp-navbar>
-		<view class="main">
-			<view class="park-name" v-if="detail.parkName">
-				<img src="../../static/img/if-location-pin@2x.png" alt="">
-				<text>{{detail.parkName}}</text>
-			</view>
-			<view class="unlabeled"  >
-				无牌车
-			</view>
-			<view class="bus-number" v-if="detail.id">
-				{{detail.carNum}}
-			</view>
-			<view class="bus-number"  v-if="!detail.id">
-				{{message}}
-			</view>	
-		</view>
-		
-		<view v-if="detail.inParkingStatus==1" style="
-				text-align: center;
-				font-size: 30px;
-				font-weight: bold;
-			">
-			车辆已进场
-		</view>
-		<u-button v-if="detail.inParkingStatus==0" @click="submit" >请求进场</u-button>
-		<view class="notice" v-if="txt">
-			<view class="title">
-				停车场须知
-			</view>
-			<p v-html="txt"></p>
-			
-			
-		</view>
-		
-		<view class="notice" >
-			<view class="title">
-				停车场须知
-			</view>
-			<h3 style="color:red">入住酒店客户请截图保留此页面</h3>
-			
-			
-		</view>
-	</view>
-</template>
-
-<script>
-	import * as API from '@/apis/parking.js'
-	import * as newsApi from '@/apis/news.js'
-	
-	export default {
-		data() {
-			return {
-				channelId:'',
-				detail:{},
-			 message:"",
-				txt:''
-			}
-		},onLoad(op) {
-			this.getNewsInfoDetail()
-			if(op.id){
-				this.channelId=op.id
-				this.getInfo()
-			}else{
-				uni.showModal({
-					content:"参数错误"
-				})
-			}
-			
-		},	methods: {
-			getNewsInfoDetail() {
-				
-				
-				newsApi.findConfigureByKey({
-					key:'parking-registration-txt'
-				}).then((res) => {
-									
-					this.txt = res.data.value;
-					
-				}).catch(error => {
-					uni.showToast({
-						title: error,
-						icon: "none"
-					})
-				})
-			},
-			submit(){
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				
-				API.temporaryCarNumInPark({
-					id: this.detail.id,
-					openId: this.carhelp.getOpenId(),
-					channelId:this.channelId
-				}).then(data => {
-					var obj=data.data;
-					 
-					this.carhelp.set("parkingregistration_submit",obj)
-					uni.reLaunch({
-						url:'/pages/parking/request'
-					})
-					
-				}).catch(error => {
-						uni.hideLoading()
-					uni.showToast({
-						title: error,
-						icon: "none"
-					})
-				})
-				
-			},
-			getInfo(){
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				API.generateTemporaryCarNum({
-					openId:this.carhelp.getOpenId(),
-					channelId:this.channelId
-				}).then((res) => {
-					
-					uni.hideLoading();
-					
-					this.detail = res.data;
-					if(this.detail.status==2){
-						uni.reLaunch({
-							url:'/pages/parking/outPayment?id='+this.channelId
-						})
-					}
-				}).catch(error => {
-						uni.hideLoading()
-						this.message=error
-				})
-			}
-		}
-	}
-	
-</script>
-
-<style lang="scss" scoped>
-	
-	.main{
-		
-		padding: 20px 0px 28px 23px;
-		background: linear-gradient(#1F55FF,#27ABFF);
-		.park-name{
-		    line-height: 20px;
-			color: rgba(255, 255, 255, 100);
-			font-size: 20px;
-			position: relative;
-			text{
-				margin-left: 25px;
-			}
-			img{
-				width: 20px;
-				height: 20px;
-				margin-right: 8px;
-				position: absolute;
-				
-			}
-		}
-		.unlabeled{
-			line-height: 36px;
-			color: rgba(255, 255, 255, 100);
-			font-size: 36px;
-			margin-top: 28px;
-		}
-		.bus-number{
-			line-height: 48px;
-			color: rgba(255, 255, 255, 100);
-			font-size: 48px;
-			margin-top: 20px;
-		}
-	}
-	.u-btn{
-		width: 89.3% ;
-		background-color:#005AD9;
-		color: #ffffff;
-		border-radius: 12px;
-		margin-top: 20px;
-	}
-	.notice{
-		padding: 20px 23px;
-		.title{
-			font-size: 16px;
-			color: #101010;
-		}
-		p{
-			color: #666666;
-			margin-top: 8px;
-		}
-	}
+<template>
+	<view >
+		<ujp-navbar title="无牌车辆扫码停车" :is-back="false" ></ujp-navbar>
+		<view class="main">
+			<view class="park-name" v-if="detail.parkName">
+				<img src="@/assets/static/img/if-location-pin@2x.png" alt="">
+				<text>{{detail.parkName}}</text>
+			</view>
+			<view class="unlabeled"  >
+				无牌车
+			</view>
+			<view class="bus-number" v-if="detail.id">
+				{{detail.carNum}}
+			</view>
+			<view class="bus-number"  v-if="!detail.id">
+				{{message}}
+			</view>	
+		</view>
+		
+		<view v-if="detail.inParkingStatus==1" style="
+				text-align: center;
+				font-size: 30px;
+				font-weight: bold;
+			">
+			车辆已进场
+		</view>
+		<u-button v-if="detail.inParkingStatus==0" @click="submit" >请求进场</u-button>
+		<view class="notice" v-if="txt">
+			<view class="title">
+				停车场须知
+			</view>
+			<p v-html="txt"></p>
+			
+			
+		</view>
+		
+		<view class="notice" >
+			<view class="title">
+				停车场须知
+			</view>
+			<h3 style="color:red">入住酒店客户请截图保留此页面</h3>
+			
+			
+		</view>
+	</view>
+</template>
+
+<script>
+	import * as API from '@/apis/parking.js'
+	import * as newsApi from '@/apis/news.js'
+	
+	export default {
+		data() {
+			return {
+				channelId:'',
+				detail:{},
+			 message:"",
+				txt:''
+			}
+		},onLoad(op) {
+			this.getNewsInfoDetail()
+			if(op.id){
+				this.channelId=op.id
+				this.getInfo()
+			}else{
+				uni.showModal({
+					content:"参数错误"
+				})
+			}
+			
+		},	methods: {
+			getNewsInfoDetail() {
+				
+				
+				newsApi.findConfigureByKey({
+					key:'parking-registration-txt'
+				}).then((res) => {
+									
+					this.txt = res.data.value;
+					
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+			},
+			submit(){
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				
+				API.temporaryCarNumInPark({
+					id: this.detail.id,
+					openId: this.carhelp.getOpenId(),
+					channelId:this.channelId
+				}).then(data => {
+					var obj=data.data;
+					 
+					this.carhelp.set("parkingregistration_submit",obj)
+					uni.reLaunch({
+						url:'/pages/parking/request'
+					})
+					
+				}).catch(error => {
+						uni.hideLoading()
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+				
+			},
+			getInfo(){
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				API.generateTemporaryCarNum({
+					openId:this.carhelp.getOpenId(),
+					channelId:this.channelId
+				}).then((res) => {
+					
+					uni.hideLoading();
+					
+					this.detail = res.data;
+					if(this.detail.status==2){
+						uni.reLaunch({
+							url:'/pages/parking/outPayment?id='+this.channelId
+						})
+					}
+				}).catch(error => {
+						uni.hideLoading()
+						this.message=error
+				})
+			}
+		}
+	}
+	
+</script>
+
+<style lang="scss" scoped>
+	
+	.main{
+		
+		padding: 20px 0px 28px 23px;
+		background: linear-gradient(#1F55FF,#27ABFF);
+		.park-name{
+		    line-height: 20px;
+			color: rgba(255, 255, 255, 100);
+			font-size: 20px;
+			position: relative;
+			text{
+				margin-left: 25px;
+			}
+			img{
+				width: 20px;
+				height: 20px;
+				margin-right: 8px;
+				position: absolute;
+				
+			}
+		}
+		.unlabeled{
+			line-height: 36px;
+			color: rgba(255, 255, 255, 100);
+			font-size: 36px;
+			margin-top: 28px;
+		}
+		.bus-number{
+			line-height: 48px;
+			color: rgba(255, 255, 255, 100);
+			font-size: 48px;
+			margin-top: 20px;
+		}
+	}
+	.u-btn{
+		width: 89.3% ;
+		background-color:#005AD9;
+		color: #ffffff;
+		border-radius: 12px;
+		margin-top: 20px;
+	}
+	.notice{
+		padding: 20px 23px;
+		.title{
+			font-size: 16px;
+			color: #101010;
+		}
+		p{
+			color: #666666;
+			margin-top: 8px;
+		}
+	}
 </style>

pages/parking/search.vue

@@ -1,374 +1,374 @@
-<template>
-	<view>
-		<view class="wrap" v-if="!kongResult">
-			<ujp-navbar title="车牌查询" :is-back="false">
-			</ujp-navbar>
-			<view class="key-input">
-				<u-message-input :focus="true" :value="form.carNum" :maxlength="maxlength" :disabled-keyboard="true"></u-message-input>
-			</view>
-			<ucarkeyboard ref="uKeyboard" mode="car" :showTips="true" :confirmBtn="false" :mask-close-able="false" :tooltip="false" v-model="keyShow" @change="valChange" @backspace="backspace"></ucarkeyboard>
-			 
-			<!-- <view class="carNone"  v-if="kongResult">
-				<img src="static/img/暂无数据-缺省页.png" alt="">
-				<p>没有找到停车信息</p>
-			</view> -->
-			<u-button class="login-btn" type="success" shape="circle" @click="keepCar">查询</u-button>
-			
-			<view style="padding: 20px;">
-				<b>停车场收费说明:</b><br>
-				缴费后请于规定时间离场，离场会自动抬杆。如果找不到停车信息，或者临牌停车，请至集中缴费处缴纳现金。
-				
-			</view>
-		</view>
-		
-		<view class="wrap"  v-if="kongResult">
-			 
-			
-			<view >
-				<view class="">
-					<h2 style="
-					    text-align: center;
-					    font-size: 36px;
-					      padding-top: 30px;
-					"> 停车缴费</h2>
-					<h2 style="
-    text-align: center;
-    font-size: 46px;
-    color: #53b56b;
-"> {{detail.price.toFixed(2)}}<span style="font-size: 16px;">元</span></h2>
-					<view class="cartitle"> 缴费信息</view>
-					<view class="info" >
-						<view class="info-name">
-							车牌号
-						</view>
-						<view class="info-text">
-							{{detail.carNumber}}			
-							<a @click="goToBack" class="color4fc5f7 marginl5">修改</a>
-					
-						</view>
-					</view>
-					
-					<view class="info" >
-						<view class="info-name"  style="font-size: 16px;">
-							停车费
-						</view>
-						<view class="info-text" style="font-size: 16px;">
-							{{detail.total.toFixed(2)}}元
-						</view>
-					</view>
-					<view class="info"   >
-						<view class="info-name"  style="font-size: 16px;">
-							折扣
-						</view>
-						<view class="info-text" style="font-size: 16px;">
-							 {{detail.discountMoney.toFixed(2)}}元
-						</view>
-					</view>
-					
-					
-					<view class="cartitle"> 停车详情</view>
-					
-					<view class="info" >
-						<view class="info-name">
-							每小时费用
-						</view>
-						<view class="info-text">
-							 			
-							{{detail.hourCost.toFixed(2)}}元
-						</view>
-					</view>
-					<view class="info" >
-						<view class="info-name">
-							停车位置
-						</view>
-						<view class="info-text">
-							 			
-							{{detail.parkingName}}
-						</view>
-					</view>
-					<view class="info" >
-						<view class="info-name">
-							入场时间
-						</view>
-						<view class="info-text">
-							 			
-						{{detail.inParkingTime}}
-						</view>
-					</view>
-					<view class="info" >
-						<view class="info-name">
-							停车时间
-						</view>
-						<view class="info-text">
-							 			
-					{{detail.parkingTimeStr}}
-						</view>
-					</view>
-				
-				
- 			</view>
-			<u-button class="login-btn" type="success" shape="circle" @click="pay()">支付离场</u-button>
-			
-			<u-button class="login-btn2"  type="default" shape="circle" @click="keepCar">刷新</u-button>
-			
-			 
-		</view>
-		
-		
-		</view>
-	</view>
-</template>
-
-<script>
-	
-	import * as API from '@/apis/parking.js'
-	import ucarkeyboard from '@/components/Ucarkeyboard.vue'
-
-	import {
-		wxPayJs
-	} from '@/utils/wxpay'
-	import {
-		aliPayJs
-	} from '@/utils/alipay'
-	
-	export default {
-		components: {
-			ucarkeyboard
-		},
-		data() {
-			return {
-			 
-				maxlength:8,
-				keyShow: true,
-				detail:{},
-				form: {
-					carNum: '鄂',
-					parkId: "",
-				},
-				
-				kongResult: false,
-			}
-		},
-		onLoad(op) {
-			
-			if(op.id){
-				this.form.parkId=op.id
-			}else{
-				uni.showModal({
-					content:"参数错误"
-				})
-			}
-			
-		},
-		onReady() {
-			this.$refs.uKeyboard.changeCarInputMode();
-		},
-		methods: {
-			//微信支付
-			payWx() {
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				
-				API.parkingWxPay({
-					id: this.detail.id,
-					openId: this.carhelp.getOpenId()
-				}).then(data => {
-					
-					data.data.url = window.location.href.split("#")[0] + "/#/car/payResult";
-			
-					uni.hideLoading()
-					wxPayJs(data.data)
-				}).catch(error => {
-						uni.hideLoading()
-					uni.showToast({
-						title: error,
-						icon: "none"
-					})
-				})
-			},
-			//支付宝支付
-			payAli() {
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				API.parkingTradeWebPay({
-					id: this.detail.id,
-					openId:  this.carhelp.getOpenIdALI()
-				}).then(response => {
-				 	uni.hideLoading()
-					let opthions = {
-						tradeNo: response.data.tradeOrder.tradeNo,
-						succUrl: window.location.href.split("#")[0] + "/#/pages/parking/payResult?id="+ response.data.tradeOrder.tradeNo,
-						cancelUrl: window.location.href.split("#")[0] + "/#/pages/parking/search?id=" + this.form.parkId,
-					}
-					//(opthions);
-					aliPayJs(opthions);
-				}).catch(error => {
-						uni.hideLoading()
-					 uni.showToast({
-					 	title: error,
-					 	icon: "none"
-					 })
-				})
-			},
-			//支付
-			pay() {
-				var IS_WEIXIN = /MicroMessenger/.test(window.navigator.userAgent)
-				var IS_ALI = /AlipayClient/.test(window.navigator.userAgent)
-				
-				
-				if (IS_WEIXIN) {
-					this.payWx();
-				} else if (IS_ALI) {
-					this.payAli();
-				} else {
-					this.payWx();
-					uni.showModal({
-						content:"请用微信或支付宝打开"
-					})
-				}
-			},
-			
-			 goToBack() {
-			 	this.kongResult=false
-			 },
-			 
-			// 按键被点击(点击退格键不会触发此事件)
-			valChange(val) {
-				if(this.form.carNum.length>=this.maxlength){
-					return
-				}
-				// 将每次按键的值拼接到form.carNum变量中，注意+=写法
-				this.form.carNum += val;
-				//(this.form.carNum);
-				
-				if(this.form.carNum.length == 1) {
-					this.$refs.uKeyboard.changeCarInputMode();
-				}
-			},
-			// 退格键被点击
-			backspace() {
-				// 删除form.carNum的最后一个字符
-				if (this.form.carNum.length) this.form.carNum = this.form.carNum.substr(0, this.form.carNum.length - 1);
-				//(this.form.carNum);
-				
-				var aaa =	this.$refs.uKeyboard.changeCarInputValue();
-				if(this.form.carNum.length == 0 && aaa) {
-					this.$refs.uKeyboard.changeCarInputMode();
-				}
-			},
-			keepCar() {
-				//(this.form)
-				if (this.form.carNum.length <7) {
-					uni.showToast({
-						title:"车牌号至少输入7位"
-					})
-					return false;
-				} 
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				API.carPayDetail(this.form).then((res) => {
-					
-					uni.hideLoading();
-					
-					this.detail = res.data;
-					this.kongResult=true;
-				}).catch(error => {
-						uni.hideLoading()
-					uni.showToast({
-						title: error,
-						icon: "none"
-					})
-				})
-			}
-		}
-	}
-</script>
-<style>
-	page {
-		background-color: #fff;
-	}
-</style>
-<style lang="scss" scoped>
-	.cartitle{
-		font-size: 16px;
-		margin-left: 20px;
-		font-weight: bold;
-		 margin-top: 5px;
-	}
-	.color4fc5f7{
-		color:#53b56b;
-	
-		margin-left: 5px;
-		 font-weight: bold;
-	}
-	.info {
-		    font-size: 14px;
-			display: flex;
-			justify-content: space-between;
-			margin: 0 40px;
-			// height: 48px;
-			line-height: 48px;
-			background-color: rgba(255, 255, 255, 100);
-			color: rgba(16, 16, 16, 100);
-			
-			
-			border-bottom: 1px solid #ededed;
-	
-			.info-text {
-				
-	/*			line-height: 23px;*/
-			//	padding: 13px 0 12px;
-				//width: 200px;
-				text-align: right;
-			}
-		}
-	.carNone{
-		display: flex;
-		flex-direction: column;
-		justify-content: center;
-		align-items: center;
-		img{
-			width: 100%;
-			height: 100%;
-		}
-		p{
-			margin-top: -60px;
-		}
-	}
-	.u-char-item{
-		width: 29px !important;
-	}
-	.u-drawer{
-		z-index: -1 !important;
-	}
-	/deep/.u-char-item {
-		width: 30px !important;
-		height: 40px !important;
-		font-size: 18px !important;
-	}
-
-	.key-input {
-		padding-top: 24px;
-	}
-
-	.default {
-		margin: 16px 28px;
-	}
-
-	.login-btn {
-		margin: 28px;
-		background-color: #00B962 !important;
-		border-color: #00B962 !important;
-		color: #fff !important;
-	}
-	.login-btn2 {
-		margin: 28px;
-	
-	}
-</style>
+<template>
+	<view>
+		<view class="wrap" v-if="!kongResult">
+			<ujp-navbar title="车牌查询" :is-back="false">
+			</ujp-navbar>
+			<view class="key-input">
+				<u-message-input :focus="true" :value="form.carNum" :maxlength="maxlength" :disabled-keyboard="true"></u-message-input>
+			</view>
+			<ucarkeyboard ref="uKeyboard" mode="car" :showTips="true" :confirmBtn="false" :mask-close-able="false" :tooltip="false" v-model="keyShow" @change="valChange" @backspace="backspace"></ucarkeyboard>
+			 
+			<!-- <view class="carNone"  v-if="kongResult">
+				<img src="@/assets/static/img/暂无数据-缺省页.png" alt="">
+				<p>没有找到停车信息</p>
+			</view> -->
+			<u-button class="login-btn" type="success" shape="circle" @click="keepCar">查询</u-button>
+			
+			<view style="padding: 20px;">
+				<b>停车场收费说明:</b><br>
+				缴费后请于规定时间离场，离场会自动抬杆。如果找不到停车信息，或者临牌停车，请至集中缴费处缴纳现金。
+				
+			</view>
+		</view>
+		
+		<view class="wrap"  v-if="kongResult">
+			 
+			
+			<view >
+				<view class="">
+					<h2 style="
+					    text-align: center;
+					    font-size: 36px;
+					      padding-top: 30px;
+					"> 停车缴费</h2>
+					<h2 style="
+    text-align: center;
+    font-size: 46px;
+    color: #53b56b;
+"> {{detail.price.toFixed(2)}}<span style="font-size: 16px;">元</span></h2>
+					<view class="cartitle"> 缴费信息</view>
+					<view class="info" >
+						<view class="info-name">
+							车牌号
+						</view>
+						<view class="info-text">
+							{{detail.carNumber}}			
+							<a @click="goToBack" class="color4fc5f7 marginl5">修改</a>
+					
+						</view>
+					</view>
+					
+					<view class="info" >
+						<view class="info-name"  style="font-size: 16px;">
+							停车费
+						</view>
+						<view class="info-text" style="font-size: 16px;">
+							{{detail.total.toFixed(2)}}元
+						</view>
+					</view>
+					<view class="info"   >
+						<view class="info-name"  style="font-size: 16px;">
+							折扣
+						</view>
+						<view class="info-text" style="font-size: 16px;">
+							 {{detail.discountMoney.toFixed(2)}}元
+						</view>
+					</view>
+					
+					
+					<view class="cartitle"> 停车详情</view>
+					
+					<view class="info" >
+						<view class="info-name">
+							每小时费用
+						</view>
+						<view class="info-text">
+							 			
+							{{detail.hourCost.toFixed(2)}}元
+						</view>
+					</view>
+					<view class="info" >
+						<view class="info-name">
+							停车位置
+						</view>
+						<view class="info-text">
+							 			
+							{{detail.parkingName}}
+						</view>
+					</view>
+					<view class="info" >
+						<view class="info-name">
+							入场时间
+						</view>
+						<view class="info-text">
+							 			
+						{{detail.inParkingTime}}
+						</view>
+					</view>
+					<view class="info" >
+						<view class="info-name">
+							停车时间
+						</view>
+						<view class="info-text">
+							 			
+					{{detail.parkingTimeStr}}
+						</view>
+					</view>
+				
+				
+ 			</view>
+			<u-button class="login-btn" type="success" shape="circle" @click="pay()">支付离场</u-button>
+			
+			<u-button class="login-btn2"  type="default" shape="circle" @click="keepCar">刷新</u-button>
+			
+			 
+		</view>
+		
+		
+		</view>
+	</view>
+</template>
+
+<script>
+	
+	import * as API from '@/apis/parking.js'
+	import ucarkeyboard from '@/components/Ucarkeyboard.vue'
+
+	import {
+		wxPayJs
+	} from '@/utils/wxpay'
+	import {
+		aliPayJs
+	} from '@/utils/alipay'
+	
+	export default {
+		components: {
+			ucarkeyboard
+		},
+		data() {
+			return {
+			 
+				maxlength:8,
+				keyShow: true,
+				detail:{},
+				form: {
+					carNum: '鄂',
+					parkId: "",
+				},
+				
+				kongResult: false,
+			}
+		},
+		onLoad(op) {
+			
+			if(op.id){
+				this.form.parkId=op.id
+			}else{
+				uni.showModal({
+					content:"参数错误"
+				})
+			}
+			
+		},
+		onReady() {
+			this.$refs.uKeyboard.changeCarInputMode();
+		},
+		methods: {
+			//微信支付
+			payWx() {
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				
+				API.parkingWxPay({
+					id: this.detail.id,
+					openId: this.carhelp.getOpenId()
+				}).then(data => {
+					
+					data.data.url = window.location.href.split("#")[0] + "/#/car/payResult";
+			
+					uni.hideLoading()
+					wxPayJs(data.data)
+				}).catch(error => {
+						uni.hideLoading()
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+			},
+			//支付宝支付
+			payAli() {
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				API.parkingTradeWebPay({
+					id: this.detail.id,
+					openId:  this.carhelp.getOpenIdALI()
+				}).then(response => {
+				 	uni.hideLoading()
+					let opthions = {
+						tradeNo: response.data.tradeOrder.tradeNo,
+						succUrl: window.location.href.split("#")[0] + "/#/pages/parking/payResult?id="+ response.data.tradeOrder.tradeNo,
+						cancelUrl: window.location.href.split("#")[0] + "/#/pages/parking/search?id=" + this.form.parkId,
+					}
+					//(opthions);
+					aliPayJs(opthions);
+				}).catch(error => {
+						uni.hideLoading()
+					 uni.showToast({
+					 	title: error,
+					 	icon: "none"
+					 })
+				})
+			},
+			//支付
+			pay() {
+				var IS_WEIXIN = /MicroMessenger/.test(window.navigator.userAgent)
+				var IS_ALI = /AlipayClient/.test(window.navigator.userAgent)
+				
+				
+				if (IS_WEIXIN) {
+					this.payWx();
+				} else if (IS_ALI) {
+					this.payAli();
+				} else {
+					this.payWx();
+					uni.showModal({
+						content:"请用微信或支付宝打开"
+					})
+				}
+			},
+			
+			 goToBack() {
+			 	this.kongResult=false
+			 },
+			 
+			// 按键被点击(点击退格键不会触发此事件)
+			valChange(val) {
+				if(this.form.carNum.length>=this.maxlength){
+					return
+				}
+				// 将每次按键的值拼接到form.carNum变量中，注意+=写法
+				this.form.carNum += val;
+				//(this.form.carNum);
+				
+				if(this.form.carNum.length == 1) {
+					this.$refs.uKeyboard.changeCarInputMode();
+				}
+			},
+			// 退格键被点击
+			backspace() {
+				// 删除form.carNum的最后一个字符
+				if (this.form.carNum.length) this.form.carNum = this.form.carNum.substr(0, this.form.carNum.length - 1);
+				//(this.form.carNum);
+				
+				var aaa =	this.$refs.uKeyboard.changeCarInputValue();
+				if(this.form.carNum.length == 0 && aaa) {
+					this.$refs.uKeyboard.changeCarInputMode();
+				}
+			},
+			keepCar() {
+				//(this.form)
+				if (this.form.carNum.length <7) {
+					uni.showToast({
+						title:"车牌号至少输入7位"
+					})
+					return false;
+				} 
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				API.carPayDetail(this.form).then((res) => {
+					
+					uni.hideLoading();
+					
+					this.detail = res.data;
+					this.kongResult=true;
+				}).catch(error => {
+						uni.hideLoading()
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+			}
+		}
+	}
+</script>
+<style>
+	page {
+		background-color: #fff;
+	}
+</style>
+<style lang="scss" scoped>
+	.cartitle{
+		font-size: 16px;
+		margin-left: 20px;
+		font-weight: bold;
+		 margin-top: 5px;
+	}
+	.color4fc5f7{
+		color:#53b56b;
+	
+		margin-left: 5px;
+		 font-weight: bold;
+	}
+	.info {
+		    font-size: 14px;
+			display: flex;
+			justify-content: space-between;
+			margin: 0 40px;
+			// height: 48px;
+			line-height: 48px;
+			background-color: rgba(255, 255, 255, 100);
+			color: rgba(16, 16, 16, 100);
+			
+			
+			border-bottom: 1px solid #ededed;
+	
+			.info-text {
+				
+	/*			line-height: 23px;*/
+			//	padding: 13px 0 12px;
+				//width: 200px;
+				text-align: right;
+			}
+		}
+	.carNone{
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		img{
+			width: 100%;
+			height: 100%;
+		}
+		p{
+			margin-top: -60px;
+		}
+	}
+	.u-char-item{
+		width: 29px !important;
+	}
+	.u-drawer{
+		z-index: -1 !important;
+	}
+	/deep/.u-char-item {
+		width: 30px !important;
+		height: 40px !important;
+		font-size: 18px !important;
+	}
+
+	.key-input {
+		padding-top: 24px;
+	}
+
+	.default {
+		margin: 16px 28px;
+	}
+
+	.login-btn {
+		margin: 28px;
+		background-color: #00B962 !important;
+		border-color: #00B962 !important;
+		color: #fff !important;
+	}
+	.login-btn2 {
+		margin: 28px;
+	
+	}
+</style>

pages/parking/temCarNumber.vue

@@ -1,125 +1,125 @@
-<template>
-	<view>
-		<ujp-navbar title="临时车辆" :is-back="false"></ujp-navbar>
-		<view class="main">
-			<!-- <view class="park-name" v-if="detail.parkName">
-				<img src="../../static/img/if-location-pin@2x.png" alt="">
-				<text>{{detail.parkName}}</text>
-			</view> -->
-			<view class="unlabeled">
-				临时车
-			</view>
-			<view class="bus-number">
-				{{detail.carNum}}
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import * as API from '@/apis/parking.js'
-
-	export default {
-		data() {
-			return {
-				companyId: '',
-				detail: {},
-				message: '',
-			}
-		},
-		onLoad(op) {
-			if (op.id) {
-				this.companyId = op.id
-				this.getInfo()
-			} else {
-				uni.showModal({
-					content: "参数错误"
-				})
-			}
-		},
-		methods: {
-			getInfo() {
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				API.getTemporaryCarNum({
-					openId: this.carhelp.getOpenId(),
-					companyId: this.companyId
-				}).then((res) => {
-
-					uni.hideLoading();
-
-					this.detail = res.data;
-					
-				}).catch(error => {
-					uni.hideLoading()
-					this.message = error
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.main {
-
-		padding: 20px 0px 28px 23px;
-		background: linear-gradient(#1F55FF, #27ABFF);
-
-		.park-name {
-		 line-height: 20px;
-			color: rgba(255, 255, 255, 100);
-			font-size: 20px;
-			position: relative;
-
-			text {
-				margin-left: 25px;
-			}
-
-			img {
-				width: 20px;
-				height: 20px;
-				margin-right: 8px;
-				position: absolute;
-
-			}
-		}
-
-		.unlabeled {
-			line-height: 36px;
-			color: rgba(255, 255, 255, 100);
-			font-size: 36px;
-			margin-top: 28px;
-		}
-
-		.bus-number {
-			line-height: 48px;
-			color: rgba(255, 255, 255, 100);
-			font-size: 48px;
-			margin-top: 20px;
-		}
-	}
-
-	.u-btn {
-		width: 89.3%;
-		background-color: #005AD9;
-		color: #ffffff;
-		border-radius: 12px;
-		margin-top: 20px;
-	}
-
-	.notice {
-		padding: 20px 23px;
-
-		.title {
-			font-size: 16px;
-			color: #101010;
-		}
-
-		p {
-			color: #666666;
-			margin-top: 8px;
-		}
-	}
-</style>
+<template>
+	<view>
+		<ujp-navbar title="临时车辆" :is-back="false"></ujp-navbar>
+		<view class="main">
+			<!-- <view class="park-name" v-if="detail.parkName">
+				<img src="@/assets/static/img/if-location-pin@2x.png" alt="">
+				<text>{{detail.parkName}}</text>
+			</view> -->
+			<view class="unlabeled">
+				临时车
+			</view>
+			<view class="bus-number">
+				{{detail.carNum}}
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import * as API from '@/apis/parking.js'
+
+	export default {
+		data() {
+			return {
+				companyId: '',
+				detail: {},
+				message: '',
+			}
+		},
+		onLoad(op) {
+			if (op.id) {
+				this.companyId = op.id
+				this.getInfo()
+			} else {
+				uni.showModal({
+					content: "参数错误"
+				})
+			}
+		},
+		methods: {
+			getInfo() {
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				API.getTemporaryCarNum({
+					openId: this.carhelp.getOpenId(),
+					companyId: this.companyId
+				}).then((res) => {
+
+					uni.hideLoading();
+
+					this.detail = res.data;
+					
+				}).catch(error => {
+					uni.hideLoading()
+					this.message = error
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.main {
+
+		padding: 20px 0px 28px 23px;
+		background: linear-gradient(#1F55FF, #27ABFF);
+
+		.park-name {
+		 line-height: 20px;
+			color: rgba(255, 255, 255, 100);
+			font-size: 20px;
+			position: relative;
+
+			text {
+				margin-left: 25px;
+			}
+
+			img {
+				width: 20px;
+				height: 20px;
+				margin-right: 8px;
+				position: absolute;
+
+			}
+		}
+
+		.unlabeled {
+			line-height: 36px;
+			color: rgba(255, 255, 255, 100);
+			font-size: 36px;
+			margin-top: 28px;
+		}
+
+		.bus-number {
+			line-height: 48px;
+			color: rgba(255, 255, 255, 100);
+			font-size: 48px;
+			margin-top: 20px;
+		}
+	}
+
+	.u-btn {
+		width: 89.3%;
+		background-color: #005AD9;
+		color: #ffffff;
+		border-radius: 12px;
+		margin-top: 20px;
+	}
+
+	.notice {
+		padding: 20px 23px;
+
+		.title {
+			font-size: 16px;
+			color: #101010;
+		}
+
+		p {
+			color: #666666;
+			margin-top: 8px;
+		}
+	}
+</style>

pages/record/index.vue

@@ -1,265 +1,265 @@
-<template>
-	<view>
-		<ujp-navbar title="充电订单"></ujp-navbar>
-		
-		<view class="record">
-			<view class="recordTime oldTextjp2" oldstyle="font-size: 18px;" @click="show = true">
-				<u-picker mode="time" v-model="show" :params="params" :default-time="endDate" @confirm="confirmTime" @cancel="cancelTime"></u-picker>
-				<p>{{month}}月</p>
-				<u-icon name="arrow-down-s-fill" custom-prefix="custom-icon" color="#B3B3B3" size="32"></u-icon>
-			</view>
-			<view class="carNone" v-if="chargeList.length == 0">
-				<img src="static/img/暂无数据-缺省页.png" alt="">
-				<p class="oldTextjp2" oldstyle="font-size: 18px;">暂无充电订单</p>
-			</view>
-			<view class="recordList" v-if="chargeList.length > 0">
-				<view class="recordList-item" v-for="(item,index) in chargeList" :key="item.id" @click="toUrl(item)">
-					<view class="recordList-name">
-						<h4 class="oldTextjp" oldstyle="font-size: 20px;">{{item.stationName}}/{{item.deviceName}}</h4>
-						<span class="state1" :style="{color : textColor(item),fontSize: textFontSize()}">{{item.statusText}}</span>
-					</view>
-					<view class="recordList-row">
-						<p :style="elderStatus ? 'font-size: 14px' : ''">结束时间：{{item.status == '0' ? '暂未开始' : item.endTime}}</p>
-					</view>
-					<view class="recordList-row">
-						<p :style="elderStatus ? 'font-size: 14px' : ''">充电电量：{{item.electricQuantity != null ? item.electricQuantity/10000 : '0.000'}}度</p>
-					</view>
-					<view class="recordList-row">
-						<p :style="elderStatus ? 'font-size: 14px' : ''">充电时长：{{item.chargingMinute != null ? getPercent(item.chargingMinute): '0秒'}}</p>
-						<h4 class="oldTextjp2" oldstyle="font-size: 28px;">{{item.actualFee != null ? item.actualFee.toFixed(2) : '0.00'}}元</h4>
-					</view>
-				</view>
-			</view>
-		</view>
-		<u-divider  v-if="chargeList.length == recordsTotal && recordsTotal != 0" style="margin-top: 10px;background-color: #F2F4F4;">已经到底了</u-divider>
-	</view>
-</template>
-
-<script>
-	import * as API from '@/apis/index.js'
-	
-	export default {
-		data() {
-			return {
-				params: {
-					year: true,
-					month: true,
-					day: false,
-					hour: false,
-					minute: false,
-					second: false,
-					timestamp: true,
-				},
-				show: false,
-				month: '',
-				startDate: '',
-				endDate: '',
-				chargeList: [],
-				pageIndex: 1,
-				recordsTotal: 0,
-				elderStatus: false,
-			}
-		},
-		onReady() {
-			var date = new Date();
-			this.month = date.getMonth() + 1;
-			
-			var year = date.getFullYear();
-			var day = new Date(year, this.month, 0).getDate();
-			var monthN = this.month;
-			if(monthN >= 1 && monthN <= 9) {
-				monthN = "0" + monthN;
-			}
-			
-			this.startDate = year + '-' + monthN + '-' + '01';
-			this.endDate = year + '-' + monthN + '-' + day;
-					
-			this.getChargeList();
-			
-			if(this.carhelp.get("getElderModeClass") == "长辈模式") {
-				this.elderStatus = true;
-			} else {
-				this.elderStatus = false;
-			}
-		},
-		onReachBottom() {
-			if (this.chargeList.length < this.recordsTotal) {			
-				this.myLoadmore();
-			}
-		},
-		methods: {
-			getPercent(estimateMinute) {
-				var value="";
-				 
-				var ms =estimateMinute
-				if (ms > 0) {
-					var Hour = parseInt(Math.floor(ms / 60 ));
-					var Fen = parseInt(Math.floor(ms % 60 ));	
-				//	value = Hour + "小时"  + Fen+"分钟"
-					if(Hour){
-						value += Hour + "小时" 
-					}
-						
-					if(Fen){
-						value += Fen+"分钟"
-					}
-				}
-			
-				return value;
-			},
-			toUrl(item) {
-				if(item.status == '1') {
-					uni.navigateTo({
-						url: '/pages/searchPile/chargeProcess/dcCharging?id=' + item.id
-					})
-				} else if (item.status == '4') {
-					uni.navigateTo({
-						url: '/pages/searchPile/chargeProcess/dcCharging?id=' + item.id
-					})
-				} else {
-					uni.navigateTo({
-						url: '/pages/record/details?id=' + item.id
-					})
-				}	
-			},
-			myLoadmore() {
-				this.pageIndex += 1;
-				this.getChargeList()
-			},
-			textColor(item) {
-				switch (item.status) {
-					case '1':
-						return '#00B962'
-						break;
-					case '2':
-						return '#666666'
-						break;
-					case '4':
-						return '#8161FF'
-						break;
-				}
-			},
-			textFontSize() {
-				if(this.elderStatus) {
-						return '40rpx'
-				}
-			},
-			confirmTime(params) {
-				if(params.month.slice(0,1) == '0') {
-					this.month = params.month.slice(1);
-				} else {
-					this.month = params.month;
-				}
-				
-				this.startDate = params.year + '-' + params.month + '-' + '01';
-				var day = new Date(params.year, params.month, 0).getDate();
-				this.endDate = params.year + '-' + params.month + '-' + day;
-				this.getChargeList(true);
-				this.show = false;
-			},
-			cancelTime() {
-				this.show = false;
-			},
-			getChargeList(bl) {
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				if (bl) {
-					this.chargeList = [];
-					this.pageIndex = 1;
-				}
-				API.chargingRecordData({
-					pageIndex: this.pageIndex,
-					startDate: this.startDate,
-					endDate: this.endDate
-				}).then((res) => {
-					uni.hideLoading();
-					
-					this.chargeList = [
-						...this.chargeList,
-						...res.data.data
-					];
-					this.recordsTotal = res.data.recordsTotal;
-				}).catch(error => {
-					uni.showToast({
-						title: error,
-						icon: "none"
-					})
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.carNone{
-		display: flex;
-		flex-direction: column;
-		justify-content: center;
-		align-items: center;
-		img{
-			width: 100%;
-			height: 100%;
-		}
-		p{
-			margin-top: -60px;
-		}
-	}
-	.recordTime{
-		height: 44px;
-		background-color: #fff;
-		border-bottom: 1px solid #F2F2F2;
-		display: flex;
-		align-items: center;
-		padding: 0 16px;
-		p{
-			margin-right: 4px;
-		}
-	}
-	.recordList{
-		background-color: #fff;
-	}
-	.recordList-item{
-		background-color: #fff;
-		border-bottom: 1px solid #ededed;
-		margin-left: 16px;
-		padding: 16px 16px 16px 0;
-		.recordList-name{
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			margin-bottom: 12px;
-			h4{
-				font-weight: normal;
-				font-size: 15px;
-				overflow: hidden;
-				width: 75%;
-				text-overflow: ellipsis;
-				white-space: nowrap;
-			}
-			.state1{
-				color:#8161FF;
-			}
-			.state2{
-				color:#00B962;
-			}
-			.state3{
-				color:#666666;
-			}
-		}
-		.recordList-row{
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			margin-top: 8px;
-			p{
-				font-size: 12px;
-				color:#888;
-			}
-			h4{
-				font-size: 16px;
-			}
-		}
-	}
-</style>
+<template>
+	<view>
+		<ujp-navbar title="充电订单"></ujp-navbar>
+		
+		<view class="record">
+			<view class="recordTime oldTextjp2" oldstyle="font-size: 18px;" @click="show = true">
+				<u-picker mode="time" v-model="show" :params="params" :default-time="endDate" @confirm="confirmTime" @cancel="cancelTime"></u-picker>
+				<p>{{month}}月</p>
+				<u-icon name="arrow-down-s-fill" custom-prefix="custom-icon" color="#B3B3B3" size="32"></u-icon>
+			</view>
+			<view class="carNone" v-if="chargeList.length == 0">
+				<img src="@/assets/static/img/暂无数据-缺省页.png" alt="">
+				<p class="oldTextjp2" oldstyle="font-size: 18px;">暂无充电订单</p>
+			</view>
+			<view class="recordList" v-if="chargeList.length > 0">
+				<view class="recordList-item" v-for="(item,index) in chargeList" :key="item.id" @click="toUrl(item)">
+					<view class="recordList-name">
+						<h4 class="oldTextjp" oldstyle="font-size: 20px;">{{item.stationName}}/{{item.deviceName}}</h4>
+						<span class="state1" :style="{color : textColor(item),fontSize: textFontSize()}">{{item.statusText}}</span>
+					</view>
+					<view class="recordList-row">
+						<p :style="elderStatus ? 'font-size: 14px' : ''">结束时间：{{item.status == '0' ? '暂未开始' : item.endTime}}</p>
+					</view>
+					<view class="recordList-row">
+						<p :style="elderStatus ? 'font-size: 14px' : ''">充电电量：{{item.electricQuantity != null ? item.electricQuantity/10000 : '0.000'}}度</p>
+					</view>
+					<view class="recordList-row">
+						<p :style="elderStatus ? 'font-size: 14px' : ''">充电时长：{{item.chargingMinute != null ? getPercent(item.chargingMinute): '0秒'}}</p>
+						<h4 class="oldTextjp2" oldstyle="font-size: 28px;">{{item.actualFee != null ? item.actualFee.toFixed(2) : '0.00'}}元</h4>
+					</view>
+				</view>
+			</view>
+		</view>
+		<u-divider  v-if="chargeList.length == recordsTotal && recordsTotal != 0" style="margin-top: 10px;background-color: #F2F4F4;">已经到底了</u-divider>
+	</view>
+</template>
+
+<script>
+	import * as API from '@/apis/index.js'
+	
+	export default {
+		data() {
+			return {
+				params: {
+					year: true,
+					month: true,
+					day: false,
+					hour: false,
+					minute: false,
+					second: false,
+					timestamp: true,
+				},
+				show: false,
+				month: '',
+				startDate: '',
+				endDate: '',
+				chargeList: [],
+				pageIndex: 1,
+				recordsTotal: 0,
+				elderStatus: false,
+			}
+		},
+		onReady() {
+			var date = new Date();
+			this.month = date.getMonth() + 1;
+			
+			var year = date.getFullYear();
+			var day = new Date(year, this.month, 0).getDate();
+			var monthN = this.month;
+			if(monthN >= 1 && monthN <= 9) {
+				monthN = "0" + monthN;
+			}
+			
+			this.startDate = year + '-' + monthN + '-' + '01';
+			this.endDate = year + '-' + monthN + '-' + day;
+					
+			this.getChargeList();
+			
+			if(this.carhelp.get("getElderModeClass") == "长辈模式") {
+				this.elderStatus = true;
+			} else {
+				this.elderStatus = false;
+			}
+		},
+		onReachBottom() {
+			if (this.chargeList.length < this.recordsTotal) {			
+				this.myLoadmore();
+			}
+		},
+		methods: {
+			getPercent(estimateMinute) {
+				var value="";
+				 
+				var ms =estimateMinute
+				if (ms > 0) {
+					var Hour = parseInt(Math.floor(ms / 60 ));
+					var Fen = parseInt(Math.floor(ms % 60 ));	
+				//	value = Hour + "小时"  + Fen+"分钟"
+					if(Hour){
+						value += Hour + "小时" 
+					}
+						
+					if(Fen){
+						value += Fen+"分钟"
+					}
+				}
+			
+				return value;
+			},
+			toUrl(item) {
+				if(item.status == '1') {
+					uni.navigateTo({
+						url: '/pages/searchPile/chargeProcess/dcCharging?id=' + item.id
+					})
+				} else if (item.status == '4') {
+					uni.navigateTo({
+						url: '/pages/searchPile/chargeProcess/dcCharging?id=' + item.id
+					})
+				} else {
+					uni.navigateTo({
+						url: '/pages/record/details?id=' + item.id
+					})
+				}	
+			},
+			myLoadmore() {
+				this.pageIndex += 1;
+				this.getChargeList()
+			},
+			textColor(item) {
+				switch (item.status) {
+					case '1':
+						return '#00B962'
+						break;
+					case '2':
+						return '#666666'
+						break;
+					case '4':
+						return '#8161FF'
+						break;
+				}
+			},
+			textFontSize() {
+				if(this.elderStatus) {
+						return '40rpx'
+				}
+			},
+			confirmTime(params) {
+				if(params.month.slice(0,1) == '0') {
+					this.month = params.month.slice(1);
+				} else {
+					this.month = params.month;
+				}
+				
+				this.startDate = params.year + '-' + params.month + '-' + '01';
+				var day = new Date(params.year, params.month, 0).getDate();
+				this.endDate = params.year + '-' + params.month + '-' + day;
+				this.getChargeList(true);
+				this.show = false;
+			},
+			cancelTime() {
+				this.show = false;
+			},
+			getChargeList(bl) {
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				if (bl) {
+					this.chargeList = [];
+					this.pageIndex = 1;
+				}
+				API.chargingRecordData({
+					pageIndex: this.pageIndex,
+					startDate: this.startDate,
+					endDate: this.endDate
+				}).then((res) => {
+					uni.hideLoading();
+					
+					this.chargeList = [
+						...this.chargeList,
+						...res.data.data
+					];
+					this.recordsTotal = res.data.recordsTotal;
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.carNone{
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		img{
+			width: 100%;
+			height: 100%;
+		}
+		p{
+			margin-top: -60px;
+		}
+	}
+	.recordTime{
+		height: 44px;
+		background-color: #fff;
+		border-bottom: 1px solid #F2F2F2;
+		display: flex;
+		align-items: center;
+		padding: 0 16px;
+		p{
+			margin-right: 4px;
+		}
+	}
+	.recordList{
+		background-color: #fff;
+	}
+	.recordList-item{
+		background-color: #fff;
+		border-bottom: 1px solid #ededed;
+		margin-left: 16px;
+		padding: 16px 16px 16px 0;
+		.recordList-name{
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			margin-bottom: 12px;
+			h4{
+				font-weight: normal;
+				font-size: 15px;
+				overflow: hidden;
+				width: 75%;
+				text-overflow: ellipsis;
+				white-space: nowrap;
+			}
+			.state1{
+				color:#8161FF;
+			}
+			.state2{
+				color:#00B962;
+			}
+			.state3{
+				color:#666666;
+			}
+		}
+		.recordList-row{
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			margin-top: 8px;
+			p{
+				font-size: 12px;
+				color:#888;
+			}
+			h4{
+				font-size: 16px;
+			}
+		}
+	}
+</style>

pages/search/search.vue

@@ -1,773 +1,773 @@
-
-<template>
-	<view>
-		<ujp-navbar title="" ref='navbar' id='navbar' :height='nav_height'> 
-			<u-search id='search' ref='search'   :input-style='inputStyle'  placeholder="查询站点地址或站名" @change="search()" v-model="keyword" color="#c8c8c8" @search="search" @click="search" @clickicon='back' @custom='search'></u-search>		 
-		</ujp-navbar>
-		<view class="recommend">推荐充电站</view>
-	<view class="carNone" v-if="stationslist.length == 0">
-		<img src="static/img/暂无数据-缺省页.png" alt="">
-		<p class="oldTextjp2" oldstyle="font-size: 18px;">暂无可用充电站</p>
-		
-	</view>
-	
-	  <view v-for="(item,index) in stationslist" :key="item.id" class="charing-slow"   @click="stationDetail(item)">
-		
-		
-		
-			<view class="address">
-				<view class="name oldTextjp" oldstyle="font-size: 20px;">
-					{{item.name}}
-				</view>
-				<view class="distance " oldstyle="font-size: 16px;" v-if="item.distance != '99999999'">
-					<text class="iconfont" style="color:#666666">&#xe615;</text>
-					{{item.distance!=null && item.distance>0.1 ? item.distance.toFixed(1)+'公里' : '小于100米'}}
-				</view>
-				<view class="distance " oldstyle="font-size: 16px;" v-else>
-					<text class="iconfont" style="color:#666666">&#xe615;</text>
-					暂无定位
-				</view>
-			</view>
-			<view class="sign" >
-				{{item.address}}
-			</view>
-			<view class="sign" >
-				<view class="sign-1" v-if="item.giveDiscount&&item.discountRatio&&item.discountRatio!=100">会员{{discountRatio10(item.discountRatio)}}折</view>
-				<view class="sign-3" v-if="item.category=='超充'">160kW超充站</view>
-				<view class="sign-4" v-if="item.nightLowPriceEnabled">夜间超低价</view>
-					<view class="sign-2" v-if="item.platformType==1">自营站</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 price-freeList">
-			<view class="price"  v-if="personInfo&&personInfo.userType==2">
-				<view class="price-1">
-					<text class="num">{{!item.giveDiscount ? (item.electricityPrice+item.servicePrice).toFixed(2)
-					: (item.electricityPrice+item.discountServicePrice).toFixed(2)}}</text>
-					<text class="unit " oldstyle="font-size: 14px;">
-						元/度
-					</text>
-				</view>
-				<view class="price-2 " 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="price" v-else>
-				<view class="price-1">
-					<text class="num">
-						{{(item.electricityPrice+item.servicePrice).toFixed(2)}}</text>
-					<text class="unit " oldstyle="font-size: 48rpx;">元/度</text>
-				</view>
-				<view class="price-3 " oldstyle="font-size: 48rpx;" v-if="item.giveDiscount">
-					<text class="num1">会员</text>
-					<text class="num">{{ (item.electricityPrice+item.discountServicePrice).toFixed(2)}}</text>
-					<text class="unit ">元/度</text>
-				</view>
-			</view>
-			
-				<view class="free"  >
-					
-				<view class="fast" v-if="item.fastNum">
-					<view class="fast-font">
-						快
-					</view>
-					<view class="num">
-						{{item.fastAvailableNum}}/{{item.fastNum}}
-					</view>
-				</view>
-				<view class="slow" v-if="item.slowNum">
-					<view class="slow-font">
-						慢
-					</view>
-					<view class="num">
-						{{item.slowAvailableNum}}/{{item.slowNum}}
-					</view>
-				</view>
-			</view>
-		</view>
-							
-	
-		
-	
-	</view>
-			<u-divider margin-top="20" bg-color="#F2F4F4" v-if="stationslist.length == recordsTotal">已经到底了</u-divider>
-			
-	</view>
-</template>
-
-<script>
-	let _self; 
-	import * as API from '@/apis/site.js';
-	import * as WxJsApi from '@/utils/wxJsApi.js'
-	import MapLoader from '@/utils/AMap'
-	export default {
-		
-		data() {
-			
-			return {
-				elderMode:false,
-				inputStyle:{
-					backgroundColor: 'transparent',
-					"font-size":'32rpx',
-				
-				},
-				pageIndex:1,
-				recordsTotal: 0,
-				nav_height:54,
-				personInfo:{},
-				userId:'',
-				keyword:'',
-			  stationslist:[],
-			  stations:[
-/*					{name:'荆鹏软件园充电站',position:'湖北省荆州市沙市区江津东路附155号',price:1.2,idleNum:10,total:10,distance:0.1,time:1,type:'慢充',park:'2小时免费停车'},
-					{name:'荆鹏软件园充电站2',position:'湖北省荆州市沙市区江津东路附156号',price:1.2,idleNum:10,total:10,distance:0.15,time:12,type:'快充',park:'3小时免费停车'},
-					{name:'荆鹏软件园充电站3',position:'湖北省荆州市沙市区江津东路附157号',price:1.2,idleNum:10,total:10,distance:0.2,time:13,type:'慢充',park:'4小时免费停车'},
-					{name:'荆鹏大道求助站充电站',position:'湖北省荆州市沙市区江津东路附158号',price:1.2,idleNum:10,total:10,distance:0.3,time:14,type:'快充',park:'5小时免费停车'},
-	*/			
-				],
-			}
-		},
-		onLoad(op){
-			_self = this;
-			
-			//var px1 = uni.upx2px(88);
-			
-			//var rpx = 40/(uni.upx2px(100)/100);			 
-			// 验证上面rpx的值
-			var px = uni.upx2px(88); 
-			this.nav_height = px;
-			
-			
- 			// //('搜索框高度'+JSON.stringify(rpx))
-			// //('搜索框高度'+JSON.stringify(px))
-			/*
-			if(op!= null && op.stationlist != null){
-				this.stations = decodeURIComponent(op.stationlist)
-				//('stations'+JSON.stringify(this.stations))
-			}
-			//('op'+JSON.stringify(op))*/
-		},
-		onReady() {
-			this.elderMode = this.carhelp.get('getElderModeClass')  == '长辈模式';
-			if(this.elderMode)
-				this.theme('elder')
-			else
-				this.theme('standard')
-				
-			 if (this.carhelp.getPersonInfo()) {
-			 	this.userId = this.carhelp.getPersonInfo().id;
-			 	this.personInfo=this.carhelp.getPersonInfo();
-			 } 
-			 WxJsApi.getWxConfig(['getLocation','openLocation', 'addEventListener']).then((res)=>{
-			 
-				
-			 }).catch(error => {
-					
-			 })
-			this.getPoint();
-		},
-		onReachBottom() {
-			if (this.stationslist.length < this.recordsTotal) {			
-				this.myLoadmore();
-			}
-		},
-		 // conponents:{charingSlows},
-		methods: { 
-			theme(type) {
-			  if(type == 'elder')	
-			  {
-				document.getElementsByTagName('body')[0].setAttribute('data-theme',type);
-				 let data = {
-				 	backgroundColor: 'transparent',
-				 	"font-size":'32rpx',
-				 	
-				 };
-				 this.inputStyle = data;
-			  }
-			  else
-			  {
-				document.getElementsByTagName('body')[0].setAttribute('data-theme',type);
-				  let data  ={
-				  	backgroundColor: 'transparent',
-				  	"font-size":'32rpx',
-				 
-				  };
-				  this.inputStyle = data;
-			  } 
-			},
-			navigateTo(item){
-				 
-				 uni.showLoading({
-				 	
-				 })
-				 WxJsApi.openLocation({
-				     latitude:parseFloat( item.latitude),//目的地latitude
-				     longitude:parseFloat( item.longitude),//目的地longitude
-				     name: item.name,
-				     address: item.address,
-				     scale: 15,//地图缩放大小，可根据情况具体调整
-				 	success(res) {
-				 			uni.hideLoading()
-				 	},
-				 	complete() {
-				 		//	uni.hideLoading()
-				 	}
-				 });
-				//window.location.href="https://uri.amap.com/marker?position="+ item.longitude+","+item.latitude+"&name="+item.name;
-				 
-			},
-			stationDetail(item){
-				 
-				//('stationDetail item'+JSON.stringify(item))
-				uni.navigateTo({
-					url:'../searchPile/stationAndPile/stationDetails?id='+item.id
-				})
-					/*
-				uni.navigateTo({
-					url:'stationAndPile/stationDetails?station='+encodeURIComponent(JSON.stringify(item))
-				})
-				*/
-	//			//('stationDetail'+JSON.stringify(item))
-			},
-			calculateDistance(startLngLat,obj){
-				var _this = this;
-				var endLngLat = [obj.longitude,obj.latitude];
-				MapLoader().then(AMap1 => {
-					
-					this.AMap=AMap;
-					
-					var lnglat = new AMap.LngLat(startLngLat.longitude,startLngLat.latitude);
-					var myDistance = lnglat.distance([obj.longitude, obj.latitude]);
-					obj.distance = myDistance/1000;
-					obj.time = myDistance/500;
-				
-				
-				}, e => {
-					//_this.mui.toast('地图加载失败');
-					//('地图加载失败', e)
-				})
-			},
-			getPoint() {
-				var _this = this;
-				//('getPoint')
-				this.getChargingStationData(true);
-				
-				WxJsApi.getLocation().then((res) => {
-					
-					var latitude = parseFloat(res.latitude);
-					var longitude = parseFloat(res.longitude);
-					_this.latitude = latitude;
-					_this.longitude = longitude;
-					
-					this.getChargingStationData(true);
-					
-				
-				}).catch(error => {
-					
-					uni.showToast({
-						title:JSON.stringify(error)
-					})					
-				})
-			},
-			myLoadmore() {
-				this.pageIndex += 1;
-				this.getChargingStationData()
-			},
-			getChargingStationData(bl){ 
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				if (bl) {
-					this.stationslist = [];
-					this.pageIndex = 1;
-				}
-				var data = {
-					pageIndex: this.pageIndex,
-					pageSize:20,
-					raidus:200,
-					 stationName:this.keyword,
-					 findType: 0,
-					
-				};
-				if(this.longitude&&this.latitude){
-					data.longitude=this.longitude;
-					data.latitude=this.latitude;
-				}
-				if (this.carhelp.getPersonInfo()) {
-						data.openId=this.carhelp.getOpenId()
-				}
-				data.raidus=200
-				API.getChargingStationData(data).then((response) => {
-					if (bl) {
-						this.stationslist = [];
-						this.pageIndex = 1;
-					}
-					console.log(response)
-					var stationDataList=response.data.data
-					if(this.longitude&&this.latitude){
-						MapLoader().then(AMap1 => {
-							for(var i in stationDataList){
-								var item=stationDataList[i]
-								
-									var lnglat = new AMap.LngLat(this.longitude,this.latitude);
-									var myDistance = lnglat.distance([item.longitude,item.latitude]);
-									item.distance = myDistance/1000;
-								
-								
-							}
-						})
-					}
-				
-					
-					this.stationslist = [
-						...this.stationslist,
-						...stationDataList
-					];
-					this.recordsTotal = response.data.recordsTotal;
-					//this.detail=response.data.monthlyRentCard
-					uni.hideLoading()
-				}).catch(error => {
-					uni.showToast({
-						title: error
-					})
-				})
-			},	
-			back(){
-				//('back');
-				uni.navigateBack({
-					delta:1
-				})
-			},
-			search(){
-				//('search keyword'+this.keyword + ' '+JSON.stringify(this.stations))
-				 this.getChargingStationData(true)
-				
-				//('search ' + this.keyword);
-				
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped> 
-	@import "@/_theme.scss";
-	
-	/deep/.u-content[data-v-1a326067] {
-		flex: 0.95;
-		color: #bdbdbd;
-	}
-
-	/deep/.u-action {
-		margin-right: 0rpx;
-		color: #c8c8c8;
-	}
-
-	.recommend {
-		width: 100%;
-		height: 88rpx;
-		line-height: 88rpx;
-		color: #101010;
-		padding: 0 32rpx;
-		background-color: #fff;
-		font-weight: 600;
-	}
-
- .charing-slow-2{
-	 margin: 0 0 10px 0 !important;
-	 // border-bottom: 1px solid rgba(238, 242, 240, 100);
-	 
- }
- .charing-slow {
- 	background-color: #fff;
-	margin: 36rpx;
-	border-radius: 16rpx;
- 	padding: 40rpx 24rpx 24rpx;
- 	position: relative;
- 	left: 0;
- 	right: 0;
-}
-.fast-charge {
-		display: inline-block;
-		border-radius: 50px;
-		border-radius: 4px;
-		background-color: rgba(208, 209, 255, 100);
-		color: rgba(56, 60, 255, 100);
-
-		margin: auto 0;
-		@include themeify{
-			width: themed('font-size18');
-			font-size: themed('font-size2');
- 			line-height: themed('font-size7');
-			height: themed('font-size8');
-		}
-		text-align: center;
-	}
-	
-	.fast-trickle-charge {
-		display: inline-block;
-	     margin: auto 0;
-		border-radius: 4px;
-		background-color: rgba(172, 236, 240, 100);
-		color: rgba(0, 124, 134, 100);
-		@include themeify{
-			width: themed('font-size18');
-			font-size: themed('font-size2');
-			line-height: themed('font-size7');
-			height: themed('font-size8');
-		}
-		text-align: center;
-	}
-	.trickle-charge {
-		display: inline-block;
-	border-radius: 4px;
-	margin: auto 0;
-		
-		background-color: rgba(186, 240, 215, 100);
-		color: rgba(0, 130, 69, 100);
-		@include themeify{
-			width: themed('font-size18');			
-			font-size: themed('font-size2');
-			line-height: themed('font-size7');
-			height: themed('font-size8');
-		}
-		text-align: center;
-	}
-  
- 	.station-items {
- 		display: inline-block;
-/* 		height: 16px;
- 		line-height: 16px;*/
-		@include themeify{
-			font-size: themed('font-size3');
-			font-weight: themed('fontWeight');
-			line-height: themed('font-size3');
-			height: themed('font-size3');
-		}
-
- 		margin-left: 8rpx;
- 		color: #101010;
- 
- 
- 	}
-	//
-	
- 	.address {
-		width: 100%;
-		line-height: 20px;
-		display: flex;
-		justify-content: space-between;
-		.name{
-			font-size: 16px;
-			white-space: nowrap;
-			overflow: hidden;
-			text-overflow: ellipsis;
-		}
-		.distance{
-			color: rgba(102, 102, 102, 100);
-			font-size: 12px;
-			text-align: right;
-			    width: 100px;
-			.iconfont{
-				font-size: 12px;
-				margin-right: 2px;
-			}
-		}
-		
-		@include themeify{
-			font-size: themed('font-size5');
-			line-height: themed('font-size7');
-		}
-/* 		font-size: 11px;*/
-font-weight: 600;
- 		color: #101010;
- 	}
-	
- .price-free{
-	 width: 100%;
-	 display: flex;
-	 align-items: center;
-	 justify-content: space-between;
-	
- }
- 	.price {
- 		display: flex;
-		align-items: baseline;
-		line-height: 40rpx;
-		.price-3 {
-			font-size: 24rpx;
-			color: #fff;
-			margin-left: 8rpx;
-			padding-right: 9rpx;
-			 background:#00B962 ;
-			 border-radius: 8rpx;
-			.num1{
-				 padding-left:  12rpx;
-				border-radius: 8rpx 0 8rpx 8rpx;
-				 padding-right: 18rpx;
-				 background: #121212;
-				 -webkit-clip-path: polygon(0 0, 93% 0, 84% 100%, 0% 100%);
-				 clip-path:  polygon(0 0, 93% 0, 84% 100%, 0% 100%);
-				 
-			}
-			 
-		}
-		.price-1{
-		
-			
-			.num {
-			
-			 	color: rgba(255, 98, 0, 100);
-			 
-			
-				     font-size: 44rpx;
-				     height: 44rpx;
-			 	text-align: left;
-			 	font-family: Roboto-medium;
-			 }
-			 .unit {
-					// font-size: 12px;
-			  	color: rgba(102, 102, 102, 100);
-			 	@include themeify{
-			 			// font-size: themed('font-size2');
-						font-size: 24rpx;
-						
-			 			height: themed('font-size2');
-			 			
-			 	}
-			
-			  	text-align: left;
-			  	font-family: AlibabaPuHui-regular;
-			  	
-			  	margin-left: 8rpx;
-			  }
-		}
-        .price-2{
-        	color: rgba(153, 153, 153, 100);
-        	margin-left: 6rpx;
-        	text-decoration: line-through;
-			font-size: 24rpx
-        }
- 	}
- 
- .free{
- 	display: flex;
-     align-items: center;
- 	.slow,.fast{
- 		display: flex;
-		.sp-font{
-			width: 40rpx;
-			height: 40rpx;
-			line-height: 40rpx;
-			border-radius: 4px;
-			background-color: #7a68f6;
-			color: #fff;
-			font-size: 28rpx;
-			text-align: center;
-			margin-right: 2rpx;
-		}
- 		.fast-font{
- 			width: 40rpx;
- 			height: 40rpx;
- 			line-height: 40rpx;
- 			border-radius: 4px;
- 			// background-color: rgba(186, 240, 215, 100);
- 			// color: rgba(0, 130, 69, 100);
-			background-color: #1677FF;
-			color: rgba(255, 255, 255, 1);
- 			font-size: 28rpx;
- 			text-align: center;
- 			margin-right: 2rpx;
- 		}
- 		.slow-font{
- 			width: 40rpx;
- 			height: 40rpx;
- 			line-height: 40rpx;
- 			border-radius: 4px;
- 			// background-color: rgba(226, 226, 226, 100);
- 			// color: rgba(128, 128, 128, 100);
-			background-color: #00B962;
-			color: rgba(255, 255, 255, 1);
- 			font-size: 28rpx;
- 			text-align: center;
- 			margin-right: 2rpx;
- 		}
- 		.num {
- 			font-size: 32rpx;
- 			color: #666;
- 			line-height: 40rpx;
- 		}
- 		.num1 {
- 			font-size: 32rpx;
- 			color: #bbb;
- 			line-height: 40rpx;
- 		}
- 	}
- 	.slow{
- 		margin-left: 16rpx;
- 	}
- }
- 
-  
- 
- 	.park {
- 		margin-top: 16rpx;
- 		display: flex;
- 
- 		
- 
- 		
- 	}
-	.park-p {
-		display: inline-block;
-		width: 20px;
-/*		height: 18px;
-		line-height: 12px;*/
-		@include themeify{
-			line-height: themed('font-size1');
-			height: themed('font-size4');
-		}
-		text-align: center;
-		// background-color: rgba(125, 177, 255, 100);
-		background-color: #00b962;
-		color: #fff;
-	}
-	.park-text {
-		display: inline-block;
-		color: rgba(102, 102, 102, 100);
-		@include themeify{
-			font-size: themed('font-size1');
-			height:themed('font-size4');
-		}
-/*		font-size: 12px;*/
-		text-align: left;
-		margin-left: 4px;
-		margin-top: 2px;
-	}
-	
-	 .map {
-		width: 100%;
-	 
-		height: 100%;
-		position: relative;
-	}
-	#container {
-	  width: 100%;
-	  height: 100%;
-	}
- 	
-
-	
-	.distance-font {
-		@include themeify{
-				font-size: themed('font-size3');
-		}
-/*		font-size: 16px*/
-	}
-	
-	.position{
-		color: #1677ff;
-		@include themeify{
-				font-size: themed('font-size2');
-		}
-/*		font-size: 14px*/
-	}
-	.position-box{
-		position:absolute;
-		top: 341px;
-		right: 118px;
-		width: 16px;
-		height: 16px;
-		/* line-height: 20px; */
-		background-color: rgba(22, 119, 255, 100);
-		text-align: center;
-		box-shadow: 0px 0px 8px 0px rgba(0, 0, 0, 0.4);
-		border: 2px solid rgba(255, 255, 255, 100);
-		border-radius: 999px;
-	}
-	.min-h{
-		min-height: 65px;
-	}
-	.sign{
-		display: flex;
-		flex-wrap: wrap;
-		margin-top: 10px;
-		
-		.sign-1{
-			height: 20px;
-			line-height: 20px;
-			border-radius: 4px;
-			background-color: rgba(255, 255, 255, 100);
-			color: rgba(255, 139, 0, 100);
-			font-size: 12px;
-			text-align: center;
-			border: 1px solid rgba(255, 139, 0, 100);
-			padding: 0 4px;
-			margin-right: 8px;
-			margin-bottom: 4px;
-		}
-		.sign-2{
-			height: 20px;
-			line-height: 20px;
-			border-radius: 4px;
-			background-color: rgba(255, 255, 255, 100);
-			color: rgba(153, 153, 153, 100);
-			font-size: 12px;
-			text-align: center;
-			border: 1px solid rgba(204, 204, 204, 100);
-			padding: 0 4px;
-			margin-right: 8px;
-			margin-bottom: 4px;
-		}
-		.sign-3{
-			line-height: 40rpx;
-			border-radius: 8rpx;
-			background-color: rgba(255, 255, 255, 100);
-			color: #8161FF ;
-			font-size: 24rpx;
-			text-align: center;
-			border: 1px solid  #8161FF;
-			padding: 0 8rpx;
-			margin-right: 16rpx;
-			margin-bottom: 8rpx;
-		}
-		.sign-4{
-			line-height: 40rpx;
-			border-radius: 8rpx;
-			background-color: rgba(255, 255, 255, 100);
-			color: #00B962  ;
-			font-size: 24rpx;
-			text-align: center;
-			border: 1px solid #00B962 ;
-			padding: 0 8rpx;
-			margin-right: 16rpx;
-			margin-bottom: 8rpx;
-		}
-	}
-	
-		.park-text2 {
-			    width: 140%;
-			}
-			.park-text3 {
-				    white-space: nowrap;
-				 
-				 
-				    text-overflow: ellipsis;
-				    overflow: hidden;
-				}
-				.carNone{
-					display: flex;
-					flex-direction: column;
-					justify-content: center;
-					align-items: center;
-					img{
-						width: 100%;
-						height: 100%;
-					}
-					p{
-						margin-top: -60px;
-					}
-				}
-</style>
+
+<template>
+	<view>
+		<ujp-navbar title="" ref='navbar' id='navbar' :height='nav_height'> 
+			<u-search id='search' ref='search'   :input-style='inputStyle'  placeholder="查询站点地址或站名" @change="search()" v-model="keyword" color="#c8c8c8" @search="search" @click="search" @clickicon='back' @custom='search'></u-search>		 
+		</ujp-navbar>
+		<view class="recommend">推荐充电站</view>
+	<view class="carNone" v-if="stationslist.length == 0">
+		<img src="@/assets/static/img/暂无数据-缺省页.png" alt="">
+		<p class="oldTextjp2" oldstyle="font-size: 18px;">暂无可用充电站</p>
+		
+	</view>
+	
+	  <view v-for="(item,index) in stationslist" :key="item.id" class="charing-slow"   @click="stationDetail(item)">
+		
+		
+		
+			<view class="address">
+				<view class="name oldTextjp" oldstyle="font-size: 20px;">
+					{{item.name}}
+				</view>
+				<view class="distance " oldstyle="font-size: 16px;" v-if="item.distance != '99999999'">
+					<text class="iconfont" style="color:#666666">&#xe615;</text>
+					{{item.distance!=null && item.distance>0.1 ? item.distance.toFixed(1)+'公里' : '小于100米'}}
+				</view>
+				<view class="distance " oldstyle="font-size: 16px;" v-else>
+					<text class="iconfont" style="color:#666666">&#xe615;</text>
+					暂无定位
+				</view>
+			</view>
+			<view class="sign" >
+				{{item.address}}
+			</view>
+			<view class="sign" >
+				<view class="sign-1" v-if="item.giveDiscount&&item.discountRatio&&item.discountRatio!=100">会员{{discountRatio10(item.discountRatio)}}折</view>
+				<view class="sign-3" v-if="item.category=='超充'">160kW超充站</view>
+				<view class="sign-4" v-if="item.nightLowPriceEnabled">夜间超低价</view>
+					<view class="sign-2" v-if="item.platformType==1">自营站</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 price-freeList">
+			<view class="price"  v-if="personInfo&&personInfo.userType==2">
+				<view class="price-1">
+					<text class="num">{{!item.giveDiscount ? (item.electricityPrice+item.servicePrice).toFixed(2)
+					: (item.electricityPrice+item.discountServicePrice).toFixed(2)}}</text>
+					<text class="unit " oldstyle="font-size: 14px;">
+						元/度
+					</text>
+				</view>
+				<view class="price-2 " 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="price" v-else>
+				<view class="price-1">
+					<text class="num">
+						{{(item.electricityPrice+item.servicePrice).toFixed(2)}}</text>
+					<text class="unit " oldstyle="font-size: 48rpx;">元/度</text>
+				</view>
+				<view class="price-3 " oldstyle="font-size: 48rpx;" v-if="item.giveDiscount">
+					<text class="num1">会员</text>
+					<text class="num">{{ (item.electricityPrice+item.discountServicePrice).toFixed(2)}}</text>
+					<text class="unit ">元/度</text>
+				</view>
+			</view>
+			
+				<view class="free"  >
+					
+				<view class="fast" v-if="item.fastNum">
+					<view class="fast-font">
+						快
+					</view>
+					<view class="num">
+						{{item.fastAvailableNum}}/{{item.fastNum}}
+					</view>
+				</view>
+				<view class="slow" v-if="item.slowNum">
+					<view class="slow-font">
+						慢
+					</view>
+					<view class="num">
+						{{item.slowAvailableNum}}/{{item.slowNum}}
+					</view>
+				</view>
+			</view>
+		</view>
+							
+	
+		
+	
+	</view>
+			<u-divider margin-top="20" bg-color="#F2F4F4" v-if="stationslist.length == recordsTotal">已经到底了</u-divider>
+			
+	</view>
+</template>
+
+<script>
+	let _self; 
+	import * as API from '@/apis/site.js';
+	import * as WxJsApi from '@/utils/wxJsApi.js'
+	import MapLoader from '@/utils/AMap'
+	export default {
+		
+		data() {
+			
+			return {
+				elderMode:false,
+				inputStyle:{
+					backgroundColor: 'transparent',
+					"font-size":'32rpx',
+				
+				},
+				pageIndex:1,
+				recordsTotal: 0,
+				nav_height:54,
+				personInfo:{},
+				userId:'',
+				keyword:'',
+			  stationslist:[],
+			  stations:[
+/*					{name:'荆鹏软件园充电站',position:'湖北省荆州市沙市区江津东路附155号',price:1.2,idleNum:10,total:10,distance:0.1,time:1,type:'慢充',park:'2小时免费停车'},
+					{name:'荆鹏软件园充电站2',position:'湖北省荆州市沙市区江津东路附156号',price:1.2,idleNum:10,total:10,distance:0.15,time:12,type:'快充',park:'3小时免费停车'},
+					{name:'荆鹏软件园充电站3',position:'湖北省荆州市沙市区江津东路附157号',price:1.2,idleNum:10,total:10,distance:0.2,time:13,type:'慢充',park:'4小时免费停车'},
+					{name:'荆鹏大道求助站充电站',position:'湖北省荆州市沙市区江津东路附158号',price:1.2,idleNum:10,total:10,distance:0.3,time:14,type:'快充',park:'5小时免费停车'},
+	*/			
+				],
+			}
+		},
+		onLoad(op){
+			_self = this;
+			
+			//var px1 = uni.upx2px(88);
+			
+			//var rpx = 40/(uni.upx2px(100)/100);			 
+			// 验证上面rpx的值
+			var px = uni.upx2px(88); 
+			this.nav_height = px;
+			
+			
+ 			// //('搜索框高度'+JSON.stringify(rpx))
+			// //('搜索框高度'+JSON.stringify(px))
+			/*
+			if(op!= null && op.stationlist != null){
+				this.stations = decodeURIComponent(op.stationlist)
+				//('stations'+JSON.stringify(this.stations))
+			}
+			//('op'+JSON.stringify(op))*/
+		},
+		onReady() {
+			this.elderMode = this.carhelp.get('getElderModeClass')  == '长辈模式';
+			if(this.elderMode)
+				this.theme('elder')
+			else
+				this.theme('standard')
+				
+			 if (this.carhelp.getPersonInfo()) {
+			 	this.userId = this.carhelp.getPersonInfo().id;
+			 	this.personInfo=this.carhelp.getPersonInfo();
+			 } 
+			 WxJsApi.getWxConfig(['getLocation','openLocation', 'addEventListener']).then((res)=>{
+			 
+				
+			 }).catch(error => {
+					
+			 })
+			this.getPoint();
+		},
+		onReachBottom() {
+			if (this.stationslist.length < this.recordsTotal) {			
+				this.myLoadmore();
+			}
+		},
+		 // conponents:{charingSlows},
+		methods: { 
+			theme(type) {
+			  if(type == 'elder')	
+			  {
+				document.getElementsByTagName('body')[0].setAttribute('data-theme',type);
+				 let data = {
+				 	backgroundColor: 'transparent',
+				 	"font-size":'32rpx',
+				 	
+				 };
+				 this.inputStyle = data;
+			  }
+			  else
+			  {
+				document.getElementsByTagName('body')[0].setAttribute('data-theme',type);
+				  let data  ={
+				  	backgroundColor: 'transparent',
+				  	"font-size":'32rpx',
+				 
+				  };
+				  this.inputStyle = data;
+			  } 
+			},
+			navigateTo(item){
+				 
+				 uni.showLoading({
+				 	
+				 })
+				 WxJsApi.openLocation({
+				     latitude:parseFloat( item.latitude),//目的地latitude
+				     longitude:parseFloat( item.longitude),//目的地longitude
+				     name: item.name,
+				     address: item.address,
+				     scale: 15,//地图缩放大小，可根据情况具体调整
+				 	success(res) {
+				 			uni.hideLoading()
+				 	},
+				 	complete() {
+				 		//	uni.hideLoading()
+				 	}
+				 });
+				//window.location.href="https://uri.amap.com/marker?position="+ item.longitude+","+item.latitude+"&name="+item.name;
+				 
+			},
+			stationDetail(item){
+				 
+				//('stationDetail item'+JSON.stringify(item))
+				uni.navigateTo({
+					url:'../searchPile/stationAndPile/stationDetails?id='+item.id
+				})
+					/*
+				uni.navigateTo({
+					url:'stationAndPile/stationDetails?station='+encodeURIComponent(JSON.stringify(item))
+				})
+				*/
+	//			//('stationDetail'+JSON.stringify(item))
+			},
+			calculateDistance(startLngLat,obj){
+				var _this = this;
+				var endLngLat = [obj.longitude,obj.latitude];
+				MapLoader().then(AMap1 => {
+					
+					this.AMap=AMap;
+					
+					var lnglat = new AMap.LngLat(startLngLat.longitude,startLngLat.latitude);
+					var myDistance = lnglat.distance([obj.longitude, obj.latitude]);
+					obj.distance = myDistance/1000;
+					obj.time = myDistance/500;
+				
+				
+				}, e => {
+					//_this.mui.toast('地图加载失败');
+					//('地图加载失败', e)
+				})
+			},
+			getPoint() {
+				var _this = this;
+				//('getPoint')
+				this.getChargingStationData(true);
+				
+				WxJsApi.getLocation().then((res) => {
+					
+					var latitude = parseFloat(res.latitude);
+					var longitude = parseFloat(res.longitude);
+					_this.latitude = latitude;
+					_this.longitude = longitude;
+					
+					this.getChargingStationData(true);
+					
+				
+				}).catch(error => {
+					
+					uni.showToast({
+						title:JSON.stringify(error)
+					})					
+				})
+			},
+			myLoadmore() {
+				this.pageIndex += 1;
+				this.getChargingStationData()
+			},
+			getChargingStationData(bl){ 
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				if (bl) {
+					this.stationslist = [];
+					this.pageIndex = 1;
+				}
+				var data = {
+					pageIndex: this.pageIndex,
+					pageSize:20,
+					raidus:200,
+					 stationName:this.keyword,
+					 findType: 0,
+					
+				};
+				if(this.longitude&&this.latitude){
+					data.longitude=this.longitude;
+					data.latitude=this.latitude;
+				}
+				if (this.carhelp.getPersonInfo()) {
+						data.openId=this.carhelp.getOpenId()
+				}
+				data.raidus=200
+				API.getChargingStationData(data).then((response) => {
+					if (bl) {
+						this.stationslist = [];
+						this.pageIndex = 1;
+					}
+					console.log(response)
+					var stationDataList=response.data.data
+					if(this.longitude&&this.latitude){
+						MapLoader().then(AMap1 => {
+							for(var i in stationDataList){
+								var item=stationDataList[i]
+								
+									var lnglat = new AMap.LngLat(this.longitude,this.latitude);
+									var myDistance = lnglat.distance([item.longitude,item.latitude]);
+									item.distance = myDistance/1000;
+								
+								
+							}
+						})
+					}
+				
+					
+					this.stationslist = [
+						...this.stationslist,
+						...stationDataList
+					];
+					this.recordsTotal = response.data.recordsTotal;
+					//this.detail=response.data.monthlyRentCard
+					uni.hideLoading()
+				}).catch(error => {
+					uni.showToast({
+						title: error
+					})
+				})
+			},	
+			back(){
+				//('back');
+				uni.navigateBack({
+					delta:1
+				})
+			},
+			search(){
+				//('search keyword'+this.keyword + ' '+JSON.stringify(this.stations))
+				 this.getChargingStationData(true)
+				
+				//('search ' + this.keyword);
+				
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped> 
+	@import "@/_theme.scss";
+	
+	/deep/.u-content[data-v-1a326067] {
+		flex: 0.95;
+		color: #bdbdbd;
+	}
+
+	/deep/.u-action {
+		margin-right: 0rpx;
+		color: #c8c8c8;
+	}
+
+	.recommend {
+		width: 100%;
+		height: 88rpx;
+		line-height: 88rpx;
+		color: #101010;
+		padding: 0 32rpx;
+		background-color: #fff;
+		font-weight: 600;
+	}
+
+ .charing-slow-2{
+	 margin: 0 0 10px 0 !important;
+	 // border-bottom: 1px solid rgba(238, 242, 240, 100);
+	 
+ }
+ .charing-slow {
+ 	background-color: #fff;
+	margin: 36rpx;
+	border-radius: 16rpx;
+ 	padding: 40rpx 24rpx 24rpx;
+ 	position: relative;
+ 	left: 0;
+ 	right: 0;
+}
+.fast-charge {
+		display: inline-block;
+		border-radius: 50px;
+		border-radius: 4px;
+		background-color: rgba(208, 209, 255, 100);
+		color: rgba(56, 60, 255, 100);
+
+		margin: auto 0;
+		@include themeify{
+			width: themed('font-size18');
+			font-size: themed('font-size2');
+ 			line-height: themed('font-size7');
+			height: themed('font-size8');
+		}
+		text-align: center;
+	}
+	
+	.fast-trickle-charge {
+		display: inline-block;
+	     margin: auto 0;
+		border-radius: 4px;
+		background-color: rgba(172, 236, 240, 100);
+		color: rgba(0, 124, 134, 100);
+		@include themeify{
+			width: themed('font-size18');
+			font-size: themed('font-size2');
+			line-height: themed('font-size7');
+			height: themed('font-size8');
+		}
+		text-align: center;
+	}
+	.trickle-charge {
+		display: inline-block;
+	border-radius: 4px;
+	margin: auto 0;
+		
+		background-color: rgba(186, 240, 215, 100);
+		color: rgba(0, 130, 69, 100);
+		@include themeify{
+			width: themed('font-size18');			
+			font-size: themed('font-size2');
+			line-height: themed('font-size7');
+			height: themed('font-size8');
+		}
+		text-align: center;
+	}
+  
+ 	.station-items {
+ 		display: inline-block;
+/* 		height: 16px;
+ 		line-height: 16px;*/
+		@include themeify{
+			font-size: themed('font-size3');
+			font-weight: themed('fontWeight');
+			line-height: themed('font-size3');
+			height: themed('font-size3');
+		}
+
+ 		margin-left: 8rpx;
+ 		color: #101010;
+ 
+ 
+ 	}
+	//
+	
+ 	.address {
+		width: 100%;
+		line-height: 20px;
+		display: flex;
+		justify-content: space-between;
+		.name{
+			font-size: 16px;
+			white-space: nowrap;
+			overflow: hidden;
+			text-overflow: ellipsis;
+		}
+		.distance{
+			color: rgba(102, 102, 102, 100);
+			font-size: 12px;
+			text-align: right;
+			    width: 100px;
+			.iconfont{
+				font-size: 12px;
+				margin-right: 2px;
+			}
+		}
+		
+		@include themeify{
+			font-size: themed('font-size5');
+			line-height: themed('font-size7');
+		}
+/* 		font-size: 11px;*/
+font-weight: 600;
+ 		color: #101010;
+ 	}
+	
+ .price-free{
+	 width: 100%;
+	 display: flex;
+	 align-items: center;
+	 justify-content: space-between;
+	
+ }
+ 	.price {
+ 		display: flex;
+		align-items: baseline;
+		line-height: 40rpx;
+		.price-3 {
+			font-size: 24rpx;
+			color: #fff;
+			margin-left: 8rpx;
+			padding-right: 9rpx;
+			 background:#00B962 ;
+			 border-radius: 8rpx;
+			.num1{
+				 padding-left:  12rpx;
+				border-radius: 8rpx 0 8rpx 8rpx;
+				 padding-right: 18rpx;
+				 background: #121212;
+				 -webkit-clip-path: polygon(0 0, 93% 0, 84% 100%, 0% 100%);
+				 clip-path:  polygon(0 0, 93% 0, 84% 100%, 0% 100%);
+				 
+			}
+			 
+		}
+		.price-1{
+		
+			
+			.num {
+			
+			 	color: rgba(255, 98, 0, 100);
+			 
+			
+				     font-size: 44rpx;
+				     height: 44rpx;
+			 	text-align: left;
+			 	font-family: Roboto-medium;
+			 }
+			 .unit {
+					// font-size: 12px;
+			  	color: rgba(102, 102, 102, 100);
+			 	@include themeify{
+			 			// font-size: themed('font-size2');
+						font-size: 24rpx;
+						
+			 			height: themed('font-size2');
+			 			
+			 	}
+			
+			  	text-align: left;
+			  	font-family: AlibabaPuHui-regular;
+			  	
+			  	margin-left: 8rpx;
+			  }
+		}
+        .price-2{
+        	color: rgba(153, 153, 153, 100);
+        	margin-left: 6rpx;
+        	text-decoration: line-through;
+			font-size: 24rpx
+        }
+ 	}
+ 
+ .free{
+ 	display: flex;
+     align-items: center;
+ 	.slow,.fast{
+ 		display: flex;
+		.sp-font{
+			width: 40rpx;
+			height: 40rpx;
+			line-height: 40rpx;
+			border-radius: 4px;
+			background-color: #7a68f6;
+			color: #fff;
+			font-size: 28rpx;
+			text-align: center;
+			margin-right: 2rpx;
+		}
+ 		.fast-font{
+ 			width: 40rpx;
+ 			height: 40rpx;
+ 			line-height: 40rpx;
+ 			border-radius: 4px;
+ 			// background-color: rgba(186, 240, 215, 100);
+ 			// color: rgba(0, 130, 69, 100);
+			background-color: #1677FF;
+			color: rgba(255, 255, 255, 1);
+ 			font-size: 28rpx;
+ 			text-align: center;
+ 			margin-right: 2rpx;
+ 		}
+ 		.slow-font{
+ 			width: 40rpx;
+ 			height: 40rpx;
+ 			line-height: 40rpx;
+ 			border-radius: 4px;
+ 			// background-color: rgba(226, 226, 226, 100);
+ 			// color: rgba(128, 128, 128, 100);
+			background-color: #00B962;
+			color: rgba(255, 255, 255, 1);
+ 			font-size: 28rpx;
+ 			text-align: center;
+ 			margin-right: 2rpx;
+ 		}
+ 		.num {
+ 			font-size: 32rpx;
+ 			color: #666;
+ 			line-height: 40rpx;
+ 		}
+ 		.num1 {
+ 			font-size: 32rpx;
+ 			color: #bbb;
+ 			line-height: 40rpx;
+ 		}
+ 	}
+ 	.slow{
+ 		margin-left: 16rpx;
+ 	}
+ }
+ 
+  
+ 
+ 	.park {
+ 		margin-top: 16rpx;
+ 		display: flex;
+ 
+ 		
+ 
+ 		
+ 	}
+	.park-p {
+		display: inline-block;
+		width: 20px;
+/*		height: 18px;
+		line-height: 12px;*/
+		@include themeify{
+			line-height: themed('font-size1');
+			height: themed('font-size4');
+		}
+		text-align: center;
+		// background-color: rgba(125, 177, 255, 100);
+		background-color: #00b962;
+		color: #fff;
+	}
+	.park-text {
+		display: inline-block;
+		color: rgba(102, 102, 102, 100);
+		@include themeify{
+			font-size: themed('font-size1');
+			height:themed('font-size4');
+		}
+/*		font-size: 12px;*/
+		text-align: left;
+		margin-left: 4px;
+		margin-top: 2px;
+	}
+	
+	 .map {
+		width: 100%;
+	 
+		height: 100%;
+		position: relative;
+	}
+	#container {
+	  width: 100%;
+	  height: 100%;
+	}
+ 	
+
+	
+	.distance-font {
+		@include themeify{
+				font-size: themed('font-size3');
+		}
+/*		font-size: 16px*/
+	}
+	
+	.position{
+		color: #1677ff;
+		@include themeify{
+				font-size: themed('font-size2');
+		}
+/*		font-size: 14px*/
+	}
+	.position-box{
+		position:absolute;
+		top: 341px;
+		right: 118px;
+		width: 16px;
+		height: 16px;
+		/* line-height: 20px; */
+		background-color: rgba(22, 119, 255, 100);
+		text-align: center;
+		box-shadow: 0px 0px 8px 0px rgba(0, 0, 0, 0.4);
+		border: 2px solid rgba(255, 255, 255, 100);
+		border-radius: 999px;
+	}
+	.min-h{
+		min-height: 65px;
+	}
+	.sign{
+		display: flex;
+		flex-wrap: wrap;
+		margin-top: 10px;
+		
+		.sign-1{
+			height: 20px;
+			line-height: 20px;
+			border-radius: 4px;
+			background-color: rgba(255, 255, 255, 100);
+			color: rgba(255, 139, 0, 100);
+			font-size: 12px;
+			text-align: center;
+			border: 1px solid rgba(255, 139, 0, 100);
+			padding: 0 4px;
+			margin-right: 8px;
+			margin-bottom: 4px;
+		}
+		.sign-2{
+			height: 20px;
+			line-height: 20px;
+			border-radius: 4px;
+			background-color: rgba(255, 255, 255, 100);
+			color: rgba(153, 153, 153, 100);
+			font-size: 12px;
+			text-align: center;
+			border: 1px solid rgba(204, 204, 204, 100);
+			padding: 0 4px;
+			margin-right: 8px;
+			margin-bottom: 4px;
+		}
+		.sign-3{
+			line-height: 40rpx;
+			border-radius: 8rpx;
+			background-color: rgba(255, 255, 255, 100);
+			color: #8161FF ;
+			font-size: 24rpx;
+			text-align: center;
+			border: 1px solid  #8161FF;
+			padding: 0 8rpx;
+			margin-right: 16rpx;
+			margin-bottom: 8rpx;
+		}
+		.sign-4{
+			line-height: 40rpx;
+			border-radius: 8rpx;
+			background-color: rgba(255, 255, 255, 100);
+			color: #00B962  ;
+			font-size: 24rpx;
+			text-align: center;
+			border: 1px solid #00B962 ;
+			padding: 0 8rpx;
+			margin-right: 16rpx;
+			margin-bottom: 8rpx;
+		}
+	}
+	
+		.park-text2 {
+			    width: 140%;
+			}
+			.park-text3 {
+				    white-space: nowrap;
+				 
+				 
+				    text-overflow: ellipsis;
+				    overflow: hidden;
+				}
+				.carNone{
+					display: flex;
+					flex-direction: column;
+					justify-content: center;
+					align-items: center;
+					img{
+						width: 100%;
+						height: 100%;
+					}
+					p{
+						margin-top: -60px;
+					}
+				}
+</style>

pages/searchPile/chargeProcess/charge.vue

@@ -73,32 +73,32 @@
 				<p v-show="!chargingFundsBl&&!(payValue==1||payValue==4)">当前余额{{user.balance>0?user.balance.toFixed(2):'0.00'}}元
 					<span @click="paySelectShow()" style="color:#00B962;margin-left: 20px; ">去充值></span>
 
-				</p>
-				<p  v-show="(payValue==1||payValue==4)">优先使用付款方式
-					<span @click="paySelectShow()" style="color:#00B962;margin-left: 20px; ">去充值></span>
-					
-					
-				</p>
-				<view class="rechargeBalance"  v-if="chargingFundsBl" >
-					<view class="rechargeBalanceItem">账户余额{{user.balance>0?user.balance.toFixed(2):'0.00'}}元</view>
-					<view class="rechargeBalanceItem" v-if="chargingFundsBl">|</view>
-					<view class="rechargeBalanceItem"  v-if="chargingFundsBl" >充电金{{user.chargingFunds>0?user.chargingFunds.toFixed(2):'0.00'}}元</view>
-				</view>
-				<view class="rechargeMain" v-if="chargingFundsBl" v-show="payValue==1||payValue==4">
-					
-					<view 
-						class=" recharge-item  "   @click="paySelectMethodValue=1"  :class="payValue == 1? 'active' : ''" >
-						账户余额
-					</view>
-					<view
-						class=" recharge-item  "   @click="paySelectMethodValue=4"  :class="payValue == 4? 'active' : ''">
-						充电金
-					</view>
-				</view>
+				</p>
+				<p  v-show="(payValue==1||payValue==4)">优先使用付款方式
+					<span @click="paySelectShow()" style="color:#00B962;margin-left: 20px; ">去充值></span>
+					
+					
+				</p>
+				<view class="rechargeBalance"  v-if="chargingFundsBl" >
+					<view class="rechargeBalanceItem">账户余额{{user.balance>0?user.balance.toFixed(2):'0.00'}}元</view>
+					<view class="rechargeBalanceItem" v-if="chargingFundsBl">|</view>
+					<view class="rechargeBalanceItem"  v-if="chargingFundsBl" >充电金{{user.chargingFunds>0?user.chargingFunds.toFixed(2):'0.00'}}元</view>
+				</view>
+				<view class="rechargeMain" v-if="chargingFundsBl" v-show="payValue==1||payValue==4">
+					
+					<view 
+						class=" recharge-item  "   @click="paySelectMethodValue=1"  :class="payValue == 1? 'active' : ''" >
+						账户余额
+					</view>
+					<view
+						class=" recharge-item  "   @click="paySelectMethodValue=4"  :class="payValue == 4? 'active' : ''">
+						充电金
+					</view>
+				</view>
 				<p v-if="chargingFundsBl" v-show="(payValue==1||payValue==4)" >充电时长</p>
 				<view class="rechargeMain" v-show="payValue==1||payValue==4">
-					
-					
+					
+					
 					<view @click="moneyClick(-1)" :class="!otherNum&&moneyActiveClass == -1? 'active' : ''"
 						class=" recharge-item  ">
 						充满自停
@@ -213,15 +213,15 @@
 					<view class="type" v-if="!vin" style="color: red;">
 						vin码不一致
 					</view>
-					<view class="type" v-else-if="canUse">
-						<template v-if="userCard.cardType==4">
-							{{userCard.cardName}}
-							{{userCard.monthlyRentName}}
-							
-						</template>
-						<template v-else>
-							{{userCard.classify==1?'折扣卡':''}}
-							{{userCard.classify==2?'服务费'+(userCard.serviceFeeDiscountRate/10)+'折卡':''}}
+					<view class="type" v-else-if="canUse">
+						<template v-if="userCard.cardType==4">
+							{{userCard.cardName}}
+							{{userCard.monthlyRentName}}
+							
+						</template>
+						<template v-else>
+							{{userCard.classify==1?'折扣卡':''}}
+							{{userCard.classify==2?'服务费'+(userCard.serviceFeeDiscountRate/10)+'折卡':''}}
 						</template>
 						
 					</view>
@@ -237,35 +237,35 @@
 
 			</view>
 
-			<view v-if="cardList.length&&userCard&&(payValue=='1'||payValue=='4')" class="cardListView">
-				<view  class="cardListItemTitle"  v-if="cardList.length>1" >点击切换其他卡</view>
-
-				<view  class="cardListItem" v-for="(item,i) in cardList" 
-				 :key="i"  :class="{
-					 select:userCard.id==item.id
-				 }" @click="userCard=item" >
-					<view  class="cardListName" >
-						{{item.cardName}}
-						
-					</view>
-					<view  class="cardListText" v-if="item.classify==1" >
-						
-						<view>充电服务费全免</view>
-						
-						<view>
-							{{thisendTime(item.endTime)}}到期
-						</view>
-					</view>
-					<view  class="cardListText" v-if="item.classify==2" >
-						
-						<view>
-							已用{{item.chargedDegree?item.chargedDegree.toFixed(0):0.00}}度 / 共{{item.chargeDegreeLimit}}度
-						</view>
-						<view>
-							{{thisendTime(item.endTime)}}到期
-						</view>
-					</view>
-				</view>
+			<view v-if="cardList.length&&userCard&&(payValue=='1'||payValue=='4')" class="cardListView">
+				<view  class="cardListItemTitle"  v-if="cardList.length>1" >点击切换其他卡</view>
+
+				<view  class="cardListItem" v-for="(item,i) in cardList" 
+				 :key="i"  :class="{
+					 select:userCard.id==item.id
+				 }" @click="userCard=item" >
+					<view  class="cardListName" >
+						{{item.cardName}}
+						
+					</view>
+					<view  class="cardListText" v-if="item.classify==1" >
+						
+						<view>充电服务费全免</view>
+						
+						<view>
+							{{thisendTime(item.endTime)}}到期
+						</view>
+					</view>
+					<view  class="cardListText" v-if="item.classify==2" >
+						
+						<view>
+							已用{{item.chargedDegree?item.chargedDegree.toFixed(0):0.00}}度 / 共{{item.chargeDegreeLimit}}度
+						</view>
+						<view>
+							{{thisendTime(item.endTime)}}到期
+						</view>
+					</view>
+				</view>
 			</view>
 
 		</view>
@@ -314,7 +314,7 @@
 				<view
 					v-if="companyPaySelect&&(companyPaySelect.carList&&companyPaySelect.carList.length==0||companyPaySelect.carList==null)"
 					style=" text-align: center;">
-					<img src="static/img/暂无数据-缺省页.png" alt="">
+					<img src="@/assets/static/img/暂无数据-缺省页.png" alt="">
 					<p class="oldTextjp2">未分配车辆，请联系管理员</p>
 				</view>
 				<scroll-view v-else scroll-y="true" style="height: 520rpx;">
@@ -459,22 +459,22 @@
 </template>
 
 <script>
-	import * as API from '@/apis/chargeProcess.js'
-	import * as API_index from '@/apis/index.js'
+	import * as API from '@/apis/chargeProcess.js'
+	import * as API_index from '@/apis/index.js'
 	
 	import * as userApi from '@/apis/user.js'
 	import * as newsApi from '@/apis/news.js'
 	import * as API_finance from '@/apis/finance.js'
 	import {
 		wxPayJs
-	} from '@/utils/wxpay'
-	import {
-		newDate,daysDistance
-		
-	} from '@/utils'
+	} from '@/utils/wxpay'
+	import {
+		newDate,daysDistance
+		
+	} from '@/utils'
 	
 	import * as Pay from '@/apis/weixin.js'
-// import { contentStore } from 'core/core.model'
+// import { contentStore } from 'core/core.model'
 
 
 
@@ -597,14 +597,14 @@
 				selectItem: {},
 				personInfo: {},
 				carNumber: "",
-				show3: false,
-				cardList:[],
-
+				show3: false,
+				cardList:[],
+
 				startMode:"",
-
-				paySelectMethodValue:1,
+
+				paySelectMethodValue:1,
 				chargingFundsBl:false,
-
+
 			}
 		},
 		computed: {
@@ -623,8 +623,8 @@
 			}
 		},
 		onLoad(op) {
-			if(op.startMode){
-				this.startMode=op.startMode
+			if(op.startMode){
+				this.startMode=op.startMode
 			}
 			this.personInfo = this.carhelp.getPersonInfo()
 			// if(plus){
@@ -673,13 +673,13 @@
 				if (payValueDefault == "1" || payValueDefault == "0") {
 					this.payValue = payValueDefault;
 				}
-				if (payValueDefault == "1" || payValueDefault == "4") {
-					this.paySelectMethodValue = payValueDefault;
-					this.payValue = payValueDefault;
-				}
-				
-				if(payValueDefault==4){
-					this.chargingFundsBl=true;
+				if (payValueDefault == "1" || payValueDefault == "4") {
+					this.paySelectMethodValue = payValueDefault;
+					this.payValue = payValueDefault;
+				}
+				
+				if(payValueDefault==4){
+					this.chargingFundsBl=true;
 				}
 			}
 			this.payName = this.payList[this.payValue].name;
@@ -690,9 +690,9 @@
 			if (this.elderMode)
 				this.theme('elder')
 			else
-				this.theme('standard')
-				
-				
+				this.theme('standard')
+				
+				
 			this.getChargeList()
 		},
 		onShow() {
@@ -707,34 +707,34 @@
 
 			this.getHomePage()
 		},
-		methods: {
-			thisdaysDistance(endTime){
-						
-							 var date=new Date()
-							 var date2=newDate(endTime);
-							 return daysDistance(date,date2)
-							 
-			},
-			getChargeList() {
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				
-				API_index.personCardList({
-				
-				}).then((res) => {
-					uni.hideLoading();
-					this.cardList=res.data.cardList
-					
-					
-					
-				}).catch(error => {
-					uni.showToast({
-						title: error,
-						icon: "none"
-					})
-				})
+		methods: {
+			thisdaysDistance(endTime){
+						
+							 var date=new Date()
+							 var date2=newDate(endTime);
+							 return daysDistance(date,date2)
+							 
+			},
+			getChargeList() {
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				
+				API_index.personCardList({
+				
+				}).then((res) => {
+					uni.hideLoading();
+					this.cardList=res.data.cardList
+					
+					
+					
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
 			},
 			gotoLogin() {
 				this.onShowRole = true
@@ -762,7 +762,7 @@
 			paySelectCompany() {
 
 			},
-			paySelectMethod(value, company) {
+			paySelectMethod(value, company) {
 				console.log(value)
 				if (this.personInfo.userType == "1") {
 					uni.showToast({
@@ -780,7 +780,7 @@
 
 							this.companyPaySelect.car = company.carList[0].carNum;
 						}
-					}
+					}
 					this.$forceUpdate()
 				}
 				
@@ -1118,8 +1118,8 @@
 						companyId: this.companyPaySelect.enterpriseAccount.id,
 					});
 				}
-				if(this.startMode){
-					this.submitForm.startMode=this.startMode;  //判断充电入口
+				if(this.startMode){
+					this.submitForm.startMode=this.startMode;  //判断充电入口
 				}
 				//this.submitForm.deviceNo = this.detail.deviceNo;
 				API.startCarCharging(this.submitForm).then((res) => {
@@ -1173,14 +1173,14 @@
 					}
 
 				})
-			},
-			thisendTime(endTime){
-				if(endTime){
-					var reg=new RegExp('-','gi')
-					var str=endTime.substring(0,10).replace(reg,'.')
-					return str
-				}
-				return ''
+			},
+			thisendTime(endTime){
+				if(endTime){
+					var reg=new RegExp('-','gi')
+					var str=endTime.substring(0,10).replace(reg,'.')
+					return str
+				}
+				return ''
 			},
 			getHomePage() {
 				uni.showLoading({
@@ -1202,11 +1202,11 @@
 					API.personalCenter({
 						stationId: this.stationId
 					}).then((res2) => {
-						this.user = res2.data
-						
-						if(this.user.chargingFunds){
-							this.chargingFundsBl=true;
-						}
+						this.user = res2.data
+						
+						if(this.user.chargingFunds){
+							this.chargingFundsBl=true;
+						}
 						
 						var entRegList = res2.data.entRegList;
 						this.companyList = []
@@ -1962,40 +1962,40 @@
 		img {
 			width: 100%;
 		}
-	}
-	.cardListView{
-		
-		.cardListItemTitle{
-			    color: #777777;
-			    font-size: 36rpx;
-		}
-			.cardListItem{
-				    margin:5px  4px;
-					border: 1px solid ;
-					    padding: 3px;
-					    border-radius: 6px;
-					.cardListName{
-						 font-size: 34rpx;
-					}
-				.cardListText{
-					 font-size: 24rpx;
-					display:flex;
-					 justify-content: space-between;
-				}
-				
-			}
-			.select{
-				border: 2px solid #00b962;
-				background-color:  #00b962;
-				color:#fff;
-			}
-	}
-	.rechargeBalance{
-		display: flex;
-		.rechargeBalanceItem{
-			margin-right: 6px;
-			    color: #666;
-		}
-	}
+	}
+	.cardListView{
+		
+		.cardListItemTitle{
+			    color: #777777;
+			    font-size: 36rpx;
+		}
+			.cardListItem{
+				    margin:5px  4px;
+					border: 1px solid ;
+					    padding: 3px;
+					    border-radius: 6px;
+					.cardListName{
+						 font-size: 34rpx;
+					}
+				.cardListText{
+					 font-size: 24rpx;
+					display:flex;
+					 justify-content: space-between;
+				}
+				
+			}
+			.select{
+				border: 2px solid #00b962;
+				background-color:  #00b962;
+				color:#fff;
+			}
+	}
+	.rechargeBalance{
+		display: flex;
+		.rechargeBalanceItem{
+			margin-right: 6px;
+			    color: #666;
+		}
+	}
 	
 </style>

pages/searchPile/chargeProcess/dcCharging.vue

@@ -189,7 +189,7 @@
 				<view class="slot-content">
 
 					<u-image width="120px" style="margin: auto;" mode="widthFix"
-						src="@/static/img/充电中-缺省页.png"></u-image>
+						src="@/assets/static/img/充电中-缺省页.png"></u-image>
 					<view style="padding:0 40px;font-size: 36rpx;">
 						系统检测出当前充电车辆与折扣卡所绑定的车辆不一致，该车辆可以正常充电，但无法享受折扣卡免服务费优惠。
 

pages/searchPile/searchPile.vue

@@ -1,1630 +1,1630 @@
-<template>
-	<view>
-		<ujp-navbar :is-back="false" height='88' style="background-color: bisque;">
-			<view class="ujp-navbar-main">
-				<view class="ujp-navbar-main1">
-					<view style="margin-left:20rpx;width: 160rpx;">
-						<uni-combox class='font2' ref="city" :border="false" v-model="area" :candidates="cities"
-							@updateModel='updateCity' @updateSelector="updateTypeSelector(3)"></uni-combox>
-					</view>
-					<view style="margin-right: 20rpx; flex:1">
-						<u-search height="60" :input-style='inputStyle' placeholder="查询站点地址或站名" :showAction="false"
-							@focus="navigate"></u-search>
-					</view>
-					<view style="margin-right: 20rpx;" v-show="viewMode" @click="listMode">
-						<text class="iconfont">&#xe613;</text> <text class="list font2">列表</text>
-					</view>
-					<view style="margin-right: 20rpx;" v-show="!viewMode" @click="mapMode">
-						<text class="iconfont">&#xe622;</text> <text class="list font2">地图</text>
-					</view>
-				</view>
-				<view class="ujp-navbar-main2">
-					<view style="display: flex;">
-						<view
-							style=" min-width: 180rpx;   max-width: 200rpx;margin-left:20rpx;margin-right:10rpx;flex:1; ">
-
-							<uni-combox class='font2' ref="raidus" :border="false" v-model="raidus"
-								:candidates="radiuses" @updateModel='updateRadius'
-								@updateSelector="updateTypeSelector('0')"></uni-combox>
-						</view>
-						<view style=" min-width: 180rpx;  max-width: 200rpx;flex:1;   ">
-							<uni-combox ref="type" class='font2' :border="false" v-model="type" :candidates="types"
-								@updateModel='updateType' @updateSelector="updateTypeSelector(1)"></uni-combox>
-						</view>
-					</view>
-
-
-					<!-- <view style="flex:1;">
-						<uni-combox ref="stationType" class='font2' :border="false" v-model="stationType"
-							:candidates="stationTypes" @updateModel='updateType2'
-							@updateSelector="updateTypeSelector(2)"></uni-combox>
-					</view> -->
-					<view style="margin-right: 20rpx;">
-						<!--  -->
-						<!-- <view v-show="dropdownShow" >
-							 <u-mask :show="dropdownShow" ></u-mask>
-						</view> -->
-						<jp-dropdown @open="dropdownShow=true" active-color="rgb(0, 185, 98)"
-							@close="dropdownShow=false" ref="uDropdown" style="    display: contents;" :top="180">
-							<u-dropdown-item title="筛选">
-								<view class="slot-content">
-
-									<view v-if="dropdownShow" class="u-text-center u-content-color  ">
-										<view class="preference" style="z-index:1024;width: 100%;">
-											<view class="content-s">
-												<view class="preference_group">
-													<view class="preference_group_item"><label
-															class="preference_label">距离我</label></view>
-													<view>
-														<u-tag class="preference_item"
-															v-for="(item, index) in info.miles_type" :key="index"
-															:style="index == preference.miles_index ? 'background-color:#00B962;color:#FFFFFF' : 'background-color:#EFF4F2;color:#926666'"
-															shape="circle" :text="item.text"
-															@click="selectMiles(index)"></u-tag>
-													</view>
-												</view>
-												<view class="preference_group">
-													<view class="preference_group_item"><label
-															class="preference_label">充电站类型</label></view>
-													<view>
-														<u-tag class="preference_item_medium"
-															v-for="(item, index) in info.obc_type" :key="index"
-															:style="index == preference.obc_type_index ? 'background-color:#00B962;color:#FFFFFF' : 'background-color:#EFF4F2;color:#926666'"
-															shape="circle" :text="item.text"
-															@click="selectOBSType(index)"></u-tag>
-													</view>
-												</view>
-												<view class="preference_group">
-													<view class="preference_group_item"><label
-															class="preference_label">运营模式</label></view>
-													<view>
-														<u-tag class="preference_item_medium"
-															v-for="(item, index) in info.obc_stationType" :key="index"
-															:style="index == preference.obc_stationType_index ? 'background-color:#00B962;color:#FFFFFF' : 'background-color:#EFF4F2;color:#926666'"
-															shape="circle" :text="item.text"
-															@click="selectOBSType2(index)"></u-tag>
-													</view>
-												</view>
-
-												<view class="preference_group" v-if="false">
-													<view class="preference_group_item"><label
-															class="preference_label">是否对外开放</label></view>
-													<view>
-														<u-tag class="preference_item_plus"
-															v-for="(item, index) in info.obc_status" :key="index"
-															:style="index == preference.obc_status_index ? 'background-color:#00B962;color:#FFFFFF' : 'background-color:#EFF4F2;color:#926666'"
-															shape="circle" :text="item.text"
-															@click="selectOBSStatus(index)"></u-tag>
-													</view>
-												</view>
-
-												<view class="preference_group" v-if="false">
-													<view style="margin-left: 30rpx;"><u-checkbox active-color="#00b962"
-															shape="circle" v-model="preference.save_preference"
-															@change="radioChange">保存偏好设置</u-checkbox></view>
-												</view>
-
-											</view>
-											<view class="pre-btn" style="display: flex;flex-direction: row;">
-												<view class="btn-1 font3" @click="reset" style="width: 30%;">重置</view>
-												<view class="btn-2 font3" @click="close"
-													style="width: 70%;background-color: #00B962;color: #fff;">确定</view>
-											</view>
-
-										</view>
-									</view>
-									<!-- <u-button type="primary" @click="closeDropdown">确定</u-button> -->
-								</view>
-							</u-dropdown-item>
-						</jp-dropdown>
-					</view>
-				</view>
-			</view>
-		</ujp-navbar>
-		<!-- 定位 -->
-		<view v-show="!viewMode">
-
-
-			<view class="location-box" v-if="message != 'getLocation:ok' && stationslist.length == 0 ">
-				<view class="location">
-					<view class="location-text">
-						<view class="text-1 oldTextjp" oldstyle="font-size: 20px;">
-							定位中...
-						</view>
-						<view class="text-2 oldTextjp2" oldstyle="font-size: 16px;">
-							授权定位后可查询附近充电站
-						</view>
-						<view class="text-view">
-							<view class="text-3 oldTextjp2" oldstyle="font-size: 16px;" @click="getPoint()">
-								重新定位
-							</view>
-
-							<view class="text-3  text-4 oldTextjp2" oldstyle="font-size: 16px;"
-								@click="searchStationData()">
-								直接搜索
-							</view>
-						</view>
-
-					</view>
-					<view class="img-box">
-						<img src="static/img/暂无网络信号-缺省页 1.png">
-					</view>
-				</view>
-
-			</view>
-			<view v-else-if="message == 'getLocation:ok'&&stationslist.length==0">
-				<view class="carNone" v-if="stationslist.length == 0">
-					<img src="static/img/暂无数据-缺省页.png" alt="">
-					<p class="oldTextjp2" oldstyle="font-size: 18px;">{{loading?'暂无可用充电站':'正在为你加载可用的充电站...'}}</p>
-
-				</view>
-			</view>
-			<view>
-				<view>
-					<view v-for="(item,index) in (stationslist.length?stationslist:defaultStation)" :key="item.id"
-						class="charing-slow charing-new" @click="stationDetail(item)">
-
-						<view class="new-img">
+<template>
+	<view>
+		<ujp-navbar :is-back="false" height='88' style="background-color: bisque;">
+			<view class="ujp-navbar-main">
+				<view class="ujp-navbar-main1">
+					<view style="margin-left:20rpx;width: 160rpx;">
+						<uni-combox class='font2' ref="city" :border="false" v-model="area" :candidates="cities"
+							@updateModel='updateCity' @updateSelector="updateTypeSelector(3)"></uni-combox>
+					</view>
+					<view style="margin-right: 20rpx; flex:1">
+						<u-search height="60" :input-style='inputStyle' placeholder="查询站点地址或站名" :showAction="false"
+							@focus="navigate"></u-search>
+					</view>
+					<view style="margin-right: 20rpx;" v-show="viewMode" @click="listMode">
+						<text class="iconfont">&#xe613;</text> <text class="list font2">列表</text>
+					</view>
+					<view style="margin-right: 20rpx;" v-show="!viewMode" @click="mapMode">
+						<text class="iconfont">&#xe622;</text> <text class="list font2">地图</text>
+					</view>
+				</view>
+				<view class="ujp-navbar-main2">
+					<view style="display: flex;">
+						<view
+							style=" min-width: 180rpx;   max-width: 200rpx;margin-left:20rpx;margin-right:10rpx;flex:1; ">
+
+							<uni-combox class='font2' ref="raidus" :border="false" v-model="raidus"
+								:candidates="radiuses" @updateModel='updateRadius'
+								@updateSelector="updateTypeSelector('0')"></uni-combox>
+						</view>
+						<view style=" min-width: 180rpx;  max-width: 200rpx;flex:1;   ">
+							<uni-combox ref="type" class='font2' :border="false" v-model="type" :candidates="types"
+								@updateModel='updateType' @updateSelector="updateTypeSelector(1)"></uni-combox>
+						</view>
+					</view>
+
+
+					<!-- <view style="flex:1;">
+						<uni-combox ref="stationType" class='font2' :border="false" v-model="stationType"
+							:candidates="stationTypes" @updateModel='updateType2'
+							@updateSelector="updateTypeSelector(2)"></uni-combox>
+					</view> -->
+					<view style="margin-right: 20rpx;">
+						<!--  -->
+						<!-- <view v-show="dropdownShow" >
+							 <u-mask :show="dropdownShow" ></u-mask>
+						</view> -->
+						<jp-dropdown @open="dropdownShow=true" active-color="rgb(0, 185, 98)"
+							@close="dropdownShow=false" ref="uDropdown" style="    display: contents;" :top="180">
+							<u-dropdown-item title="筛选">
+								<view class="slot-content">
+
+									<view v-if="dropdownShow" class="u-text-center u-content-color  ">
+										<view class="preference" style="z-index:1024;width: 100%;">
+											<view class="content-s">
+												<view class="preference_group">
+													<view class="preference_group_item"><label
+															class="preference_label">距离我</label></view>
+													<view>
+														<u-tag class="preference_item"
+															v-for="(item, index) in info.miles_type" :key="index"
+															:style="index == preference.miles_index ? 'background-color:#00B962;color:#FFFFFF' : 'background-color:#EFF4F2;color:#926666'"
+															shape="circle" :text="item.text"
+															@click="selectMiles(index)"></u-tag>
+													</view>
+												</view>
+												<view class="preference_group">
+													<view class="preference_group_item"><label
+															class="preference_label">充电站类型</label></view>
+													<view>
+														<u-tag class="preference_item_medium"
+															v-for="(item, index) in info.obc_type" :key="index"
+															:style="index == preference.obc_type_index ? 'background-color:#00B962;color:#FFFFFF' : 'background-color:#EFF4F2;color:#926666'"
+															shape="circle" :text="item.text"
+															@click="selectOBSType(index)"></u-tag>
+													</view>
+												</view>
+												<view class="preference_group">
+													<view class="preference_group_item"><label
+															class="preference_label">运营模式</label></view>
+													<view>
+														<u-tag class="preference_item_medium"
+															v-for="(item, index) in info.obc_stationType" :key="index"
+															:style="index == preference.obc_stationType_index ? 'background-color:#00B962;color:#FFFFFF' : 'background-color:#EFF4F2;color:#926666'"
+															shape="circle" :text="item.text"
+															@click="selectOBSType2(index)"></u-tag>
+													</view>
+												</view>
+
+												<view class="preference_group" v-if="false">
+													<view class="preference_group_item"><label
+															class="preference_label">是否对外开放</label></view>
+													<view>
+														<u-tag class="preference_item_plus"
+															v-for="(item, index) in info.obc_status" :key="index"
+															:style="index == preference.obc_status_index ? 'background-color:#00B962;color:#FFFFFF' : 'background-color:#EFF4F2;color:#926666'"
+															shape="circle" :text="item.text"
+															@click="selectOBSStatus(index)"></u-tag>
+													</view>
+												</view>
+
+												<view class="preference_group" v-if="false">
+													<view style="margin-left: 30rpx;"><u-checkbox active-color="#00b962"
+															shape="circle" v-model="preference.save_preference"
+															@change="radioChange">保存偏好设置</u-checkbox></view>
+												</view>
+
+											</view>
+											<view class="pre-btn" style="display: flex;flex-direction: row;">
+												<view class="btn-1 font3" @click="reset" style="width: 30%;">重置</view>
+												<view class="btn-2 font3" @click="close"
+													style="width: 70%;background-color: #00B962;color: #fff;">确定</view>
+											</view>
+
+										</view>
+									</view>
+									<!-- <u-button type="primary" @click="closeDropdown">确定</u-button> -->
+								</view>
+							</u-dropdown-item>
+						</jp-dropdown>
+					</view>
+				</view>
+			</view>
+		</ujp-navbar>
+		<!-- 定位 -->
+		<view v-show="!viewMode">
+
+
+			<view class="location-box" v-if="message != 'getLocation:ok' && stationslist.length == 0 ">
+				<view class="location">
+					<view class="location-text">
+						<view class="text-1 oldTextjp" oldstyle="font-size: 20px;">
+							定位中...
+						</view>
+						<view class="text-2 oldTextjp2" oldstyle="font-size: 16px;">
+							授权定位后可查询附近充电站
+						</view>
+						<view class="text-view">
+							<view class="text-3 oldTextjp2" oldstyle="font-size: 16px;" @click="getPoint()">
+								重新定位
+							</view>
+
+							<view class="text-3  text-4 oldTextjp2" oldstyle="font-size: 16px;"
+								@click="searchStationData()">
+								直接搜索
+							</view>
+						</view>
+
+					</view>
+					<view class="img-box">
+						<img src="@/assets/static/img/暂无网络信号-缺省页 1.png">
+					</view>
+				</view>
+
+			</view>
+			<view v-else-if="message == 'getLocation:ok'&&stationslist.length==0">
+				<view class="carNone" v-if="stationslist.length == 0">
+					<img src="@/assets/static/img/暂无数据-缺省页.png" alt="">
+					<p class="oldTextjp2" oldstyle="font-size: 18px;">{{loading?'暂无可用充电站':'正在为你加载可用的充电站...'}}</p>
+
+				</view>
+			</view>
+			<view>
+				<view>
+					<view v-for="(item,index) in (stationslist.length?stationslist:defaultStation)" :key="item.id"
+						class="charing-slow charing-new" @click="stationDetail(item)">
+
+						<view class="new-img">
 							<img :src="item.image" v-if="item.image" class="img1">
-							<img v-else src="@/assets/img/chargesite_default.png"  class="img1" mode=""></img>
-							<view class="img2Class" v-if="item.isRecommend||stationslist.length==0">
-								<img src="@/assets/img/9-4/推荐.svg" class="img2">
-							</view>
-							
-							<view class="img2Class" v-else-if="item.isAlways" >
-								
-								<img src="@/assets/img/9-4/常用.svg" class="img2">
-							</view>	
-							<view class="img2Class" v-else-if="item.isSpecial" >
-										
-								<img src="@/assets/img/9-4/特价tag.svg" class="img2">
-							</view>	
-						</view>
-						<view class="new-body">
-
-
-							<view class="address">
-								<view class="name oldTextjp" oldstyle="font-size: 20px;">
-									{{item.name}}
-								</view>
-
-							</view>
-
-							<view class="sign">
-								<!-- <view class="sign-tag sign-0" v-if="item.isRecommend||stationslist.length==0">推荐</view>
-							<view class="sign-tag sign-5" v-if="item.isAlways" >常用</view>	
-							 -->
-
-								<view class="sign-tag sign-1"
-									v-if="item.giveDiscount&&item.discountRatio&&item.discountRatio!=100">
-									会员{{discountRatio10(item.discountRatio)}}折</view>
-
-								<view class="sign-tag sign-4" v-if="item.nightLowPriceEnabled">
-									夜间超低价</view>
-
-								<view class="sign-tag sign-3" v-if="item.category=='超充'">160kW超充站</view>
-								<view class="sign-tag sign-2" v-if="item.platformType==1">自营站</view>
-								<view class="sign-tag sign-2" v-if="item.tagList.length != 0"
-									v-for="(tagName,tagIndex) in item.tagList" :key="tagIndex">{{tagName}}</view>
-
-								<template v-if="item.stationType==50">
-									{{item.address}}
-								</template>
-							</view>
-
-							<view class="price-free price-freeList" style="margin-top: 16rpx;">
-								<view class="free">
-
-									<view class="fast" v-if="item.fastNum">
-										<view class="fast-font">
-											快
-										</view>
-										<view class="num">
-
-											{{item.fastAvailableNum}}
-										</view>
-										<view class="num1">
-										
-											/{{item.fastNum}}
-										</view>
-									</view>
-									<view class="slow" v-if="item.slowNum">
-										<view class="slow-font">
-											慢
-										</view>
-										<view class="num">
-											{{item.slowAvailableNum}}
-										</view>
-										<view class="num1">
-											/{{item.slowNum}}
-										</view>
-									</view>
-								</view>
-								<template v-if="stationslist.length!=0">
-
-									<view class="distance " v-if="item.distance != '99999999'">
-										<text class="iconfont" style="color:#666666">&#xe615;</text>
-										{{item.distance!=null && item.distance>0.1 ? item.distance.toFixed(1)+'km' : '小于100m'}}
-									</view>
-									<view class="distance oldTextjp2" oldstyle="font-size: 16px;" v-else>
-										<text class="iconfont" style="color:#666666">&#xe615;</text>
-										暂无定位
-									</view>
-								</template>
-							</view>
-							<u-line margin="16rpx 0 "></u-line>
-
-							<view class="price-free price-freeList">
-								<view class="price" v-if="personInfo&&personInfo.userType==2">
-									<view class="price-1">
-										<text class="num">{{!item.giveDiscount ? (item.electricityPrice+item.servicePrice).toFixed(2)
-									: (item.electricityPrice+item.discountServicePrice).toFixed(2)}}</text>
-										<text class="unit " oldstyle="font-size: 14px;">
-											元/度
-										</text>
-									</view>
-									
-									<view class="price-3 "  v-if="prevMonthKwhBL&&item.tagList&&item.tagList.length&&(item.tagList.indexOf('6折卡')>-1||item.tagList.indexOf('月卡')>-1||item.tagList.indexOf('自营站')>-1)">
-										<view class="num1">
-											
-											<img  src="@/assets/img/9-4/6折卡价.svg" />
-											
-										</view>
-										<text
-											class="num">{{ (item.electricityPrice+(item.servicePrice*0.6)).toFixed(2)}}元/度</text>
-										
-									</view>
-									<view class="price-3 price-3-yue "  v-if="!prevMonthKwhBL&&item.tagList&&item.tagList.length&&(item.tagList.indexOf('6折卡')>-1||item.tagList.indexOf('月卡')>-1||item.tagList.indexOf('自营站')>-1)">
-										<view class="num1">
-											
-											<img  src="@/assets/img/9-4/月卡价格.png" />
-											
-										</view>
-										<text
-											class="num">{{ (item.electricityPrice).toFixed(2)}}元/度</text>
-										
-									</view>
-								</view>
-								<!-- 游客价格-->
-								<view class="price" v-else>
-									<view class="price-1">
-										<text class="num">
-											{{showNumJP(item.electricityPrice+item.servicePrice)}}</text>
-										<text class="unit " oldstyle="font-size: 48rpx;">元/度</text>
-									</view>
-									<view class="price-3 " oldstyle="font-size: 48rpx;" v-if="item.giveDiscount">
-										<text class="num1">
-											<img  src="@/assets/img/9-4/会员价.svg" />
-											
-											
-										</text>
-										<text
-											class="num">{{ showNumJP(item.electricityPrice+item.discountServicePrice)}}元/度</text>
-										<text class="unit "></text>
-									</view>
-								</view>
-							</view>
-
-						</view>
-
-					</view>
-
-					<u-divider margin-top="20"  v-if="stationslist.length!=0" style="margin-bottom: 20px;" bg-color="#F2F4F4"
-						 >已经到底了</u-divider>
-
-				</view>
-
-			</view>
-		</view>
-		<view v-show="viewMode">
-			<view>
-				<Chargermap @onMoveStart="moveStart" @onMoveEnd="moveEnd" ref="amap" @onClicked="onClicked"
-					@onload="mapdown" @clickMap="clickMap"></Chargermap>
-				<!--@location="location"-->
-				<view class="locationBtn" style=' ' @click="setCenter">
-					<u-image src="@/static/img/location.png" border-radius="8" bg-color="#ffffff" width="20px"
-						height="20px"></u-image>
-				</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 " v-if="item.distance != '99999999'">
-										<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;" v-else>
-										<text class="iconfont" style="color:#666666">&#xe615;</text>
-										暂无定位
-									</view>
-								</view>
-								<view class="sign min-h">
-
-
-									<view class="sign-tag sign-1"
-										v-if="item.giveDiscount&&item.discountRatio&&item.discountRatio!=100">
-										会员{{discountRatio10(item.discountRatio)}}折</view>
-									<view class="sign-tag sign-3" v-if="item.category=='超充'">160kW超充站</view>
-									<view class="sign-tag sign-4" v-if="item.nightLowPriceEnabled">
-										夜间超低价</view>
-
-
-									<view class="sign-tag sign-2" v-if="item.platformType==1">自营站</view>
-									<view class="sign-tag sign-2" v-if="item.tagList.length != 0"
-										v-for="(tagName,tagIndex) in item.tagList" :key="tagIndex">{{tagName}}
-									</view>
-
-								</view>
-								<view class="price-free  price-freeOne">
-									<view class="price" v-if="personInfo&&personInfo.userType==2">
-										<view class="price-1">
-											<text class="num">{{!item.giveDiscount ? (item.electricityPrice+item.servicePrice).toFixed(2)
-											: (item.electricityPrice+item.discountServicePrice).toFixed(2)}}</text>
-											<text class="unit " oldstyle="font-size: 14px;">
-												元/度
-											</text>
-										</view>
-										<view class="price-2 " 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="price" v-else>
-										<view class="price-1">
-											<text class="num">
-												{{(item.electricityPrice+item.servicePrice).toFixed(2)}}</text>
-											<text class="unit " oldstyle="font-size: 48rpx;">元/度</text>
-										</view>
-										<view class="price-3 " oldstyle="font-size: 48rpx;" v-if="item.giveDiscount">
-											<text class="num1">会员</text>
-											<text
-												class="num">{{ (item.electricityPrice+item.discountServicePrice).toFixed(2)}}</text>
-											<text class="unit ">元/度</text>
-										</view>
-									</view>
-
-
-									<view class="free">
-
-										<view class="fast" v-if="item.fastNum">
-											<view class="fast-font">
-												快
-											</view>
-											<view class="num">
-
-												{{item.fastAvailableNum}}
-											</view>
-											<view class="num1">
-											
-												/{{item.fastNum}}
-											</view>
-										</view>
-										<view class="slow" v-if="item.slowNum">
-											<view class="slow-font">
-												慢
-											</view>
-											<view class="num">
-												{{item.slowAvailableNum}}
-											</view>
-											<view class="num1">
-												/{{item.slowNum}}
-											</view>
-										</view>
-									</view>
-								</view>
-							</view>
-						</view>
-					</swiper-item>
-				</swiper>
-			</view>
-
-		</view>
-
-		<Tabbar :current="2" ref="tabbarMain"></Tabbar>
-
-	</view>
-</template>
-
-<script>
-	import * as indexAPI from '@/apis/index.js'
-	import * as api from '@/apis/site.js';
-	import Tabbar from '@/components/Tabbar.vue';
-	import Chargermap from '@/components/Chargermap.vue';
-	import jpDropdown from '@/components/Udropdown.vue';
-
-	import uniCombox from '@/components/uni-combox/components/uni-combox/uni-combox.vue'
-	import * as WxJsApi from '@/utils/wxJsApi.js'
-import {
-		newDate,parseUnixTime
-		
-	} from '@/utils'
-	export default {
-		components: {
-			Chargermap,
-			Tabbar,
-			uniCombox,
-			jpDropdown
-		},
-		data() {
-			return {
-				personInfo: {},
-				loading: false,
-				viewMode: false, //列表
-				inputStyle: {
-					backgroundColor: 'transparent',
-					"font-size": '32rpx',
-				},
-				defaultStation: [],
-				cities: ['荆州市'],
-				radiuses: ['1公里', '2公里', '5公里', '10公里', '20公里', '50公里', '100公里', '200公里'],
-				types: ['全部', '直流快充', '交流慢充'],
-				stationTypes: ['全部', '公共充电桩', '个人充电桩'],
-				info: {
-					miles_type: [{
-							distance: 1,
-							text: '1公里'
-						},
-						{
-							distance: 2,
-							text: '2公里'
-						},
-						{
-							distance: 5,
-							text: '5公里'
-						},
-						{
-							distance: 10,
-							text: '10公里'
-						},
-						{
-							distance: 20,
-							text: '20公里'
-						},
-						{
-							distance: 50,
-							text: '50公里'
-						},
-						{
-							distance: 100,
-							text: '100公里'
-						},
-						{
-							distance: 200,
-							text: '200公里'
-						}
-					],
-					obc_type: [{
-						value: '',
-						text: '全部'
-					}, {
-						value: 1,
-						text: '直流快充'
-					}, {
-						value: 2,
-						text: '交流慢充'
-					}],
-					obc_status: [{
-						value: 0,
-						text: '对外开放'
-					}, {
-						value: 1,
-						text: '不对外开放'
-					}],
-					obc_voltage: [{
-						value: 0,
-						text: '低于700V'
-					}, {
-						value: 1,
-						text: '700V及以上'
-					}],
-					obc_power: {
-						minValue: 0,
-						maxValue: 1000
-					},
-					obc_stationType: [{
-						value: '',
-						text: '全部'
-					}, {
-						value: -1,
-						text: '自营站'
-					}, {
-						value: 1,
-						text: '合作站'
-					}, {
-						value: 50,
-						text: '个人桩'
-					}]
-				},
-				preference: {
-					miles_index: 3,
-					obc_stationType_index: 0,
-					obc_type_index: 0,
-					obc_status_index: 0,
-					obc_voltage_index: 0,
-					save_preference: false,
-					obc_power: {
-						minValue: 0,
-						maxValue: 500
-					}
-				},
-
-				area: '荆州市',
-				raidus: '10公里',
-				type: '全部',
-				stationType: '全部',
-				longitude: '',
-				latitude: '',
-				message: '',
-				stationslist: [],
-				stationsmap: [],
-				pointTimeOut: true,
-				dropdownShow: false,
-				currentIndex: 0,
-				carImg3span1:0,
-				carImg3span2:0,
-
-			}
-		},
-		onUnload() {
-			//this.timeOut = false;
-			this.pointTimeOut = false;
-		},
-		onHide() {
-			//this.timeOut = false;
-			this.pointTimeOut = false;
-		},
-		onShow() {
-			if (this.$refs.tabbarMain) {
-				this.$refs.tabbarMain.setcount(2);
-			}
-			if (!this.pointTimeOut) {
-				this.pointTimeOut = true
-				this.getPointTimeOut();
-			}
-			this.$nextTick(() => {
-				this.type = this.info.obc_type[this.preference.obc_type_index].text;
-				this.raidus = this.info.miles_type[this.preference.miles_index].text;
-				this.stationType = this.info.obc_stationType[this.preference.obc_stationType_index].text;
-
-
-				if (this.viewMode) {
-					this.$refs.amap.init();
-					this.searchStationData()
-
-
-				}
-
-			})
-
-		},
-		onLoad() {
-
-		},
-		onReady() {
-			WxJsApi.getWxConfig(['getLocation', 'addEventListener', 'scanQRCode']).then((res) => {
-				// //(res)
-			}).catch(error => {
-				//(res)
-			})
-			if (this.carhelp.getPersonInfo()) {
-				//	this.userId = this.carhelp.getPersonInfo().id;
-				this.personInfo = this.carhelp.getPersonInfo();
-			}
-			this.getPointTimeOut();
-			this.getChargeList()
-		},
-		computed: {
-			prevMonthKwhBL(){
-				if(this.carImg3span1>=1000){
-					return false
-				}
-				return true
-			},
-		},
-		methods: {
-			
-			getChargeList(){
-				var obj=this.carhelp.get("carhelp_getChargeList")
-				var time=new Date( ).toLocaleString().substr(0,12).replace("T"," ");
-				if(obj&&time==obj.time){
-					
-					this.carImg3span1=parseInt(obj.electricQuantity);
-					this.carImg3span2=parseInt(obj.totalServiceMoney) ;
-					console.log("carhelp_getChargeList",this.carImg3span1,this.carImg3span2)
-					return
-				}
-				
-				var date =new Date().getTime()-30*1000*60*60*24;
+							<img v-else src="@/assets/img/chargesite_default.png"  class="img1" mode=""></img>
+							<view class="img2Class" v-if="item.isRecommend||stationslist.length==0">
+								<img src="@/assets/img/9-4/推荐.svg" class="img2">
+							</view>
+							
+							<view class="img2Class" v-else-if="item.isAlways" >
+								
+								<img src="@/assets/img/9-4/常用.svg" class="img2">
+							</view>	
+							<view class="img2Class" v-else-if="item.isSpecial" >
+										
+								<img src="@/assets/img/9-4/特价tag.svg" class="img2">
+							</view>	
+						</view>
+						<view class="new-body">
+
+
+							<view class="address">
+								<view class="name oldTextjp" oldstyle="font-size: 20px;">
+									{{item.name}}
+								</view>
+
+							</view>
+
+							<view class="sign">
+								<!-- <view class="sign-tag sign-0" v-if="item.isRecommend||stationslist.length==0">推荐</view>
+							<view class="sign-tag sign-5" v-if="item.isAlways" >常用</view>	
+							 -->
+
+								<view class="sign-tag sign-1"
+									v-if="item.giveDiscount&&item.discountRatio&&item.discountRatio!=100">
+									会员{{discountRatio10(item.discountRatio)}}折</view>
+
+								<view class="sign-tag sign-4" v-if="item.nightLowPriceEnabled">
+									夜间超低价</view>
+
+								<view class="sign-tag sign-3" v-if="item.category=='超充'">160kW超充站</view>
+								<view class="sign-tag sign-2" v-if="item.platformType==1">自营站</view>
+								<view class="sign-tag sign-2" v-if="item.tagList.length != 0"
+									v-for="(tagName,tagIndex) in item.tagList" :key="tagIndex">{{tagName}}</view>
+
+								<template v-if="item.stationType==50">
+									{{item.address}}
+								</template>
+							</view>
+
+							<view class="price-free price-freeList" style="margin-top: 16rpx;">
+								<view class="free">
+
+									<view class="fast" v-if="item.fastNum">
+										<view class="fast-font">
+											快
+										</view>
+										<view class="num">
+
+											{{item.fastAvailableNum}}
+										</view>
+										<view class="num1">
+										
+											/{{item.fastNum}}
+										</view>
+									</view>
+									<view class="slow" v-if="item.slowNum">
+										<view class="slow-font">
+											慢
+										</view>
+										<view class="num">
+											{{item.slowAvailableNum}}
+										</view>
+										<view class="num1">
+											/{{item.slowNum}}
+										</view>
+									</view>
+								</view>
+								<template v-if="stationslist.length!=0">
+
+									<view class="distance " v-if="item.distance != '99999999'">
+										<text class="iconfont" style="color:#666666">&#xe615;</text>
+										{{item.distance!=null && item.distance>0.1 ? item.distance.toFixed(1)+'km' : '小于100m'}}
+									</view>
+									<view class="distance oldTextjp2" oldstyle="font-size: 16px;" v-else>
+										<text class="iconfont" style="color:#666666">&#xe615;</text>
+										暂无定位
+									</view>
+								</template>
+							</view>
+							<u-line margin="16rpx 0 "></u-line>
+
+							<view class="price-free price-freeList">
+								<view class="price" v-if="personInfo&&personInfo.userType==2">
+									<view class="price-1">
+										<text class="num">{{!item.giveDiscount ? (item.electricityPrice+item.servicePrice).toFixed(2)
+									: (item.electricityPrice+item.discountServicePrice).toFixed(2)}}</text>
+										<text class="unit " oldstyle="font-size: 14px;">
+											元/度
+										</text>
+									</view>
+									
+									<view class="price-3 "  v-if="prevMonthKwhBL&&item.tagList&&item.tagList.length&&(item.tagList.indexOf('6折卡')>-1||item.tagList.indexOf('月卡')>-1||item.tagList.indexOf('自营站')>-1)">
+										<view class="num1">
+											
+											<img  src="@/assets/img/9-4/6折卡价.svg" />
+											
+										</view>
+										<text
+											class="num">{{ (item.electricityPrice+(item.servicePrice*0.6)).toFixed(2)}}元/度</text>
+										
+									</view>
+									<view class="price-3 price-3-yue "  v-if="!prevMonthKwhBL&&item.tagList&&item.tagList.length&&(item.tagList.indexOf('6折卡')>-1||item.tagList.indexOf('月卡')>-1||item.tagList.indexOf('自营站')>-1)">
+										<view class="num1">
+											
+											<img  src="@/assets/img/9-4/月卡价格.png" />
+											
+										</view>
+										<text
+											class="num">{{ (item.electricityPrice).toFixed(2)}}元/度</text>
+										
+									</view>
+								</view>
+								<!-- 游客价格-->
+								<view class="price" v-else>
+									<view class="price-1">
+										<text class="num">
+											{{showNumJP(item.electricityPrice+item.servicePrice)}}</text>
+										<text class="unit " oldstyle="font-size: 48rpx;">元/度</text>
+									</view>
+									<view class="price-3 " oldstyle="font-size: 48rpx;" v-if="item.giveDiscount">
+										<text class="num1">
+											<img  src="@/assets/img/9-4/会员价.svg" />
+											
+											
+										</text>
+										<text
+											class="num">{{ showNumJP(item.electricityPrice+item.discountServicePrice)}}元/度</text>
+										<text class="unit "></text>
+									</view>
+								</view>
+							</view>
+
+						</view>
+
+					</view>
+
+					<u-divider margin-top="20"  v-if="stationslist.length!=0" style="margin-bottom: 20px;" bg-color="#F2F4F4"
+						 >已经到底了</u-divider>
+
+				</view>
+
+			</view>
+		</view>
+		<view v-show="viewMode">
+			<view>
+				<Chargermap @onMoveStart="moveStart" @onMoveEnd="moveEnd" ref="amap" @onClicked="onClicked"
+					@onload="mapdown" @clickMap="clickMap"></Chargermap>
+				<!--@location="location"-->
+				<view class="locationBtn" style=' ' @click="setCenter">
+					<u-image src="@/assets/static/img/location.png" border-radius="8" bg-color="#ffffff" width="20px"
+						height="20px"></u-image>
+				</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 " v-if="item.distance != '99999999'">
+										<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;" v-else>
+										<text class="iconfont" style="color:#666666">&#xe615;</text>
+										暂无定位
+									</view>
+								</view>
+								<view class="sign min-h">
+
+
+									<view class="sign-tag sign-1"
+										v-if="item.giveDiscount&&item.discountRatio&&item.discountRatio!=100">
+										会员{{discountRatio10(item.discountRatio)}}折</view>
+									<view class="sign-tag sign-3" v-if="item.category=='超充'">160kW超充站</view>
+									<view class="sign-tag sign-4" v-if="item.nightLowPriceEnabled">
+										夜间超低价</view>
+
+
+									<view class="sign-tag sign-2" v-if="item.platformType==1">自营站</view>
+									<view class="sign-tag sign-2" v-if="item.tagList.length != 0"
+										v-for="(tagName,tagIndex) in item.tagList" :key="tagIndex">{{tagName}}
+									</view>
+
+								</view>
+								<view class="price-free  price-freeOne">
+									<view class="price" v-if="personInfo&&personInfo.userType==2">
+										<view class="price-1">
+											<text class="num">{{!item.giveDiscount ? (item.electricityPrice+item.servicePrice).toFixed(2)
+											: (item.electricityPrice+item.discountServicePrice).toFixed(2)}}</text>
+											<text class="unit " oldstyle="font-size: 14px;">
+												元/度
+											</text>
+										</view>
+										<view class="price-2 " 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="price" v-else>
+										<view class="price-1">
+											<text class="num">
+												{{(item.electricityPrice+item.servicePrice).toFixed(2)}}</text>
+											<text class="unit " oldstyle="font-size: 48rpx;">元/度</text>
+										</view>
+										<view class="price-3 " oldstyle="font-size: 48rpx;" v-if="item.giveDiscount">
+											<text class="num1">会员</text>
+											<text
+												class="num">{{ (item.electricityPrice+item.discountServicePrice).toFixed(2)}}</text>
+											<text class="unit ">元/度</text>
+										</view>
+									</view>
+
+
+									<view class="free">
+
+										<view class="fast" v-if="item.fastNum">
+											<view class="fast-font">
+												快
+											</view>
+											<view class="num">
+
+												{{item.fastAvailableNum}}
+											</view>
+											<view class="num1">
+											
+												/{{item.fastNum}}
+											</view>
+										</view>
+										<view class="slow" v-if="item.slowNum">
+											<view class="slow-font">
+												慢
+											</view>
+											<view class="num">
+												{{item.slowAvailableNum}}
+											</view>
+											<view class="num1">
+												/{{item.slowNum}}
+											</view>
+										</view>
+									</view>
+								</view>
+							</view>
+						</view>
+					</swiper-item>
+				</swiper>
+			</view>
+
+		</view>
+
+		<Tabbar :current="2" ref="tabbarMain"></Tabbar>
+
+	</view>
+</template>
+
+<script>
+	import * as indexAPI from '@/apis/index.js'
+	import * as api from '@/apis/site.js';
+	import Tabbar from '@/components/Tabbar.vue';
+	import Chargermap from '@/components/Chargermap.vue';
+	import jpDropdown from '@/components/Udropdown.vue';
+
+	import uniCombox from '@/components/uni-combox/components/uni-combox/uni-combox.vue'
+	import * as WxJsApi from '@/utils/wxJsApi.js'
+import {
+		newDate,parseUnixTime
+		
+	} from '@/utils'
+	export default {
+		components: {
+			Chargermap,
+			Tabbar,
+			uniCombox,
+			jpDropdown
+		},
+		data() {
+			return {
+				personInfo: {},
+				loading: false,
+				viewMode: false, //列表
+				inputStyle: {
+					backgroundColor: 'transparent',
+					"font-size": '32rpx',
+				},
+				defaultStation: [],
+				cities: ['荆州市'],
+				radiuses: ['1公里', '2公里', '5公里', '10公里', '20公里', '50公里', '100公里', '200公里'],
+				types: ['全部', '直流快充', '交流慢充'],
+				stationTypes: ['全部', '公共充电桩', '个人充电桩'],
+				info: {
+					miles_type: [{
+							distance: 1,
+							text: '1公里'
+						},
+						{
+							distance: 2,
+							text: '2公里'
+						},
+						{
+							distance: 5,
+							text: '5公里'
+						},
+						{
+							distance: 10,
+							text: '10公里'
+						},
+						{
+							distance: 20,
+							text: '20公里'
+						},
+						{
+							distance: 50,
+							text: '50公里'
+						},
+						{
+							distance: 100,
+							text: '100公里'
+						},
+						{
+							distance: 200,
+							text: '200公里'
+						}
+					],
+					obc_type: [{
+						value: '',
+						text: '全部'
+					}, {
+						value: 1,
+						text: '直流快充'
+					}, {
+						value: 2,
+						text: '交流慢充'
+					}],
+					obc_status: [{
+						value: 0,
+						text: '对外开放'
+					}, {
+						value: 1,
+						text: '不对外开放'
+					}],
+					obc_voltage: [{
+						value: 0,
+						text: '低于700V'
+					}, {
+						value: 1,
+						text: '700V及以上'
+					}],
+					obc_power: {
+						minValue: 0,
+						maxValue: 1000
+					},
+					obc_stationType: [{
+						value: '',
+						text: '全部'
+					}, {
+						value: -1,
+						text: '自营站'
+					}, {
+						value: 1,
+						text: '合作站'
+					}, {
+						value: 50,
+						text: '个人桩'
+					}]
+				},
+				preference: {
+					miles_index: 3,
+					obc_stationType_index: 0,
+					obc_type_index: 0,
+					obc_status_index: 0,
+					obc_voltage_index: 0,
+					save_preference: false,
+					obc_power: {
+						minValue: 0,
+						maxValue: 500
+					}
+				},
+
+				area: '荆州市',
+				raidus: '10公里',
+				type: '全部',
+				stationType: '全部',
+				longitude: '',
+				latitude: '',
+				message: '',
+				stationslist: [],
+				stationsmap: [],
+				pointTimeOut: true,
+				dropdownShow: false,
+				currentIndex: 0,
+				carImg3span1:0,
+				carImg3span2:0,
+
+			}
+		},
+		onUnload() {
+			//this.timeOut = false;
+			this.pointTimeOut = false;
+		},
+		onHide() {
+			//this.timeOut = false;
+			this.pointTimeOut = false;
+		},
+		onShow() {
+			if (this.$refs.tabbarMain) {
+				this.$refs.tabbarMain.setcount(2);
+			}
+			if (!this.pointTimeOut) {
+				this.pointTimeOut = true
+				this.getPointTimeOut();
+			}
+			this.$nextTick(() => {
+				this.type = this.info.obc_type[this.preference.obc_type_index].text;
+				this.raidus = this.info.miles_type[this.preference.miles_index].text;
+				this.stationType = this.info.obc_stationType[this.preference.obc_stationType_index].text;
+
+
+				if (this.viewMode) {
+					this.$refs.amap.init();
+					this.searchStationData()
+
+
+				}
+
+			})
+
+		},
+		onLoad() {
+
+		},
+		onReady() {
+			WxJsApi.getWxConfig(['getLocation', 'addEventListener', 'scanQRCode']).then((res) => {
+				// //(res)
+			}).catch(error => {
+				//(res)
+			})
+			if (this.carhelp.getPersonInfo()) {
+				//	this.userId = this.carhelp.getPersonInfo().id;
+				this.personInfo = this.carhelp.getPersonInfo();
+			}
+			this.getPointTimeOut();
+			this.getChargeList()
+		},
+		computed: {
+			prevMonthKwhBL(){
+				if(this.carImg3span1>=1000){
+					return false
+				}
+				return true
+			},
+		},
+		methods: {
+			
+			getChargeList(){
+				var obj=this.carhelp.get("carhelp_getChargeList")
+				var time=new Date( ).toLocaleString().substr(0,12).replace("T"," ");
+				if(obj&&time==obj.time){
+					
+					this.carImg3span1=parseInt(obj.electricQuantity);
+					this.carImg3span2=parseInt(obj.totalServiceMoney) ;
+					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}');
-				if (this.carhelp.getPersonInfo()) {
-				indexAPI.chargingRecordData({
-					pageIndex: 1,
-					pageSize:999,
-					startDate: startDate,
-					// endDate: this.endDate
-				}).then((res) => {
-				
-					
-					var chargeList =res.data.data;
-					var num1=0;
-					var num2=0;
-					for(var i in chargeList){
-						var obj=chargeList[i]
-						if(obj.status==2){
-							num1+=obj.electricQuantity
-							num2+=obj.totalServiceMoney
-						}
-					}
-					console.log(num1,num2)
-					this.carImg3span1=parseInt(num1);
-					this.carImg3span2=parseInt(num2) ;
-					
-					this.carhelp.set("carhelp_getChargeList",{
-						time: time,
-						electricQuantity:num1,
-						totalServiceMoney:num2
-					})
-					
-					// if(num2*0.4>20){
-					
-					// 	this.carImg3Bl=true;
-					// }else{
-					// 	this.carImg4Bl=true;
-					// }
-					
-				}).catch(error => {
-					uni.showToast({
-						title: error,
-						icon: "none"
-					})
+				if (this.carhelp.getPersonInfo()) {
+				indexAPI.chargingRecordData({
+					pageIndex: 1,
+					pageSize:999,
+					startDate: startDate,
+					// endDate: this.endDate
+				}).then((res) => {
+				
+					
+					var chargeList =res.data.data;
+					var num1=0;
+					var num2=0;
+					for(var i in chargeList){
+						var obj=chargeList[i]
+						if(obj.status==2){
+							num1+=obj.electricQuantity
+							num2+=obj.totalServiceMoney
+						}
+					}
+					console.log(num1,num2)
+					this.carImg3span1=parseInt(num1);
+					this.carImg3span2=parseInt(num2) ;
+					
+					this.carhelp.set("carhelp_getChargeList",{
+						time: time,
+						electricQuantity:num1,
+						totalServiceMoney:num2
+					})
+					
+					// if(num2*0.4>20){
+					
+					// 	this.carImg3Bl=true;
+					// }else{
+					// 	this.carImg4Bl=true;
+					// }
+					
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
 				})
-				}
-			},
-			
-			navigate() {
-				//('naviage to ')
-				uni.navigateTo({
-					url: '/pages/search/search'
-
-				})
-			},
-			isEnabled() {
-				if (this.viewMode) {
-					if (this.show)
-						return false;
-				}
-				return true;
-			},
-			stationDetail(item) {
-				if (!this.isEnabled()) {
-					return;
-				}
-
-
-				uni.navigateTo({
-					url: 'stationAndPile/stationDetails?id=' + item.id
-				})
-			},
-			setCenter() {
-				//('getPoint')
-				WxJsApi.getLocation().then((res) => {
-
-					this.latitude = parseFloat(res.latitude);
-					this.longitude = parseFloat(res.longitude);
-					//let data = {position:{latitude:latitude,longitude:longitude}};
-
-					let posCenter = {
-						longitude: this.longitude,
-						latitude: this.latitude
-					};
-
-					this.$refs.amap.setCenter(posCenter);
-					this.searchStationData();
-				}).catch(error => {
-					uni.showToast({
-						title: JSON.stringify(error)
-					})
-				})
-
-				//			//('setCenter')
-			},
-			updateType2(e) {
-				this.preference.obc_stationType_index = e.value;
-				this.close();
-
-			},
-			swiperTransitionEnd(e) {
-
-			},
-			swiperTransition(e) {
-				//
-			},
-			updateType(e) {
-				this.preference.obc_type_index = e.value;
-				this.close();
-
-			},
-			updateRadius(e) {
-				this.preference.miles_index = e.value;
-				this.close();
-
-			},
-			selectOBSType(index) {
-				this.preference.obc_type_index = index;
-			},
-			selectOBSType2(index) {
-				this.preference.obc_stationType_index = index;
-			},
-			selectOBSStatus(index) {
-				this.preference.obc_status_index = index;
-			},
-			selectOBCVoltage(index) {
-				this.preference.obc_voltage_index = index;
-			},
-			selectMiles(index) {
-				this.preference.miles_index = index;
-			},
-			swiperChange(e) {
-				if (!this.viewMode) {
-					return
-				}
-				this.currentIndex = e.detail.current
-				let station = this.stationsmap[this.currentIndex];
-
-				let posCenter = {
-					longitude: station.longitude,
-					latitude: station.latitude
-				};
-				//			//('currentIndex'+JSON.stringify(this.currentIndex))
-				//			//('currentIndex'+JSON.stringify(posCenter))
-				//			//('station'+JSON.stringify(station))
-				let bounds = this.$refs.amap.logMapInfo();
-				/*if( (posCenter.latitude<bounds.bounds.northeast.lat && posCenter.latitude>bounds.bounds.sourthwest.lat)
-				&&  (posCenter.longitude<bounds.bounds.northeast.lng && posCenter.longitude>bounds.bounds.sourthwest.lng)
-				){
-					//('bounds'+JSON.stringify(bounds));
-					
-				}else{			
-					this.$refs.amap.setCenter(posCenter);				
-				}*/
-
-				this.$refs.amap.updateCharger(station);
-				this.$refs.amap.setCenter(posCenter);
-
-			},
-			listMode() {
-				this.close_all();
-				this.viewMode = false
-			},
-			mapMode() {
-				//this.$refs.amap.setChargerList(this.stationslist);
-				this.$refs.amap.init();
-
-				//this.currentIndex = 0;
-				this.close_all();
-				this.searchStationData()
-				this.viewMode = true
-			},
-			reset() {
-				this.preference.obc_status_index = 0;
-				this.preference.obc_voltage_index = 0;
-				this.preference.obc_stationType_index = 0;
-
-				this.preference.obc_type_index = 0;
-				this.preference.miles_index = 3;
-				this.preference.save_preference = false;
-				//			this.$refs.obc_voltage.currentValue = [0,100];
-				this.preference.obc_power.minValue = 0;
-				this.preference.obc_power.maxValue = 500;
-				this.preference.obc_power.minP = Math.floor((this.preference.obc_power.minValue / (this.info.obc_power
-					.maxValue - this.info.obc_power.minValue)) * 100);
-				this.preference.obc_power.maxP = Math.floor((this.preference.obc_power.maxValue / (this.info.obc_power
-					.maxValue - this.info.obc_power.minValue)) * 100);
-				//            //('minP'+this.preference.obc_power.minP)
-				//            //('maxP'+this.preference.obc_power.maxP)
-				//this.$refs.obc_voltage.reset(this.preference.obc_power);
-				//			this.$refs.obc_voltage.currentMaxValue = this.preference.obc_power[1];
-				// 			//('reset')
-			},
-
-			close() {
-
-				this.updateTypeSelector('')
-
-				this.type = this.info.obc_type[this.preference.obc_type_index].text;
-				this.raidus = this.info.miles_type[this.preference.miles_index].text;
-				this.stationType = this.info.obc_stationType[this.preference.obc_stationType_index].text;
-
-				if (this.preference.save_preference) {
-					this.carhelp.set('preference', this.preference)
-				}
-				this.$refs.uDropdown.close();
-				this.searchStationData();
-
-
-			},
-			clickMap(obj) {
-				//this.show = false;
-
-				if (obj == null || obj.type == null) return;
-				if (obj.type == 'charger') {
-					if (obj.obj != null) {
-
-						let index = this.stationsmap.findIndex(item => item.id == obj.obj.id);
-						this.currentIndex = index;
-						//('find Index'+index);
-					}
-
-				}
-			},
-			getPoint() {
-				if (this.stationslist.length != 0) {
-					return
-				}
-
-				WxJsApi.getLocation().then((res) => {
-
-					this.latitude = parseFloat(res.latitude);
-					this.longitude = parseFloat(res.longitude);
-					this.message = res.errMsg;
-
-
-					if (res.errMsg != 'getLocation:ok') {
-						uni.showToast({
-							title: res
-						})
-					} else {
-						uni.showToast({
-							title: "定位中..."
-						})
-						this.searchStationData()
-					}
-				}).catch(error => {
-					uni.showToast({
-						title: error,
-						icon: "none"
-					})
-				})
-			},
-			searchStationData(obj) {
-				let data1 = {
-					latitude: this.latitude,
-					longitude: this.longitude,
-					findType: "1",
-					pageIndex: 1,
-					pageSize: 999
-				};
-				if (obj) {
-					data1 = {
-						...data1,
-						...obj
-					}
-				}
-
-				data1.type = this.info.obc_type[this.preference.obc_type_index].value;
-				if (this.info.miles_type[this.preference.miles_index].distance != null)
-					data1.raidus = this.info.miles_type[this.preference.miles_index].distance.toString();
-
-				if (this.preference.obc_stationType_index != null) {
-					var stationType = this.info.obc_stationType[this.preference.obc_stationType_index].value
-					if (stationType == -1) {
-						data1.platformType = "1"
-					} else {
-						data1.stationType = stationType
-					}
-
-				}
-				//this.currentIndex = -1;
-				//data1.findType = this.viewMode?"0":"1";
-				uni.showLoading({})
-
-				if (this.carhelp.getPersonInfo()) {
-					data1.openId = this.carhelp.getOpenId()
-				}
-				this.loading = false
-				api.getChargingStationData(data1).then(res => {
-					uni.hideLoading()
-					this.loading = true
-					this.recordsTotal = res.data.recordsTotal;
-
-					var stationslist = res.data.data
-					if (this.viewMode) {
-						this.stationsmap = stationslist;
-						this.$refs.amap.setChargerList(stationslist);
-						// this.$refs.amap.init();
-
-						if (this.currentIndex == -1 || this.currentIndex > stationslist.length) {
-							this.currentIndex = 0
-						}
-						if (stationslist.length) {
-							this.$refs.amap.updateCharger(stationslist[this.currentIndex]);
-						}
-						let posCenter = {
-							longitude: this.longitude,
-							latitude: this.latitude
-						};
-
-						this.$refs.amap.setCenter(posCenter);
-						this.$refs.amap.calcDistances([this.longitude, this.latitude], this.stationslist)
-
-						// this.$refs.amap.calcDistances([this.longitude, this.latitude], this.stationslist)
-
-					} else {
-						this.stationslist = stationslist;
-					}
-					if (this.stationslist.length == 0) {
-						this.getChargingStationDetail()
-					}
-
-				}).catch(error => {
-					uni.showToast({
-						title: error,
-						icon: "none"
-					})
-				})
-
-			},
-			getChargingStationDetail() {
-				var defaultStation = process.car.defaultStation
-				for (var item in defaultStation) {
-					api.getChargingStationDetail({
-						stationId: defaultStation[item]
-					}).then((res) => {
-
-						var station = res.data.station
-						//this.MapLoaderthen(station)
-
-						this.defaultStation.push(station)
-					}).catch(error => {
-
-						uni.showToast({
-							title: error,
-							icon: "none"
-						})
-					})
-				}
-
-			},
-			getPointTimeOut() {
-
-				setTimeout(() => {
-					if (this.pointTimeOut) {
-						this.getPoint();
-					}
-				}, 1000)
-
-			},
-			closeDropdown() {
-				this.$refs.uDropdown.close();
-			},
-			close_all() {
-
-				this.updateTypeSelector('')
-
-			},
-			updateTypeSelector(val) {
-
-				var sz = ["raidus", "type", 'city']
-				for (var i in sz) {
-					if (i == val && val != '') {
-
-					} else {
-						this.$refs[sz[i]].closeSelector();
-					}
-				}
-				//this.show = false;		
-			},
-			mapdown() {
-				//this.isReady = true;
-				//this.$refs.amap.getLocation ();
-				//let state = {};
-				uni.getSystemInfo({
-					success: (res) => {
-
-						let scrollH = res.windowHeight; // - uni.upx2px(88) - navbarH
-						let scrollW = res.windowWidth;
-						this.$refs.amap.setMyStyle("height:" + (scrollH - 88 - 50) + "px;width:" + scrollW +
-							"px;");
-					}
-				})
-
-			},
-			moveEnd(e) {
-				//('moveEnd')
-				this.close_all();
-				let posCenter = this.$refs.amap.logMapInfo();
-				////('posCenter'+JSON.stringify(posCenter))		
-
-
-
-				if (this.latitude == e.center.lat && this.longitude == e.center.lng) {
-					return
-				}
-				this.latitude = e.center.lat
-				this.longitude = e.center.lng
-				this.searchStationData();
-			},
-			moveStart(e) {
-				//this.close_all();
-			},
-			onClicked(e) {
-				this.close_all();
-				////('onClicked e'+JSON.stringify(e))
-			},
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	@import "@/_theme.scss";
-
-	.locationBtn {
-		width: 30px;
-		height: 30px;
-		position: absolute;
-		z-index: 1023;
-		right: 40rpx;
-		bottom: 520rpx;
-		background: white;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		border: 1px solid;
-		border-radius: 8px;
-	}
-
-	.ujp-navbar-main {
-		display: flex;
-		flex-direction: column;
-		width: 100%;
-		height: 100%;
-
-		.ujp-navbar-main1 {
-			display: flex;
-			flex-direction: row;
-			height: 100%;
-			align-items: center;
-			margin-top: 0rpx;
-			padding-top: 0rpx;
-			padding-bottom: 20rpx;
-		}
-
-		.ujp-navbar-main2 {
-			display: flex;
-			flex-direction: row;
-			width: 100%;
-			justify-content: space-between;
-			align-items: center;
-		}
-	}
-
-
-	.preference_group_item {
-		padding: 15rpx;
-
-	}
-
-	.preference_group {
-		padding-bottom: 20rpx;
-	}
-
-	.preference {
-		background-color: #ffffff;
-		left: 0rpx;
-		//	position: absolute
-
-	}
-
-	.preference_item {
-		margin-bottom: 10rpx;
-		margin-left: 20rpx;
-		text-align: center;
-		border-style: none;
-		width: 20%;
-		//height: 56rpx;
-
-		/*	line-height: 14px;*/
-	}
-
-	.content-s {
-		height: 640rpx;
-		overflow-y: scroll;
-		text-align: left;
-	}
-
-	.preference_item_medium {
-		margin-bottom: 10rpx;
-		margin-left: 20rpx;
-		text-align: center;
-		border-style: none;
-		min-width: 22%;
-		//height: 56rpx;
-
-		@include themeify {
-			font-size: themed('font-size2');
-			line-height: themed('font-size2');
-		}
-
-		/*	line-height: 14px;*/
-	}
-
-	.preference_item_plus {
-		margin-bottom: 10rpx;
-		margin-left: 20rpx;
-		align-items: center;
-		justify-content: center;
-		text-align: center;
-		width: 28%;
-		border-style: none;
-		//height: 56rpx;
-
-		@include themeify {
-			font-size: themed('font-size2');
-			line-height: themed('font-size2');
-		}
-
-		/*	line-height: 14px;*/
-	}
-
-	.preference_label {
-		@include themeify {
-			color: themed('font_colorLabel');
-			font-size: themed('font-size1');
-			font-weight: themed('fontWeight');
-		}
-
-		margin-left: 20rpx;
-		margin-bottom: 100rpx;
-	}
-
-	.pre-btn {
-		width: 100%;
-		height: 96rpx;
-		z-index: 999;
-	}
-
-	.btn-1,
-	.btn-2 {
-		height: 96rpx;
-		line-height: 96rpx;
-		text-align: center;
-		border-top: 1px solid rgba(225, 228, 232, 100);
-	}
-
-	.station,
-	.location,
-	.state1 {
-		box-shadow: 0px 4rpx 12rpx 0px #008c4a33;
-	}
-
-	//定位
-
-	.location {
-		width: 91.4%;
-		background-color: #ffffff;
-		height: 120px;
-		display: flex;
-		justify-content: space-between;
-		margin: 20px auto 0;
-		border-radius: 8px;
-		border: #F2F4F4 1px;
-
-		.location-text {
-			padding: 24px 0 0 28px;
-
-			.text-1 {
-				height: 16px;
-				line-height: 16px;
-				color: rgba(16, 16, 16, 100);
-				font-size: 16px;
-				text-align: left;
-			}
-
-			.text-2 {
-				height: 17px;
-				line-height: 17px;
-				color: rgba(102, 102, 102, 100);
-				font-size: 12px;
-				text-align: left;
-				margin-top: 4px;
-				white-space: nowrap; //强制不换行
-				text-overflow: ellipsis; //文本超出出现省略号
-				overflow: hidden;
-			}
-
-			.text-view {
-				display: flex;
-			}
-
-			.text-3 {
-				width: 80px;
-				height: 24px;
-				line-height: 22px;
-				border-radius: 50px;
-				color: rgba(0, 185, 98, 100);
-				font-size: 12px;
-				text-align: center;
-				border: 1px solid rgba(0, 185, 98, 100);
-				margin-top: 11px;
-			}
-
-			.text-4 {
-				margin-left: 10px;
-				color: #ff9900;
-				border: 1px solid #ff9900;
-			}
-		}
-
-		.img-box {
-			width: 120px;
-			height: 120px;
-			margin-right: 20px;
-
-			img {
-				width: 100%;
-				height: 100%;
-			}
-		}
-	}
-
-	.carNone {
-		display: flex;
-		flex-direction: column;
-		justify-content: center;
-		align-items: center;
-
-		img {
-			width: 100%;
-			height: 100%;
-		}
-
-		p {
-			margin-top: -60px;
-		}
-	}
-
-	.charing-slow-2 {
-		margin: 0 0 20rpx 0 !important;
-		// border-bottom: 1px solid rgba(238, 242, 240, 100);
-
-	}
-
-	.charing-slow {
-		//box-shadow: 0px 4rpx 12rpx 0px #008c4a33;
-		background-color: #fff;
-		margin: 26rpx;
-		border-radius: 16rpx;
-		padding: 24rpx;
-		position: relative;
-		left: 0;
-		right: 0;
-	}
-
-	.min-h {
-		min-height: 65px;
-	}
-
-	.sign {
-		display: flex;
-		flex-wrap: wrap;
-		margin-top: 10px;
-		
-		.sign-tag {
-			
-			height: 36rpx;
-			line-height: 32rpx;
-			border-radius: 8rpx;
-			//background-color: rgba(255, 255, 255, 100);
-			//color: rgba(255, 139, 0, 100);
-			font-size: 10px;
-			text-align: center;
-			//border: 1px solid rgba(255, 139, 0, 100);
-			padding: 0 8rpx;
-			margin-right: 8rpx;
-			margin-bottom: 8rpx;
-		}
-
-		.sign-0 {
-			background: linear-gradient(89.4deg, rgba(129, 97, 255, 1) 2.8%, rgba(169, 147, 255, 1) 98.02%);
-			color: rgba(255, 255, 255, 1);
-			//padding: 0 10rpx;
-			//border: 1px solid rgba(255, 139, 0, 100);
-		}
-
-		.sign-5 {
-			background: linear-gradient(89.4deg, rgba(255, 61, 0, 1) 2.8%, rgba(255, 134, 0, 1) 98.02%);
-			color: rgba(255, 255, 255, 1);
-			//padding: 0 10rpx;
-		}
-
-		.sign-1 {
-			background-color: rgba(255, 255, 255, 100);
-			color: rgba(255, 139, 0, 100);
-			border: 1px solid rgba(255, 139, 0, 100);
-
-		}
-
-		.sign-2 {
-			background-color: rgba(255, 255, 255, 100);
-			color: rgba(153, 153, 153, 100);
-			border: 1px solid rgba(204, 204, 204, 100);
-
-		}
-
-		.sign-3 {
-			background-color: rgba(255, 255, 255, 100);
-			color: #8161FF;
-			border: 1px solid #8161FF;
-
-		}
-
-		.sign-4 {
-			background-color: rgba(255, 255, 255, 100);
-			color: #00B962;
-			border: 1px solid #00B962;
-		}
-	}
-
-	.address {
-		   
-		width: 100%;
-		line-height: 20px;
-
-		display: flex;
-		justify-content: space-between;
-
-		.name {
-			font-size: 36rpx;
-			white-space: nowrap;
-			overflow: hidden;
-			text-overflow: ellipsis;
-		}
-
-		
-
-		@include themeify {
-			font-size: themed('font-size5');
-			line-height: themed('font-size7');
-		}
-
-		/* 		font-size: 11px;*/
-		font-weight: 600;
-		color: #101010;
-	}
-
-	.price-free {
-		width: 100%;
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		
-	}
-	.distance {
-		color: rgba(102, 102, 102, 100);
-		text-align: end;
-		font-size: 30rpx;
-		width: 180rpx;
-		min-width: 180rpx;
-	
-		.iconfont {
-			font-size: 12px;
-			margin-right: 2px;
-		}
-	}
-	.price {
-		display: flex;
-		align-items: center;
-
-
-		.price-1 {
-			line-height: 40rpx;
-
-			.num {
-
-				//color: rgba(255, 98, 0, 100);
-				color: rgba(16, 16, 16, 1);
-
-
-				font-size: 40rpx;
-				//height: 44rpx;
-				font-weight: bold;
-				text-align: left;
-				font-family: Roboto-medium;
-			}
-
-			.unit {
-				// font-size: 12px;
-				color: rgba(119, 119, 119, 1);
-				font-size: 28rpx;
-
-
-				text-align: left;
-				font-family: AlibabaPuHui-regular;
-
-				margin-left: 8rpx;
-			}
-		}
-
-		.price-2 {
-			color: rgba(153, 153, 153, 100);
-			margin-left: 6rpx;
-			text-decoration: line-through;
-			font-size: 24rpx
-		}
-		.price-3{
-			    display: flex;
-			background: linear-gradient(93.02deg, rgba(59,182,254,1) 39.4%,rgba(0,185,98,1) 92.96%);
-			border-radius: 4px;
-			height: 16px;
-			min-height: 16px;
-			    margin-left: 32rpx;
-			//	align-items: center;
-			line-height: 16px;
-			.num1{
-				img{
-					// width: 88rpx;
-					//width: 34px;
-					height: 16px;
-				}
-				/deep/.u-image{
-					 min-height: 16px;
-					
-				}
-			}
-			.num{
-				padding: 0 12rpx 0 8rpx;
-				color: rgba(255, 255, 255, 1);
-				font-size: 11px;
-				display: flex;
-				align-items: center;
-				
-			}
-		}
-		.price-3-yue{
-			background: linear-gradient(88.81deg, rgba(219,199,167,1) 1.89%,rgba(194,154,93,1) 98%);
-		}
-		
-	}
-
-	.free {
-		display: flex;
-		align-items: center;
-
-		.slow,
-		.fast {
-			display: flex;
-
-			.sp-font {
-				width: 40rpx;
-				height: 40rpx;
-				line-height: 40rpx;
-				border-radius: 4px;
-				background-color: #7a68f6;
-				color: #fff;
-				font-size: 28rpx;
-				text-align: center;
-				margin-right: 2rpx;
-			}
-
-			.fast-font {
-				width: 40rpx;
-				height: 40rpx;
-				line-height: 40rpx;
-				border-radius: 4px;
-				//background-color: rgba(186, 240, 215, 100);
-				background-color: #1677FF;
-				color: rgba(255, 255, 255, 1);
-				//color: rgba(0, 130, 69, 100);
-				font-size: 28rpx;
-				text-align: center;
-				margin-right: 2rpx;
-			}
-
-			.slow-font {
-				width: 40rpx;
-				height: 40rpx;
-				line-height: 40rpx;
-				border-radius: 4px;
-				// background-color: rgba(226, 226, 226, 100);
-				// color: rgba(128, 128, 128, 100);
-				background-color: #00B962;
-				color: rgba(255, 255, 255, 1);
-				font-size: 28rpx;
-				text-align: center;
-				margin-right: 2rpx;
-			}
-
-			.num {
-				font-size: 32rpx;
-				color: #666;
-				line-height: 40rpx;
-			}
-			.num1 {
-				font-size: 32rpx;
-				color: #bbb;
-				line-height: 40rpx;
-			}
-		}
-		
-		
-		.slow {
-			margin-left: 16rpx;
-		}
-	}
-
-
-	.chargerCard {
-		z-index: 999;
-		background-color: #fff;
-		margin: 0 24rpx;
-		border-radius: 16rpx;
-		// overflow: hidden;
-		bottom: 68px;
-		left: 0;
-		right: 0;
-		position: fixed;
-		// height: 380rpx;
-
-
-
-		// @include themeify{
-		// 	height:themed('cardHeight'); 
-		// } 
-
-	}
-
-
-	.charing-new {
-		display: flex;
-
-		.new-img {
-			.img1 {
-				width: 120rpx;
-				height: 120rpx;
-				border-radius: 4px;
-			}
-			.img2Class{
-				       top: -134rpx;
-				       left: -16rpx;
-				    position: relative;
-				    border-radius: 4px 4px 4px 0px;
-				    color: #fff;
-				    padding: 2px 6px;
-				    font-size: 10px;
-				    line-height: 10px;
-				    height: 1px;
-				    background-blend-mode: soft-light;
-					.img2 {
-						
-						width: 56rpx;
-						height: 32rpx;
-						min-width: 28px;
-						min-height: 16px;
-						//border-radius: 4px;
-					}
-			}
-		}
-
-		.new-body {
-			max-width: 75%;
-			margin-left: 24rpx;
-			min-width: 65%;
-			.sign {
-				margin-top: 12rpx;
-			}
-		}
-	}
+				}
+			},
+			
+			navigate() {
+				//('naviage to ')
+				uni.navigateTo({
+					url: '/pages/search/search'
+
+				})
+			},
+			isEnabled() {
+				if (this.viewMode) {
+					if (this.show)
+						return false;
+				}
+				return true;
+			},
+			stationDetail(item) {
+				if (!this.isEnabled()) {
+					return;
+				}
+
+
+				uni.navigateTo({
+					url: 'stationAndPile/stationDetails?id=' + item.id
+				})
+			},
+			setCenter() {
+				//('getPoint')
+				WxJsApi.getLocation().then((res) => {
+
+					this.latitude = parseFloat(res.latitude);
+					this.longitude = parseFloat(res.longitude);
+					//let data = {position:{latitude:latitude,longitude:longitude}};
+
+					let posCenter = {
+						longitude: this.longitude,
+						latitude: this.latitude
+					};
+
+					this.$refs.amap.setCenter(posCenter);
+					this.searchStationData();
+				}).catch(error => {
+					uni.showToast({
+						title: JSON.stringify(error)
+					})
+				})
+
+				//			//('setCenter')
+			},
+			updateType2(e) {
+				this.preference.obc_stationType_index = e.value;
+				this.close();
+
+			},
+			swiperTransitionEnd(e) {
+
+			},
+			swiperTransition(e) {
+				//
+			},
+			updateType(e) {
+				this.preference.obc_type_index = e.value;
+				this.close();
+
+			},
+			updateRadius(e) {
+				this.preference.miles_index = e.value;
+				this.close();
+
+			},
+			selectOBSType(index) {
+				this.preference.obc_type_index = index;
+			},
+			selectOBSType2(index) {
+				this.preference.obc_stationType_index = index;
+			},
+			selectOBSStatus(index) {
+				this.preference.obc_status_index = index;
+			},
+			selectOBCVoltage(index) {
+				this.preference.obc_voltage_index = index;
+			},
+			selectMiles(index) {
+				this.preference.miles_index = index;
+			},
+			swiperChange(e) {
+				if (!this.viewMode) {
+					return
+				}
+				this.currentIndex = e.detail.current
+				let station = this.stationsmap[this.currentIndex];
+
+				let posCenter = {
+					longitude: station.longitude,
+					latitude: station.latitude
+				};
+				//			//('currentIndex'+JSON.stringify(this.currentIndex))
+				//			//('currentIndex'+JSON.stringify(posCenter))
+				//			//('station'+JSON.stringify(station))
+				let bounds = this.$refs.amap.logMapInfo();
+				/*if( (posCenter.latitude<bounds.bounds.northeast.lat && posCenter.latitude>bounds.bounds.sourthwest.lat)
+				&&  (posCenter.longitude<bounds.bounds.northeast.lng && posCenter.longitude>bounds.bounds.sourthwest.lng)
+				){
+					//('bounds'+JSON.stringify(bounds));
+					
+				}else{			
+					this.$refs.amap.setCenter(posCenter);				
+				}*/
+
+				this.$refs.amap.updateCharger(station);
+				this.$refs.amap.setCenter(posCenter);
+
+			},
+			listMode() {
+				this.close_all();
+				this.viewMode = false
+			},
+			mapMode() {
+				//this.$refs.amap.setChargerList(this.stationslist);
+				this.$refs.amap.init();
+
+				//this.currentIndex = 0;
+				this.close_all();
+				this.searchStationData()
+				this.viewMode = true
+			},
+			reset() {
+				this.preference.obc_status_index = 0;
+				this.preference.obc_voltage_index = 0;
+				this.preference.obc_stationType_index = 0;
+
+				this.preference.obc_type_index = 0;
+				this.preference.miles_index = 3;
+				this.preference.save_preference = false;
+				//			this.$refs.obc_voltage.currentValue = [0,100];
+				this.preference.obc_power.minValue = 0;
+				this.preference.obc_power.maxValue = 500;
+				this.preference.obc_power.minP = Math.floor((this.preference.obc_power.minValue / (this.info.obc_power
+					.maxValue - this.info.obc_power.minValue)) * 100);
+				this.preference.obc_power.maxP = Math.floor((this.preference.obc_power.maxValue / (this.info.obc_power
+					.maxValue - this.info.obc_power.minValue)) * 100);
+				//            //('minP'+this.preference.obc_power.minP)
+				//            //('maxP'+this.preference.obc_power.maxP)
+				//this.$refs.obc_voltage.reset(this.preference.obc_power);
+				//			this.$refs.obc_voltage.currentMaxValue = this.preference.obc_power[1];
+				// 			//('reset')
+			},
+
+			close() {
+
+				this.updateTypeSelector('')
+
+				this.type = this.info.obc_type[this.preference.obc_type_index].text;
+				this.raidus = this.info.miles_type[this.preference.miles_index].text;
+				this.stationType = this.info.obc_stationType[this.preference.obc_stationType_index].text;
+
+				if (this.preference.save_preference) {
+					this.carhelp.set('preference', this.preference)
+				}
+				this.$refs.uDropdown.close();
+				this.searchStationData();
+
+
+			},
+			clickMap(obj) {
+				//this.show = false;
+
+				if (obj == null || obj.type == null) return;
+				if (obj.type == 'charger') {
+					if (obj.obj != null) {
+
+						let index = this.stationsmap.findIndex(item => item.id == obj.obj.id);
+						this.currentIndex = index;
+						//('find Index'+index);
+					}
+
+				}
+			},
+			getPoint() {
+				if (this.stationslist.length != 0) {
+					return
+				}
+
+				WxJsApi.getLocation().then((res) => {
+
+					this.latitude = parseFloat(res.latitude);
+					this.longitude = parseFloat(res.longitude);
+					this.message = res.errMsg;
+
+
+					if (res.errMsg != 'getLocation:ok') {
+						uni.showToast({
+							title: res
+						})
+					} else {
+						uni.showToast({
+							title: "定位中..."
+						})
+						this.searchStationData()
+					}
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+			},
+			searchStationData(obj) {
+				let data1 = {
+					latitude: this.latitude,
+					longitude: this.longitude,
+					findType: "1",
+					pageIndex: 1,
+					pageSize: 999
+				};
+				if (obj) {
+					data1 = {
+						...data1,
+						...obj
+					}
+				}
+
+				data1.type = this.info.obc_type[this.preference.obc_type_index].value;
+				if (this.info.miles_type[this.preference.miles_index].distance != null)
+					data1.raidus = this.info.miles_type[this.preference.miles_index].distance.toString();
+
+				if (this.preference.obc_stationType_index != null) {
+					var stationType = this.info.obc_stationType[this.preference.obc_stationType_index].value
+					if (stationType == -1) {
+						data1.platformType = "1"
+					} else {
+						data1.stationType = stationType
+					}
+
+				}
+				//this.currentIndex = -1;
+				//data1.findType = this.viewMode?"0":"1";
+				uni.showLoading({})
+
+				if (this.carhelp.getPersonInfo()) {
+					data1.openId = this.carhelp.getOpenId()
+				}
+				this.loading = false
+				api.getChargingStationData(data1).then(res => {
+					uni.hideLoading()
+					this.loading = true
+					this.recordsTotal = res.data.recordsTotal;
+
+					var stationslist = res.data.data
+					if (this.viewMode) {
+						this.stationsmap = stationslist;
+						this.$refs.amap.setChargerList(stationslist);
+						// this.$refs.amap.init();
+
+						if (this.currentIndex == -1 || this.currentIndex > stationslist.length) {
+							this.currentIndex = 0
+						}
+						if (stationslist.length) {
+							this.$refs.amap.updateCharger(stationslist[this.currentIndex]);
+						}
+						let posCenter = {
+							longitude: this.longitude,
+							latitude: this.latitude
+						};
+
+						this.$refs.amap.setCenter(posCenter);
+						this.$refs.amap.calcDistances([this.longitude, this.latitude], this.stationslist)
+
+						// this.$refs.amap.calcDistances([this.longitude, this.latitude], this.stationslist)
+
+					} else {
+						this.stationslist = stationslist;
+					}
+					if (this.stationslist.length == 0) {
+						this.getChargingStationDetail()
+					}
+
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+
+			},
+			getChargingStationDetail() {
+				var defaultStation = process.car.defaultStation
+				for (var item in defaultStation) {
+					api.getChargingStationDetail({
+						stationId: defaultStation[item]
+					}).then((res) => {
+
+						var station = res.data.station
+						//this.MapLoaderthen(station)
+
+						this.defaultStation.push(station)
+					}).catch(error => {
+
+						uni.showToast({
+							title: error,
+							icon: "none"
+						})
+					})
+				}
+
+			},
+			getPointTimeOut() {
+
+				setTimeout(() => {
+					if (this.pointTimeOut) {
+						this.getPoint();
+					}
+				}, 1000)
+
+			},
+			closeDropdown() {
+				this.$refs.uDropdown.close();
+			},
+			close_all() {
+
+				this.updateTypeSelector('')
+
+			},
+			updateTypeSelector(val) {
+
+				var sz = ["raidus", "type", 'city']
+				for (var i in sz) {
+					if (i == val && val != '') {
+
+					} else {
+						this.$refs[sz[i]].closeSelector();
+					}
+				}
+				//this.show = false;		
+			},
+			mapdown() {
+				//this.isReady = true;
+				//this.$refs.amap.getLocation ();
+				//let state = {};
+				uni.getSystemInfo({
+					success: (res) => {
+
+						let scrollH = res.windowHeight; // - uni.upx2px(88) - navbarH
+						let scrollW = res.windowWidth;
+						this.$refs.amap.setMyStyle("height:" + (scrollH - 88 - 50) + "px;width:" + scrollW +
+							"px;");
+					}
+				})
+
+			},
+			moveEnd(e) {
+				//('moveEnd')
+				this.close_all();
+				let posCenter = this.$refs.amap.logMapInfo();
+				////('posCenter'+JSON.stringify(posCenter))		
+
+
+
+				if (this.latitude == e.center.lat && this.longitude == e.center.lng) {
+					return
+				}
+				this.latitude = e.center.lat
+				this.longitude = e.center.lng
+				this.searchStationData();
+			},
+			moveStart(e) {
+				//this.close_all();
+			},
+			onClicked(e) {
+				this.close_all();
+				////('onClicked e'+JSON.stringify(e))
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "@/_theme.scss";
+
+	.locationBtn {
+		width: 30px;
+		height: 30px;
+		position: absolute;
+		z-index: 1023;
+		right: 40rpx;
+		bottom: 520rpx;
+		background: white;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		border: 1px solid;
+		border-radius: 8px;
+	}
+
+	.ujp-navbar-main {
+		display: flex;
+		flex-direction: column;
+		width: 100%;
+		height: 100%;
+
+		.ujp-navbar-main1 {
+			display: flex;
+			flex-direction: row;
+			height: 100%;
+			align-items: center;
+			margin-top: 0rpx;
+			padding-top: 0rpx;
+			padding-bottom: 20rpx;
+		}
+
+		.ujp-navbar-main2 {
+			display: flex;
+			flex-direction: row;
+			width: 100%;
+			justify-content: space-between;
+			align-items: center;
+		}
+	}
+
+
+	.preference_group_item {
+		padding: 15rpx;
+
+	}
+
+	.preference_group {
+		padding-bottom: 20rpx;
+	}
+
+	.preference {
+		background-color: #ffffff;
+		left: 0rpx;
+		//	position: absolute
+
+	}
+
+	.preference_item {
+		margin-bottom: 10rpx;
+		margin-left: 20rpx;
+		text-align: center;
+		border-style: none;
+		width: 20%;
+		//height: 56rpx;
+
+		/*	line-height: 14px;*/
+	}
+
+	.content-s {
+		height: 640rpx;
+		overflow-y: scroll;
+		text-align: left;
+	}
+
+	.preference_item_medium {
+		margin-bottom: 10rpx;
+		margin-left: 20rpx;
+		text-align: center;
+		border-style: none;
+		min-width: 22%;
+		//height: 56rpx;
+
+		@include themeify {
+			font-size: themed('font-size2');
+			line-height: themed('font-size2');
+		}
+
+		/*	line-height: 14px;*/
+	}
+
+	.preference_item_plus {
+		margin-bottom: 10rpx;
+		margin-left: 20rpx;
+		align-items: center;
+		justify-content: center;
+		text-align: center;
+		width: 28%;
+		border-style: none;
+		//height: 56rpx;
+
+		@include themeify {
+			font-size: themed('font-size2');
+			line-height: themed('font-size2');
+		}
+
+		/*	line-height: 14px;*/
+	}
+
+	.preference_label {
+		@include themeify {
+			color: themed('font_colorLabel');
+			font-size: themed('font-size1');
+			font-weight: themed('fontWeight');
+		}
+
+		margin-left: 20rpx;
+		margin-bottom: 100rpx;
+	}
+
+	.pre-btn {
+		width: 100%;
+		height: 96rpx;
+		z-index: 999;
+	}
+
+	.btn-1,
+	.btn-2 {
+		height: 96rpx;
+		line-height: 96rpx;
+		text-align: center;
+		border-top: 1px solid rgba(225, 228, 232, 100);
+	}
+
+	.station,
+	.location,
+	.state1 {
+		box-shadow: 0px 4rpx 12rpx 0px #008c4a33;
+	}
+
+	//定位
+
+	.location {
+		width: 91.4%;
+		background-color: #ffffff;
+		height: 120px;
+		display: flex;
+		justify-content: space-between;
+		margin: 20px auto 0;
+		border-radius: 8px;
+		border: #F2F4F4 1px;
+
+		.location-text {
+			padding: 24px 0 0 28px;
+
+			.text-1 {
+				height: 16px;
+				line-height: 16px;
+				color: rgba(16, 16, 16, 100);
+				font-size: 16px;
+				text-align: left;
+			}
+
+			.text-2 {
+				height: 17px;
+				line-height: 17px;
+				color: rgba(102, 102, 102, 100);
+				font-size: 12px;
+				text-align: left;
+				margin-top: 4px;
+				white-space: nowrap; //强制不换行
+				text-overflow: ellipsis; //文本超出出现省略号
+				overflow: hidden;
+			}
+
+			.text-view {
+				display: flex;
+			}
+
+			.text-3 {
+				width: 80px;
+				height: 24px;
+				line-height: 22px;
+				border-radius: 50px;
+				color: rgba(0, 185, 98, 100);
+				font-size: 12px;
+				text-align: center;
+				border: 1px solid rgba(0, 185, 98, 100);
+				margin-top: 11px;
+			}
+
+			.text-4 {
+				margin-left: 10px;
+				color: #ff9900;
+				border: 1px solid #ff9900;
+			}
+		}
+
+		.img-box {
+			width: 120px;
+			height: 120px;
+			margin-right: 20px;
+
+			img {
+				width: 100%;
+				height: 100%;
+			}
+		}
+	}
+
+	.carNone {
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+
+		img {
+			width: 100%;
+			height: 100%;
+		}
+
+		p {
+			margin-top: -60px;
+		}
+	}
+
+	.charing-slow-2 {
+		margin: 0 0 20rpx 0 !important;
+		// border-bottom: 1px solid rgba(238, 242, 240, 100);
+
+	}
+
+	.charing-slow {
+		//box-shadow: 0px 4rpx 12rpx 0px #008c4a33;
+		background-color: #fff;
+		margin: 26rpx;
+		border-radius: 16rpx;
+		padding: 24rpx;
+		position: relative;
+		left: 0;
+		right: 0;
+	}
+
+	.min-h {
+		min-height: 65px;
+	}
+
+	.sign {
+		display: flex;
+		flex-wrap: wrap;
+		margin-top: 10px;
+		
+		.sign-tag {
+			
+			height: 36rpx;
+			line-height: 32rpx;
+			border-radius: 8rpx;
+			//background-color: rgba(255, 255, 255, 100);
+			//color: rgba(255, 139, 0, 100);
+			font-size: 10px;
+			text-align: center;
+			//border: 1px solid rgba(255, 139, 0, 100);
+			padding: 0 8rpx;
+			margin-right: 8rpx;
+			margin-bottom: 8rpx;
+		}
+
+		.sign-0 {
+			background: linear-gradient(89.4deg, rgba(129, 97, 255, 1) 2.8%, rgba(169, 147, 255, 1) 98.02%);
+			color: rgba(255, 255, 255, 1);
+			//padding: 0 10rpx;
+			//border: 1px solid rgba(255, 139, 0, 100);
+		}
+
+		.sign-5 {
+			background: linear-gradient(89.4deg, rgba(255, 61, 0, 1) 2.8%, rgba(255, 134, 0, 1) 98.02%);
+			color: rgba(255, 255, 255, 1);
+			//padding: 0 10rpx;
+		}
+
+		.sign-1 {
+			background-color: rgba(255, 255, 255, 100);
+			color: rgba(255, 139, 0, 100);
+			border: 1px solid rgba(255, 139, 0, 100);
+
+		}
+
+		.sign-2 {
+			background-color: rgba(255, 255, 255, 100);
+			color: rgba(153, 153, 153, 100);
+			border: 1px solid rgba(204, 204, 204, 100);
+
+		}
+
+		.sign-3 {
+			background-color: rgba(255, 255, 255, 100);
+			color: #8161FF;
+			border: 1px solid #8161FF;
+
+		}
+
+		.sign-4 {
+			background-color: rgba(255, 255, 255, 100);
+			color: #00B962;
+			border: 1px solid #00B962;
+		}
+	}
+
+	.address {
+		   
+		width: 100%;
+		line-height: 20px;
+
+		display: flex;
+		justify-content: space-between;
+
+		.name {
+			font-size: 36rpx;
+			white-space: nowrap;
+			overflow: hidden;
+			text-overflow: ellipsis;
+		}
+
+		
+
+		@include themeify {
+			font-size: themed('font-size5');
+			line-height: themed('font-size7');
+		}
+
+		/* 		font-size: 11px;*/
+		font-weight: 600;
+		color: #101010;
+	}
+
+	.price-free {
+		width: 100%;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		
+	}
+	.distance {
+		color: rgba(102, 102, 102, 100);
+		text-align: end;
+		font-size: 30rpx;
+		width: 180rpx;
+		min-width: 180rpx;
+	
+		.iconfont {
+			font-size: 12px;
+			margin-right: 2px;
+		}
+	}
+	.price {
+		display: flex;
+		align-items: center;
+
+
+		.price-1 {
+			line-height: 40rpx;
+
+			.num {
+
+				//color: rgba(255, 98, 0, 100);
+				color: rgba(16, 16, 16, 1);
+
+
+				font-size: 40rpx;
+				//height: 44rpx;
+				font-weight: bold;
+				text-align: left;
+				font-family: Roboto-medium;
+			}
+
+			.unit {
+				// font-size: 12px;
+				color: rgba(119, 119, 119, 1);
+				font-size: 28rpx;
+
+
+				text-align: left;
+				font-family: AlibabaPuHui-regular;
+
+				margin-left: 8rpx;
+			}
+		}
+
+		.price-2 {
+			color: rgba(153, 153, 153, 100);
+			margin-left: 6rpx;
+			text-decoration: line-through;
+			font-size: 24rpx
+		}
+		.price-3{
+			    display: flex;
+			background: linear-gradient(93.02deg, rgba(59,182,254,1) 39.4%,rgba(0,185,98,1) 92.96%);
+			border-radius: 4px;
+			height: 16px;
+			min-height: 16px;
+			    margin-left: 32rpx;
+			//	align-items: center;
+			line-height: 16px;
+			.num1{
+				img{
+					// width: 88rpx;
+					//width: 34px;
+					height: 16px;
+				}
+				/deep/.u-image{
+					 min-height: 16px;
+					
+				}
+			}
+			.num{
+				padding: 0 12rpx 0 8rpx;
+				color: rgba(255, 255, 255, 1);
+				font-size: 11px;
+				display: flex;
+				align-items: center;
+				
+			}
+		}
+		.price-3-yue{
+			background: linear-gradient(88.81deg, rgba(219,199,167,1) 1.89%,rgba(194,154,93,1) 98%);
+		}
+		
+	}
+
+	.free {
+		display: flex;
+		align-items: center;
+
+		.slow,
+		.fast {
+			display: flex;
+
+			.sp-font {
+				width: 40rpx;
+				height: 40rpx;
+				line-height: 40rpx;
+				border-radius: 4px;
+				background-color: #7a68f6;
+				color: #fff;
+				font-size: 28rpx;
+				text-align: center;
+				margin-right: 2rpx;
+			}
+
+			.fast-font {
+				width: 40rpx;
+				height: 40rpx;
+				line-height: 40rpx;
+				border-radius: 4px;
+				//background-color: rgba(186, 240, 215, 100);
+				background-color: #1677FF;
+				color: rgba(255, 255, 255, 1);
+				//color: rgba(0, 130, 69, 100);
+				font-size: 28rpx;
+				text-align: center;
+				margin-right: 2rpx;
+			}
+
+			.slow-font {
+				width: 40rpx;
+				height: 40rpx;
+				line-height: 40rpx;
+				border-radius: 4px;
+				// background-color: rgba(226, 226, 226, 100);
+				// color: rgba(128, 128, 128, 100);
+				background-color: #00B962;
+				color: rgba(255, 255, 255, 1);
+				font-size: 28rpx;
+				text-align: center;
+				margin-right: 2rpx;
+			}
+
+			.num {
+				font-size: 32rpx;
+				color: #666;
+				line-height: 40rpx;
+			}
+			.num1 {
+				font-size: 32rpx;
+				color: #bbb;
+				line-height: 40rpx;
+			}
+		}
+		
+		
+		.slow {
+			margin-left: 16rpx;
+		}
+	}
+
+
+	.chargerCard {
+		z-index: 999;
+		background-color: #fff;
+		margin: 0 24rpx;
+		border-radius: 16rpx;
+		// overflow: hidden;
+		bottom: 68px;
+		left: 0;
+		right: 0;
+		position: fixed;
+		// height: 380rpx;
+
+
+
+		// @include themeify{
+		// 	height:themed('cardHeight'); 
+		// } 
+
+	}
+
+
+	.charing-new {
+		display: flex;
+
+		.new-img {
+			.img1 {
+				width: 120rpx;
+				height: 120rpx;
+				border-radius: 4px;
+			}
+			.img2Class{
+				       top: -134rpx;
+				       left: -16rpx;
+				    position: relative;
+				    border-radius: 4px 4px 4px 0px;
+				    color: #fff;
+				    padding: 2px 6px;
+				    font-size: 10px;
+				    line-height: 10px;
+				    height: 1px;
+				    background-blend-mode: soft-light;
+					.img2 {
+						
+						width: 56rpx;
+						height: 32rpx;
+						min-width: 28px;
+						min-height: 16px;
+						//border-radius: 4px;
+					}
+			}
+		}
+
+		.new-body {
+			max-width: 75%;
+			margin-left: 24rpx;
+			min-width: 65%;
+			.sign {
+				margin-top: 12rpx;
+			}
+		}
+	}
 </style>

pages/searchPile/searchPileMap.vue

@@ -77,7 +77,7 @@
 					<text class="iconfont distance-font">&#xe615;</text><text class="text">1.2公里 3分钟</text>
 				</view>
 			</view>
-			<view class="img-box"><img src="/static/img/location.png" alt=""></view>
+			<view class="img-box"><img src="@/assets/static/img/location.png" alt=""></view>
 		</view>
         <view class="position-box">
         	<view class="iconfont position" >&#xe634;</view>

pages/searchPile/stationAndPile/chargingPileDetails.vue

@@ -11,8 +11,8 @@
 		</u-popup>
 
 		<view v-show="step==1">
-			<ujp-navbar title="费用说明页" :startGz="false"
-			 
+			<ujp-navbar title="费用说明页" :startGz="false"
+			 
 			 :custom-back="customback2" ref="ujpnavbar">
 
 			</ujp-navbar>
@@ -155,42 +155,42 @@
 
 								<view class="num1"  v-if="!userCard||userCard.serviceFeeDiscountRate==60" >
 
-									<img src="@/assets/img/9-4/6折卡价.svg" />
+									<img src="@/assets/img/9-4/6折卡价.svg" />
 									
-								</view>
-								<view class="num1" style="    background: #303133;
-										color: #f4f4f4;
-										border-radius: 4px 0 4px 4px;
-										padding: 0 3px;
-										margin-right: 3px;"  v-else >
-								
-								
-									<span v-if="userCard.cardType==4"  >折扣卡 </span>
-									<span v-else  >{{userCard.serviceFeeDiscountRate/10}}折卡 </span>
+								</view>
+								<view class="num1" style="    background: #303133;
+										color: #f4f4f4;
+										border-radius: 4px 0 4px 4px;
+										padding: 0 3px;
+										margin-right: 3px;"  v-else >
+								
+								
+									<span v-if="userCard.cardType==4"  >折扣卡 </span>
+									<span v-else  >{{userCard.serviceFeeDiscountRate/10}}折卡 </span>
 								</view>
 								<text
 									class="num">{{ (price.electricityPrice+(price.servicePrice*(userCard?userCard.serviceFeeDiscountRate/100:0.6))).toFixed(2)}}元/度</text>
 
 							</view>
 						</view>
-						<view class="price-3-card-view " v-else-if="personInfo&&personInfo.userType==2&&((userCardBool&&userCard.classify==1)||(!userCardBool&&!prevMonthKwhBL))">
-							<view class="price">
-						
-								<text class="span">{{price.costPrice.toFixed(2)}}</text><text class="unit">元/度</text>
-						
-							</view>
-							<view class="price-3-card price-3-card-yue ">
-						
-						
-								<view class="num1">
-						
-									<img src="@/assets/img/9-4/月卡价格.png" />
-						
-								</view>
-								<text
-									class="num">{{ (price.electricityPrice).toFixed(2)}}元/度</text>
-						
-							</view>
+						<view class="price-3-card-view " v-else-if="personInfo&&personInfo.userType==2&&((userCardBool&&userCard.classify==1)||(!userCardBool&&!prevMonthKwhBL))">
+							<view class="price">
+						
+								<text class="span">{{price.costPrice.toFixed(2)}}</text><text class="unit">元/度</text>
+						
+							</view>
+							<view class="price-3-card price-3-card-yue ">
+						
+						
+								<view class="num1">
+						
+									<img src="@/assets/img/9-4/月卡价格.png" />
+						
+								</view>
+								<text
+									class="num">{{ (price.electricityPrice).toFixed(2)}}元/度</text>
+						
+							</view>
 						</view>
 						<view class="price" v-else-if="false&&personInfo&&personInfo.userType==2">
 
@@ -283,16 +283,16 @@
 						</view>
 
 					</view>
-					<view class="discount-card" 
-					:class="{
-						'discount-card-4':userCard.cardType==4
-					}"
+					<view class="discount-card" 
+					:class="{
+						'discount-card-4':userCard.cardType==4
+					}"
 					v-if="userCardBool&&userCard.classify==2">
 						<view class="name" v-if="userCard.cardType==4">
 							51充电联盟{{userCard.monthlyRentName}}
-						</view>
-						<view class="name" v-else>
-							自营站充电服务费{{userCard.serviceFeeDiscountRate/10}}折卡
+						</view>
+						<view class="name" v-else>
+							自营站充电服务费{{userCard.serviceFeeDiscountRate/10}}折卡
 						</view>
 						<view class="progress">
 							<view class="time">
@@ -312,9 +312,9 @@
 			<view class="carImg" v-if="personInfo&&personInfo.userType!=2">
 					<img @click="gotoLogin" src="@/assets/img/gologin/img.png">
 			</view>
-			<view class="carImg3"  :class="{
-				'carImg3-yue':!prevMonthKwhBL
-			}"
+			<view class="carImg3"  :class="{
+				'carImg3-yue':!prevMonthKwhBL
+			}"
 			 v-else-if="carImg3Bl&&!userCardBool">
 				<view class="carImg2" v-if="prevMonthKwhBL" >
 					
@@ -326,61 +326,61 @@
 							<span>点击购买</span>
 						</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 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>
-			
-			<view class="carImg3" v-else-if="carImg4Bl&&!userCardBool">
-				<view class="carImg2" >
-					
-			
-					<view>
-						<view class="carImg-1">每月只需12.9元</view>
-						<view  class="carImg-2">前338度电可省约<span>67.6</span>元</view>
-						<view  class="carImg-3" @click="gotoUrl('pages/discountCard/productDetails')">
-							<span>点击购买</span>
-						</view>
-					</view>
-					</view>
-			
-			</view>
-			
+			</view>
+			
+			<view class="carImg3" v-else-if="carImg4Bl&&!userCardBool">
+				<view class="carImg2" >
+					
+			
+					<view>
+						<view class="carImg-1">每月只需12.9元</view>
+						<view  class="carImg-2">前338度电可省约<span>67.6</span>元</view>
+						<view  class="carImg-3" @click="gotoUrl('pages/discountCard/productDetails')">
+							<span>点击购买</span>
+						</view>
+					</view>
+					</view>
+			
+			</view>
+			
 			
 		
 			<view class="bottom">
 
 				<!-- 解锁中 -->
 				<!-- 						<u-button shape="circle" type="success" style="opacity: 0.4;">
-							解锁中<img style="margin-left: 4px;" src="../../../static/img/riLine-refresh-line.svg" alt="">
+							解锁中<img style="margin-left: 4px;" src="@/assets/static/img/riLine-refresh-line.svg" alt="">
 						</u-button> -->
 				<!-- 刷新充电枪状态   如果改动 ，请添加    方法判断startCarCharging  -->
 				<u-button shape="circle" type="success" v-if="gun&&gun.workStatus==2">充电中</u-button>
 
 				<u-button shape="circle" type="success" v-else-if="!openBool">仅单位内部员工可用</u-button>
 
-				<!-- 刷新充电枪状态   如果改动 ，请添加    方法判断startCarCharging  -->
+				<!-- 刷新充电枪状态   如果改动 ，请添加    方法判断startCarCharging  -->
 				
 				<u-button shape="circle" type="success" @click="getPile()"
 					v-else-if="gunDetail.chargingAppointment&&!gunDetail.isMeAppoint">已被预约</u-button>
 
-				<!-- 刷新充电枪状态   如果改动 ，请添加    方法判断startCarCharging  -->
+				<!-- 刷新充电枪状态   如果改动 ，请添加    方法判断startCarCharging  -->
 				
 				<u-button shape="circle" v-else-if="haveLock&&lockStatus==1" @click="lockDown()"
 					style="background-color:#009ED7" type="success">下降地锁</u-button>
 
 				<u-button shape="circle" v-else-if="!isInsert" @click="getPile()" type="success">刷新充电枪状态</u-button>
-				<!-- 刷新充电枪状态   如果改动 ，请添加    方法判断startCarCharging  -->
+				<!-- 刷新充电枪状态   如果改动 ，请添加    方法判断startCarCharging  -->
 				
 				<!-- 开始充电 -->
 				<u-button shape="circle" type="success" v-else @click="charge()">开始充电</u-button>
@@ -425,14 +425,14 @@
 					</view>
 					<view class="car-number" v-if="!car||!carplateMust">
 						{{car?car.carNum:'填车牌号减免停车费用'}}
-						<img v-if="!car" @click="carDet()" src="../../../static/img/riLine-edit-box-line2.svg" alt="">
+						<img v-if="!car" @click="carDet()" src="@/assets/static/img/riLine-edit-box-line2.svg" alt="">
 					</view>
 					<view class="car-number" v-else >
 						{{car?car.carNum:'填车牌号减免停车费用'}}
 						<!-- <img v-if="car&&car.carNum" @click="carTempBl=true"
-							src="../../../static/img/riLine-edit-box-line2.svg" alt=""> -->
+							src="@/assets/static/img/riLine-edit-box-line2.svg" alt=""> -->
 								
-						<img   @click="carTempBl=true" src="../../../static/img/riLine-edit-box-line2.svg" alt="">
+						<img   @click="carTempBl=true" src="@/assets/static/img/riLine-edit-box-line2.svg" alt="">
 								
 					</view>
 				</view>
@@ -578,56 +578,56 @@
 				</view>
 			</view>
 		</u-modal>
-		
-		
-		<u-modal v-model="quickChargingBl" class="quickMain" confirm-text="注册会员" cancel-text="先不注册" :show-title="false" width="650"
-			border-radius="30" title="" :show-cancel-button="false" :show-confirm-button="false">
-			<view class="quickMain-slot-content">
-				<!-- :show-title="false" -->
-		
-				<view class="quickMain-img">
-					<img src="@/assets/img/member/10.png" ></img>
-				</view>
-				<view  class="quickMain-bodyMain" >
-					<view  class="quickMain-body">
-						<view  class="quickMain-text1">快捷充电功能上线!</view>
-						<view  class="quickMain-text2">
-							恭喜您达到
-							<img src="@/assets/img/9-4/白金会员.svg" ></img>
-							<span style="color:#3F51B5;">白金会员</span>等级，您已获得<span style="color: #19be6b;">【快捷充电】</span>功能体验资格。
-							
-						</view>
-						<view  class="quickMain-text2">
-							当您插枪扫码后，在账户余额充足的情况下，自动帮您选择充满自停模式并开始充电。如需关闭此功能，可在“我的”-“设置”中修改。
-						</view>
-					</view>
-					<view class="btnview">
-						<!-- 	<u-button shape="circle" @click="show3=false"
-							style="    width: 200rpx;    background-color: #fff !important; margin: 20rpx;float: left;margin-bottom: 20px; "
-							szie="mini" type="success" plain>继续充电</u-button> -->
-						<view class="btnview1">
-							<u-button shape="circle" style=" float: left;   width: 400rpx; margin: 20rpx; " szie="mini"
-								type="success" @click="checkedChange2(1)">同意并记住我的选择</u-button>
-							
-						</view>
-							
-						<view class="btnview2" @click="checkedChange2(0)">暂不启用</view>
-					</view>
-				</view>
-				
-			</view>
-		</u-modal>
-		<u-modal v-model="carplateMustModel" :mask-close-able="true"  
-		@cancel="carTempBl=true" :title="station.name+'提醒您'"
-		cancel-text="临时车牌号" confirm-text="默认车牌号" :show-cancel-button="true"  >
-			<view style="padding: 20px;">
-				当前绑定的车牌号为<span style="color:#19be6b">{{car?car.carNum:''}}</span><br/>
-				车辆充电，车牌号一致可<span style="color:#FF5722">减免停车费</span>，不一致可使用临时车牌号，用于出入停车场
-			</view>
-		</u-modal>
-		<u-modal v-model="show1" @confirm="gotoGz" cancel-text="暂不关注" confirm-text="前往关注" :show-cancel-button="false"
-			confirm-color="#53b56b" ref="uModal2" :asyncClose="true">
-			<view style="padding: 15px;">请先关注<span style=" color:  #53b56b;">{{projectName}}</span>公众号，然后进行车辆充电</view>
+		
+		
+		<u-modal v-model="quickChargingBl" class="quickMain" confirm-text="注册会员" cancel-text="先不注册" :show-title="false" width="650"
+			border-radius="30" title="" :show-cancel-button="false" :show-confirm-button="false">
+			<view class="quickMain-slot-content">
+				<!-- :show-title="false" -->
+		
+				<view class="quickMain-img">
+					<img src="@/assets/img/member/10.png" ></img>
+				</view>
+				<view  class="quickMain-bodyMain" >
+					<view  class="quickMain-body">
+						<view  class="quickMain-text1">快捷充电功能上线!</view>
+						<view  class="quickMain-text2">
+							恭喜您达到
+							<img src="@/assets/img/9-4/白金会员.svg" ></img>
+							<span style="color:#3F51B5;">白金会员</span>等级，您已获得<span style="color: #19be6b;">【快捷充电】</span>功能体验资格。
+							
+						</view>
+						<view  class="quickMain-text2">
+							当您插枪扫码后，在账户余额充足的情况下，自动帮您选择充满自停模式并开始充电。如需关闭此功能，可在“我的”-“设置”中修改。
+						</view>
+					</view>
+					<view class="btnview">
+						<!-- 	<u-button shape="circle" @click="show3=false"
+							style="    width: 200rpx;    background-color: #fff !important; margin: 20rpx;float: left;margin-bottom: 20px; "
+							szie="mini" type="success" plain>继续充电</u-button> -->
+						<view class="btnview1">
+							<u-button shape="circle" style=" float: left;   width: 400rpx; margin: 20rpx; " szie="mini"
+								type="success" @click="checkedChange2(1)">同意并记住我的选择</u-button>
+							
+						</view>
+							
+						<view class="btnview2" @click="checkedChange2(0)">暂不启用</view>
+					</view>
+				</view>
+				
+			</view>
+		</u-modal>
+		<u-modal v-model="carplateMustModel" :mask-close-able="true"  
+		@cancel="carTempBl=true" :title="station.name+'提醒您'"
+		cancel-text="临时车牌号" confirm-text="默认车牌号" :show-cancel-button="true"  >
+			<view style="padding: 20px;">
+				当前绑定的车牌号为<span style="color:#19be6b">{{car?car.carNum:''}}</span><br/>
+				车辆充电，车牌号一致可<span style="color:#FF5722">减免停车费</span>，不一致可使用临时车牌号，用于出入停车场
+			</view>
+		</u-modal>
+		<u-modal v-model="show1" @confirm="gotoGz" cancel-text="暂不关注" confirm-text="前往关注" :show-cancel-button="false"
+			confirm-color="#53b56b" ref="uModal2" :asyncClose="true">
+			<view style="padding: 15px;">请先关注<span style=" color:  #53b56b;">{{projectName}}</span>公众号，然后进行车辆充电</view>
 		</u-modal>
 
 	</view>
@@ -639,7 +639,7 @@
 	import * as userApi from '@/apis/user.js'
 	import * as newsApi from '@/apis/news.js'
 	import ucarkeyboard from '@/components/Ucarkeyboard.vue'
-	
+	
 	import * as API_weixin from '@/apis/weixin.js'
 
 	import {
@@ -655,11 +655,11 @@
 			ucarkeyboard
 		},
 		data() {
-			return {
-				show1: false,
-				show2: false,
+			return {
+				show1: false,
+				show2: false,
 				
-				carImg3Bl:false,
+				carImg3Bl:false,
 				carImg4Bl:false,
 				carImg3span1:0,
 				carImg3span2:0,
@@ -726,20 +726,20 @@
 				carTempBl: false,
 				maxlength: 8,
 				chatShowId: "",
-				chatShow: false,
-				startCarChargingBl:false,
-				quickChargingBl:false,
-				carplateMustModel:false,
+				chatShow: false,
+				startCarChargingBl:false,
+				quickChargingBl:false,
+				carplateMustModel:false,
 				projectName: "",
 			}
 		},
 
-		computed: {
-			prevMonthKwhBL(){
-				if(this.carImg3span1>=1000){
-					return false
-				}
-				return true
+		computed: {
+			prevMonthKwhBL(){
+				if(this.carImg3span1>=1000){
+					return false
+				}
+				return true
 			},
 			openBool() {
 				if (this.openStatus == '3') {
@@ -770,65 +770,65 @@
 			}
 
 		},
-		methods: {
-			cancelGz() {
-				this.carhelp.setGzDate()
-			},
-			gotoGz() {
-				this.carhelp.setGzDate()
-			//	this.gotoGzShow = false;
-				var url = "https://mp.weixin.qq.com/s/mCHz1nNvg0xAICiBeIyKRQ";
-				window.location.href = url
-			
-			},
-			checkSubscribe() {
-				API_weixin.checkSubscribe({
-					openId: this.carhelp.getOpenId()
-				}).then((res) => {
-			
-					if (res.data == "0") {
-						this.show1 = true
-						
-					} else {
-						//this.init();
-						this.show1 = false;
-						this.show2 = true;
-			
-			
-						//this.carhelp.setGzDate() 
-			
-					}
-			
-					//setGzDate
-				}).catch(error => {
-					uni.showToast({
-						title: error
-					})
-				})
-			
-			},
-			checkedChange2(checked2) {
-			
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				
-				API_index.changeQuickCharging({qucikStatus: checked2}).then((res) => {
-					var userInfo = this.carhelp.getPersonInfo();
-					userInfo.quickCharging=checked2;
-					this.carhelp.setPersonInfo(userInfo);
-					this.quickChargingBl=false;
-					uni.hideLoading();
-					if(checked2){
-						this.startCarCharging()
-					}
-				}).catch(error => {
-					uni.showToast({
-						title: error,
-						icon: "none"
-					})
-				})
+		methods: {
+			cancelGz() {
+				this.carhelp.setGzDate()
+			},
+			gotoGz() {
+				this.carhelp.setGzDate()
+			//	this.gotoGzShow = false;
+				var url = "https://mp.weixin.qq.com/s/mCHz1nNvg0xAICiBeIyKRQ";
+				window.location.href = url
+			
+			},
+			checkSubscribe() {
+				API_weixin.checkSubscribe({
+					openId: this.carhelp.getOpenId()
+				}).then((res) => {
+			
+					if (res.data == "0") {
+						this.show1 = true
+						
+					} else {
+						//this.init();
+						this.show1 = false;
+						this.show2 = true;
+			
+			
+						//this.carhelp.setGzDate() 
+			
+					}
+			
+					//setGzDate
+				}).catch(error => {
+					uni.showToast({
+						title: error
+					})
+				})
+			
+			},
+			checkedChange2(checked2) {
+			
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				
+				API_index.changeQuickCharging({qucikStatus: checked2}).then((res) => {
+					var userInfo = this.carhelp.getPersonInfo();
+					userInfo.quickCharging=checked2;
+					this.carhelp.setPersonInfo(userInfo);
+					this.quickChargingBl=false;
+					uni.hideLoading();
+					if(checked2){
+						this.startCarCharging()
+					}
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
 			},
 			chatShowBtn(item) {
 				if(this.chatShow == false){
@@ -1104,27 +1104,27 @@
 				}
 				return true;
 			},
-			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) ;
-					this.carImg3span1=parseInt(num1/10000);
-					this.carImg3span2=parseInt(num2*0.4) ;
-					this.carImg3span3=parseInt(num2) ;
-					if(num2*0.4>20||this.carImg3span1>=1000){
-					
-						this.carImg3Bl=true;
-					}else{
-						this.carImg4Bl=true;
-					}
-					
-					console.log("carhelp_getChargeList",this.carImg3span1,this.carImg3span2)
-					return
-				}
-				
+			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) ;
+					this.carImg3span1=parseInt(num1/10000);
+					this.carImg3span2=parseInt(num2*0.4) ;
+					this.carImg3span3=parseInt(num2) ;
+					if(num2*0.4>20||this.carImg3span1>=1000){
+					
+						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}');
@@ -1146,20 +1146,20 @@
 							num2+=obj.totalServiceMoney
 						}
 					}
-					console.log(num1,num2)
-					this.carhelp.set("carhelp_getChargeList",{
-						time: time,
-						electricQuantity:num1,
-						totalServiceMoney:num2
-					})
-					this.carImg3span1=parseInt(num1/10000);
-					this.carImg3span2=parseInt(num2*0.4) ;
+					console.log(num1,num2)
+					this.carhelp.set("carhelp_getChargeList",{
+						time: time,
+						electricQuantity:num1,
+						totalServiceMoney:num2
+					})
+					this.carImg3span1=parseInt(num1/10000);
+					this.carImg3span2=parseInt(num2*0.4) ;
 					this.carImg3span3=parseInt(num2) ;
 					if(num2*0.4>20||this.carImg3span1>=1000){
 						
 						this.carImg3Bl=true;
-					}else{
-						this.carImg4Bl=true;
+					}else{
+						this.carImg4Bl=true;
 					}
 					
 				}).catch(error => {
@@ -1182,7 +1182,7 @@
 					this.userCard = res2.data.regUserCard
 					//this.canUse=res2.data.canUse
 					//this.user = res.data
-					this.personInfo = this.carhelp.getPersonInfo()
+					this.personInfo = this.carhelp.getPersonInfo()
 					
 					if (!this.userCardBool) {
 						if (this.personInfo && this.personInfo.userType == "2") {
@@ -1195,22 +1195,22 @@
 							
 						}
 
-					}
-					
-					//快捷充电
-					if (this.personInfo && (this.personInfo.memberLevel == "3"||this.personInfo.memberLevel == "4") ) {
-						if(this.personInfo.quickCharging){
-							
-							if(this.startCarChargingBl==false){
-							
-								this.startCarCharging()
-							}
-						}else if(this.personInfo.quickCharging==null){
-							//初始化
-							this.quickChargingBl=true
-						}
-						
-							
+					}
+					
+					//快捷充电
+					if (this.personInfo && (this.personInfo.memberLevel == "3"||this.personInfo.memberLevel == "4") ) {
+						if(this.personInfo.quickCharging){
+							
+							if(this.startCarChargingBl==false){
+							
+								this.startCarCharging()
+							}
+						}else if(this.personInfo.quickCharging==null){
+							//初始化
+							this.quickChargingBl=true
+						}
+						
+							
 					}
 
 				}).catch(error2 => {
@@ -1370,14 +1370,14 @@
 			charge(bl) {
 				if (!this.role(bl)) {
 					return
-				}
+				}
 				
 				
 				var url = '/pages/searchPile/chargeProcess/charge?stationId=' + this.detail.stationId +
 					'&deviceNo=' + this.detail.deviceNo + "&gun=" + this.gun.channelNo + "&carNumber=" + (
 						this.car ? this.car.carNum : '');
-					if(this.isback){
-						url+="&startMode=1"
+					if(this.isback){
+						url+="&startMode=1"
 					}
 	
 				uni.navigateTo({
@@ -1595,79 +1595,79 @@
 				if (personInfo && personInfo.userType == "1") {
 					this.showVin = true
 				}
-			},
-			startCarCharging(){
-				
-				if(this.gun&&this.gun.workStatus==2){
-					uni.showToast({
-						title:"快捷充电失败：充电中"
-					})
-				}else if(!this.openBool){
-					uni.showToast({
-						title:"快捷充电失败：仅单位内部员工可用"
-					})
-				}else if(this.gunDetail.chargingAppointment&&!this.gunDetail.isMeAppoint){
-					uni.showToast({
-						title:"快捷充电失败：已被预约"
-					})
-				}else if(this.haveLock&&this.lockStatus==1){
-					uni.showToast({
-						title:"快捷充电失败：下降地锁"
-					})
-				}else if(!this.isInsert){
-					uni.showToast({
-						title:"快捷充电失败：未插枪"
-					})
-				}else {
-					this.startCarChargingApi();
-				}
-			},
-			startCarChargingApi(){
-						uni.showLoading({
-							title:"快捷充电启动",
-							mask: true,
-						})
-						this.startCarChargingBl=true;
-						var submitForm={
-							deviceNo:this.detail.deviceNo,
-							channelNo:this.gun.channelNo,
-							carNumber:this.car ? this.car.carNum : '',
-							chargeStrategy:0,
-							amount:0,
-							payType:2,
-						}
-						if(this.userCardBool){
-							submitForm.userCardId=this.userCard.id
-						}
-						API.startCarCharging(submitForm).then((res) => {
-							if (res.data.status == "5") {
-								uni.showToast({
-									title:"快捷充电失败:用户余额不足！"
-								})
-								uni.hideLoading()
-							}else{
-								this.gotoUrl("pages/searchPile/chargeProcess/dcCharging?id=" + res.data.recordId);
-								
-							}
-							
-						}).catch(error => {
-							uni.hideLoading()
-							if (error == '用户账户余额不足!') {
-						
-							} else {
-								
-							}
-							uni.showToast({
-								title:"快捷充电失败:"+( error?error:'未知错误')
-							})
-						
-						})
+			},
+			startCarCharging(){
+				
+				if(this.gun&&this.gun.workStatus==2){
+					uni.showToast({
+						title:"快捷充电失败：充电中"
+					})
+				}else if(!this.openBool){
+					uni.showToast({
+						title:"快捷充电失败：仅单位内部员工可用"
+					})
+				}else if(this.gunDetail.chargingAppointment&&!this.gunDetail.isMeAppoint){
+					uni.showToast({
+						title:"快捷充电失败：已被预约"
+					})
+				}else if(this.haveLock&&this.lockStatus==1){
+					uni.showToast({
+						title:"快捷充电失败：下降地锁"
+					})
+				}else if(!this.isInsert){
+					uni.showToast({
+						title:"快捷充电失败：未插枪"
+					})
+				}else {
+					this.startCarChargingApi();
+				}
+			},
+			startCarChargingApi(){
+						uni.showLoading({
+							title:"快捷充电启动",
+							mask: true,
+						})
+						this.startCarChargingBl=true;
+						var submitForm={
+							deviceNo:this.detail.deviceNo,
+							channelNo:this.gun.channelNo,
+							carNumber:this.car ? this.car.carNum : '',
+							chargeStrategy:0,
+							amount:0,
+							payType:2,
+						}
+						if(this.userCardBool){
+							submitForm.userCardId=this.userCard.id
+						}
+						API.startCarCharging(submitForm).then((res) => {
+							if (res.data.status == "5") {
+								uni.showToast({
+									title:"快捷充电失败:用户余额不足！"
+								})
+								uni.hideLoading()
+							}else{
+								this.gotoUrl("pages/searchPile/chargeProcess/dcCharging?id=" + res.data.recordId);
+								
+							}
+							
+						}).catch(error => {
+							uni.hideLoading()
+							if (error == '用户账户余额不足!') {
+						
+							} else {
+								
+							}
+							uni.showToast({
+								title:"快捷充电失败:"+( error?error:'未知错误')
+							})
+						
+						})
 			}
 		},
 
 		onReady() {
 
-			this.projectName = process.car.ProjectName;
+			this.projectName = process.car.ProjectName;
 			
 			var consumerPhone = "400-8899-619"
 			// img="https://yktwechat.xiaoxinda.com/config/xxd2021.jpg"		
@@ -1678,8 +1678,8 @@
 			// img="https://yktwechat.xiaoxinda.com/config/xxd2021.jpg"		
 			if (carDetText) {
 				this.carDetText = carDetText
-			}
-			
+			}
+			
 			
 		},
 		onLoad(op) {
@@ -1751,27 +1751,27 @@
 			background: linear-gradient(84.49deg, rgba(59, 182, 254, 1) 4.25%, rgba(0, 185, 98, 1) 95.02%);
 		}
 	}
-	.discount-card-4 {
-		background:  #da241e !important;
-		.unit{
-			color:#fff !important;
-		}
-		.u-progress{
-			    background-color:#cf4c42 !important;
-				color: #fff;
-		}
-		.name{
-			color: #ffd695!important;
-			font-size: 36rpx;
-			  font-family: "SimSun", Arial, sans-serif;  
-			font-weight: 400;
-			  text-shadow: 2px 1px 0px #800400 ;  
-		
-		}
-		.progress{
-				color: #fff;
-		}
-	}
+	.discount-card-4 {
+		background:  #da241e !important;
+		.unit{
+			color:#fff !important;
+		}
+		.u-progress{
+			    background-color:#cf4c42 !important;
+				color: #fff;
+		}
+		.name{
+			color: #ffd695!important;
+			font-size: 36rpx;
+			  font-family: "SimSun", Arial, sans-serif;  
+			font-weight: 400;
+			  text-shadow: 2px 1px 0px #800400 ;  
+		
+		}
+		.progress{
+				color: #fff;
+		}
+	}
 	
 	.temporaryCarNum {
 		text-align: right;
@@ -1958,8 +1958,8 @@
 						/deep/.u-image {
 							min-height: 32rpx;
 
-						}
-						font-size: 22rpx;
+						}
+						font-size: 22rpx;
 						background: rgb(48, 49, 51);
 					}
 
@@ -1971,10 +1971,10 @@
 						align-items: center;
 
 					}
-				}
-				.price-3-card-yue{
-					background: linear-gradient(88.81deg, rgba(219,199,167,1) 1.89%,rgba(194,154,93,1) 98%);
-					
+				}
+				.price-3-card-yue{
+					background: linear-gradient(88.81deg, rgba(219,199,167,1) 1.89%,rgba(194,154,93,1) 98%);
+					
 				}
 			}
 
@@ -2090,7 +2090,7 @@
 					justify-content: space-between;
 					align-items: center;
 					.car-number {
-						display: flex;
+						display: flex;
 						  font-size: 32rpx;
 					}
 					
@@ -2168,17 +2168,17 @@
 		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;
+			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;
@@ -2187,8 +2187,8 @@
 				span{
 					font-size: 48rpx;
 					color:red;
-					margin: 0 4rpx;
-					font-weight: bold;
+					margin: 0 4rpx;
+					font-weight: bold;
 					padding:0rpx 4rpx;
 				}
 			}
@@ -2218,9 +2218,9 @@
 			span{
 				font-size: 48rpx;
 				color:red;
-				margin: 0 4rpx;
-				
-				font-weight: bold;
+				margin: 0 4rpx;
+				
+				font-weight: bold;
 				padding:0rpx 4rpx;
 			}
 		}
@@ -2285,7 +2285,7 @@
 		.btnview1 {}
 
 		.btnview2 {
-			color: #999999;
+			color: #999999;
 			margin-top: 20rpx;
 			padding-bottom: 48rpx;
 		}
@@ -2412,52 +2412,52 @@
 				justify-content: space-between;
 			}
 		}
-	}
-	
-	.quickMain{
-		/deep/.u-mode-center-box{
-			background-color: transparent;
-		}
-		/deep/.u-model{
-			background-color: transparent;
-		}
-		.quickMain-slot-content{
-			.quickMain-img{
-				    position: relative;
-				    top: 120rpx;
-				    text-align: center;
-				img{
-					width: 160rpx;
-					height: 240rpx;
-				}
-			}
-			.quickMain-bodyMain{
-				background-color:#fff;
-				border-radius: 15px;
-			}
-			.quickMain-body{
-				
-				margin:0 56rpx ;
-				color: rgba(51, 51, 51, 1);
-
-				.quickMain-text1{
-					font-size: 48rpx;
-					text-align: center;
-					padding: 132rpx 0 32rpx 0;
-				}
-				.quickMain-text2{
-					margin-bottom: 20rpx ;
-					//color: rgba(51, 51, 51, 1);
-					font-size: 32rpx;
-					img{
-						width: 40rpx;
-						//height: 120px;
-					}
-				}
-				
-			}
-			
-			
-		}
 	}
-</style>
+	
+	.quickMain{
+		/deep/.u-mode-center-box{
+			background-color: transparent;
+		}
+		/deep/.u-model{
+			background-color: transparent;
+		}
+		.quickMain-slot-content{
+			.quickMain-img{
+				    position: relative;
+				    top: 120rpx;
+				    text-align: center;
+				img{
+					width: 160rpx;
+					height: 240rpx;
+				}
+			}
+			.quickMain-bodyMain{
+				background-color:#fff;
+				border-radius: 15px;
+			}
+			.quickMain-body{
+				
+				margin:0 56rpx ;
+				color: rgba(51, 51, 51, 1);
+
+				.quickMain-text1{
+					font-size: 48rpx;
+					text-align: center;
+					padding: 132rpx 0 32rpx 0;
+				}
+				.quickMain-text2{
+					margin-bottom: 20rpx ;
+					//color: rgba(51, 51, 51, 1);
+					font-size: 32rpx;
+					img{
+						width: 40rpx;
+						//height: 120px;
+					}
+				}
+				
+			}
+			
+			
+		}
+	}
+</style>

pages/store/myOrder.vue

@@ -1,242 +1,242 @@
-<template>
-	<view>
-		<ujp-navbar title="订单列表"></ujp-navbar>
-		<view class="tabs" v-if="false">
-			<u-tabs active-color="#00B962" :list="list" :is-scroll="false" :current="current" @change="change"></u-tabs>
-		</view>
-		<view class="card" v-for="(item,i) in list[current].list"
-		   
-		   @click="gotoUrl('pages/store/orderDetails?id='+item.id)"
-		   :key="i" >
-			<view class="state">
-				<view class="time">
-					订单生成时间：{{item.createTime}}
-				</view>
-				<view class="payment-state" >
-					{{item.payStatus=='1'?'已付款':''}}
-					{{item.payStatus=='0'?'未付款':''}}
-				</view>
-			</view>
-			<view class="card-infos">
-				<view class="picture">
-					<img :src="item.productPic" alt="">
-				</view>
-				<view class="infos">
-					<view class="name">
-						{{item.productName}}
-					</view>
-					<!-- <view class="usable" v-if="item.monthlyRentCard.classify==2">
-						可用{{item.monthlyRentCard.chargeDegreeLimit}}度（有效期{{item.monthlyRentCard.periodOfValidity}}天）
-					</view> -->
-					<view class="price">
-						{{item.price}}元
-					</view>
-				</view>
-				<view class="amount">
-					x1
-				</view>
-			</view>
-			
-			<view class="order-amount">
-				<view class="title">
-					订单金额
-				</view>
-				<view class="value">
-					{{item.totalFee}}元
-				</view>
-			</view>
-			
-		</view>
-		<u-divider  bg-color="#F2F4F4" v-if="list[current].list.length&&list[current].list.length == list[current].recordsTotal" >已经到底了</u-divider>
-		
-		<view class="carNone" v-if="list[current].list.length == 0">
-				<img src="static/img/暂无数据-缺省页.png" alt="">
-				<p class="oldTextjp2" oldstyle="font-size: 18px;">暂无记录</p>
-			</view>
-			
-	</view>
-</template>
-
-<script>
-	//import * as API from '@/apis/order.js'
-	import * as API from '@/apis/mall.js'
-	
-	export default {
-		data() {
-			return {
-				list: [{
-					name: '全部',
-					pageIndex: 1,
-					pageSize: 20,
-					recordsTotal: 1,
-				payStatus:1,
-					status: "",
-					list: []
-				}, {
-					name: '未付款',
-					pageIndex: 1,
-					pageSize: 20,
-					recordsTotal: 1,
-					status: "0",
-					list: []
-				}, {
-					name: '已付款',
-					pageIndex: 1,
-					pageSize: 20,
-					recordsTotal: 1,
-					status: "1",
-					payStatus:1,
-					list: []
-					
-				}],
-				current: 2
-			}
-		},
-		onLoad(op) {
-			if (op.c) {
-				this.current = op.c
-			}
-			this.getList();
-		},
-		onReachBottom() {
-			var obj = this.list[this.current]
-			if (obj.list.length < obj.recordsTotal) {
-				this.myLoadmore();
-			}
-		},
-		methods: {
-			
-			getList() {
-			
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				var list = this.list[this.current].list
-				var obj = this.list[this.current]
-				var listForm = {
-					...obj
-				}
-				delete listForm.list
-			
-				API.myOrderList(listForm).then((res) => {
-			
-					if (listForm.pageIndex == 1) {
-						list = res.data.data;
-					} else {
-						list = [
-							...list,
-							...res.data.data
-						];
-					}
-			
-					this.list[this.current].list = list
-			
-					this.list[this.current].recordsTotal = res.data.recordsTotal;
-					uni.hideLoading();
-				}).catch(error => {
-					uni.showToast({
-						icon: 'none',
-						title: error,
-						icon: "none"
-					})
-				})
-			
-			},
-			myLoadmore() {
-				this.list[this.current].pageIndex += 1;
-				this.getList();
-			},
-			change(index) {
-				this.current = index;
-				var list = this.list[this.current].list
-				this.list[this.current].pageIndex = 1;
-				this.list[this.current].list = [];
-				this.getList();
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.carNone{
-		display: flex;
-		flex-direction: column;
-		justify-content: center;
-		align-items: center;
-		img{
-			width: 100%;
-			height: 100%;
-		}
-		p{
-			margin-top: -60px;
-		}
-	}
-	.tabs{
-		padding: 0 80rpx;
-		background-color: #fff;
-	}
-	.card{
-		margin: 24rpx;
-		padding: 24rpx;
-		background-color: #fff;
-		border-radius: 16rpx;
-		.state{
-			display: flex;
-			align-items: center;
-			justify-content: space-between;
-			.time{
-				color: rgba(119, 119, 119, 1);
-			}
-			.payment-state{
-				color: rgba(51, 51, 51, 1);
-			}
-		}
-		.card-infos{
-			margin: 32rpx 0 40rpx ;
-			display: flex;
-			align-items: center;
-			.picture{
-				width: 152rpx;
-				height: 152rpx;
-				border-radius: 4px;
-				img{
-					width: 100%;
-				}
-			}
-			.infos{
-				margin-left: 26rpx;
-				.name{
-					color: rgba(51, 51, 51, 1);
-					font-size: 32rpx;
-					font-weight: bold;
-				}
-				.usable{
-					color: rgba(119, 119, 119, 1);
-					font-size: 24rpx;
-					margin-top: 8rpx;
-				}
-				.price{
-					color: rgba(16, 16, 16, 1);
-					font-size: 32rpx;
-					margin-top: 24rpx;
-				}
-			}
-			.amount{
-				margin-left: auto;
-				color: rgba(51, 51, 51, 1);
-				font-size: 32rpx;
-			}
-		}
-		.order-amount{
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			color: rgba(51, 51, 51, 1);
-			.value{
-				font-size: 32rpx;
-			}
-		}
-	}
-
-</style>
+<template>
+	<view>
+		<ujp-navbar title="订单列表"></ujp-navbar>
+		<view class="tabs" v-if="false">
+			<u-tabs active-color="#00B962" :list="list" :is-scroll="false" :current="current" @change="change"></u-tabs>
+		</view>
+		<view class="card" v-for="(item,i) in list[current].list"
+		   
+		   @click="gotoUrl('pages/store/orderDetails?id='+item.id)"
+		   :key="i" >
+			<view class="state">
+				<view class="time">
+					订单生成时间：{{item.createTime}}
+				</view>
+				<view class="payment-state" >
+					{{item.payStatus=='1'?'已付款':''}}
+					{{item.payStatus=='0'?'未付款':''}}
+				</view>
+			</view>
+			<view class="card-infos">
+				<view class="picture">
+					<img :src="item.productPic" alt="">
+				</view>
+				<view class="infos">
+					<view class="name">
+						{{item.productName}}
+					</view>
+					<!-- <view class="usable" v-if="item.monthlyRentCard.classify==2">
+						可用{{item.monthlyRentCard.chargeDegreeLimit}}度（有效期{{item.monthlyRentCard.periodOfValidity}}天）
+					</view> -->
+					<view class="price">
+						{{item.price}}元
+					</view>
+				</view>
+				<view class="amount">
+					x1
+				</view>
+			</view>
+			
+			<view class="order-amount">
+				<view class="title">
+					订单金额
+				</view>
+				<view class="value">
+					{{item.totalFee}}元
+				</view>
+			</view>
+			
+		</view>
+		<u-divider  bg-color="#F2F4F4" v-if="list[current].list.length&&list[current].list.length == list[current].recordsTotal" >已经到底了</u-divider>
+		
+		<view class="carNone" v-if="list[current].list.length == 0">
+				<img src="@/assets/static/img/暂无数据-缺省页.png" alt="">
+				<p class="oldTextjp2" oldstyle="font-size: 18px;">暂无记录</p>
+			</view>
+			
+	</view>
+</template>
+
+<script>
+	//import * as API from '@/apis/order.js'
+	import * as API from '@/apis/mall.js'
+	
+	export default {
+		data() {
+			return {
+				list: [{
+					name: '全部',
+					pageIndex: 1,
+					pageSize: 20,
+					recordsTotal: 1,
+				payStatus:1,
+					status: "",
+					list: []
+				}, {
+					name: '未付款',
+					pageIndex: 1,
+					pageSize: 20,
+					recordsTotal: 1,
+					status: "0",
+					list: []
+				}, {
+					name: '已付款',
+					pageIndex: 1,
+					pageSize: 20,
+					recordsTotal: 1,
+					status: "1",
+					payStatus:1,
+					list: []
+					
+				}],
+				current: 2
+			}
+		},
+		onLoad(op) {
+			if (op.c) {
+				this.current = op.c
+			}
+			this.getList();
+		},
+		onReachBottom() {
+			var obj = this.list[this.current]
+			if (obj.list.length < obj.recordsTotal) {
+				this.myLoadmore();
+			}
+		},
+		methods: {
+			
+			getList() {
+			
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				var list = this.list[this.current].list
+				var obj = this.list[this.current]
+				var listForm = {
+					...obj
+				}
+				delete listForm.list
+			
+				API.myOrderList(listForm).then((res) => {
+			
+					if (listForm.pageIndex == 1) {
+						list = res.data.data;
+					} else {
+						list = [
+							...list,
+							...res.data.data
+						];
+					}
+			
+					this.list[this.current].list = list
+			
+					this.list[this.current].recordsTotal = res.data.recordsTotal;
+					uni.hideLoading();
+				}).catch(error => {
+					uni.showToast({
+						icon: 'none',
+						title: error,
+						icon: "none"
+					})
+				})
+			
+			},
+			myLoadmore() {
+				this.list[this.current].pageIndex += 1;
+				this.getList();
+			},
+			change(index) {
+				this.current = index;
+				var list = this.list[this.current].list
+				this.list[this.current].pageIndex = 1;
+				this.list[this.current].list = [];
+				this.getList();
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.carNone{
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		img{
+			width: 100%;
+			height: 100%;
+		}
+		p{
+			margin-top: -60px;
+		}
+	}
+	.tabs{
+		padding: 0 80rpx;
+		background-color: #fff;
+	}
+	.card{
+		margin: 24rpx;
+		padding: 24rpx;
+		background-color: #fff;
+		border-radius: 16rpx;
+		.state{
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			.time{
+				color: rgba(119, 119, 119, 1);
+			}
+			.payment-state{
+				color: rgba(51, 51, 51, 1);
+			}
+		}
+		.card-infos{
+			margin: 32rpx 0 40rpx ;
+			display: flex;
+			align-items: center;
+			.picture{
+				width: 152rpx;
+				height: 152rpx;
+				border-radius: 4px;
+				img{
+					width: 100%;
+				}
+			}
+			.infos{
+				margin-left: 26rpx;
+				.name{
+					color: rgba(51, 51, 51, 1);
+					font-size: 32rpx;
+					font-weight: bold;
+				}
+				.usable{
+					color: rgba(119, 119, 119, 1);
+					font-size: 24rpx;
+					margin-top: 8rpx;
+				}
+				.price{
+					color: rgba(16, 16, 16, 1);
+					font-size: 32rpx;
+					margin-top: 24rpx;
+				}
+			}
+			.amount{
+				margin-left: auto;
+				color: rgba(51, 51, 51, 1);
+				font-size: 32rpx;
+			}
+		}
+		.order-amount{
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			color: rgba(51, 51, 51, 1);
+			.value{
+				font-size: 32rpx;
+			}
+		}
+	}
+
+</style>

pages/user/InviteFriends.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="all">
 		<u-mask :show="show" @click="show = false">
-				<u-image width="100%" height="500px"  :mode="'widthFix'"  src="/static/img/guide_point.png"></u-image>
+				<u-image width="100%" height="500px"  :mode="'widthFix'"  src="@/assets/static/img/guide_point.png"></u-image>
 				
 		</u-mask>
 		
@@ -10,9 +10,9 @@
 			opacityClass:show
 		}">
 			<view class="InviteFriends-head">
-				<u-image width="274rpx" height="60rpx" src="/static/img/logo3.png"></u-image>
-				<u-image class="textImg" width="662rpx" height="59rpx" src="/static/img/text-1.png"></u-image>
-				<u-image width="100%" height="320rpx" src="/static/img/handshake.png"></u-image>
+				<u-image width="274rpx" height="60rpx" src="@/assets/static/img/logo3.png"></u-image>
+				<u-image class="textImg" width="662rpx" height="59rpx" src="@/assets/static/img/text-1.png"></u-image>
+				<u-image width="100%" height="320rpx" src="@/assets/static/img/handshake.png"></u-image>
 			</view>
 		
 			<view class="InviteFriends-main">
@@ -60,7 +60,7 @@
 					<view class="reward-head">
 						<p>成功邀请{{list?list.length:0}}人，已获得</p>
 						<view class="reward-head-price">
-							<h2>{{list?(list.length*2).toFixed(2):'0.00'}}</h2><span>元</span>
+							<h2>{{list?(amount).toFixed(2):'0.00'}}</h2><span>元</span>
 						</view>
 					</view>
 					<view class="reward-main">

pages/user/about.vue

@@ -1,114 +1,114 @@
-<template>
-	<view class="all">
-		<ujp-navbar title="关于我们"></ujp-navbar>
-		<view class="about">
-			<img src="../../static/img/aboutus.png" alt="">
-			<p class="font-weight2">{{projectName}}</p>
-		</view>
-		<u-cell-group>
-			<u-cell-item :titleStyle='titleStyle' title="用户协议" @click="gotoUrl('pages/article/details?code=YHXY')"></u-cell-item>
-			<u-cell-item :titleStyle='titleStyle' title="隐私政策" @click="gotoUrl('pages/article/details?code=YSZC')"></u-cell-item>
-			<u-cell-item :titleStyle='titleStyle' title="充值协议" @click="gotoUrl('pages/article/details?code=CZXY')"></u-cell-item>
-		</u-cell-group>
-		<view class="about-foot">
-			<p>湖北荆鹏集团</p>
-			<p>版权所有 Copyright ©2022</p>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				elderMode:false,
-				projectName:'',
-				form: {
-					name: '',
-					intro: '',
-				},
-				titleStyle:{
-					"font-size":'28rpx'
-				},
-				elderStatus: false,
-			}
-		},
-		onReady() {
-			if(this.carhelp.get("getElderModeClass") == "长辈模式") {
-				this.elderStatus = true;
-			} else {
-				this.elderStatus = false;
-			}
-		},
-		methods: {
-			theme(type) {
-				
-			  if(type == 'elder')	
-			  {
-				document.getElementsByTagName('body')[0].setAttribute('data-theme',type);
-				 let data = {
-				 	"font-size":'32rpx',
-					"font-weight":'bold!important'
-				 	};
-				 this.titleStyle = data;
-			  }
-			  else
-			  {
-				document.getElementsByTagName('body')[0].setAttribute('data-theme',type);
-				 let data = {
-				 	"font-size":'28rpx'
-				 	};
-				 this.titleStyle = data;
-			  } 
-			}
-		},
-		onReady(){
-			this.elderMode = this.carhelp.get('getElderModeClass')  == '长辈模式';
-			if(this.elderMode)
-				this.theme('elder')
-			else
-				this.theme('standard')
-		},
-		onLoad(){
-			this.projectName=process.car.ProjectName;
-		}
-	}
-</script>
-<style>
-	page{
-		background-color: #F7F7F7;
-	}
-</style>
-<style lang="scss" scoped>
-	@import "@/_theme.scss";
-	.all{
-		@include themeify{
-			font-size: themed('font-size2');
-		}
-	}
-	.about{
-		background-color: #fff;
-		padding: 36px 0;
-		margin-bottom: 10px;
-		display: flex;
-		align-items: center;
-		flex-direction: column;
-		img{
-			height: 120rpx;
-			width: 120rpx;
-		}
-		p{
-			margin-top: 8px;
-		}
-	}
-	.about-foot{
-		position: fixed;
-		bottom:16px;
-		text-align: center;
-		left: 0;
-		right: 0;
-		p{
-			color:#666;
-		}
-	}
-</style>
+<template>
+	<view class="all">
+		<ujp-navbar title="关于我们"></ujp-navbar>
+		<view class="about">
+			<img src="@/assets/static/img/aboutus.png" alt="">
+			<p class="font-weight2">{{projectName}}</p>
+		</view>
+		<u-cell-group>
+			<u-cell-item :titleStyle='titleStyle' title="用户协议" @click="gotoUrl('pages/article/details?code=YHXY')"></u-cell-item>
+			<u-cell-item :titleStyle='titleStyle' title="隐私政策" @click="gotoUrl('pages/article/details?code=YSZC')"></u-cell-item>
+			<u-cell-item :titleStyle='titleStyle' title="充值协议" @click="gotoUrl('pages/article/details?code=CZXY')"></u-cell-item>
+		</u-cell-group>
+		<view class="about-foot">
+			<p>湖北荆鹏集团</p>
+			<p>版权所有 Copyright ©2022</p>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				elderMode:false,
+				projectName:'',
+				form: {
+					name: '',
+					intro: '',
+				},
+				titleStyle:{
+					"font-size":'28rpx'
+				},
+				elderStatus: false,
+			}
+		},
+		onReady() {
+			if(this.carhelp.get("getElderModeClass") == "长辈模式") {
+				this.elderStatus = true;
+			} else {
+				this.elderStatus = false;
+			}
+		},
+		methods: {
+			theme(type) {
+				
+			  if(type == 'elder')	
+			  {
+				document.getElementsByTagName('body')[0].setAttribute('data-theme',type);
+				 let data = {
+				 	"font-size":'32rpx',
+					"font-weight":'bold!important'
+				 	};
+				 this.titleStyle = data;
+			  }
+			  else
+			  {
+				document.getElementsByTagName('body')[0].setAttribute('data-theme',type);
+				 let data = {
+				 	"font-size":'28rpx'
+				 	};
+				 this.titleStyle = data;
+			  } 
+			}
+		},
+		onReady(){
+			this.elderMode = this.carhelp.get('getElderModeClass')  == '长辈模式';
+			if(this.elderMode)
+				this.theme('elder')
+			else
+				this.theme('standard')
+		},
+		onLoad(){
+			this.projectName=process.car.ProjectName;
+		}
+	}
+</script>
+<style>
+	page{
+		background-color: #F7F7F7;
+	}
+</style>
+<style lang="scss" scoped>
+	@import "@/_theme.scss";
+	.all{
+		@include themeify{
+			font-size: themed('font-size2');
+		}
+	}
+	.about{
+		background-color: #fff;
+		padding: 36px 0;
+		margin-bottom: 10px;
+		display: flex;
+		align-items: center;
+		flex-direction: column;
+		img{
+			height: 120rpx;
+			width: 120rpx;
+		}
+		p{
+			margin-top: 8px;
+		}
+	}
+	.about-foot{
+		position: fixed;
+		bottom:16px;
+		text-align: center;
+		left: 0;
+		right: 0;
+		p{
+			color:#666;
+		}
+	}
+</style>

pages/user/appointmentExplain.vue

@@ -1,79 +1,79 @@
-<template>
-	<view>
-		<ujp-navbar title="轻松预约 告别排队" ></ujp-navbar>
-		<view class="main">
-			<view class="item">
-				<view class="title">
-					1、点击主页的“附近站点”按钮或点击底部的“找桩”；
-				</view>
-				<view class="img">
-					<img src="../../static/img/explain1.png" alt="">
-				</view>
-				<view class="img">
-					<img src="../../static/img/explain2.png" alt="">
-				</view>
-			</view>
-			
-			<view class="item">
-				<view class="title">
-					2、进入到站点列表，点击站点名称，进入站点详情页；
-				</view>
-				<view class="img">
-					<img src="../../static/img/explain3.png" alt="">
-				</view>
-				
-			</view>
-			
-			<view class="item">
-				<view class="title">
-					3、点击“预约”按钮即可进行预约。
-				</view>
-				<view class="img margin-b">
-					<img src="../../static/img/explain4.png" alt="">
-				</view>
-				<view class="img">
-					<img src="../../static/img/explain5.png" alt="">
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				
-			}
-		},
-		methods: {
-			
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	page{
-		background-color: #fff;
-	}
-	.main{
-		padding: 20px;
-		
-		.item{
-			margin-bottom: 20px;
-		}
-		.title{
-			line-height: 22px;
-			margin-bottom: 12px;
-			color: rgba(16, 16, 16, 100);
-			font-size: 16px;
-		}
-	}
-.margin-b{
-	margin-bottom: 12px;
-}
-img{
-	width: 100%;
-	height: 100%;
-}
-</style>
+<template>
+	<view>
+		<ujp-navbar title="轻松预约 告别排队" ></ujp-navbar>
+		<view class="main">
+			<view class="item">
+				<view class="title">
+					1、点击主页的“附近站点”按钮或点击底部的“找桩”；
+				</view>
+				<view class="img">
+					<img src="@/assets/static/img/explain1.png" alt="">
+				</view>
+				<view class="img">
+					<img src="@/assets/static/img/explain2.png" alt="">
+				</view>
+			</view>
+			
+			<view class="item">
+				<view class="title">
+					2、进入到站点列表，点击站点名称，进入站点详情页；
+				</view>
+				<view class="img">
+					<img src="@/assets/static/img/explain3.png" alt="">
+				</view>
+				
+			</view>
+			
+			<view class="item">
+				<view class="title">
+					3、点击“预约”按钮即可进行预约。
+				</view>
+				<view class="img margin-b">
+					<img src="@/assets/static/img/explain4.png" alt="">
+				</view>
+				<view class="img">
+					<img src="@/assets/static/img/explain5.png" alt="">
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	page{
+		background-color: #fff;
+	}
+	.main{
+		padding: 20px;
+		
+		.item{
+			margin-bottom: 20px;
+		}
+		.title{
+			line-height: 22px;
+			margin-bottom: 12px;
+			color: rgba(16, 16, 16, 100);
+			font-size: 16px;
+		}
+	}
+.margin-b{
+	margin-bottom: 12px;
+}
+img{
+	width: 100%;
+	height: 100%;
+}
+</style>

pages/user/car/index.vue

@@ -1,147 +1,147 @@
-<template>
-	<view>
-		<ujp-navbar title="车辆管理页面"></ujp-navbar>
-		<view v-if="false">
-			<view class="carNone" v-if="carList.length == 0">
-				<img src="static/img/none2.svg" alt="">
-				<p class="oldTextjp2" oldstyle="font-size: 18px;">暂无绑定车辆</p>
-				<view class="carNone-btn" @click="addCar">
-					添加车牌
-				</view>
-			</view>
-			<view class="car" v-else>
-				<view class="car-item" v-for="(item,index) in carList" :key="item.id" @click="toCarAdd(item)">
-					<span v-if="item.defaultFlag">默认</span>
-					<font>{{item.carNum}}</font>
-				</view>
-				<view class="car-btn oldTextjp2" oldstyle="font-size: 18px;" @click="addCar">添加车牌</view>
-			</view>
-		</view>
-		
-	</view>
-</template>
-
-<script>
-	import * as userApi from '@/apis/user.js'
-	
-	export default {
-		data() {
-			return {
-				carList: [],
-				jpcode:"",
-			}
-		},
-		onShow() {
-			this.getCarList();
-		},
-		onLoad(op) {
-			if(op.jpcode){
-				this.jpcode=op.jpcode
-			}
-				
-		},
-		methods: {
-			toCarAdd(item) {
-				var url='/pages/user/car/carAdd?id=' + item.id;
-				if(this.jpcode){
-					url+="&jpcode="+this.jpcode
-				}
-				uni.navigateTo({
-					url: url
-				})
-			},
-			getCarList() {
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})		
-				userApi.regUserCarList().then((res) => {
-					uni.hideLoading();
-					
-					this.carList = res.data;
-				}).catch(error => {
-					uni.showToast({
-						title: error,
-						icon: "none"
-					})
-				})
-			},
-			addCar() {
-				var url='/pages/user/car/carDet' ;
-				if(this.jpcode){
-					url+="?jpcode="+this.jpcode
-				}
-				uni.navigateTo({
-					url: url
-				})
-			}
-		}
-	}
-</script>
-<style>
-	page{
-		background: #fff;
-	}
-</style>
-<style lang="scss" scoped>
-	.carNone{
-		display: flex;
-		flex-direction: column;
-		justify-content: center;
-		height: calc(100vh - 44px);
-		align-items: center;
-		img{
-			width: 256px;
-			height: 256px;
-		}
-		p{
-			margin-top: -60px;
-		}
-		.carNone-btn{
-			font-size: 16px;
-			color:#00B962;
-			border: 1px solid #00B962;
-			padding: 10px 70px;
-			border-radius: 20px;
-			margin-top: 48px;
-		}
-	}
-	.car{
-		padding: 24px;
-		.car-item{
-			margin: 10px;
-			background-color: #00B962;
-			height: 80px;
-			border-radius: 8px;
-			position: relative;
-			text-align: center;
-			font{
-				color:#fff;
-				font-size: 36px;
-				line-height:80px;
-			}
-			span{
-				position: absolute;
-				height: 24px;
-				width: 48px;
-				background-color: #008A4B ;
-				color:#fff;
-				right: 0;
-				top: 0;
-				text-align: center;
-				line-height: 24px;
-				border-radius: 0 8px 0 8px;
-			}
-		}
-		.car-btn{
-			margin:12px 10px 0;
-			font-size: 16px;
-			color:#00B962;
-			border: 1px solid #00B962;
-			border-radius: 21px;
-			padding: 10px 0;
-			text-align: center;
-			
-		}
-	}
-</style>
+<template>
+	<view>
+		<ujp-navbar title="车辆管理页面"></ujp-navbar>
+		<view v-if="false">
+			<view class="carNone" v-if="carList.length == 0">
+				<img src="@/assets/static/img/none2.svg" alt="">
+				<p class="oldTextjp2" oldstyle="font-size: 18px;">暂无绑定车辆</p>
+				<view class="carNone-btn" @click="addCar">
+					添加车牌
+				</view>
+			</view>
+			<view class="car" v-else>
+				<view class="car-item" v-for="(item,index) in carList" :key="item.id" @click="toCarAdd(item)">
+					<span v-if="item.defaultFlag">默认</span>
+					<font>{{item.carNum}}</font>
+				</view>
+				<view class="car-btn oldTextjp2" oldstyle="font-size: 18px;" @click="addCar">添加车牌</view>
+			</view>
+		</view>
+		
+	</view>
+</template>
+
+<script>
+	import * as userApi from '@/apis/user.js'
+	
+	export default {
+		data() {
+			return {
+				carList: [],
+				jpcode:"",
+			}
+		},
+		onShow() {
+			this.getCarList();
+		},
+		onLoad(op) {
+			if(op.jpcode){
+				this.jpcode=op.jpcode
+			}
+				
+		},
+		methods: {
+			toCarAdd(item) {
+				var url='/pages/user/car/carAdd?id=' + item.id;
+				if(this.jpcode){
+					url+="&jpcode="+this.jpcode
+				}
+				uni.navigateTo({
+					url: url
+				})
+			},
+			getCarList() {
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})		
+				userApi.regUserCarList().then((res) => {
+					uni.hideLoading();
+					
+					this.carList = res.data;
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+			},
+			addCar() {
+				var url='/pages/user/car/carDet' ;
+				if(this.jpcode){
+					url+="?jpcode="+this.jpcode
+				}
+				uni.navigateTo({
+					url: url
+				})
+			}
+		}
+	}
+</script>
+<style>
+	page{
+		background: #fff;
+	}
+</style>
+<style lang="scss" scoped>
+	.carNone{
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		height: calc(100vh - 44px);
+		align-items: center;
+		img{
+			width: 256px;
+			height: 256px;
+		}
+		p{
+			margin-top: -60px;
+		}
+		.carNone-btn{
+			font-size: 16px;
+			color:#00B962;
+			border: 1px solid #00B962;
+			padding: 10px 70px;
+			border-radius: 20px;
+			margin-top: 48px;
+		}
+	}
+	.car{
+		padding: 24px;
+		.car-item{
+			margin: 10px;
+			background-color: #00B962;
+			height: 80px;
+			border-radius: 8px;
+			position: relative;
+			text-align: center;
+			font{
+				color:#fff;
+				font-size: 36px;
+				line-height:80px;
+			}
+			span{
+				position: absolute;
+				height: 24px;
+				width: 48px;
+				background-color: #008A4B ;
+				color:#fff;
+				right: 0;
+				top: 0;
+				text-align: center;
+				line-height: 24px;
+				border-radius: 0 8px 0 8px;
+			}
+		}
+		.car-btn{
+			margin:12px 10px 0;
+			font-size: 16px;
+			color:#00B962;
+			border: 1px solid #00B962;
+			border-radius: 21px;
+			padding: 10px 0;
+			text-align: center;
+			
+		}
+	}
+</style>

pages/user/company-vip.vue

@@ -1,448 +1,448 @@
-<template>
-	<view>
-		<view class="header">
-			<ujp-navbar title="企业会员"></ujp-navbar>
-			
-			
-			<view class="user-card">
-				<view class="head-img">
-					<img v-if="info.headImg" style="border-radius: 50px;"
-					:src="info.headImg" alt="">
-					<img v-else src="../../assets/img/headPortrait.png" alt="">
-					
-				</view>
-				<view class="user-name">
-					<view class="name">
-						{{info.realName?info.realName:info.nickName}}
-					</view>
-					<view class="sign">
-						{{platformN}}
-					</view>
-					<view class="sign2">
-						{{cardNo}}
-					</view>
-					
-				</view>
-				
-			</view>
-			
-		</view>
-		<u-picker mode="time" v-model="popupShow" @confirm="changedate" :default-time="queryTime+'-1'"  :params="params"></u-picker>
-		
-		<view class="details">
-			<!-- 可用余额 -->
-			<view class="balance" v-if="enterpriseAccount"  >
-				
-				<view class="item2" >
-					<view class="num " >
-						{{enterpriseAccount.balance}}<span >元</span>
-					</view>
-					<view class="name">
-						充值余额
-					</view>
-				</view>
-				<view class="item3"></view>
-				<view class="item2" >
-					<view class="num " >
-						{{enterpriseAccount.giftAmount?enterpriseAccount.giftAmount:0}}<span >元</span>
-					</view>
-					<view class="name" @click="ckIcon">
-						赠送余额<u-icon name="info-circle"></u-icon>
-					</view>
-				</view>
-				
-			</view>
-			
-			  <view class="month-electric">
-			  	  <view class="month"  @click="popupShow = true" >
-					  {{showTime(queryTime)}}
-					  <u-icon name="arrow-down" color="#b0b8c8" size="32" v-show="!popupShow"></u-icon>
-					  	<u-icon name="arrow-up" color="#b0b8c8" size="32" v-show="popupShow"></u-icon>
-					  
-			  	  	<!-- 8月<text class="iconfont">&#xe62b;</text> -->
-			  	  </view>
-				  <view class="electric">
-				  	本月累计充电 {{(electricQuantity).toFixed(1)}}度
-				  </view>
-			  </view>
-			  
-			  <view class="carNone"  v-show="!list.length">
-			  	<img src="static/img/暂无数据-缺省页.png" alt="">
-			  	<p>暂无充电记录</p>
-			  </view>
-			  
-		<view class="item" v-for="(item,i) in list" :key="i"  >
-			 <view class="infos">
-				 <view class="station-name">
-				 	{{item.stationName}}
-				 </view>
-				 <view class="time">
-				 	{{item.endTime}}
-				 </view>
-			 	
-			 </view>
-			 <view class="electricity-consumption">
-			 	{{(item.electricQuantity/10000).toFixed(1)}}度
-			 </view>
-		</view>
-		
-		
-		<u-divider color="#a8a8a8" v-if="list.length"  half-width="200" border-color="#CFD2D5" fontSize="28">已经到底了</u-divider>
-		</view>
-		
-	</view>
-</template>
-
-<script>
-	import * as API_index from '@/apis/index.js'
-	
-	import * as API from '@/apis/user.js'
-	import {
-		daysDistance,
-		beforeTimeStamp,
-		currentTimeStamp,
-		parseUnixTime
-	} from '@/utils'
-	export default {
-		data() {
-			return {
-				enterpriseAccount:null,
-				params: {
-									year: true,
-									month: true,
-									day: false,
-									hour: false,
-									minute: false,
-									second: false
-				},
-				popupShow:false,
-				queryTime:"",
-				info:{},
-				platformN:'',
-				platform:'',
-				startDate:'',
-				endTime:"",
-				pageIndex:1,
-				list: [],
-				electricQuantity:0,
-				recordsTotal: 0,
-				cardNo:"",
-			}
-		},
-		onReachBottom() {
-			if (this.list.length < this.recordsTotal) {			
-				this.myLoadmore();
-			}
-		},
-		
-		onLoad(op) {
-			this.platform=op.id;
-			this.info=this.carhelp.getPersonInfo()
-			var list=this.carhelp.getPersonInfoPlus().businessVipList;
-			if(list){	
-				for(var i in list){
-					if(list[i].platform==this.platform){
-						this.platformN=list[i].platformN
-						this.cardNo=list[i].cardNo
-					}
-				}
-			}
-			this.queryTime=parseUnixTime(currentTimeStamp(), '{y}-{m}'),
-			this.endTime = parseUnixTime(currentTimeStamp(), '{y}-{m}-{d}')
-			this.personalCenter()
-			this.getList()
-		},computed:{
-		
-		
-			startTime(){
-				return this.queryTime+'-1'
-			},
-			
-		},
-		methods: {
-			ckIcon(){
-				uni.showModal({
-					title: '提示',
-					content: '余额扣款顺序为先扣除充值余额,再扣除赠送余额.如申请退款,赠送余额不退换给用户.',
-					showCancel:false,
-					success: res=>{
-						if (res.confirm) {
-							
-						} else if (res.cancel) {
-							//('用户点击取消');
-						}
-					}
-				});
-			},
-			personalCenter(){
-				
-				var list=this.carhelp.getPersonInfoPlus().businessVipList;
-				if(list){	
-					for(var i in list){
-						if(list[i].platform==this.platform){
-							this.platformN=list[i].platformN
-						}
-					}
-				}
-				
-				API_index.personalCenter().then((res2) => {
-					var entRegList=res2.data.entRegList;
-					for(var i in list){
-						var item1=list[i]
-						if(list[i].platform==this.platform){
-							for(var j in entRegList){
-								var item2=entRegList[j].vipUser;
-								
-								if(item1.id==item2.id){
-									this.enterpriseAccount=entRegList[j].enterpriseAccount
-									console.log(this.enterpriseAccount)
-								}
-							}
-						}
-						
-					}
-					this.$forceUpdate()
-					
-				}).catch(error => {
-						uni.showToast({
-							title: error
-						})
-					})
-			},
-			okbtn() {
-				this.popupShow = false;
-				this.getList(true)
-			},
-			changedate(e) {
-				console.log(e)
-				this.queryTime=e.year+'-'+e.month;
-				
-				if(e.month=='12'){
-					this.endTime=(e.year)+"/12/31"
-				}else{
-					var b=e.year+'/'+(parseInt(e.month)+1)+'/1';
-					var a=beforeTimeStamp(1,b);
-					this.endTime= parseUnixTime(a, '{y}-{m}-{d}')
-				}
-				
-				this.okbtn()
-			
-			},
-			showTime(name){
-				if(!name){
-					return ''
-				}
-				return name.replace('-','年')+'月';
-			},
-			myLoadmore() {
-				this.pageIndex += 1;
-				this.getList()
-			},
-			getList(bl){
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				if (bl) {
-					this.list = [];
-					this.pageIndex = 1;
-				}
-				API.chargingRecordVipData({
-					pageIndex: this.pageIndex,
-					startDate: this.startTime,
-					endDate: this.endTime,
-					platform: this.platform,
-					pageSize:20,
-				}).then((res) => {
-					uni.hideLoading();
-					
-					this.list = [
-						...this.list,
-						...res.data.data
-					];
-					
-					this.electricQuantity = res.data.electricQuantity;
-					this.recordsTotal = res.data.recordsTotal;
-				}).catch(error => {
-					uni.showToast({
-						title: error,
-						icon: "none"
-					})
-				})
-				
-			},
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	// 余额
-	.balance {
-		
-		background-color: #f3f4f7;
-	
-		margin: 12rpx 0px 22rpx 0px;
-		padding: 32rpx 60rpx;
-		display: flex;
-		// justify-content: space-between;
-		justify-content: space-around;
-		border-radius: 12px;
-		.item3{
-			    border-right: 1px solid #dad5d5;
-			    height: 60rpx;
-			    margin-top: 20rpx;
-		}
-		.item2 {
-			text-align: center;
-			 display: table-row;
-			
-			.num {
-				line-height: 56rpx;
-				color: rgba(51, 51, 51, 100);
-				font-size: 48rpx;
-				position: relative;
-				 font-weight: bold;
-	
-			}
-	
-			.name {
-				height: 32rpx;
-				color: rgba(134, 134, 134, 100);
-				font-size: 28rpx;
-				margin-top: 2px;
-				margin-botton: 4px;
-				
-			}
-		}
-	}
-	page{
-		background-color: #fff;
-	}
-	.header{
-		background-color: #4C586B;
-		color: #fff;
-		.title{
-			display: flex;
-			line-height: 26px;
-			padding: 9px 11px;
-			
-			
-		}
-		.iconfont{
-			font-size: 24px
-		}
-		.content{
-			flex: 1;
-			text-align: center;
-			font-size: 20px
-		}
-		
-		.user-card{
-		   padding: 19px 0 39px 20px;
-			margin: 21px 20px 0 20px;
-			background:url(@/assets/img/companyVIP.png) no-repeat right,linear-gradient(to right,#C6D4ED,#DCE6F0) no-repeat;
-			box-shadow: 0px 0px 16px 0px rgba(14, 39, 84, 28);
-			border: 2px solid rgba(236, 239, 245, 100);
-			border-radius: 16px;
-			display: flex;
-			.head-img{
-				width: 48px;
-				height: 48px;
-				img{
-					width: 100%;
-				}
-			}
-			.user-name{
-				margin-left: 12px;
-				.name{
-					line-height: 40rpx;
-					color: rgba(33, 41, 48, 100);
-					font-size: 40rpx;
-					font-weight: 550;
-				}
-				.sign{
-					color: rgba(76, 89, 111, 100);
-					font-size: 28rpx;
-					line-height: 28rpx;
-					margin-top: 16rpx;
-				}
-				.sign2{
-					color: #6C6F73 ;
-					font-size: 24rpx;
-					line-height: 24rpx;
-					margin-top: 16rpx;
-				}
-			}
-		}
-	}
-
-.carNone{
-		display: flex;
-		flex-direction: column;
-		justify-content: center;
-		align-items: center;
-		img{
-			width: 100%;
-			height: 100%;
-		}
-		p{
-			margin-top: -60px;
-		}
-	}
-.details{
-	height: 100%;
-	
-	box-shadow: 0px -6px 6px 0px #1A313C47;
-	margin-top: -15px;
-	border-radius: 16px 16px 0px 0px;
-	background-color: #fff;
-	padding: 10px 20px;
-	
-	.month-electric{
-		display: flex;
-		justify-content: space-between;
-		line-height: 16px;
-		margin-bottom: 25px;
-		.month{
-			
-			color: #333333;
-			.iconfont{
-				color:#666666;
-			}
-		}
-		.electric{
-			color: rgba(102, 102, 102, 100);
-			font-size: 16px;
-		}
-	}
-	
-	.item{
-		display: flex;
-		justify-content: space-between;
-		margin-bottom: 22px;
-		.infos{
-			.station-name{
-				color: rgba(51, 51, 51, 100);
-				font-size: 16px;
-				line-height: 16px;
-			}
-			.time{
-				color: rgba(119, 119, 119, 100);
-				line-height: 14px;
-				margin-top: 8px;
-			}
-		}
-		.electricity-consumption{
-			
-			margin: auto 0;
-			font-size: 24px;
-			color: #111111;
-		}
-		
-	}
-	/deep/.u-divider{
-		margin-top: 27px !important;
-		
-	}
-}
-</style>
+<template>
+	<view>
+		<view class="header">
+			<ujp-navbar title="企业会员"></ujp-navbar>
+			
+			
+			<view class="user-card">
+				<view class="head-img">
+					<img v-if="info.headImg" style="border-radius: 50px;"
+					:src="info.headImg" alt="">
+					<img v-else src="../../assets/img/headPortrait.png" alt="">
+					
+				</view>
+				<view class="user-name">
+					<view class="name">
+						{{info.realName?info.realName:info.nickName}}
+					</view>
+					<view class="sign">
+						{{platformN}}
+					</view>
+					<view class="sign2">
+						{{cardNo}}
+					</view>
+					
+				</view>
+				
+			</view>
+			
+		</view>
+		<u-picker mode="time" v-model="popupShow" @confirm="changedate" :default-time="queryTime+'-1'"  :params="params"></u-picker>
+		
+		<view class="details">
+			<!-- 可用余额 -->
+			<view class="balance" v-if="enterpriseAccount"  >
+				
+				<view class="item2" >
+					<view class="num " >
+						{{enterpriseAccount.balance}}<span >元</span>
+					</view>
+					<view class="name">
+						充值余额
+					</view>
+				</view>
+				<view class="item3"></view>
+				<view class="item2" >
+					<view class="num " >
+						{{enterpriseAccount.giftAmount?enterpriseAccount.giftAmount:0}}<span >元</span>
+					</view>
+					<view class="name" @click="ckIcon">
+						赠送余额<u-icon name="info-circle"></u-icon>
+					</view>
+				</view>
+				
+			</view>
+			
+			  <view class="month-electric">
+			  	  <view class="month"  @click="popupShow = true" >
+					  {{showTime(queryTime)}}
+					  <u-icon name="arrow-down" color="#b0b8c8" size="32" v-show="!popupShow"></u-icon>
+					  	<u-icon name="arrow-up" color="#b0b8c8" size="32" v-show="popupShow"></u-icon>
+					  
+			  	  	<!-- 8月<text class="iconfont">&#xe62b;</text> -->
+			  	  </view>
+				  <view class="electric">
+				  	本月累计充电 {{(electricQuantity).toFixed(1)}}度
+				  </view>
+			  </view>
+			  
+			  <view class="carNone"  v-show="!list.length">
+			  	<img src="@/assets/static/img/暂无数据-缺省页.png" alt="">
+			  	<p>暂无充电记录</p>
+			  </view>
+			  
+		<view class="item" v-for="(item,i) in list" :key="i"  >
+			 <view class="infos">
+				 <view class="station-name">
+				 	{{item.stationName}}
+				 </view>
+				 <view class="time">
+				 	{{item.endTime}}
+				 </view>
+			 	
+			 </view>
+			 <view class="electricity-consumption">
+			 	{{(item.electricQuantity/10000).toFixed(1)}}度
+			 </view>
+		</view>
+		
+		
+		<u-divider color="#a8a8a8" v-if="list.length"  half-width="200" border-color="#CFD2D5" fontSize="28">已经到底了</u-divider>
+		</view>
+		
+	</view>
+</template>
+
+<script>
+	import * as API_index from '@/apis/index.js'
+	
+	import * as API from '@/apis/user.js'
+	import {
+		daysDistance,
+		beforeTimeStamp,
+		currentTimeStamp,
+		parseUnixTime
+	} from '@/utils'
+	export default {
+		data() {
+			return {
+				enterpriseAccount:null,
+				params: {
+									year: true,
+									month: true,
+									day: false,
+									hour: false,
+									minute: false,
+									second: false
+				},
+				popupShow:false,
+				queryTime:"",
+				info:{},
+				platformN:'',
+				platform:'',
+				startDate:'',
+				endTime:"",
+				pageIndex:1,
+				list: [],
+				electricQuantity:0,
+				recordsTotal: 0,
+				cardNo:"",
+			}
+		},
+		onReachBottom() {
+			if (this.list.length < this.recordsTotal) {			
+				this.myLoadmore();
+			}
+		},
+		
+		onLoad(op) {
+			this.platform=op.id;
+			this.info=this.carhelp.getPersonInfo()
+			var list=this.carhelp.getPersonInfoPlus().businessVipList;
+			if(list){	
+				for(var i in list){
+					if(list[i].platform==this.platform){
+						this.platformN=list[i].platformN
+						this.cardNo=list[i].cardNo
+					}
+				}
+			}
+			this.queryTime=parseUnixTime(currentTimeStamp(), '{y}-{m}'),
+			this.endTime = parseUnixTime(currentTimeStamp(), '{y}-{m}-{d}')
+			this.personalCenter()
+			this.getList()
+		},computed:{
+		
+		
+			startTime(){
+				return this.queryTime+'-1'
+			},
+			
+		},
+		methods: {
+			ckIcon(){
+				uni.showModal({
+					title: '提示',
+					content: '余额扣款顺序为先扣除充值余额,再扣除赠送余额.如申请退款,赠送余额不退换给用户.',
+					showCancel:false,
+					success: res=>{
+						if (res.confirm) {
+							
+						} else if (res.cancel) {
+							//('用户点击取消');
+						}
+					}
+				});
+			},
+			personalCenter(){
+				
+				var list=this.carhelp.getPersonInfoPlus().businessVipList;
+				if(list){	
+					for(var i in list){
+						if(list[i].platform==this.platform){
+							this.platformN=list[i].platformN
+						}
+					}
+				}
+				
+				API_index.personalCenter().then((res2) => {
+					var entRegList=res2.data.entRegList;
+					for(var i in list){
+						var item1=list[i]
+						if(list[i].platform==this.platform){
+							for(var j in entRegList){
+								var item2=entRegList[j].vipUser;
+								
+								if(item1.id==item2.id){
+									this.enterpriseAccount=entRegList[j].enterpriseAccount
+									console.log(this.enterpriseAccount)
+								}
+							}
+						}
+						
+					}
+					this.$forceUpdate()
+					
+				}).catch(error => {
+						uni.showToast({
+							title: error
+						})
+					})
+			},
+			okbtn() {
+				this.popupShow = false;
+				this.getList(true)
+			},
+			changedate(e) {
+				console.log(e)
+				this.queryTime=e.year+'-'+e.month;
+				
+				if(e.month=='12'){
+					this.endTime=(e.year)+"/12/31"
+				}else{
+					var b=e.year+'/'+(parseInt(e.month)+1)+'/1';
+					var a=beforeTimeStamp(1,b);
+					this.endTime= parseUnixTime(a, '{y}-{m}-{d}')
+				}
+				
+				this.okbtn()
+			
+			},
+			showTime(name){
+				if(!name){
+					return ''
+				}
+				return name.replace('-','年')+'月';
+			},
+			myLoadmore() {
+				this.pageIndex += 1;
+				this.getList()
+			},
+			getList(bl){
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				if (bl) {
+					this.list = [];
+					this.pageIndex = 1;
+				}
+				API.chargingRecordVipData({
+					pageIndex: this.pageIndex,
+					startDate: this.startTime,
+					endDate: this.endTime,
+					platform: this.platform,
+					pageSize:20,
+				}).then((res) => {
+					uni.hideLoading();
+					
+					this.list = [
+						...this.list,
+						...res.data.data
+					];
+					
+					this.electricQuantity = res.data.electricQuantity;
+					this.recordsTotal = res.data.recordsTotal;
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+				
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	// 余额
+	.balance {
+		
+		background-color: #f3f4f7;
+	
+		margin: 12rpx 0px 22rpx 0px;
+		padding: 32rpx 60rpx;
+		display: flex;
+		// justify-content: space-between;
+		justify-content: space-around;
+		border-radius: 12px;
+		.item3{
+			    border-right: 1px solid #dad5d5;
+			    height: 60rpx;
+			    margin-top: 20rpx;
+		}
+		.item2 {
+			text-align: center;
+			 display: table-row;
+			
+			.num {
+				line-height: 56rpx;
+				color: rgba(51, 51, 51, 100);
+				font-size: 48rpx;
+				position: relative;
+				 font-weight: bold;
+	
+			}
+	
+			.name {
+				height: 32rpx;
+				color: rgba(134, 134, 134, 100);
+				font-size: 28rpx;
+				margin-top: 2px;
+				margin-botton: 4px;
+				
+			}
+		}
+	}
+	page{
+		background-color: #fff;
+	}
+	.header{
+		background-color: #4C586B;
+		color: #fff;
+		.title{
+			display: flex;
+			line-height: 26px;
+			padding: 9px 11px;
+			
+			
+		}
+		.iconfont{
+			font-size: 24px
+		}
+		.content{
+			flex: 1;
+			text-align: center;
+			font-size: 20px
+		}
+		
+		.user-card{
+		   padding: 19px 0 39px 20px;
+			margin: 21px 20px 0 20px;
+			background:url(@/assets/img/companyVIP.png) no-repeat right,linear-gradient(to right,#C6D4ED,#DCE6F0) no-repeat;
+			box-shadow: 0px 0px 16px 0px rgba(14, 39, 84, 28);
+			border: 2px solid rgba(236, 239, 245, 100);
+			border-radius: 16px;
+			display: flex;
+			.head-img{
+				width: 48px;
+				height: 48px;
+				img{
+					width: 100%;
+				}
+			}
+			.user-name{
+				margin-left: 12px;
+				.name{
+					line-height: 40rpx;
+					color: rgba(33, 41, 48, 100);
+					font-size: 40rpx;
+					font-weight: 550;
+				}
+				.sign{
+					color: rgba(76, 89, 111, 100);
+					font-size: 28rpx;
+					line-height: 28rpx;
+					margin-top: 16rpx;
+				}
+				.sign2{
+					color: #6C6F73 ;
+					font-size: 24rpx;
+					line-height: 24rpx;
+					margin-top: 16rpx;
+				}
+			}
+		}
+	}
+
+.carNone{
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		img{
+			width: 100%;
+			height: 100%;
+		}
+		p{
+			margin-top: -60px;
+		}
+	}
+.details{
+	height: 100%;
+	
+	box-shadow: 0px -6px 6px 0px #1A313C47;
+	margin-top: -15px;
+	border-radius: 16px 16px 0px 0px;
+	background-color: #fff;
+	padding: 10px 20px;
+	
+	.month-electric{
+		display: flex;
+		justify-content: space-between;
+		line-height: 16px;
+		margin-bottom: 25px;
+		.month{
+			
+			color: #333333;
+			.iconfont{
+				color:#666666;
+			}
+		}
+		.electric{
+			color: rgba(102, 102, 102, 100);
+			font-size: 16px;
+		}
+	}
+	
+	.item{
+		display: flex;
+		justify-content: space-between;
+		margin-bottom: 22px;
+		.infos{
+			.station-name{
+				color: rgba(51, 51, 51, 100);
+				font-size: 16px;
+				line-height: 16px;
+			}
+			.time{
+				color: rgba(119, 119, 119, 100);
+				line-height: 14px;
+				margin-top: 8px;
+			}
+		}
+		.electricity-consumption{
+			
+			margin: auto 0;
+			font-size: 24px;
+			color: #111111;
+		}
+		
+	}
+	/deep/.u-divider{
+		margin-top: 27px !important;
+		
+	}
+}
+</style>

pages/user/coupon/chooseCoupons.vue

@@ -1,343 +1,343 @@
-<template>
-	<view >
-		<ujp-navbar title="我的优惠券">
-			<view class="exchange oldTextjp2" oldstyle="font-size: 16px;" @click="toConversion">兑换</view></ujp-navbar>
-		
-		<u-alert-tips size="12" :show-icon="true"  type="warning"
-		 description="同类型优惠券只显示一张"></u-alert-tips>
-		
-		
-		<view class="list-item"  
-		
-		v-for="(item,index) in myCouponList"
-		:style="item.chooseStatus == '0' ? 'opacity: 0.5':'' "
-		 @click="ckselectObj(item)"
-		 :key="item.id">
-			
-			<view 
-			:style="item.chooseStatus == '0' ? 'background-color:#9F9F9F':'' "
-			
-			class="voucher" >优惠券</view>
-		
-			
-			
-			<view class="checked" v-if="selectObj.id==item.id">
-				<img src="../../../static/img/选中.png" alt="">
-			</view>
-			
-			 
-			<view class="item-left">
-				<view class="title oldTextjp" oldstyle="font-size: 18px;">
-					{{item.couponName}}
-				</view>
-				<view class="useful-life oldTextjp2" oldstyle="font-size: 16px;">
-					有效期至{{item.endDate&&item.endDate.slice(0,10)}}{{" "}}
-					<span class="item-left-explain" @click.stop="gotoUrl('pages/user/coupon/couponDetails?id=' + item.id)">使用说明</span>
-				</view>
-			</view>
-			<view class="item-right">
-				
-				
-					<view class="price2"
-					 :style="item.chooseStatus == '0' ? 'color:#666':'' "
-					 
-					 v-if="item.classify == '2'"><span style="font-size: 12px;">服务费</span>{{item.value}}<span style="font-size: 12px;">折</span></view>
-				 <view class="price"
-				  :style="item.chooseStatus == '0' ? 'color:#666':'' "
-				 
-				 v-else >{{item.value.toFixed(2)}}<span style="font-size: 12px;">元</span></view>
-				 
-				 
-				 
-				  <view class="contidion oldTextjp2" oldstyle="font-size: 16px;">
-				  	{{item.threshold == 0 ? '无门槛' : '满'+item.threshold.toFixed(2)+'元可用'}}
-				  </view>
-			</view>
-		</view>
-		<u-divider  v-if="myCouponList.length > 0" style="margin-top: 10px;background-color: #F2F4F4;">已经到底了</u-divider>
-		<view   v-if="myCouponList.length > 0"  style="padding-bottom: 80px;" ></view>
-		<view class="carNone" v-if="myCouponList.length == 0">
-			<img src="static/img/暂无数据-缺省页.png" alt="">
-			<p>暂无优惠券</p>
-		</view>
-		
-	<view class="bottom">
-		<view class="text">
-			
-			<view class="num"  v-show="selectObj.id">
-				 
-				<view class="price" v-if="selectObj.classify == '2'">服务费{{selectObj.value}}折</view>
-				<view class="price" v-else  >抵扣{{selectObj.value}}元</view>
-								 
-			</view>
-		</view>
-		<u-button 
-		:style="selectObj.id  ?'' : 'background-color:#9F9F9F'"
-		@click="submitBtn"
-		class="confirm" >
-			<span>确定</span>
-		</u-button>
-	</view>
-	
-	
-	
-	</view>
-</template>
-
-<script>
-	//import * as userApi from '@/apis/user.js'
-	import * as userApi from '@/apis/chargeProcess.js'
-	
-	export default{
-		data(){
-			return{
-				selectObj:{},
-				amount:0,
-				uuid:0,
-				myCouponList: [],
-				pageIndex: 1,
-				recordsTotal: 0,
-				stationId:"",
-				userCard:null,
-			}
-		},
-		onReachBottom() {
-			if (this.myCouponList.length < this.recordsTotal) {			
-				this.myLoadmore();
-			}
-		},
-		onLoad(op) {
-			var plus=this.carhelp.getPersonInfoPlus()
-			if(plus){
-				this.userCard=plus.userCard;
-			}
-			if(op.uuid){
-				this.amount=op.amount
-				this.uuid=op.uuid
-				this.stationId=op.stationId;
-			}
-		
-		},
-		onShow() {
-				this.getCouponList();
-		},
-		computed:{
-			userCardBool(){
-				if(this.userCard){
-					var date=new Date().getTime()
-					var reg=new RegExp('-','gi')
-					var str=this.userCard.endTime;
-					//console.log(str.replace(reg,'/'))
-					var date2=new Date(str.replace(reg,'/')).getTime();
-					if(date<date2){
-						return true;
-					}
-				}
-				return false
-			}
-		},
-		methods:{
-			submitBtn(){
-				if(this.selectObj.id){
-					this.carhelp.set("chooseCoupons",{
-						uuid:this.uuid,
-						selectObj:this.selectObj
-					})
-					uni.navigateBack({
-						
-					})
-				}
-			},
-			ckselectObj(item){
-				if(item.chooseStatus==1){
-					this.selectObj=item;
-				}else{
-					uni.showToast({
-						title:"不满足使用条件"
-					})
-				}
-				
-			},
-			toConversion() {
-				uni.navigateTo({
-					url: '/pages/user/coupon/conversion'
-				})
-			},
-			getCouponList(bl) {
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				if (bl) {
-					this.myCouponList = [];
-					this.pageIndex = 1;
-				}
-				var obj={
-					amount:this.amount==0?'':this.amount,
-					stationId:this.stationId
-				}
-				if(this.userCardBool){
-					obj.userCardId=this.userCard.id
-				}
-	
-				userApi.useCoupon(obj).then((res) => {
-					uni.hideLoading();
-					
-					this.myCouponList =res.data.userCouponList
-					this.recordsTotal = res.data.recordsTotal;
-				}).catch(error => {
-					uni.showToast({
-						title: error,
-						icon: "none"
-					})
-				})
-			},
-			myLoadmore() {
-				this.pageIndex += 1;
-				this.getCouponList()
-			},
-		}
-	}
-</script>
-
-<style lang="scss">
-	.carNone{
-		display: flex;
-		flex-direction: column;
-		justify-content: center;
-		align-items: center;
-		img{
-			width: 100%;
-			height: 100%;
-		}
-		p{
-			margin-top: -60px;
-		}
-	}
-	.exchange{
-		margin-left: 85.3%;
-		color: rgba(119, 119, 119, 100);
-		font-size: 12px
-	}
-	.list-item{
-		width: 91.4%;
-		display: flex;
-		justify-content: space-between;
-		background-color: #fff;
-		margin: 12px auto 0;
-		border-radius: 8px;
-		position: relative;
-		.voucher{
-			width: 60px;
-			height: 20px;
-			line-height: 20px;
-			border-radius: 8px 0px 8px 0px;
-			background-color: rgba(0, 185, 98, 100);
-			color: rgba(255, 255, 255, 100);
-			font-size: 12px;
-			text-align: center;
-			position: absolute;
-			top: 0;
-			left: 0;
-		}
-		.checked{
-			width: 28px;
-			height: 28px;
-			position: absolute;
-			top: 0;
-			right: 0;
-			img{
-				width: 100%;
-				height: 100%;
-			}
-		}
-		.item-left{
-			padding: 24px 0 20px 10px;
-			.title{
-				line-height: 25px;
-				color: rgba(16, 16, 16, 100);
-				font-size: 18px;
-				font-weight: 600;
-			}
-			.useful-life{
-				line-height: 22px;
-				color: rgba(51, 51, 51, 100);
-				font-size: 14px;
-				margin-top: 1px;
-			}
-			.item-left-explain {
-				color: rgba(0, 185, 98, 100);
-				font-size: 14px;
-			}
-		}
-		.item-right{
-			padding: 19px 10px 18px 0;
-			
-			.price{
-				height: 38px;
-				color: rgba(0, 185, 98, 100);
-				font-size: 32px;
-				text-align: right;
-			}
-			.price2{
-				height: 38px;
-				color: rgba(0, 185, 98, 100);
-				font-size: 20px;
-				text-align: right;
-			}
-			.contidion{
-				height: 22px;
-				color: rgba(51, 51, 51, 100);
-				font-size: 16px;
-				text-align: right;
-				margin-top: 4px;
-			}
-		}
-	}
-
-  .have-used{
-	  
-	  width: 54px;
-	  height: 54px;
-	  position: absolute;
-	  top: -12px;
-	 right: 0;
-	  img{
-		  width: 100%;
-		  height: 100%;
-	  }
-  }
-.bottom{
-	position: fixed;
-	bottom: 0;
-	right: 0;
-	width: 100%;
-	height: 64px;
-	line-height: 64px;
-	background-color: #fff;
-	padding: 0 16px;
-	display: flex;
-	justify-content: space-between;
-	.text{
-		height: 20px;
-		color: rgba(16, 16, 16, 100);
-		font-size: 18px;
-		display: flex;
-		.num{
-			color: orangered;
-			font-size: 18px
-		}
-	}
-	.confirm{
-		width: 100px;
-		height: 40px;
-		border-radius: 50px;
-		background-color: rgba(0, 185, 98, 100);
-		color: rgba(255, 255, 255, 100);
-		font-size: 18px;
-		text-align: center;
-		margin: auto 10px ;
-	}
-}
-
+<template>
+	<view >
+		<ujp-navbar title="我的优惠券">
+			<view class="exchange oldTextjp2" oldstyle="font-size: 16px;" @click="toConversion">兑换</view></ujp-navbar>
+		
+		<u-alert-tips size="12" :show-icon="true"  type="warning"
+		 description="同类型优惠券只显示一张"></u-alert-tips>
+		
+		
+		<view class="list-item"  
+		
+		v-for="(item,index) in myCouponList"
+		:style="item.chooseStatus == '0' ? 'opacity: 0.5':'' "
+		 @click="ckselectObj(item)"
+		 :key="item.id">
+			
+			<view 
+			:style="item.chooseStatus == '0' ? 'background-color:#9F9F9F':'' "
+			
+			class="voucher" >优惠券</view>
+		
+			
+			
+			<view class="checked" v-if="selectObj.id==item.id">
+				<img src="@/assets/static/img/选中.png" alt="">
+			</view>
+			
+			 
+			<view class="item-left">
+				<view class="title oldTextjp" oldstyle="font-size: 18px;">
+					{{item.couponName}}
+				</view>
+				<view class="useful-life oldTextjp2" oldstyle="font-size: 16px;">
+					有效期至{{item.endDate&&item.endDate.slice(0,10)}}{{" "}}
+					<span class="item-left-explain" @click.stop="gotoUrl('pages/user/coupon/couponDetails?id=' + item.id)">使用说明</span>
+				</view>
+			</view>
+			<view class="item-right">
+				
+				
+					<view class="price2"
+					 :style="item.chooseStatus == '0' ? 'color:#666':'' "
+					 
+					 v-if="item.classify == '2'"><span style="font-size: 12px;">服务费</span>{{item.value}}<span style="font-size: 12px;">折</span></view>
+				 <view class="price"
+				  :style="item.chooseStatus == '0' ? 'color:#666':'' "
+				 
+				 v-else >{{item.value.toFixed(2)}}<span style="font-size: 12px;">元</span></view>
+				 
+				 
+				 
+				  <view class="contidion oldTextjp2" oldstyle="font-size: 16px;">
+				  	{{item.threshold == 0 ? '无门槛' : '满'+item.threshold.toFixed(2)+'元可用'}}
+				  </view>
+			</view>
+		</view>
+		<u-divider  v-if="myCouponList.length > 0" style="margin-top: 10px;background-color: #F2F4F4;">已经到底了</u-divider>
+		<view   v-if="myCouponList.length > 0"  style="padding-bottom: 80px;" ></view>
+		<view class="carNone" v-if="myCouponList.length == 0">
+			<img src="@/assets/static/img/暂无数据-缺省页.png" alt="">
+			<p>暂无优惠券</p>
+		</view>
+		
+	<view class="bottom">
+		<view class="text">
+			
+			<view class="num"  v-show="selectObj.id">
+				 
+				<view class="price" v-if="selectObj.classify == '2'">服务费{{selectObj.value}}折</view>
+				<view class="price" v-else  >抵扣{{selectObj.value}}元</view>
+								 
+			</view>
+		</view>
+		<u-button 
+		:style="selectObj.id  ?'' : 'background-color:#9F9F9F'"
+		@click="submitBtn"
+		class="confirm" >
+			<span>确定</span>
+		</u-button>
+	</view>
+	
+	
+	
+	</view>
+</template>
+
+<script>
+	//import * as userApi from '@/apis/user.js'
+	import * as userApi from '@/apis/chargeProcess.js'
+	
+	export default{
+		data(){
+			return{
+				selectObj:{},
+				amount:0,
+				uuid:0,
+				myCouponList: [],
+				pageIndex: 1,
+				recordsTotal: 0,
+				stationId:"",
+				userCard:null,
+			}
+		},
+		onReachBottom() {
+			if (this.myCouponList.length < this.recordsTotal) {			
+				this.myLoadmore();
+			}
+		},
+		onLoad(op) {
+			var plus=this.carhelp.getPersonInfoPlus()
+			if(plus){
+				this.userCard=plus.userCard;
+			}
+			if(op.uuid){
+				this.amount=op.amount
+				this.uuid=op.uuid
+				this.stationId=op.stationId;
+			}
+		
+		},
+		onShow() {
+				this.getCouponList();
+		},
+		computed:{
+			userCardBool(){
+				if(this.userCard){
+					var date=new Date().getTime()
+					var reg=new RegExp('-','gi')
+					var str=this.userCard.endTime;
+					//console.log(str.replace(reg,'/'))
+					var date2=new Date(str.replace(reg,'/')).getTime();
+					if(date<date2){
+						return true;
+					}
+				}
+				return false
+			}
+		},
+		methods:{
+			submitBtn(){
+				if(this.selectObj.id){
+					this.carhelp.set("chooseCoupons",{
+						uuid:this.uuid,
+						selectObj:this.selectObj
+					})
+					uni.navigateBack({
+						
+					})
+				}
+			},
+			ckselectObj(item){
+				if(item.chooseStatus==1){
+					this.selectObj=item;
+				}else{
+					uni.showToast({
+						title:"不满足使用条件"
+					})
+				}
+				
+			},
+			toConversion() {
+				uni.navigateTo({
+					url: '/pages/user/coupon/conversion'
+				})
+			},
+			getCouponList(bl) {
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				if (bl) {
+					this.myCouponList = [];
+					this.pageIndex = 1;
+				}
+				var obj={
+					amount:this.amount==0?'':this.amount,
+					stationId:this.stationId
+				}
+				if(this.userCardBool){
+					obj.userCardId=this.userCard.id
+				}
+	
+				userApi.useCoupon(obj).then((res) => {
+					uni.hideLoading();
+					
+					this.myCouponList =res.data.userCouponList
+					this.recordsTotal = res.data.recordsTotal;
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+			},
+			myLoadmore() {
+				this.pageIndex += 1;
+				this.getCouponList()
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	.carNone{
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		img{
+			width: 100%;
+			height: 100%;
+		}
+		p{
+			margin-top: -60px;
+		}
+	}
+	.exchange{
+		margin-left: 85.3%;
+		color: rgba(119, 119, 119, 100);
+		font-size: 12px
+	}
+	.list-item{
+		width: 91.4%;
+		display: flex;
+		justify-content: space-between;
+		background-color: #fff;
+		margin: 12px auto 0;
+		border-radius: 8px;
+		position: relative;
+		.voucher{
+			width: 60px;
+			height: 20px;
+			line-height: 20px;
+			border-radius: 8px 0px 8px 0px;
+			background-color: rgba(0, 185, 98, 100);
+			color: rgba(255, 255, 255, 100);
+			font-size: 12px;
+			text-align: center;
+			position: absolute;
+			top: 0;
+			left: 0;
+		}
+		.checked{
+			width: 28px;
+			height: 28px;
+			position: absolute;
+			top: 0;
+			right: 0;
+			img{
+				width: 100%;
+				height: 100%;
+			}
+		}
+		.item-left{
+			padding: 24px 0 20px 10px;
+			.title{
+				line-height: 25px;
+				color: rgba(16, 16, 16, 100);
+				font-size: 18px;
+				font-weight: 600;
+			}
+			.useful-life{
+				line-height: 22px;
+				color: rgba(51, 51, 51, 100);
+				font-size: 14px;
+				margin-top: 1px;
+			}
+			.item-left-explain {
+				color: rgba(0, 185, 98, 100);
+				font-size: 14px;
+			}
+		}
+		.item-right{
+			padding: 19px 10px 18px 0;
+			
+			.price{
+				height: 38px;
+				color: rgba(0, 185, 98, 100);
+				font-size: 32px;
+				text-align: right;
+			}
+			.price2{
+				height: 38px;
+				color: rgba(0, 185, 98, 100);
+				font-size: 20px;
+				text-align: right;
+			}
+			.contidion{
+				height: 22px;
+				color: rgba(51, 51, 51, 100);
+				font-size: 16px;
+				text-align: right;
+				margin-top: 4px;
+			}
+		}
+	}
+
+  .have-used{
+	  
+	  width: 54px;
+	  height: 54px;
+	  position: absolute;
+	  top: -12px;
+	 right: 0;
+	  img{
+		  width: 100%;
+		  height: 100%;
+	  }
+  }
+.bottom{
+	position: fixed;
+	bottom: 0;
+	right: 0;
+	width: 100%;
+	height: 64px;
+	line-height: 64px;
+	background-color: #fff;
+	padding: 0 16px;
+	display: flex;
+	justify-content: space-between;
+	.text{
+		height: 20px;
+		color: rgba(16, 16, 16, 100);
+		font-size: 18px;
+		display: flex;
+		.num{
+			color: orangered;
+			font-size: 18px
+		}
+	}
+	.confirm{
+		width: 100px;
+		height: 40px;
+		border-radius: 50px;
+		background-color: rgba(0, 185, 98, 100);
+		color: rgba(255, 255, 255, 100);
+		font-size: 18px;
+		text-align: center;
+		margin: auto 10px ;
+	}
+}
+
 </style>

pages/user/coupon/myCoupon.vue

@@ -1,321 +1,321 @@
-<template>
-	<view >
-		<ujp-navbar title="我的优惠券"><view class="exchange oldTextjp2" oldstyle="font-size: 16px;" @click="toConversion">兑换</view></ujp-navbar>
-		<view class="tab" >
-			<u-tabs :font-size="elderStatus ? 36 : 30" :list="tabList" :current="current" @change="change" :show-bar="false" active-color="#333" inactive-color="#c4c0c0"></u-tabs>
-		</view>
-		<view class="carNone" v-if="myCouponList.length == 0">
-			<img src="static/img/暂无数据-缺省页.png" alt="">
-			<p>暂无优惠券</p>
-		</view>
-		<view class="workable" :style="current == 0 ? '' : 'opacity: 0.6'">
-			<view class="list-item" v-for="(item,index) in myCouponList" :key="index">
-	
-				<view class="voucher" v-if="item.classify == '4'||item.classify == '5'">月卡优惠券</view>
-				<view class="voucher" v-else>优惠券</view>
-				
-				<view class="content" @click="gotoUrl('pages/user/coupon/couponDetails?id=' + item.id)">
-					<view class="content-left">
-						<view class="text oldTextjp" oldstyle="font-size: 18px;">{{item.couponName}}</view>
-						<view class="useful-life oldTextjp2" oldstyle="font-size: 16px;">
-							有效期至{{item.endDate&&item.endDate.slice(0,10)}}
-						</view>	
-					</view>
-					<view class="content-right">
-
-						<view class="price2" v-if="item.classify == '2'"><span style="font-size: 12px;">服务费</span>{{item.value}}<span style="font-size: 12px;">折</span></view>
-						<view class="price" v-else >{{item.value}}<span style="font-size: 12px;">元</span></view>
-						
-						
-						<view class="price-condition oldTextjp2" oldstyle="font-size: 16px;">
-							{{item.threshold > 0 ? '满'+item.threshold+'元可用' : '无门槛'}}
-						</view>
-					</view>
-				</view>
-				
-				<view class="limit">
-					<view class="limit-text">
-							<view :class="more==index&&readMoreStatus ? 'limit-text2' : 'limit-text1'">
-								<span>{{item.useScopeText}}</span>		
-							</view>
-							<view class="iconfont arrows" @click="readMore(index)">{{more==index&&readMoreStatus ? '&#xe607;' : '&#xe62c;'}}</view>
-					</view>
-					<view class="use-button" v-if="current == '0'" @click="toIndex">去使用</view>
-					<view class="have-used" v-if="current == '1'"><img src="../../../static/img/haveused.png" alt=""></view>
-					<view class="have-used" v-if="current == '2'"><img src="../../../static/img/overdue.png" alt=""></view>
-				</view>
-			</view>
-		</view>
-		<u-divider  v-if="myCouponList.length == recordsTotal && recordsTotal != 0" style="margin-top: 10px;background-color: #F2F4F4;">已经到底了</u-divider>
-		
-	</view>	
-</template>
-
-<script>
-	import * as userApi from '@/apis/user.js'
-	
-	export default{
-		data(){
-			return{
-				tabList: [
-					{name: '可使用',type: '0'},
-					{name: '已使用',type: '1'},
-					{name: '已过期',type: '2'},
-				],
-				current: 0,
-				couponType: '0',
-				myCouponList: [],
-				pageIndex: 1,
-				recordsTotal: 0,
-				readMoreStatus: false,
-				more: -1,
-				moreShow: '',
-				elderStatus: false,
-			}
-		},
-		onShow() {
-			this.getCouponList(true);
-			
-			if(this.carhelp.get("getElderModeClass") == "长辈模式") {
-				this.elderStatus = true;
-			} else {
-				this.elderStatus = false;
-			}
-		},
-		onReachBottom() {
-			if (this.myCouponList.length < this.recordsTotal) {			
-				this.myLoadmore();
-			}
-		},
-		methods:{
-			toConversion() {
-				uni.navigateTo({
-					url: '/pages/user/coupon/conversion'
-				})
-			},
-			toIndex() {
-				uni.navigateTo({
-					url: '/pages/index/index'
-				})
-			},
-			readMore(index) {
-				if(this.more != index && this.readMoreStatus) {
-					this.more = index;
-					this.readMoreStatus = true;
-				} else {
-					this.more = index;
-					this.readMoreStatus = !this.readMoreStatus;
-				}
-			},
-			getCouponList(bl) {
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				if (bl) {
-					this.myCouponList = [];
-					this.pageIndex = 1;
-				}
-				userApi.couponList({
-					pageIndex: this.pageIndex,
-					status: this.couponType
-				}).then((res) => {
-					uni.hideLoading();
-					
-					this.myCouponList = [
-						...this.myCouponList,
-						...res.data.data
-					];
-					this.recordsTotal = res.data.recordsTotal;
-				}).catch(error => {
-					uni.showToast({
-						title: error,
-						icon: "none"
-					})
-				})
-			},
-			change(index) {
-				this.current = index;
-				this.couponType = this.tabList[index].type;
-				this.getCouponList(true);
-			},
-			myLoadmore() {
-				this.pageIndex += 1;
-				this.getCouponList()
-			},
-		}
-	}
-</script>
-<style>
-	page{
-		padding-bottom: 50px;
-	}
-</style>
-<style lang="scss" scoped>
-	.carNone{
-		display: flex;
-		flex-direction: column;
-		justify-content: center;
-		align-items: center;
-		img{
-			width: 100%;
-			height: 100%;
-		}
-		p{
-			margin-top: -60px;
-		}
-	}
-	.exchange{
-		margin-left: 85.3%;
-		color: rgba(119, 119, 119, 100);
-		font-size: 12px
-	}
-	.tab{
-		
-		width: 100%;
-		
-	}
-	/deep/.u-scroll-box{
-		width: 80.8%;
-		margin: 0 auto;
-	    display: flex;
-		justify-content: space-between;
-	}
-	
-	.list-item{
-		width: 91.4%;
-		background-color: #fff;
-		margin: 12px auto 0;
-		position: relative;
-		border-radius:8px;
-		.voucher{
-			width: 60px;
-			height: 20px;
-			line-height: 20px;
-			border-radius: 8px 0px 8px 0px;
-			background-color: rgba(0, 185, 98, 100);
-			color: rgba(255, 255, 255, 100);
-			font-size: 12px;
-			text-align: center;
-			position: absolute;
-			top: 0;
-			left: 0;
-		}
-		.content{
-			   display: flex;
-			   justify-content: space-between;
-			   padding: 24px 16px;
-		}
-			   .content-left{
-				   .text{
-					 
-					   height: 22px;
-					   line-height: 22px;
-					   color: rgba(16, 16, 16, 100);
-					   font-size: 16px;
-				   }
-				
-				   .useful-life{
-					   height: 17px;
-					   line-height: 17px;
-					   color: rgba(153, 153, 153, 100);
-					   font-size: 12px;
-					   margin-top: 4px;
-				   }
-			   };
-			   .content-right{
-				   margin-top: -8px;
-				   text-align: right;
-				   .price{
-					   height: 38px;
-					   color: rgba(0, 185, 98, 100);
-					   font-size: 34px;
-					   
-				   }
-				   .price2{
-				   			 height: 38px;
-				   			   color: rgba(0, 185, 98, 100);
-				   			 font-size: 24px;
-				   }
-				   .price-condition{
-					   height: 17px;
-					   color: rgba(102, 102, 102, 100);
-					   font-size: 12px;
-					   text-align: center;
-					   margin-top: 4px;
-				   }
-			   }
-		}
-		.limit{
-		
-			display: flex;
-			justify-content: space-between;
-			padding: 14px 16px;
-			border-top:  1px dotted rgba(227, 227, 227, 100);
-			position: relative;
-			
-			.limit-text{
-				color: rgba(153, 153, 153, 100);
-								font-size: 12px;
-								display: flex;
-								
-				
-				.limit-text1{
-					max-width: 51vw;
-					line-height: 20px;
-					position: relative;
-					font-size: 12px;
-					white-space: nowrap;
-					overflow: hidden;
-					text-overflow: ellipsis;	
-			}
-			.limit-text2{
-					max-width: 51vw;
-					line-height: 20px;
-					position: relative;
-					font-size: 12px;
-					white-space: normal;
-					overflow: hidden;
-					text-overflow: ellipsis;	
-			}
-			.arrows{
-									   display: inline-block;
-								   width: 20px;
-								   height: 20px;
-						           padding-top: 2px;
-								   margin-left: 4px;
-								   
-								  
-				
-			
-			}
-			
-		}
-		
-		
-	}
-	
-  .use-button{
-  	width: 56px;
-  	height: 24px;
-  	line-height: 24px;
-  	border-radius: 4px;
-  	background-color: rgba(0, 185, 98, 100);
-  	color: rgba(255, 255, 255, 100);
-  	font-size: 12px;
-  	text-align: center;
-  }
-  .have-used{
-	  
-	  width: 64px;
-	  height: 64px;
-	  position: absolute;
-	  top: -12px;
-	 right: 0;
-	  img{
-		  width: 100%;
-		  height: 100%;
-	  }
-  }
-
+<template>
+	<view >
+		<ujp-navbar title="我的优惠券"><view class="exchange oldTextjp2" oldstyle="font-size: 16px;" @click="toConversion">兑换</view></ujp-navbar>
+		<view class="tab" >
+			<u-tabs :font-size="elderStatus ? 36 : 30" :list="tabList" :current="current" @change="change" :show-bar="false" active-color="#333" inactive-color="#c4c0c0"></u-tabs>
+		</view>
+		<view class="carNone" v-if="myCouponList.length == 0">
+			<img src="@/assets/static/img/暂无数据-缺省页.png" alt="">
+			<p>暂无优惠券</p>
+		</view>
+		<view class="workable" :style="current == 0 ? '' : 'opacity: 0.6'">
+			<view class="list-item" v-for="(item,index) in myCouponList" :key="index">
+	
+				<view class="voucher" v-if="item.classify == '4'||item.classify == '5'">月卡优惠券</view>
+				<view class="voucher" v-else>优惠券</view>
+				
+				<view class="content" @click="gotoUrl('pages/user/coupon/couponDetails?id=' + item.id)">
+					<view class="content-left">
+						<view class="text oldTextjp" oldstyle="font-size: 18px;">{{item.couponName}}</view>
+						<view class="useful-life oldTextjp2" oldstyle="font-size: 16px;">
+							有效期至{{item.endDate&&item.endDate.slice(0,10)}}
+						</view>	
+					</view>
+					<view class="content-right">
+
+						<view class="price2" v-if="item.classify == '2'"><span style="font-size: 12px;">服务费</span>{{item.value}}<span style="font-size: 12px;">折</span></view>
+						<view class="price" v-else >{{item.value}}<span style="font-size: 12px;">元</span></view>
+						
+						
+						<view class="price-condition oldTextjp2" oldstyle="font-size: 16px;">
+							{{item.threshold > 0 ? '满'+item.threshold+'元可用' : '无门槛'}}
+						</view>
+					</view>
+				</view>
+				
+				<view class="limit">
+					<view class="limit-text">
+							<view :class="more==index&&readMoreStatus ? 'limit-text2' : 'limit-text1'">
+								<span>{{item.useScopeText}}</span>		
+							</view>
+							<view class="iconfont arrows" @click="readMore(index)">{{more==index&&readMoreStatus ? '&#xe607;' : '&#xe62c;'}}</view>
+					</view>
+					<view class="use-button" v-if="current == '0'" @click="toIndex">去使用</view>
+					<view class="have-used" v-if="current == '1'"><img src="@/assets/static/img/haveused.png" alt=""></view>
+					<view class="have-used" v-if="current == '2'"><img src="@/assets/static/img/overdue.png" alt=""></view>
+				</view>
+			</view>
+		</view>
+		<u-divider  v-if="myCouponList.length == recordsTotal && recordsTotal != 0" style="margin-top: 10px;background-color: #F2F4F4;">已经到底了</u-divider>
+		
+	</view>	
+</template>
+
+<script>
+	import * as userApi from '@/apis/user.js'
+	
+	export default{
+		data(){
+			return{
+				tabList: [
+					{name: '可使用',type: '0'},
+					{name: '已使用',type: '1'},
+					{name: '已过期',type: '2'},
+				],
+				current: 0,
+				couponType: '0',
+				myCouponList: [],
+				pageIndex: 1,
+				recordsTotal: 0,
+				readMoreStatus: false,
+				more: -1,
+				moreShow: '',
+				elderStatus: false,
+			}
+		},
+		onShow() {
+			this.getCouponList(true);
+			
+			if(this.carhelp.get("getElderModeClass") == "长辈模式") {
+				this.elderStatus = true;
+			} else {
+				this.elderStatus = false;
+			}
+		},
+		onReachBottom() {
+			if (this.myCouponList.length < this.recordsTotal) {			
+				this.myLoadmore();
+			}
+		},
+		methods:{
+			toConversion() {
+				uni.navigateTo({
+					url: '/pages/user/coupon/conversion'
+				})
+			},
+			toIndex() {
+				uni.navigateTo({
+					url: '/pages/index/index'
+				})
+			},
+			readMore(index) {
+				if(this.more != index && this.readMoreStatus) {
+					this.more = index;
+					this.readMoreStatus = true;
+				} else {
+					this.more = index;
+					this.readMoreStatus = !this.readMoreStatus;
+				}
+			},
+			getCouponList(bl) {
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				if (bl) {
+					this.myCouponList = [];
+					this.pageIndex = 1;
+				}
+				userApi.couponList({
+					pageIndex: this.pageIndex,
+					status: this.couponType
+				}).then((res) => {
+					uni.hideLoading();
+					
+					this.myCouponList = [
+						...this.myCouponList,
+						...res.data.data
+					];
+					this.recordsTotal = res.data.recordsTotal;
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+			},
+			change(index) {
+				this.current = index;
+				this.couponType = this.tabList[index].type;
+				this.getCouponList(true);
+			},
+			myLoadmore() {
+				this.pageIndex += 1;
+				this.getCouponList()
+			},
+		}
+	}
+</script>
+<style>
+	page{
+		padding-bottom: 50px;
+	}
+</style>
+<style lang="scss" scoped>
+	.carNone{
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		img{
+			width: 100%;
+			height: 100%;
+		}
+		p{
+			margin-top: -60px;
+		}
+	}
+	.exchange{
+		margin-left: 85.3%;
+		color: rgba(119, 119, 119, 100);
+		font-size: 12px
+	}
+	.tab{
+		
+		width: 100%;
+		
+	}
+	/deep/.u-scroll-box{
+		width: 80.8%;
+		margin: 0 auto;
+	    display: flex;
+		justify-content: space-between;
+	}
+	
+	.list-item{
+		width: 91.4%;
+		background-color: #fff;
+		margin: 12px auto 0;
+		position: relative;
+		border-radius:8px;
+		.voucher{
+			width: 60px;
+			height: 20px;
+			line-height: 20px;
+			border-radius: 8px 0px 8px 0px;
+			background-color: rgba(0, 185, 98, 100);
+			color: rgba(255, 255, 255, 100);
+			font-size: 12px;
+			text-align: center;
+			position: absolute;
+			top: 0;
+			left: 0;
+		}
+		.content{
+			   display: flex;
+			   justify-content: space-between;
+			   padding: 24px 16px;
+		}
+			   .content-left{
+				   .text{
+					 
+					   height: 22px;
+					   line-height: 22px;
+					   color: rgba(16, 16, 16, 100);
+					   font-size: 16px;
+				   }
+				
+				   .useful-life{
+					   height: 17px;
+					   line-height: 17px;
+					   color: rgba(153, 153, 153, 100);
+					   font-size: 12px;
+					   margin-top: 4px;
+				   }
+			   };
+			   .content-right{
+				   margin-top: -8px;
+				   text-align: right;
+				   .price{
+					   height: 38px;
+					   color: rgba(0, 185, 98, 100);
+					   font-size: 34px;
+					   
+				   }
+				   .price2{
+				   			 height: 38px;
+				   			   color: rgba(0, 185, 98, 100);
+				   			 font-size: 24px;
+				   }
+				   .price-condition{
+					   height: 17px;
+					   color: rgba(102, 102, 102, 100);
+					   font-size: 12px;
+					   text-align: center;
+					   margin-top: 4px;
+				   }
+			   }
+		}
+		.limit{
+		
+			display: flex;
+			justify-content: space-between;
+			padding: 14px 16px;
+			border-top:  1px dotted rgba(227, 227, 227, 100);
+			position: relative;
+			
+			.limit-text{
+				color: rgba(153, 153, 153, 100);
+								font-size: 12px;
+								display: flex;
+								
+				
+				.limit-text1{
+					max-width: 51vw;
+					line-height: 20px;
+					position: relative;
+					font-size: 12px;
+					white-space: nowrap;
+					overflow: hidden;
+					text-overflow: ellipsis;	
+			}
+			.limit-text2{
+					max-width: 51vw;
+					line-height: 20px;
+					position: relative;
+					font-size: 12px;
+					white-space: normal;
+					overflow: hidden;
+					text-overflow: ellipsis;	
+			}
+			.arrows{
+									   display: inline-block;
+								   width: 20px;
+								   height: 20px;
+						           padding-top: 2px;
+								   margin-left: 4px;
+								   
+								  
+				
+			
+			}
+			
+		}
+		
+		
+	}
+	
+  .use-button{
+  	width: 56px;
+  	height: 24px;
+  	line-height: 24px;
+  	border-radius: 4px;
+  	background-color: rgba(0, 185, 98, 100);
+  	color: rgba(255, 255, 255, 100);
+  	font-size: 12px;
+  	text-align: center;
+  }
+  .have-used{
+	  
+	  width: 64px;
+	  height: 64px;
+	  position: absolute;
+	  top: -12px;
+	 right: 0;
+	  img{
+		  width: 100%;
+		  height: 100%;
+	  }
+  }
+
 </style>

pages/user/finance/balance.vue

@@ -1,310 +1,310 @@
-<template>
-	<view>
-		<ujp-navbar title="我的余额">
-			<view class="slot-wrap">
-				<span class="navBtn oldTextjp222" oldstyle="font-size: 16px;" @click="toRefundList">退余额</span>
-			</view>
-		</ujp-navbar>
-		
-		<u-modal v-model="show" :confirm-text="confirmText" confirm-color="#00B962">
-			<view class="slot-content">
-				<rich-text :nodes="content"></rich-text>
-			</view>
-		</u-modal>
-		<u-modal v-model="show2" :confirm-text="confirmText" confirm-color="#00B962">
-			<view class="slot-content">
-				<rich-text :nodes="content2"></rich-text>
-			</view>
-		</u-modal>
-		<view class="balance">
-			<view class="balanceHead">
-				<view class="balanceCard">
-					<view class="balanceCard-head">
-						<view class="balanceCard-head-item">
-							<view>
-								总金额(元)<u-icon name="question-line" custom-prefix="custom-icon" color="#fff" size="36" @click="show=true"></u-icon>
-							</view>
-							<view class="h2" v-if="personAccount.availableAmount != null">{{personAccount.availableAmount.toFixed(2)}}</view>
-						</view>
-						<view  class="balanceCard-head-item"  v-if="personAccount.chargingFunds" >
-							<view>
-								充电金(元)<u-icon name="question-line" custom-prefix="custom-icon" color="#fff" size="36" @click="show2=true"></u-icon>
-							</view>
-							
-							<view class="h2" v-if="personAccount.chargingFunds != null">{{personAccount.chargingFunds.toFixed(2)}}</view>
-							
-						</view>
-					</view>
-				
-				<!-- 	<view class="balanceCard-main oldTextjp222" oldstyle="font-size: 16px;">
-						<h2 v-if="personAccount.availableAmount != null">{{personAccount.availableAmount.toFixed(2)}}元</h2>
-						<view class="balanceCard-btn" @click="rechargeNow">立即充值</view>
-					</view> -->
-					<view class="balanceCard-foot oldTextjp222" oldstyle="font-size: 16px;">
-						<view class="balanceCard-item" v-if="personAccount.availableAmount != null">可用余额{{personAccount.availableAmount.toFixed(2)}}</view>
-						<view class="balanceCard-item" v-if="personAccount.frozenTotal != null">冻结金额{{personAccount.frozenTotal.toFixed(2)}}</view>
-					</view>
-					
-				</view>
-				<view class="new-balanceCard-foot" @click="rechargeNow">
-					立即充值
-				</view>
-			</view>
-			<view class="balanceMain">
-				<view class="balanceMain-title">
-					<view class="title">
-						<u-icon name="todo-fill" custom-prefix="custom-icon" color="#6BC6A7" size="40"></u-icon>
-						<span class="oldTextjp222" oldstyle="font-size: 20px;">充值明细</span>
-					</view>
-					<view class="more oldTextjp222" oldstyle="font-size: 16px;" @click="seeAll">
-						<span>查看全部</span>
-						<u-icon name="arrow-right-s-line" custom-prefix="custom-icon" color="#B3B3B3" size="32"></u-icon>
-					</view>
-				</view>
-				<view class="balanceMain-list" v-if="accountList.length > 0">
-					<view class="balanceMain-item" v-for="(item,index) in accountList " :key="item.id" @click="gotoUrl('pages/user/finance/rechargeDet?type='+item.type+'&id=' + item.id)">
-						<view class="title">
-							<font class="oldTextjp222" oldstyle="font-size: 18px;">{{item.remark}}</font>
-							<p  class="oldTextjp222" oldstyle="font-size: 14px;">{{item.createTime}}</p>
-						</view>
-						<h4 class="oldTextjp222" oldstyle="font-size: 24px;">{{item.amount?item.amount.toFixed(2):0}}元</h4>
-					</view>
-				</view>
-			</view>
-			<view class="carNone" v-if="accountList.length == 0">
-				<img src="static/img/暂无数据-缺省页.png" alt="">
-				<p class="oldTextjp222" oldstyle="font-size: 18px;">本月暂无充值记录</p>
-			</view>
-		</view>	
-	</view>
-</template>
-
-<script>
-	import * as userApi from '@/apis/user.js'
-	import * as API from '@/apis/index.js'
-	
-	export default {
-		data() {
-			return {
-				dateMonth: '',
-				userId: '',
-				show: false,
-				show2: false,
-				confirmText: '知道了',
-				content: `总金额=可用余额+冻结金额。使用预付费充电时，在充电过程中会冻结部分金额，充电完成后将剩余金额返还至余额账户，每笔预充金额的冻结时间不超过96小时。`,
-				content2:"充电金：只可用于平台内所有自营站充电使用，不能提现",
-				personAccount: {},
-				accountList: [],
-				elderStatus: false,
-			}
-		},
-		onReady() {
-		
-			
-			if(this.carhelp.get("getElderModeClass") == "长辈模式") {
-				this.elderStatus = true;
-			} else {
-				this.elderStatus = false;
-			}
-		},
-		onShow(){
-			
-			var date = new Date();
-			var year = date.getFullYear();
-			var monthN = date.getMonth() + 1;	
-			if(monthN >= 1 && monthN <= 9) {
-				monthN = "0" + monthN;
-			}
-			this.dateMonth = year + '-' + monthN + '-01';
-			//this.dateMonth = year + '-10-01';
-			this.getCarPersonAccount();
-			this.getAccountRecordData();
-				
-		},
-		methods: {
-			toRefundList() {
-				uni.navigateTo({
-					url: '/pages/user/finance/refundList'
-				})
-			},
-			getAccountRecordData() {
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})		
-				API.rechargeAmountRecordList({
-					queryDate: this.dateMonth
-				}).then((res) => {
-					uni.hideLoading();
-					
-					this.accountList = res.data.data;
-				}).catch(error => {
-					uni.showToast({
-						title: error,
-						icon: "none"
-					})
-				})
-			},
-			getCarPersonAccount() {
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})		
-				userApi.carPersonAccount().then((res) => {
-					uni.hideLoading();
-					
-					this.personAccount = res.data;
-				}).catch(error => {
-					uni.showToast({
-						title: error,
-						icon: "none"
-					})
-				})
-			},
-			rechargeNow() {
-				uni.navigateTo({
-					url: '/pages/user/finance/recharge'
-				})
-			},
-			seeAll() {
-				uni.navigateTo({
-					url: '/pages/user/finance/rechargeList'
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.oldTextClassF{
-		
-	}
-	.slot-content {
-		font-size: 28rpx;
-		color: $u-content-color;
-		padding-left: 30rpx;
-		padding-right: 30rpx;
-		padding-top: 20px;
-		padding-bottom: 20px;
-	}
-	.slot-wrap{
-		flex: 1;
-	}
-	.navBtn{
-		font-size: 36rpx;
-		float: right;
-		margin-right: 15px;
-		color:#3fbd70;
-	}
-	.carNone{
-		display: flex;
-		flex-direction: column;
-		justify-content: center;
-		align-items: center;
-		img{
-			width: 100%;
-			height: 100%;
-		}
-		p{
-			margin-top: -60px;
-		}
-	}
-	.balanceHead{
-		background-color: #fff;
-		margin: 16px;
-		background-color: #00B962;
-		border-radius: 12px;
-		.new-balanceCard-foot{
-			font-size: 18px;
-			margin-top: 24rpx;
-			padding:4px;
-			color: rgba(84, 69, 47, 1);
-
-			border-radius:0 0 12px 12px;
-			text-align: center;
-			background: linear-gradient(88.81deg, rgba(224,207,180,1) 1.89%,rgba(207,167,106,1) 99.99%);
-		}
-		.balanceCard{
-			
-			padding: 16px 16px 0 16px;
-			.balanceCard-head{
-				    display: flex;
-				    justify-content: flex-start;
-				font-size: 36rpx;
-				color:#fff;
-				.h2{
-					font-size:72rpx
-				}
-				.balanceCard-head-item{
-					width: 49%;
-				}
-			}
-			.balanceCard-main{
-				display: flex;
-				align-items: center;
-				justify-content: space-between;
-				margin-top: 8px;
-				h2{
-					font-size: 80rpx;
-					color:#fff;
-					font-weight: normal;
-				}
-				.balanceCard-btn{
-					padding: 8px 20px;
-					background-color: #fff;
-					color:#00B962;
-					border-radius: 18px;
-				}
-			}
-			.balanceCard-foot{
-				display: flex;
-				margin-top: 8rpx;
-				.balanceCard-item{
-					font-size: 32rpx;
-					flex: 1;
-					color:#fff;
-				}
-			}
-		}
-	}
-	
-	.balanceMain{
-		background-color: #fff;
-		margin-top: 12px;
-		.balanceMain-title{
-			display: flex;
-			align-items: center;
-			justify-content: space-between;
-			height: 48px;
-			border-bottom: 1px solid #f7f7f7;
-			padding: 0 16px;
-		
-			.title{
-					font-weight: bold;
-				display: flex;
-				align-items: center;
-				
-
-				span{
-					margin-left: 8px;
-					font-size: 36rpx;
-				}
-			}
-		}
-		.balanceMain-item{
-			display: flex;
-			align-items: center;
-			justify-content: space-between;
-			padding: 12px 16px;
-			font-size: 32rpx;
-			color: rgba(16, 16, 16, 1);
-
-			p{
-				font-size: 32rpx;
-				color:#888;
-				margin-top: 3px;
-			}
-		}
-		
-	}
-</style>
+<template>
+	<view>
+		<ujp-navbar title="我的余额">
+			<view class="slot-wrap">
+				<span class="navBtn oldTextjp222" oldstyle="font-size: 16px;" @click="toRefundList">退余额</span>
+			</view>
+		</ujp-navbar>
+		
+		<u-modal v-model="show" :confirm-text="confirmText" confirm-color="#00B962">
+			<view class="slot-content">
+				<rich-text :nodes="content"></rich-text>
+			</view>
+		</u-modal>
+		<u-modal v-model="show2" :confirm-text="confirmText" confirm-color="#00B962">
+			<view class="slot-content">
+				<rich-text :nodes="content2"></rich-text>
+			</view>
+		</u-modal>
+		<view class="balance">
+			<view class="balanceHead">
+				<view class="balanceCard">
+					<view class="balanceCard-head">
+						<view class="balanceCard-head-item">
+							<view>
+								总金额(元)<u-icon name="question-line" custom-prefix="custom-icon" color="#fff" size="36" @click="show=true"></u-icon>
+							</view>
+							<view class="h2" v-if="personAccount.availableAmount != null">{{personAccount.availableAmount.toFixed(2)}}</view>
+						</view>
+						<view  class="balanceCard-head-item"  v-if="personAccount.chargingFunds" >
+							<view>
+								充电金(元)<u-icon name="question-line" custom-prefix="custom-icon" color="#fff" size="36" @click="show2=true"></u-icon>
+							</view>
+							
+							<view class="h2" v-if="personAccount.chargingFunds != null">{{personAccount.chargingFunds.toFixed(2)}}</view>
+							
+						</view>
+					</view>
+				
+				<!-- 	<view class="balanceCard-main oldTextjp222" oldstyle="font-size: 16px;">
+						<h2 v-if="personAccount.availableAmount != null">{{personAccount.availableAmount.toFixed(2)}}元</h2>
+						<view class="balanceCard-btn" @click="rechargeNow">立即充值</view>
+					</view> -->
+					<view class="balanceCard-foot oldTextjp222" oldstyle="font-size: 16px;">
+						<view class="balanceCard-item" v-if="personAccount.availableAmount != null">可用余额{{personAccount.availableAmount.toFixed(2)}}</view>
+						<view class="balanceCard-item" v-if="personAccount.frozenTotal != null">冻结金额{{personAccount.frozenTotal.toFixed(2)}}</view>
+					</view>
+					
+				</view>
+				<view class="new-balanceCard-foot" @click="rechargeNow">
+					立即充值
+				</view>
+			</view>
+			<view class="balanceMain">
+				<view class="balanceMain-title">
+					<view class="title">
+						<u-icon name="todo-fill" custom-prefix="custom-icon" color="#6BC6A7" size="40"></u-icon>
+						<span class="oldTextjp222" oldstyle="font-size: 20px;">充值明细</span>
+					</view>
+					<view class="more oldTextjp222" oldstyle="font-size: 16px;" @click="seeAll">
+						<span>查看全部</span>
+						<u-icon name="arrow-right-s-line" custom-prefix="custom-icon" color="#B3B3B3" size="32"></u-icon>
+					</view>
+				</view>
+				<view class="balanceMain-list" v-if="accountList.length > 0">
+					<view class="balanceMain-item" v-for="(item,index) in accountList " :key="item.id" @click="gotoUrl('pages/user/finance/rechargeDet?type='+item.type+'&id=' + item.id)">
+						<view class="title">
+							<font class="oldTextjp222" oldstyle="font-size: 18px;">{{item.remark}}</font>
+							<p  class="oldTextjp222" oldstyle="font-size: 14px;">{{item.createTime}}</p>
+						</view>
+						<h4 class="oldTextjp222" oldstyle="font-size: 24px;">{{item.amount?item.amount.toFixed(2):0}}元</h4>
+					</view>
+				</view>
+			</view>
+			<view class="carNone" v-if="accountList.length == 0">
+				<img src="@/assets/static/img/暂无数据-缺省页.png" alt="">
+				<p class="oldTextjp222" oldstyle="font-size: 18px;">本月暂无充值记录</p>
+			</view>
+		</view>	
+	</view>
+</template>
+
+<script>
+	import * as userApi from '@/apis/user.js'
+	import * as API from '@/apis/index.js'
+	
+	export default {
+		data() {
+			return {
+				dateMonth: '',
+				userId: '',
+				show: false,
+				show2: false,
+				confirmText: '知道了',
+				content: `总金额=可用余额+冻结金额。使用预付费充电时，在充电过程中会冻结部分金额，充电完成后将剩余金额返还至余额账户，每笔预充金额的冻结时间不超过96小时。`,
+				content2:"充电金：只可用于平台内所有自营站充电使用，不能提现",
+				personAccount: {},
+				accountList: [],
+				elderStatus: false,
+			}
+		},
+		onReady() {
+		
+			
+			if(this.carhelp.get("getElderModeClass") == "长辈模式") {
+				this.elderStatus = true;
+			} else {
+				this.elderStatus = false;
+			}
+		},
+		onShow(){
+			
+			var date = new Date();
+			var year = date.getFullYear();
+			var monthN = date.getMonth() + 1;	
+			if(monthN >= 1 && monthN <= 9) {
+				monthN = "0" + monthN;
+			}
+			this.dateMonth = year + '-' + monthN + '-01';
+			//this.dateMonth = year + '-10-01';
+			this.getCarPersonAccount();
+			this.getAccountRecordData();
+				
+		},
+		methods: {
+			toRefundList() {
+				uni.navigateTo({
+					url: '/pages/user/finance/refundList'
+				})
+			},
+			getAccountRecordData() {
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})		
+				API.rechargeAmountRecordList({
+					queryDate: this.dateMonth
+				}).then((res) => {
+					uni.hideLoading();
+					
+					this.accountList = res.data.data;
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+			},
+			getCarPersonAccount() {
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})		
+				userApi.carPersonAccount().then((res) => {
+					uni.hideLoading();
+					
+					this.personAccount = res.data;
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+			},
+			rechargeNow() {
+				uni.navigateTo({
+					url: '/pages/user/finance/recharge'
+				})
+			},
+			seeAll() {
+				uni.navigateTo({
+					url: '/pages/user/finance/rechargeList'
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.oldTextClassF{
+		
+	}
+	.slot-content {
+		font-size: 28rpx;
+		color: $u-content-color;
+		padding-left: 30rpx;
+		padding-right: 30rpx;
+		padding-top: 20px;
+		padding-bottom: 20px;
+	}
+	.slot-wrap{
+		flex: 1;
+	}
+	.navBtn{
+		font-size: 36rpx;
+		float: right;
+		margin-right: 15px;
+		color:#3fbd70;
+	}
+	.carNone{
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		img{
+			width: 100%;
+			height: 100%;
+		}
+		p{
+			margin-top: -60px;
+		}
+	}
+	.balanceHead{
+		background-color: #fff;
+		margin: 16px;
+		background-color: #00B962;
+		border-radius: 12px;
+		.new-balanceCard-foot{
+			font-size: 18px;
+			margin-top: 24rpx;
+			padding:4px;
+			color: rgba(84, 69, 47, 1);
+
+			border-radius:0 0 12px 12px;
+			text-align: center;
+			background: linear-gradient(88.81deg, rgba(224,207,180,1) 1.89%,rgba(207,167,106,1) 99.99%);
+		}
+		.balanceCard{
+			
+			padding: 16px 16px 0 16px;
+			.balanceCard-head{
+				    display: flex;
+				    justify-content: flex-start;
+				font-size: 36rpx;
+				color:#fff;
+				.h2{
+					font-size:72rpx
+				}
+				.balanceCard-head-item{
+					width: 49%;
+				}
+			}
+			.balanceCard-main{
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				margin-top: 8px;
+				h2{
+					font-size: 80rpx;
+					color:#fff;
+					font-weight: normal;
+				}
+				.balanceCard-btn{
+					padding: 8px 20px;
+					background-color: #fff;
+					color:#00B962;
+					border-radius: 18px;
+				}
+			}
+			.balanceCard-foot{
+				display: flex;
+				margin-top: 8rpx;
+				.balanceCard-item{
+					font-size: 32rpx;
+					flex: 1;
+					color:#fff;
+				}
+			}
+		}
+	}
+	
+	.balanceMain{
+		background-color: #fff;
+		margin-top: 12px;
+		.balanceMain-title{
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			height: 48px;
+			border-bottom: 1px solid #f7f7f7;
+			padding: 0 16px;
+		
+			.title{
+					font-weight: bold;
+				display: flex;
+				align-items: center;
+				
+
+				span{
+					margin-left: 8px;
+					font-size: 36rpx;
+				}
+			}
+		}
+		.balanceMain-item{
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			padding: 12px 16px;
+			font-size: 32rpx;
+			color: rgba(16, 16, 16, 1);
+
+			p{
+				font-size: 32rpx;
+				color:#888;
+				margin-top: 3px;
+			}
+		}
+		
+	}
+</style>

pages/user/finance/rechargeList.vue

@@ -1,180 +1,180 @@
-<template>
-	<view>
-		<ujp-navbar title="充值记录"></ujp-navbar>
-		<view class="rechargeTime oldTextjp2" oldstyle="font-size: 18px;" @click="show = true">
-			<u-picker mode="time" v-model="show" :params="params" @confirm="confirmTime" @cancel="cancelTime"></u-picker>
-			<span>{{month}}月</span>
-			<u-icon name="arrow-down-s-fill" custom-prefix="custom-icon" color="#B3B3B3" size="32"></u-icon>
-		</view>
-		<view class="carNone" v-if="accountList.length == 0">
-			<img src="static/img/暂无数据-缺省页.png" alt="">
-			<p class="oldTextjp2" oldstyle="font-size: 18px;">暂无充值记录</p>
-		</view>
-		<view class="rechargeList" v-if="accountList.length > 0">
-			<view class="rechargeList-item" v-for="(item,index) in accountList" :key="item.id" @click="gotoUrl('pages/user/finance/rechargeDet?type='+item.type+'&id=' + item.id)">
-				<view class="rechargeList-row">
-					<span class="oldTextjp" oldstyle="font-size: 18px;">{{item.remark}}</span>
-					<h4 class="oldTextjp2" oldstyle="font-size: 20px;">{{item.amount?item.amount.toFixed(2):0}}元</h4>
-				</view>
-				<view class="rechargeList-row">
-					<p class="oldTextjp2" oldstyle="font-size: 14px;"></p>
-					<p class="oldTextjp2" oldstyle="font-size: 14px;">{{item.createTime}}</p>
-				</view>
-			</view>
-		</view>
-		<u-divider  v-if="accountList.length == recordsTotal && recordsTotal != 0" style="margin-top: 10px;background-color: #F2F4F4;">已经到底了</u-divider>
-	</view>
-</template>
-
-<script>
-	import * as API from '@/apis/index.js'
-	
-	export default {
-		data() {
-			return {
-				userId: '',
-				params: {
-					year: true,
-					month: true,
-					day: false,
-					hour: false,
-					minute: false,
-					second: false,
-					timestamp: true,
-				},
-				show: false,
-				month: '',
-				dateMonth: '',
-				accountList: [],
-				pageIndex: 1,
-				recordsTotal: 0,
-				elderStatus: false,
-			}
-		},
-		onReady() {			
-			if(this.carhelp.getPersonInfo()) {
-				this.userId = this.carhelp.getPersonInfo().id;
-				
-				if(this.carhelp.get("getElderModeClass") == "长辈模式") {
-					this.elderStatus = true;
-				} else {
-					this.elderStatus = false;
-				}
-			}
-			
-			var date = new Date();
-			this.month = date.getMonth() + 1;
-			
-			var year = date.getFullYear();
-			var monthN = this.month;
-			if(monthN >= 1 && monthN <= 9) {
-				monthN = "0" + monthN;
-			}
-			this.dateMonth = year + '-' + monthN + '-01';
-					
-			this.getAccountRecordData();
-		},
-		onReachBottom() {
-			if (this.accountList.length < this.recordsTotal) {			
-				this.myLoadmore();
-			}
-		},
-		methods: {
-			myLoadmore(bl) {
-				this.pageIndex += 1;
-				this.getAccountRecordData()
-			},
-			getAccountRecordData(bl) {
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				if (bl) {
-					this.accountList = [];
-					this.pageIndex = 1;
-				}
-				API.rechargeAmountRecordList({
-					pageIndex: this.pageIndex,
-					queryDate: this.dateMonth,
-				}).then((res) => {
-					uni.hideLoading();
-					
-					this.accountList = [
-						...this.accountList,
-						...res.data.data
-					];
-					this.recordsTotal = res.data.recordsTotal;
-				}).catch(error => {
-					uni.showToast({
-						title: error,
-						icon: "none"
-					})
-				})
-			},
-			confirmTime(params) {
-				this.dateMonth = params.year + '-' + params.month + '-01';
-				if(params.month.slice(0,1) == '0') {
-					this.month = params.month.slice(1);
-				} else {
-					this.month = params.month;
-				}
-				this.getAccountRecordData(true);
-				this.show = false;
-			},
-			cancelTime() {
-				this.show = false;
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.carNone{
-		display: flex;
-		flex-direction: column;
-		justify-content: center;
-		align-items: center;
-		img{
-			width: 100%;
-			height: 100%;
-		}
-		p{
-			margin-top: -60px;
-		}
-	}
-	.rechargeTime{
-		background-color: #fff;
-		height: 44px;
-		display: flex;
-		align-items: center;
-		padding: 12px 16px;
-		border-bottom: 1px solid #f7f7f7;
-		span{
-			margin-right: 4px;
-		}
-	}
-	.rechargeList{
-		background-color: #fff;
-		padding-left: 16px;
-		.rechargeList-item{
-			padding: 12px 16px 12px 0;
-			border-bottom: 1px solid #f7f7f7;
-			&:last-child{
-				border-bottom: none;
-			}
-		}
-		.rechargeList-row{
-			display: flex;
-			align-items: center;
-			justify-content: space-between;
-			h4{
-				font-size: 16px;
-			}
-			p{
-				font-size: 12px;
-				margin-top: 4px;
-				color:#888;
-			}
-		}
-	}
-</style>
+<template>
+	<view>
+		<ujp-navbar title="充值记录"></ujp-navbar>
+		<view class="rechargeTime oldTextjp2" oldstyle="font-size: 18px;" @click="show = true">
+			<u-picker mode="time" v-model="show" :params="params" @confirm="confirmTime" @cancel="cancelTime"></u-picker>
+			<span>{{month}}月</span>
+			<u-icon name="arrow-down-s-fill" custom-prefix="custom-icon" color="#B3B3B3" size="32"></u-icon>
+		</view>
+		<view class="carNone" v-if="accountList.length == 0">
+			<img src="@/assets/static/img/暂无数据-缺省页.png" alt="">
+			<p class="oldTextjp2" oldstyle="font-size: 18px;">暂无充值记录</p>
+		</view>
+		<view class="rechargeList" v-if="accountList.length > 0">
+			<view class="rechargeList-item" v-for="(item,index) in accountList" :key="item.id" @click="gotoUrl('pages/user/finance/rechargeDet?type='+item.type+'&id=' + item.id)">
+				<view class="rechargeList-row">
+					<span class="oldTextjp" oldstyle="font-size: 18px;">{{item.remark}}</span>
+					<h4 class="oldTextjp2" oldstyle="font-size: 20px;">{{item.amount?item.amount.toFixed(2):0}}元</h4>
+				</view>
+				<view class="rechargeList-row">
+					<p class="oldTextjp2" oldstyle="font-size: 14px;"></p>
+					<p class="oldTextjp2" oldstyle="font-size: 14px;">{{item.createTime}}</p>
+				</view>
+			</view>
+		</view>
+		<u-divider  v-if="accountList.length == recordsTotal && recordsTotal != 0" style="margin-top: 10px;background-color: #F2F4F4;">已经到底了</u-divider>
+	</view>
+</template>
+
+<script>
+	import * as API from '@/apis/index.js'
+	
+	export default {
+		data() {
+			return {
+				userId: '',
+				params: {
+					year: true,
+					month: true,
+					day: false,
+					hour: false,
+					minute: false,
+					second: false,
+					timestamp: true,
+				},
+				show: false,
+				month: '',
+				dateMonth: '',
+				accountList: [],
+				pageIndex: 1,
+				recordsTotal: 0,
+				elderStatus: false,
+			}
+		},
+		onReady() {			
+			if(this.carhelp.getPersonInfo()) {
+				this.userId = this.carhelp.getPersonInfo().id;
+				
+				if(this.carhelp.get("getElderModeClass") == "长辈模式") {
+					this.elderStatus = true;
+				} else {
+					this.elderStatus = false;
+				}
+			}
+			
+			var date = new Date();
+			this.month = date.getMonth() + 1;
+			
+			var year = date.getFullYear();
+			var monthN = this.month;
+			if(monthN >= 1 && monthN <= 9) {
+				monthN = "0" + monthN;
+			}
+			this.dateMonth = year + '-' + monthN + '-01';
+					
+			this.getAccountRecordData();
+		},
+		onReachBottom() {
+			if (this.accountList.length < this.recordsTotal) {			
+				this.myLoadmore();
+			}
+		},
+		methods: {
+			myLoadmore(bl) {
+				this.pageIndex += 1;
+				this.getAccountRecordData()
+			},
+			getAccountRecordData(bl) {
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				if (bl) {
+					this.accountList = [];
+					this.pageIndex = 1;
+				}
+				API.rechargeAmountRecordList({
+					pageIndex: this.pageIndex,
+					queryDate: this.dateMonth,
+				}).then((res) => {
+					uni.hideLoading();
+					
+					this.accountList = [
+						...this.accountList,
+						...res.data.data
+					];
+					this.recordsTotal = res.data.recordsTotal;
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+			},
+			confirmTime(params) {
+				this.dateMonth = params.year + '-' + params.month + '-01';
+				if(params.month.slice(0,1) == '0') {
+					this.month = params.month.slice(1);
+				} else {
+					this.month = params.month;
+				}
+				this.getAccountRecordData(true);
+				this.show = false;
+			},
+			cancelTime() {
+				this.show = false;
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.carNone{
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		img{
+			width: 100%;
+			height: 100%;
+		}
+		p{
+			margin-top: -60px;
+		}
+	}
+	.rechargeTime{
+		background-color: #fff;
+		height: 44px;
+		display: flex;
+		align-items: center;
+		padding: 12px 16px;
+		border-bottom: 1px solid #f7f7f7;
+		span{
+			margin-right: 4px;
+		}
+	}
+	.rechargeList{
+		background-color: #fff;
+		padding-left: 16px;
+		.rechargeList-item{
+			padding: 12px 16px 12px 0;
+			border-bottom: 1px solid #f7f7f7;
+			&:last-child{
+				border-bottom: none;
+			}
+		}
+		.rechargeList-row{
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			h4{
+				font-size: 16px;
+			}
+			p{
+				font-size: 12px;
+				margin-top: 4px;
+				color:#888;
+			}
+		}
+	}
+</style>

pages/user/finance/refundList.vue

@@ -1,330 +1,330 @@
-<template>
-	<view>
-		<ujp-navbar title="退费记录"></ujp-navbar>
-		<view class="balance">
-			<view class="balanceHead">
-				<view>
-					<view class="payPrice">
-						<font>{{account.availableAmountSubIncome!=null ? account.availableAmountSubIncome.toFixed(2) : '0.00'}}</font><span>元</span>
-					</view>
-					<view class="tips">
-						<p>充值退款(元)</p><u-icon name="question-line" custom-prefix="custom-icon" color="#00B962" size="32" @click="showtip = true"></u-icon>
-					</view>
-				</view>
-				<view v-if="account.availableAmountIncome">
-					<view class="payPrice">
-						<font>{{account.availableAmountIncome!=null ? account.availableAmountIncome.toFixed(2) : '0.00'}}</font><span>元</span>
-					</view>
-					<view class="tips">
-						<p>现金分红(元)</p><u-icon name="question-line" custom-prefix="custom-icon" color="#00B962" size="32" @click="showtip2 = true"></u-icon>
-					</view>
-				</view>
-			</view>
-			<view class="balanceMain">
-				<view class="balanceMain-title">
-					<view class="title">
-						<u-icon name="todo-fill" custom-prefix="custom-icon" color="#6BC6A7" size="40"></u-icon>
-						<span>退费记录</span>
-					</view>
-				</view>
-				<view class="refundList">
-					<view class="refundList-item" v-for="(item,index) in items" :key="index" @click="refundItem(item)"> 
-						<view class="refundList-row">
-							<font>原路退回</font>
-							<span :class=" 'state'+item.status ">{{item.statusText}}</span>
-						</view>
-						<view class="refundList-row" >
-							<p>{{item.applicationTime}}</p>
-							<p>{{item.refundAmount!=null ? item.refundAmount.toFixed(2) : '0.00'}}元</p>
-						</view>
-					</view>
-					
-					
-					<!-- <view class="refundList-none">
-						<u-image width="200px" height="200px" src="/static/img/none.svg"></u-image>
-					</view> -->
-				</view>
-			</view>
-		</view>	
-		<view>
-			<u-modal v-model="show" :title="title" :content="content"  :show-confirm-button="true" :show-cancel-button='true' @confirm="confirm"></u-modal> 
-		</view>
-		<view>
-			<u-modal v-model="showtip" :title="title" :show-confirm-button="true" confirm-text="知道了" confirm-color="#00B962">
-				<view class="slot-content">
-					<rich-text :nodes="content1"></rich-text>
-				</view>
-			</u-modal> 
-			<u-modal v-model="showtip2" :title="title" :show-confirm-button="true" confirm-text="知道了" confirm-color="#00B962">
-				<view class="slot-content">
-					<rich-text :nodes="content2"></rich-text>
-				</view>
-			</u-modal> 
-		</view>
-				
-		<view style="bottom:0;position:absolute;width: 100%;padding: 40rpx;" v-show="account.availableAmount>0">
-			
-			<u-button shape="circle"  v-if="account.availableAmountIncome"
-			  style="background-color:#00b962;color:white" @click="gotoRefundInfo()">申请退款</u-button>
-			  
-			<u-button shape="circle" v-else   style="background-color:#00b962;color:white" @click="show=true">申请退款</u-button>
-			  
-		</view>
-	</view>
-</template>
-
-<script>
-	let _self;
-	import * as api from "@/apis/refund.js"
-	export default {
-		data() {
-			return {
-				elderMode:false,
-				content2:`首次申请现金分红退费需填写收款人账户信息，申请成功后工作人员将在5~10个工作日内完成转账打款。`,
-				
-				content1:`本平台仅支持充值金额全额退费,申请成功后退费金额将于5个工作日内退还至您的充值账户.在本平台,三个月内的支付宝充值,微信支付可申请退费.<br />退费成功后,您可以在退费记录查看退费信息和审核进度.`,
-				title:'提示',
-				content:'是否确定提交退费申请？申请成功后退费金额将于5个工作日内退还至您的充值账户',
-				show:false,
-				showtip:false,
-				showtip2:false,
-				userId:'',
-				account:{},
-				items:[],
-			}
-		},
-		onLoad(){
-			_self = this;
-		},
-		onShow(){
-			api.personAccount().then(function(res){
-				if(res.result)
-				{
-					_self.account = res.data;
-					
-				}
-				//('个人余额信息'+JSON.stringify(res));
-			},function(err){
-				uni.showToast({
-					title: err,
-					icon: "none"
-				})
-				////('err'+JSON.stringify(err));
-			});
-		},
-		onReady(){
-		
-			this.elderMode = this.carhelp.get('getElderModeClass') == '长辈模式';
-			if(this.elderMode)
-				this.theme('elder')
-			else
-				this.theme('standard')
-
-			if (this.carhelp.getPersonInfo()) {
-				this.userId = this.carhelp.getPersonInfo().id;
-				//('userId'+this.userId)
-			}
- 
-		
-			let data = {pageIndex:1,pageSize:10};
-			api.personAccountRefundList(data).then(function(res){
-				if(res.result){
-					//('res'+JSON.stringify(res));
-					_self.items = res.data.data;
-					for(let i = 0;i< _self.items.length;i++){
-						if(_self.items[i].refundChannel == 'wechat')
-							_self.items[i].refundChannelText = "微信"
-						else if (_self.items[i].refundChannel == 'alipay')
-							_self.items[i].refundChannelText = "支付宝"
-							
-						if(_self.items[i].status == '0')
-							_self.items[i].statusText = "退款中"
-						else if (_self.items[i].status == '1')
-							_self.items[i].statusText = "退款成功"
-						else if (_self.items[i].status == '2')
-							_self.items[i].statusText = "退款拒绝"
-						else if (_self.items[i].status == '3')
-							_self.items[i].statusText = "退款失败"
-										 
-					}
-//					//('res'+JSON.stringify(_self.items));
-				}
-			},function(err){
-				uni.showToast({
-					title: err,
-					icon: "none"
-				})
-				////('err'+JSON.stringify(err));
-			});
-		},
-		methods: {
-			gotoRefundInfo(){
-				uni.redirectTo({
-					url:'/pages/user/finance/refundInfo'
-				})
-			},
-			theme(type) {
-			  if(type == 'elder')	
-			  {
-				document.getElementsByTagName('body')[0].setAttribute('data-theme',type);
-				  
-			  }
-			  else
-			  {
-				document.getElementsByTagName('body')[0].setAttribute('data-theme',type);
-				  
-			  } 
-			},
-			refundItem(item){
-				uni.navigateTo({
-					url:'refundDet?id='+item.id
-				})
-				
-			},
-			confirm(){
-				uni.showLoading({
-					
-				})
-				let data = {
-					amount:_self.account.availableAmount
-					,refundChannel:'wechat',
-					applicationChannel:"E"
-				}
-				api.personAccountRefundApplication(data).then(function(res){
-					uni.hideLoading()
-					if(res.result){
-						
-						//('personAccountRefundApplication'+JSON.stringify(res));
-						uni.redirectTo({
-							url:'refundApp'
-						})
-						
-					}
-					
-				},function(err){
-					// uni.showToast({
-					// 	title:err
-					// })
-						uni.hideLoading();
-					uni.showModal({
-							content:err,
-						title:'提示',
-						showCancel:false,
-						confirmText:'知道了'
-					})
-				}
-				);
-				////('confirm')
-			},
-			showTips(){
-				
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped> 
-	@import "@/_theme.scss";
-	.slot-content {
-		@include themeify{
-			font-size:themed('font-size2'); 
-		}
-/*		font-size: 28rpx;*/
-		color: $u-content-color;
-		padding-left: 30rpx;
-		padding-right: 30rpx;
-		padding-top: 40rpx;
-		padding-bottom: 40rpx;
-	}
-	.refundList-none{
-		display: flex;
-		align-items: center;
-		justify-content: center;
-	}
-	.balanceHead{
-		background-color: #fff;
-		padding: 48rpx 0;
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-		    justify-content: space-around;
-	
-		.payPrice{
-			display: flex;
-			align-items: flex-end;
-			justify-content: center;
-			font{
-/*				font-size: 36px;
-				line-height: 36px;*/
-				@include themeify{
-					font-size:themed('font-size13'); 
-					line-height:themed('font-size13'); 
-				}
-			}
-		}
-		.tips{
-			display: flex;
-			align-items: center;
-			margin-top: 8rpx;
-			p{
-				color:#999;
-				margin-right: 8rpx;
-			}
-		}
-	}
-	.balanceMain{
-		background-color: #fff;
-		margin-top: 24rpx;
-		.balanceMain-title{
-			display: flex;
-			align-items: center;
-			justify-content: space-between;
-			height: 96rpx;
-			border-bottom: 2rpx solid #f7f7f7;
-			padding: 0 32rpx;
-			.title{
-				display: flex;
-				align-items: center;
-				span{
-					margin-left: 16rpx;
-/*					font-size: 16px;*/
-					@include themeify{
-						font-size:themed('font-size3'); 
-						font-weight: themed('fontWeight');
-						letter-spacing: themed('letterSpacing');
- 					}
-				}
-			}
-		}
-		.refundList-item{
-			padding: 12px 16px;
-			.refundList-row{
-				display: flex;
-				align-items: center;
-				justify-content: space-between;
-				p{
-					@include themeify{
-						font-size:themed('font-size1'); 
-					}
-/*					font-size: 12px;*/
-					color:#888;
-					margin-top: 6rpx;
-				}
-				.state0{
-					color:#FF9600;
-				}
-				.state1{
-					color:#00B962;
-				}
-				
-				.state2{
-					color:red;
-				}
-				.state3{
-					color:red;
-				}
-			}
-		}
-		
-	}
-</style>
+<template>
+	<view>
+		<ujp-navbar title="退费记录"></ujp-navbar>
+		<view class="balance">
+			<view class="balanceHead">
+				<view>
+					<view class="payPrice">
+						<font>{{account.availableAmountSubIncome!=null ? account.availableAmountSubIncome.toFixed(2) : '0.00'}}</font><span>元</span>
+					</view>
+					<view class="tips">
+						<p>充值退款(元)</p><u-icon name="question-line" custom-prefix="custom-icon" color="#00B962" size="32" @click="showtip = true"></u-icon>
+					</view>
+				</view>
+				<view v-if="account.availableAmountIncome">
+					<view class="payPrice">
+						<font>{{account.availableAmountIncome!=null ? account.availableAmountIncome.toFixed(2) : '0.00'}}</font><span>元</span>
+					</view>
+					<view class="tips">
+						<p>现金分红(元)</p><u-icon name="question-line" custom-prefix="custom-icon" color="#00B962" size="32" @click="showtip2 = true"></u-icon>
+					</view>
+				</view>
+			</view>
+			<view class="balanceMain">
+				<view class="balanceMain-title">
+					<view class="title">
+						<u-icon name="todo-fill" custom-prefix="custom-icon" color="#6BC6A7" size="40"></u-icon>
+						<span>退费记录</span>
+					</view>
+				</view>
+				<view class="refundList">
+					<view class="refundList-item" v-for="(item,index) in items" :key="index" @click="refundItem(item)"> 
+						<view class="refundList-row">
+							<font>原路退回</font>
+							<span :class=" 'state'+item.status ">{{item.statusText}}</span>
+						</view>
+						<view class="refundList-row" >
+							<p>{{item.applicationTime}}</p>
+							<p>{{item.refundAmount!=null ? item.refundAmount.toFixed(2) : '0.00'}}元</p>
+						</view>
+					</view>
+					
+					
+					<!-- <view class="refundList-none">
+						<u-image width="200px" height="200px" src="@/assets/static/img/none.svg"></u-image>
+					</view> -->
+				</view>
+			</view>
+		</view>	
+		<view>
+			<u-modal v-model="show" :title="title" :content="content"  :show-confirm-button="true" :show-cancel-button='true' @confirm="confirm"></u-modal> 
+		</view>
+		<view>
+			<u-modal v-model="showtip" :title="title" :show-confirm-button="true" confirm-text="知道了" confirm-color="#00B962">
+				<view class="slot-content">
+					<rich-text :nodes="content1"></rich-text>
+				</view>
+			</u-modal> 
+			<u-modal v-model="showtip2" :title="title" :show-confirm-button="true" confirm-text="知道了" confirm-color="#00B962">
+				<view class="slot-content">
+					<rich-text :nodes="content2"></rich-text>
+				</view>
+			</u-modal> 
+		</view>
+				
+		<view style="bottom:0;position:absolute;width: 100%;padding: 40rpx;" v-show="account.availableAmount>0">
+			
+			<u-button shape="circle"  v-if="account.availableAmountIncome"
+			  style="background-color:#00b962;color:white" @click="gotoRefundInfo()">申请退款</u-button>
+			  
+			<u-button shape="circle" v-else   style="background-color:#00b962;color:white" @click="show=true">申请退款</u-button>
+			  
+		</view>
+	</view>
+</template>
+
+<script>
+	let _self;
+	import * as api from "@/apis/refund.js"
+	export default {
+		data() {
+			return {
+				elderMode:false,
+				content2:`首次申请现金分红退费需填写收款人账户信息，申请成功后工作人员将在5~10个工作日内完成转账打款。`,
+				
+				content1:`本平台仅支持充值金额全额退费,申请成功后退费金额将于5个工作日内退还至您的充值账户.在本平台,三个月内的支付宝充值,微信支付可申请退费.<br />退费成功后,您可以在退费记录查看退费信息和审核进度.`,
+				title:'提示',
+				content:'是否确定提交退费申请？申请成功后退费金额将于5个工作日内退还至您的充值账户',
+				show:false,
+				showtip:false,
+				showtip2:false,
+				userId:'',
+				account:{},
+				items:[],
+			}
+		},
+		onLoad(){
+			_self = this;
+		},
+		onShow(){
+			api.personAccount().then(function(res){
+				if(res.result)
+				{
+					_self.account = res.data;
+					
+				}
+				//('个人余额信息'+JSON.stringify(res));
+			},function(err){
+				uni.showToast({
+					title: err,
+					icon: "none"
+				})
+				////('err'+JSON.stringify(err));
+			});
+		},
+		onReady(){
+		
+			this.elderMode = this.carhelp.get('getElderModeClass') == '长辈模式';
+			if(this.elderMode)
+				this.theme('elder')
+			else
+				this.theme('standard')
+
+			if (this.carhelp.getPersonInfo()) {
+				this.userId = this.carhelp.getPersonInfo().id;
+				//('userId'+this.userId)
+			}
+ 
+		
+			let data = {pageIndex:1,pageSize:10};
+			api.personAccountRefundList(data).then(function(res){
+				if(res.result){
+					//('res'+JSON.stringify(res));
+					_self.items = res.data.data;
+					for(let i = 0;i< _self.items.length;i++){
+						if(_self.items[i].refundChannel == 'wechat')
+							_self.items[i].refundChannelText = "微信"
+						else if (_self.items[i].refundChannel == 'alipay')
+							_self.items[i].refundChannelText = "支付宝"
+							
+						if(_self.items[i].status == '0')
+							_self.items[i].statusText = "退款中"
+						else if (_self.items[i].status == '1')
+							_self.items[i].statusText = "退款成功"
+						else if (_self.items[i].status == '2')
+							_self.items[i].statusText = "退款拒绝"
+						else if (_self.items[i].status == '3')
+							_self.items[i].statusText = "退款失败"
+										 
+					}
+//					//('res'+JSON.stringify(_self.items));
+				}
+			},function(err){
+				uni.showToast({
+					title: err,
+					icon: "none"
+				})
+				////('err'+JSON.stringify(err));
+			});
+		},
+		methods: {
+			gotoRefundInfo(){
+				uni.redirectTo({
+					url:'/pages/user/finance/refundInfo'
+				})
+			},
+			theme(type) {
+			  if(type == 'elder')	
+			  {
+				document.getElementsByTagName('body')[0].setAttribute('data-theme',type);
+				  
+			  }
+			  else
+			  {
+				document.getElementsByTagName('body')[0].setAttribute('data-theme',type);
+				  
+			  } 
+			},
+			refundItem(item){
+				uni.navigateTo({
+					url:'refundDet?id='+item.id
+				})
+				
+			},
+			confirm(){
+				uni.showLoading({
+					
+				})
+				let data = {
+					amount:_self.account.availableAmount
+					,refundChannel:'wechat',
+					applicationChannel:"E"
+				}
+				api.personAccountRefundApplication(data).then(function(res){
+					uni.hideLoading()
+					if(res.result){
+						
+						//('personAccountRefundApplication'+JSON.stringify(res));
+						uni.redirectTo({
+							url:'refundApp'
+						})
+						
+					}
+					
+				},function(err){
+					// uni.showToast({
+					// 	title:err
+					// })
+						uni.hideLoading();
+					uni.showModal({
+							content:err,
+						title:'提示',
+						showCancel:false,
+						confirmText:'知道了'
+					})
+				}
+				);
+				////('confirm')
+			},
+			showTips(){
+				
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped> 
+	@import "@/_theme.scss";
+	.slot-content {
+		@include themeify{
+			font-size:themed('font-size2'); 
+		}
+/*		font-size: 28rpx;*/
+		color: $u-content-color;
+		padding-left: 30rpx;
+		padding-right: 30rpx;
+		padding-top: 40rpx;
+		padding-bottom: 40rpx;
+	}
+	.refundList-none{
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+	.balanceHead{
+		background-color: #fff;
+		padding: 48rpx 0;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		    justify-content: space-around;
+	
+		.payPrice{
+			display: flex;
+			align-items: flex-end;
+			justify-content: center;
+			font{
+/*				font-size: 36px;
+				line-height: 36px;*/
+				@include themeify{
+					font-size:themed('font-size13'); 
+					line-height:themed('font-size13'); 
+				}
+			}
+		}
+		.tips{
+			display: flex;
+			align-items: center;
+			margin-top: 8rpx;
+			p{
+				color:#999;
+				margin-right: 8rpx;
+			}
+		}
+	}
+	.balanceMain{
+		background-color: #fff;
+		margin-top: 24rpx;
+		.balanceMain-title{
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			height: 96rpx;
+			border-bottom: 2rpx solid #f7f7f7;
+			padding: 0 32rpx;
+			.title{
+				display: flex;
+				align-items: center;
+				span{
+					margin-left: 16rpx;
+/*					font-size: 16px;*/
+					@include themeify{
+						font-size:themed('font-size3'); 
+						font-weight: themed('fontWeight');
+						letter-spacing: themed('letterSpacing');
+ 					}
+				}
+			}
+		}
+		.refundList-item{
+			padding: 12px 16px;
+			.refundList-row{
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				p{
+					@include themeify{
+						font-size:themed('font-size1'); 
+					}
+/*					font-size: 12px;*/
+					color:#888;
+					margin-top: 6rpx;
+				}
+				.state0{
+					color:#FF9600;
+				}
+				.state1{
+					color:#00B962;
+				}
+				
+				.state2{
+					color:red;
+				}
+				.state3{
+					color:red;
+				}
+			}
+		}
+		
+	}
+</style>

pages/user/limeClipper/limeClipper.vue

@@ -30,11 +30,11 @@
 				</view>
 				<view v-if="isShowPhotoBtn" @tap="uploadImage">
 					<slot name="photo" v-if="$slots.photo" />
-					<image v-else src="@/static/limeClipper/photo.svg" />
+					<image v-else src="@/assets/static/limeClipper/photo.svg" />
 				</view>
 				<view v-if="isShowRotateBtn" @tap="rotate">
 					<slot name="rotate" v-if="$slots.rotate" />
-					<image v-else src="@/static/limeClipper/rotate.svg" data-type="inverse" />
+					<image v-else src="@/assets/static/limeClipper/rotate.svg" data-type="inverse" />
 				</view>
 				<view v-if="isShowConfirmBtn" @tap="confirm">
 					<slot name="confirm" v-if="$slots.confirm" />

pages/user/logout.vue

@@ -1,154 +1,154 @@
-<template>
-	<view class="all">
-		<ujp-navbar title="注销账号"></ujp-navbar>
-		<view class="logout-head">
-			<img src="../../static/img/logout.png" alt="">
-			<p>注销帐号</p>
-		</view>
-		<view class="logout-text">
-			<p>我们很遗憾您做出注销帐号的决定，在提交申请前请您仔细阅读以下内容:</p>
-			<p>	1.您应确保您有权决定该账户的注销事宜,不侵犯任何第三方的合法权益,如因此引发任何投诉争议,由您自行承担。</p>
-			<p>	2.帐号注销后您无法再使用本社区的各项服务,您的个人信息及求助记录也将被清空。</p>
-			<p>	3.如您已被国家机关调查或正处于诉讼、仲裁程序中,请注意，注销您的帐号并不代表此帐号注销前的帐号行为和相关责任得到豁免或减轻。</p>
-		</view>
-		<view class="logout-btn">
-			<u-button class="logout-btn1" shape="circle" type="" @click="logout">
-				<span>继续注销</span>
-			</u-button>
-			<u-button class="logout-btn2" shape="circle" type="success" @click="toSetting">
-				<span>我再想想</span>
-			</u-button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import * as userApi from '@/apis/user.js'
-	
-	export default {
-		data() {
-			return {
-				elderMode:false,
-				jpcode: 'toLogin',
-			}
-		}, 
-		onReady(){
-			this.elderMode = this.carhelp.get('getElderModeClass')  == '长辈模式';
-			if(this.elderMode)
-				this.theme('elder')
-			else
-				this.theme('standard')
-		},
-		methods: {
-			theme(type) {
-				
-			  if(type == 'elder')	
-			  {
-				document.getElementsByTagName('body')[0].setAttribute('data-theme',type);
-				 
-			  }
-			  else
-			  {
-				document.getElementsByTagName('body')[0].setAttribute('data-theme',type);
-				  
-			  } 
-			},
-			toSetting() {
-				uni.navigateBack({
-					
-				})
-			},
-			logout() {
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})		
-				userApi.deleteUser().then((res) => {
-					uni.hideLoading();
-					
-					this.carhelp.logoff();
-					uni.reLaunch({
-						url: '/pages/index/index'
-					})
-				}).catch(error => {
-					uni.navigateTo({
-						url: '/pages/user/finance/refundList'
-					})
-				})
-			}
-		}
-	}
-</script>
-<style>
-	page{
-		background-color: #fff;
-	}
-</style>
-
-<style lang="scss" scoped>
-	@import "@/_theme.scss";
-	.all{
-		@include themeify{
-			font-size: themed('font-size2');
-		}
-	}
-	.collapse{
-		background-color: #fff;
-		padding:0 10px;
-	}
-	.logout-head{
-		background-color: #FF5E5E ;
-		padding: 20px 0;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		img{
-			height: 52px;
-			width: 52px;
-		}
-		p{
-			color:#fff;
-			margin-top: 4px;
-		}
-		@include themeify{
-			font-size: themed('font-size2');
-		}
-	}
-	.logout-text{
-		padding: 24px;
-		p{
-/*			line-height: 28px;*/
-			@include themeify{
-				line-height: themed('font-size9'); 
-			}
-		}
-	}
-	.logout-btn{
-		display: flex;
-		justify-content: space-between;
-		padding: 0 24px;
-		
-	}
-	.logout-btn1{
-		color:#BBBBBB!important;
-		background-color:#fff!important;
-		flex: 0.4;
-		span{
-			color:#333;
-		}
-		@include themeify{
-			font-size: themed('font-size3'); 
-			line-height: themed('font-size3'); 
-		}
-	}
-	.logout-btn2{
-		background-color:#00B962!important;
-		flex: 0.4;
-		border-color: #00B962!important;
-		color:#fff!important;
-		@include themeify{
-			font-size: themed('font-size3'); 
-			line-height: themed('font-size3'); 
-		}
-	}
-</style>
+<template>
+	<view class="all">
+		<ujp-navbar title="注销账号"></ujp-navbar>
+		<view class="logout-head">
+			<img src="@/assets/static/img/logout.png" alt="">
+			<p>注销帐号</p>
+		</view>
+		<view class="logout-text">
+			<p>我们很遗憾您做出注销帐号的决定，在提交申请前请您仔细阅读以下内容:</p>
+			<p>	1.您应确保您有权决定该账户的注销事宜,不侵犯任何第三方的合法权益,如因此引发任何投诉争议,由您自行承担。</p>
+			<p>	2.帐号注销后您无法再使用本社区的各项服务,您的个人信息及求助记录也将被清空。</p>
+			<p>	3.如您已被国家机关调查或正处于诉讼、仲裁程序中,请注意，注销您的帐号并不代表此帐号注销前的帐号行为和相关责任得到豁免或减轻。</p>
+		</view>
+		<view class="logout-btn">
+			<u-button class="logout-btn1" shape="circle" type="" @click="logout">
+				<span>继续注销</span>
+			</u-button>
+			<u-button class="logout-btn2" shape="circle" type="success" @click="toSetting">
+				<span>我再想想</span>
+			</u-button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import * as userApi from '@/apis/user.js'
+	
+	export default {
+		data() {
+			return {
+				elderMode:false,
+				jpcode: 'toLogin',
+			}
+		}, 
+		onReady(){
+			this.elderMode = this.carhelp.get('getElderModeClass')  == '长辈模式';
+			if(this.elderMode)
+				this.theme('elder')
+			else
+				this.theme('standard')
+		},
+		methods: {
+			theme(type) {
+				
+			  if(type == 'elder')	
+			  {
+				document.getElementsByTagName('body')[0].setAttribute('data-theme',type);
+				 
+			  }
+			  else
+			  {
+				document.getElementsByTagName('body')[0].setAttribute('data-theme',type);
+				  
+			  } 
+			},
+			toSetting() {
+				uni.navigateBack({
+					
+				})
+			},
+			logout() {
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})		
+				userApi.deleteUser().then((res) => {
+					uni.hideLoading();
+					
+					this.carhelp.logoff();
+					uni.reLaunch({
+						url: '/pages/index/index'
+					})
+				}).catch(error => {
+					uni.navigateTo({
+						url: '/pages/user/finance/refundList'
+					})
+				})
+			}
+		}
+	}
+</script>
+<style>
+	page{
+		background-color: #fff;
+	}
+</style>
+
+<style lang="scss" scoped>
+	@import "@/_theme.scss";
+	.all{
+		@include themeify{
+			font-size: themed('font-size2');
+		}
+	}
+	.collapse{
+		background-color: #fff;
+		padding:0 10px;
+	}
+	.logout-head{
+		background-color: #FF5E5E ;
+		padding: 20px 0;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		img{
+			height: 52px;
+			width: 52px;
+		}
+		p{
+			color:#fff;
+			margin-top: 4px;
+		}
+		@include themeify{
+			font-size: themed('font-size2');
+		}
+	}
+	.logout-text{
+		padding: 24px;
+		p{
+/*			line-height: 28px;*/
+			@include themeify{
+				line-height: themed('font-size9'); 
+			}
+		}
+	}
+	.logout-btn{
+		display: flex;
+		justify-content: space-between;
+		padding: 0 24px;
+		
+	}
+	.logout-btn1{
+		color:#BBBBBB!important;
+		background-color:#fff!important;
+		flex: 0.4;
+		span{
+			color:#333;
+		}
+		@include themeify{
+			font-size: themed('font-size3'); 
+			line-height: themed('font-size3'); 
+		}
+	}
+	.logout-btn2{
+		background-color:#00B962!important;
+		flex: 0.4;
+		border-color: #00B962!important;
+		color:#fff!important;
+		@include themeify{
+			font-size: themed('font-size3'); 
+			line-height: themed('font-size3'); 
+		}
+	}
+</style>

pages/user/myReservation/myReservation.vue

@@ -1,407 +1,407 @@
-<template>
-	<view>
-		<ujp-navbar title="我的预约">
-			<view class="screen oldTextjp2" oldstyle="font-size: 16px;" @click="screenClick">筛选</view>
-		</ujp-navbar>
-		<view>
-			<view v-if="screenShow" class="preference" :style="screenShow ? 'z-index:1024;top:'+navBarHeight+'px;' : 'z-index:0'"
-				style="width: 100%;">
-				<view class="content-s">
-					<view class="preference_group">
-						<view class="preference_group_item" :class="statusClass == index ? 'active' : ''" v-for="(item,index) in statusList" :key="item.id" @click="statusClick(index,item)">{{item.name}}</view>
-					</view>
-				</view>
-			</view>
-			<u-mask :show="screenShow" @click="screenShow = false" z-index="100"></u-mask>
-		</view>
-		<view class="carNone" v-if="appointmentList.length == 0">
-			<img src="static/img/暂无数据-缺省页.png" alt="">
-			<p>暂无预约</p>
-		</view>
-		<view class="reservation-items" v-for="(item,index) in appointmentList" :key="item.id" @click="gotoUrl('pages/user/myReservation/reservationListDetails?id='+item.id)">
-			<view class="station-name ellipsis">
-				{{item.stationName}}/{{item.deviceName}}
-				<view class="toBe-confirmed btn" v-if="item.status == '0'">{{item.statusText}}</view>
-				<view class="confirmed btn" v-if="item.status == '1'">已确认</view>
-				<view class="canceled btn" v-if="item.status == '3'">{{item.statusText}}</view>
-				<view class="have-expired btn" v-if="item.status == '9'">{{item.statusText}}</view>
-				<view class="confirmed btn" v-if="item.status == '2'">{{item.statusText}}</view>
-				<view class="refused btn" v-if="item.status == '4'">{{item.statusText}}</view>
-				<view class="have-expired btn" v-if="item.status == '5'">已过期</view>
-				<view class="have-expired btn" v-if="item.status == '6'">已过期</view>
-			</view>
-			<view class="details-items">
-				<view class="items">
-					<view class="items-name">
-						预约单号
-					</view>
-					<view class="items-content">
-						{{item.flowNo}}
-					</view>
-				</view>
-				<view class="items">
-					<view class="items-name">
-						充电类型
-					</view>
-					<view class="items-content">
-						{{item.typeText}}
-					</view>
-				</view>
-				<view class="items">
-					<view class="items-name">
-						预约预留时长
-					</view>
-					<view class="items-content">
-						{{item.reserveMinutes}}分钟
-					</view>
-				</view>
-				<view class="items">
-					<view class="items-name">
-						预留截至时间
-					</view>
-					<view class="items-content">
-						{{item.endTime}}
-					</view>
-				</view>
-				<view class="items">
-					<view class="items-name">
-						预约充电时长
-					</view>
-					<view class="items-content">
-						{{item.estimateMinutes != null ? (item.estimateMinutes/60).toFixed(1)+'小时' : '0'}}
-					</view>
-				</view>
-			</view>
-			<view class="button" v-if="item.status == '0'">
-				<u-button class="cancel" shape="circle" @click="refuseClick(item,item.status)">取消预约</u-button>
-			</view>
-			<view class="button" v-if="item.status == '1'">
-				<u-button class="navigation" shape="circle" @click="gotoUrl('pages/searchPile/stationAndPile/stationDetails?id='+item.stationId)">导航</u-button>
-				<u-button class="cancel" shape="circle" @click="refuseClick(item,item.status)">取消预约</u-button>
-			</view>
-			<view class="button" v-if="item.status == '2'">
-				<u-button class="check" shape="circle" @click="gotoUrl('pages/user/myReservation/reservationListDetails?id='+item.id)">查看详情</u-button>
-			</view>
-			<!-- <view class="button" v-if="item.status == '3'">
-				<u-button class="rebook" shape="circle" @click="remakeClick(item)">重新预约</u-button>
-				<u-button class="canc" shape="circle">删除</u-button>
-			</view> -->
-			<!-- <view class="button" v-if="item.status == '9'">
-				<u-button class="canc" shape="circle">删除</u-button>
-			</view> -->
-		</view>
-		<u-divider  v-if="appointmentList.length == recordsTotal && recordsTotal != 0" style="margin-top: 10px;background-color: #F2F4F4;">已经到底了</u-divider>
-	</view>
-</template>
-
-<script>
-	import * as API from '@/apis/apointment.js'
-	
-	import {
-		hourDistanceArr,
-		currentTimeStamp,
-		parseUnixTime
-	} from '@/utils'
-	
-	export default {
-		data() {
-			return {
-				screenShow: false,
-				navBarHeight:44,
-				statusList: [
-					{id:"",name:"全部预约单"},
-					{id:"1",name:"已确认"},
-					{id:"0",name:"待确认"},
-					{id:"2",name:"已完成"},
-					{id:"3",name:"已取消"},
-					{id:"4",name:"已拒绝"},
-					{id:"9",name:"已过期"},
-				],
-				statusClass: '',
-				pageIndex: 1,
-				recordsTotal: 0,
-				appointmentList: [],
-				status: '',
-			}
-		},
-		onShow() {
-			this.getAppointmentList(true);
-		},
-		onReachBottom() {
-			if (this.appointmentList.length < this.recordsTotal) {			
-				this.myLoadmore();
-			}
-		},
-		methods: {
-			statusClick(index,item) {
-				this.statusClass = index;
-				this.screenShow = false;
-				this.status = item.id;
-				this.getAppointmentList(true);
-			},
-			screenClick() {
-				this.screenShow = !this.screenShow;
-			},
-			getAppointmentList(bl) {
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				if (bl) {
-					this.appointmentList = [];
-					this.pageIndex = 1;
-				}
-				API.myAppointmentList({
-					pageIndex: this.pageIndex,
-					status: this.status
-				}).then((res) => {
-					uni.hideLoading();
-					this.appointmentList = [
-						...this.appointmentList,
-						...res.data.data
-					];
-					this.recordsTotal = res.data.recordsTotal;
-					
-					var list = res.data.data;
-					for (let i = 0; i < list.length; i++) {
-						if(list[i].status == '0') {
-							
-						}
-					}
-				}).catch(error => {
-					uni.showToast({
-						title: error,
-						icon: "none"
-					})
-				})
-			},
-			myLoadmore() {
-				this.pageIndex += 1;
-				this.getAppointmentList()
-			},
-			confirmrefuse(item){
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				API.regChangeStatus({
-					id: item.id,
-					status: '3'
-				}).then((res) => {
-					uni.hideLoading();
-					this.getAppointmentList(true);
-				}).catch(error => {
-					uni.showToast({
-						title: error,
-						icon: "none"
-					})
-				})
-			},
-			refuseClick(item,status) {
-				if(status=='0'){
-					uni.showModal({
-						title:"提示",
-						content: "请确认是否取消预约功能",
-					
-						success: (res1) => {
-							if (res1.confirm) {
-									this.confirmrefuse(item)
-							} else if (res1.cancel) {
-								//('用户点击取消');
-							}
-						}
-					})
-				}else{
-					uni.showModal({
-						title: '强制取消',
-						cancelText:'我再想想',
-						confirmText:'取消预约',
-						content: '您的预约单已被确认，如强制取消，平台为保证每位车主的合理权益，会对您作出停用预约充电功能1天的处罚。确定取消预约吗？',
-						success: res => {
-							if (res.confirm) {
-								//付钱  改为组件
-								this.confirmrefuse(item)
-							} else if (res.cancel) {
-								//('用户点击取消');
-							}
-						}
-					});
-				}
-				
-				
-			},
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.carNone{
-		display: flex;
-		flex-direction: column;
-		justify-content: center;
-		align-items: center;
-		img{
-			width: 100%;
-			height: 100%;
-		}
-		p{
-			margin-top: -60px;
-		}
-	}
-	.preference {
-		background-color: #ffffff;
-		left: 0rpx;
-		position: fixed
-	
-	}
-	.preference_group_item {
-		padding: 15rpx;
-		text-align: center;
-		color: #777777;
-	}
-	.active {
-		color: #00B962;
-		font-size: 18px;
-	}
-	.preference_group {
-		padding-bottom: 20rpx;
-	}
-	.content-s{
-		height: 240px;
-		overflow-y:scroll;
-	}
-	page {
-		padding-bottom: 155px;
-	}
-
-	.screen {
-		margin-left: 85.3%;
-		color: rgba(119, 119, 119, 100);
-		font-size: 12px
-	}
-
-	.btn {
-		width: 60px;
-		height: 24px;
-		line-height: 20px;
-		border-radius: 4px;
-		background-color: rgba(255, 255, 255, 100);
-		font-size: 14px;
-		text-align: center;
-		float: right;
-		margin-right: 24px;
-		margin-top: 12px;
-	}
-
-	// 待确认按钮
-	.toBe-confirmed {
-
-		color: rgba(78, 141, 246, 100);
-		border: 1px solid rgba(78, 141, 246, 100);
-
-	}
-
-	// 已确认按钮
-	.confirmed {
-		border: 1px solid rgba(0, 185, 98, 100);
-		color: rgba(0, 185, 98, 100);
-
-	}
-
-	// 已取消按钮
-	.canceled {
-		border: 1px solid rgba(153, 153, 153, 100);
-		color: rgba(153, 153, 153, 100);
-		;
-	}
-
-	// 已过期按钮
-	.have-expired {
-		color: rgba(162, 169, 181, 100);
-		border: 1px solid rgba(162, 169, 181, 100);
-	}
-
-	// 已拒绝
-	.refused {
-		color: rgba(255, 79, 63, 100);
-		border: 1px solid rgba(255, 79, 63, 100);
-	}
-
-	.reservation-items {
-		width: 100%;
-		background-color: #fff;
-		padding-left: 14px;
-		margin-bottom: 12px;
-
-		.station-name {
-			line-height: 48px;
-			color: rgba(16, 16, 16, 100);
-			font-size: 20px
-		}
-		.ellipsis{
-			white-space: nowrap;
-			text-overflow: ellipsis;
-			overflow: hidden;
-		}
-		.details-items {
-			border: 1px solid rgba(238, 242, 240, 100);
-			border-left: none;
-			padding-bottom: 13px;
-
-			.items {
-				display: flex;
-				justify-content: space-between;
-				padding: 12px 14px 0px 0;
-				line-height: 20px;
-			}
-
-		}
-
-		/deep/.u-alert-tips--bg--warning-light {
-			background-color: #fff !important;
-			border: none;
-			margin-top: 12px;
-			padding: 8px 0;
-
-			.u-alert-desc {
-				color: #ff7300;
-			}
-		}
-
-		.button {
-			height: 56px;
-			padding: 12px 0;
-
-			/deep/.u-btn {
-				width: 100px;
-				height: 32px;
-				line-height: 23px;
-				background-color: rgba(255, 255, 255, 100);
-				color: rgba(153, 153, 153, 100);
-				font-size: 16px;
-				text-align: center;
-				float: right;
-				margin-right: 16px;
-			}
-
-			.navigation,
-			.start {
-
-				color: rgba(0, 185, 98, 100);
-
-			}
-
-			.check {
-				color: rgba(153, 153, 153, 100);
-			}
-
-			.canc {
-				color: rgba(153, 153, 153, 100);
-			}
-
-			.rebook {
-				color: rgba(0, 185, 98, 100);
-			}
-		}
-	}
-</style>
+<template>
+	<view>
+		<ujp-navbar title="我的预约">
+			<view class="screen oldTextjp2" oldstyle="font-size: 16px;" @click="screenClick">筛选</view>
+		</ujp-navbar>
+		<view>
+			<view v-if="screenShow" class="preference" :style="screenShow ? 'z-index:1024;top:'+navBarHeight+'px;' : 'z-index:0'"
+				style="width: 100%;">
+				<view class="content-s">
+					<view class="preference_group">
+						<view class="preference_group_item" :class="statusClass == index ? 'active' : ''" v-for="(item,index) in statusList" :key="item.id" @click="statusClick(index,item)">{{item.name}}</view>
+					</view>
+				</view>
+			</view>
+			<u-mask :show="screenShow" @click="screenShow = false" z-index="100"></u-mask>
+		</view>
+		<view class="carNone" v-if="appointmentList.length == 0">
+			<img src="@/assets/static/img/暂无数据-缺省页.png" alt="">
+			<p>暂无预约</p>
+		</view>
+		<view class="reservation-items" v-for="(item,index) in appointmentList" :key="item.id" @click="gotoUrl('pages/user/myReservation/reservationListDetails?id='+item.id)">
+			<view class="station-name ellipsis">
+				{{item.stationName}}/{{item.deviceName}}
+				<view class="toBe-confirmed btn" v-if="item.status == '0'">{{item.statusText}}</view>
+				<view class="confirmed btn" v-if="item.status == '1'">已确认</view>
+				<view class="canceled btn" v-if="item.status == '3'">{{item.statusText}}</view>
+				<view class="have-expired btn" v-if="item.status == '9'">{{item.statusText}}</view>
+				<view class="confirmed btn" v-if="item.status == '2'">{{item.statusText}}</view>
+				<view class="refused btn" v-if="item.status == '4'">{{item.statusText}}</view>
+				<view class="have-expired btn" v-if="item.status == '5'">已过期</view>
+				<view class="have-expired btn" v-if="item.status == '6'">已过期</view>
+			</view>
+			<view class="details-items">
+				<view class="items">
+					<view class="items-name">
+						预约单号
+					</view>
+					<view class="items-content">
+						{{item.flowNo}}
+					</view>
+				</view>
+				<view class="items">
+					<view class="items-name">
+						充电类型
+					</view>
+					<view class="items-content">
+						{{item.typeText}}
+					</view>
+				</view>
+				<view class="items">
+					<view class="items-name">
+						预约预留时长
+					</view>
+					<view class="items-content">
+						{{item.reserveMinutes}}分钟
+					</view>
+				</view>
+				<view class="items">
+					<view class="items-name">
+						预留截至时间
+					</view>
+					<view class="items-content">
+						{{item.endTime}}
+					</view>
+				</view>
+				<view class="items">
+					<view class="items-name">
+						预约充电时长
+					</view>
+					<view class="items-content">
+						{{item.estimateMinutes != null ? (item.estimateMinutes/60).toFixed(1)+'小时' : '0'}}
+					</view>
+				</view>
+			</view>
+			<view class="button" v-if="item.status == '0'">
+				<u-button class="cancel" shape="circle" @click="refuseClick(item,item.status)">取消预约</u-button>
+			</view>
+			<view class="button" v-if="item.status == '1'">
+				<u-button class="navigation" shape="circle" @click="gotoUrl('pages/searchPile/stationAndPile/stationDetails?id='+item.stationId)">导航</u-button>
+				<u-button class="cancel" shape="circle" @click="refuseClick(item,item.status)">取消预约</u-button>
+			</view>
+			<view class="button" v-if="item.status == '2'">
+				<u-button class="check" shape="circle" @click="gotoUrl('pages/user/myReservation/reservationListDetails?id='+item.id)">查看详情</u-button>
+			</view>
+			<!-- <view class="button" v-if="item.status == '3'">
+				<u-button class="rebook" shape="circle" @click="remakeClick(item)">重新预约</u-button>
+				<u-button class="canc" shape="circle">删除</u-button>
+			</view> -->
+			<!-- <view class="button" v-if="item.status == '9'">
+				<u-button class="canc" shape="circle">删除</u-button>
+			</view> -->
+		</view>
+		<u-divider  v-if="appointmentList.length == recordsTotal && recordsTotal != 0" style="margin-top: 10px;background-color: #F2F4F4;">已经到底了</u-divider>
+	</view>
+</template>
+
+<script>
+	import * as API from '@/apis/apointment.js'
+	
+	import {
+		hourDistanceArr,
+		currentTimeStamp,
+		parseUnixTime
+	} from '@/utils'
+	
+	export default {
+		data() {
+			return {
+				screenShow: false,
+				navBarHeight:44,
+				statusList: [
+					{id:"",name:"全部预约单"},
+					{id:"1",name:"已确认"},
+					{id:"0",name:"待确认"},
+					{id:"2",name:"已完成"},
+					{id:"3",name:"已取消"},
+					{id:"4",name:"已拒绝"},
+					{id:"9",name:"已过期"},
+				],
+				statusClass: '',
+				pageIndex: 1,
+				recordsTotal: 0,
+				appointmentList: [],
+				status: '',
+			}
+		},
+		onShow() {
+			this.getAppointmentList(true);
+		},
+		onReachBottom() {
+			if (this.appointmentList.length < this.recordsTotal) {			
+				this.myLoadmore();
+			}
+		},
+		methods: {
+			statusClick(index,item) {
+				this.statusClass = index;
+				this.screenShow = false;
+				this.status = item.id;
+				this.getAppointmentList(true);
+			},
+			screenClick() {
+				this.screenShow = !this.screenShow;
+			},
+			getAppointmentList(bl) {
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				if (bl) {
+					this.appointmentList = [];
+					this.pageIndex = 1;
+				}
+				API.myAppointmentList({
+					pageIndex: this.pageIndex,
+					status: this.status
+				}).then((res) => {
+					uni.hideLoading();
+					this.appointmentList = [
+						...this.appointmentList,
+						...res.data.data
+					];
+					this.recordsTotal = res.data.recordsTotal;
+					
+					var list = res.data.data;
+					for (let i = 0; i < list.length; i++) {
+						if(list[i].status == '0') {
+							
+						}
+					}
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+			},
+			myLoadmore() {
+				this.pageIndex += 1;
+				this.getAppointmentList()
+			},
+			confirmrefuse(item){
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				API.regChangeStatus({
+					id: item.id,
+					status: '3'
+				}).then((res) => {
+					uni.hideLoading();
+					this.getAppointmentList(true);
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+			},
+			refuseClick(item,status) {
+				if(status=='0'){
+					uni.showModal({
+						title:"提示",
+						content: "请确认是否取消预约功能",
+					
+						success: (res1) => {
+							if (res1.confirm) {
+									this.confirmrefuse(item)
+							} else if (res1.cancel) {
+								//('用户点击取消');
+							}
+						}
+					})
+				}else{
+					uni.showModal({
+						title: '强制取消',
+						cancelText:'我再想想',
+						confirmText:'取消预约',
+						content: '您的预约单已被确认，如强制取消，平台为保证每位车主的合理权益，会对您作出停用预约充电功能1天的处罚。确定取消预约吗？',
+						success: res => {
+							if (res.confirm) {
+								//付钱  改为组件
+								this.confirmrefuse(item)
+							} else if (res.cancel) {
+								//('用户点击取消');
+							}
+						}
+					});
+				}
+				
+				
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.carNone{
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		img{
+			width: 100%;
+			height: 100%;
+		}
+		p{
+			margin-top: -60px;
+		}
+	}
+	.preference {
+		background-color: #ffffff;
+		left: 0rpx;
+		position: fixed
+	
+	}
+	.preference_group_item {
+		padding: 15rpx;
+		text-align: center;
+		color: #777777;
+	}
+	.active {
+		color: #00B962;
+		font-size: 18px;
+	}
+	.preference_group {
+		padding-bottom: 20rpx;
+	}
+	.content-s{
+		height: 240px;
+		overflow-y:scroll;
+	}
+	page {
+		padding-bottom: 155px;
+	}
+
+	.screen {
+		margin-left: 85.3%;
+		color: rgba(119, 119, 119, 100);
+		font-size: 12px
+	}
+
+	.btn {
+		width: 60px;
+		height: 24px;
+		line-height: 20px;
+		border-radius: 4px;
+		background-color: rgba(255, 255, 255, 100);
+		font-size: 14px;
+		text-align: center;
+		float: right;
+		margin-right: 24px;
+		margin-top: 12px;
+	}
+
+	// 待确认按钮
+	.toBe-confirmed {
+
+		color: rgba(78, 141, 246, 100);
+		border: 1px solid rgba(78, 141, 246, 100);
+
+	}
+
+	// 已确认按钮
+	.confirmed {
+		border: 1px solid rgba(0, 185, 98, 100);
+		color: rgba(0, 185, 98, 100);
+
+	}
+
+	// 已取消按钮
+	.canceled {
+		border: 1px solid rgba(153, 153, 153, 100);
+		color: rgba(153, 153, 153, 100);
+		;
+	}
+
+	// 已过期按钮
+	.have-expired {
+		color: rgba(162, 169, 181, 100);
+		border: 1px solid rgba(162, 169, 181, 100);
+	}
+
+	// 已拒绝
+	.refused {
+		color: rgba(255, 79, 63, 100);
+		border: 1px solid rgba(255, 79, 63, 100);
+	}
+
+	.reservation-items {
+		width: 100%;
+		background-color: #fff;
+		padding-left: 14px;
+		margin-bottom: 12px;
+
+		.station-name {
+			line-height: 48px;
+			color: rgba(16, 16, 16, 100);
+			font-size: 20px
+		}
+		.ellipsis{
+			white-space: nowrap;
+			text-overflow: ellipsis;
+			overflow: hidden;
+		}
+		.details-items {
+			border: 1px solid rgba(238, 242, 240, 100);
+			border-left: none;
+			padding-bottom: 13px;
+
+			.items {
+				display: flex;
+				justify-content: space-between;
+				padding: 12px 14px 0px 0;
+				line-height: 20px;
+			}
+
+		}
+
+		/deep/.u-alert-tips--bg--warning-light {
+			background-color: #fff !important;
+			border: none;
+			margin-top: 12px;
+			padding: 8px 0;
+
+			.u-alert-desc {
+				color: #ff7300;
+			}
+		}
+
+		.button {
+			height: 56px;
+			padding: 12px 0;
+
+			/deep/.u-btn {
+				width: 100px;
+				height: 32px;
+				line-height: 23px;
+				background-color: rgba(255, 255, 255, 100);
+				color: rgba(153, 153, 153, 100);
+				font-size: 16px;
+				text-align: center;
+				float: right;
+				margin-right: 16px;
+			}
+
+			.navigation,
+			.start {
+
+				color: rgba(0, 185, 98, 100);
+
+			}
+
+			.check {
+				color: rgba(153, 153, 153, 100);
+			}
+
+			.canc {
+				color: rgba(153, 153, 153, 100);
+			}
+
+			.rebook {
+				color: rgba(0, 185, 98, 100);
+			}
+		}
+	}
+</style>

pages/user/myReservation/reservationListDetails.vue

@@ -1,501 +1,501 @@
-<template>
-	<view >
-		<ujp-navbar title="预约单详情" :custom-back="customback" >
-		
-		</ujp-navbar>
-	<!-- 	<view class="iconfont tittle-font">
-			&#xe616;
-		</view> -->
-		<u-alert-tips type="warning" v-if="detail.status==0"  :description="description"></u-alert-tips>
-		
- 		<view class="reverse-time">
-			<view class="time refused" v-if="detail.status==4||detail.status==5||detail.status==6">
-					{{detail.statusText}}
-				</view> 
-			<view class="time" v-else >
-				预留{{detail.reserveMinutes}}分钟
-				<view class="img-box" >
-					<img src="@/assets/img/finished.png" v-if="detail.status==1" alt="">
-					<!-- 已取消 -->
-					  <img src="../../../static/img/canc.png" v-if="detail.status==3" alt="">  
-					<!-- 已完成-->
-					 <img src="../../../static/img/f.png" v-if="detail.status==2" alt=""> 
-				</view>
-			</view>
-			<!-- 已取消/已拒绝 -->
-			<!-- 	-->
-			<view class="details-item">
-				<view class="item">
-					<view class="item-name">
-						预约单号
-					</view>
-					<view class="item-content">
-						{{detail.flowNo}}
-					</view>
-				</view>
-				<view class="item">
-					<view class="item-name">
-						预计开始充电
-					</view>
-					<view class="item-content">
-						
-						{{detail.startTime}}
-						
-					</view>
-				</view>
-				<view class="item">
-					<view class="item-name">
-						预计充电时长
-					</view>
-					<view class="item-content">
-						{{getPercent(detail.estimateMinutes)}}
-					</view>
-				</view>
-			</view>
-			
-		</view>
-		<u-alert-tips type="warning" v-if="detail.status==1"  :description="description"></u-alert-tips>
-		
-		<!-- 充电桩详情 -->
-		<view class="charge-pile">
-		<view class="box" @click="gotoUrl('pages/searchPile/stationAndPile/stationDetails?id='+chargingDevice.stationId)">
-		
-			<view class="name ellipsis">
-				{{chargingDevice.stationName}}/{{chargingDevice.name}}
-			</view>
-			<view class="address ellipsis">
-				{{chargingDevice.address}}
-			</view>
-			<text class="iconfont more">
-				&#xe600;
-			</text>
-		</view>
-	
-			<view class="details-item">
-				<view class="item">
-					<view class="item-name">
-						预约单生成时间
-			
-					</view>
-					<view class="item-content">
-						{{detail.createTime}}
-			
-					</view>
-				</view>
-				<view class="item">
-					<view class="item-name">
-			
-						电费单价
-			
-					</view>
-					<view class="item-content">
-						{{price.electricityPrice.toFixed(2)}}元/度
-					</view>
-				</view>
-				<view class="item">
-					<view class="item-name">
-			
-						充电服务费 
-					</view>
-					<view class="item-content">
-						{{price.servicePrice.toFixed(2)}}元/度
-					</view>
-				</view>
-				
-				<view class="item"  v-if="detail.status==3" >
-					<view class="item-name" >
-							
-						取消时间 
-					</view>
-					<view class="item-content">
-						{{detail.updateTime}}
-					</view>
-				</view>
-				
-				<template v-if="detail.status==5||detail.status==6" >
-					<view class="item"   >
-						<view class="item-name" >
-								
-							过期时间 
-						</view>
-						<view class="item-content">
-							{{detail.updateTime}}
-						</view>
-					</view>
-					<view class="item"   >
-						<view class="item-name" >
-								
-							过期原因 
-						</view>
-						<view class="item-content">
-							{{detail.remark}}
-						</view>
-					</view>
-				</template>
-				
-				
-				
-			</view>
-		</view>
-		<!-- 底部按钮 -->
-		<view class="bottom" v-if="detail.status==0" >
-		<!-- 	<u-button shape='circle' class="refuse-btn">拒绝</u-button>
-			<u-button type="success" shape='circle'>确认</u-button>
-			 --><!-- 删除订单按钮 -->
-		 <u-button shape='circle' 
-		 @click="regChangeStatus(detail.status)"
-		 class="cancel-btn">取消预约</u-button>
-		</view>
-		<view class="bottom2" v-if="detail.status==1" >
-		<!-- 	<u-button shape='circle' class="refuse-btn">拒绝</u-button>
-			<u-button type="success" shape='circle'>确认</u-button>
-			 --><!-- 删除订单按钮 -->
-			<u-button size="medium" shape='circle' @click="regChangeStatus(detail.status)" class="cancel-btn">取消预约</u-button>
-			<u-button size="medium" shape='circle' type="success" @click="charge" >开始充电</u-button>
-		</view>
-	</view>
-</template>
-
-
-<script>
-	import * as API from '@/apis/apointment.js'
-	
-	import {
-		newDate,
-		hourDistanceArr,
-		currentTimeStamp,
-		parseUnixTime
-	} from '@/utils'
-	export default {
-		data() {
-			return {
-				gunNo:"",
-				deviceNo:"",
-				channelNo:"",
-				carNumber:"",
-				stationId:"",
-				isback:false,
-				detail:{},
-				price:{},
-				chargingDevice:{},
-				description: '等待桩主确认预约单，剩余时间04:59:59'
-			}
-			
-		},onLoad(op) {
-			//预约充电跳转过来则 返回首页
-			if(op.isback){
-				this.isback=true
-			}
-			if(op.notice){
-				this.isback=true
-			}
-			if(op.qr){
-				//扫码进入的
-			}
-			if (op.deviceNo) {
-				
-			}
-			this.id= op.id;
-			this.getInfo()
-		},
-		methods:{
-			getPercent(estimateMinute) {
-				var value="";
-				 
-				var ms =estimateMinute
-				if (ms > 0) {
-					var Hour = parseInt(Math.floor(ms / 60 ));
-					var Fen = parseInt(Math.floor(ms % 60 ));
-					if(Hour>0){
-						value+=Hour + "小时" 
-					}
-					if(Fen>0){
-						value+=Fen + "分钟" 
-					}
-					
-				}
-			
-				return value;
-			},
-			charge(){
-				uni.navigateTo({
-					url:'/pages/searchPile/stationAndPile/chargingPileDetails?isback=1&id='+this.gunNo
-				})
-			},
-			regChangeStatusSuccess(){
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})	
-				
-				API.regChangeStatus({
-					id:this.id,			
-					status:3
-				}).then((res) => {
-					uni.hideLoading()
-					this.getInfo();
-					
-				}).catch(error => {
-					uni.showToast({
-						title: error
-					})
-				})
-			},
-			regChangeStatus(status){
-				
-				
-				if(status=='0'){
-					uni.showModal({
-						title:"提示",
-						content: "请确认是否取消预约功能",
-					
-						success: (res1) => {
-							if (res1.confirm) {
-									this.regChangeStatusSuccess()
-							} else if (res1.cancel) {
-								//('用户点击取消');
-							}
-						}
-					})
-				}else{
-					uni.showModal({
-						title: '强制取消',
-						cancelText:'我再想想',
-						confirmText:'取消预约',
-						content: '您的预约单已被确认，如强制取消，平台为保证每位车主的合理权益，会对您作出停用预约充电功能1天的处罚。确定取消预约吗？',
-						success: res => {
-							if (res.confirm) {
-								//付钱  改为组件
-								this.regChangeStatusSuccess()
-							} else if (res.cancel) {
-								//('用户点击取消');
-							}
-						}
-					});
-				}
-				
-			},
-			getInfo(bl,bl2){
-				//(bl)
-				if(!bl){
-					uni.showLoading({
-						title: "加载中",
-						mask: true,
-					})	
-				}
-				
-				API.myAppointmentDetail({
-					id:this.id,			
-				
-				}).then((res) => {
-					if(!bl){
-						uni.hideLoading()
-					}
-					this.detail= res.data.chargingAppointment;
-					this.chargingDevice=res.data.chargingDevice;
-					this.price=res.data.price;
-					
-					
-					this.stationId= this.chargingDevice.stationId;
-					this.deviceNo = this.chargingDevice.deviceNo;
-					this.channelNo = res.data.channelNo;
-					this.carNumber = res.data.carNumber;
-					this.gunNo = res.data.gunNo;
-								
-								
-					if(this.detail.status=="0"){
-						//this.description= '等待桩主确认预约单，剩余时间'
-						var data=newDate(this.detail.createTime).getTime()
-						var c=hourDistanceArr(new Date(),new Date(data+5*60*1000))
-					
-						this.description= '等待桩主确认预约单，剩余时间'+c[1]+'分'+c[2]+"秒";		
-						
-						setTimeout(()=>{
-							this.getInfo(true);
-						},2000)
-					}
-					if(this.detail.status=="1"){
-						if(!bl2){
-							this.indexstep()
-						}
-						
-					}
-					
-					
-				}).catch(error => {
-					uni.showToast({
-						title: error
-					})
-				})
-				
-			},
-			indexstep(){
-				//this.description= '等待桩主确认预约单，剩余时间'
-				var data=newDate(this.detail.createTime).getTime()
-				var c=hourDistanceArr(new Date(),new Date(data+this.detail.reserveMinutes*60*1000))
-									
-				this.description= c[1]+'分'+c[2]+"秒后预约授权将超时，如超时授权自动取消。";		
-				if( c[1]!=0||c[2]!=0){
-					setTimeout(()=>{
-						this.indexstep()
-					},1000)
-				
-				}else{
-					 
-					setTimeout(()=>{
-						this.getInfo(true,true)
-					},5000)
-				
-				}
-				
-			},
-			customback(){
-				if(this.isback){
-					uni.reLaunch({
-						url:"/pages/index/index"
-					})
-				}else{
-					uni.navigateBack({
-						
-					})
-				}
-				
-			},
-		}
-		
-	}
-</script>
-
-<style lang="scss" scoped>
-	
-	
-	.tittle-font {
-			
-			font-size: 24px;
-			position: fixed;
-			top: 12px;
-			right: 16px;
-			z-index: 99999;
-	
-		}
-		/deep/.u-alert-desc{
-			width: 100vw;
-			text-align: center;
-			color: #ff5a00;
-		}
-		.reverse-time{
-			background-color: #fff;
-			padding: 36px 28px 16px;
-			.time{
-				height: 36px;
-				color: rgba(0, 185, 98, 100);
-				font-size: 36px;
-				text-align: center;
-				position: relative;
-				.img-box{
-					width: 72px;
-					height: 72px;
-					img{
-						width: 72px;
-						height: 72px;
-						position: absolute;
-						top: -12px;
-						right: -2px;
-					}
-				}
-			}
-			.refused{
-				color: #666666;
-			}
-		}
-		.details-item{
-			margin-top: 32px;
-			.item{
-				display: flex;
-				justify-content: space-between;
-				margin-top: 8px;
-			}
-		}
-		// 充电桩详情
-		.charge-pile{
-			background-color: #fff;
-			margin-top: 12px;
-			padding: 12px 28px;
-			.box{
-				position: relative;
-				.more{
-					position: absolute;
-					top: 9px;
-					right: 0px;
-					font-size: 24px;
-					color: #b3b3b3;
-				}
-			}
-			.name{
-				line-height: 18px;
-				color: rgba(16, 16, 16, 100);
-				font-size: 18px;
-				font-weight: 600;
-			}
-			.ellipsis{
-				white-space: nowrap;
-				text-overflow: ellipsis;
-				overflow: hidden;
-			}
-			.address{
-				line-height: 20px;
-				color: rgba(51, 51, 51, 100);
-				margin-top: 4px;
-			}
-			.item{
-				margin-top: 20px;
-			}
-		}
-		
-		// 按钮
-		.bottom{
-			width: 100%;
-			height: 56px;
-			position: fixed;
-			bottom: 0;
-			background-color: #fff;
-			display: flex;
-			.refuse-btn{
-				background-color: #DBDBDB;
-			}
-			.u-btn{
-				width: 91.4%;
-				height: 40px;
-				margin: auto;
-				font-size: 18px;
-				
-			}
-			// .cancel-btn{
-			// 	width: 91.4%;
-			// 	background-color: #dbdbdb;
-			// 	color: #666666
-			// }
-		}
-		.bottom2{
-			width: 100%;
-			height: 56px;
-			position: fixed;
-			bottom: 0;
-			background-color: #fff;
-			display: flex;
-			.refuse-btn{
-				background-color: #DBDBDB;
-			}
-			.u-btn{
-				height: 40px;
-				margin: auto;
-				font-size: 18px;
-				
-			}
-			// .cancel-btn{
-			// 	width: 91.4%;
-			// 	background-color: #dbdbdb;
-			// 	color: #666666
-			// }
-		}
+<template>
+	<view >
+		<ujp-navbar title="预约单详情" :custom-back="customback" >
+		
+		</ujp-navbar>
+	<!-- 	<view class="iconfont tittle-font">
+			&#xe616;
+		</view> -->
+		<u-alert-tips type="warning" v-if="detail.status==0"  :description="description"></u-alert-tips>
+		
+ 		<view class="reverse-time">
+			<view class="time refused" v-if="detail.status==4||detail.status==5||detail.status==6">
+					{{detail.statusText}}
+				</view> 
+			<view class="time" v-else >
+				预留{{detail.reserveMinutes}}分钟
+				<view class="img-box" >
+					<img src="@/assets/img/finished.png" v-if="detail.status==1" alt="">
+					<!-- 已取消 -->
+					  <img src="@/assets/static/img/canc.png" v-if="detail.status==3" alt="">  
+					<!-- 已完成-->
+					 <img src="@/assets/static/img/f.png" v-if="detail.status==2" alt=""> 
+				</view>
+			</view>
+			<!-- 已取消/已拒绝 -->
+			<!-- 	-->
+			<view class="details-item">
+				<view class="item">
+					<view class="item-name">
+						预约单号
+					</view>
+					<view class="item-content">
+						{{detail.flowNo}}
+					</view>
+				</view>
+				<view class="item">
+					<view class="item-name">
+						预计开始充电
+					</view>
+					<view class="item-content">
+						
+						{{detail.startTime}}
+						
+					</view>
+				</view>
+				<view class="item">
+					<view class="item-name">
+						预计充电时长
+					</view>
+					<view class="item-content">
+						{{getPercent(detail.estimateMinutes)}}
+					</view>
+				</view>
+			</view>
+			
+		</view>
+		<u-alert-tips type="warning" v-if="detail.status==1"  :description="description"></u-alert-tips>
+		
+		<!-- 充电桩详情 -->
+		<view class="charge-pile">
+		<view class="box" @click="gotoUrl('pages/searchPile/stationAndPile/stationDetails?id='+chargingDevice.stationId)">
+		
+			<view class="name ellipsis">
+				{{chargingDevice.stationName}}/{{chargingDevice.name}}
+			</view>
+			<view class="address ellipsis">
+				{{chargingDevice.address}}
+			</view>
+			<text class="iconfont more">
+				&#xe600;
+			</text>
+		</view>
+	
+			<view class="details-item">
+				<view class="item">
+					<view class="item-name">
+						预约单生成时间
+			
+					</view>
+					<view class="item-content">
+						{{detail.createTime}}
+			
+					</view>
+				</view>
+				<view class="item">
+					<view class="item-name">
+			
+						电费单价
+			
+					</view>
+					<view class="item-content">
+						{{price.electricityPrice.toFixed(2)}}元/度
+					</view>
+				</view>
+				<view class="item">
+					<view class="item-name">
+			
+						充电服务费 
+					</view>
+					<view class="item-content">
+						{{price.servicePrice.toFixed(2)}}元/度
+					</view>
+				</view>
+				
+				<view class="item"  v-if="detail.status==3" >
+					<view class="item-name" >
+							
+						取消时间 
+					</view>
+					<view class="item-content">
+						{{detail.updateTime}}
+					</view>
+				</view>
+				
+				<template v-if="detail.status==5||detail.status==6" >
+					<view class="item"   >
+						<view class="item-name" >
+								
+							过期时间 
+						</view>
+						<view class="item-content">
+							{{detail.updateTime}}
+						</view>
+					</view>
+					<view class="item"   >
+						<view class="item-name" >
+								
+							过期原因 
+						</view>
+						<view class="item-content">
+							{{detail.remark}}
+						</view>
+					</view>
+				</template>
+				
+				
+				
+			</view>
+		</view>
+		<!-- 底部按钮 -->
+		<view class="bottom" v-if="detail.status==0" >
+		<!-- 	<u-button shape='circle' class="refuse-btn">拒绝</u-button>
+			<u-button type="success" shape='circle'>确认</u-button>
+			 --><!-- 删除订单按钮 -->
+		 <u-button shape='circle' 
+		 @click="regChangeStatus(detail.status)"
+		 class="cancel-btn">取消预约</u-button>
+		</view>
+		<view class="bottom2" v-if="detail.status==1" >
+		<!-- 	<u-button shape='circle' class="refuse-btn">拒绝</u-button>
+			<u-button type="success" shape='circle'>确认</u-button>
+			 --><!-- 删除订单按钮 -->
+			<u-button size="medium" shape='circle' @click="regChangeStatus(detail.status)" class="cancel-btn">取消预约</u-button>
+			<u-button size="medium" shape='circle' type="success" @click="charge" >开始充电</u-button>
+		</view>
+	</view>
+</template>
+
+
+<script>
+	import * as API from '@/apis/apointment.js'
+	
+	import {
+		newDate,
+		hourDistanceArr,
+		currentTimeStamp,
+		parseUnixTime
+	} from '@/utils'
+	export default {
+		data() {
+			return {
+				gunNo:"",
+				deviceNo:"",
+				channelNo:"",
+				carNumber:"",
+				stationId:"",
+				isback:false,
+				detail:{},
+				price:{},
+				chargingDevice:{},
+				description: '等待桩主确认预约单，剩余时间04:59:59'
+			}
+			
+		},onLoad(op) {
+			//预约充电跳转过来则 返回首页
+			if(op.isback){
+				this.isback=true
+			}
+			if(op.notice){
+				this.isback=true
+			}
+			if(op.qr){
+				//扫码进入的
+			}
+			if (op.deviceNo) {
+				
+			}
+			this.id= op.id;
+			this.getInfo()
+		},
+		methods:{
+			getPercent(estimateMinute) {
+				var value="";
+				 
+				var ms =estimateMinute
+				if (ms > 0) {
+					var Hour = parseInt(Math.floor(ms / 60 ));
+					var Fen = parseInt(Math.floor(ms % 60 ));
+					if(Hour>0){
+						value+=Hour + "小时" 
+					}
+					if(Fen>0){
+						value+=Fen + "分钟" 
+					}
+					
+				}
+			
+				return value;
+			},
+			charge(){
+				uni.navigateTo({
+					url:'/pages/searchPile/stationAndPile/chargingPileDetails?isback=1&id='+this.gunNo
+				})
+			},
+			regChangeStatusSuccess(){
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})	
+				
+				API.regChangeStatus({
+					id:this.id,			
+					status:3
+				}).then((res) => {
+					uni.hideLoading()
+					this.getInfo();
+					
+				}).catch(error => {
+					uni.showToast({
+						title: error
+					})
+				})
+			},
+			regChangeStatus(status){
+				
+				
+				if(status=='0'){
+					uni.showModal({
+						title:"提示",
+						content: "请确认是否取消预约功能",
+					
+						success: (res1) => {
+							if (res1.confirm) {
+									this.regChangeStatusSuccess()
+							} else if (res1.cancel) {
+								//('用户点击取消');
+							}
+						}
+					})
+				}else{
+					uni.showModal({
+						title: '强制取消',
+						cancelText:'我再想想',
+						confirmText:'取消预约',
+						content: '您的预约单已被确认，如强制取消，平台为保证每位车主的合理权益，会对您作出停用预约充电功能1天的处罚。确定取消预约吗？',
+						success: res => {
+							if (res.confirm) {
+								//付钱  改为组件
+								this.regChangeStatusSuccess()
+							} else if (res.cancel) {
+								//('用户点击取消');
+							}
+						}
+					});
+				}
+				
+			},
+			getInfo(bl,bl2){
+				//(bl)
+				if(!bl){
+					uni.showLoading({
+						title: "加载中",
+						mask: true,
+					})	
+				}
+				
+				API.myAppointmentDetail({
+					id:this.id,			
+				
+				}).then((res) => {
+					if(!bl){
+						uni.hideLoading()
+					}
+					this.detail= res.data.chargingAppointment;
+					this.chargingDevice=res.data.chargingDevice;
+					this.price=res.data.price;
+					
+					
+					this.stationId= this.chargingDevice.stationId;
+					this.deviceNo = this.chargingDevice.deviceNo;
+					this.channelNo = res.data.channelNo;
+					this.carNumber = res.data.carNumber;
+					this.gunNo = res.data.gunNo;
+								
+								
+					if(this.detail.status=="0"){
+						//this.description= '等待桩主确认预约单，剩余时间'
+						var data=newDate(this.detail.createTime).getTime()
+						var c=hourDistanceArr(new Date(),new Date(data+5*60*1000))
+					
+						this.description= '等待桩主确认预约单，剩余时间'+c[1]+'分'+c[2]+"秒";		
+						
+						setTimeout(()=>{
+							this.getInfo(true);
+						},2000)
+					}
+					if(this.detail.status=="1"){
+						if(!bl2){
+							this.indexstep()
+						}
+						
+					}
+					
+					
+				}).catch(error => {
+					uni.showToast({
+						title: error
+					})
+				})
+				
+			},
+			indexstep(){
+				//this.description= '等待桩主确认预约单，剩余时间'
+				var data=newDate(this.detail.createTime).getTime()
+				var c=hourDistanceArr(new Date(),new Date(data+this.detail.reserveMinutes*60*1000))
+									
+				this.description= c[1]+'分'+c[2]+"秒后预约授权将超时，如超时授权自动取消。";		
+				if( c[1]!=0||c[2]!=0){
+					setTimeout(()=>{
+						this.indexstep()
+					},1000)
+				
+				}else{
+					 
+					setTimeout(()=>{
+						this.getInfo(true,true)
+					},5000)
+				
+				}
+				
+			},
+			customback(){
+				if(this.isback){
+					uni.reLaunch({
+						url:"/pages/index/index"
+					})
+				}else{
+					uni.navigateBack({
+						
+					})
+				}
+				
+			},
+		}
+		
+	}
+</script>
+
+<style lang="scss" scoped>
+	
+	
+	.tittle-font {
+			
+			font-size: 24px;
+			position: fixed;
+			top: 12px;
+			right: 16px;
+			z-index: 99999;
+	
+		}
+		/deep/.u-alert-desc{
+			width: 100vw;
+			text-align: center;
+			color: #ff5a00;
+		}
+		.reverse-time{
+			background-color: #fff;
+			padding: 36px 28px 16px;
+			.time{
+				height: 36px;
+				color: rgba(0, 185, 98, 100);
+				font-size: 36px;
+				text-align: center;
+				position: relative;
+				.img-box{
+					width: 72px;
+					height: 72px;
+					img{
+						width: 72px;
+						height: 72px;
+						position: absolute;
+						top: -12px;
+						right: -2px;
+					}
+				}
+			}
+			.refused{
+				color: #666666;
+			}
+		}
+		.details-item{
+			margin-top: 32px;
+			.item{
+				display: flex;
+				justify-content: space-between;
+				margin-top: 8px;
+			}
+		}
+		// 充电桩详情
+		.charge-pile{
+			background-color: #fff;
+			margin-top: 12px;
+			padding: 12px 28px;
+			.box{
+				position: relative;
+				.more{
+					position: absolute;
+					top: 9px;
+					right: 0px;
+					font-size: 24px;
+					color: #b3b3b3;
+				}
+			}
+			.name{
+				line-height: 18px;
+				color: rgba(16, 16, 16, 100);
+				font-size: 18px;
+				font-weight: 600;
+			}
+			.ellipsis{
+				white-space: nowrap;
+				text-overflow: ellipsis;
+				overflow: hidden;
+			}
+			.address{
+				line-height: 20px;
+				color: rgba(51, 51, 51, 100);
+				margin-top: 4px;
+			}
+			.item{
+				margin-top: 20px;
+			}
+		}
+		
+		// 按钮
+		.bottom{
+			width: 100%;
+			height: 56px;
+			position: fixed;
+			bottom: 0;
+			background-color: #fff;
+			display: flex;
+			.refuse-btn{
+				background-color: #DBDBDB;
+			}
+			.u-btn{
+				width: 91.4%;
+				height: 40px;
+				margin: auto;
+				font-size: 18px;
+				
+			}
+			// .cancel-btn{
+			// 	width: 91.4%;
+			// 	background-color: #dbdbdb;
+			// 	color: #666666
+			// }
+		}
+		.bottom2{
+			width: 100%;
+			height: 56px;
+			position: fixed;
+			bottom: 0;
+			background-color: #fff;
+			display: flex;
+			.refuse-btn{
+				background-color: #DBDBDB;
+			}
+			.u-btn{
+				height: 40px;
+				margin: auto;
+				font-size: 18px;
+				
+			}
+			// .cancel-btn{
+			// 	width: 91.4%;
+			// 	background-color: #dbdbdb;
+			// 	color: #666666
+			// }
+		}
 </style>

pages/user/newYear2024.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="all">
 		<u-mask :show="show" @click="show = false">
-			<u-image width="100%" height="500px" :mode="'widthFix'" src="/static/img/guide_point2.png"></u-image>
+			<u-image width="100%" height="500px" :mode="'widthFix'" src="@/assets/static/img/guide_point2.png"></u-image>
 
 		</u-mask>
 
@@ -46,8 +46,8 @@
 				</view>
 
 				<view class="application-form ">
-					<view class="title">
-						线上预约:
+					<view class="title">
+						线上预约:
 					</view>
 					<view class="tel">
 						<p><span style="color: red;">*</span>填写手机号</p>
@@ -59,40 +59,40 @@
 					<view class="bottomView">
 
 						<u-button class="button" type="warning" @click="submit">我要预约</u-button>
-					</view>
-					<view style="margin-top: 24rpx;margin-bottom: 44rpx;">
-						<u-icon name="info-circle"></u-icon>
-						预约成功后，会有工作人员跟您联系，请保持电话畅通。
-					</view>
-					<view class="title">
-						线下办理:
-					</view>
-					<view class="tel" style="margin-top: 24rpx;margin-bottom: 24rpx;">
-						携带本人<span  class="titlespan">身份证</span>、<span  class="titlespan">车辆行驶证</span>前往江津东路附155号荆鹏软件园一楼柜台办理。
-					</view>
-					<view class="telImg" @click="navigate">
-						<img src="@/assets/img/piccShare/map.png" style="width: 100%;"></img>
 					</view>
-				</view>
-				
-				<view class="application-table  table">
-					<view style="text-align: center;color: red;font-size: 36rpx;margin-bottom: 8px;font-weight:bold;">
-						年卡礼包
-					</view>
-					<table >
-						<tr class="th">
-						
-							<td >年卡</td>
-							<td>说明</td>
-							<td>价值</td>
-						</tr>
-						<tr v-for="(item,i) in tableList" :key="i">
-							<td class="td1">{{item.name}}</td>
-							<td class="td2">{{item.value}}</td>
-							<td class="td3">{{item.createBy}}</td>
-						 
-						</tr>
-					</table>
+					<view style="margin-top: 24rpx;margin-bottom: 44rpx;">
+						<u-icon name="info-circle"></u-icon>
+						预约成功后，会有工作人员跟您联系，请保持电话畅通。
+					</view>
+					<view class="title">
+						线下办理:
+					</view>
+					<view class="tel" style="margin-top: 24rpx;margin-bottom: 24rpx;">
+						携带本人<span  class="titlespan">身份证</span>、<span  class="titlespan">车辆行驶证</span>前往江津东路附155号荆鹏软件园一楼柜台办理。
+					</view>
+					<view class="telImg" @click="navigate">
+						<img src="@/assets/img/piccShare/map.png" style="width: 100%;"></img>
+					</view>
+				</view>
+				
+				<view class="application-table  table">
+					<view style="text-align: center;color: red;font-size: 36rpx;margin-bottom: 8px;font-weight:bold;">
+						年卡礼包
+					</view>
+					<table >
+						<tr class="th">
+						
+							<td >年卡</td>
+							<td>说明</td>
+							<td>价值</td>
+						</tr>
+						<tr v-for="(item,i) in tableList" :key="i">
+							<td class="td1">{{item.name}}</td>
+							<td class="td2">{{item.value}}</td>
+							<td class="td3">{{item.createBy}}</td>
+						 
+						</tr>
+					</table>
 					</view>
 			</view>
 		</view>
@@ -134,7 +134,7 @@
 			ucarkeyboard
 		},
 		data() {
-			return {
+			return {
 				tableList:[],
 				isLogin: false,
 				carAuthImg: "",
@@ -209,7 +209,7 @@
 			this.getList("凭话费送年卡")
 		},
 		onReady() {
-			
+			
 			
 			var info = this.carhelp.getPersonInfo();
 
@@ -225,36 +225,36 @@
 			this.checkSubscribe()
 
 		},
-		methods: {
-			navigate() {
-				// x
-				// : 
-				// "112.276527"
-				// y
-				// : 
-				// "30.306427"
-				//console.log(item)
-				uni.showLoading({
-			
-				})
-				WxJsApi.openLocation({
-					latitude: parseFloat(30.306427), //目的地latitude
-					longitude: parseFloat(112.276527), //目的地longitude
-					name: "江津东路附155号荆鹏软件园",
-					address: "携带本人身份证、车辆行驶证前往江津东路附155号荆鹏软件园一楼柜台办理",
-					scale: 15, //地图缩放大小，可根据情况具体调整
-					success(res) {
-						uni.hideLoading()
-					},
-					complete() {
-						//	uni.hideLoading()
-					}
-				});
-				// //('station'+JSON.stringify(_self.stationDetail.station))
-				// window.location.href = "https://uri.amap.com/marker?position=" + _self.stationDetail.station.longitude +
-				// 	"," + _self.stationDetail.station.latitude + "&name=" + _self.stationDetail.station.name;
-			
-			},
+		methods: {
+			navigate() {
+				// x
+				// : 
+				// "112.276527"
+				// y
+				// : 
+				// "30.306427"
+				//console.log(item)
+				uni.showLoading({
+			
+				})
+				WxJsApi.openLocation({
+					latitude: parseFloat(30.306427), //目的地latitude
+					longitude: parseFloat(112.276527), //目的地longitude
+					name: "江津东路附155号荆鹏软件园",
+					address: "携带本人身份证、车辆行驶证前往江津东路附155号荆鹏软件园一楼柜台办理",
+					scale: 15, //地图缩放大小，可根据情况具体调整
+					success(res) {
+						uni.hideLoading()
+					},
+					complete() {
+						//	uni.hideLoading()
+					}
+				});
+				// //('station'+JSON.stringify(_self.stationDetail.station))
+				// window.location.href = "https://uri.amap.com/marker?position=" + _self.stationDetail.station.longitude +
+				// 	"," + _self.stationDetail.station.latitude + "&name=" + _self.stationDetail.station.name;
+			
+			},
 			
 			getList(key) {
 				API.findByCatalogName({
@@ -382,8 +382,8 @@
 						signature: wxconfig.signature, // 必填，签名，见附录1
 						jsApiList: ['updateAppMessageShareData',
 							'updateTimelineShareData', 'onMenuShareTimeline', 'onMenuShareAppMessage',
-							'onMenuShareQQ', 'onMenuShareQZone',
-							 'openLocation'
+							'onMenuShareQQ', 'onMenuShareQZone',
+							 'openLocation'
 							
 						], // 必填，需要使用的JS接口列表，所有JS接口列表见附录2
 
@@ -560,29 +560,29 @@
 				}
 			}
 		}
-		.application-table {
-			background-color: #fff;
-			border-radius: 16px;
-			margin-top: 24px;
-			padding: 24rpx 16rpx;
-			padding-top:8px;
+		.application-table {
+			background-color: #fff;
+			border-radius: 16px;
+			margin-top: 24px;
+			padding: 24rpx 16rpx;
+			padding-top:8px;
 		}
 
 		.application-form {
 			background-color: #fff;
 			border-radius: 16px;
 			margin-top: 24px;
-			padding: 24px;
-			.titlespan{
-				font-weight: bold;
-				color: rgba(16, 16, 16, 1);
+			padding: 24px;
+			.titlespan{
+				font-weight: bold;
+				color: rgba(16, 16, 16, 1);
+			}
+			.title{
+				color: rgba(16, 16, 16, 1);
+				font-size: 36rpx;
+				font-weight: bold;
+				margin-bottom: 24rpx
 			}
-			.title{
-				color: rgba(16, 16, 16, 1);
-				font-size: 36rpx;
-				font-weight: bold;
-				margin-bottom: 24rpx
-			}
 			
 			.u-input {
 				border-radius: 50px;
@@ -816,47 +816,47 @@
 		border-radius: 20px;
 		background: #e9ecea;
 		color: #808080
-	}
-	
-	.table {
-		table {
-			border-spacing:0;
-			font-size: 32rpx;
-			.th {
-				background-color: #f2efef;
-				color:	#101010;
-				font-weight: bold;
-				td{
-					border: 1px solid   #dbdbdb;
-					
-				}
-			}
-	
-			.td1 {
-				text-align: start;
-			//	background-color: rgba(243, 245, 247, 1);
-				width: 212rpx;
-				
-				border-left: 1px solid   #dbdbdb;
-				border-right: 1px solid   #dbdbdb;
-				
-			}
-			.td3 {
-				text-align: start;
-				//background-color: rgba(243, 245, 247, 1);
-				//width: 100rpx;
-			
-				border-left: 1px solid   #dbdbdb;
-				border-right: 1px solid   #dbdbdb;
-			}
-	
-			td {
-				//text-align: center;
-				border-bottom: 1px solid   #dbdbdb;
-				//width: 160rpx;
-			}
-		}
-	
-	
+	}
+	
+	.table {
+		table {
+			border-spacing:0;
+			font-size: 32rpx;
+			.th {
+				background-color: #f2efef;
+				color:	#101010;
+				font-weight: bold;
+				td{
+					border: 1px solid   #dbdbdb;
+					
+				}
+			}
+	
+			.td1 {
+				text-align: start;
+			//	background-color: rgba(243, 245, 247, 1);
+				width: 212rpx;
+				
+				border-left: 1px solid   #dbdbdb;
+				border-right: 1px solid   #dbdbdb;
+				
+			}
+			.td3 {
+				text-align: start;
+				//background-color: rgba(243, 245, 247, 1);
+				//width: 100rpx;
+			
+				border-left: 1px solid   #dbdbdb;
+				border-right: 1px solid   #dbdbdb;
+			}
+	
+			td {
+				//text-align: center;
+				border-bottom: 1px solid   #dbdbdb;
+				//width: 160rpx;
+			}
+		}
+	
+	
 	}
 </style>

pages/user/sharePicc.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="all">
 		<u-mask :show="show" @click="show = false">
-			<u-image width="100%" height="500px" :mode="'widthFix'" src="/static/img/guide_point2.png"></u-image>
+			<u-image width="100%" height="500px" :mode="'widthFix'" src="@/assets/static/img/guide_point2.png"></u-image>
 
 		</u-mask>
 
@@ -9,15 +9,15 @@
 		<view class="InviteFriends" :class="{
 			opacityClass:show
 		}">
-		<view class="text imgHead">
-					<view class="imgHead1">
-						<img   style="width: 105px;" src="@/assets/img/piccShare/1.png"></img>
-						<img style="width: 16px;height:16px;margin: 3px;" src="@/assets/img/piccShare/2.png"></img>
-						<img  src="@/assets/img/piccShare/3.png"></img>
-						
-					</view>
-					<view class="imgHead2">
-						<img  style="width: 252px;height: 28px;" src="@/assets/img/piccShare/4.png"></img>
+		<view class="text imgHead">
+					<view class="imgHead1">
+						<img   style="width: 105px;" src="@/assets/img/piccShare/1.png"></img>
+						<img style="width: 16px;height:16px;margin: 3px;" src="@/assets/img/piccShare/2.png"></img>
+						<img  src="@/assets/img/piccShare/3.png"></img>
+						
+					</view>
+					<view class="imgHead2">
+						<img  style="width: 252px;height: 28px;" src="@/assets/img/piccShare/4.png"></img>
 					</view>
 				</view>
 			<view class="main">
@@ -27,24 +27,24 @@
 					<view class="content">
 						新能源车及燃油车车主。
 						
-					</view>
+					</view>
 					<p class="title">活动时间 :</p>
 					<view class="content">
 					2023年12月1日-2024年5月31日
-					</view>
-					
-					<p class="title">活动说明 :</p>
-					<view class="content">
-						<p>1.本活动为51充电联盟发起，由中国人民财产保险股份有限公司荆州分公司提供服务。</p>
-						
-						<p>2.<span style="color: #01b963;">新能源车</span>、<span style="color: #ee6e30;">燃油车</span>成功参与本活动，可获得本平台充电5折年卡1张，详情请点击查看<span style="color: #01b963;" @click="gotoUrl('pages/article/details?code=PICCSendPass')"  >《活动规则》</span>”。</p>
-						<p>3.分享奖励：您可以分享此页面至微信社群，其他车友通过链接填报信息并投保成功后，您可获得1张10元超级代金券。</p>
-						<p>4.本次报名不限数量，如有多辆汽车需要购买车险，可多次报名。</p>
-					</view>
-					<view class="bottomView">
-						<u-button class="button" shape="circle" @click="show=true" >分享活动
-						<u-icon name="share"></u-icon>
-						</u-button>
+					</view>
+					
+					<p class="title">活动说明 :</p>
+					<view class="content">
+						<p>1.本活动为51充电联盟发起，由中国人民财产保险股份有限公司荆州分公司提供服务。</p>
+						
+						<p>2.<span style="color: #01b963;">新能源车</span>、<span style="color: #ee6e30;">燃油车</span>成功参与本活动，可获得本平台充电5折年卡1张，详情请点击查看<span style="color: #01b963;" @click="gotoUrl('pages/article/details?code=PICCSendPass')"  >《活动规则》</span>”。</p>
+						<p>3.分享奖励：您可以分享此页面至微信社群，其他车友通过链接填报信息并投保成功后，您可获得1张10元超级代金券。</p>
+						<p>4.本次报名不限数量，如有多辆汽车需要购买车险，可多次报名。</p>
+					</view>
+					<view class="bottomView">
+						<u-button class="button" shape="circle" @click="show=true" >分享活动
+						<u-icon name="share"></u-icon>
+						</u-button>
 					</view>
 				</view>
 
@@ -59,81 +59,81 @@
 						<u-input v-model="subForm.phone" :customStyle="placeholderStyle" 
 							:placeholderStyle="placeholderStyle" placeholder="请填写联系电话"></u-input>
 					</view>
-					
-					<view class="want" v-if="isLogin">
-						<p><span style="color: red;">*</span>是否使用平台已认证车辆信息</p>
-						<view class="wantView">
-							<u-button  :class="{
-								wantBtn:carLicense
-							}" shape="circle" @tap="carLicense=true">
-								<span  @tap="carLicense=true">{{carNum}}</span>
-							</u-button>
-							
-							<u-button   :class="{
-								wantBtn:!carLicense
-							}"  shape="circle" @tap="carLicense=false">
-								<span  @tap="carLicense=false">其他车辆</span>
-							</u-button>
-							
-						</view>
-						<span v-show="carLicense" class="wanttpis" >已认证</span>
-					</view>
-					<view class="place"  v-show="!carLicense">
-						<p><span style="color: red;">*</span>车牌号码</p>
-						 
-							<view @click="carTempBl=true,carTempBlInit" class="carTempBlInput">
-								{{subForm.carNum?subForm.carNum:'请填写车牌号码'}}
-							</view>
+					
+					<view class="want" v-if="isLogin">
+						<p><span style="color: red;">*</span>是否使用平台已认证车辆信息</p>
+						<view class="wantView">
+							<u-button  :class="{
+								wantBtn:carLicense
+							}" shape="circle" @tap="carLicense=true">
+								<span  @tap="carLicense=true">{{carNum}}</span>
+							</u-button>
+							
+							<u-button   :class="{
+								wantBtn:!carLicense
+							}"  shape="circle" @tap="carLicense=false">
+								<span  @tap="carLicense=false">其他车辆</span>
+							</u-button>
+							
+						</view>
+						<span v-show="carLicense" class="wanttpis" >已认证</span>
+					</view>
+					<view class="place"  v-show="!carLicense">
+						<p><span style="color: red;">*</span>车牌号码</p>
+						 
+							<view @click="carTempBl=true,carTempBlInit" class="carTempBlInput">
+								{{subForm.carNum?subForm.carNum:'请填写车牌号码'}}
+							</view>
 					</view>
-					<view class="type"  v-show="!carLicense">
+					<view class="type"  v-show="!carLicense">
 						<p><span style="color: red;">*</span>车辆认证</p>
-						<view style="font-size: 12px;color:rgba(51, 51, 51, 1);margin: 2px 0;">上传机动车行驶证清晰照片</view>
-						
-						<view class="checkbox">
+						<view style="font-size: 12px;color:rgba(51, 51, 51, 1);margin: 2px 0;">上传机动车行驶证清晰照片</view>
+						
+						<view class="checkbox">
 							
-							<view class="car-type">
-								
-								<view class="carAuth">
-									<view class="mark"  v-show="!carAuthImg">
-										<view class="text">例</view>
-									</view>
-									<view class="carAuthIcon" @click="uploadPhoto">
-										<u-icon name="camera-fill" custom-prefix="custom-icon" color="#fff" size="48"></u-icon>
-										
-									</view>
-									<image class="carAuthImg"  @click="uploadPhoto" v-show="carAuthImg" :src="carAuthImg"></image>
-									
-									<image class="carAuthImg"  @click="uploadPhoto" v-show="!carAuthImg" src="@/assets/img/carDet/authtest.png"></image>
-									
-								</view>
-								
+							<view class="car-type">
+								
+								<view class="carAuth">
+									<view class="mark"  v-show="!carAuthImg">
+										<view class="text">例</view>
+									</view>
+									<view class="carAuthIcon" @click="uploadPhoto">
+										<u-icon name="camera-fill" custom-prefix="custom-icon" color="#fff" size="48"></u-icon>
+										
+									</view>
+									<image class="carAuthImg"  @click="uploadPhoto" v-show="carAuthImg" :src="carAuthImg"></image>
+									
+									<image class="carAuthImg"  @click="uploadPhoto" v-show="!carAuthImg" src="@/assets/img/carDet/authtest.png"></image>
+									
+								</view>
+								
 							</view>
 						</view>
 					</view>
 					
 					<view class="hint">
 						查看<span style="color: #01b963;" @click="gotoUrl('pages/article/details?code=PICCSendPass')"  >《购车险送年卡活动规则》</span>
-					</view>
-					<view class="bottomView">
-						
-							<u-button class="button"  type="warning" @click="submit">提交申请</u-button>
+					</view>
+					<view class="bottomView">
+						
+							<u-button class="button"  type="warning" @click="submit">提交申请</u-button>
 					</view>
 				
 				</view>
 			</view>
 
-		</view>
-		<u-modal v-model="show1" @confirm="gotoGz" cancel-text="暂不关注" confirm-text="前往关注" :show-cancel-button="false"
-			confirm-color="#53b56b" ref="uModal2" :asyncClose="true">
-			<view style="padding: 15px;">请先关注<span style=" color:  #53b56b;">{{projectName}}</span>公众号，然后进行填报</view>
+		</view>
+		<u-modal v-model="show1" @confirm="gotoGz" cancel-text="暂不关注" confirm-text="前往关注" :show-cancel-button="false"
+			confirm-color="#53b56b" ref="uModal2" :asyncClose="true">
+			<view style="padding: 15px;">请先关注<span style=" color:  #53b56b;">{{projectName}}</span>公众号，然后进行填报</view>
 		</u-modal>
-		
-		<u-mask :show="carTempBl" >
-		<ucarkeyboard  v-if="carTempBl" :tips="subForm.carNum" style="z-index: 9999;position: fixed !important;"  ref="uKeyboard" mode="car"
-			@confirm="carTempBl=false" @cancel="carTempBl=false" :showTips="true"
-			:mask-close-able="false" @change="valChange" @backspace="backspace"></ucarkeyboard>
-		
-		</u-mask>
+		
+		<u-mask :show="carTempBl" >
+		<ucarkeyboard  v-if="carTempBl" :tips="subForm.carNum" style="z-index: 9999;position: fixed !important;"  ref="uKeyboard" mode="car"
+			@confirm="carTempBl=false" @cancel="carTempBl=false" :showTips="true"
+			:mask-close-able="false" @change="valChange" @backspace="backspace"></ucarkeyboard>
+		
+		</u-mask>
 		
 	</view>
 </template>
@@ -144,10 +144,10 @@
 	import {
 		convertCanvasToImage,
 		substrMb
-	} from '@/utils'
-	import {
-		checkPhone
-	} from '@/utils'
+	} from '@/utils'
+	import {
+		checkPhone
+	} from '@/utils'
 	
  	import * as API from '@/apis/friends.js'
 	import * as WxJsApi from '@/utils/wxJsApi.js'
@@ -156,12 +156,12 @@
 	import ucarkeyboard from '@/components/Ucarkeyboard.vue'
 
 
-	export default {
-		components: {
-			ucarkeyboard
+	export default {
+		components: {
+			ucarkeyboard
 		},
 		data() {
-			return {
+			return {
 				isLogin:false,
 				carAuthImg:"",
 				id: "",
@@ -178,58 +178,58 @@
 				 
 				back: true,
 				 
-				subForm: {
+				subForm: {
 					realName:"",
 					phone: "",
-					carNum:"",
-					licenseFileUrl: "",
+					carNum:"",
+					licenseFileUrl: "",
 					openId:"",
 					shareUserId: ""
 				},
 
 				
 				placeholderStyle: {
-					'font-size': '16px',
-					
-					'padding': '4px 8px'
+					'font-size': '16px',
 					
-				},
-				shareUserId:"",
+					'padding': '4px 8px'
+					
+				},
+				shareUserId:"",
 				userInfo:null,
 				carNum:'',
 				 carLicense:false,
 
 			}
 		},
-		onLoad(op) {
-			if(op.back){
-				this.back=false
+		onLoad(op) {
+			if(op.back){
+				this.back=false
 			}
 			this.projectName = process.car.ProjectName;
-			
-			if(op.sid){
-				
-					this.shareUserId = op.sid
-					this.carhelp.set("picc_shareUserId_1112",{
-						sid:op.sid,
-						time:new Date().getTime()
-					});
-			}else{
-				var obj=this.carhelp.get("picc_shareUserId_1112")
-				if(obj){
-					var time1 =new Date().getTime()
-					var time2 =obj.time;
-					if(time1-time2<1000*60*5){
-						this.shareUserId = obj.sid;
-					}
-					
-				}
+			
+			if(op.sid){
+				
+					this.shareUserId = op.sid
+					this.carhelp.set("picc_shareUserId_1112",{
+						sid:op.sid,
+						time:new Date().getTime()
+					});
+			}else{
+				var obj=this.carhelp.get("picc_shareUserId_1112")
+				if(obj){
+					var time1 =new Date().getTime()
+					var time2 =obj.time;
+					if(time1-time2<1000*60*5){
+						this.shareUserId = obj.sid;
+					}
+					
+				}
 			}
-			//console.log(this.shareUserId )
-			if(this.shareUserId ){
-				uni.showToast({
-					title:"来自好友的分享"
-				})
+			//console.log(this.shareUserId )
+			if(this.shareUserId ){
+				uni.showToast({
+					title:"来自好友的分享"
+				})
 			}
 		
 			this.get_wx_config();
@@ -237,14 +237,14 @@
 		},
 		onReady() {
 		
-			var info = this.carhelp.getPersonInfo();
+			var info = this.carhelp.getPersonInfo();
 		
-			if(info.id&&info.carLicense){
-				this.isLogin=true
-				this.userInfo=info;
-				this.carLicense=true;
-				//console.log(JSON.parse(info.carLicenseJson))
-				this.carNum=JSON.parse(info.carLicenseJson)["号牌号码"].words
+			if(info.id&&info.carLicense){
+				this.isLogin=true
+				this.userInfo=info;
+				this.carLicense=true;
+				//console.log(JSON.parse(info.carLicenseJson))
+				this.carNum=JSON.parse(info.carLicenseJson)["号牌号码"].words
 			}
 		},
 		onShow() {
@@ -252,235 +252,235 @@
 			this.checkSubscribe()
 
 		},
-		methods: {
-			carTempBlInit() {
-				var aaa = this.$refs.uKeyboard.changeCarInputValue();
-				console.log(aaa)
-				if (this.subForm.carNum.length && !aaa) {
-					var c = this.$refs.uKeyboard.changeCarInputMode();
-			
-				}
-			},
-			// 按键被点击(点击退格键不会触发此事件)
-			// 按键被点击(点击退格键不会触发此事件)
-			valChange(val) {
-			
-				if (this.subForm.carNum.length >= 8) {
-					return
-				}
-			
-				this.subForm.carNum += val;
-				// 将每次按键的值拼接到form.carNum变量中，注意+=写法
-			
-				//(this.subForm.carNum);
-			
-				var aaa = this.$refs.uKeyboard.changeCarInputValue();
-				if ((this.subForm.carNum.length == 0) && aaa) {
-					this.$refs.uKeyboard.changeCarInputMode();
-				} else if (!aaa) {
-					this.$refs.uKeyboard.changeCarInputMode();
-				}
-			},
-			// 退格键被点击
-			backspace() {
-				// 删除form.carNum的最后一个字符
-				if (this.subForm.carNum.length) {
-					if (true) {
-			
-						this.subForm.carNum = this.subForm.carNum.substr(0, this.subForm.carNum.length - 1);
-			
-					} else {
-			
-						//this.selectIndex=-1;
-					}
-				}
-			
-			
-			
-			
-				//(this.subForm.carNum);
-			
-				var aaa = this.$refs.uKeyboard.changeCarInputValue();
-				if (this.subForm.carNum.length == 0 && aaa) {
-					this.$refs.uKeyboard.changeCarInputMode();
-				}
-			},
-			checkSubscribe() {
-				API_weixin.checkSubscribe({
-					openId: this.carhelp.getOpenId()
-				}).then((res) => {
-			
-					if (res.data == "0") {
-						this.show1 = true
-						
-					} else {
-						//this.init();
-						this.show1 = false;
-						this.show2 = true;
-			
-			
-						//this.carhelp.setGzDate() 
-			
-					}
-			
-					//setGzDate
-				}).catch(error => {
-					uni.showToast({
-						title: error
-					})
-				})
-			
-			},
-			gotoGz() {
-				this.carhelp.setGzDate()
-			//	this.gotoGzShow = false;
-				var url = "https://mp.weixin.qq.com/s/mCHz1nNvg0xAICiBeIyKRQ";
-				window.location.href = url
-			
-			},
-			submit(){
-				this.subForm.openId=this.carhelp.getOpenId();
-				this.subForm.shareUserId=this.shareUserId;
-				this.subForm.licenseFileUrl=this.carAuthImg
-				if(this.carLicense){
-					this.subForm.licenseFileUrl=this.userInfo.carLicense
-					this.subForm.carNum=this.carNum
-				}
-				if(!this.subForm.realName){
-					uni.showToast({
-						title:"请输入车主姓名"
-					})
-					return
-				}
-				if(!this.subForm.phone){
-					uni.showToast({
-						title:"请输入联系电话"
-					})
-					return
-				}
-				var checkPhoneResult = checkPhone(this.subForm.phone);
-							
-				if (checkPhoneResult !== true) {
-					uni.showToast({
-						title: checkPhoneResult,
-					})
-					return;
-				}
-				
-				if(!this.subForm.carNum){
-					uni.showToast({
-						title:"请输入车牌号码"
-					})
-					return
-				}
-				
-				if(!this.subForm.licenseFileUrl){
-					uni.showToast({
-						title:"请上传行驶证"
-					})
-					return
-				}
-				
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})		
-				API.submitPicc(this.subForm).then((res) => {
-					uni.hideLoading()
-					
-					if(res.result){
-						uni.showModal({
-							//showCancel:false,
-						
-							title:"提示",
-							content:"提交成功！",
-							confirmText:"前往主页",
-							success:(me)=> {
-								this.carAuthImg="";
-								this.subForm={
-									realName:"",
-									phone: "",
-									carNum:"",
-									licenseFileUrl: "",
-									//openId:"",
-									//shareUserId: ""
-								}
-								if(me.confirm){
-									uni.reLaunch({
-										url:"/"
-									})
-								}
-							
-							}
-						})
-					}
-					
-				}).catch(error => {
-					uni.showToast({
-						title: error,
-						icon: "none"
-					})
-				})
-			},
-			uploadFile(imageSrc){
-				var action=process.car.BASE_URL+"uploadPicture"
-				var token=this.carhelp.getToken()
-				var header={
-					'Authorization':token
-				}
-				var formData={
-					subFolder:"/team51/picc"
-				}
-				var _this=this
-				uni.showLoading({
-				   					title: '上传中',
-									mask: true,
-				   				})
-				   				  uni.uploadFile({
-				   					url: action, //仅为示例，非真实的接口地址
-				   					filePath: imageSrc,
-				   					name: 'photoFile',
-									header: header,
-				   					formData: formData,
-				   					success: (res) => {
-				   						
-				   						uni.hideLoading();
-				   						uni.showToast({
-				   							title: '上传成功',
-				   							icon: 'success',
-				   							duration: 1000
-				   						})
-										
-				   						_this.carAuthImg = JSON.parse(res.data).data
-				   						_this.$forceUpdate()
-										
-										
-				   					},
-				   					fail: (err) => {
-				   						console.log('uploadImage fail', err);
-				   						uni.hideLoading();
-				   						uni.showModal({
-				   							content: err.errMsg,
-				   							showCancel: false
-				   						});
-				   					},
-				   				});
+		methods: {
+			carTempBlInit() {
+				var aaa = this.$refs.uKeyboard.changeCarInputValue();
+				console.log(aaa)
+				if (this.subForm.carNum.length && !aaa) {
+					var c = this.$refs.uKeyboard.changeCarInputMode();
+			
+				}
+			},
+			// 按键被点击(点击退格键不会触发此事件)
+			// 按键被点击(点击退格键不会触发此事件)
+			valChange(val) {
+			
+				if (this.subForm.carNum.length >= 8) {
+					return
+				}
+			
+				this.subForm.carNum += val;
+				// 将每次按键的值拼接到form.carNum变量中，注意+=写法
+			
+				//(this.subForm.carNum);
+			
+				var aaa = this.$refs.uKeyboard.changeCarInputValue();
+				if ((this.subForm.carNum.length == 0) && aaa) {
+					this.$refs.uKeyboard.changeCarInputMode();
+				} else if (!aaa) {
+					this.$refs.uKeyboard.changeCarInputMode();
+				}
+			},
+			// 退格键被点击
+			backspace() {
+				// 删除form.carNum的最后一个字符
+				if (this.subForm.carNum.length) {
+					if (true) {
+			
+						this.subForm.carNum = this.subForm.carNum.substr(0, this.subForm.carNum.length - 1);
+			
+					} else {
+			
+						//this.selectIndex=-1;
+					}
+				}
+			
+			
+			
+			
+				//(this.subForm.carNum);
+			
+				var aaa = this.$refs.uKeyboard.changeCarInputValue();
+				if (this.subForm.carNum.length == 0 && aaa) {
+					this.$refs.uKeyboard.changeCarInputMode();
+				}
+			},
+			checkSubscribe() {
+				API_weixin.checkSubscribe({
+					openId: this.carhelp.getOpenId()
+				}).then((res) => {
+			
+					if (res.data == "0") {
+						this.show1 = true
+						
+					} else {
+						//this.init();
+						this.show1 = false;
+						this.show2 = true;
+			
+			
+						//this.carhelp.setGzDate() 
+			
+					}
+			
+					//setGzDate
+				}).catch(error => {
+					uni.showToast({
+						title: error
+					})
+				})
+			
+			},
+			gotoGz() {
+				this.carhelp.setGzDate()
+			//	this.gotoGzShow = false;
+				var url = "https://mp.weixin.qq.com/s/mCHz1nNvg0xAICiBeIyKRQ";
+				window.location.href = url
+			
+			},
+			submit(){
+				this.subForm.openId=this.carhelp.getOpenId();
+				this.subForm.shareUserId=this.shareUserId;
+				this.subForm.licenseFileUrl=this.carAuthImg
+				if(this.carLicense){
+					this.subForm.licenseFileUrl=this.userInfo.carLicense
+					this.subForm.carNum=this.carNum
+				}
+				if(!this.subForm.realName){
+					uni.showToast({
+						title:"请输入车主姓名"
+					})
+					return
+				}
+				if(!this.subForm.phone){
+					uni.showToast({
+						title:"请输入联系电话"
+					})
+					return
+				}
+				var checkPhoneResult = checkPhone(this.subForm.phone);
+							
+				if (checkPhoneResult !== true) {
+					uni.showToast({
+						title: checkPhoneResult,
+					})
+					return;
+				}
+				
+				if(!this.subForm.carNum){
+					uni.showToast({
+						title:"请输入车牌号码"
+					})
+					return
+				}
+				
+				if(!this.subForm.licenseFileUrl){
+					uni.showToast({
+						title:"请上传行驶证"
+					})
+					return
+				}
+				
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})		
+				API.submitPicc(this.subForm).then((res) => {
+					uni.hideLoading()
+					
+					if(res.result){
+						uni.showModal({
+							//showCancel:false,
+						
+							title:"提示",
+							content:"提交成功！",
+							confirmText:"前往主页",
+							success:(me)=> {
+								this.carAuthImg="";
+								this.subForm={
+									realName:"",
+									phone: "",
+									carNum:"",
+									licenseFileUrl: "",
+									//openId:"",
+									//shareUserId: ""
+								}
+								if(me.confirm){
+									uni.reLaunch({
+										url:"/"
+									})
+								}
+							
+							}
+						})
+					}
+					
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
 			},
-			uploadPhoto() {
-				
-				uni.chooseImage({
-					count: 1,
-					sizeType:['compressed'],
-					success: async (res) => {
-						console.log(res)
-						var imageSrc = res.tempFilePaths[0]
-						this.uploadFile(imageSrc);
-							
-					},
-					fail: (err) => {
-					   	console.log('chooseImage fail', err)
-					}
-				})
+			uploadFile(imageSrc){
+				var action=process.car.BASE_URL+"uploadPicture"
+				var token=this.carhelp.getToken()
+				var header={
+					'Authorization':token
+				}
+				var formData={
+					subFolder:"/team51/picc"
+				}
+				var _this=this
+				uni.showLoading({
+				   					title: '上传中',
+									mask: true,
+				   				})
+				   				  uni.uploadFile({
+				   					url: action, //仅为示例，非真实的接口地址
+				   					filePath: imageSrc,
+				   					name: 'photoFile',
+									header: header,
+				   					formData: formData,
+				   					success: (res) => {
+				   						
+				   						uni.hideLoading();
+				   						uni.showToast({
+				   							title: '上传成功',
+				   							icon: 'success',
+				   							duration: 1000
+				   						})
+										
+				   						_this.carAuthImg = JSON.parse(res.data).data
+				   						_this.$forceUpdate()
+										
+										
+				   					},
+				   					fail: (err) => {
+				   						console.log('uploadImage fail', err);
+				   						uni.hideLoading();
+				   						uni.showModal({
+				   							content: err.errMsg,
+				   							showCancel: false
+				   						});
+				   					},
+				   				});
+			},
+			uploadPhoto() {
+				
+				uni.chooseImage({
+					count: 1,
+					sizeType:['compressed'],
+					success: async (res) => {
+						console.log(res)
+						var imageSrc = res.tempFilePaths[0]
+						this.uploadFile(imageSrc);
+							
+					},
+					fail: (err) => {
+					   	console.log('chooseImage fail', err)
+					}
+				})
 			},
 			 
 			
@@ -531,31 +531,31 @@
 				var desc = ProjectName
 				let joinUrl = window.location.href.split("/team51/")[0] + "/team51/#/pages/user/sharePicc?back=1"
 				//this.joinUrl=joinUrl;
-				if(info.id){
-					joinUrl+="&sid=" + info.id;
+				if(info.id){
+					joinUrl+="&sid=" + info.id;
 				}
 				var _this=this;
 				wx.ready(function() {
-					
-					wx.onMenuShareAppMessage({
-						title: title,
-						desc: desc,
-						link: joinUrl,
-						imgUrl: img,
-						success: function() {
-							// 设置成功
-							_this.$emit("wxShare",null);
-						}
-					})
-					wx.onMenuShareTimeline({
-						title: title,
-						desc: desc,
-						link: joinUrl,
-						imgUrl: img,
-						success: function() {
-							// 设置成功
-							_this.$emit("wxShare",null);
-						}
+					
+					wx.onMenuShareAppMessage({
+						title: title,
+						desc: desc,
+						link: joinUrl,
+						imgUrl: img,
+						success: function() {
+							// 设置成功
+							_this.$emit("wxShare",null);
+						}
+					})
+					wx.onMenuShareTimeline({
+						title: title,
+						desc: desc,
+						link: joinUrl,
+						imgUrl: img,
+						success: function() {
+							// 设置成功
+							_this.$emit("wxShare",null);
+						}
 					})
 					wx.updateAppMessageShareData({
 						title: title,
@@ -578,7 +578,7 @@
 							// 设置成功
 							_this.$emit("wxShare", null);
 						}
-					})
+					})
 					console.log("readyreadyreadyreadyready")
 				});
 			}
@@ -596,29 +596,29 @@
 			font-size: themed('font-size1');
 		}
 	}
-	.imgHead{
-		padding-top: 72rpx;
-		    display: flex;
-		    flex-direction: column;
-		    align-items: center;
-		
-		.imgHead1{
-			img{
-				height: 20px;
-			}
-			
-			    display: flex;
-			    justify-content: center;
-		}
-		.imgHead2{
-			
-			    display: flex;
-			img{
-				width: 100%;
-				height: 20px;
-			}
-			    margin-top: 16px;
-		}
+	.imgHead{
+		padding-top: 72rpx;
+		    display: flex;
+		    flex-direction: column;
+		    align-items: center;
+		
+		.imgHead1{
+			img{
+				height: 20px;
+			}
+			
+			    display: flex;
+			    justify-content: center;
+		}
+		.imgHead2{
+			
+			    display: flex;
+			img{
+				width: 100%;
+				height: 20px;
+			}
+			    margin-top: 16px;
+		}
 	}
 
 	.main {
@@ -640,7 +640,7 @@
 		}
 
 		.suited {
-			background-color: #fff;
+			background-color: #fff;
 			background: linear-gradient(180deg, rgba(189,255,224,1) 0%,rgba(255,255,255,1) 14%);
 			margin-top: 24px;
 			padding: 24px;
@@ -659,11 +659,11 @@
 			.content {
 				margin: 16rpx 0;
 				//font-weight: 550;
-				color: rgba(102, 102, 102, 1);
+				color: rgba(102, 102, 102, 1);
 				line-height: 20px;
 				font-size: 14px;
-				p{
-					margin: 8rpx 0;
+				p{
+					margin: 8rpx 0;
 				}
 			}
 		}
@@ -690,7 +690,7 @@
 				margin-right: 10px;
 			}
 
-			p {
+			p {
 					font-size:18px;
 				@include themeify {
 				
@@ -798,102 +798,102 @@
 	.opacityClass {
 		opacity: 0.2;
 	}
-	// 底部
-	.bottomView {
-			border-radius: 50px;
-		color:rgba(0, 185, 98, 100);
-		// width: 100%;
-		// height: 64px;
-		// text-align: center;
-		// background-color: #fff;
-		.button{
-			//width: 90%;
-			border-radius: 50px;
-			// background-color: #fff;
-			color:#fff;
-			font-size: 16px;
-			background: linear-gradient(90deg, rgba(255,98,0,1) 0%,rgba(255,150,0,1) 100%);
-			//border: 1px solid rgba(0, 163, 86, 1);
-		}
-		// 	button::after {
-		// 		border: rgba(0, 185, 98, 100);
-		// 	}
-	}
-	
-	.carAuth{
-		border-radius: 12px;
-		background-color: rgba(255, 255, 255, 1);
-		border: 2px dashed rgba(187, 187, 187, 1);
-		//height: 400rpx;
-		width: 100%;
-		    overflow: hidden;
-			text-align: center;
-			.carAuthImg{
-				margin-top: 10px;
-				margin-bottom: 10px;
-				width: 510rpx;
-				height: 360rpx;
-			}
-			.carAuthIcon{
-				    position: absolute;
-				    background: #6e7175;
-				    width: 44px;
-				    height: 44px;
-					border-radius: 50px;
-				    /* left: 200px; */
-				    /* top: 200px; */
-				    margin: 160rpx 230rpx;
-				    z-index: 99;
-					    display: flex; 
-					    justify-content: center;
-	
-			}
+	// 底部
+	.bottomView {
+			border-radius: 50px;
+		color:rgba(0, 185, 98, 100);
+		// width: 100%;
+		// height: 64px;
+		// text-align: center;
+		// background-color: #fff;
+		.button{
+			//width: 90%;
+			border-radius: 50px;
+			// background-color: #fff;
+			color:#fff;
+			font-size: 16px;
+			background: linear-gradient(90deg, rgba(255,98,0,1) 0%,rgba(255,150,0,1) 100%);
+			//border: 1px solid rgba(0, 163, 86, 1);
+		}
+		// 	button::after {
+		// 		border: rgba(0, 185, 98, 100);
+		// 	}
+	}
+	
+	.carAuth{
+		border-radius: 12px;
+		background-color: rgba(255, 255, 255, 1);
+		border: 2px dashed rgba(187, 187, 187, 1);
+		//height: 400rpx;
+		width: 100%;
+		    overflow: hidden;
+			text-align: center;
+			.carAuthImg{
+				margin-top: 10px;
+				margin-bottom: 10px;
+				width: 510rpx;
+				height: 360rpx;
+			}
+			.carAuthIcon{
+				    position: absolute;
+				    background: #6e7175;
+				    width: 44px;
+				    height: 44px;
+					border-radius: 50px;
+				    /* left: 200px; */
+				    /* top: 200px; */
+				    margin: 160rpx 230rpx;
+				    z-index: 99;
+					    display: flex; 
+					    justify-content: center;
+	
+			}
+	}
+	
+	// .car-type{
+	// 	    display: flex;
+	// 	    flex-direction: row;
+	// 		margin: 0 40rpx;
+	// 		flex-wrap: wrap;
+	// }
+	.want{
+		.wantView{
+			display: flex;
+		}
+		button{
+			width: 45%;
+			color: rgba(51, 51, 51, 1);
+			background-color: rgba(232, 236, 234, 1);
+			
+		}
+		button::after {
+			border: none;
+		}
+		.wantBtn{
+			background-color: #fff;
+			border:2px solid #00B962;
+		}
+		.wanttpis{
+			    position: relative;
+			    top: -100rpx;
+			    left: 180rpx;
+			    z-index: 99;
+			    background: #00B962 ;
+				padding: 2px 3px;
+				font-size: 10px;
+				color:#fff;
+				border-radius: 4px;
+
+		}
 	}
-	
-	// .car-type{
-	// 	    display: flex;
-	// 	    flex-direction: row;
-	// 		margin: 0 40rpx;
-	// 		flex-wrap: wrap;
-	// }
-	.want{
-		.wantView{
-			display: flex;
-		}
-		button{
-			width: 45%;
-			color: rgba(51, 51, 51, 1);
-			background-color: rgba(232, 236, 234, 1);
-			
-		}
-		button::after {
-			border: none;
-		}
-		.wantBtn{
-			background-color: #fff;
-			border:2px solid #00B962;
-		}
-		.wanttpis{
-			    position: relative;
-			    top: -100rpx;
-			    left: 180rpx;
-			    z-index: 99;
-			    background: #00B962 ;
-				padding: 2px 3px;
-				font-size: 10px;
-				color:#fff;
-				border-radius: 4px;
-
-		}
-	}
-	.carTempBlInput{
-		    display: flex;
-		    align-items: center;
-		font-size: 16px;
-		min-height: 44px;
-		padding: 4px 16px;
-		border-radius:20px;
-		 background: #e9ecea ;
-		 color:#808080
+	.carTempBlInput{
+		    display: flex;
+		    align-items: center;
+		font-size: 16px;
+		min-height: 44px;
+		padding: 4px 16px;
+		border-radius:20px;
+		 background: #e9ecea ;
+		 color:#808080
 	}
 </style>

pages/user/toJoin.vue

@@ -1,469 +1,469 @@
-<template>
-	<view class="all">
-		<ujp-navbar :is-back="back" title="我要加盟" ></ujp-navbar>
-	
-		<view class="main">
-			<view class="main-content">
-				<p class="title">适合对象:</p>
-				<view class="text">
-					已经在经营充电桩业务的商家，可以申请加入“<text style="color: #e14173;">51充电联盟</text>”。
-				</view>
-				<p class="title">平台能为您提供：</p>
-				<view class="text-box">
-					<p>1.便捷的找桩、充电服务，提升用户体验。</p>
-					<p>2.获得更多的用户资源和运营支持，提高市场竞争力。</p>
-					<p>3.良好的平台背书,提高公信力</p>
-				</view>
-			</view>
-			<view class="application-form ">
-				<view class="name">
-					<p>申请人姓名</p>
-
-					<u-input   v-model="name" :customStyle="customStyle" :placeholderStyle="placeholderStyle" placeholder=""></u-input>
-				</view>
-				<view class="tel">
-					<p>联系电话</p>
-					<u-input :customStyle="customStyle"  v-model="subForm.phone" :placeholderStyle="placeholderStyle" placeholder=""></u-input>
- 				</view>
-				<view class="place">
-					<p>自有电桩地点</p>
-				
-					<u-input class="textarea"  type="textarea" height="200"  v-model="address" placeholder="填写详细位置" ></u-input>
-				</view>
-				<view class="type">
-					<p>自有电桩类型</p>
-					<view class="checkbox">
-							<view class="">
-									<u-checkbox-group    active-color="#00B962">
-										<u-checkbox 
-										 
-											v-model="item.checked" 
-											v-for="(item, index) in typeList" :key="index" 
-											:name="item.name"
-										>{{item.name}}</u-checkbox>
-									</u-checkbox-group>
-									
-								</view>
-						</view>
-				</view>
-				<view class="want">
-					<p>自有电桩数量</p>
-					<view class="radio-box">
-						
-									<view class="">
-										<u-radio-group v-model="text2"  active-color="#00B962">
-											<u-radio 
-											 
-												v-for="(item, index) in numlist" :key="index" 
-												:name="item.name"
-												
-												:disabled="item.disabled"
-											>
-												{{item.name}}
-											</u-radio>
-										</u-radio-group>
-									</view>
-						</view>
-				</view>
-			      <view class="hint">
-			      	<span style="color: red;">*</span>请保持手机畅通，我们将安排专人与您联系。您也可以拨打 
-					 <text class="tel-num" @click="calltel('400-8899-619')">400-8899-619</text>查询申请审核进度！
-			      </view>
-				 <u-button type="warning"  @click="submit"  >提交申请</u-button>
-			</view>
-
-
-		</view>
-
-	</view>
-</template>
-
-<script>
-	import * as API from '@/apis/friends.js'
-	import {
-		checkPhone
-	} from '@/utils'
-	export default{
-		data() {
-				return {
-					name:"",
-					address:"",
-					text1:[],
-					back:false,
-					text2:"5台以内",
-					subForm:{
-						phone:"",
-						openId:"",
-						type:"1",
-						content:""
-					},
-					elderMode:false,
-					customStyle:{
-						'font-size':'28rpx'
-					},
-					placeholderStyle:"font-size:28rpx",
-					typeList: [
-									{
-										name: '电动汽车充电桩（快充）',
-										checked: false,
-										disabled: false
-									},
-									{
-										name: '电动汽车充电桩（慢充）',
-										checked: false,
-										disabled: false
-									},
-									{
-										name: '电动摩托/自行车充电桩',
-										checked: false,
-										disabled: false
-									}
-								],
-								numlist: [
-												{
-													name: '5台以内',
-													disabled: false,
-													checked: true,
-												},
-												{
-													name: '5~10台',
-													disabled: false,
-													checked: false,
-												},
-												{
-													name: '10台以上',
-													disabled: false,
-													checked: false,
-												}
-											],
-											// u-radio-group的v-model绑定的值如果设置为某个radio的name，就会被默认选中
-											value: 'orange',
-							
-								
-				};
-				
-			},
-			onLoad(op) {
-				if(op.isback){
-					this.back=true;
-				}
-			},
-			methods:{
-				calltel(tel){
-					uni.makePhoneCall({
-						phoneNumber:tel //仅为示例
-					});
-				},
-				
-				submit(){
-				
-					var obj=[]
-					if(!this.name){
-						uni.showToast({
-							title:"请输入申请人姓名"
-						})
-						return
-					}
-					if(!this.subForm.phone){
-						uni.showToast({
-							title:"请输入联系电话"
-						})
-						return
-					}
-					var checkPhoneResult = checkPhone(this.subForm.phone);
-								
-					if (checkPhoneResult !== true) {
-						uni.showToast({
-							title: checkPhoneResult,
-						})
-						return;
-					}
-					if(!this.address){
-						uni.showToast({
-							title:"请填写详细位置"
-						})
-						return
-					}
-					obj.push({
-						name:"申请人姓名",
-						value:this.name,
-						type:"text"
-					})
-					obj.push({
-						name:"自有电桩地点",
-						value:this.address,
-						type:"text"
-					})
-					this.text1="";
-					this.text1b=false;
-				
-					var list1=this.typeList.map(item=>{
-						if(item.checked){
-							this.text1+="1"
-							this.text1b=true;
-						}else{
-							this.text1+="0"
-						}
-						return item.name
-					})
-					
-					//this.text2="";
-					var text2value="";
-					this.text2b=false;
-					var list2=this.numlist.map(item=>{
-						if(item.name==this.text2){
-							text2value+="1"
-								this.text2b=true;
-						}else{
-							text2value+="0"
-						}
-						return item.name
-					})
-					
-					if(!this.text1b){
-						uni.showToast({
-							title:"请至少勾选一项“自有电桩类型”"
-						})
-						return
-					}
-					if(!this.text2b){
-						uni.showToast({
-							title:"请至少勾选一项“自有电桩数量”"
-						})
-						return
-					}
-					obj.push({
-						name:"自有电桩类型",
-						value:this.text1,
-						type:"list",
-						list:list1
-					})
-					obj.push({
-						name:"自有电桩数量",
-						value:text2value,
-						type:"list",
-						list:list2
-					})
-					this.subForm.openId=this.carhelp.getOpenId();
-					this.subForm.content=JSON.stringify(obj);
-					//(this.subForm)
-					
-					uni.showLoading({
-						title: "加载中",
-						mask: true,
-					})		
-					API.submit(this.subForm).then((res) => {
-						uni.hideLoading()
-						uni.showModal({
-							showCancel:false,
-							title:"提示",
-							content:"提交成功！",
-							confirmText:"前往主页",
-							success() {
-								uni.reLaunch({
-									url:"/"
-								})
-							}
-						})
-						
-					}).catch(error => {
-						uni.showToast({
-							title: error,
-							icon: "none"
-						})
-					})
-				},
-				theme(type) {
-					
-				  if(type == 'elder')	
-				  {
-					document.getElementsByTagName('body')[0].setAttribute('data-theme',type);
-					 let data = {
-					 	"font-size":'32rpx', 
-					 	};
-					this.customStyle = data;
-					this.placeholderStyle = "font-size:32rpx";//data;
-				  }
-				  else
-				  {
-					document.getElementsByTagName('body')[0].setAttribute('data-theme',type);
-					 let data = {
-					 	"font-size":'28rpx'
-					 	};
-					this.customStyle = data;
-					this.placeholderStyle = "font-size:28rpx";//data;
-				  } 
-				}
-			},
-			onReady(){
-				this.elderMode = this.carhelp.get('getElderModeClass')  == '长辈模式';
-				if(this.elderMode)
-					this.theme('elder')
-				else
-					this.theme('standard')
-			}
-	}
-</script>
-
-<style>
-	page {
-		
-		background:url(../../static/img/earth_@2.png) no-repeat top center #00b962 ;
-		background-size: 100%;
-		background-position: 50% 4%
-	}
-</style>
-
-<style lang="scss" scoped>
-	@import "@/_theme.scss";
-	.all{
-		@include themeify{
-			font-size: themed('font-size1');
-		}
-	}
-	.main {
-		width: 100%;
-	    margin-top: 131px;
-		@include themeify{
- 			line-height: themed('font-size5');
-		}
-/*		line-height: 20px;*/
-		border-radius: 16px;
-	
-		padding: 0 28px 85px;
-
-		.main-content {
-			padding:24px 24px;
-			background-color: #fff;
-            border-radius: 16px;
-			.title{
-/*				height: 18px;*/
-				color: rgba(16, 16, 16, 100);
-				@include themeify{
-					font-size: themed('font-size4');
-					height: themed('font-size4');
-				}
-/*				font-size: 18px;*/
-				font-weight: 600;
-				
-			}
-			.text{
-				margin-top: 12px;
-				margin-bottom: 24px;
-			}
-			.text-box{
-				margin-top: 12px;
-				p{
-					margin-top: 10px;
-					@include themeify{
-						line-height: themed('font-size7');
-					}
-/*					line-height: 24px;*/
-					text-align: justify;
-				}
-			}
-		}
-		.application-form{
-			background-color: #fff;
-			 border-radius: 16px;
-			 margin-top: 24px;
-			  padding: 24px;
-			  .u-input{
-				  border-radius: 50px;
-				  background-color: rgba(232, 236, 234, 100);
-				  margin-top: 12px;
-				
-			  }
-			 /deep/.uni-input-input{
-			 			  margin: 20px;
-			 }
-			 /deep/.u-input__right-icon{
-			 			  margin-right: 10px;
-			 }
-			  p{
-				  @include themeify{
-				  	font-size: themed('font-size4');
-				  	line-height: themed('font-size4');
-				  	height: themed('font-size4');
-				  }
-/*			  				  height: 18px;
-							  line-height: 18px;*/
-			  				  color: rgba(16, 16, 16, 100);
-/*			  				  font-size: 18px;*/
-			  }
-			  
-			  .tel,.place,.type,.want{
-				  margin-top: 24px;
-			  }
-			  .textarea{
-				  width: 72.2vw;
-				  height: 140px;
-				  border-radius: 22px;
-				  background-color: rgba(232, 236, 234, 100);
-			      overflow-y: scroll;
-			
-				   margin-top: 12px;
-				  @include themeify{
-				  	font-size: themed('font-size2');
-				  	line-height: themed('font-size2');
-				  } 
-				 .uni-textarea-placeholder{
-				
-					 padding: 12px 20px;
-					
-					 @include themeify{
-					 	font-size: themed('font-size2');
-					 	line-height: themed('font-size2');
- 					 }
-				 }
-				 /deep/.uni-textarea-textarea{
-					 width: 90%;
-					 padding: 10px 20px;
-					  
-				 }
-				 /deep/.u-input__right-icon {
-					 display: none;
-				 }
-				
-			  }
-			  .type{
-			  	.checkbox{
-			  		margin-top: 12px;
-			  		/deep/.u-checkbox{
-			  			
-			  			margin-top: 4px;
-			  		}
-			  	}
-			  	
-			  }
-			  .want{
-				
-				  .radio-box{
-					  margin-top: 12px;
-				  }
-			  /deep/.u-radio{
-			  	width: 50% !important;
-				margin-top: 4px;
-			  }
-			  }
-			  .hint{
-			  	margin-top: 12px;
-			  	@include themeify{
-			  		font-size: themed('font-size2');
-			  		line-height: themed('font-size5'); 
-			  	}
-/*			  	font-size: 14px;
-			  	line-height: 20px;*/
-			  	text-align: justify;
-			  	.tel-num{
-			  		color: #9FC7FF;
-			  	}
-			  }
-			  /deep/.u-btn{
-			  	border-radius: 50px ;
-			  	margin-top: 24px;
-			  }
-		}
-
-	}
-</style>
+<template>
+	<view class="all">
+		<ujp-navbar :is-back="back" title="我要加盟" ></ujp-navbar>
+	
+		<view class="main">
+			<view class="main-content">
+				<p class="title">适合对象:</p>
+				<view class="text">
+					已经在经营充电桩业务的商家，可以申请加入“<text style="color: #e14173;">51充电联盟</text>”。
+				</view>
+				<p class="title">平台能为您提供：</p>
+				<view class="text-box">
+					<p>1.便捷的找桩、充电服务，提升用户体验。</p>
+					<p>2.获得更多的用户资源和运营支持，提高市场竞争力。</p>
+					<p>3.良好的平台背书,提高公信力</p>
+				</view>
+			</view>
+			<view class="application-form ">
+				<view class="name">
+					<p>申请人姓名</p>
+
+					<u-input   v-model="name" :customStyle="customStyle" :placeholderStyle="placeholderStyle" placeholder=""></u-input>
+				</view>
+				<view class="tel">
+					<p>联系电话</p>
+					<u-input :customStyle="customStyle"  v-model="subForm.phone" :placeholderStyle="placeholderStyle" placeholder=""></u-input>
+ 				</view>
+				<view class="place">
+					<p>自有电桩地点</p>
+				
+					<u-input class="textarea"  type="textarea" height="200"  v-model="address" placeholder="填写详细位置" ></u-input>
+				</view>
+				<view class="type">
+					<p>自有电桩类型</p>
+					<view class="checkbox">
+							<view class="">
+									<u-checkbox-group    active-color="#00B962">
+										<u-checkbox 
+										 
+											v-model="item.checked" 
+											v-for="(item, index) in typeList" :key="index" 
+											:name="item.name"
+										>{{item.name}}</u-checkbox>
+									</u-checkbox-group>
+									
+								</view>
+						</view>
+				</view>
+				<view class="want">
+					<p>自有电桩数量</p>
+					<view class="radio-box">
+						
+									<view class="">
+										<u-radio-group v-model="text2"  active-color="#00B962">
+											<u-radio 
+											 
+												v-for="(item, index) in numlist" :key="index" 
+												:name="item.name"
+												
+												:disabled="item.disabled"
+											>
+												{{item.name}}
+											</u-radio>
+										</u-radio-group>
+									</view>
+						</view>
+				</view>
+			      <view class="hint">
+			      	<span style="color: red;">*</span>请保持手机畅通，我们将安排专人与您联系。您也可以拨打 
+					 <text class="tel-num" @click="calltel('400-8899-619')">400-8899-619</text>查询申请审核进度！
+			      </view>
+				 <u-button type="warning"  @click="submit"  >提交申请</u-button>
+			</view>
+
+
+		</view>
+
+	</view>
+</template>
+
+<script>
+	import * as API from '@/apis/friends.js'
+	import {
+		checkPhone
+	} from '@/utils'
+	export default{
+		data() {
+				return {
+					name:"",
+					address:"",
+					text1:[],
+					back:false,
+					text2:"5台以内",
+					subForm:{
+						phone:"",
+						openId:"",
+						type:"1",
+						content:""
+					},
+					elderMode:false,
+					customStyle:{
+						'font-size':'28rpx'
+					},
+					placeholderStyle:"font-size:28rpx",
+					typeList: [
+									{
+										name: '电动汽车充电桩（快充）',
+										checked: false,
+										disabled: false
+									},
+									{
+										name: '电动汽车充电桩（慢充）',
+										checked: false,
+										disabled: false
+									},
+									{
+										name: '电动摩托/自行车充电桩',
+										checked: false,
+										disabled: false
+									}
+								],
+								numlist: [
+												{
+													name: '5台以内',
+													disabled: false,
+													checked: true,
+												},
+												{
+													name: '5~10台',
+													disabled: false,
+													checked: false,
+												},
+												{
+													name: '10台以上',
+													disabled: false,
+													checked: false,
+												}
+											],
+											// u-radio-group的v-model绑定的值如果设置为某个radio的name，就会被默认选中
+											value: 'orange',
+							
+								
+				};
+				
+			},
+			onLoad(op) {
+				if(op.isback){
+					this.back=true;
+				}
+			},
+			methods:{
+				calltel(tel){
+					uni.makePhoneCall({
+						phoneNumber:tel //仅为示例
+					});
+				},
+				
+				submit(){
+				
+					var obj=[]
+					if(!this.name){
+						uni.showToast({
+							title:"请输入申请人姓名"
+						})
+						return
+					}
+					if(!this.subForm.phone){
+						uni.showToast({
+							title:"请输入联系电话"
+						})
+						return
+					}
+					var checkPhoneResult = checkPhone(this.subForm.phone);
+								
+					if (checkPhoneResult !== true) {
+						uni.showToast({
+							title: checkPhoneResult,
+						})
+						return;
+					}
+					if(!this.address){
+						uni.showToast({
+							title:"请填写详细位置"
+						})
+						return
+					}
+					obj.push({
+						name:"申请人姓名",
+						value:this.name,
+						type:"text"
+					})
+					obj.push({
+						name:"自有电桩地点",
+						value:this.address,
+						type:"text"
+					})
+					this.text1="";
+					this.text1b=false;
+				
+					var list1=this.typeList.map(item=>{
+						if(item.checked){
+							this.text1+="1"
+							this.text1b=true;
+						}else{
+							this.text1+="0"
+						}
+						return item.name
+					})
+					
+					//this.text2="";
+					var text2value="";
+					this.text2b=false;
+					var list2=this.numlist.map(item=>{
+						if(item.name==this.text2){
+							text2value+="1"
+								this.text2b=true;
+						}else{
+							text2value+="0"
+						}
+						return item.name
+					})
+					
+					if(!this.text1b){
+						uni.showToast({
+							title:"请至少勾选一项“自有电桩类型”"
+						})
+						return
+					}
+					if(!this.text2b){
+						uni.showToast({
+							title:"请至少勾选一项“自有电桩数量”"
+						})
+						return
+					}
+					obj.push({
+						name:"自有电桩类型",
+						value:this.text1,
+						type:"list",
+						list:list1
+					})
+					obj.push({
+						name:"自有电桩数量",
+						value:text2value,
+						type:"list",
+						list:list2
+					})
+					this.subForm.openId=this.carhelp.getOpenId();
+					this.subForm.content=JSON.stringify(obj);
+					//(this.subForm)
+					
+					uni.showLoading({
+						title: "加载中",
+						mask: true,
+					})		
+					API.submit(this.subForm).then((res) => {
+						uni.hideLoading()
+						uni.showModal({
+							showCancel:false,
+							title:"提示",
+							content:"提交成功！",
+							confirmText:"前往主页",
+							success() {
+								uni.reLaunch({
+									url:"/"
+								})
+							}
+						})
+						
+					}).catch(error => {
+						uni.showToast({
+							title: error,
+							icon: "none"
+						})
+					})
+				},
+				theme(type) {
+					
+				  if(type == 'elder')	
+				  {
+					document.getElementsByTagName('body')[0].setAttribute('data-theme',type);
+					 let data = {
+					 	"font-size":'32rpx', 
+					 	};
+					this.customStyle = data;
+					this.placeholderStyle = "font-size:32rpx";//data;
+				  }
+				  else
+				  {
+					document.getElementsByTagName('body')[0].setAttribute('data-theme',type);
+					 let data = {
+					 	"font-size":'28rpx'
+					 	};
+					this.customStyle = data;
+					this.placeholderStyle = "font-size:28rpx";//data;
+				  } 
+				}
+			},
+			onReady(){
+				this.elderMode = this.carhelp.get('getElderModeClass')  == '长辈模式';
+				if(this.elderMode)
+					this.theme('elder')
+				else
+					this.theme('standard')
+			}
+	}
+</script>
+
+<style>
+	page {
+		
+		background:url(@/assets/static/img/earth_@2.png) no-repeat top center #00b962 ;
+		background-size: 100%;
+		background-position: 50% 4%
+	}
+</style>
+
+<style lang="scss" scoped>
+	@import "@/_theme.scss";
+	.all{
+		@include themeify{
+			font-size: themed('font-size1');
+		}
+	}
+	.main {
+		width: 100%;
+	    margin-top: 131px;
+		@include themeify{
+ 			line-height: themed('font-size5');
+		}
+/*		line-height: 20px;*/
+		border-radius: 16px;
+	
+		padding: 0 28px 85px;
+
+		.main-content {
+			padding:24px 24px;
+			background-color: #fff;
+            border-radius: 16px;
+			.title{
+/*				height: 18px;*/
+				color: rgba(16, 16, 16, 100);
+				@include themeify{
+					font-size: themed('font-size4');
+					height: themed('font-size4');
+				}
+/*				font-size: 18px;*/
+				font-weight: 600;
+				
+			}
+			.text{
+				margin-top: 12px;
+				margin-bottom: 24px;
+			}
+			.text-box{
+				margin-top: 12px;
+				p{
+					margin-top: 10px;
+					@include themeify{
+						line-height: themed('font-size7');
+					}
+/*					line-height: 24px;*/
+					text-align: justify;
+				}
+			}
+		}
+		.application-form{
+			background-color: #fff;
+			 border-radius: 16px;
+			 margin-top: 24px;
+			  padding: 24px;
+			  .u-input{
+				  border-radius: 50px;
+				  background-color: rgba(232, 236, 234, 100);
+				  margin-top: 12px;
+				
+			  }
+			 /deep/.uni-input-input{
+			 			  margin: 20px;
+			 }
+			 /deep/.u-input__right-icon{
+			 			  margin-right: 10px;
+			 }
+			  p{
+				  @include themeify{
+				  	font-size: themed('font-size4');
+				  	line-height: themed('font-size4');
+				  	height: themed('font-size4');
+				  }
+/*			  				  height: 18px;
+							  line-height: 18px;*/
+			  				  color: rgba(16, 16, 16, 100);
+/*			  				  font-size: 18px;*/
+			  }
+			  
+			  .tel,.place,.type,.want{
+				  margin-top: 24px;
+			  }
+			  .textarea{
+				  width: 72.2vw;
+				  height: 140px;
+				  border-radius: 22px;
+				  background-color: rgba(232, 236, 234, 100);
+			      overflow-y: scroll;
+			
+				   margin-top: 12px;
+				  @include themeify{
+				  	font-size: themed('font-size2');
+				  	line-height: themed('font-size2');
+				  } 
+				 .uni-textarea-placeholder{
+				
+					 padding: 12px 20px;
+					
+					 @include themeify{
+					 	font-size: themed('font-size2');
+					 	line-height: themed('font-size2');
+ 					 }
+				 }
+				 /deep/.uni-textarea-textarea{
+					 width: 90%;
+					 padding: 10px 20px;
+					  
+				 }
+				 /deep/.u-input__right-icon {
+					 display: none;
+				 }
+				
+			  }
+			  .type{
+			  	.checkbox{
+			  		margin-top: 12px;
+			  		/deep/.u-checkbox{
+			  			
+			  			margin-top: 4px;
+			  		}
+			  	}
+			  	
+			  }
+			  .want{
+				
+				  .radio-box{
+					  margin-top: 12px;
+				  }
+			  /deep/.u-radio{
+			  	width: 50% !important;
+				margin-top: 4px;
+			  }
+			  }
+			  .hint{
+			  	margin-top: 12px;
+			  	@include themeify{
+			  		font-size: themed('font-size2');
+			  		line-height: themed('font-size5'); 
+			  	}
+/*			  	font-size: 14px;
+			  	line-height: 20px;*/
+			  	text-align: justify;
+			  	.tel-num{
+			  		color: #9FC7FF;
+			  	}
+			  }
+			  /deep/.u-btn{
+			  	border-radius: 50px ;
+			  	margin-top: 24px;
+			  }
+		}
+
+	}
+</style>