V-deep

App.vue

@@ -1,5 +1,5 @@
-
-<script>
+
+<script>
 	
 	
 	  
@@ -13,36 +13,36 @@
 			}
 		},
 		onLoad() {
-		},
+		},
 		onLaunch: function() {
 			
-			
-		},
+			
+		},
 		onShow: function() {
-			
-		
+			
+		
 		},
 		onReady: function() {
 			console.log("aaa")
-		},
-		onHide: function() {
-			
+		},
+		onHide: function() {
+			
 		},
 		methods:{
 			
-		} 
-	}
-</script>
+		} 
+	}
+</script>
 <style lang="scss">
 	.springClass {
-		/deep/.u-tabbar__content {
+		::v-deep.u-tabbar__content {
 			background-image: url("@/assets/img/spring/indexTabbar.png");
 			background-size: 100% 100%;
 			background-position: center;
 			background-repeat: no-repeat;
 			border: none !important;
 		}
-		/deep/.u-tabbar__content::after {
+		::v-deep.u-tabbar__content::after {
 			
 			border: none !important;
 		}
@@ -57,20 +57,20 @@
 	/*每个页面公共css */
 	//@import 'static/css/style.css';
 	
-	@import '@/assets/font/iconfont.css';
-	@import '@/iconfont/iconfont.css';
-	
-	html, body {
-	  background-color: #F2F4F4;  
-	  margin: 0;
-	  padding: 0;
-	} ygff
-	// 后退图标
-	.back{
-		display: inline-block;
-		font-size: 18px;
-		float: left;
-		margin-left: 11px;
+	@import '@/assets/font/iconfont.css';
+	@import '@/iconfont/iconfont.css';
+	
+	html, body {
+	  background-color: #F2F4F4;  
+	  margin: 0;
+	  padding: 0;
+	} ygff
+	// 后退图标
+	.back{
+		display: inline-block;
+		font-size: 18px;
+		float: left;
+		margin-left: 11px;
 	}
 	.uni-icon-success-no-circle:before {
 	    content: "" !important ;
@@ -90,19 +90,19 @@
 		border-radius: 1px;
 	}
 	// @media screen and (min-width: 320px) {
-	//    /deep/.u-tabbar__content {
+	//    ::v-deep.u-tabbar__content {
 	// 		height: 45px!important;
 	//    }
 	// }
 	// @media screen and (min-width: 375px) {
-	//    /deep/.u-tabbar__content {
+	//    ::v-deep.u-tabbar__content {
 	// 		height: 55px!important;
 	//    }
 	// }
 	// @media screen and (min-width: 425px) {
-	//    /deep/.u-tabbar__content {
+	//    ::v-deep.u-tabbar__content {
 	// 		height: 65px!important;
 	//    }
-	// }
+	// }
 
 </style>

components/QuickRegistration.vue

@@ -408,7 +408,7 @@
 </script>
 
 <style  lang="scss" scoped>
-	/deep/.u-char-item {
+	::v-deep.u-char-item {
 		width: 60rpx !important;
 		height: 80rpx !important;
 		font-size: 36rpx !important;

config/.env.dev.ud.js

@@ -2,7 +2,7 @@ const UNI_APP = {
 	ProjectName :"优电联盟",
 	BASE_URL: 'https://youdian.hbjp.com.cn/charging-station-server/',
 	//
-	BASE_URL: 'http://charging.xiaoxinda.com/charging-station-test/',
+	//BASE_URL: 'http://charging.xiaoxinda.com/charging-station-test/',
 	//BASE_URL: 'https://youdian-test.hbjp.com.cn/charging-station-test/',
 	
 	//BASE_URL: 'http://192.168.77.162:8081/charging-station/' ,
@@ -26,6 +26,7 @@ const UNI_APP = {
 	//openId:"oSruR6dZcmSM4ATuweZ5fjHGQsiA",//ys
 	//openId:"oSruR6RWLdQp-HGmcQgXEy2tNUmw",//家桩
 	openId:"oSruR6fYa0yzdMsDinzNOlePTotk",//zq
+	openId:"oSruR6RXae3ZNpux_YN8o6U0xMhA",
 	//小鹏管家appid
 	//VUE_APP_WXAPPID:"wx7e70eb62a8459869",
 	branchParameter:"youdian",//team51,youdian

pages/MyInvoice/editInvoiceTitle.vue

@@ -168,17 +168,17 @@ export default {
 		color: rgba(238, 49, 56, 100);
 		font-size: 12px
 	}
-	/deep/.u-cell__value{
+	::v-deep.u-cell__value{
 		text-align: left;
 		margin-left: 8%;
 		font-size: 16px
 	}
 		
-	/deep/.u-switch{
+	::v-deep.u-switch{
 		margin: auto 0;
 		float: right;;
 	}
-	/deep/.u-btn{
+	::v-deep.u-btn{
 		width: 91.4%;
 		margin: 12px auto;
 		position: fixed;

pages/MyInvoice/invioceResult.vue

@@ -89,7 +89,7 @@ page{
 		font-size: 18px;
 	}
 }
-/deep/.u-btn{
+::v-deep.u-btn{
 	width: 91.4%;
 	position: fixed;
 	bottom: 0;

pages/MyInvoice/invoiceDetail.vue

@@ -166,17 +166,17 @@
 			margin-top: 4px;
 		}
 	}
-	/deep/.u-cell-box{
+	::v-deep.u-cell-box{
 		margin: 12px 0;
 		
 	}
-	/deep/.u-cell__value,/deep/.u-cell_title{
+	::v-deep.u-cell__value,::v-deep.u-cell_title{
 		font-size: 18px 
 	}
-	/deep/.u-cell_title{
+	::v-deep.u-cell_title{
 		color: #666666;
 	}
-	/deep/.u-cell__value{
+	::v-deep.u-cell__value{
 		color: #101010;
 	}
 	.color959595{

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="@/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;
-	}
+<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
+	}
+	::v-deep.u-scroll-box{
+		 width: 65.8% !important;
+		 margin: 0 auto;
+		 display: flex;
+		 
+	}
+	::v-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;
+		::v-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;
+				
+			}
+		}
+		::v-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

@@ -196,7 +196,7 @@
 			margin: auto 8px;
 		}
 	}
-	/deep/.u-btn{
+	::v-deep.u-btn{
 		width: 91.4%;
 		margin: 12px auto;
 		position: fixed;

pages/MyInvoice/issueInvoice.vue

@@ -223,13 +223,13 @@ font-size: 12px
 		}
 	}
 
-	/deep/.u-cell__value {
+	::v-deep.u-cell__value {
 		text-align: left;
 		margin-left: 41px;
 		font-size: 16px
 	}
 
-	/deep/.u-cell {
+	::v-deep.u-cell {
 		padding: 16px 0;
 	}
 

pages/article/articleDetails.vue

@@ -107,7 +107,7 @@
 			// margin-top: 13px;
 			// font-size: 14px;
 			padding-top: 8rpx;
-			/deep/img{
+			::v-deepimg{
 					margin: -6rpx auto;
 			}
 		

pages/bindingHomePile/homeInfo.vue

@@ -1,39 +1,39 @@
-<template>
-	<view>
-		
-			<ujp-navbar :title="pageTitle" :startGz="false" >
-				<view class="iconfont service" @click="openModal">
-					&#xe60d;
-				</view>
-			</ujp-navbar>
+<template>
+	<view>
+		
+			<ujp-navbar :title="pageTitle" :startGz="false" >
+				<view class="iconfont service" @click="openModal">
+					&#xe60d;
+				</view>
+			</ujp-navbar>
 		<view class="main-back">
 			
-		</view>
-			<view class="main">
-				<view class="main-head">
-
-
-				
-
-					<view class="text" >
-						<view class="text-1">
-							充电桩名称
-						</view>
-						 
-						<view class="text-2" >
-							{{applyList.length?applyList[0].chargingName:''}}
-						</view>
-					</view>
-
-					<view class="charge-img">
-						<img src="@/assets/img/charge.png" alt="">
-					</view>
-				</view>
-
-
-
-				<view class="charging-info" >
-					<view class="info-title">
+		</view>
+			<view class="main">
+				<view class="main-head">
+
+
+				
+
+					<view class="text" >
+						<view class="text-1">
+							充电桩名称
+						</view>
+						 
+						<view class="text-2" >
+							{{applyList.length?applyList[0].chargingName:''}}
+						</view>
+					</view>
+
+					<view class="charge-img">
+						<img src="@/assets/img/charge.png" alt="">
+					</view>
+				</view>
+
+
+
+				<view class="charging-info" >
+					<view class="info-title">
 						<view class="name">设备信息</view>
 						<view class="value">
 							<view class="pack-up" v-show="!listShow" @click="listShow=true">
@@ -42,8 +42,8 @@
 							<view class="pack-up" v-if="listShow" @click="listShow=false">
 								展开<text class="iconfont">&#xe62c;</text>
 							</view>
-						</view>
-					</view>
+						</view>
+					</view>
 					<view class="table">
 						<view class="row">
 							<view class="name">设备型号</view>
@@ -63,16 +63,16 @@
 						<view class="row">
 							<view class="name">防护等级</view>
 							<view class="value">{{obj.protectionGrade}}</view>
-						</view>
-						
-						<view class="row">
-							<view class="name">输入电压</view>
-							<view class="value">{{obj.inputVoltage}}</view>
-						</view>
-						<view class="row">
-							<view class="name">输出电压</view>
-							<view class="value">{{obj.outputVoltage}}</view>
-						</view>
+						</view>
+						
+						<view class="row">
+							<view class="name">输入电压</view>
+							<view class="value">{{obj.inputVoltage}}</view>
+						</view>
+						<view class="row">
+							<view class="name">输出电压</view>
+							<view class="value">{{obj.outputVoltage}}</view>
+						</view>
 						
 						<view class="row">
 							<view class="name">输出电流</view>
@@ -81,12 +81,12 @@
 						<view class="row">
 							<view class="name">输出功率</view>
 							<view class="value">{{obj.outputPower}}</view>
-						</view>
-						
-						<view class="row">
-							<view class="name">生产日期</view>
-							<view class="value">{{obj.manufactureTime}}</view>
-						</view>
+						</view>
+						
+						<view class="row">
+							<view class="name">生产日期</view>
+							<view class="value">{{obj.manufactureTime}}</view>
+						</view>
 						
 						<view class="row">
 							<view class="name">标准依据</view>
@@ -95,24 +95,24 @@
 						<view class="row">
 							<view class="name">联网卡号</view>
 							<view class="value">{{obj.trafficCardNumber}}</view>
-						</view>
-						<view class="row">
-							<view class="name">资费标准</view>
-							<view class="value">{{obj.tariffStandard}}</view>
+						</view>
+						<view class="row">
+							<view class="name">资费标准</view>
+							<view class="value">{{obj.tariffStandard}}</view>
 						</view>
 						<view class="row">
 							<view class="name">设备启动时间</view>
 							<view class="value">{{obj.bindingTime}}</view>
-						</view>
-						<view class="row">
-							<view class="name">设备质保期</view>
-							<view class="value">{{obj.shelfLife}}</view>
+						</view>
+						<view class="row">
+							<view class="name">设备质保期</view>
+							<view class="value">{{obj.shelfLife}}</view>
 						</view>
 						</template>
 						
 					</view>
 				
-				</view>	
+				</view>	
 					
 					<view class="charging-info" >
 						<view class="info-title">
@@ -179,8 +179,8 @@
 							
 						</view>
 					
-					</view>	
-					
+					</view>	
+					
 			</view>
 			<u-popup v-model="popupShowWL" mode="bottom" :closeable="true"  border-radius="30" >
 				<view class="popup-screen">
@@ -249,16 +249,16 @@
 			
 			</u-modal>
 			<img id="qrcode" style="display: none;">
-			
-			<u-popup v-model="popupShow" mode="bottom" :closeable="true"  border-radius="30" >
+			
+			<u-popup v-model="popupShow" mode="bottom" :closeable="true"  border-radius="30" >
 				<view class="popup-screen">
-					<view class="popup-title">{{vipUser.id?'修改':'添加'}}白名单信息</view>
+					<view class="popup-title">{{vipUser.id?'修改':'添加'}}白名单信息</view>
 					<view style="padding: 4px;" >白名单车主姓名<span style="color: red;">*</span></view>
 					<u-input :customStyle="customStyle"  v-model="vipUser.name"
-					placeholder="白名单车主姓名(必填)"></u-input>
+					placeholder="白名单车主姓名(必填)"></u-input>
 					<view  style="padding: 4px;">白名单车主手机号码<span style="color: red;">*</span></view>
 					<u-input :customStyle="customStyle" type="number" v-model="vipUser.phone"
-					placeholder="白名单车主手机号码(必填)"></u-input>
+					placeholder="白名单车主手机号码(必填)"></u-input>
 					<view style="padding: 4px;">白名单车主车牌号</view>
 					<u-input :customStyle="customStyle"   v-model="vipUser.carNum"
 					placeholder="白名单车主车牌号"></u-input>
@@ -276,41 +276,41 @@
 					
 					
 				</view>
-			</u-popup>
+			</u-popup>
 			<view class="botton">
 				<button class="bottonBtn" @click="bindingHomePile">开始充电</button>
 			
-			</view>
+			</view>
 		 <u-modal v-model="delShow" @confirm="confirmDelete" confirm-color="#fa3534" :show-cancel-button="true" ref="uModal"  title="删除白名单用户"
 		 	content="是否删除当前白名单用户?" confirm-text="删除"></u-modal>
-			
+			
 			<u-modal v-model="show" @confirm="confirmPhone" :confirm-text="confirmText" confirm-color="#606266"
 				:show-cancel-button="true" ref="uModal" :asyncClose="true" :title="title" :content="consumerPhone"
 				:content-style="{fontSize: '24px',color: '#101010'}"></u-modal>
-		
-	</view>
-</template>
-
+		
+	</view>
+</template>
+
 <script>
-	
+	
 	import * as API from '@/apis/mall.js'
 	import * as WxJsApi from '@/utils/wxJsApi.js'
-	import QRCode from 'qrcodejs2'
-	import * as API_apply from '@/apis/apply.js'
-	import {
-		convertCanvasToImage
+	import QRCode from 'qrcodejs2'
+	import * as API_apply from '@/apis/apply.js'
+	import {
+		convertCanvasToImage
 	} from '@/utils'
 	import {
 		wxPayJs
-	} from '@/utils/wxpay'
-
-	export default {
-		components: {
-		
-		},
-		data() {
+	} from '@/utils/wxpay'
+
+	export default {
+		components: {
+		
+		},
+		data() {
 			return {
-				pageTitle:"充电枪详情",
+				pageTitle:"充电枪详情",
 				show:false,
 				consumerPhone:"",
 				title: '联系客服',
@@ -351,14 +351,14 @@
 						name:"3个月",
 						price:15
 					}
-				]
-			}
-		},
-
-		computed: {
-			
-			
-		},
+				]
+			}
+		},
+
+		computed: {
+			
+			
+		},
 		onShow() {
 			
 		
@@ -374,7 +374,7 @@
 		onLoad(op) {
 			this.myApplyList()
 			this.trafficCardMallList()
-		},
+		},
 		methods: {
 			confirmzfb(){
 				this.popupShowWL=false;
@@ -537,9 +537,9 @@
 				this.vipUser=item;
 				this.vipUser.name=item.userName
 				var item=this.applyList[0]
-				this.vipUser.stationId=item.stationId
-				if(this.vipUser.carNum==0){
-					this.vipUser.carNum=''
+				this.vipUser.stationId=item.stationId
+				if(this.vipUser.carNum==0){
+					this.vipUser.carNum=''
 				}
 			},
 			addUser(){
@@ -656,17 +656,17 @@
 			},
 			openModal() {
 				this.show = true;
-			},
-			
-		},
-
-		
-	}
-</script>
-
-<style lang="scss">
-	
-
+			},
+			
+		},
+
+		
+	}
+</script>
+
+<style lang="scss">
+	
+
 	// 支付方式
 	.payment {
 		margin: 24rpx;
@@ -701,58 +701,58 @@
 				}
 			}
 	
-			/deep/.uni-radio-input-checked {
+			::v-deep.uni-radio-input-checked {
 				background-color: #00b962 !important;
 	
 			}
 	
-			/deep/.uni-radio-input {
+			::v-deep.uni-radio-input {
 				width: 40rpx !important;
 				height: 40rpx !important;
 			}
 		}
 	
-	}
-
-	page {
-		background-color: #F6F8F8;
-		padding-bottom: 100px;
-	}
-
-	.service {
-		font-size: 24px;
-		color: #101010;
-		position: absolute;
-		right: 16px;
-	}
-
-	
-
+	}
+
+	page {
+		background-color: #F6F8F8;
+		padding-bottom: 100px;
+	}
+
+	.service {
+		font-size: 24px;
+		color: #101010;
+		position: absolute;
+		right: 16px;
+	}
+
+	
+
 	.main {
 		    position: absolute;
-		    top: 80rpx;
+		    top: 80rpx;
 		padding: 32rpx ;
-		padding-bottom: 140rpx;
-		//background-image: linear-gradient(#D6EEDC, #F6F8F8);
-		.text-1 {
+		padding-bottom: 140rpx;
+		//background-image: linear-gradient(#D6EEDC, #F6F8F8);
+		.text-1 {
 			color: rgba(255, 255, 255, 0.8);
 			font-size:36rpx;
-			    margin-top: 20rpx;
-
-		}
-
-		.text-2 {
+			    margin-top: 20rpx;
+
+		}
+
+		.text-2 {
 			color: rgba(255, 255, 255, 1);
 			font-size: 40rpx;
-			    margin-top: 10rpx;
-		}
-
+			    margin-top: 10rpx;
+		}
+
 		.charging-info {
-			    position: relative;
-			background-color: #fff;
-			margin: 20rpx auto;
-			border-radius: 12px;
-			padding: 20rpx 32rpx;
+			    position: relative;
+			background-color: #fff;
+			margin: 20rpx auto;
+			border-radius: 12px;
+			padding: 20rpx 32rpx;
 			.info-title{
 				    display: flex;
 				    justify-content: space-between;
@@ -771,7 +771,7 @@
 						font-size: 28rpx;
 						color: rgba(119, 119, 119, 1);
 					}
-			}
+			}
 			.pack-up {
 				
 				
@@ -782,33 +782,33 @@
 				display: flex;
 				    align-items: flex-start;
 				font-size: 24rpx;
-			}
-		}
-	}
-
-	.main-head {
-		display: flex;
+			}
+		}
+	}
+
+	.main-head {
+		display: flex;
 		justify-content: space-between;
-		
-	}
+		
+	}
 	.main-back{
 		background: linear-gradient(180deg, rgba(0,185,98,1) 18%,rgba(137,218,182,1) 70%,rgba(242,244,246,1) 100%);
 		height: 360rpx;
-	}
-	.charge-img {
-
-		
-		//overflow: hidden;
-		height: 160rpx;
-		margin-right: 40rpx;
-		// margin-right: 16rpx;
-		img {
+	}
+	.charge-img {
+
+		
+		//overflow: hidden;
+		height: 160rpx;
+		margin-right: 40rpx;
+		// margin-right: 16rpx;
+		img {
 			//width: 65%;
 			
-			width: 100rpx;
-		}
-	}
-	
+			width: 100rpx;
+		}
+	}
+	
 	
 	// 尾部
 	.botton {
@@ -927,5 +927,5 @@
 				}
 			}
 		}
-	}
-</style>
+	}
+</style>

pages/cardBag/cardBag.vue

@@ -1,237 +1,237 @@
-<template>
-	<view>
-		<ujp-navbar title="我的卡包" bkUrl="/pages/user/index" ></ujp-navbar>
-		<view class="tabs">
-			<u-tabs bar-width="80" active-color="#333333" inactive-color="#999999" :list="list" :is-scroll="false"
-				:current="current" @change="change"></u-tabs>
-		</view>
-		<view class="main" :class="{
-			opacityClass:show
-		}">
-
-			<view class="discount-card" v-if="current==1" v-for="(item,i) in  businessVipList"
-				@click="gotoUrl('pages/user/company-vip?id='+item.vipUser.platform)" :key="i">
-				<view class="name">
-
-					<img src="../../assets/img/corporateMember.png" alt="">
-
-				</view>
-
-				<view class="progress">
-					<view class="time">
-						{{item.vipUser.platformN}}
-					</view>
-					<view class="electric-quantity" v-if="item.vipUser.entAccountEnabled&&item.enterpriseAccount" >
-						企业账户余额：{{item.enterpriseAccount.totalAmount?item.enterpriseAccount.totalAmount.toFixed(2):'0.00'}}元
-
-					</view>
-
-				</view>
-
-			</view>
-
-
-			<template v-for="(item,i) in showList">
-
-
+<template>
+	<view>
+		<ujp-navbar title="我的卡包" bkUrl="/pages/user/index" ></ujp-navbar>
+		<view class="tabs">
+			<u-tabs bar-width="80" active-color="#333333" inactive-color="#999999" :list="list" :is-scroll="false"
+				:current="current" @change="change"></u-tabs>
+		</view>
+		<view class="main" :class="{
+			opacityClass:show
+		}">
+
+			<view class="discount-card" v-if="current==1" v-for="(item,i) in  businessVipList"
+				@click="gotoUrl('pages/user/company-vip?id='+item.vipUser.platform)" :key="i">
+				<view class="name">
+
+					<img src="../../assets/img/corporateMember.png" alt="">
+
+				</view>
+
+				<view class="progress">
+					<view class="time">
+						{{item.vipUser.platformN}}
+					</view>
+					<view class="electric-quantity" v-if="item.vipUser.entAccountEnabled&&item.enterpriseAccount" >
+						企业账户余额：{{item.enterpriseAccount.totalAmount?item.enterpriseAccount.totalAmount.toFixed(2):'0.00'}}元
+
+					</view>
+
+				</view>
+
+			</view>
+
+
+			<template v-for="(item,i) in showList">
+
+
 				<view class="discount-card"  :class="{
 					'card-type-4':item.cardType==4
 				}"
-				 @click="gotocardDetails(item)" :key="i+'b'">
-					<view class="name" v-if="item.classify==1">
-
-						<img src="@/assets/img/monthCard.png" alt="">
-
+				 @click="gotocardDetails(item)" :key="i+'b'">
+					<view class="name" v-if="item.classify==1">
+
+						<img src="@/assets/img/monthCard.png" alt="">
+
 					</view>
 					<view class="name" v-else-if="item.cardType==4">
 					
 						{{projectName}}{{item.cardName}}
 					
-					</view>
-					<view class="name" v-else-if="item.classify==2">
-
-						<img v-if="item.serviceFeeDiscountRate==60" src="@/assets/img/0.6off.png" alt="">
-						<img v-else-if="item.serviceFeeDiscountRate==50" src="@/assets/img/halfoff.png" alt="">
-						<img v-else src="@/assets/img/monthCard.png" alt="">
-					</view>
-					<view class="progress">
-						<template v-if="current==0">
-							<view class="time">
-								<span v-if="item.classify==1">服务费全免</span>
-								<span
-									v-if="item.classify==2">可用{{item.chargeDegreeLimit}}度</span>（有效期{{setValidity(item.periodOfValidity)}}）
-							</view>
-							<view class="electric-quantity">
-								发卡日期：{{item.createTime.substring(0,10)}}
-							</view>
-						</template>
-						<template v-else>
-
-							<view class="time">
-								{{thisendTime(item.endTime)}}到期 剩余{{setValidity(thisdaysDistance(item.endTime))}}
-							</view>
-							<view class="electric-quantity" v-if="item.classify==2">
-								已用{{item.chargedDegree?item.chargedDegree.toFixed(0):0.00}}度 /
-								共{{item.chargeDegreeLimit}}度
-							</view>
-						</template>
-
-					</view>
-					<ujp-line-progress v-if="current!=0" active-color="#2979ff" 
+					</view>
+					<view class="name" v-else-if="item.classify==2">
+
+						<img v-if="item.serviceFeeDiscountRate==60" src="@/assets/img/0.6off.png" alt="">
+						<img v-else-if="item.serviceFeeDiscountRate==50" src="@/assets/img/halfoff.png" alt="">
+						<img v-else src="@/assets/img/monthCard.png" alt="">
+					</view>
+					<view class="progress">
+						<template v-if="current==0">
+							<view class="time">
+								<span v-if="item.classify==1">服务费全免</span>
+								<span
+									v-if="item.classify==2">可用{{item.chargeDegreeLimit}}度</span>（有效期{{setValidity(item.periodOfValidity)}}）
+							</view>
+							<view class="electric-quantity">
+								发卡日期：{{item.createTime.substring(0,10)}}
+							</view>
+						</template>
+						<template v-else>
+
+							<view class="time">
+								{{thisendTime(item.endTime)}}到期 剩余{{setValidity(thisdaysDistance(item.endTime))}}
+							</view>
+							<view class="electric-quantity" v-if="item.classify==2">
+								已用{{item.chargedDegree?item.chargedDegree.toFixed(0):0.00}}度 /
+								共{{item.chargeDegreeLimit}}度
+							</view>
+						</template>
+
+					</view>
+					<ujp-line-progress v-if="current!=0" active-color="#2979ff" 
 						:percent="thispercent(item)"></ujp-line-progress>
 						
-						
-					<img class="corner-mark" v-if="current==0" src="@/assets/img/nonactivated.png" alt="">
-
-				</view>
-
-			</template>
-
-
-			<view class="carNone" v-if="current==1&&businessVipList.length==0&&showList.length==0">
-				<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="@/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="@/assets/static/img/暂无数据-缺省页.png" alt="">
-				<p class="oldTextjp2" oldstyle="font-size: 18px;">暂无数据</p>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import * as API from '@/apis/index.js'
-	import {
-		newDate,
-		daysDistance
-
-	} from '@/utils'
-	export default {
-		data() {
+						
+					<img class="corner-mark" v-if="current==0" src="@/assets/img/nonactivated.png" alt="">
+
+				</view>
+
+			</template>
+
+
+			<view class="carNone" v-if="current==1&&businessVipList.length==0&&showList.length==0">
+				<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="@/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="@/assets/static/img/暂无数据-缺省页.png" alt="">
+				<p class="oldTextjp2" oldstyle="font-size: 18px;">暂无数据</p>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import * as API from '@/apis/index.js'
+	import {
+		newDate,
+		daysDistance
+
+	} from '@/utils'
+	export default {
+		data() {
 			return {
-				show:false,
-				list: [ {
-					name: '未激活',
-					count: 0
+				show:false,
+				list: [ {
+					name: '未激活',
+					count: 0
 				},
-				{
-					name: '生效中'
-				}, {
-					name: '已过期'
+				{
+					name: '生效中'
+				}, {
+					name: '已过期'
 				}],
 				
-				
-				expireUserCardList: [],
-				cardList: [],
-				pageIndex: 1,
-				recordsTotal: 0,
-				current: 0,
-				businessVipList: [],
-				userCard: null,
-				notActiveCardList: [],
-			}
-		},
-		computed: {
-			showList() {
-				if (this.current == 1) {
-
-					return this.cardList
-				}
-				if (this.current == 2) {
-
-					return this.expireUserCardList
-				}
-				if (this.current == 0) {
-					return this.notActiveCardList
-				}
-				return []
-			},
-			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 = newDate(str).getTime();
-
-					if (date < date2) {
-
-						return true;
-					}
-				}
-				return false
-			}
-		},
-		onReady() {
-
-
-			
-
+				
+				expireUserCardList: [],
+				cardList: [],
+				pageIndex: 1,
+				recordsTotal: 0,
+				current: 0,
+				businessVipList: [],
+				userCard: null,
+				notActiveCardList: [],
+			}
+		},
+		computed: {
+			showList() {
+				if (this.current == 1) {
+
+					return this.cardList
+				}
+				if (this.current == 2) {
+
+					return this.expireUserCardList
+				}
+				if (this.current == 0) {
+					return this.notActiveCardList
+				}
+				return []
+			},
+			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 = newDate(str).getTime();
+
+					if (date < date2) {
+
+						return true;
+					}
+				}
+				return false
+			}
+		},
+		onReady() {
+
+
+			
+
 		},onShow() {
 			this.getChargeList();
-		},
+		},
 		onLoad() {
 			
-		},
-		methods: {
-			gotocardDetails(item) {
-
-				this.carhelp.set("cardDetails-info", item)
-				uni.navigateTo({
-					url: '/pages/cardBag/cardDetail?id=' + item.id
-				})
-
-			},
-			thisdaysDistance(endTime) {
-
-				var date = new Date()
-				var date2 = newDate(endTime);
-				return daysDistance(date, date2)
-
+		},
+		methods: {
+			gotocardDetails(item) {
+
+				this.carhelp.set("cardDetails-info", item)
+				uni.navigateTo({
+					url: '/pages/cardBag/cardDetail?id=' + item.id
+				})
+
 			},
-			
-			getChargeList() {
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-
-				API.personCardList({
-
-				}).then((res) => {
-					uni.hideLoading();
-					this.cardList = res.data.cardList;
-					this.notActiveCardList = res.data.notActiveCardList;
+			thisdaysDistance(endTime) {
+
+				var date = new Date()
+				var date2 = newDate(endTime);
+				return daysDistance(date, date2)
+
+			},
+			
+			getChargeList() {
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+
+				API.personCardList({
+
+				}).then((res) => {
+					uni.hideLoading();
+					this.cardList = res.data.cardList;
+					this.notActiveCardList = res.data.notActiveCardList;
 					this.list[0].count = this.notActiveCardList.length;
 					if(this.notActiveCardList.length==0){
 						this.current=1
-					}
-					this.expireUserCardList = res.data.expireUserCardList;
-					//this.recordsTotal = res.data.recordsTotal;
-					this.businessVipList = res.data.memberCardList;
-
-
-
-				}).catch(error => {
-					uni.showToast({
-						title: error,
-						icon: "none"
-					})
-				})
-			},
-			thisendTime(endTime) {
-				if (endTime) {
-					var reg = new RegExp('-', 'gi')
-					var str = endTime.substring(0, 10).replace(reg, '.')
-					return str
-				}
-				return ''
-			},
+					}
+					this.expireUserCardList = res.data.expireUserCardList;
+					//this.recordsTotal = res.data.recordsTotal;
+					this.businessVipList = res.data.memberCardList;
+
+
+
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+			},
+			thisendTime(endTime) {
+				if (endTime) {
+					var reg = new RegExp('-', 'gi')
+					var str = endTime.substring(0, 10).replace(reg, '.')
+					return str
+				}
+				return ''
+			},
 			thispercent(userCard) {
 				if(userCard.classify==1){
 					var k1=daysDistance(userCard.startTime, userCard.endTime)
@@ -253,130 +253,130 @@
 					return p.toFixed(0)
 				}else{
 					return 0
-				}
-				
-			},
-
-			change(index) {
-				this.current = index;
-
-			}
-		}
-	}
-</script>
-
-<style scoped lang="scss">
-	.opacityClass {
-		opacity: 0.2;
-	}
-
-	.carNone {
-		display: flex;
-		flex-direction: column;
-		justify-content: center;
-		align-items: center;
-
-		img {
-			width: 100%;
-			height: 100%;
-		}
-
-		p {
-			margin-top: -60px;
-		}
-	}
-
-	/deep/.u-tab-bar {
-		background-color: #00B962 !important;
-	}
-
-	.main {
-		padding: 0 32rpx;
-
-		.monthly-payment,
-		.mcorporate-member {
-			height: 160rpx;
-			border-radius: 8px;
-			background-color: rgba(55, 59, 80, 1);
-			padding-left: 24rpx;
-			margin-top: 24rpx;
-			display: flex;
-			align-items: center;
-
-			.icon {
-				width: 80rpx;
-				height: 80rpx;
-
-				img {
-					width: 100%;
-				}
-			}
-
-			.infos {
-				margin-left: 16rpx;
-
-				.name {
-					color: rgba(225, 192, 130, 1);
-					font-size: 32rpx;
-				}
-
-				.date {
-					color: rgba(211, 185, 134, 1);
-					font-size: 24rpx;
-				}
-
-				.company {
-					color: rgba(204, 204, 204, 1);
-					font-size: 24rpx;
-				}
-
-				.balance {
-					color: rgba(219, 219, 219, 1);
-					font-size: 24rpx;
-
-				}
-			}
-		}
-
-		.discount-card {
-			position: relative;
+				}
+				
+			},
+
+			change(index) {
+				this.current = index;
+
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.opacityClass {
+		opacity: 0.2;
+	}
+
+	.carNone {
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+
+		img {
+			width: 100%;
+			height: 100%;
+		}
+
+		p {
+			margin-top: -60px;
+		}
+	}
+
+	::v-deep.u-tab-bar {
+		background-color: #00B962 !important;
+	}
+
+	.main {
+		padding: 0 32rpx;
+
+		.monthly-payment,
+		.mcorporate-member {
+			height: 160rpx;
+			border-radius: 8px;
+			background-color: rgba(55, 59, 80, 1);
+			padding-left: 24rpx;
+			margin-top: 24rpx;
+			display: flex;
+			align-items: center;
+
+			.icon {
+				width: 80rpx;
+				height: 80rpx;
+
+				img {
+					width: 100%;
+				}
+			}
+
+			.infos {
+				margin-left: 16rpx;
+
+				.name {
+					color: rgba(225, 192, 130, 1);
+					font-size: 32rpx;
+				}
+
+				.date {
+					color: rgba(211, 185, 134, 1);
+					font-size: 24rpx;
+				}
+
+				.company {
+					color: rgba(204, 204, 204, 1);
+					font-size: 24rpx;
+				}
+
+				.balance {
+					color: rgba(219, 219, 219, 1);
+					font-size: 24rpx;
+
+				}
+			}
+		}
+
+		.discount-card {
+			position: relative;
 			
-			
-			.corner-mark {
-				width: 112rpx;
-				height: 112rpx;
-				position: absolute;
-				top: 0;
-				right: 0;
-			}
-
-			border-radius: 8px;
-			background-color: rgba(55, 59, 80, 1);
-			padding: 24rpx;
-			margin-top: 24rpx;
-
-			.name {
-				color: rgba(255, 255, 255, 1);
-				font-size: 32rpx;
-
-				img {
-					width: 262rpx;
-					height: 56rpx;
-				}
-			}
-
-			.progress {
-				display: flex;
-				justify-content: space-between;
-				color: rgba(219, 219, 219, 1);
-				font-size: 24rpx;
-				margin-bottom: 16rpx;
-			}
-
-			/deep/.u-active {
-				background: linear-gradient(84.49deg, rgba(59, 182, 254, 1) 4.25%, rgba(0, 185, 98, 1) 95.02%);
+			
+			.corner-mark {
+				width: 112rpx;
+				height: 112rpx;
+				position: absolute;
+				top: 0;
+				right: 0;
+			}
+
+			border-radius: 8px;
+			background-color: rgba(55, 59, 80, 1);
+			padding: 24rpx;
+			margin-top: 24rpx;
+
+			.name {
+				color: rgba(255, 255, 255, 1);
+				font-size: 32rpx;
+
+				img {
+					width: 262rpx;
+					height: 56rpx;
+				}
 			}
-			
+
+			.progress {
+				display: flex;
+				justify-content: space-between;
+				color: rgba(219, 219, 219, 1);
+				font-size: 24rpx;
+				margin-bottom: 16rpx;
+			}
+
+			::v-deep.u-active {
+				background: linear-gradient(84.49deg, rgba(59, 182, 254, 1) 4.25%, rgba(0, 185, 98, 1) 95.02%);
+			}
+			
 		}
 		
 		.discount-card.card-type-4{
@@ -394,6 +394,6 @@
 					color: #fff;
 			}
 			
-		}
-	}
+		}
+	}
 </style>

pages/cardBag/getCard.vue

@@ -265,7 +265,7 @@
 	
 	
 	}
-/deep/.u-model__content__message{
+::v-deep.u-model__content__message{
 	color: #333333;
 	font-size: 32rpx
 }

pages/cardBag/nonactivatedCard.vue

@@ -292,7 +292,7 @@
 	
 	
 	}
-/deep/.u-model__content__message{
+::v-deep.u-model__content__message{
 	color: #333333;
 	font-size: 32rpx
 }

pages/discountCard/confirmOrder.vue

@@ -251,11 +251,11 @@ show: true,
 					}
 				}
 			}
-			/deep/.uni-radio-input{
+			::v-deep.uni-radio-input{
 				width: 40rpx;
 				height: 40rpx;
 			}
-			/deep/.uni-radio-input-checked{
+			::v-deep.uni-radio-input-checked{
 				background-color: #00B962 !important;
 				    border-color: #00B962 !important;
 			}

pages/discountCard/productDetails.vue

@@ -13,9 +13,9 @@
 				</view>
 				<view class="price" style="font-style: italic;" v-if="detail.id">
 					￥{{detail.price}}元
-				</view>
-				<view class="price"  style="    color: #777777;" v-else>
-					请选择规格
+				</view>
+				<view class="price"  style="    color: #777777;" v-else>
+					请选择规格
 				</view>
 				<!-- 使用范围 -->
 				<view class="usable-range">
@@ -41,10 +41,10 @@
 				</view>
 				<view class="value" @click="show=true" v-if="detail.id">
 					可用{{detail.chargeDegreeLimit}}度（有效期{{setValidity(detail.periodOfValidity)}}） <u-icon name="arrow-right" color="#999" size="28"></u-icon>
-				</view>
-				<view class="value" v-else @click="show=true" style="    color: #777777;">
-					请选择规格 <u-icon name="arrow-right" color="#999" size="28"></u-icon>
-				</view>
+				</view>
+				<view class="value" v-else @click="show=true" style="    color: #777777;">
+					请选择规格 <u-icon name="arrow-right" color="#999" size="28"></u-icon>
+				</view>
 				
 			</view>
 			
@@ -79,9 +79,9 @@
 					</view>
 				</view>
 				<view class="priceMain" >
-					<view class="price"  v-for="(item,i) in cardList" 
-					
-					@click="checkboxChange(item.monthlyRentCard)"
+					<view class="price"  v-for="(item,i) in cardList" 
+					
+					@click="checkboxChange(item.monthlyRentCard)"
 					:key="i" >
 						<view class="item">
 							<text>{{item.monthlyRentCard.price}}</text>元
@@ -444,10 +444,10 @@
 									<!-- 已选：可用338度（有效期30天） -->
 									已选：可用{{detail.chargeDegreeLimit}}度（有效期{{setValidity(detail.periodOfValidity)}}） 
 									
-								</view>
-								<view class="price-detail"  v-else style="    color: rgb(119, 119, 119);" >
-									<!-- 已选：可用338度（有效期30天） -->
-									请选择规格
+								</view>
+								<view class="price-detail"  v-else style="    color: rgb(119, 119, 119);" >
+									<!-- 已选：可用338度（有效期30天） -->
+									请选择规格
 								</view>
 							</view>
 						</view>
@@ -690,15 +690,15 @@
 				}
 			}
 		},
-		methods: {
-			openPayModel(){
-				if (!this.cardId) {
-					uni.showToast({
-						title:"请选择产品规格"
-					})
-					return
-				}
-				this.showPay=true;
+		methods: {
+			openPayModel(){
+				if (!this.cardId) {
+					uni.showToast({
+						title:"请选择产品规格"
+					})
+					return
+				}
+				this.showPay=true;
 			},
 			openModal() {
 				//this.show3 = true;
@@ -756,9 +756,9 @@
 			checkboxChange(monthlyRentCard) {
 			
 				this.detail = monthlyRentCard;
-				this.cardId = monthlyRentCard.id
-				uni.showToast({
-					title: "已选中 "+this.detail.price+"元,可用"+this.detail.chargeDegreeLimit+"度"
+				this.cardId = monthlyRentCard.id
+				uni.showToast({
+					title: "已选中 "+this.detail.price+"元,可用"+this.detail.chargeDegreeLimit+"度"
 				})
 			// 	monthlyRentCard.checked = true
 			// 	for (var i in this.cardList) {
@@ -835,9 +835,9 @@
 					this.cardList = response.data.cardList;
 			 
 					if (this.cardList.length) {
-						this.detail = {
-							...this.cardList[0].monthlyRentCard
-						}
+						this.detail = {
+							...this.cardList[0].monthlyRentCard
+						}
 						this.detail.id=null
 						// this.cardId = this.detail.id;
 						// this.cardList[0].monthlyRentCard.checked = true
@@ -912,7 +912,7 @@
 					})
 				})
 			},
-			submit(type) {
+			submit(type) {
 			
 				if (!this.endCardBool) {
 					return
@@ -1013,45 +1013,45 @@
 		padding-bottom: 200px;
 	}
 </style>
-<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%;
+<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;
-		z-index: 999;
-
-
-	}
-
-	.upupupView img {
-		top: 15px;
-		position: relative;
+		z-index: 999;
+
+
+	}
+
+	.upupupView img {
+		top: 15px;
+		position: relative;
 		width: 60px;
-		z-index: 999;
-		animation: movepoint 2s infinite;
-		-webkit-animation: movepoint 2s infinite;
-	}
+		z-index: 999;
+		animation: movepoint 2s infinite;
+		-webkit-animation: movepoint 2s infinite;
+	}
 </style>
 <style lang="scss" scoped>
 	.header {
@@ -1136,7 +1136,7 @@
 				margin-top: 8rpx;
 				color: rgba(51, 51, 51, 1);
 
-				/deep/.u-icon--right {
+				::v-deep.u-icon--right {
 					margin-right: 4rpx;
 				}
 			}
@@ -1158,7 +1158,7 @@
 				color: rgba(16, 16, 16, 1);
 				font-size: 32rpx;
 
-				/deep/.uicon-arrow-right {
+				::v-deep.uicon-arrow-right {
 					margin-left: 8rpx;
 				}
 			}
@@ -1598,7 +1598,7 @@
 		align-items: center;
 		justify-content: space-between;
 		margin-bottom: 32rpx;
-		/deep/.uicon-arrow-up{
+		::v-deep.uicon-arrow-up{
 			margin-left: 8rpx;
 			
 		}
@@ -1737,7 +1737,7 @@
 	
 	
 }
-/deep/.u-drawer-content{
+::v-deep.u-drawer-content{
 	border-radius: 12px;
 }
 </style>

pages/index/activity.vue

@@ -36,7 +36,7 @@
 						<view class="news-time">{{item.createTime ? item.createTime.slice(5,16) : ''}}</view>
 					</view>
 					<view class="content-img">
-						<img v-if="item.pic " :src="item.pic" alt="">
+						<img v-if="item.pic " :src="item.pic" alt="">
 						<img v-else src="@/assets/static/img/image_default.png" alt="">
 					</view>
 				</view>
@@ -342,7 +342,7 @@
 			}
 		}
 	}
-	/deep/.springclass{
+	::v-deep.springclass{
 		.u-tabbar__content__item{
 			.u-icon__img {
 			  width:56rpx !important;

pages/index/all.vue

@@ -1,1023 +1,1023 @@
-<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.customNo)}}/{{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: 240rpx;
-		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;
-		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>
-
+<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.customNo)}}/{{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;
+		}
+		
+	}
+	::v-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: 240rpx;
+		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;
+		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;
+		}
+
+		::v-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;
+
+		}
+
+		::v-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{
+		::v-deep.u-model,::v-deep.u-mode-center-box{
+			background-color: transparent;
+		}
+	}
+	
+</style>
+

pages/login/completeInfo.vue

@@ -1,43 +1,43 @@
-<template>
-	<view>
-		<ujp-navbar title="完善信息">
-
-			<view slot="right" @click="gotoLink" style=" margin-right: 20rpx;"> 跳过</view>
-
-		</ujp-navbar>
-		<view class="data">
-			<view class="data-img" v-show="!keyShow">
-				<view class="data-icon">
-					<u-icon name="camera-fill" custom-prefix="custom-icon" color="#fff" size="32"></u-icon>
-				</view>
-				<u-avatar :src="form.headImg+'?x-oss-process=image/resize,m_fill,w_256,h_256'" size="216"
-					@click="uploadPhoto" /></u-avatar>
-			</view>
-
-			<view class="data-input">
-				<u-form :model="form" ref="uForm">
-					<u-form-item label-position="top" required label="昵称"><u-input v-model="form.nickName"
-							placeholder="请填写昵称" /></u-form-item>
-				</u-form>
+<template>
+	<view>
+		<ujp-navbar title="完善信息">
+
+			<view slot="right" @click="gotoLink" style=" margin-right: 20rpx;"> 跳过</view>
+
+		</ujp-navbar>
+		<view class="data">
+			<view class="data-img" v-show="!keyShow">
+				<view class="data-icon">
+					<u-icon name="camera-fill" custom-prefix="custom-icon" color="#fff" size="32"></u-icon>
+				</view>
+				<u-avatar :src="form.headImg+'?x-oss-process=image/resize,m_fill,w_256,h_256'" size="216"
+					@click="uploadPhoto" /></u-avatar>
+			</view>
+
+			<view class="data-input">
+				<u-form :model="form" ref="uForm">
+					<u-form-item label-position="top" required label="昵称"><u-input v-model="form.nickName"
+							placeholder="请填写昵称" /></u-form-item>
+				</u-form>
 			</view>
-			
+			
 			<p class="car-num" ><span style="color:rgba(238, 49, 56, 1)">*</span>车牌号码
 					
 					<span  @click="gotoLink" 
 							style="color: rgb(63, 189, 112);float: right;">临时车牌,点击快速充电</span>
-					</p>
-			
-			<view class="key-input" @tap="keyShow=true">
-
-				<umessageInput :focus="true" @selectIndex="getSelectIndex" :value="form.carNum" :maxlength="maxlength"
-					:disabled-keyboard="true"></umessageInput>
-
-				<!-- 				<u-message-input :focus="true" :value="form.carNum" :maxlength="maxlength" :disabled-keyboard="true"></u-message-input>
- -->
+					</p>
+			
+			<view class="key-input" @tap="keyShow=true">
+
+				<umessageInput :focus="true" @selectIndex="getSelectIndex" :value="form.carNum" :maxlength="maxlength"
+					:disabled-keyboard="true"></umessageInput>
+
+				<!-- 				<u-message-input :focus="true" :value="form.carNum" :maxlength="maxlength" :disabled-keyboard="true"></u-message-input>
+ -->
 			</view>
 			<p class="car-num" ><span @tap="keyShow=!keyShow"
 					style="float: right;color: #9e9e9e;">点击输入框{{keyShow?'收起':'唤起'}}键盘</span></p>
-			<p class="car-num" v-show="!keyShow"><span style="color:rgba(238, 49, 56, 1)">*</span>车辆用途</p>
+			<p class="car-num" v-show="!keyShow"><span style="color:rgba(238, 49, 56, 1)">*</span>车辆用途</p>
 			<view class="car-type" v-show="!keyShow">
 				
 				<view class="card"  v-for="(item,i) in carlist" :key="i"
@@ -91,74 +91,74 @@
 			</view>
 			
 			
-			
-			<view class="default" v-show="!keyShow">
-				<view style="width: 350px;">
-					<u-checkbox-group>
-						<u-checkbox class="tips" active-color="green" v-model="value" shape="circle"
-							@change="checkboxChange()"></u-checkbox>
-					</u-checkbox-group>
-					<span>我已阅读并同意</span>
-					<span @click="gotoUrl('pages/article/details?code=GRXXCLSQS')"
-						style="color: #3fbd70;">《个人信息处理授权书》</span>
-
+			
+			<view class="default" v-show="!keyShow">
+				<view style="width: 350px;">
+					<u-checkbox-group>
+						<u-checkbox class="tips" active-color="green" v-model="value" shape="circle"
+							@change="checkboxChange()"></u-checkbox>
+					</u-checkbox-group>
+					<span>我已阅读并同意</span>
+					<span @click="gotoUrl('pages/article/details?code=GRXXCLSQS')"
+						style="color: #3fbd70;">《个人信息处理授权书》</span>
+
 				</view>
 				<u-button class="login-btn"  @click="keepCar" type="success" shape="circle">完成</u-button>
-				
-			</view>
-		
-
-
-			<ucarkeyboard ref="uKeyboard" style="    z-index: 999;" :style="!keyShow?'display: none':''" mode="car"
-				:confirmBtn="false" :mask-close-able="false" :tooltip="false" v-show="keyShow" @change="valChange"
-				@backspace="backspace">
-				<view style="
-			 	text-align: center;
-			 	font-size: 18px;
-			 ">
-					<span style="color: #fff;">车牌号:{{form.carNum}}</span>
-					<span @tap="keyShow=!keyShow" style="
-			 	float: right;
-			 	padding-right: 10px;
-			 	color: #41a863;
-			 ">确定</span>
-				</view>
-
-			</ucarkeyboard>
-		</view>
-	</view>
-</template>
-
-<script>
-	import * as userApi from '@/apis/user.js'
-	import ucarkeyboard from '@/components/Ucarkeyboard.vue'
-	import * as loginApi from '@/apis/login.js'
-	import umessageInput from '@/components/UmessageInput.vue'
-	var car1=require("@/assets/img/cartype/car1.png")
+				
+			</view>
+		
+
+
+			<ucarkeyboard ref="uKeyboard" style="    z-index: 999;" :style="!keyShow?'display: none':''" mode="car"
+				:confirmBtn="false" :mask-close-able="false" :tooltip="false" v-show="keyShow" @change="valChange"
+				@backspace="backspace">
+				<view style="
+			 	text-align: center;
+			 	font-size: 18px;
+			 ">
+					<span style="color: #fff;">车牌号:{{form.carNum}}</span>
+					<span @tap="keyShow=!keyShow" style="
+			 	float: right;
+			 	padding-right: 10px;
+			 	color: #41a863;
+			 ">确定</span>
+				</view>
+
+			</ucarkeyboard>
+		</view>
+	</view>
+</template>
+
+<script>
+	import * as userApi from '@/apis/user.js'
+	import ucarkeyboard from '@/components/Ucarkeyboard.vue'
+	import * as loginApi from '@/apis/login.js'
+	import umessageInput from '@/components/UmessageInput.vue'
+	var car1=require("@/assets/img/cartype/car1.png")
 	var car2=require("@/assets/img/cartype/car2.png")
 	var car3=require("@/assets/img/cartype/car3.png")
-	var car4=require("@/assets/img/cartype/car4.png")
-	export default {
-		components: {
-			ucarkeyboard,
-			umessageInput
-		},
-		data() {
+	var car4=require("@/assets/img/cartype/car4.png")
+	export default {
+		components: {
+			ucarkeyboard,
+			umessageInput
+		},
+		data() {
 			return {
 				carLicense:"",
-				carAuthImg:"",
-				value: false,
-				selectIndex: -1,
-				maxlength: 8,
-				keyShow: false,
-				isLogin: false,
-				code: "",
-				codeId: "",
-				form: {
-					nickName: '',
-					headImg: '',
-					carNum: '',
-					defaultFlag: true,
+				carAuthImg:"",
+				value: false,
+				selectIndex: -1,
+				maxlength: 8,
+				keyShow: false,
+				isLogin: false,
+				code: "",
+				codeId: "",
+				form: {
+					nickName: '',
+					headImg: '',
+					carNum: '',
+					defaultFlag: true,
 				},
 				usage:"",
 				carlist:[
@@ -183,30 +183,30 @@
 						img:car4
 					}
 				]
-				
-			}
-		},
-		onLoad(op) {
-			if (op.jpcode) {
-				var str1 = op.jpcode.slice(0, 19);
-				var str2 = op.jpcode.slice(20, 21);
-				var str3 = op.jpcode.slice(22);
-
-				if (str1 == 'jp_team51_charge_id') {
-					if (str2 == 'A') {
-						this.code = str2;
-						this.codeId = str3;
-					}
-				}
-			}
-			if (op.login) {
-				this.isLogin = true;
-			}
-		},
-		onReady() {
-			//this.$refs.uKeyboard.changeCarInputMode();
-			this.getUserInfo();
-		},
+				
+			}
+		},
+		onLoad(op) {
+			if (op.jpcode) {
+				var str1 = op.jpcode.slice(0, 19);
+				var str2 = op.jpcode.slice(20, 21);
+				var str3 = op.jpcode.slice(22);
+
+				if (str1 == 'jp_team51_charge_id') {
+					if (str2 == 'A') {
+						this.code = str2;
+						this.codeId = str3;
+					}
+				}
+			}
+			if (op.login) {
+				this.isLogin = true;
+			}
+		},
+		onReady() {
+			//this.$refs.uKeyboard.changeCarInputMode();
+			this.getUserInfo();
+		},
 		methods: {
 			
 			uploadFile(imageSrc){
@@ -273,201 +273,201 @@
 					   	console.log('chooseImage fail', err)
 					}
 				})
-			},
-			getUserInfo() {
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				loginApi.findByOpenId({
-					openId: this.carhelp.getOpenId()
-				}).then((res) => {
-					uni.hideLoading();
-					this.form.nickName = res.data.regUser.nickName;
-					this.form.headImg = res.data.regUser.headImg;
-				}).catch(error => {
-					uni.showToast({
-						title: error,
-						icon: "none"
-					})
-				})
-			},
-			uploadPhoto() {
-				let _self = this;
-
-				const crop = {
-					quality: 100,
-					width: 600,
-					height: 600,
-					resize: true
-				};
-
-				// 上传图片
-				uni.chooseImage({
-					count: 1,
-					crop,
-					success: async (res) => {
-						//(res);
-						let tempFile = res.tempFiles[0],
-							avatar_file = {
-								// #ifdef H5
-								extname: tempFile.name.split('.')[tempFile.name.split('.').length - 1],
-								// #endif
-								// #ifndef H5
-								extname: tempFile.path.split('.')[tempFile.path.split('.').length - 1]
-								// #endif
-							},
-							filePath = res.tempFilePaths[0]
-
-						// #ifndef APP-PLUS
-						//(`filePath=${filePath}`)
-
-						//非app端用前端组件剪裁头像，app端用内置的原生裁剪
-						let fileData = await new Promise((callback) => {
-							uni.navigateTo({
-								url: '/pages/user/cropImage?path=' + filePath +
-									`&options=${JSON.stringify(crop)}`,
-								animationType: "fade-in",
-								events: {
-									success: url => {
-										callback(url)
-									}
-								}
-							});
-						})
-						// #endif
-
-						//返回 base64 图片
-						//(fileData);
-
-						var token = _self.carhelp.getToken()
-
-						uni.showLoading({
-							title: '上传中'
-						});
-
-						uni.request({
-							url: process.car.BASE_URL + "uploadBase64",
-							method: 'POST',
-							data: {
+			},
+			getUserInfo() {
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				loginApi.findByOpenId({
+					openId: this.carhelp.getOpenId()
+				}).then((res) => {
+					uni.hideLoading();
+					this.form.nickName = res.data.regUser.nickName;
+					this.form.headImg = res.data.regUser.headImg;
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+			},
+			uploadPhoto() {
+				let _self = this;
+
+				const crop = {
+					quality: 100,
+					width: 600,
+					height: 600,
+					resize: true
+				};
+
+				// 上传图片
+				uni.chooseImage({
+					count: 1,
+					crop,
+					success: async (res) => {
+						//(res);
+						let tempFile = res.tempFiles[0],
+							avatar_file = {
+								// #ifdef H5
+								extname: tempFile.name.split('.')[tempFile.name.split('.').length - 1],
+								// #endif
+								// #ifndef H5
+								extname: tempFile.path.split('.')[tempFile.path.split('.').length - 1]
+								// #endif
+							},
+							filePath = res.tempFilePaths[0]
+
+						// #ifndef APP-PLUS
+						//(`filePath=${filePath}`)
+
+						//非app端用前端组件剪裁头像，app端用内置的原生裁剪
+						let fileData = await new Promise((callback) => {
+							uni.navigateTo({
+								url: '/pages/user/cropImage?path=' + filePath +
+									`&options=${JSON.stringify(crop)}`,
+								animationType: "fade-in",
+								events: {
+									success: url => {
+										callback(url)
+									}
+								}
+							});
+						})
+						// #endif
+
+						//返回 base64 图片
+						//(fileData);
+
+						var token = _self.carhelp.getToken()
+
+						uni.showLoading({
+							title: '上传中'
+						});
+
+						uni.request({
+							url: process.car.BASE_URL + "uploadBase64",
+							method: 'POST',
+							data: {
 								photoBase64Data: fileData,
-								branchParameter:process.car.branchParameter
-							},
-							header: {
-								'Authorization': token,
-								'content-type': 'application/x-www-form-urlencoded'
-							},
-							success: (res) => {
-								let jsonData = res.data;
-								_self.form.headImg = jsonData.data;
-
-								uni.hideLoading();
-							}
-						});
-					}
-				});
-			},
-			gotoLink() {
-				if (this.code == 'A') {
-					uni.redirectTo({
-						url: '/pages/searchPile/stationAndPile/chargingPileDetails?id=' + this.codeId
-					})
-				} else if (this.isLogin) {
-					uni.redirectTo({
-						url: '/pages/index/index'
-					})
+								branchParameter:process.car.branchParameter
+							},
+							header: {
+								'Authorization': token,
+								'content-type': 'application/x-www-form-urlencoded'
+							},
+							success: (res) => {
+								let jsonData = res.data;
+								_self.form.headImg = jsonData.data;
+
+								uni.hideLoading();
+							}
+						});
+					}
+				});
+			},
+			gotoLink() {
+				if (this.code == 'A') {
+					uni.redirectTo({
+						url: '/pages/searchPile/stationAndPile/chargingPileDetails?id=' + this.codeId
+					})
+				} else if (this.isLogin) {
+					uni.redirectTo({
+						url: '/pages/index/index'
+					})
 				}else{
 					uni.redirectTo({
 						url: '/pages/index/index'
 					})
-				}
-			},
-			checkboxChange() {
-				this.value = !this.value;
-			},
-			getSelectIndex(i) {
-				this.selectIndex = i;
-				if (i == 0) {
-					var aaa = this.$refs.uKeyboard.changeCarInputValue();
-
-					if (aaa) {
-						this.$refs.uKeyboard.changeCarInputMode();
-					}
-				}
-			},
-
-			// 按键被点击(点击退格键不会触发此事件)
-			valChange(val) {
-				if (this.form.carNum.length >= this.maxlength && this.selectIndex == -1) {
-					return
-				}
-
-				if (this.selectIndex == -1) {
-					this.form.carNum += val;
-				} else {
-					const replaceStr = (str, index, char) => {
-						const strAry = str.split('');
-						if (index < strAry.length) {
-							strAry[index] = char;
-						}
-
-						return strAry.join('');
-					}
-
-					this.form.carNum = replaceStr(this.form.carNum, this.selectIndex, val);
-					this.selectIndex = -1;
-				}
-				// 将每次按键的值拼接到form.carNum变量中，注意+=写法
-
-				//(this.form.carNum);
-
-				var aaa = this.$refs.uKeyboard.changeCarInputValue();
-				if ((this.form.carNum.length == 0) && aaa) {
-					this.$refs.uKeyboard.changeCarInputMode();
-				} else if (!aaa) {
-					this.$refs.uKeyboard.changeCarInputMode();
-				}
-			},
-			// 退格键被点击
-			backspace() {
-				// 删除form.carNum的最后一个字符
-				if (this.form.carNum.length) {
-					if (this.selectIndex == -1) {
-
-						this.form.carNum = this.form.carNum.substr(0, this.form.carNum.length - 1);
-
-					} else {
-						const replaceStr = (str, index, char) => {
-							const strAry = str.split('');
-							if (index < strAry.length) {
-								strAry[index] = char;
-							}
-
-							return strAry.join('');
-						}
-
-						this.form.carNum = replaceStr(this.form.carNum, this.selectIndex, '');
-
-						//this.selectIndex=-1;
-					}
-				}
-
-
-
-
-				//(this.form.carNum);
-
-				var aaa = this.$refs.uKeyboard.changeCarInputValue();
-				if (this.form.carNum.length == 0 && aaa) {
-					this.$refs.uKeyboard.changeCarInputMode();
-				}
-			},
-			keepCar() {
-				if (this.form.carNum.length != 8) {
-					uni.showToast({
-						title: "请填写新能源车牌"
-					})
-					return
+				}
+			},
+			checkboxChange() {
+				this.value = !this.value;
+			},
+			getSelectIndex(i) {
+				this.selectIndex = i;
+				if (i == 0) {
+					var aaa = this.$refs.uKeyboard.changeCarInputValue();
+
+					if (aaa) {
+						this.$refs.uKeyboard.changeCarInputMode();
+					}
+				}
+			},
+
+			// 按键被点击(点击退格键不会触发此事件)
+			valChange(val) {
+				if (this.form.carNum.length >= this.maxlength && this.selectIndex == -1) {
+					return
+				}
+
+				if (this.selectIndex == -1) {
+					this.form.carNum += val;
+				} else {
+					const replaceStr = (str, index, char) => {
+						const strAry = str.split('');
+						if (index < strAry.length) {
+							strAry[index] = char;
+						}
+
+						return strAry.join('');
+					}
+
+					this.form.carNum = replaceStr(this.form.carNum, this.selectIndex, val);
+					this.selectIndex = -1;
+				}
+				// 将每次按键的值拼接到form.carNum变量中，注意+=写法
+
+				//(this.form.carNum);
+
+				var aaa = this.$refs.uKeyboard.changeCarInputValue();
+				if ((this.form.carNum.length == 0) && aaa) {
+					this.$refs.uKeyboard.changeCarInputMode();
+				} else if (!aaa) {
+					this.$refs.uKeyboard.changeCarInputMode();
+				}
+			},
+			// 退格键被点击
+			backspace() {
+				// 删除form.carNum的最后一个字符
+				if (this.form.carNum.length) {
+					if (this.selectIndex == -1) {
+
+						this.form.carNum = this.form.carNum.substr(0, this.form.carNum.length - 1);
+
+					} else {
+						const replaceStr = (str, index, char) => {
+							const strAry = str.split('');
+							if (index < strAry.length) {
+								strAry[index] = char;
+							}
+
+							return strAry.join('');
+						}
+
+						this.form.carNum = replaceStr(this.form.carNum, this.selectIndex, '');
+
+						//this.selectIndex=-1;
+					}
+				}
+
+
+
+
+				//(this.form.carNum);
+
+				var aaa = this.$refs.uKeyboard.changeCarInputValue();
+				if (this.form.carNum.length == 0 && aaa) {
+					this.$refs.uKeyboard.changeCarInputMode();
+				}
+			},
+			keepCar() {
+				if (this.form.carNum.length != 8) {
+					uni.showToast({
+						title: "请填写新能源车牌"
+					})
+					return
 				}
 				if (!this.usage) {
 					uni.showToast({
@@ -482,99 +482,99 @@
 					return
 				}
 				
-				
+				
 				//(this.form)
 				this.form.usage=this.usage;
-				this.form.photoFile=this.carAuthImg;
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				userApi.perfectPersonInformation(this.form).then((res) => {
-					uni.hideLoading();
+				this.form.photoFile=this.carAuthImg;
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				userApi.perfectPersonInformation(this.form).then((res) => {
+					uni.hideLoading();
 					if(this.carAuthImg){
 						var obj=this.carhelp.getPersonInfo()
 						obj.carLicense=this.carAuthImg
 						this.carhelp.setPersonInfo(obj)
 					}
-					 
-					this.gotoLink()
-				}).catch(error => {
+					 
+					this.gotoLink()
+				}).catch(error => {
 					
 					uni.hideLoading();
 					uni.showModal({
 						content: error,
 						showCancel: false
-					});
-				})
-			}
-		}
-
-	}
-</script>
-<style>
-	page {
-		background: #fff;
-	}
-</style>
-<style lang="scss" scoped>
-	.u-char-item {
-		width: 58rpx !important;
-	}
-
-	.skip {
-		margin-left: 81.3%;
-	}
-
-	.data-icon {
-		height: 28px;
-		width: 28px;
-		background-color: #00B962;
-		border-radius: 14px;
-		border: 2px solid #fff;
-		text-align: center;
-		line-height: 24px;
-		position: absolute;
-		z-index: 999;
-		right: 0;
-		bottom: 0px
-	}
-
-	.data-img {
-		margin: 10px auto;
-		height: 216rpx;
-		width: 216rpx;
-		position: relative;
-	}
-
-	.data-input {
-		margin: 0 60rpx;
-	}
-
-	.login-btn {
-		margin-top: 12px;
-		background-color: #00B962 !important;
-		border-color: #00B962 !important;
-		color: #fff !important;
-	}
-
-	.car-num {
-		padding: 20rpx 60rpx 0 60rpx;
-		line-height: 18px;
-	}
-
-	.key-input {
-		padding-top: 19px;
-	}
-
-	.default {
-		margin: 30rpx 60rpx;
-	}
-
-	/deep/.u-char-item {
+					});
+				})
+			}
+		}
+
+	}
+</script>
+<style>
+	page {
+		background: #fff;
+	}
+</style>
+<style lang="scss" scoped>
+	.u-char-item {
+		width: 58rpx !important;
+	}
+
+	.skip {
+		margin-left: 81.3%;
+	}
+
+	.data-icon {
+		height: 28px;
+		width: 28px;
+		background-color: #00B962;
+		border-radius: 14px;
+		border: 2px solid #fff;
+		text-align: center;
+		line-height: 24px;
+		position: absolute;
+		z-index: 999;
+		right: 0;
+		bottom: 0px
+	}
+
+	.data-img {
+		margin: 10px auto;
+		height: 216rpx;
+		width: 216rpx;
+		position: relative;
+	}
+
+	.data-input {
+		margin: 0 60rpx;
+	}
+
+	.login-btn {
+		margin-top: 12px;
+		background-color: #00B962 !important;
+		border-color: #00B962 !important;
+		color: #fff !important;
+	}
+
+	.car-num {
+		padding: 20rpx 60rpx 0 60rpx;
+		line-height: 18px;
+	}
+
+	.key-input {
+		padding-top: 19px;
+	}
+
+	.default {
+		margin: 30rpx 60rpx;
+	}
+
+	::v-deep.u-char-item {
 		width: 60rpx !important;
 		height: 80rpx !important;
-		font-size: 36rpx !important;
+		font-size: 36rpx !important;
 	}
 	.car-type{
 		    display: flex;
@@ -738,5 +738,5 @@
 		border-top: 5px solid red;
 		border-right: 5px solid transparent;
 		border-left: 5px solid transparent;
-	}
+	}
 </style>

pages/login/login.vue

@@ -1,82 +1,82 @@
-<template>
-	<view class="wrap">
+<template>
+	<view class="wrap">
 		<ujp-navbar :isBack="false" title="" v-if="false">
 		
 			<view slot="right" v-if="!personInfo&&!member" @click="show3=true"
 				style=" margin-right: 10px;color:#00B962">游客模式 </view>
-		</ujp-navbar>
-
-		<view class="login">
+		</ujp-navbar>
+
+		<view class="login">
 			<view class="login-title">
-				
+				
 				<h3 ><span style="font-weight: bold;">手机号登录/注册</span>
 				<span class="login-title-span"  v-if="!personInfo&&!member"  @click="show3=true" >游客模式</span>
-				</h3>
-				<p>欢迎来到{{projectName}}</p>
-				<p v-if="activityInfo"><span style="color: red;">*</span>正在参加活动<span style="color: #3fbd70;">
-						<邀请有礼>
-					</span></p>
-			</view>
-
-			<view class="login-form">
-				<view class="login-form-item">
-					<view class="title"  style="font-weight: bold;" >手机号</view>
-					<view class="input">
-						<u-input :customStyle="customStyle" :placeholderStyle="placeholderStyle"
-							v-model="form.telephone" type="number" placeholder="请输入手机号"
-							placeholder-style="font-size:16px;color:#ccc;" />
-					</view>
+				</h3>
+				<p>欢迎来到{{projectName}}</p>
+				<p v-if="activityInfo"><span style="color: red;">*</span>正在参加活动<span style="color: #3fbd70;">
+						<邀请有礼>
+					</span></p>
+			</view>
+
+			<view class="login-form">
+				<view class="login-form-item">
+					<view class="title"  style="font-weight: bold;" >手机号</view>
+					<view class="input">
+						<u-input :customStyle="customStyle" :placeholderStyle="placeholderStyle"
+							v-model="form.telephone" type="number" placeholder="请输入手机号"
+							placeholder-style="font-size:16px;color:#ccc;" />
+					</view>
 					<view class="tips"><span style="color: red;">*</span>未注册的手机号验证后将自动注册</view>
-					
-				</view>
-				<view class="login-form-item">
-					<view class="title"  style="font-weight: bold;">验证码</view>
-					<view class="input">
-						<u-input :customStyle="customStyle" :placeholderStyle="placeholderStyle"
-							v-model="form.verifyCode" type="number" placeholder="请输入验证码"
-							placeholder-style="font-size:16px;color:#ccc;" />
-						<view class="code" :style="isCodeTipsColor ? 'color: #999999;' : ''" @click="getCode">
-							{{codeTips}}</view>
-					</view>
-					<view style="width: 350px;">
-						<u-checkbox-group>
-							<u-checkbox class="tips" active-color="green" v-model="value" shape="circle"
-								@change="checkboxChange()"></u-checkbox>
-						</u-checkbox-group>
-						<span style="font-size: 24rpx;">我已阅读并同意</span>
-						<span @click="gotoUrl('pages/article/details?code=YHXY')" style="color: #3fbd70;font-size: 24rpx;">《会员协议》</span>和
-						<span @click="gotoUrl('pages/article/details?code=YSZC')" style="color: #3fbd70;font-size: 24rpx;">《隐私协议》</span>
-					</view>
-				</view>
-			</view>
-			<u-button :style="[inputStyle]" class="login-btn" type="success" shape="circle" @click="login">登录</u-button>
-			<u-verification-code :seconds="sendMsgSecond" ref="uCode" @change="codeChange" @end="end" @start="start"
-				change-text="已发送(Xs)">
-			</u-verification-code>
-		</view>
-
-		<view class="foot" v-if="!show2">
-			<span style="color: red;">*</span>我们将使用您的微信昵称及头像，为您补全本平台帐号相关基础信息，请点击下方“<span
-				style="color: #3fbd70;">使用完整服务</span>”。
-		</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-modal v-model="show3" v-show="!show1" class="showOss" confirm-text="注册会员" cancel-text="先不注册"
-			:show-title="false" width="650" border-radius="30" title="" :show-cancel-button="false"
-			:show-confirm-button="false">
-			<view class="slot-content">
-				<!-- :show-title="false" -->
-
+					
+				</view>
+				<view class="login-form-item">
+					<view class="title"  style="font-weight: bold;">验证码</view>
+					<view class="input">
+						<u-input :customStyle="customStyle" :placeholderStyle="placeholderStyle"
+							v-model="form.verifyCode" type="number" placeholder="请输入验证码"
+							placeholder-style="font-size:16px;color:#ccc;" />
+						<view class="code" :style="isCodeTipsColor ? 'color: #999999;' : ''" @click="getCode">
+							{{codeTips}}</view>
+					</view>
+					<view style="width: 350px;">
+						<u-checkbox-group>
+							<u-checkbox class="tips" active-color="green" v-model="value" shape="circle"
+								@change="checkboxChange()"></u-checkbox>
+						</u-checkbox-group>
+						<span style="font-size: 24rpx;">我已阅读并同意</span>
+						<span @click="gotoUrl('pages/article/details?code=YHXY')" style="color: #3fbd70;font-size: 24rpx;">《会员协议》</span>和
+						<span @click="gotoUrl('pages/article/details?code=YSZC')" style="color: #3fbd70;font-size: 24rpx;">《隐私协议》</span>
+					</view>
+				</view>
+			</view>
+			<u-button :style="[inputStyle]" class="login-btn" type="success" shape="circle" @click="login">登录</u-button>
+			<u-verification-code :seconds="sendMsgSecond" ref="uCode" @change="codeChange" @end="end" @start="start"
+				change-text="已发送(Xs)">
+			</u-verification-code>
+		</view>
+
+		<view class="foot" v-if="!show2">
+			<span style="color: red;">*</span>我们将使用您的微信昵称及头像，为您补全本平台帐号相关基础信息，请点击下方“<span
+				style="color: #3fbd70;">使用完整服务</span>”。
+		</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-modal v-model="show3" v-show="!show1" class="showOss" confirm-text="注册会员" cancel-text="先不注册"
+			:show-title="false" width="650" border-radius="30" title="" :show-cancel-button="false"
+			:show-confirm-button="false">
+			<view class="slot-content">
+				<!-- :show-title="false" -->
+
 				<view>
 					<img  v-if="branchParameterBl('ud')" src="@/assets/img/gologin/nipic.png" style="width: 100%;"></img>
 					
 					<img  v-else  src="@/assets/img/Nipic_24385267_20191128181916139081.png" style="width: 100%;"></img>
-					
-				</view>
-				<view>
+					
+				</view>
+				<view>
 					<table  class="classtable">
 						
 						
@@ -110,9 +110,9 @@
 							</td>
 						</tr>
 						
-					</table>
-
-				</view>
+					</table>
+
+				</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; "
@@ -124,297 +124,297 @@
 					</view>
 					
 					<view  class="btnview2"  @click="touristConfirm">游客模式</view>
-				</view>
-			</view>
-		</u-modal>
-
-
-
-	</view>
-</template>
-
-<script>
-	import * as loginApi from '@/apis/login.js'
-	import * as API from '@/apis/index.js'
-	import * as API_weixin from '@/apis/weixin.js'
-
-	import {
-		checkPhone,newDate
-	} from '@/utils'
-
-	export default {
-		data() {
-			return {
-				elderMode: false,
-				customStyle: {
-					'font-size': '28rpx'
-				},
-				placeholderStyle: "font-size:28rpx",
-				form: {
-					telephone: '',
-					verifyCode: '',
-				},
-				activityInfo: null,
-				isSendMsgIng: false,
-				isCodeTipsColor: false,
-				sendMsgSecond: 60,
-				codeTips: '',
-				value: false,
-				code: '',
-				codeId: '',
-				projectName: '',
-				show1: false,
-				show2: false,
-				show3: false,
-				touristBl: false,
-				personInfo: null,
-				member: false,
-
-			}
-		},
-		computed: {
-			inputStyle() {
-				let style = {};
-				if (this.form.telephone) {
-					style.color = "#fff";
-					style.backgroundColor = this.$u.color['success'];
-				}
-				return style;
-			}
-		},
-		onLoad(op) {
-			this.projectName = process.car.ProjectName;
-			if (op.member) {
-				this.member = true;
+				</view>
+			</view>
+		</u-modal>
+
+
+
+	</view>
+</template>
+
+<script>
+	import * as loginApi from '@/apis/login.js'
+	import * as API from '@/apis/index.js'
+	import * as API_weixin from '@/apis/weixin.js'
+
+	import {
+		checkPhone,newDate
+	} from '@/utils'
+
+	export default {
+		data() {
+			return {
+				elderMode: false,
+				customStyle: {
+					'font-size': '28rpx'
+				},
+				placeholderStyle: "font-size:28rpx",
+				form: {
+					telephone: '',
+					verifyCode: '',
+				},
+				activityInfo: null,
+				isSendMsgIng: false,
+				isCodeTipsColor: false,
+				sendMsgSecond: 60,
+				codeTips: '',
+				value: false,
+				code: '',
+				codeId: '',
+				projectName: '',
+				show1: false,
+				show2: false,
+				show3: false,
+				touristBl: false,
+				personInfo: null,
+				member: false,
+
+			}
+		},
+		computed: {
+			inputStyle() {
+				let style = {};
+				if (this.form.telephone) {
+					style.color = "#fff";
+					style.backgroundColor = this.$u.color['success'];
+				}
+				return style;
+			}
+		},
+		onLoad(op) {
+			this.projectName = process.car.ProjectName;
+			if (op.member) {
+				this.member = true;
 			}
 			if (op.jpcode2) {
 				this.code = op.jpcode2;
 			}
 			if (op.codeId) {
 				this.codeId = op.codeId;
-			}
-			if (op.jpcode) {
-
-				var str1 = op.jpcode.slice(0, 19);
-				var str2 = op.jpcode.slice(20, 21);
-				var str3 = op.jpcode.slice(22);
-
-				if (str1 == 'jp_team51_charge_id') {
-					if (str2 == 'A') {
-						this.code = str2;
-						this.codeId = str3;
-						uni.showToast({
-							title: "注册后享受充电服务"
-						})
-					}
-				}
-
-			}
-			var obj = this.carhelp.get("friends_invitation")
-
-			if (obj) {
-				if (obj.date + 1000 * 60 * 60 * 24 > new Date().getTime()) {
-					this.form.inviteId = obj.op.uid
-					this.form.code = obj.op.icode
-					this.activityInfo = "true";
-				}
-
-			}
-
-			this.personInfo = this.carhelp.getPersonInfo()
-			if (this.personInfo) {
-				if (this.personInfo.userType == "1") {
-
-				} else {
-					uni.redirectTo({
-						url: '/pages/index/index'
-					})
-				}
-			} else {
-				if (!this.member) {
-					this.show3 = true
+			}
+			if (op.jpcode) {
+
+				var str1 = op.jpcode.slice(0, 19);
+				var str2 = op.jpcode.slice(20, 21);
+				var str3 = op.jpcode.slice(22);
+
+				if (str1 == 'jp_team51_charge_id') {
+					if (str2 == 'A') {
+						this.code = str2;
+						this.codeId = str3;
+						uni.showToast({
+							title: "注册后享受充电服务"
+						})
+					}
+				}
+
+			}
+			var obj = this.carhelp.get("friends_invitation")
+
+			if (obj) {
+				if (obj.date + 1000 * 60 * 60 * 24 > new Date().getTime()) {
+					this.form.inviteId = obj.op.uid
+					this.form.code = obj.op.icode
+					this.activityInfo = "true";
 				}
-				
-
-			}
-
-
-		},
-		onReady() {
-			this.elderMode = this.carhelp.get('getElderModeClass') == '长辈模式';
-			if (this.elderMode)
-				this.theme('elder')
-			else
-				this.theme('standard')
-		},
-		onShow() {
-			this.checkSubscribe()
-		},
-		methods: {
-			touristConfirm() {
-
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
+
+			}
+
+			this.personInfo = this.carhelp.getPersonInfo()
+			if (this.personInfo) {
+				if (this.personInfo.userType == "1") {
+
+				} else {
+					uni.redirectTo({
+						url: '/pages/index/index'
+					})
+				}
+			} else {
+				if (!this.member) {
+					this.show3 = true
+				}
+				
+
+			}
+
+
+		},
+		onReady() {
+			this.elderMode = this.carhelp.get('getElderModeClass') == '长辈模式';
+			if (this.elderMode)
+				this.theme('elder')
+			else
+				this.theme('standard')
+		},
+		onShow() {
+			this.checkSubscribe()
+		},
+		methods: {
+			touristConfirm() {
+
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
 
 				if(this.carhelp.getUserInfo().nickname){
 					this.form.nickName = this.carhelp.getUserInfo().nickname;
 					this.form.headImg = this.carhelp.getUserInfo().headimgurl;
 				}else{
 					
-				}
-				//this.form.nickName = this.carhelp.getUserInfo().nickname;
-				//this.form.headImg = this.carhelp.getUserInfo().headimgurl;
-				this.form.openId = this.carhelp.getOpenId();
-				this.form.source = 2 //创建渠道1电单车2电车
-
-				loginApi.registerGuest(this.form).then((response) => {
-					this.loginresponse(response,true);
-				}).catch(error => {
-					uni.showToast({
-						title: error,
-						icon: "none"
-					})
-				})
-
-			},
-			gotoGz() {
-				this.carhelp.setGzDate()
+				}
+				//this.form.nickName = this.carhelp.getUserInfo().nickname;
+				//this.form.headImg = this.carhelp.getUserInfo().headimgurl;
+				this.form.openId = this.carhelp.getOpenId();
+				this.form.source = 2 //创建渠道1电单车2电车
+
+				loginApi.registerGuest(this.form).then((response) => {
+					this.loginresponse(response,true);
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+
+			},
+			gotoGz() {
+				this.carhelp.setGzDate()
 			var url = process.car.gzUrl;
-				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
-					})
-				})
-
-			},
-
-			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;
-				}
-			},
-			codeChange(text) {
-				this.codeTips = text;
-			},
-			start() {
-				if (!this.isSendMsgIng) {
-					uni.showLoading({
-						title: "加载中",
-						mask: true,
-					})
-					loginApi.getVerifyCode(this.form.telephone).then((response) => {
-						uni.hideLoading();
-						this.carhelp.set("getvcodetime", new Date().getTime());
-
-						if (!"") {
-							//倒计时
-							uni.showToast({
-								title: "发送成功"
-							})
-						} else {
-							uni.showToast({
-								title: "您的验证码已经发送[5分钟有效]，请勿重复点击"
-							})
-						}
-					}).catch(error => {
-						uni.showToast({
-							title: error,
-							icon: "none"
-						})
-					})
-				}
-			},
-			//倒计时
-			end() {
-				this.sendMsgSecond = 60;
-				this.isSendMsgIng = false;
-				this.isCodeTipsColor = false;
-			},
-			// 获取验证码
-			getCode() {
-				if (this.$refs.uCode.canGetCode) {} else {
-					uni.showToast({
-						title: '倒计时结束后再发送',
-						icon: "none"
-					})
-					return
-				}
-
-				var checkPhoneResult = checkPhone(this.form.telephone);
-
-				if (checkPhoneResult !== true) {
-					uni.showToast({
-						title: checkPhoneResult,
-					})
-					return;
-				}
-				this.$refs.uCode.start();
-				this.isCodeTipsColor = true;
-			},
-			checkboxChange() {
-				this.value = !this.value;
-			},
-			loginresponse(response, bl) {
-				uni.hideLoading();
-
-				var token = response ? response.data.token : '';
-				this.carhelp.setToken(token);
-				this.carhelp.setPersonInfo(response.data.regUser);
-				if (!bl && !response.data.regUser.carId) {
-					var url = "/pages/login/completeInfo?login=1"
-
-					if (this.code == 'A') {
-						url += "&jpcode=jp_team51_charge_id:A_" + this.codeId
-					}
-					uni.redirectTo({
-						url: url
-					})
-
-				} else if (this.code == 'A') {
-
-					var k = API.codeOperation("jp_team51_charge_id:A_" + this.codeId);
-					if (k) {
-						uni.redirectTo({
-							url: k
-						})
-					}
-
+				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
+					})
+				})
+
+			},
+
+			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;
+				}
+			},
+			codeChange(text) {
+				this.codeTips = text;
+			},
+			start() {
+				if (!this.isSendMsgIng) {
+					uni.showLoading({
+						title: "加载中",
+						mask: true,
+					})
+					loginApi.getVerifyCode(this.form.telephone).then((response) => {
+						uni.hideLoading();
+						this.carhelp.set("getvcodetime", new Date().getTime());
+
+						if (!"") {
+							//倒计时
+							uni.showToast({
+								title: "发送成功"
+							})
+						} else {
+							uni.showToast({
+								title: "您的验证码已经发送[5分钟有效]，请勿重复点击"
+							})
+						}
+					}).catch(error => {
+						uni.showToast({
+							title: error,
+							icon: "none"
+						})
+					})
+				}
+			},
+			//倒计时
+			end() {
+				this.sendMsgSecond = 60;
+				this.isSendMsgIng = false;
+				this.isCodeTipsColor = false;
+			},
+			// 获取验证码
+			getCode() {
+				if (this.$refs.uCode.canGetCode) {} else {
+					uni.showToast({
+						title: '倒计时结束后再发送',
+						icon: "none"
+					})
+					return
+				}
+
+				var checkPhoneResult = checkPhone(this.form.telephone);
+
+				if (checkPhoneResult !== true) {
+					uni.showToast({
+						title: checkPhoneResult,
+					})
+					return;
+				}
+				this.$refs.uCode.start();
+				this.isCodeTipsColor = true;
+			},
+			checkboxChange() {
+				this.value = !this.value;
+			},
+			loginresponse(response, bl) {
+				uni.hideLoading();
+
+				var token = response ? response.data.token : '';
+				this.carhelp.setToken(token);
+				this.carhelp.setPersonInfo(response.data.regUser);
+				if (!bl && !response.data.regUser.carId) {
+					var url = "/pages/login/completeInfo?login=1"
+
+					if (this.code == 'A') {
+						url += "&jpcode=jp_team51_charge_id:A_" + this.codeId
+					}
+					uni.redirectTo({
+						url: url
+					})
+
+				} else if (this.code == 'A') {
+
+					var k = API.codeOperation("jp_team51_charge_id:A_" + this.codeId);
+					if (k) {
+						uni.redirectTo({
+							url: k
+						})
+					}
+
 				}else if(this.code == 'card'){
 					
 					uni.redirectTo({
@@ -427,9 +427,9 @@
 					})
 				}else {
 					//pages/temporary/anniversary2024
-					
-					var time1=newDate("2024-05-18 12:00:00")
-					var time2=newDate("2024-06-08 12:00:00")
+					
+					var time1=newDate("2024-05-18 12:00:00")
+					var time2=newDate("2024-06-08 12:00:00")
 					
 					var time3=new Date()
 					
@@ -442,89 +442,89 @@
 						uni.redirectTo({
 							url: '/pages/index/index'
 						})
-					}
-					
-				}
-			},
-			login() {
-				// if(!this.show2){
-				// 	this.show1=true;
-				// 	return
-				// }
-
-				var checkPhoneResult = checkPhone(this.form.telephone);
-
-				if (!this.form.telephone || checkPhoneResult != true) {
-					uni.showToast({
-						title: checkPhoneResult,
-						icon: "none"
-					})
-					return;
-				}
-				if (!this.form.verifyCode) {
-					uni.showToast({
-						title: "请输入验证码",
-						icon: "none"
-					})
-					return
-				}
-				if (!this.value) {
-					uni.showToast({
-						title: "请勾选协议",
-						icon: "none"
-					})
-					return
-				}
-
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-
+					}
+					
+				}
+			},
+			login() {
+				// if(!this.show2){
+				// 	this.show1=true;
+				// 	return
+				// }
+
+				var checkPhoneResult = checkPhone(this.form.telephone);
+
+				if (!this.form.telephone || checkPhoneResult != true) {
+					uni.showToast({
+						title: checkPhoneResult,
+						icon: "none"
+					})
+					return;
+				}
+				if (!this.form.verifyCode) {
+					uni.showToast({
+						title: "请输入验证码",
+						icon: "none"
+					})
+					return
+				}
+				if (!this.value) {
+					uni.showToast({
+						title: "请勾选协议",
+						icon: "none"
+					})
+					return
+				}
+
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+
 				//this.form.nickName= this.form.telephone;
 				if(this.carhelp.getUserInfo().nickname){
 					this.form.nickName = this.carhelp.getUserInfo().nickname;
 					this.form.headImg = this.carhelp.getUserInfo().headimgurl;
-				}
-				
-				this.form.openId = this.carhelp.getOpenId();
-				this.form.source = 2 //创建渠道1电单车2电车
-
-
-				if (this.personInfo && this.personInfo.userType == "1") {
-
-					loginApi.validateGuestCode(this.form).then((response) => {
-						this.loginresponse(response, true)
-
-					}).catch(error => {
-						uni.showToast({
-							title: error,
-							icon: "none"
-						})
-					})
-				} else {
-					loginApi.validateCode(this.form).then((response) => {
-						this.loginresponse(response)
-
-					}).catch(error => {
-						uni.showToast({
-							title: error,
-							icon: "none"
-						})
-					})
-				}
-
-
-			}
-		}
-	}
-</script>
-
-<style>
-	page {
-		background-color: #fff;
-	}
-</style>
+				}
+				
+				this.form.openId = this.carhelp.getOpenId();
+				this.form.source = 2 //创建渠道1电单车2电车
+
+
+				if (this.personInfo && this.personInfo.userType == "1") {
+
+					loginApi.validateGuestCode(this.form).then((response) => {
+						this.loginresponse(response, true)
+
+					}).catch(error => {
+						uni.showToast({
+							title: error,
+							icon: "none"
+						})
+					})
+				} else {
+					loginApi.validateCode(this.form).then((response) => {
+						this.loginresponse(response)
+
+					}).catch(error => {
+						uni.showToast({
+							title: error,
+							icon: "none"
+						})
+					})
+				}
+
+
+			}
+		}
+	}
+</script>
+
+<style>
+	page {
+		background-color: #fff;
+	}
+</style>
 <style lang="scss" scoped>
 	.login-title-span{
 		    font-size: 36rpx;
@@ -566,131 +566,131 @@
 			color:#999999 ;
 			padding-bottom:38rpx ;
 		}
-	}
-	.foot {
-		position: fixed;
-		left: 0;
-		right: 0;
-		bottom: 0;
-		background-color: #fff;
-
-
-		padding: 0 10px;
-	}
-
-
-	@import "@/_theme.scss";
-
-	.all {
-		@include themeify {
-			font-size: themed('font-size2');
-		}
-	}
-
-	/deep/.placeholderStyle {
-		font-size: themed('font-size2');
-	}
-
+	}
+	.foot {
+		position: fixed;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		background-color: #fff;
+
+
+		padding: 0 10px;
+	}
+
+
+	@import "@/_theme.scss";
+
+	.all {
+		@include themeify {
+			font-size: themed('font-size2');
+		}
+	}
+
+	::v-deep.placeholderStyle {
+		font-size: themed('font-size2');
+	}
+
 	.wrap {
-		//background: linear-gradient(#D6EEDC, #F3F4F4);
-		@include themeify {
-			font-size: themed('font-size2');
-		}
-
-		/*	font-size: 28rpx;*/
-		.login {
-			//width: 600rpx;
-		
-			//
-
+		//background: linear-gradient(#D6EEDC, #F3F4F4);
+		@include themeify {
+			font-size: themed('font-size2');
+		}
+
+		/*	font-size: 28rpx;*/
+		.login {
+			//width: 600rpx;
+		
+			//
+
 			.login-title {
 				padding: 0 50rpx 0 50rpx;
 					padding-top: 80rpx;
-				background: linear-gradient(#D6EEDC, #fff);
-				text-align: left;
-
-				h3 {
-					@include themeify {
-						font-size: themed('font-size7');
-					}
-
-					/*				font-size: 48rpx;*/
-					font-weight: normal;
-				}
-
-				p {
-					margin-top: 4px;
-					color: #777
-				}
-			}
-
+				background: linear-gradient(#D6EEDC, #fff);
+				text-align: left;
+
+				h3 {
+					@include themeify {
+						font-size: themed('font-size7');
+					}
+
+					/*				font-size: 48rpx;*/
+					font-weight: normal;
+				}
+
+				p {
+					margin-top: 4px;
+					color: #777
+				}
+			}
+
 			.login-form-item {
 			
 				margin: 0 50rpx;
-				width: 600rpx;
-				margin-top: 40px;
-
-				.title {
-					margin-bottom: 8px;
-
-					@include themeify {
-						font-size: themed('font-size2');
-						font-weight: themed('fontWeight');
-						letter-spacing: themed('letterSpacing');
-					}
-				}
-
-				.input {
-					border-bottom: 1px solid #f7f7f7;
+				width: 600rpx;
+				margin-top: 40px;
+
+				.title {
+					margin-bottom: 8px;
+
+					@include themeify {
+						font-size: themed('font-size2');
+						font-weight: themed('fontWeight');
+						letter-spacing: themed('letterSpacing');
+					}
+				}
+
+				.input {
+					border-bottom: 1px solid #f7f7f7;
 					position: relative;
-					box-shadow: 0px 1px 0px 0px rgba(0, 0, 0, 0.1);
-				}
-
-				.code {
-					position: absolute;
-					right: 0;
-					top: 7px;
-					color: rgb(63, 189, 112);
-				}
-
-				.tips {
-					color: $u-type-info;
-					margin-top: 12px;
-
-					@include themeify {
-						font-size: themed('font-size1');
-					}
-
-					/*				font-size: 12px;*/
-					span {
-						color: #3fbd70;
-					}
-				}
-			}
-
+					box-shadow: 0px 1px 0px 0px rgba(0, 0, 0, 0.1);
+				}
+
+				.code {
+					position: absolute;
+					right: 0;
+					top: 7px;
+					color: rgb(63, 189, 112);
+				}
+
+				.tips {
+					color: $u-type-info;
+					margin-top: 12px;
+
+					@include themeify {
+						font-size: themed('font-size1');
+					}
+
+					/*				font-size: 12px;*/
+					span {
+						color: #3fbd70;
+					}
+				}
+			}
+
 			.login-btn {
 				width: 600rpx;
-				margin: 0 auto;
-				margin-top: 40px;
-				background-color: #a7dbc2;
-
-				@include themeify {
-					font-size: themed('font-size3');
-				}
-			}
-
-			.alternative {
-				color: $u-tips-color;
-				display: flex;
-				justify-content: space-between;
-				margin-top: 30rpx;
-			}
-		}
-	}
-	/deep/.uni-input-placeholder{
-		color:#ccc
-	}
-	.u-checkbox-group{
-		width: 40rpx;
-	}
+				margin: 0 auto;
+				margin-top: 40px;
+				background-color: #a7dbc2;
+
+				@include themeify {
+					font-size: themed('font-size3');
+				}
+			}
+
+			.alternative {
+				color: $u-tips-color;
+				display: flex;
+				justify-content: space-between;
+				margin-top: 30rpx;
+			}
+		}
+	}
+	::v-deep.uni-input-placeholder{
+		color:#ccc
+	}
+	.u-checkbox-group{
+		width: 40rpx;
+	}
 </style>

pages/monthlyCardActivity/monthlyCardBuy.vue

@@ -1,1569 +1,1569 @@
-<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>
+<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 
 			 style="font-size: 24rpx;color: rgba(119, 119, 119, 1);width: 91.4%;margin: 8px auto 0;font-weight: 400;text-align: start;">
 				暂不适用站点：恩施花硒谷华美达安可酒店充电站、恩施青花民族医院充电站
-			</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"
+			</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"  :style="'border: 1px solid '+tagNameBy(tagName,1)+';color:'+tagNameBy(tagName,1)"
-									:key="tagIndex">{{tagNameBy(tagName,0)}}</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()
+									:key="tagIndex">{{tagNameBy(tagName,0)}}</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 = process.car.gzUrl;
-				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;
-			}
-		}
-	}
+				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;
+	}
+
+	::v-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;
+
+		}
+
+		::v-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;
+
+
+			::v-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;
+
+		::v-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/newPage/chargeMoney/chargeMoney.vue

@@ -126,7 +126,7 @@
 		background: linear-gradient(180deg, rgba(0,148,79,1) 25%,rgba(0,185,98,1) 79%,rgba(246,246,246,1) 100%);
 		height: 830rpx;
 		margin-bottom: 200rpx;
-		/deep/.u-navbar{
+		::v-deep.u-navbar{
 			z-index: 1 !important;
 			background: none !important;
 			

pages/newPage/chargeMoney/financialDetails.vue

@@ -108,7 +108,7 @@
 		height: 320rpx;
 		margin-bottom: 80rpx;
 		background: linear-gradient(180deg, rgba(0,185,98,1) 56%,rgba(246,246,246,1) 100%);
-	/deep/.u-navbar{
+	::v-deep.u-navbar{
 		z-index: 1 !important;
 		background: none !important;
 		
@@ -164,7 +164,7 @@
 				text-align: center;
 				border: 1px solid rgba(0, 185, 98, 1);
 				position: relative;
-				/deep/.u-icon{
+				::v-deep.u-icon{
 					margin-left: 10rpx;
 				}
 				

pages/newPage/chargeMoney/topUp.vue

@@ -179,7 +179,7 @@
 			font-size: 56rpx;
 			color: #cccccc;
 		}
-		/deep/.uni-input-placeholder{
+		::v-deep.uni-input-placeholder{
 			color: #cccccc;
 		}
 	}
@@ -263,11 +263,11 @@
 		}
 		.radio{
                margin-left:auto;
-			   /deep/.uni-radio-input-checked{
+			   ::v-deep.uni-radio-input-checked{
 				   background-color: #00B962 !important;
 				   border-color: #00B962 !important;
 			   }
-			   /deep/.uni-radio-input{
+			   ::v-deep.uni-radio-input{
 				   width: 38rpx;
 				   height: 38rpx;
 			   }

pages/newPage/chargeMoney/withdraw.vue

@@ -152,11 +152,11 @@
 			}
 			.radio{
 	               margin-left:auto;
-				   /deep/.uni-radio-input-checked{
+				   ::v-deep.uni-radio-input-checked{
 					   background-color: #00B962 !important;
 					   border-color: #00B962 !important;
 				   }
-				   /deep/.uni-radio-input{
+				   ::v-deep.uni-radio-input{
 					   width: 38rpx;
 					   height: 38rpx;
 				   }
@@ -188,7 +188,7 @@
 			font-size: 36rpx;
 			color: #cccccc;
 		}
-		/deep/.uni-input-placeholder{
+		::v-deep.uni-input-placeholder{
 			color: #cccccc;
 		}
 		.all{

pages/parking/outPayment.vue

@@ -1,416 +1,416 @@
-<template>
-	<view>
-		<u-navbar title="无车辆扫码停车" :is-back="false"></u-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>
+<template>
+	<view>
+		<u-navbar title="无车辆扫码停车" :is-back="false"></u-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;
+		  	}
+		  }
+		  ::v-deep.u-radio-group {
+		  	width: 100%;
+		  }
+		  ::v-deep.u-radio {
+		  	position: relative;
+		  }
+		  
+		  ::v-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,345 +1,345 @@
-<template>
-	<view>
-
-		<view class="carNone" v-if="kongResult">
-			<u-navbar title="停车缴费" :is-back="false">
-
-			</u-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 class="info" v-if="detail.disTimesStr!=null && detail.disTimesStr">
-						<view class="info-name">
-							优惠时长
-						</view>
-						<view class="info-text">
-
-							{{detail.disTimesStr}}
-						</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: {
-					price: 0,
-					total: 0,
-					discountMoney: 0,
-					hourCost: 0
-				},
-				kongResult: true,
-			}
-		},
-		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;
-
-	}
+<template>
+	<view>
+
+		<view class="carNone" v-if="kongResult">
+			<u-navbar title="停车缴费" :is-back="false">
+
+			</u-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 class="info" v-if="detail.disTimesStr!=null && detail.disTimesStr">
+						<view class="info-name">
+							优惠时长
+						</view>
+						<view class="info-text">
+
+							{{detail.disTimesStr}}
+						</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: {
+					price: 0,
+					total: 0,
+					discountMoney: 0,
+					hourCost: 0
+				},
+				kongResult: true,
+			}
+		},
+		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;
+	}
+
+	::v-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/search.vue

@@ -1,374 +1,374 @@
-<template>
-	<view>
-		<view class="wrap" v-if="!kongResult">
-			<u-navbar title="车牌查询" :is-back="false">
-			</u-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="true" :mask-close-able="true" :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>
+<template>
+	<view>
+		<view class="wrap" v-if="!kongResult">
+			<u-navbar title="车牌查询" :is-back="false">
+			</u-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="true" :mask-close-able="true" :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;
+	}
+	::v-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/search/search.vue

@@ -1,35 +1,35 @@
-
-<template>
-	<view>
-		<ujp-navbar title="" ref='navbar' id='navbar' :height='nav_height'> 
-			<u-search id='search' ref='search'    placeholder="查询站点地址或站名" @change="search()" v-model="keyword"  @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}}
+
+<template>
+	<view>
+		<ujp-navbar title="" ref='navbar' id='navbar' :height='nav_height'> 
+			<u-search id='search' ref='search'    placeholder="查询站点地址或站名" @change="search()" v-model="keyword"  @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 v-if="quickChargeReduceMethod1(item)&&personInfo&&personInfo.userType==2"
 			style="margin-top: 10rpx;color: rgba(255, 121, 0, 1);font-size: 28rpx;    display: flex; align-items: center;" >
@@ -55,753 +55,753 @@
 				" >活动</span>
 				喜迎国庆，充电有奖
 			</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" >
+				<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"  :style="'border: 1px solid '+tagNameBy(tagName,1)+';color:'+tagNameBy(tagName,1)"
-									:key="tagIndex">{{tagNameBy(tagName,0)}}</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: { 
-			gotoStationDetails(stationData){
-					if(stationData.stationType==50&&stationData.fastNum==0&&stationData.slowNum==1){
-						this.gotoUrl('pages/searchPile/stationAndPile/chargingPileDetails?isback=1&sid=' + stationData.id)
-						
-					}else{
-						this.gotoUrl('pages/searchPile/stationAndPile/stationDetails?id=' + stationData.id)
-					}
-			},
-			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){
-				 this.gotoStationDetails(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,
-					radius:500,
-					 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.radius=500
-				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>
+									:key="tagIndex">{{tagNameBy(tagName,0)}}</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: { 
+			gotoStationDetails(stationData){
+					if(stationData.stationType==50&&stationData.fastNum==0&&stationData.slowNum==1){
+						this.gotoUrl('pages/searchPile/stationAndPile/chargingPileDetails?isback=1&sid=' + stationData.id)
+						
+					}else{
+						this.gotoUrl('pages/searchPile/stationAndPile/stationDetails?id=' + stationData.id)
+					}
+			},
+			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){
+				 this.gotoStationDetails(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,
+					radius:500,
+					 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.radius=500
+				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";
+	
+	::v-deep.u-content[data-v-1a326067] {
+		flex: 0.95;
+		color: #bdbdbd;
+	}
+
+	::v-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/service/service.vue

@@ -147,13 +147,13 @@
 		z-index: 999;
 		background: linear-gradient(180deg, rgba(0, 185, 98, 1) 43%, rgba(246, 246, 246, 1) 100%);
 
-		/deep/.u-navbar {
+		::v-deep.u-navbar {
 			background: none !important;
 			border-bottom: none !important;
 
 		}
 
-		/deep/.u-border-bottom:after {
+		::v-deep.u-border-bottom:after {
 			border-bottom-width: 0px !important;
 		}
 
@@ -220,7 +220,7 @@
 			padding-bottom: 20rpx;
 			border-bottom: 1px solid rgba(246, 246, 246, 1);
 
-			/deep/.u-tab-bar {
+			::v-deep.u-tab-bar {
 				background-color: #00B962 !important;
 			}
 		}

pages/store/commodityDetails.vue

@@ -456,7 +456,7 @@
 </script>
 
 <style lang="scss" scoped>
-	/deep/.u-back-wrap{
+	::v-deep.u-back-wrap{
 		background-color: #fff;
 	}
 	page {
@@ -539,7 +539,7 @@
 		background-color: #fff;
 		    padding: 0 40rpx;
 		padding-bottom: 100px;
-		/deep/img{
+		::v-deepimg{
 			//display: inline-block;
 			width: 100% !important;
 			height: 100% !important;
@@ -618,7 +618,7 @@
 		}
 	}
 
-	/deep/.u-drawer-content {
+	::v-deep.u-drawer-content {
 		border-radius: 12px 12px 0 0;
 
 		.infos {

pages/store/orderConfirm.vue

@@ -764,12 +764,12 @@ import MapLoader from '@/utils/AMap'
 				}
 			}
 
-			/deep/.uni-radio-input-checked {
+			::v-deep.uni-radio-input-checked {
 				background-color: #00b962 !important;
 
 			}
 
-			/deep/.uni-radio-input {
+			::v-deep.uni-radio-input {
 				width: 40rpx !important;
 				height: 40rpx !important;
 			}
@@ -869,7 +869,7 @@ import MapLoader from '@/utils/AMap'
 
 
 
- /deep/.u-mode-center-box{
+ ::v-deep.u-mode-center-box{
 	border-radius: 8px !important;
 }
 uni-input{

pages/temporary/anniversary2024.vue

@@ -1,209 +1,209 @@
-<template>
-	<view class="background">
-		<ujp-navbar title="优电联盟全新上线" bkUrl="/pages/index/index"></ujp-navbar>
-		<view class="backgroundHead" @click="scrollToBottom">
-			<img style="width: 100%;" src="@/assets/img/anniversary/两周年bg.jpg"></img>
-		</view>
-		<view class="btn">
-			<view class="btnCard " :class="{
-				btnCard1:key,
-				btnCard2:!key
-			}">
-				<view class="text1">
-					<view class="text11">服务费免单卷</view>
-					<view class="text12">有效期{{str}}，逾期作废，已使用过免单卷的无法再次领取</view>
-				</view>
-				<view class="text2" v-if="key" @click="exchangeBtn">
-					点击<br />
-					领取
-				</view>
-				<view class="text2" v-if="!key" @click="exchangeBtn2">
-					领取<br />
-					成功
-				</view>
-			</view>
-			<view class="option">
-				<u-button size="medium" type="error" @click="show=true">活动规则</u-button>
-				<u-button size="medium" type="error" @click="gotoUrl('pages/user/coupon/myCoupon')">我的优惠券</u-button>
-			</view>
-		</view>
-		<u-popup v-model="show" class="u-popup-class" border-radius="56" mode="center">
-			<view class="popupMain">
-				<view class="popup-content">
-					<view class="p-head">活动规则</view>
-					<view class="p-title">
-						活动对象：
-					</view>
-					<view class="p-value">
-						优电联盟会员
-					</view>
-					<view class="p-title">
-						活动时间：
-					</view>
-					<view class="p-value">
-						{{str}}（以订单开始充电时间为准）
-					</view>
-					<view class="p-title">
-						活动范围：
-					</view>
-					<view class="p-value">
-						所有优电联盟充电站
-					</view>
-					<view class="p-title">
-						活动内容：
-					</view>
-					<view class="p-value">
-
-
-						51充电联盟二周年之际，完成品牌升级并更名为“优电联盟”，“优电联盟”将一贯秉承“共建、共享、共赢”理念，为用户提供更优充电服务。
-						<br />优电联盟会员可领取一张“<span
-							style="font-weight: bold;">服务费免单券</span>”，充电时使用本券可免单次充电服务费，每个账号可领取一次，该券使用有效期为{{str}}，共7天，超过有效期无法使用。
-						<br /><br />1.已使用过免单卷的无法再次领取
-						<br />2.为方便用户使用“服务费免单券”，快捷充电功能将暂停，活动结束后快捷充电功能将恢复。
-
-					</view>
-					<view class="p-btn-view">
-						<view class="p-btn" @click="show=false">知道了</view>
-					</view>
-				</view>
-			</view>
-		</u-popup>
-
-		<u-popup v-model="show2" class="u-popup-class" border-radius="56" mode="center">
-			<view class="popupMain">
-				<view class="popup-content" style="
-    text-align: center;    padding: 60rpx;
-">
-					<view class="p-title">
-						<img style="height: 256rpx;width: 256rpx;" src="@/assets/img/anniversary/lq2.png">
-					</view>
-
-					<view class="p-title" style="color: rgba(100, 58, 28, 1);
-font-size: 48rpx;">
-
-						提示
-					</view>
-					<view class="p-value" style="color: rgba(100, 58, 28, 1);
-font-size: 32rpx;">
-						已使用过免单卷的无法再次领取
-
-					</view>
-					<view class="p-btn-view">
-						<view class="p-btn" @click="show2=false">知道了</view>
-					</view>
-				</view>
-			</view>
-		</u-popup>
-		<u-popup v-model="show3" class="u-popup-class popupMain2" border-radius="56" mode="center">
-			<view class="popupMain ">
-				<view class="popupMain-main ">
-					<view class="popup-content" style=" text-align: center;    padding: 60rpx;">
-						<view class="p-title">
-							<img style="height: 256rpx;width: 256rpx;" src="@/assets/img/anniversary/lq1.png">
-						</view>
-
-						<view class="p-title" style="color: rgba(100, 58, 28, 1);
-font-size: 48rpx;">
-							领取成功
-						</view>
-						<view class="p-value">
-
-
-						</view>
-						<view class="p-btn-view">
-							<view class="p-btn" @click="redirectToInfo('/pages/index/index')">去充电</view>
-						</view>
-					</view>
-
-				</view>
-				<u-image width="36px" style="margin: auto;margin-top: 10rpx;" mode="widthFix" @click="show3=false"
-					src="../../assets/img/if-close-line-circled.png"></u-image>
-			</view>
-		</u-popup>
-
-		<u-popup v-model="show4" class="u-popup-class popupMain2" border-radius="56" mode="center">
-			<view class="popupMain ">
-				<view class="popupMain-main ">
-					<view class="popup-content" style="
-		    text-align: center;    padding: 60rpx;
-		">
-						<view class="p-title">
-							<img style="height: 256rpx;width: 256rpx;" src="@/assets/img/anniversary/lq1.png">
-						</view>
-
-						<view class="p-title" style="color: rgba(100, 58, 28, 1);font-size: 48rpx;">
-
-						</view>
-
-						<view class="p-value" style="color: rgba(100, 58, 28, 1);
-								font-size: 32rpx;">
-							有效期{{str}}，逾期作废，已使用过免单卷的无法再次领取
-
-						</view>
-						<view class="p-btn-view">
-							<view class="p-btn" @click="redirectToInfo('/pages/index/index')">返回首页</view>
-						</view>
-					</view>
-
-				</view>
-				<u-image width="36px" style="margin: auto;margin-top: 10rpx;" mode="widthFix" @click="show4=false"
-					src="../../assets/img/if-close-line-circled.png"></u-image>
-			</view>
-		</u-popup>
-		<u-popup v-model="show5" class="u-popup-class popupMain2" border-radius="56" mode="center">
-			<view class="popupMain ">
-				<view class="popupMain-main ">
-					<view class="popup-content" style="
-				    text-align: center;    padding: 60rpx;
-				">
-						<view class="p-title">
-							<img style="height: 256rpx;width: 256rpx;" src="@/assets/img/anniversary/lq2.png">
-						</view>
-
-						<view class="p-title" style="color: rgba(100, 58, 28, 1);font-size: 48rpx;">
-							游客无法兑换,是否前往注册？
-						</view>
-						<view class="p-value">
-
-
-						</view>
-						<view class="p-btn-view">
-							<view class="p-btn" @click="redirectToInfo('/pages/login/login')">前往注册</view>
-						</view>
-					</view>
-
-				</view>
-				<u-image width="36px" style="margin: auto;margin-top: 10rpx;" mode="widthFix" @click="show5=false"
+<template>
+	<view class="background">
+		<ujp-navbar title="优电联盟全新上线" bkUrl="/pages/index/index"></ujp-navbar>
+		<view class="backgroundHead" @click="scrollToBottom">
+			<img style="width: 100%;" src="@/assets/img/anniversary/两周年bg.jpg"></img>
+		</view>
+		<view class="btn">
+			<view class="btnCard " :class="{
+				btnCard1:key,
+				btnCard2:!key
+			}">
+				<view class="text1">
+					<view class="text11">服务费免单卷</view>
+					<view class="text12">有效期{{str}}，逾期作废，已使用过免单卷的无法再次领取</view>
+				</view>
+				<view class="text2" v-if="key" @click="exchangeBtn">
+					点击<br />
+					领取
+				</view>
+				<view class="text2" v-if="!key" @click="exchangeBtn2">
+					领取<br />
+					成功
+				</view>
+			</view>
+			<view class="option">
+				<u-button size="medium" type="error" @click="show=true">活动规则</u-button>
+				<u-button size="medium" type="error" @click="gotoUrl('pages/user/coupon/myCoupon')">我的优惠券</u-button>
+			</view>
+		</view>
+		<u-popup v-model="show" class="u-popup-class" border-radius="56" mode="center">
+			<view class="popupMain">
+				<view class="popup-content">
+					<view class="p-head">活动规则</view>
+					<view class="p-title">
+						活动对象：
+					</view>
+					<view class="p-value">
+						优电联盟会员
+					</view>
+					<view class="p-title">
+						活动时间：
+					</view>
+					<view class="p-value">
+						{{str}}（以订单开始充电时间为准）
+					</view>
+					<view class="p-title">
+						活动范围：
+					</view>
+					<view class="p-value">
+						所有优电联盟充电站
+					</view>
+					<view class="p-title">
+						活动内容：
+					</view>
+					<view class="p-value">
+
+
+						51充电联盟二周年之际，完成品牌升级并更名为“优电联盟”，“优电联盟”将一贯秉承“共建、共享、共赢”理念，为用户提供更优充电服务。
+						<br />优电联盟会员可领取一张“<span
+							style="font-weight: bold;">服务费免单券</span>”，充电时使用本券可免单次充电服务费，每个账号可领取一次，该券使用有效期为{{str}}，共7天，超过有效期无法使用。
+						<br /><br />1.已使用过免单卷的无法再次领取
+						<br />2.为方便用户使用“服务费免单券”，快捷充电功能将暂停，活动结束后快捷充电功能将恢复。
+
+					</view>
+					<view class="p-btn-view">
+						<view class="p-btn" @click="show=false">知道了</view>
+					</view>
+				</view>
+			</view>
+		</u-popup>
+
+		<u-popup v-model="show2" class="u-popup-class" border-radius="56" mode="center">
+			<view class="popupMain">
+				<view class="popup-content" style="
+    text-align: center;    padding: 60rpx;
+">
+					<view class="p-title">
+						<img style="height: 256rpx;width: 256rpx;" src="@/assets/img/anniversary/lq2.png">
+					</view>
+
+					<view class="p-title" style="color: rgba(100, 58, 28, 1);
+font-size: 48rpx;">
+
+						提示
+					</view>
+					<view class="p-value" style="color: rgba(100, 58, 28, 1);
+font-size: 32rpx;">
+						已使用过免单卷的无法再次领取
+
+					</view>
+					<view class="p-btn-view">
+						<view class="p-btn" @click="show2=false">知道了</view>
+					</view>
+				</view>
+			</view>
+		</u-popup>
+		<u-popup v-model="show3" class="u-popup-class popupMain2" border-radius="56" mode="center">
+			<view class="popupMain ">
+				<view class="popupMain-main ">
+					<view class="popup-content" style=" text-align: center;    padding: 60rpx;">
+						<view class="p-title">
+							<img style="height: 256rpx;width: 256rpx;" src="@/assets/img/anniversary/lq1.png">
+						</view>
+
+						<view class="p-title" style="color: rgba(100, 58, 28, 1);
+font-size: 48rpx;">
+							领取成功
+						</view>
+						<view class="p-value">
+
+
+						</view>
+						<view class="p-btn-view">
+							<view class="p-btn" @click="redirectToInfo('/pages/index/index')">去充电</view>
+						</view>
+					</view>
+
+				</view>
+				<u-image width="36px" style="margin: auto;margin-top: 10rpx;" mode="widthFix" @click="show3=false"
 					src="../../assets/img/if-close-line-circled.png"></u-image>
-				
-			</view>
-		</u-popup>
+			</view>
+		</u-popup>
+
+		<u-popup v-model="show4" class="u-popup-class popupMain2" border-radius="56" mode="center">
+			<view class="popupMain ">
+				<view class="popupMain-main ">
+					<view class="popup-content" style="
+		    text-align: center;    padding: 60rpx;
+		">
+						<view class="p-title">
+							<img style="height: 256rpx;width: 256rpx;" src="@/assets/img/anniversary/lq1.png">
+						</view>
+
+						<view class="p-title" style="color: rgba(100, 58, 28, 1);font-size: 48rpx;">
+
+						</view>
+
+						<view class="p-value" style="color: rgba(100, 58, 28, 1);
+								font-size: 32rpx;">
+							有效期{{str}}，逾期作废，已使用过免单卷的无法再次领取
+
+						</view>
+						<view class="p-btn-view">
+							<view class="p-btn" @click="redirectToInfo('/pages/index/index')">返回首页</view>
+						</view>
+					</view>
+
+				</view>
+				<u-image width="36px" style="margin: auto;margin-top: 10rpx;" mode="widthFix" @click="show4=false"
+					src="../../assets/img/if-close-line-circled.png"></u-image>
+			</view>
+		</u-popup>
+		<u-popup v-model="show5" class="u-popup-class popupMain2" border-radius="56" mode="center">
+			<view class="popupMain ">
+				<view class="popupMain-main ">
+					<view class="popup-content" style="
+				    text-align: center;    padding: 60rpx;
+				">
+						<view class="p-title">
+							<img style="height: 256rpx;width: 256rpx;" src="@/assets/img/anniversary/lq2.png">
+						</view>
+
+						<view class="p-title" style="color: rgba(100, 58, 28, 1);font-size: 48rpx;">
+							游客无法兑换,是否前往注册？
+						</view>
+						<view class="p-value">
+
+
+						</view>
+						<view class="p-btn-view">
+							<view class="p-btn" @click="redirectToInfo('/pages/login/login')">前往注册</view>
+						</view>
+					</view>
+
+				</view>
+				<u-image width="36px" style="margin: auto;margin-top: 10rpx;" mode="widthFix" @click="show5=false"
+					src="../../assets/img/if-close-line-circled.png"></u-image>
+				
+			</view>
+		</u-popup>
 		<view class="slogan-4">
 			活动时间 ： {{str}}
-		</view>
-	</view>
-</template>
-
-<script>
-	import * as userApi from '@/apis/user.js'
-	import {
-		checkPhone,newDate
-	} from '@/utils'
-
-	export default {
-		data() {
-			return {
-				one: true,
-				show: false, //活动规则
-				show2: false, //已使用
-				show3: false, //领取成功
-				show4: false, //已领取
-				show5: false, //游客
-				str:"",
-				couponList: [],
-				key: "",
-			}
-		},
+		</view>
+	</view>
+</template>
+
+<script>
+	import * as userApi from '@/apis/user.js'
+	import {
+		checkPhone,newDate
+	} from '@/utils'
+
+	export default {
+		data() {
+			return {
+				one: true,
+				show: false, //活动规则
+				show2: false, //已使用
+				show3: false, //领取成功
+				show4: false, //已领取
+				show5: false, //游客
+				str:"",
+				couponList: [],
+				key: "",
+			}
+		},
 		onReady() {
 			
 			//this.str="5月18日12:00至25日12:00"
@@ -214,237 +214,237 @@ font-size: 48rpx;">
 			if(time3>time1){
 				this.str="至6月1日12:00-8日12:00"
 			}
-			
-			this.getf5surprised()
-		},
-		methods: {
-			scrollToBottom() {
-				// 使用uni.pageScrollTo方法滚动到指定位置  
-				uni.pageScrollTo({
-					scrollTop: 99999, // 设置一个足够大的值，确保滚动到最底部  
-					duration: 300 // 滚动动画时长，单位ms  
-				});
-			},
-			exchangeBtn2() {
-				this.show4 = true
-			},
-			exchangeBtn() {
-				var user = this.carhelp.getPersonInfo()
-				if (user.userType == 1) {
-					this.show5 = true
-				} else {
-					if (!this.key) {
-						return
-					}
-					uni.showLoading({
-						title: "加载中",
-						mask: true,
-					})
-					userApi.exchangeByGroupFive({
-						key: this.key
-					}).then((res) => {
-						uni.hideLoading();
-						this.getf5surprised()
-						this.show3 = true;
-
-
-					}).catch(error => {
-						//this.showNt = false;
-						uni.showToast({
-							title: error,
-							icon: "none"
-						})
-					})
-				}
-
-			},
-			redirectToInfo(url) {
-
-
-				uni.redirectTo({
-					url: url
-				})
-			},
-			getf5surprised() {
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				userApi.exchangeGroupDetail2("周年红包").then((res) => {
-					uni.hideLoading();
-					var data = res.data;
-					this.key = ""
-					this.couponList = []
-
-					if (data.length) {
-						this.couponList = res.data[0].couponList;
-
-						if (this.couponList && this.couponList.length) {
-							this.key = res.data[0].key;
-						}
-					}
-
-					if (res.message == "已使用") {
-
-						this.show2 = true
-					}
-
-
-
-				}).catch(error => {
-
-					uni.showToast({
-						title: error,
-						icon: "none"
-					})
-				})
-			},
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	page {
-		background-color: #eabe9a;
-	}
-
-	.btn {
-		padding: 40rpx;
-		top: -40rpx;
-		background-color: #eabe9a;
-		position: relative;
-		border-radius: 10px 10px 0px 0px;
-
-	}
-
-	.btnCard {
-		//padding: 40rpx;
-		background-size: 100% 100%;
-		display: flex;
-		justify-content: space-between;
-
-		.text1 {
-			padding: 40rpx;
-			width: 484rpx;
-			color: #7D2B00;
-
-			.text11 {
-				font-size: 40rpx;
-				font-weight: bold;
-			}
-
-			.text12 {
-				font-size: 28rpx;
-			}
-		}
-
-		.text2 {
-			font-size: 36rpx;
-			color: rgba(255, 255, 255, 1);
-			padding: 40rpx;
-			display: flex;
-			width: 188rpx;
-			align-items: center;
-			justify-content: center;
-		}
-	}
-
-	.btnCard1 {
-		background-image: url("@/assets/img/anniversary/ticket_1.png");
-	}
-
-	.btnCard2 {
-		background-image: url("@/assets/img/anniversary/ticket_2.png");
-	}
-
-	.option {
-		display: flex;
-		margin-top: 40rpx;
-		margin-bottom: 60rpx;
-		justify-content: space-between;
-
-		/deep/.u-btn {
-			width: 320rpx;
-			margin: 0;
-			border-color: #FE280F;
-			background-color: #FE280F;
-		}
-	}
-
-	.u-popup-class {
-		margin: 40rpx;
-
-	}
-
-	/deep/.uni-scroll-view {
-		border-radius: 40rpx;
-	}
-
-	/deep/.u-mode-center-box {
-		background: linear-gradient(180deg, rgba(255, 179, 147, 1) 0%, rgba(246, 234, 214, 1) 100%);
-
-
-		padding: 20rpx;
-	}
-
-	.popupMain2 {
-		/deep/.u-mode-center-box {
-			background: none !important;
-			;
-
-
-			//padding: 20rpx;
-		}
-
-		.popupMain-main {
-			padding: 20rpx;
-			border-radius: 20px;
-			background: linear-gradient(180deg, rgba(255, 179, 147, 1) 0%, rgba(246, 234, 214, 1) 100%);
-
-		}
-	}
-
-	.popupMain {
-
-		.popup-content {
-			padding: 20rpx;
-			border-radius: 20px;
-			background-color: rgba(255, 255, 255, 1);
-
-			.p-head {
-				text-align: center;
-				color: rgba(100, 58, 28, 1);
-				font-size: 56rpx;
-				font-weight: bold;
-				margin: 16rpx;
-			}
-
-			.p-title {
-				font-weight: bold;
-				font-size: 32rpx;
-				margin-bottom: 12rpx;
-			}
-
-			.p-value {
-				font-size: 28rpx;
-				margin-bottom: 28rpx;
-			}
-
-			.p-btn-view {
-				.p-btn {
-					background: linear-gradient(180deg, rgba(253, 133, 93, 1) 0%, rgba(230, 68, 53, 1) 100%);
-					color: rgba(255, 255, 255, 1);
-					font-size: 40rpx;
-					width: 460rpx;
-					border-radius: 50px;
-					padding: 20rpx;
-					text-align: center;
-					margin: auto;
-
-				}
-			}
-
-		}
+			
+			this.getf5surprised()
+		},
+		methods: {
+			scrollToBottom() {
+				// 使用uni.pageScrollTo方法滚动到指定位置  
+				uni.pageScrollTo({
+					scrollTop: 99999, // 设置一个足够大的值，确保滚动到最底部  
+					duration: 300 // 滚动动画时长，单位ms  
+				});
+			},
+			exchangeBtn2() {
+				this.show4 = true
+			},
+			exchangeBtn() {
+				var user = this.carhelp.getPersonInfo()
+				if (user.userType == 1) {
+					this.show5 = true
+				} else {
+					if (!this.key) {
+						return
+					}
+					uni.showLoading({
+						title: "加载中",
+						mask: true,
+					})
+					userApi.exchangeByGroupFive({
+						key: this.key
+					}).then((res) => {
+						uni.hideLoading();
+						this.getf5surprised()
+						this.show3 = true;
+
+
+					}).catch(error => {
+						//this.showNt = false;
+						uni.showToast({
+							title: error,
+							icon: "none"
+						})
+					})
+				}
+
+			},
+			redirectToInfo(url) {
+
+
+				uni.redirectTo({
+					url: url
+				})
+			},
+			getf5surprised() {
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				userApi.exchangeGroupDetail2("周年红包").then((res) => {
+					uni.hideLoading();
+					var data = res.data;
+					this.key = ""
+					this.couponList = []
+
+					if (data.length) {
+						this.couponList = res.data[0].couponList;
+
+						if (this.couponList && this.couponList.length) {
+							this.key = res.data[0].key;
+						}
+					}
+
+					if (res.message == "已使用") {
+
+						this.show2 = true
+					}
+
+
+
+				}).catch(error => {
+
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	page {
+		background-color: #eabe9a;
+	}
+
+	.btn {
+		padding: 40rpx;
+		top: -40rpx;
+		background-color: #eabe9a;
+		position: relative;
+		border-radius: 10px 10px 0px 0px;
+
+	}
+
+	.btnCard {
+		//padding: 40rpx;
+		background-size: 100% 100%;
+		display: flex;
+		justify-content: space-between;
+
+		.text1 {
+			padding: 40rpx;
+			width: 484rpx;
+			color: #7D2B00;
+
+			.text11 {
+				font-size: 40rpx;
+				font-weight: bold;
+			}
+
+			.text12 {
+				font-size: 28rpx;
+			}
+		}
+
+		.text2 {
+			font-size: 36rpx;
+			color: rgba(255, 255, 255, 1);
+			padding: 40rpx;
+			display: flex;
+			width: 188rpx;
+			align-items: center;
+			justify-content: center;
+		}
+	}
+
+	.btnCard1 {
+		background-image: url("@/assets/img/anniversary/ticket_1.png");
+	}
+
+	.btnCard2 {
+		background-image: url("@/assets/img/anniversary/ticket_2.png");
+	}
+
+	.option {
+		display: flex;
+		margin-top: 40rpx;
+		margin-bottom: 60rpx;
+		justify-content: space-between;
+
+		::v-deep.u-btn {
+			width: 320rpx;
+			margin: 0;
+			border-color: #FE280F;
+			background-color: #FE280F;
+		}
+	}
+
+	.u-popup-class {
+		margin: 40rpx;
+
+	}
+
+	::v-deep.uni-scroll-view {
+		border-radius: 40rpx;
+	}
+
+	::v-deep.u-mode-center-box {
+		background: linear-gradient(180deg, rgba(255, 179, 147, 1) 0%, rgba(246, 234, 214, 1) 100%);
+
+
+		padding: 20rpx;
+	}
+
+	.popupMain2 {
+		::v-deep.u-mode-center-box {
+			background: none !important;
+			;
+
+
+			//padding: 20rpx;
+		}
+
+		.popupMain-main {
+			padding: 20rpx;
+			border-radius: 20px;
+			background: linear-gradient(180deg, rgba(255, 179, 147, 1) 0%, rgba(246, 234, 214, 1) 100%);
+
+		}
+	}
+
+	.popupMain {
+
+		.popup-content {
+			padding: 20rpx;
+			border-radius: 20px;
+			background-color: rgba(255, 255, 255, 1);
+
+			.p-head {
+				text-align: center;
+				color: rgba(100, 58, 28, 1);
+				font-size: 56rpx;
+				font-weight: bold;
+				margin: 16rpx;
+			}
+
+			.p-title {
+				font-weight: bold;
+				font-size: 32rpx;
+				margin-bottom: 12rpx;
+			}
+
+			.p-value {
+				font-size: 28rpx;
+				margin-bottom: 28rpx;
+			}
+
+			.p-btn-view {
+				.p-btn {
+					background: linear-gradient(180deg, rgba(253, 133, 93, 1) 0%, rgba(230, 68, 53, 1) 100%);
+					color: rgba(255, 255, 255, 1);
+					font-size: 40rpx;
+					width: 460rpx;
+					border-radius: 50px;
+					padding: 20rpx;
+					text-align: center;
+					margin: auto;
+
+				}
+			}
+
+		}
 	}
 	.slogan-4 {
 		
@@ -461,5 +461,5 @@ font-size: 48rpx;">
 		    color: #fff;
 		
 	
-	}
+	}
 </style>

pages/temporary/autumn202409.vue

@@ -1,33 +1,33 @@
 <template>
-	
-	<view class="all">
-	
-		<ujp-navbar title="金秋满减活动" ></ujp-navbar>
-		<view class="InviteFriends" >
-			<view class="text imgHead">
+	
+	<view class="all">
+	
+		<ujp-navbar title="金秋满减活动" ></ujp-navbar>
+		<view class="InviteFriends" >
+			<view class="text imgHead">
 				<img  src="@/assets/img/temporary/autumn202409-01.png"></img>
-				
-				
-			</view>
-			<view class="main">
-
-				<view class="suited">
-					<p class="title">活动时间 :</p>
-					<view class="content">
-						2024年9月1日至9月30日
-
-					</view>
-
-
-					<p class="title">活动说明 :</p>
+				
+				
+			</view>
+			<view class="main">
+
+				<view class="suited">
+					<p class="title">活动时间 :</p>
 					<view class="content">
+						2024年9月1日至9月30日
+
+					</view>
+
+
+					<p class="title">活动说明 :</p>
+					<view class="content">
+						
 						
-						
 						
 						凡是在活动期间内，在<span>指定场站</span>充电的平台会员可享受充电服务费8.5折优惠，
 						<span>快充且充电量达30度（含）以上可享受充电服务费6.5折-7.5折</span>（电费、停车费及占桩费据实结算）。
-						
-
+						
+
 					</view>
 					
 					<p class="title">活动场站：</p>
@@ -54,31 +54,31 @@
 						注：本活动以充电开始时间为准。<br/>
 						本次活动最终解释权归湖北鹏育优电新能源科技有限公司所有
 					
-					</view>
-					 
-				</view>
-
-			
-				
+					</view>
+					 
+				</view>
+
+			
+				
 				
 					
-					
-			</view>
-		</view>
-		
-
-	</view>
-</template>
-
+					
+			</view>
+		</view>
+		
+
+	</view>
+</template>
+
 <script>
-	
-
-
-	export default {
-		components: {
-		
-		},
-		data() {
+	
+
+
+	export default {
+		components: {
+		
+		},
+		data() {
 			return {
 				list:[
 					{
@@ -106,79 +106,79 @@
 						name:"联合街道充电站",
 						num:75,
 					}
-				]
-
-			}
-		},
-		onLoad(op) {
+				]
+
+			}
+		},
+		onLoad(op) {
+			
+			
+		},
+		onReady() {
+			
 			
-			
-		},
-		onReady() {
-			
-			
-		},
-		onShow() {
-
-			
-
-		},
+		},
+		onShow() {
+
+			
+
+		},
 		methods: {
 			gotoStation(id){
 				uni.navigateTo({
 					url:"/pages/searchPile/stationAndPile/stationDetails?id="+id
 				})
-			}
-		}
-	}
-</script>
-<style>
-	page {
-		background: #f3a33a;
-	}
-</style>
-<style lang="scss" scoped>
-	@import "@/_theme.scss";
-
-	.all {
-		@include themeify {
-			font-size: themed('font-size1');
-		}
+			}
+		}
+	}
+</script>
+<style>
+	page {
+		background: #f3a33a;
+	}
+</style>
+<style lang="scss" scoped>
+	@import "@/_theme.scss";
+
+	.all {
+		@include themeify {
+			font-size: themed('font-size1');
+		}
 	}
 	 .imgHead {
 		img {
 		 			width: 100%;
 				} 
-	 }
-
-	// .imgHead {
-	// 	padding-top: 72rpx;
-	// 	display: flex;
-	// 	flex-direction: column;
-	// 	align-items: center;
-
-	// 	.imgHead1 {
-	// 		img {
-	// 			height: 24px;
-	// 		}
-
-	// 		display: flex;
+	 }
+
+	// .imgHead {
+	// 	padding-top: 72rpx;
+	// 	display: flex;
+	// 	flex-direction: column;
+	// 	align-items: center;
+
+	// 	.imgHead1 {
+	// 		img {
+	// 			height: 24px;
+	// 		}
+
+	// 		display: flex;
 	// 		justify-content: center;
-	// 		align-items: center;
-	// 	}
-
-	// 	.imgHead2 {
-
-	// 		display: flex;
-
-	// 		img {
-	// 			width: 100%;
-	// 			height: 40px;
-	// 		}
-
-	// 		margin-top: 16px;
-	// 	}
-	// }
+	// 		align-items: center;
+	// 	}
+
+	// 	.imgHead2 {
+
+	// 		display: flex;
+
+	// 		img {
+	// 			width: 100%;
+	// 			height: 40px;
+	// 		}
+
+	// 		margin-top: 16px;
+	// 	}
+	// }
 	.contentList{
 		.item{
 			border: 1px solid rgba(232, 229, 225, 1);
@@ -220,61 +220,61 @@
 
 			}
 		}
-	}
-	.main {
+	}
+	.main {
 		position: relative;
-		top: -200rpx;
-		padding: 22rpx 24rpx 10rpx;
-
-		.text {
-			color: rgba(255, 255, 255, 100);
-
-		
-
-			/*		   font-size: 18px;*/
-			text-align: justify;
-			text-indent: 36px;
-
-
-		}
-
-		.suited {
-			background-color: #fff;
-			//background: linear-gradient(180deg, rgba(189,255,224,1) 0%,rgba(255,255,255,1) 14%);
-		//	background: linear-gradient(180deg, rgba(255, 224, 223, 1) 0%, rgba(255, 255, 255, 1) 14%);
+		top: -200rpx;
+		padding: 22rpx 24rpx 10rpx;
+
+		.text {
+			color: rgba(255, 255, 255, 100);
+
+		
+
+			/*		   font-size: 18px;*/
+			text-align: justify;
+			text-indent: 36px;
+
+
+		}
+
+		.suited {
+			background-color: #fff;
+			//background: linear-gradient(180deg, rgba(189,255,224,1) 0%,rgba(255,255,255,1) 14%);
+		//	background: linear-gradient(180deg, rgba(255, 224, 223, 1) 0%, rgba(255, 255, 255, 1) 14%);
 			//background: linear-gradient(180deg, rgba(214,226,255,1) 0%,rgba(255,255,255,1) 14%);
-			margin-top: 40rpx;
-			padding: 40rpx 32rpx;
-			border-radius: 20px;
-
-			.title {
-				/*height: 18px;*/
-				color: rgba(16, 16, 16, 100);
-
-
-
-				font-size: 32rpx;
-				font-weight: 600;
-			}
+			margin-top: 40rpx;
+			padding: 40rpx 32rpx;
+			border-radius: 20px;
+
+			.title {
+				/*height: 18px;*/
+				color: rgba(16, 16, 16, 100);
+
+
+
+				font-size: 32rpx;
+				font-weight: 600;
+			}
 			.remarks{
 				color: rgba(188, 188, 188, 1);
 				font-size: 22rpx;
 				margin-top: 40rpx;
-			}
-			.content {
-				margin: 16rpx 0 40rpx ;
-				//font-weight: 550;
-				color: #333333 ;
-				
-				font-size: 28rpx;
+			}
+			.content {
+				margin: 16rpx 0 40rpx ;
+				//font-weight: 550;
+				color: #333333 ;
+				
+				font-size: 28rpx;
 				span{
 					color: #ec4f27;
-				}
-				p {
-					margin: 8rpx 0;
-				}
-			}
-		}
+				}
+				p {
+					margin: 8rpx 0;
+				}
+			}
+		}
 		.application-table {
 			.nezhaImgView{
 				text-align: center;
@@ -282,314 +282,314 @@
 				img{
 					width: 100%;
 				}
-			}
-			background-color: #fff;
-			border-radius: 16px;
-			margin-top: 24px;
-			padding: 24rpx 36rpx;
-			padding-top:8px;
-		}
-
+			}
+			background-color: #fff;
+			border-radius: 16px;
+			margin-top: 24px;
+			padding: 24rpx 36rpx;
+			padding-top:8px;
+		}
+
 		.application-form {
 			//background: linear-gradient(180deg, rgba(214,226,255,1) 0%,rgba(255,255,255,1) 14%);
-			color:#333333;
-			background-color: #fff;
-			border-radius: 16px;
-			margin-top: 24px;
-			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
-			}
-			
-			.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 {
-				font-size: 18px;
-
-				@include themeify {
-
-					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);
-				margin-top: 12px;
-				overflow-y: scroll;
-
-				@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 {
-					width: 50% !important;
-					margin-top: 4px;
-				}
-			}
-
-		}
-
-		.want {
-			/deep/.u-checkbox {
-				margin-top: 8px;
-			}
-		}
-
-		.hint {
-			margin-top: 12px;
-
-			@include themeify {
-				font-size: themed('font-size2');
-				line-height: themed('font-size5');
-			}
-
-			/*
-			font-size: 14px;
-			line-height: 20px;
-			*/
-			text-align: center;
-
-			.tel-num {
-				color: #9FC7FF;
-			}
-		}
-
-		/deep/.u-btn {
-			border-radius: 50px;
-			margin-top: 40rpx;
-		}
-	}
-
-	.InviteFriends {
-		//background-image: linear-gradient(0deg, #a2e9c9, #01b963);
+			color:#333333;
+			background-color: #fff;
+			border-radius: 16px;
+			margin-top: 24px;
+			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
+			}
+			
+			.u-input {
+				border-radius: 50px;
+				background-color: rgba(232, 236, 234, 100);
+				margin-top: 12px;
+
+			}
+
+			::v-deep.uni-input-input {
+				margin: 20px;
+			}
+
+			::v-deep.u-input__right-icon {
+				margin-right: 10px;
+			}
+
+			p {
+				font-size: 18px;
+
+				@include themeify {
+
+					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);
+				margin-top: 12px;
+				overflow-y: scroll;
+
+				@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');
+					}
+				}
+
+				::v-deep.uni-textarea-textarea {
+					width: 90%;
+					padding: 10px 20px;
+
+				}
+
+				::v-deep.u-input__right-icon {
+					display: none;
+				}
+			}
+		}
+
+		.type {
+			.checkbox {
+				margin-top: 12px;
+
+				::v-deep.u-checkbox {
+					width: 50% !important;
+					margin-top: 4px;
+				}
+			}
+
+		}
+
+		.want {
+			::v-deep.u-checkbox {
+				margin-top: 8px;
+			}
+		}
+
+		.hint {
+			margin-top: 12px;
+
+			@include themeify {
+				font-size: themed('font-size2');
+				line-height: themed('font-size5');
+			}
+
+			/*
+			font-size: 14px;
+			line-height: 20px;
+			*/
+			text-align: center;
+
+			.tel-num {
+				color: #9FC7FF;
+			}
+		}
+
+		::v-deep.u-btn {
+			border-radius: 50px;
+			margin-top: 40rpx;
+		}
+	}
+
+	.InviteFriends {
+		//background-image: linear-gradient(0deg, #a2e9c9, #01b963);
 	
-		background: #f3a33a;
-
-	}
-
-
-
-	.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;
-
-		}
-	}
-
-	// .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
-	}
-	
-	.table {
+		background: #f3a33a;
+
+	}
+
+
+
+	.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;
+
+		}
+	}
+
+	// .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
+	}
+	
+	.table {
 		table {
-			color:#010101 ;
-			border-spacing:0;
+			color:#010101 ;
+			border-spacing:0;
 			font-size: 32rpx;
-			
+			
 			.th {
 				
-
+
 				background-color: #f2efef;
-				text-align: center;
-				color:	#101010;
-				font-weight: bold;
-				td{
-					border: 1px solid   #dbdbdb;
+				text-align: center;
+				color:	#101010;
+				font-weight: bold;
+				td{
+					border: 1px solid   #dbdbdb;
 					padding: 12rpx 0;
 					height: 96rpx;
-
-				}
-			}
-	
-			.td1 {
-				text-align: start;
-			//	background-color: rgba(243, 245, 247, 1);
-				width: 132rpx;
+
+				}
+			}
+	
+			.td1 {
+				text-align: start;
+			//	background-color: rgba(243, 245, 247, 1);
+				width: 132rpx;
 				text-align: center;
-
-				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;
-			}
-		}
-	
-	
-	}
+
+				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/temporary/logo0125.vue

@@ -1,8 +1,8 @@
-<template>
+<template>
 	<view class="wrap">
-		<!--年会注册 -->
-		
-
+		<!--年会注册 -->
+		
+
 		<view class="login">
 			<view class="login-title-linear-gradient">
 				<view class="login-title">
@@ -29,165 +29,165 @@
 						<view class="tips">未注册的手机号验证后将自动注册</view>
 					</view>
 				</view>
-			</view>
-			
-			<view class="login-form">
-			
-				<view class="login-form-item">
-					<view class="title">验证码</view>
-					<view class="input">
-						<u-input :customStyle="customStyle" :placeholderStyle="placeholderStyle"
-							v-model="form.verifyCode" type="number" placeholder="请输入验证码"
-							placeholder-style="font-size:16px;color:#ccc;" />
-						<view class="code" :style="isCodeTipsColor ? 'color: #999999;' : ''" @click="getCode">
-							{{codeTips}}</view>
-					</view>
-					<view style="width: 350px;">
-						<u-checkbox-group>
-							<u-checkbox class="tips" active-color="green" v-model="value" shape="circle"
-								@change="checkboxChange()"></u-checkbox>
-						</u-checkbox-group>
-						<span style="font-size: 24rpx;">我已阅读并同意</span>
-						<span @click="gotoUrl('pages/article/details?code=YHXY')" style="color: #3fbd70;font-size: 24rpx;">《会员协议》</span>和
-						<span @click="gotoUrl('pages/article/details?code=YSZC')" style="color: #3fbd70;font-size: 24rpx;">《隐私协议》</span>
-					</view>
-				</view>
-			</view>
-			<u-button :style="[inputStyle]" class="login-btn" type="success" shape="circle" @click="login">登录</u-button>
-			<u-verification-code :seconds="sendMsgSecond" ref="uCode" @change="codeChange" @end="end" @start="start"
-				change-text="已发送(Xs)">
-			</u-verification-code>
-		</view>
-
-		<view class="foot" v-if="!show2">
-			<span style="color: red;">*</span>我们将使用您的微信昵称及头像，为您补全本平台帐号相关基础信息，请点击下方“<span
-				style="color: #3fbd70;">使用完整服务</span>”。
-		</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>
-
-
-
-
-	</view>
-</template>
-
-<script>
-	import * as loginApi from '@/apis/login.js'
-	import * as API from '@/apis/index.js'
-	import * as API_weixin from '@/apis/weixin.js'
-
-	import {
-		checkPhone
-	} from '@/utils'
-
-	export default {
-		data() {
-			return {
-				elderMode: false,
-				customStyle: {
-					'font-size': '28rpx'
-				},
-				placeholderStyle: "font-size:28rpx",
-				form: {
-					telephone: '',
-					verifyCode: '',
-				},
-				activityInfo: null,
-				isSendMsgIng: false,
-				isCodeTipsColor: false,
-				sendMsgSecond: 60,
-				codeTips: '',
-				value: false,
-				code: '',
-				codeId: '',
-				projectName: '',
-				show1: false,
-				show2: false,
-				show3: false,
-				touristBl: false,
-				personInfo: null,
-				member: false,
-
-			}
-		},
-		computed: {
-			inputStyle() {
-				let style = {};
-				if (this.form.telephone) {
-					style.color = "#fff";
-					style.backgroundColor = this.$u.color['success'];
-				}
-				return style;
-			}
-		},
-		onLoad(op) {
-			this.projectName = process.car.ProjectName;
-			if (op.member) {
-				this.member = true;
+			</view>
+			
+			<view class="login-form">
+			
+				<view class="login-form-item">
+					<view class="title">验证码</view>
+					<view class="input">
+						<u-input :customStyle="customStyle" :placeholderStyle="placeholderStyle"
+							v-model="form.verifyCode" type="number" placeholder="请输入验证码"
+							placeholder-style="font-size:16px;color:#ccc;" />
+						<view class="code" :style="isCodeTipsColor ? 'color: #999999;' : ''" @click="getCode">
+							{{codeTips}}</view>
+					</view>
+					<view style="width: 350px;">
+						<u-checkbox-group>
+							<u-checkbox class="tips" active-color="green" v-model="value" shape="circle"
+								@change="checkboxChange()"></u-checkbox>
+						</u-checkbox-group>
+						<span style="font-size: 24rpx;">我已阅读并同意</span>
+						<span @click="gotoUrl('pages/article/details?code=YHXY')" style="color: #3fbd70;font-size: 24rpx;">《会员协议》</span>和
+						<span @click="gotoUrl('pages/article/details?code=YSZC')" style="color: #3fbd70;font-size: 24rpx;">《隐私协议》</span>
+					</view>
+				</view>
+			</view>
+			<u-button :style="[inputStyle]" class="login-btn" type="success" shape="circle" @click="login">登录</u-button>
+			<u-verification-code :seconds="sendMsgSecond" ref="uCode" @change="codeChange" @end="end" @start="start"
+				change-text="已发送(Xs)">
+			</u-verification-code>
+		</view>
+
+		<view class="foot" v-if="!show2">
+			<span style="color: red;">*</span>我们将使用您的微信昵称及头像，为您补全本平台帐号相关基础信息，请点击下方“<span
+				style="color: #3fbd70;">使用完整服务</span>”。
+		</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>
+
+
+
+
+	</view>
+</template>
+
+<script>
+	import * as loginApi from '@/apis/login.js'
+	import * as API from '@/apis/index.js'
+	import * as API_weixin from '@/apis/weixin.js'
+
+	import {
+		checkPhone
+	} from '@/utils'
+
+	export default {
+		data() {
+			return {
+				elderMode: false,
+				customStyle: {
+					'font-size': '28rpx'
+				},
+				placeholderStyle: "font-size:28rpx",
+				form: {
+					telephone: '',
+					verifyCode: '',
+				},
+				activityInfo: null,
+				isSendMsgIng: false,
+				isCodeTipsColor: false,
+				sendMsgSecond: 60,
+				codeTips: '',
+				value: false,
+				code: '',
+				codeId: '',
+				projectName: '',
+				show1: false,
+				show2: false,
+				show3: false,
+				touristBl: false,
+				personInfo: null,
+				member: false,
+
+			}
+		},
+		computed: {
+			inputStyle() {
+				let style = {};
+				if (this.form.telephone) {
+					style.color = "#fff";
+					style.backgroundColor = this.$u.color['success'];
+				}
+				return style;
+			}
+		},
+		onLoad(op) {
+			this.projectName = process.car.ProjectName;
+			if (op.member) {
+				this.member = true;
 			}
 			if (op.jpcode2) {
 				this.code = op.jpcode2;
 			}
 			if (op.codeId) {
 				this.codeId = op.codeId;
-			}
-			if (op.jpcode) {
-
-				var str1 = op.jpcode.slice(0, 19);
-				var str2 = op.jpcode.slice(20, 21);
-				var str3 = op.jpcode.slice(22);
-
-				if (str1 == 'jp_team51_charge_id') {
-					if (str2 == 'A') {
-						this.code = str2;
-						this.codeId = str3;
-						uni.showToast({
-							title: "注册后享受充电服务"
-						})
-					}
-				}
-
-			}
-			var obj = this.carhelp.get("friends_invitation")
-
-			if (obj) {
-				if (obj.date + 1000 * 60 * 60 * 24 > new Date().getTime()) {
-					this.form.inviteId = obj.op.uid
-					this.form.code = obj.op.icode
-					this.activityInfo = "true";
-				}
-
-			}
-			
-			this.personInfo = this.carhelp.getPersonInfo()
-			if (this.personInfo) {
-				if (this.personInfo.userType == "1") {
-
+			}
+			if (op.jpcode) {
+
+				var str1 = op.jpcode.slice(0, 19);
+				var str2 = op.jpcode.slice(20, 21);
+				var str3 = op.jpcode.slice(22);
+
+				if (str1 == 'jp_team51_charge_id') {
+					if (str2 == 'A') {
+						this.code = str2;
+						this.codeId = str3;
+						uni.showToast({
+							title: "注册后享受充电服务"
+						})
+					}
+				}
+
+			}
+			var obj = this.carhelp.get("friends_invitation")
+
+			if (obj) {
+				if (obj.date + 1000 * 60 * 60 * 24 > new Date().getTime()) {
+					this.form.inviteId = obj.op.uid
+					this.form.code = obj.op.icode
+					this.activityInfo = "true";
+				}
+
+			}
+			
+			this.personInfo = this.carhelp.getPersonInfo()
+			if (this.personInfo) {
+				if (this.personInfo.userType == "1") {
+
 				} else {
-					this.loginresponse()
-					// uni.redirectTo({
-					// 	url: '/pages/index/index'
-					// })
-				}
-			} else {
-				
-			}
-
-
-		},
-		onReady() {
-			this.elderMode = this.carhelp.get('getElderModeClass') == '长辈模式';
-			if (this.elderMode)
-				this.theme('elder')
-			else
-				this.theme('standard')
-		},
-		onShow() {
-			this.checkSubscribe()
-		},
+					this.loginresponse()
+					// uni.redirectTo({
+					// 	url: '/pages/index/index'
+					// })
+				}
+			} else {
+				
+			}
+
+
+		},
+		onReady() {
+			this.elderMode = this.carhelp.get('getElderModeClass') == '长辈模式';
+			if (this.elderMode)
+				this.theme('elder')
+			else
+				this.theme('standard')
+		},
+		onShow() {
+			this.checkSubscribe()
+		},
 		methods: {
 			loginresponse(response, bl) {
 			//giveCard(){
@@ -234,143 +234,143 @@
 					});
 					//this.loginresponse2(response,true,false);
 				})
-			},
-			touristConfirm() {
-
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-
-				this.form.nickName = this.carhelp.getUserInfo().nickname;
-				this.form.headImg = this.carhelp.getUserInfo().headimgurl;
-				this.form.openId = this.carhelp.getOpenId();
-				this.form.source = 2 //创建渠道1电单车2电车
-
-				loginApi.registerGuest(this.form).then((response) => {
-					this.loginresponse(response,true);
-				}).catch(error => {
-					uni.showToast({
-						title: error,
-						icon: "none"
-					})
-				})
-
-			},
-			gotoGz() {
-				this.carhelp.setGzDate()
+			},
+			touristConfirm() {
+
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+
+				this.form.nickName = this.carhelp.getUserInfo().nickname;
+				this.form.headImg = this.carhelp.getUserInfo().headimgurl;
+				this.form.openId = this.carhelp.getOpenId();
+				this.form.source = 2 //创建渠道1电单车2电车
+
+				loginApi.registerGuest(this.form).then((response) => {
+					this.loginresponse(response,true);
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+
+			},
+			gotoGz() {
+				this.carhelp.setGzDate()
 			var url = process.car.gzUrl;
-				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
-					})
-				})
-
-			},
-
-			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;
-				}
-			},
-			codeChange(text) {
-				this.codeTips = text;
-			},
-			start() {
-				if (!this.isSendMsgIng) {
-					uni.showLoading({
-						title: "加载中",
-						mask: true,
-					})
-					loginApi.getVerifyCode(this.form.telephone).then((response) => {
-						uni.hideLoading();
-						this.carhelp.set("getvcodetime", new Date().getTime());
-
-						if (!"") {
-							//倒计时
-							uni.showToast({
-								title: "发送成功"
-							})
-						} else {
-							uni.showToast({
-								title: "您的验证码已经发送[5分钟有效]，请勿重复点击"
-							})
-						}
-					}).catch(error => {
-						uni.showToast({
-							title: error,
-							icon: "none"
-						})
-					})
-				}
-			},
-			//倒计时
-			end() {
-				this.sendMsgSecond = 60;
-				this.isSendMsgIng = false;
-				this.isCodeTipsColor = false;
-			},
-			// 获取验证码
-			getCode() {
-				if (this.$refs.uCode.canGetCode) {} else {
-					uni.showToast({
-						title: '倒计时结束后再发送',
-						icon: "none"
-					})
-					return
-				}
-
-				var checkPhoneResult = checkPhone(this.form.telephone);
-
-				if (checkPhoneResult !== true) {
-					uni.showToast({
-						title: checkPhoneResult,
-					})
-					return;
-				}
-				this.$refs.uCode.start();
-				this.isCodeTipsColor = true;
-			},
-			checkboxChange() {
-				this.value = !this.value;
-			},
-			loginresponse2(response, bl,bl2) {
+				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
+					})
+				})
+
+			},
+
+			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;
+				}
+			},
+			codeChange(text) {
+				this.codeTips = text;
+			},
+			start() {
+				if (!this.isSendMsgIng) {
+					uni.showLoading({
+						title: "加载中",
+						mask: true,
+					})
+					loginApi.getVerifyCode(this.form.telephone).then((response) => {
+						uni.hideLoading();
+						this.carhelp.set("getvcodetime", new Date().getTime());
+
+						if (!"") {
+							//倒计时
+							uni.showToast({
+								title: "发送成功"
+							})
+						} else {
+							uni.showToast({
+								title: "您的验证码已经发送[5分钟有效]，请勿重复点击"
+							})
+						}
+					}).catch(error => {
+						uni.showToast({
+							title: error,
+							icon: "none"
+						})
+					})
+				}
+			},
+			//倒计时
+			end() {
+				this.sendMsgSecond = 60;
+				this.isSendMsgIng = false;
+				this.isCodeTipsColor = false;
+			},
+			// 获取验证码
+			getCode() {
+				if (this.$refs.uCode.canGetCode) {} else {
+					uni.showToast({
+						title: '倒计时结束后再发送',
+						icon: "none"
+					})
+					return
+				}
+
+				var checkPhoneResult = checkPhone(this.form.telephone);
+
+				if (checkPhoneResult !== true) {
+					uni.showToast({
+						title: checkPhoneResult,
+					})
+					return;
+				}
+				this.$refs.uCode.start();
+				this.isCodeTipsColor = true;
+			},
+			checkboxChange() {
+				this.value = !this.value;
+			},
+			loginresponse2(response, bl,bl2) {
 				uni.hideLoading();
-				
+				
 				if(!response){
 					if(bl2){
 						
@@ -385,9 +385,9 @@
 					}
 					
 				}else{
-					
-					var token = response ? response.data.token : '';
-					this.carhelp.setToken(token);
+					
+					var token = response ? response.data.token : '';
+					this.carhelp.setToken(token);
 					this.carhelp.setPersonInfo(response.data.regUser);
 					
 					if(bl2){
@@ -396,25 +396,25 @@
 							url: '/pages/cardBag/cardBag?k=1'
 						})
 						
-					}else if (!bl && !response.data.regUser.carId) {
-						var url = "/pages/login/completeInfo?login=1"
-
-						if (this.code == 'A') {
-							url += "&jpcode=jp_team51_charge_id:A_" + this.codeId
-						}
-						uni.redirectTo({
-							url: url
-						})
-
-					} else if (this.code == 'A') {
-
-						var k = API.codeOperation("jp_team51_charge_id:A_" + this.codeId);
-						if (k) {
-							uni.redirectTo({
-								url: k
-							})
-						}
-
+					}else if (!bl && !response.data.regUser.carId) {
+						var url = "/pages/login/completeInfo?login=1"
+
+						if (this.code == 'A') {
+							url += "&jpcode=jp_team51_charge_id:A_" + this.codeId
+						}
+						uni.redirectTo({
+							url: url
+						})
+
+					} else if (this.code == 'A') {
+
+						var k = API.codeOperation("jp_team51_charge_id:A_" + this.codeId);
+						if (k) {
+							uni.redirectTo({
+								url: k
+							})
+						}
+
 					}else if(this.code == 'card'){
 						
 						uni.redirectTo({
@@ -425,89 +425,89 @@
 						uni.redirectTo({
 							url: '/pages/MyInvoice/invoiceManagement'
 						})
-					}else {
-						uni.redirectTo({
-							url: '/pages/index/index'
-						})
+					}else {
+						uni.redirectTo({
+							url: '/pages/index/index'
+						})
 					}
-				}
-			},
-			login() {
-				// if(!this.show2){
-				// 	this.show1=true;
-				// 	return
-				// }
-
-				var checkPhoneResult = checkPhone(this.form.telephone);
-
-				if (!this.form.telephone || checkPhoneResult != true) {
-					uni.showToast({
-						title: checkPhoneResult,
-						icon: "none"
-					})
-					return;
-				}
-				if (!this.form.verifyCode) {
-					uni.showToast({
-						title: "请输入验证码",
-						icon: "none"
-					})
-					return
-				}
-				if (!this.value) {
-					uni.showToast({
-						title: "请勾选协议",
-						icon: "none"
-					})
-					return
-				}
-
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-
-				//this.form.nickName= this.form.telephone;
-				this.form.nickName = this.carhelp.getUserInfo().nickname;
-				this.form.headImg = this.carhelp.getUserInfo().headimgurl;
-				this.form.openId = this.carhelp.getOpenId();
-				this.form.source = 2 //创建渠道1电单车2电车
-
-
-				if (this.personInfo && this.personInfo.userType == "1") {
-
-					loginApi.validateGuestCode(this.form).then((response) => {
-						this.loginresponse(response, true)
-
-					}).catch(error => {
-						uni.showToast({
-							title: error,
-							icon: "none"
-						})
-					})
-				} else {
-					loginApi.validateCode(this.form).then((response) => {
-						this.loginresponse(response)
-
-					}).catch(error => {
-						uni.showToast({
-							title: error,
-							icon: "none"
-						})
-					})
-				}
-
-
-			}
-		}
-	}
-</script>
-
-<style>
-	page {
-		background-color: #fff;
-	}
-</style>
+				}
+			},
+			login() {
+				// if(!this.show2){
+				// 	this.show1=true;
+				// 	return
+				// }
+
+				var checkPhoneResult = checkPhone(this.form.telephone);
+
+				if (!this.form.telephone || checkPhoneResult != true) {
+					uni.showToast({
+						title: checkPhoneResult,
+						icon: "none"
+					})
+					return;
+				}
+				if (!this.form.verifyCode) {
+					uni.showToast({
+						title: "请输入验证码",
+						icon: "none"
+					})
+					return
+				}
+				if (!this.value) {
+					uni.showToast({
+						title: "请勾选协议",
+						icon: "none"
+					})
+					return
+				}
+
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+
+				//this.form.nickName= this.form.telephone;
+				this.form.nickName = this.carhelp.getUserInfo().nickname;
+				this.form.headImg = this.carhelp.getUserInfo().headimgurl;
+				this.form.openId = this.carhelp.getOpenId();
+				this.form.source = 2 //创建渠道1电单车2电车
+
+
+				if (this.personInfo && this.personInfo.userType == "1") {
+
+					loginApi.validateGuestCode(this.form).then((response) => {
+						this.loginresponse(response, true)
+
+					}).catch(error => {
+						uni.showToast({
+							title: error,
+							icon: "none"
+						})
+					})
+				} else {
+					loginApi.validateCode(this.form).then((response) => {
+						this.loginresponse(response)
+
+					}).catch(error => {
+						uni.showToast({
+							title: error,
+							icon: "none"
+						})
+					})
+				}
+
+
+			}
+		}
+	}
+</script>
+
+<style>
+	page {
+		background-color: #fff;
+	}
+</style>
 <style lang="scss" scoped>
 	.login-title-span{
 		    font-size: 36rpx;
@@ -549,134 +549,134 @@
 			color:#999999 ;
 			padding-bottom:38rpx ;
 		}
-	}
-	.foot {
-		position: fixed;
-		left: 0;
-		right: 0;
-		bottom: 0;
-		background-color: #fff;
-
-
-		padding: 0 10px;
-	}
-
-
-	@import "@/_theme.scss";
-
-	.all {
-		@include themeify {
-			font-size: themed('font-size2');
-		}
-	}
-
-	/deep/.placeholderStyle {
-		font-size: themed('font-size2');
-	}
-
+	}
+	.foot {
+		position: fixed;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		background-color: #fff;
+
+
+		padding: 0 10px;
+	}
+
+
+	@import "@/_theme.scss";
+
+	.all {
+		@include themeify {
+			font-size: themed('font-size2');
+		}
+	}
+
+	::v-deep.placeholderStyle {
+		font-size: themed('font-size2');
+	}
+
 	.wrap {
-		//background: linear-gradient(#D6EEDC, #F3F4F4);
-		@include themeify {
-			font-size: themed('font-size2');
-		}
-
-		/*	font-size: 28rpx;*/
-		.login {
-			//width: 600rpx;
-		
-			//
+		//background: linear-gradient(#D6EEDC, #F3F4F4);
+		@include themeify {
+			font-size: themed('font-size2');
+		}
+
+		/*	font-size: 28rpx;*/
+		.login {
+			//width: 600rpx;
+		
+			//
 			.login-title-linear-gradient {
 				background: linear-gradient(180deg, rgba(160,188,255,1) 0%,rgba(160,188,255,0) 100%);
 				
-			}
+			}
 			.login-title {
 				padding: 0 56rpx 0 56rpx;
 				padding-top: 80rpx;
 				
-				text-align: left;
-
-				h3 {
+				text-align: left;
+
+				h3 {
 					color: rgba(16, 16, 16, 1);
-
-					font-size: 56rpx;
-					/*			;*/
+
+					font-size: 56rpx;
+					/*			;*/
 					font-weight: bold;
-					font-family: AlibabaPuHui-bold;
-				}
-
-				p {
-					margin-top: 4px;
-					color: #777
-				}
-			}
-
+					font-family: AlibabaPuHui-bold;
+				}
+
+				p {
+					margin-top: 4px;
+					color: #777
+				}
+			}
+
 			.login-form-item {
 				margin: 0 56rpx;
-				width: 600rpx;
-				margin-top: 40px;
-
-				.title {
-					margin-bottom: 8px;
+				width: 600rpx;
+				margin-top: 40px;
+
+				.title {
+					margin-bottom: 8px;
 					color: rgba(16, 16, 16, 1);
-					font-size: 36rpx;
-					@include themeify {
-					
-						font-weight: themed('fontWeight');
-						letter-spacing: themed('letterSpacing');
-					}
-				}
-
-				.input {
-					border-bottom: 1px solid #f7f7f7;
+					font-size: 36rpx;
+					@include themeify {
+					
+						font-weight: themed('fontWeight');
+						letter-spacing: themed('letterSpacing');
+					}
+				}
+
+				.input {
+					border-bottom: 1px solid #f7f7f7;
 					position: relative;
-					box-shadow: 0px 1px 0px 0px rgba(0, 0, 0, 0.1);
-				}
-
-				.code {
-					position: absolute;
-					right: 0;
-					top: 7px;
-					color: rgb(63, 189, 112);
-				}
-
-				.tips {
-					color: $u-type-info;
-					margin-top: 12px;
-
-					@include themeify {
-						font-size: themed('font-size1');
-					}
-
-					/*				font-size: 12px;*/
-					span {
-						color: #3fbd70;
-					}
-				}
-			}
-
+					box-shadow: 0px 1px 0px 0px rgba(0, 0, 0, 0.1);
+				}
+
+				.code {
+					position: absolute;
+					right: 0;
+					top: 7px;
+					color: rgb(63, 189, 112);
+				}
+
+				.tips {
+					color: $u-type-info;
+					margin-top: 12px;
+
+					@include themeify {
+						font-size: themed('font-size1');
+					}
+
+					/*				font-size: 12px;*/
+					span {
+						color: #3fbd70;
+					}
+				}
+			}
+
 			.login-btn {
 				width: 600rpx;
-				margin: 0 auto;
-				margin-top: 40px;
-				background-color: #a7dbc2;
-
-				@include themeify {
-					font-size: themed('font-size3');
-				}
-			}
-
-			.alternative {
-				color: $u-tips-color;
-				display: flex;
-				justify-content: space-between;
-				margin-top: 30rpx;
-			}
-		}
-	}
-	/deep/.uni-input-placeholder{
-		color:#ccc
-	}
-	.u-checkbox-group{
-		width: 40rpx;
-	}
+				margin: 0 auto;
+				margin-top: 40px;
+				background-color: #a7dbc2;
+
+				@include themeify {
+					font-size: themed('font-size3');
+				}
+			}
+
+			.alternative {
+				color: $u-tips-color;
+				display: flex;
+				justify-content: space-between;
+				margin-top: 30rpx;
+			}
+		}
+	}
+	::v-deep.uni-input-placeholder{
+		color:#ccc
+	}
+	.u-checkbox-group{
+		width: 40rpx;
+	}
 </style>

pages/temporary/national2024.vue

@@ -1,38 +1,38 @@
 <template>
-	
-	<view class="all">
-	
-		<ujp-navbar title="国庆充电优惠活动" ></ujp-navbar>
+	
+	<view class="all">
+	
+		<ujp-navbar title="国庆充电优惠活动" ></ujp-navbar>
 		<view class="InviteFriends" >
-			
-			<view class="text imgHead">
-				<img  src="@/assets/img/temporary/national-2024-1.png"></img>
+			
+			<view class="text imgHead">
+				<img  src="@/assets/img/temporary/national-2024-1.png"></img>
 			</view>
 			<view class="text  national0">
 				<img  src="@/assets/img/temporary/national-2024-0.png"></img>
-			</view>
-			<view class="main">
-
-				<view class="suited">
-					<p class="title">活动时间 :</p>
-					<view class="content">
-						2024 年 10 月 1 日至 2024 年 10 月 31 日
-
-					</view>
+			</view>
+			<view class="main">
+
+				<view class="suited">
+					<p class="title">活动时间 :</p>
+					<view class="content">
+						2024 年 10 月 1 日至 2024 年 10 月 31 日
+
+					</view>
 					
 					<p class="title">活动对象 :</p>
 					<view class="content">
 						优电联盟注册会员
 					
-					</view>
-
-					<p class="title">活动内容 :</p>
+					</view>
+
+					<p class="title">活动内容 :</p>
 					<view class="content">
 						
-						
+						
 						<view class="p">1、凡在活动期间，前往活动场站充电的平台会员享受充电服务费 8.5 折优惠。</view>
 						<view class="p">2、凡在活动期间，快充且充电量达 30 度（含）以上均可享受一次抽奖机会（电费、停车费及占桩费据实结算）。</view>
-						<view class="p">	奖品如下：</view>
+						<view class="p">	奖品如下：</view>
 					</view>
 					
 					
@@ -68,36 +68,36 @@
 						· 本活动以充电开始时间为准。<br/>
 						· 本次活动仅适用优电联盟平台会员，不包含快电、新电途用户。<br/>
 						· 本次活动最终解释权归湖北鹏育优电新能源科技有限公司所有<br/>
-					</view>
-					 
-				</view>
-
-			
-				
+					</view>
+					 
+				</view>
+
+			
 				
+				
+					
 					
-					
 			</view>
-			
-		</view>
-		
+			
+		</view>
+		
 		<view class="text imgHead national4">
 			<img  src="@/assets/img/temporary/national-2024-4.png"></img>
 			
 			
-		</view>
-	</view>
-</template>
-
+		</view>
+	</view>
+</template>
+
 <script>
-	
-
-
-	export default {
-		components: {
-		
-		},
-		data() {
+	
+
+
+	export default {
+		components: {
+		
+		},
+		data() {
 			return {
 				list:[
 					{
@@ -130,80 +130,80 @@
 						num:8,
 						remark:"不限次数"
 					}
-				]
-
-			}
-		},
-		onLoad(op) {
+				]
+
+			}
+		},
+		onLoad(op) {
+			
+			
+		},
+		onReady() {
+			
 			
-			
-		},
-		onReady() {
-			
-			
-		},
-		onShow() {
-
-			
-
-		},
+		},
+		onShow() {
+
+			
+
+		},
 		methods: {
 			gotoStation(id){
 				uni.navigateTo({
 					url:"/pages/searchPile/stationAndPile/stationDetails?id="+id
 				})
-			}
-		}
-	}
-</script>
-<style>
-	page {
-		background: #b92d27;
-	}
-</style>
-<style lang="scss" scoped>
-	@import "@/_theme.scss";
-
-	.all {
-		@include themeify {
-			font-size: themed('font-size1');
-		}
+			}
+		}
+	}
+</script>
+<style>
+	page {
+		background: #b92d27;
+	}
+</style>
+<style lang="scss" scoped>
+	@import "@/_theme.scss";
+
+	.all {
+		@include themeify {
+			font-size: themed('font-size1');
+		}
 	}
 	 .imgHead {
 		img {
 		 			width: 100%;
 				} 
-	 }
+	 }
+	
 	
-	
-	// .imgHead {
-	// 	padding-top: 72rpx;
-	// 	display: flex;
-	// 	flex-direction: column;
-	// 	align-items: center;
-
-	// 	.imgHead1 {
-	// 		img {
-	// 			height: 24px;
-	// 		}
-
-	// 		display: flex;
+	// .imgHead {
+	// 	padding-top: 72rpx;
+	// 	display: flex;
+	// 	flex-direction: column;
+	// 	align-items: center;
+
+	// 	.imgHead1 {
+	// 		img {
+	// 			height: 24px;
+	// 		}
+
+	// 		display: flex;
 	// 		justify-content: center;
-	// 		align-items: center;
-	// 	}
-
-	// 	.imgHead2 {
-
-	// 		display: flex;
-
-	// 		img {
-	// 			width: 100%;
-	// 			height: 40px;
-	// 		}
-
-	// 		margin-top: 16px;
-	// 	}
-	// }
+	// 		align-items: center;
+	// 	}
+
+	// 	.imgHead2 {
+
+	// 		display: flex;
+
+	// 		img {
+	// 			width: 100%;
+	// 			height: 40px;
+	// 		}
+
+	// 		margin-top: 16px;
+	// 	}
+	// }
 	.contentList{
 		.item{
 			border: 1px solid rgba(232, 229, 225, 1);
@@ -271,64 +271,64 @@
 	.national4{
 		    margin-top: -280rpx;
 		
-	}
-	.main {
+	}
+	.main {
 		position: relative;
-		top: -90rpx;
-		padding: 22rpx 24rpx 10rpx;
-
-		.text {
-			color: rgba(255, 255, 255, 100);
-
-		
-
-			/*		   font-size: 18px;*/
-			text-align: justify;
-			text-indent: 36px;
-
-
-		}
-
-		.suited {
-			background-color: #fff;
-			//background: linear-gradient(180deg, rgba(189,255,224,1) 0%,rgba(255,255,255,1) 14%);
-		//	background: linear-gradient(180deg, rgba(255, 224, 223, 1) 0%, rgba(255, 255, 255, 1) 14%);
+		top: -90rpx;
+		padding: 22rpx 24rpx 10rpx;
+
+		.text {
+			color: rgba(255, 255, 255, 100);
+
+		
+
+			/*		   font-size: 18px;*/
+			text-align: justify;
+			text-indent: 36px;
+
+
+		}
+
+		.suited {
+			background-color: #fff;
+			//background: linear-gradient(180deg, rgba(189,255,224,1) 0%,rgba(255,255,255,1) 14%);
+		//	background: linear-gradient(180deg, rgba(255, 224, 223, 1) 0%, rgba(255, 255, 255, 1) 14%);
 			//background: linear-gradient(180deg, rgba(214,226,255,1) 0%,rgba(255,255,255,1) 14%);
-			margin-top: 40rpx;
-			padding: 40rpx 32rpx;
-			border-radius: 20px;
-
-			.title {
-				/*height: 18px;*/
-				color: rgba(16, 16, 16, 100);
-
-
-
-				font-size: 32rpx;
-				font-weight: 600;
-			}
+			margin-top: 40rpx;
+			padding: 40rpx 32rpx;
+			border-radius: 20px;
+
+			.title {
+				/*height: 18px;*/
+				color: rgba(16, 16, 16, 100);
+
+
+
+				font-size: 32rpx;
+				font-weight: 600;
+			}
 			.remarks{
 				color: rgba(188, 188, 188, 1);
 				font-size: 22rpx;
 				margin-top: 40rpx;
-			}
+			}
 			.content {
 				.p{
 					margin: 12rpx 0;
-				}
-				margin: 16rpx 0 40rpx ;
-				//font-weight: 550;
-				color: #333333 ;
-				
-				font-size: 28rpx;
+				}
+				margin: 16rpx 0 40rpx ;
+				//font-weight: 550;
+				color: #333333 ;
+				
+				font-size: 28rpx;
 				span{
 					color: #ec4f27;
-				}
-				p {
-					margin: 8rpx 0;
-				}
-			}
-		}
+				}
+				p {
+					margin: 8rpx 0;
+				}
+			}
+		}
 		.application-table {
 			.nezhaImgView{
 				text-align: center;
@@ -336,314 +336,314 @@
 				img{
 					width: 100%;
 				}
-			}
-			background-color: #fff;
-			border-radius: 16px;
-			margin-top: 24px;
-			padding: 24rpx 36rpx;
-			padding-top:8px;
-		}
-
+			}
+			background-color: #fff;
+			border-radius: 16px;
+			margin-top: 24px;
+			padding: 24rpx 36rpx;
+			padding-top:8px;
+		}
+
 		.application-form {
 			//background: linear-gradient(180deg, rgba(214,226,255,1) 0%,rgba(255,255,255,1) 14%);
-			color:#333333;
-			background-color: #fff;
-			border-radius: 16px;
-			margin-top: 24px;
-			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
-			}
-			
-			.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 {
-				font-size: 18px;
-
-				@include themeify {
-
-					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);
-				margin-top: 12px;
-				overflow-y: scroll;
-
-				@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 {
-					width: 50% !important;
-					margin-top: 4px;
-				}
-			}
-
-		}
-
-		.want {
-			/deep/.u-checkbox {
-				margin-top: 8px;
-			}
-		}
-
-		.hint {
-			margin-top: 12px;
-
-			@include themeify {
-				font-size: themed('font-size2');
-				line-height: themed('font-size5');
-			}
-
-			/*
-			font-size: 14px;
-			line-height: 20px;
-			*/
-			text-align: center;
-
-			.tel-num {
-				color: #9FC7FF;
-			}
-		}
-
-		/deep/.u-btn {
-			border-radius: 50px;
-			margin-top: 40rpx;
-		}
-	}
-
-	.InviteFriends {
-		//background-image: linear-gradient(0deg, #a2e9c9, #01b963);
+			color:#333333;
+			background-color: #fff;
+			border-radius: 16px;
+			margin-top: 24px;
+			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
+			}
+			
+			.u-input {
+				border-radius: 50px;
+				background-color: rgba(232, 236, 234, 100);
+				margin-top: 12px;
+
+			}
+
+			::v-deep.uni-input-input {
+				margin: 20px;
+			}
+
+			::v-deep.u-input__right-icon {
+				margin-right: 10px;
+			}
+
+			p {
+				font-size: 18px;
+
+				@include themeify {
+
+					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);
+				margin-top: 12px;
+				overflow-y: scroll;
+
+				@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');
+					}
+				}
+
+				::v-deep.uni-textarea-textarea {
+					width: 90%;
+					padding: 10px 20px;
+
+				}
+
+				::v-deep.u-input__right-icon {
+					display: none;
+				}
+			}
+		}
+
+		.type {
+			.checkbox {
+				margin-top: 12px;
+
+				::v-deep.u-checkbox {
+					width: 50% !important;
+					margin-top: 4px;
+				}
+			}
+
+		}
+
+		.want {
+			::v-deep.u-checkbox {
+				margin-top: 8px;
+			}
+		}
+
+		.hint {
+			margin-top: 12px;
+
+			@include themeify {
+				font-size: themed('font-size2');
+				line-height: themed('font-size5');
+			}
+
+			/*
+			font-size: 14px;
+			line-height: 20px;
+			*/
+			text-align: center;
+
+			.tel-num {
+				color: #9FC7FF;
+			}
+		}
+
+		::v-deep.u-btn {
+			border-radius: 50px;
+			margin-top: 40rpx;
+		}
+	}
+
+	.InviteFriends {
+		//background-image: linear-gradient(0deg, #a2e9c9, #01b963);
+	
+		background: #b92d27;
+
+	}
+
+
+
+	.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;
+
+		}
+	}
+
+	// .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
+	}
 	
-		background: #b92d27;
-
-	}
-
-
-
-	.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;
-
-		}
-	}
-
-	// .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
-	}
-	
-	.table {
+	.table {
 		table {
-			color:#010101 ;
-			border-spacing:0;
+			color:#010101 ;
+			border-spacing:0;
 			font-size: 32rpx;
-			
+			
 			.th {
 				
-
+
 				background-color: #f2efef;
-				text-align: center;
-				color:	#101010;
-				font-weight: bold;
-				td{
-					border: 1px solid   #dbdbdb;
+				text-align: center;
+				color:	#101010;
+				font-weight: bold;
+				td{
+					border: 1px solid   #dbdbdb;
 					padding: 12rpx 0;
 					height: 96rpx;
-
-				}
-			}
-	
-			.td1 {
-				text-align: start;
-			//	background-color: rgba(243, 245, 247, 1);
-				width: 132rpx;
+
+				}
+			}
+	
+			.td1 {
+				text-align: start;
+			//	background-color: rgba(243, 245, 247, 1);
+				width: 132rpx;
 				text-align: center;
-
-				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;
-			}
-		}
-	
-	
-	}
+
+				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/car/carDet.vue

@@ -188,9 +188,9 @@
 			// 		//(res)
 			// })
 			this.userInfo=this.carhelp.getPersonInfo()
-			
-			if(op.id){
-				this.form.id = op.id;	
+			
+			if(op.id){
+				this.form.id = op.id;	
 			}
 			this.getCarList();
 			if (op.jpcode) {
@@ -384,40 +384,40 @@
 					})
 				})
 			},
-			getCarList() {
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})		
-				userApi.regUserCarList().then((res) => {
-					uni.hideLoading();
-					this.carList = res.data;
-			
-					for(var i=0;i<this.carList.length;i++) {
-						var carId = this.carList[i].id
+			getCarList() {
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})		
+				userApi.regUserCarList().then((res) => {
+					uni.hideLoading();
+					this.carList = res.data;
+			
+					for(var i=0;i<this.carList.length;i++) {
+						var carId = this.carList[i].id
 						if(this.form.id == carId||this.carList.length==1) {	
-							this.form.id=carId;
-							this.form.carNum = this.carList[i].carNum;
-							this.form.defaultFlag = this.carList[i].defaultFlag;
-							this.value=true
-							this.form.usage= this.carList[i].usage;
-							this.usage= this.carList[i].usage;
-							
-							if(this.form.carNum.length == 8) {
-								this.carName = '新能源车';
-							} else if (this.form.carNum.length == 7) {
-								this.carName = '燃油车';
-							} else {
-								this.carName = '';
-							}
-						}
-					}
-				}).catch(error => {
-					uni.showToast({
-						title: error,
-						icon: "none"
-					})
-				})
+							this.form.id=carId;
+							this.form.carNum = this.carList[i].carNum;
+							this.form.defaultFlag = this.carList[i].defaultFlag;
+							this.value=true
+							this.form.usage= this.carList[i].usage;
+							this.usage= this.carList[i].usage;
+							
+							if(this.form.carNum.length == 8) {
+								this.carName = '新能源车';
+							} else if (this.form.carNum.length == 7) {
+								this.carName = '燃油车';
+							} else {
+								this.carName = '';
+							}
+						}
+					}
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
 			},
 			gotoLink(){
 				
@@ -592,7 +592,7 @@
 	.u-drawer{
 		z-index: -1 !important;
 	}
-	/deep/.u-char-item {
+	::v-deep.u-char-item {
 		width: 60rpx !important;
 		height: 80rpx !important;
 		font-size: 36rpx !important;

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="@/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>
+<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;
+		}
+		
+	}
+	::v-deep.u-divider{
+		margin-top: 27px !important;
+		
+	}
+}
+</style>

pages/user/coupon/myCoupon.vue

@@ -1,32 +1,32 @@
-<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;" v-if="item.status==5">
-							有效期<br/>{{item.startDate&&item.startDate.slice(0,10)}}至{{item.endDate&&item.endDate.slice(0,10)}}
-						</view>	
-						<view class="useful-life oldTextjp2" oldstyle="font-size: 16px;" v-else>
-							有效期至{{item.endDate&&item.endDate.slice(0,10)}}
-						</view>	
-						
-					</view>
-					<view class="content-right">
-
+<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;" v-if="item.status==5">
+							有效期<br/>{{item.startDate&&item.startDate.slice(0,10)}}至{{item.endDate&&item.endDate.slice(0,10)}}
+						</view>	
+						<view class="useful-life oldTextjp2" oldstyle="font-size: 16px;" v-else>
+							有效期至{{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: 24rpx;" v-if="item.value">服务费</span>
@@ -34,311 +34,311 @@
 															<span v-if="item.value"> {{item.value}}<span style="font-size: 24rpx;">折</span></span>
 															<span v-else>免服务费</span>
 							
-							</view>
-						<view class="price" v-else >{{item.value}}<span style="font-size: 24rpx;">元</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-button2" v-if="current == '0'&&item.status==5" >未生效</view>
-					<view class="use-button" v-else-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{
-					 
-					   
-					   line-height: 22px;
-					   color: rgba(16, 16, 16, 100);
-					   font-size: 16px;
-				   }
-				
-				   .useful-life{
-					   
-					   line-height: 17px;
-					   color: rgba(153, 153, 153, 100);
-					   font-size: 12px;
-					   margin-top: 4px;
-				   }
-			   };
-			   .content-right{
-				   margin-top: -8px;
-				   text-align: right;
-				   .price{
-					 
-					   color: rgba(0, 185, 98, 100);
-					   font-size: 68rpx;
-					   white-space: pre;
-					   
-				   }
-				   .price2{
-					   white-space: pre;
-				   			 
-				   			   color: rgba(0, 185, 98, 100);
-				   			 font-size: 48rpx;
-				   }
-				   .price-condition{
-					    
-					   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-button2{
-		width: 56px;
-		height: 24px;
-		line-height: 24px;
-		border-radius: 4px;
-		background-color:red;
-		color: rgba(255, 255, 255, 100);
-		font-size: 12px;
-		text-align: center;
-	}
-  .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%;
-	  }
-  }
-
+							</view>
+						<view class="price" v-else >{{item.value}}<span style="font-size: 24rpx;">元</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-button2" v-if="current == '0'&&item.status==5" >未生效</view>
+					<view class="use-button" v-else-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%;
+		
+	}
+	::v-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{
+					 
+					   
+					   line-height: 22px;
+					   color: rgba(16, 16, 16, 100);
+					   font-size: 16px;
+				   }
+				
+				   .useful-life{
+					   
+					   line-height: 17px;
+					   color: rgba(153, 153, 153, 100);
+					   font-size: 12px;
+					   margin-top: 4px;
+				   }
+			   };
+			   .content-right{
+				   margin-top: -8px;
+				   text-align: right;
+				   .price{
+					 
+					   color: rgba(0, 185, 98, 100);
+					   font-size: 68rpx;
+					   white-space: pre;
+					   
+				   }
+				   .price2{
+					   white-space: pre;
+				   			 
+				   			   color: rgba(0, 185, 98, 100);
+				   			 font-size: 48rpx;
+				   }
+				   .price-condition{
+					    
+					   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-button2{
+		width: 56px;
+		height: 24px;
+		line-height: 24px;
+		border-radius: 4px;
+		background-color:red;
+		color: rgba(255, 255, 255, 100);
+		font-size: 12px;
+		text-align: center;
+	}
+  .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/dataSet.vue

@@ -265,9 +265,9 @@ import {
 			 
 			carClick() {
 				var url='/pages/user/car/carDet' 
-				
-				uni.navigateTo({
-					url: url
+				
+				uni.navigateTo({
+					url: url
 				})
 				
 			},
@@ -600,7 +600,7 @@ import {
 				margin-left: 8px;
 			}
 
-			/deep/.u-switch__node {
+			::v-deep.u-switch__node {
 				width: 24px !important;
 				height: 24px !important;
 			}
@@ -677,7 +677,7 @@ import {
 			z-index: 99999;
 		}
 	}
-	/deep/.u-line{
+	::v-deep.u-line{
 			transform: scaleY(0.1) !important;
 		}
 		

pages/user/finance/recharge.vue

@@ -485,15 +485,15 @@
 	.userBanner{
 		margin: 16px;
 	}
-	/deep/.u-radio-group {
+	::v-deep.u-radio-group {
 		width: 100%;
 	}
 
-	/deep/.u-radio {
+	::v-deep.u-radio {
 		position: relative;
 	}
 
-	/deep/.u-radio__icon-wrap {
+	::v-deep.u-radio__icon-wrap {
 		position: absolute;
 		right: 0;
 	}

pages/user/finance/refundInfo.vue

@@ -125,102 +125,102 @@
 			color: #EE3138;
 		}
 	}
-.textarea {
-		background-color:#f2f2f2;
-		margin-top: 12px;
-		line-height: 20px;
-		border-radius: 4px;
-		color: rgba(136, 136, 136, 100);
-
-		.uni-textarea-placeholder {
-			padding: 0 16rpx;
-
-		}
-
-		/deep/.uni-textarea-textarea {
-			width: 90%;
-			padding: 0 16rpx;
-
-		}
-	}
-	.withdraw {
-		margin-bottom: 8px;
-		background-color: #fff;
-		padding: 0px 16px 0 16px;
-
-		.withdraw-head {
-			padding: 16px 0;
-			border-bottom: 1px solid #E5E7EA;
-
-			align-items: center;
-			position: relative;
-
-			.unit {
-				position: absolute;
-				top: 34rpx;
-				right: 0;
-
-			}
-
-			.whthdraw-price {
-				font-size: 18px;
-				color: #101010;
-				font-weight: 600;
-			}
-
-			b {
-				color: rgba(119, 119, 119, 100);
-				font-size: 16px;
-			}
-
-			span {
-				width: 60%;
-				float: right;
-				text-align: left;
-				font-size: 16px;
-				color: #333333;
-			}
-
-			@media screen and (max-width:320px) {
-				span {
-					width: 55%;
-				}
-			}
-
-		}
-
-		.withdraw-main {
-			border-top: 1px solid #f7f7f7;
-			border-bottom: 1px solid #f7f7f7;
-
-			margin: 16px 0;
-			padding: 16px 0;
-
-			.withdraw-input {
-				margin-top: 32px;
-				display: flex;
-				align-items: center;
-				font-size: 28px;
-
-				/deep/.uni-input-input {
-					font-size: 28rpx;
-				}
-			}
-		}
-
-		.withdraw-foot {
-			display: flex;
-			align-items: center;
-
-			p {
-				color: #999
-			}
-
-			span {
-				color: #2979FF;
-				margin-left: 16px;
-
-			}
-		}
+.textarea {
+		background-color:#f2f2f2;
+		margin-top: 12px;
+		line-height: 20px;
+		border-radius: 4px;
+		color: rgba(136, 136, 136, 100);
+
+		.uni-textarea-placeholder {
+			padding: 0 16rpx;
+
+		}
+
+		::v-deep.uni-textarea-textarea {
+			width: 90%;
+			padding: 0 16rpx;
+
+		}
+	}
+	.withdraw {
+		margin-bottom: 8px;
+		background-color: #fff;
+		padding: 0px 16px 0 16px;
+
+		.withdraw-head {
+			padding: 16px 0;
+			border-bottom: 1px solid #E5E7EA;
+
+			align-items: center;
+			position: relative;
+
+			.unit {
+				position: absolute;
+				top: 34rpx;
+				right: 0;
+
+			}
+
+			.whthdraw-price {
+				font-size: 18px;
+				color: #101010;
+				font-weight: 600;
+			}
+
+			b {
+				color: rgba(119, 119, 119, 100);
+				font-size: 16px;
+			}
+
+			span {
+				width: 60%;
+				float: right;
+				text-align: left;
+				font-size: 16px;
+				color: #333333;
+			}
+
+			@media screen and (max-width:320px) {
+				span {
+					width: 55%;
+				}
+			}
+
+		}
+
+		.withdraw-main {
+			border-top: 1px solid #f7f7f7;
+			border-bottom: 1px solid #f7f7f7;
+
+			margin: 16px 0;
+			padding: 16px 0;
+
+			.withdraw-input {
+				margin-top: 32px;
+				display: flex;
+				align-items: center;
+				font-size: 28px;
+
+				::v-deep.uni-input-input {
+					font-size: 28rpx;
+				}
+			}
+		}
+
+		.withdraw-foot {
+			display: flex;
+			align-items: center;
+
+			p {
+				color: #999
+			}
+
+			span {
+				color: #2979FF;
+				margin-left: 16px;
+
+			}
+		}
 	}
 </style>

pages/user/freeInstallment.vue

@@ -359,10 +359,10 @@
 			  margin-top: 12px;
 			
 		  }
-		  /deep/.uni-input-input{
+		  ::v-deep.uni-input-input{
 			  margin: 20px;
 		  }
-		  /deep/.u-input__right-icon{
+		  ::v-deep.u-input__right-icon{
 			  margin-right: 10px;
 		  }
 		  p{
@@ -398,12 +398,12 @@
 				 	line-height: themed('font-size2'); 
    				}
 			 }
-			/deep/.uni-textarea-textarea{
+			::v-deep.uni-textarea-textarea{
 								 width: 90%;
 								 padding: 10px 20px;
 								  
 			}
-			/deep/.u-input__right-icon {
+			::v-deep.u-input__right-icon {
 								 display: none;
 			}
 		  }
@@ -411,7 +411,7 @@
 	.type{
 		.checkbox{
 			margin-top: 12px;
-			/deep/.u-checkbox{
+			::v-deep.u-checkbox{
 				width: 50% !important;
 				margin-top: 4px;
 			}
@@ -419,7 +419,7 @@
 		
 	}
 	.want{
-		/deep/.u-checkbox{
+		::v-deep.u-checkbox{
 			margin-top: 8px;
 		}
 	}
@@ -438,7 +438,7 @@
 			color: #9FC7FF;
 		}
 	}
-	/deep/.u-btn{
+	::v-deep.u-btn{
 		border-radius: 50px ;
 		margin-top: 24px;
 	}

pages/user/myPile/myPile.vue

@@ -201,29 +201,29 @@
 </script>
 
 <style lang="scss">
-	/deep/.u-cell_title {
+	::v-deep.u-cell_title {
 
 		width: 30% !important;
 	}
 
-	/deep/ .u-cell {
+	::v-deep .u-cell {
 		line-height: 20px;
 		padding: 12px 20px 12px 0;
 		margin-left: 12px;
 	}
 
-	/deep/.u-radio-group {
+	::v-deep.u-radio-group {
 		justify-content: start !important;
 	}
 
-	/deep/.u-radio-group:last-child {
+	::v-deep.u-radio-group:last-child {
 
 		justify-content: space-between !important;
 		padding: 0 0 10px 0px;
 	}
 
 
-	/deep/.u-cell__value {
+	::v-deep.u-cell__value {
 
 		text-align: left;
 
@@ -232,7 +232,7 @@
 		font-size: 16px
 	}
 
-	/deep/.u-radio-group {
+	::v-deep.u-radio-group {
 		line-height: 30px;
 		width: 100%;
 		display: flex;
@@ -242,7 +242,7 @@
 
 
 
-	/deep/.border-bottom:after {
+	::v-deep.border-bottom:after {
 		border-bottom-width: 0px !important;
 
 

pages/user/myReservation/chargingRe.vue

@@ -1,33 +1,33 @@
-<template>
-	<view>
-		<ujp-navbar title="预约充电">
-			
-		</ujp-navbar>
-		
-		<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" >
-			<view class="station-name ellipsis">
-				{{item.stationName}}/{{item.deviceName}}
+<template>
+	<view>
+		<ujp-navbar title="预约充电">
+			
+		</ujp-navbar>
+		
+		<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" >
+			<view class="station-name ellipsis">
+				{{item.stationName}}/{{item.deviceName}}
 				<view class=" btn" :class="{
 					'toBe-confirmed':item.status==0,
 						'confirmed':item.status==1,
 						'have-expired':item.status==2
-				}" >{{item.statusN}}</view>
-				
-			</view>
-			<view class="details-items">
-				
-				<view class="items">
-					<view class="items-name">
-						预约启动时间
-					</view>
-					<view class="items-content">
-						{{item.startTime}}
-					</view>
-				</view>
+				}" >{{item.statusN}}</view>
+				
+			</view>
+			<view class="details-items">
+				
+				<view class="items">
+					<view class="items-name">
+						预约启动时间
+					</view>
+					<view class="items-content">
+						{{item.startTime}}
+					</view>
+				</view>
 				<view class="items">
 					<view class="items-name">
 						创建时间
@@ -43,122 +43,122 @@
 					<view class="items-content">
 						{{item.remark}}
 					</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>
-		<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.timingList({
-					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.deleteTiming({
-					id: item.id,
-					status: '3'
-				}).then((res) => {
-					uni.hideLoading();
-					this.getAppointmentList(true);
-				}).catch(error => {
-					uni.showToast({
-						title: error,
-						icon: "none"
-					})
-				})
-			},
-			refuseClick(item,status) {
+				</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>
+		<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.timingList({
+					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.deleteTiming({
+					id: item.id,
+					status: '3'
+				}).then((res) => {
+					uni.hideLoading();
+					this.getAppointmentList(true);
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+			},
+			refuseClick(item,status) {
 				uni.showModal({
 					title:"提示",
 					content: "请确认是否取消预约充电",
@@ -170,182 +170,182 @@
 							//('用户点击取消');
 						}
 					}
-				})
-				
-				
-			},
-		}
-	}
-</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>
+				})
+				
+				
+			},
+		}
+	}
+</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;
+			}
+
+		}
+
+		::v-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;
+
+			::v-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/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="@/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>
+<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;
+			}
+
+		}
+
+		::v-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;
+
+			::v-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="@/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
-			// }
-		}
+<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;
+	
+		}
+		::v-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,864 +1,864 @@
-<template>
-	<view class="all">
-		<u-mask :show="show" @click="show = false">
-			<u-image width="100%" height="500px" :mode="'widthFix'" src="@/assets/static/img/guide_point2.png"></u-image>
-
-		</u-mask>
-
-		<ujp-navbar title="凭话费领年卡活动" :startGz="false" :isBack="back"></ujp-navbar>
-		<view class="InviteFriends" :class="{
-			opacityClass:show
-		}">
-			<view class="text imgHead">
+<template>
+	<view class="all">
+		<u-mask :show="show" @click="show = false">
+			<u-image width="100%" height="500px" :mode="'widthFix'" src="@/assets/static/img/guide_point2.png"></u-image>
+
+		</u-mask>
+
+		<ujp-navbar title="凭话费领年卡活动" :startGz="false" :isBack="back"></ujp-navbar>
+		<view class="InviteFriends" :class="{
+			opacityClass:show
+		}">
+			<view class="text imgHead">
 				<view class="imgHead1">
 					<img  v-if="branchParameterBl('ud')"  style="width: 125px; height: 40px;" src="@/assets/logo/logo4Ud.png" alt="">
 					
-					<img v-else   style="width: 125px;" src="@/assets/logo/logo1.png"></img>
-
-
-				</view>
-				<view class="imgHead2">
-					<img style="width: 252px;height: 40px;" src="@/assets/img/piccShare/5.png"></img>
-				</view>
-			</view>
-			<view class="main">
-
-				<view class="suited">
-					<p class="title">活动对象 :</p>
-					<view class="content">
-						不限
-
-					</view>
-
-
-					<p class="title">活动说明 :</p>
-					<view class="content">
-
-
-						庆元旦，迎新年，用户凭手机号，免费领取<span
-							style="color: rgb(12 11 11);font-weight: bold;">{{projectName}}年卡</span>一张，最低可享<span
-							style="color: #ec4f27;font-weight: bold;">两年免充电服务费</span>，最高可享万元礼包，老带新还能有额外红包大礼！
-
-					</view>
-					<view class="bottomView" v-if="false">
-						<u-button class="button" shape="circle" @click="show=true">分享活动
-							<u-icon name="share"></u-icon>
-						</u-button>
-					</view>
-				</view>
-
-				<view class="application-form ">
-					<view class="title">
-						线上预约:
-					</view>
-					<view class="tel">
-						<p><span style="color: red;">*</span>填写手机号</p>
-						<u-input v-model="subForm.phone" :customStyle="placeholderStyle"
-							:placeholderStyle="placeholderStyle" placeholder="请填写手机号"></u-input>
-					</view>
-
-
-					<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/map@3x.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>
-		<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>
-
-	</view>
-</template>
-
-<script>
-
-	import {
-		convertCanvasToImage,
-		substrMb
-	} from '@/utils'
-	import {
-		checkPhone
+					<img v-else   style="width: 125px;" src="@/assets/logo/logo1.png"></img>
+
+
+				</view>
+				<view class="imgHead2">
+					<img style="width: 252px;height: 40px;" src="@/assets/img/piccShare/5.png"></img>
+				</view>
+			</view>
+			<view class="main">
+
+				<view class="suited">
+					<p class="title">活动对象 :</p>
+					<view class="content">
+						不限
+
+					</view>
+
+
+					<p class="title">活动说明 :</p>
+					<view class="content">
+
+
+						庆元旦，迎新年，用户凭手机号，免费领取<span
+							style="color: rgb(12 11 11);font-weight: bold;">{{projectName}}年卡</span>一张，最低可享<span
+							style="color: #ec4f27;font-weight: bold;">两年免充电服务费</span>，最高可享万元礼包，老带新还能有额外红包大礼！
+
+					</view>
+					<view class="bottomView" v-if="false">
+						<u-button class="button" shape="circle" @click="show=true">分享活动
+							<u-icon name="share"></u-icon>
+						</u-button>
+					</view>
+				</view>
+
+				<view class="application-form ">
+					<view class="title">
+						线上预约:
+					</view>
+					<view class="tel">
+						<p><span style="color: red;">*</span>填写手机号</p>
+						<u-input v-model="subForm.phone" :customStyle="placeholderStyle"
+							:placeholderStyle="placeholderStyle" placeholder="请填写手机号"></u-input>
+					</view>
+
+
+					<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/map@3x.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>
+		<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>
+
+	</view>
+</template>
+
+<script>
+
+	import {
+		convertCanvasToImage,
+		substrMb
 	} from '@/utils'
-	
-	import wx from 'weixin-js-sdk'
-	import * as API from '@/apis/friends.js'
-	import * as WxJsApi from '@/utils/wxJsApi.js'
-	import * as API_weixin from '@/apis/weixin.js'
-
-	import ucarkeyboard from '@/components/Ucarkeyboard.vue'
-
-
-	export default {
-		components: {
-			ucarkeyboard
-		},
-		data() {
-			return {
-				tableList:[],
-				isLogin: false,
-				carAuthImg: "",
-				id: "",
-				carTempBl: false,
-				code: "",
-				show: false,
-
-				uid: "",
-
-				show1: false,
-				show2: false,
-				projectName: "",
-				name: "",
-
-				back: false,
-
-				subForm: {
-					realName: "",
-					phone: "",
-					carNum: "",
-					licenseFileUrl: "",
-					openId: "",
-					shareUserId: ""
-				},
-
-
-				placeholderStyle: {
-					'font-size': '16px',
-
-					'padding': '4px 8px',
-				},
-				shareUserId: "",
-				userInfo: null,
-				carNum: '',
-				carLicense: 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_1230", {
-					sid: op.sid,
-					time: new Date().getTime()
-				});
-			} else {
-				var obj = this.carhelp.get("picc_shareUserId_1230")
-				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: "来自好友的分享"
-				})
-			}
-
-			this.get_wx_config();
-			this.getList("凭话费送年卡")
-		},
-		onReady() {
-			
-			
-			var info = this.carhelp.getPersonInfo();
-
-			if (info.id && info.phone) {
-				//this.isLogin=true
-				this.userInfo = info;
-				this.subForm.phone = info.phone;
-
-			}
-		},
-		onShow() {
-
-			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;
-			
-			},
-			
-			getList(key) {
-				API.findByCatalogName({
-					catalogName:key
-				}).then((res) => {
-
-					this.tableList=res.data.dataDictionaryList
-
-					//setGzDate
-				}).catch(error => {
-					uni.showToast({
-						title: error
-					})
-				})
-
-			},
-
-			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 = process.car.gzUrl;
-				window.location.href = url
-
-			},
-			submit() {
-				this.subForm.openId = this.carhelp.getOpenId();
-				this.subForm.shareUserId = this.shareUserId;
-				this.subForm.event = 1;
-
-				if (!this.subForm.phone) {
-					uni.showToast({
-						title: "请填写手机号"
-					})
-					return
-				}
-				var checkPhoneResult = checkPhone(this.subForm.phone);
-
-				if (checkPhoneResult !== true) {
-					uni.showToast({
-						title: checkPhoneResult,
-					})
-					return;
-				}
-
-
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				API.submitEventRegistration(this.subForm).then((res) => {
-					uni.hideLoading()
-
-					if (res.result) {
-
-						uni.showModal({
-							//showCancel:false,
-
-							title: "提示",
-							content: "预约成功！",
-							cancelText: "继续填写",
-							confirmText: "前往主页",
-
-							success: (me) => {
-								this.carAuthImg = "";
-								this.subForm = {
-									phone: "",
-								}
-								if (me.confirm) {
-									uni.reLaunch({
-										url: "/"
-									})
-								}
-
-							}
-						})
-					}
-
-				}).catch(error => {
-					uni.showToast({
-						title: error,
-						icon: "none"
-					})
-				})
-			},
-
-
-			//获取微信jssdk配置信息
-			get_wx_config() {
-				//
-				var _this = this
-				API_weixin.getConfig().then(response => {
-					var wxconfig = response.data.wxConfig;
-
-					wx.config({
-						debug: false, // 开启调试模式,
-						appId: wxconfig.appId, // 必填，企业号的唯一标识，此处填写企业号corpid
-						timestamp: wxconfig.timestamp, // 必填，生成签名的时间戳
-						nonceStr: wxconfig.nonceStr, // 必填，生成签名的随机串
-						signature: wxconfig.signature, // 必填，签名，见附录1
-						jsApiList: ['updateAppMessageShareData',
-							'updateTimelineShareData', 'onMenuShareTimeline', 'onMenuShareAppMessage',
-							'onMenuShareQQ', 'onMenuShareQZone',
-							 'openLocation'
-							
-						], // 必填，需要使用的JS接口列表，所有JS接口列表见附录2
-
-					});
-					_this.wxShare()
-					wx.error(function(res) {
-						//('微信api配置出错');
-					});
-				}).catch(error => {
-
-					//(error);
-				})
-
-			},
-			//微信分享自定义
-			wxShare() {
-				var img =
-					"http://oss.xiaoxinda.com/charging/chargingconfigure/2022/6/6/ec228c56-487a-4ae1-ac6f-37284060fbba/hongbao.jpg"
-				// img="https://yktwechat.xiaoxinda.com/config/xxd2021.jpg"		
-				// if (indexLogo) {
-				// 	this.indexLogo = indexLogo;
-				// }
-				var info = this.carhelp.getPersonInfo()
-				//var img=require("@/static/img/aboutus.png")
-				////(this.nowItem);
-				var ProjectName = process.car.ProjectName; //info.nickName+
-				var nickName = info.nickName ? info.nickName : '好友';
-				var title = nickName + "邀请你参加'凭话费领年卡活动'"
-				//"["+ProjectName+"]"+'和好友一起领5元红包'
-				var desc = ProjectName
-				let joinUrl = window.location.href.split("/team51/")[0] + "/team51/#/pages/user/newYear2024?back=1"
-				//this.joinUrl=joinUrl;
-				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.updateAppMessageShareData({
-						title: title,
-						desc: desc,
-						link: joinUrl,
-						imgUrl: img,
-						success: function() {
-							//("updateAppMessageShareData")
-							// 设置成功
-							_this.$emit("wxShare", null);
-						}
-					})
-					wx.updateTimelineShareData({
-						title: title,
-						desc: desc,
-						link: joinUrl,
-						imgUrl: img,
-						success: function() {
-							//("updateTimelineShareData")
-							// 设置成功
-							_this.$emit("wxShare", null);
-						}
-					})
-					console.log("readyreadyreadyreadyready")
-				});
-			}
-		}
-	}
-</script>
-<style>
-	page {
-		background: #c9382c;
-	}
-</style>
-<style lang="scss" scoped>
-	@import "@/_theme.scss";
-
-	.all {
-		@include themeify {
-			font-size: themed('font-size1');
-		}
-	}
-
-	.imgHead {
-		padding-top: 72rpx;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-
-		.imgHead1 {
-			img {
-				height: 24px;
-			}
-
-			display: flex;
-			justify-content: center;
-		}
-
-		.imgHead2 {
-
-			display: flex;
-
-			img {
-				width: 100%;
-				height: 40px;
-			}
-
-			margin-top: 16px;
-		}
-	}
-
-	.main {
-
-		padding: 22rpx 56rpx 170rpx;
-
-		.text {
-			color: rgba(255, 255, 255, 100);
-
-			@include themeify {
-				font-size: themed('font-size4');
-			}
-
-			/*		   font-size: 18px;*/
-			text-align: justify;
-			text-indent: 36px;
-
-
-		}
-
-		.suited {
-			background-color: #fff;
-			//background: linear-gradient(180deg, rgba(189,255,224,1) 0%,rgba(255,255,255,1) 14%);
-			background: linear-gradient(180deg, rgba(255, 224, 223, 1) 0%, rgba(255, 255, 255, 1) 14%);
-			margin-top: 24px;
-			padding: 24px;
-			border-radius: 16px;
-
-			.title {
-				/*height: 18px;*/
-				color: rgba(16, 16, 16, 100);
-
-
-
-				font-size: 18px;
-				font-weight: 600;
-			}
-
-			.content {
-				margin: 16rpx 0;
-				//font-weight: 550;
-				color: rgba(102, 102, 102, 1);
-				line-height: 20px;
-				font-size: 14px;
-
-				p {
-					margin: 8rpx 0;
-				}
-			}
-		}
-		.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);
-			}
-			.title{
-				color: rgba(16, 16, 16, 1);
-				font-size: 36rpx;
-				font-weight: bold;
-				margin-bottom: 24rpx
-			}
-			
-			.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 {
-				font-size: 18px;
-
-				@include themeify {
-
-					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);
-				margin-top: 12px;
-				overflow-y: scroll;
-
-				@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 {
-					width: 50% !important;
-					margin-top: 4px;
-				}
-			}
-
-		}
-
-		.want {
-			/deep/.u-checkbox {
-				margin-top: 8px;
-			}
-		}
-
-		.hint {
-			margin-top: 12px;
-
-			@include themeify {
-				font-size: themed('font-size2');
-				line-height: themed('font-size5');
-			}
-
-			/*
-			font-size: 14px;
-			line-height: 20px;
-			*/
-			text-align: center;
-
-			.tel-num {
-				color: #9FC7FF;
-			}
-		}
-
-		/deep/.u-btn {
-			border-radius: 50px;
-			margin-top: 40rpx;
-		}
-	}
-
-	.InviteFriends {
-		//background-image: linear-gradient(0deg, #a2e9c9, #01b963);
-		background: #c9382c;
-
-	}
-
-
-
-	.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;
-
-		}
-	}
-
-	// .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
-	}
-	
-	.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;
-			}
-		}
-	
-	
-	}
+	import {
+		checkPhone
+	} from '@/utils'
+	
+	import wx from 'weixin-js-sdk'
+	import * as API from '@/apis/friends.js'
+	import * as WxJsApi from '@/utils/wxJsApi.js'
+	import * as API_weixin from '@/apis/weixin.js'
+
+	import ucarkeyboard from '@/components/Ucarkeyboard.vue'
+
+
+	export default {
+		components: {
+			ucarkeyboard
+		},
+		data() {
+			return {
+				tableList:[],
+				isLogin: false,
+				carAuthImg: "",
+				id: "",
+				carTempBl: false,
+				code: "",
+				show: false,
+
+				uid: "",
+
+				show1: false,
+				show2: false,
+				projectName: "",
+				name: "",
+
+				back: false,
+
+				subForm: {
+					realName: "",
+					phone: "",
+					carNum: "",
+					licenseFileUrl: "",
+					openId: "",
+					shareUserId: ""
+				},
+
+
+				placeholderStyle: {
+					'font-size': '16px',
+
+					'padding': '4px 8px',
+				},
+				shareUserId: "",
+				userInfo: null,
+				carNum: '',
+				carLicense: 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_1230", {
+					sid: op.sid,
+					time: new Date().getTime()
+				});
+			} else {
+				var obj = this.carhelp.get("picc_shareUserId_1230")
+				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: "来自好友的分享"
+				})
+			}
+
+			this.get_wx_config();
+			this.getList("凭话费送年卡")
+		},
+		onReady() {
+			
+			
+			var info = this.carhelp.getPersonInfo();
+
+			if (info.id && info.phone) {
+				//this.isLogin=true
+				this.userInfo = info;
+				this.subForm.phone = info.phone;
+
+			}
+		},
+		onShow() {
+
+			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;
+			
+			},
+			
+			getList(key) {
+				API.findByCatalogName({
+					catalogName:key
+				}).then((res) => {
+
+					this.tableList=res.data.dataDictionaryList
+
+					//setGzDate
+				}).catch(error => {
+					uni.showToast({
+						title: error
+					})
+				})
+
+			},
+
+			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 = process.car.gzUrl;
+				window.location.href = url
+
+			},
+			submit() {
+				this.subForm.openId = this.carhelp.getOpenId();
+				this.subForm.shareUserId = this.shareUserId;
+				this.subForm.event = 1;
+
+				if (!this.subForm.phone) {
+					uni.showToast({
+						title: "请填写手机号"
+					})
+					return
+				}
+				var checkPhoneResult = checkPhone(this.subForm.phone);
+
+				if (checkPhoneResult !== true) {
+					uni.showToast({
+						title: checkPhoneResult,
+					})
+					return;
+				}
+
+
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				API.submitEventRegistration(this.subForm).then((res) => {
+					uni.hideLoading()
+
+					if (res.result) {
+
+						uni.showModal({
+							//showCancel:false,
+
+							title: "提示",
+							content: "预约成功！",
+							cancelText: "继续填写",
+							confirmText: "前往主页",
+
+							success: (me) => {
+								this.carAuthImg = "";
+								this.subForm = {
+									phone: "",
+								}
+								if (me.confirm) {
+									uni.reLaunch({
+										url: "/"
+									})
+								}
+
+							}
+						})
+					}
+
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+			},
+
+
+			//获取微信jssdk配置信息
+			get_wx_config() {
+				//
+				var _this = this
+				API_weixin.getConfig().then(response => {
+					var wxconfig = response.data.wxConfig;
+
+					wx.config({
+						debug: false, // 开启调试模式,
+						appId: wxconfig.appId, // 必填，企业号的唯一标识，此处填写企业号corpid
+						timestamp: wxconfig.timestamp, // 必填，生成签名的时间戳
+						nonceStr: wxconfig.nonceStr, // 必填，生成签名的随机串
+						signature: wxconfig.signature, // 必填，签名，见附录1
+						jsApiList: ['updateAppMessageShareData',
+							'updateTimelineShareData', 'onMenuShareTimeline', 'onMenuShareAppMessage',
+							'onMenuShareQQ', 'onMenuShareQZone',
+							 'openLocation'
+							
+						], // 必填，需要使用的JS接口列表，所有JS接口列表见附录2
+
+					});
+					_this.wxShare()
+					wx.error(function(res) {
+						//('微信api配置出错');
+					});
+				}).catch(error => {
+
+					//(error);
+				})
+
+			},
+			//微信分享自定义
+			wxShare() {
+				var img =
+					"http://oss.xiaoxinda.com/charging/chargingconfigure/2022/6/6/ec228c56-487a-4ae1-ac6f-37284060fbba/hongbao.jpg"
+				// img="https://yktwechat.xiaoxinda.com/config/xxd2021.jpg"		
+				// if (indexLogo) {
+				// 	this.indexLogo = indexLogo;
+				// }
+				var info = this.carhelp.getPersonInfo()
+				//var img=require("@/static/img/aboutus.png")
+				////(this.nowItem);
+				var ProjectName = process.car.ProjectName; //info.nickName+
+				var nickName = info.nickName ? info.nickName : '好友';
+				var title = nickName + "邀请你参加'凭话费领年卡活动'"
+				//"["+ProjectName+"]"+'和好友一起领5元红包'
+				var desc = ProjectName
+				let joinUrl = window.location.href.split("/team51/")[0] + "/team51/#/pages/user/newYear2024?back=1"
+				//this.joinUrl=joinUrl;
+				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.updateAppMessageShareData({
+						title: title,
+						desc: desc,
+						link: joinUrl,
+						imgUrl: img,
+						success: function() {
+							//("updateAppMessageShareData")
+							// 设置成功
+							_this.$emit("wxShare", null);
+						}
+					})
+					wx.updateTimelineShareData({
+						title: title,
+						desc: desc,
+						link: joinUrl,
+						imgUrl: img,
+						success: function() {
+							//("updateTimelineShareData")
+							// 设置成功
+							_this.$emit("wxShare", null);
+						}
+					})
+					console.log("readyreadyreadyreadyready")
+				});
+			}
+		}
+	}
+</script>
+<style>
+	page {
+		background: #c9382c;
+	}
+</style>
+<style lang="scss" scoped>
+	@import "@/_theme.scss";
+
+	.all {
+		@include themeify {
+			font-size: themed('font-size1');
+		}
+	}
+
+	.imgHead {
+		padding-top: 72rpx;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+
+		.imgHead1 {
+			img {
+				height: 24px;
+			}
+
+			display: flex;
+			justify-content: center;
+		}
+
+		.imgHead2 {
+
+			display: flex;
+
+			img {
+				width: 100%;
+				height: 40px;
+			}
+
+			margin-top: 16px;
+		}
+	}
+
+	.main {
+
+		padding: 22rpx 56rpx 170rpx;
+
+		.text {
+			color: rgba(255, 255, 255, 100);
+
+			@include themeify {
+				font-size: themed('font-size4');
+			}
+
+			/*		   font-size: 18px;*/
+			text-align: justify;
+			text-indent: 36px;
+
+
+		}
+
+		.suited {
+			background-color: #fff;
+			//background: linear-gradient(180deg, rgba(189,255,224,1) 0%,rgba(255,255,255,1) 14%);
+			background: linear-gradient(180deg, rgba(255, 224, 223, 1) 0%, rgba(255, 255, 255, 1) 14%);
+			margin-top: 24px;
+			padding: 24px;
+			border-radius: 16px;
+
+			.title {
+				/*height: 18px;*/
+				color: rgba(16, 16, 16, 100);
+
+
+
+				font-size: 18px;
+				font-weight: 600;
+			}
+
+			.content {
+				margin: 16rpx 0;
+				//font-weight: 550;
+				color: rgba(102, 102, 102, 1);
+				line-height: 20px;
+				font-size: 14px;
+
+				p {
+					margin: 8rpx 0;
+				}
+			}
+		}
+		.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);
+			}
+			.title{
+				color: rgba(16, 16, 16, 1);
+				font-size: 36rpx;
+				font-weight: bold;
+				margin-bottom: 24rpx
+			}
+			
+			.u-input {
+				border-radius: 50px;
+				background-color: rgba(232, 236, 234, 100);
+				margin-top: 12px;
+
+			}
+
+			::v-deep.uni-input-input {
+				margin: 20px;
+			}
+
+			::v-deep.u-input__right-icon {
+				margin-right: 10px;
+			}
+
+			p {
+				font-size: 18px;
+
+				@include themeify {
+
+					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);
+				margin-top: 12px;
+				overflow-y: scroll;
+
+				@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');
+					}
+				}
+
+				::v-deep.uni-textarea-textarea {
+					width: 90%;
+					padding: 10px 20px;
+
+				}
+
+				::v-deep.u-input__right-icon {
+					display: none;
+				}
+			}
+		}
+
+		.type {
+			.checkbox {
+				margin-top: 12px;
+
+				::v-deep.u-checkbox {
+					width: 50% !important;
+					margin-top: 4px;
+				}
+			}
+
+		}
+
+		.want {
+			::v-deep.u-checkbox {
+				margin-top: 8px;
+			}
+		}
+
+		.hint {
+			margin-top: 12px;
+
+			@include themeify {
+				font-size: themed('font-size2');
+				line-height: themed('font-size5');
+			}
+
+			/*
+			font-size: 14px;
+			line-height: 20px;
+			*/
+			text-align: center;
+
+			.tel-num {
+				color: #9FC7FF;
+			}
+		}
+
+		::v-deep.u-btn {
+			border-radius: 50px;
+			margin-top: 40rpx;
+		}
+	}
+
+	.InviteFriends {
+		//background-image: linear-gradient(0deg, #a2e9c9, #01b963);
+		background: #c9382c;
+
+	}
+
+
+
+	.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;
+
+		}
+	}
+
+	// .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
+	}
+	
+	.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/preengaged/preengaged.vue

@@ -496,7 +496,7 @@
 			height: 56px;
 			padding: 12px 0;
 
-			/deep/.u-btn {
+			::v-deep.u-btn {
 				height: 32px;
 				line-height: 32px;
 				background-color: rgba(255, 255, 255, 100);

pages/user/preengaged/preengagedListDetails.vue

@@ -208,7 +208,7 @@
 
 	}
 
-	/deep/.u-alert-desc {
+	::v-deep.u-alert-desc {
 		width: 100vw;
 		text-align: center;
 		color: #ff5a00;

pages/user/setting.vue

@@ -1,18 +1,18 @@
-<template>
-	<view>
-		<ujp-navbar title="设置"></ujp-navbar>
		<view class="group">
-			<view class="userCell-item">
-				<view class="userCell-title">
-					<p class="oldTextjp" oldstyle="font-size: 18px;">长辈模式</p>
-				</view>
-				<view class="userCell-content " >
-					<view class="value">
-						<view class="text oldTextjp2" oldstyle="font-size: 16px;">
-							字体更大 看得清
-						</view>
-						<u-switch v-model="checked" active-color="#00E266" @change="checkedChange"></u-switch>
-					</view>
-				</view>
+<template>
+	<view>
+		<ujp-navbar title="设置"></ujp-navbar>		<view class="group">
+			<view class="userCell-item">
+				<view class="userCell-title">
+					<p class="oldTextjp" oldstyle="font-size: 18px;">长辈模式</p>
+				</view>
+				<view class="userCell-content " >
+					<view class="value">
+						<view class="text oldTextjp2" oldstyle="font-size: 16px;">
+							字体更大 看得清
+						</view>
+						<u-switch v-model="checked" active-color="#00E266" @change="checkedChange"></u-switch>
+					</view>
+				</view>
 			</view>
 			<view class="userCell-item" v-if="personInfo.memberLevel==3||personInfo.memberLevel==4">
 				<view class="userCell-title">
@@ -26,26 +26,26 @@
 						<u-switch v-model="checked2" active-color="#00E266" @change="checkedChange2"></u-switch>
 					</view>
 				</view>
-			</view>
-			<view class="userCell-item" @click="gotoUrl('pages/user/logout')">
-				<view class="userCell-title">
-					<p class="oldTextjp" oldstyle="font-size: 18px;">注销账号</p>
-				</view>
-				<view class="userCell-content " >
-					<text class="ff oldTextjp2" oldstyle="font-size: 16px;">注销后无法恢复，请谨慎操作	</text>
-					<text class="iconfont">&#xe600;</text>
-				</view>
-			</view>
-		</view>
-			
-		<view class="logout-btn oldTextjp" oldstyle="font-size:18px" @click="signOut">
-			退出帐号
-		</view>
-		
+			</view>
+			<view class="userCell-item" @click="gotoUrl('pages/user/logout')">
+				<view class="userCell-title">
+					<p class="oldTextjp" oldstyle="font-size: 18px;">注销账号</p>
+				</view>
+				<view class="userCell-content " >
+					<text class="ff oldTextjp2" oldstyle="font-size: 16px;">注销后无法恢复，请谨慎操作	</text>
+					<text class="iconfont">&#xe600;</text>
+				</view>
+			</view>
+		</view>
+			
+		<view class="logout-btn oldTextjp" oldstyle="font-size:18px" @click="signOut">
+			退出帐号
+		</view>
+		
 		<view>
-			
-			<u-modal v-model="show" @confirm="confirm" confirm-color="#FF3D00" :show-cancel-button="true" ref="uModal" :asyncClose="true" :title="title" 
-				:content="content" :content-style="{color: '#333333'}"></u-modal>
+			
+			<u-modal v-model="show" @confirm="confirm" confirm-color="#FF3D00" :show-cancel-button="true" ref="uModal" :asyncClose="true" :title="title" 
+				:content="content" :content-style="{color: '#333333'}"></u-modal>
 		</view>
 		
 		<u-modal v-model="quickChargingBl" :mask-close-able="true" class="quickMain" confirm-text="注册会员" cancel-text="先不注册" :show-title="false" width="650"
@@ -78,47 +78,47 @@
 				</view>
 				
 			</view>
-		</u-modal>
-	</view>
-</template>
-
-<script>
-	import * as userApi from '@/apis/user.js'
-	import * as API from '@/apis/index.js'
+		</u-modal>
+	</view>
+</template>
+
+<script>
+	import * as userApi from '@/apis/user.js'
+	import * as API from '@/apis/index.js'
 	import * as loginApi from '@/apis/login.js'
-	
-	export default {
-		data() {
-			return {
-				show: false,
-				title: '退出账号',
-				content: '是否退出当前账号?',
-				userId: '',
+	
+	export default {
+		data() {
+			return {
+				show: false,
+				title: '退出账号',
+				content: '是否退出当前账号?',
+				userId: '',
 				userPhone: '',
-				quickChargingBl:false,
+				quickChargingBl:false,
 				checked:false,
-				checked2:false,
-				valueStyle: {
-					color:'#ff3300',
-				},
-				valueStyle2: {
-					color: '#777777',
-					textAlign: 'left',
-					marginLeft: '8px'
-				},
-				titleStyle: {
-					fontWeight: 'bold',
-					fontSize: '18px',
-				},
+				checked2:false,
+				valueStyle: {
+					color:'#ff3300',
+				},
+				valueStyle2: {
+					color: '#777777',
+					textAlign: 'left',
+					marginLeft: '8px'
+				},
+				titleStyle: {
+					fontWeight: 'bold',
+					fontSize: '18px',
+				},
 				fontMode: '',
-				personInfo:{}
-			}
-		},
-		onReady() {
-			if(this.carhelp.get("getElderModeClass") == "长辈模式") {
-				this.checked = true;
-			} else {
-				this.checked = false;
+				personInfo:{}
+			}
+		},
+		onReady() {
+			if(this.carhelp.get("getElderModeClass") == "长辈模式") {
+				this.checked = true;
+			} else {
+				this.checked = false;
 			}
 			this.personInfo = this.carhelp.getPersonInfo()
 			this.$forceUpdate()
@@ -128,8 +128,8 @@
 			}
 			if(this.personInfo.quickCharging){
 				this.checked2 = true;
-			}
-		},
+			}
+		},
 		methods: {
 			getUserInfo() {
 				uni.showLoading({
@@ -171,58 +171,58 @@
 						icon: "none"
 					})
 				})
-			},
-			checkedChange() {
-				if(this.checked) {
-					this.carhelp.set("getElderModeClass", "长辈模式");
-					this.fontMode = '1';
-				} else {
-					this.carhelp.set("getElderModeClass", "标准模式");
-					this.fontMode = '0';
-				}
-				
-				API.changeFont({fontMode: this.fontMode}).then((res) => {
-					this.getUserInfo()
-				}).catch(error => {
-					uni.showToast({
-						title: error,
-						icon: "none"
-					})
-				})
-			},
-			signOut() {
-				this.show = true;
-			},
-			confirm() {
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})		
-				userApi.logout().then((res) => {
-					uni.hideLoading();
-					this.show = false;
-					this.carhelp.logoff()
-					uni.redirectTo({
-						url: '/pages/login/login'
-					})
-				}).catch(error => {
-					uni.showToast({
-						title: error,
-						icon: "none"
-					})
-				})
-			}
-		}
-	}
-</script>
-
+			},
+			checkedChange() {
+				if(this.checked) {
+					this.carhelp.set("getElderModeClass", "长辈模式");
+					this.fontMode = '1';
+				} else {
+					this.carhelp.set("getElderModeClass", "标准模式");
+					this.fontMode = '0';
+				}
+				
+				API.changeFont({fontMode: this.fontMode}).then((res) => {
+					this.getUserInfo()
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+			},
+			signOut() {
+				this.show = true;
+			},
+			confirm() {
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})		
+				userApi.logout().then((res) => {
+					uni.hideLoading();
+					this.show = false;
+					this.carhelp.logoff()
+					uni.redirectTo({
+						url: '/pages/login/login'
+					})
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+			}
+		}
+	}
+</script>
+
 <style lang="scss" scoped>
 	
 	.quickMain{
-		/deep/.u-mode-center-box{
+		::v-deep.u-mode-center-box{
 			background-color: transparent;
 		}
-		/deep/.u-model{
+		::v-deep.u-model{
 			background-color: transparent;
 		}
 		.quickMain-slot-content{
@@ -264,108 +264,108 @@
 			
 			
 		}
-	}
-	.logout-btn{
-		background-color: #fff;
-		padding: 12px 0;
-		text-align: center;
-		margin-top: 12px;
-	}
-	.group{
-		background-color: #fff;
-		margin-top: 12px;
-	}
- 
-  .ff{
-	  color: #FF0000;
-  }
-	.userCell-item {
-		display: flex;
-		border-bottom: 1px solid rgba(241, 241, 241, 100);
-		align-items: center;
-		padding: 8px 16px 8px 0px;
-	  margin-left: 8px;
-		.userCell-title {
-			
-			font-size: 16px;
-			display: flex;
-			margin-right: 8px;
-	
-			p {
-				margin-left: 8px;
-				font-size: 16px;
-				line-height: 28px;
-				color: #1a1a1a;
-			}
-		}
-	
-		.userCell-content {
-			display: flex;
-			flex: 1;
-			justify-content: space-between;
-			//margin-left: 20rpx;
-			color: #777777;
-			font-size: 12px;
-			line-height: 20px;
-			.iconfont{
-				font-size: 24px;
-				 margin: auto 0;
-				color: #b3b3b3
-			}
-	
-		}
-	
-		.value {
-			display: flex;
-			justify-content: space-between;
-			flex: 1;
-	
-			.text {
-				line-height: 28px;
-				// margin-right: 20vw;
-			}
-	
-		}
-	
-		.u-switch {
-			float: right;
-			width: 48px;
-			height: 24px;
-			vertical-align: middle;
-			margin-left: 8px;
-		}
-	
-		/deep/.u-switch__node {
-			width: 24px !important;
-			height: 24px !important;
-		}
-	
-		
-	}
-	.switcher-mode{
-		background-color: #fff;
-		height: 44px;
-		line-height: 44px;
-		display: flex;
-		justify-content: space-between;
-		padding: 0 14px;
-		text{
-			font-size: 12px;
-			color: rgba(119, 119, 119, 100);
-			margin-left: 8px;
-			}
-			.switch-box{
-				padding-top: 8px;
-			}
-			.switch{
-				width: 40px;
-				height: 22px;
-				
-			}
-			/deep/.u-switch__node{
-				width: 20px !important;
-				height: 20px !important;
-			}
+	}
+	.logout-btn{
+		background-color: #fff;
+		padding: 12px 0;
+		text-align: center;
+		margin-top: 12px;
+	}
+	.group{
+		background-color: #fff;
+		margin-top: 12px;
+	}
+ 
+  .ff{
+	  color: #FF0000;
+  }
+	.userCell-item {
+		display: flex;
+		border-bottom: 1px solid rgba(241, 241, 241, 100);
+		align-items: center;
+		padding: 8px 16px 8px 0px;
+	  margin-left: 8px;
+		.userCell-title {
+			
+			font-size: 16px;
+			display: flex;
+			margin-right: 8px;
+	
+			p {
+				margin-left: 8px;
+				font-size: 16px;
+				line-height: 28px;
+				color: #1a1a1a;
+			}
+		}
+	
+		.userCell-content {
+			display: flex;
+			flex: 1;
+			justify-content: space-between;
+			//margin-left: 20rpx;
+			color: #777777;
+			font-size: 12px;
+			line-height: 20px;
+			.iconfont{
+				font-size: 24px;
+				 margin: auto 0;
+				color: #b3b3b3
+			}
+	
+		}
+	
+		.value {
+			display: flex;
+			justify-content: space-between;
+			flex: 1;
+	
+			.text {
+				line-height: 28px;
+				// margin-right: 20vw;
+			}
+	
+		}
+	
+		.u-switch {
+			float: right;
+			width: 48px;
+			height: 24px;
+			vertical-align: middle;
+			margin-left: 8px;
+		}
+	
+		::v-deep.u-switch__node {
+			width: 24px !important;
+			height: 24px !important;
+		}
+	
+		
+	}
+	.switcher-mode{
+		background-color: #fff;
+		height: 44px;
+		line-height: 44px;
+		display: flex;
+		justify-content: space-between;
+		padding: 0 14px;
+		text{
+			font-size: 12px;
+			color: rgba(119, 119, 119, 100);
+			margin-left: 8px;
+			}
+			.switch-box{
+				padding-top: 8px;
+			}
+			.switch{
+				width: 40px;
+				height: 22px;
+				
+			}
+			::v-deep.u-switch__node{
+				width: 20px !important;
+				height: 20px !important;
+			}
 	}
 	.btnview {
 	
@@ -380,5 +380,5 @@
 			margin-top: 20rpx;
 			padding-bottom: 48rpx;
 		}
-	}
-</style>
+	}
+</style>

pages/user/sharePicc.vue

@@ -1,902 +1,902 @@
-<template>
-	<view class="all">
-		<u-mask :show="show" @click="show = false">
-			<u-image width="100%" height="500px" :mode="'widthFix'" src="@/assets/static/img/guide_point2.png"></u-image>
-
-		</u-mask>
-
-		<ujp-navbar title="PICC车险活动"  :startGz="false"  :isBack="back" ></ujp-navbar>
-		<view class="InviteFriends" :class="{
-			opacityClass:show
-		}">
-		<view class="text imgHead">
+<template>
+	<view class="all">
+		<u-mask :show="show" @click="show = false">
+			<u-image width="100%" height="500px" :mode="'widthFix'" src="@/assets/static/img/guide_point2.png"></u-image>
+
+		</u-mask>
+
+		<ujp-navbar title="PICC车险活动"  :startGz="false"  :isBack="back" ></ujp-navbar>
+		<view class="InviteFriends" :class="{
+			opacityClass:show
+		}">
+		<view class="text imgHead">
 					<view class="imgHead1">
 						<img  v-if="branchParameterBl('ud')"  style="width: 105px; height: 30px;" src="@/assets/logo/logo4Ud.png" alt="">
-						
+						
 						<img v-else   style="width: 105px;" src="@/assets/logo/logo1.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" v-if="branchParameterBl()" >
-						<img  style="width: 252px;height: 28px;" src="@/assets/img/piccShare/4.png"></img>
-					</view>
-				</view>
-			<view class="main">
-				
-				<view class="suited">
-					<p class="title">活动对象 :</p>
-					<view class="content">
-						新能源车及燃油车车主。
-						
-					</view>
-					<p class="title">活动时间 :</p>
-					<view class="content" style="color: red;">
-					<!-- 2023年12月1日-2024年5月31日 --> 活动已结束
-					</view>
-					
-					<p class="title">活动说明 :</p>
-					<view class="content">
-						<p>1.本活动为{{projectName}}发起，由中国人民财产保险股份有限公司荆州分公司提供服务。</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>
-
-				<view class="application-form ">
-					<view class="name" v-if="false">
-						<p><span style="color: red;">*</span>真实姓名</p>
-						<u-input v-model="subForm.realName" :customStyle="placeholderStyle" :placeholderStyle="placeholderStyle"
-							placeholder="请填写真实姓名"></u-input>
-					</view>
-					<view class="tel" v-if="false">
-						<p><span style="color: red;">*</span>联系电话</p>
-						<u-input v-model="subForm.phone" :customStyle="placeholderStyle" 
-							:placeholderStyle="placeholderStyle" placeholder="请填写联系电话"></u-input>
-					</view>
-					
-					<view class="want" v-if="false&&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"  v-if="false">
-						<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"  v-if="false">
-						<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 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="info" >活动已结束</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>
-		</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>
-		
-	</view>
-</template>
-
-<script>
-	import wx from 'weixin-js-sdk'
-	 
-	import {
-		convertCanvasToImage,
-		substrMb
-	} from '@/utils'
-	import {
-		checkPhone
-	} from '@/utils'
-	
- 	import * as API from '@/apis/friends.js'
-	import * as WxJsApi from '@/utils/wxJsApi.js'
-	import * as API_weixin from '@/apis/weixin.js'
-
-	import ucarkeyboard from '@/components/Ucarkeyboard.vue'
-
-
-	export default {
-		components: {
-			ucarkeyboard
-		},
-		data() {
-			return {
-				isLogin:false,
-				carAuthImg:"",
-				id: "",
-				carTempBl:false,
-				code: "",
-				show: false,
-			 
-				uid: "",
-			 
-				show1: false,
-				show2: false,
-				projectName: "",
-				name: "",
-				 
-				back: true,
-				 
-				subForm: {
-					realName:"",
-					phone: "",
-					carNum:"",
-					licenseFileUrl: "",
-					openId:"",
-					shareUserId: ""
-				},
-
-				
-				placeholderStyle: {
-					'font-size': '16px',
-					
-					'padding': '4px 8px'
-					
-				},
-				shareUserId:"",
-				userInfo:null,
-				carNum:'',
-				 carLicense: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;
-					}
-					
-				}
-			}
-			//console.log(this.shareUserId )
-			if(this.shareUserId ){
-				uni.showToast({
-					title:"来自好友的分享"
-				})
-			}
-		
-			this.get_wx_config();
-
-		},
-		onReady() {
-		
-			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
-			}
-		},
-		onShow() {
-
-			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 = process.car.gzUrl;
-				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
-				   						});
-				   					},
-				   				});
-			},
-			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)
-					}
-				})
-			},
-			 
-			
-			 
-		 
-			//获取微信jssdk配置信息
-			get_wx_config() {
-				//("get_wx_configget_wx_configget_wx_configget_wx_config")
-				var _this = this
-				API_weixin.getConfig().then(response => {
-					var wxconfig = response.data.wxConfig;
-
-					wx.config({
-						debug: false, // 开启调试模式,
-						appId: wxconfig.appId, // 必填，企业号的唯一标识，此处填写企业号corpid
-						timestamp: wxconfig.timestamp, // 必填，生成签名的时间戳
-						nonceStr: wxconfig.nonceStr, // 必填，生成签名的随机串
-						signature: wxconfig.signature, // 必填，签名，见附录1
-						jsApiList: ['updateAppMessageShareData',
-						'updateTimelineShareData','onMenuShareTimeline', 'onMenuShareAppMessage', 'onMenuShareQQ', 'onMenuShareQZone'], // 必填，需要使用的JS接口列表，所有JS接口列表见附录2
-
-					});
-					_this.wxShare()
-					wx.error(function(res) {
-						//('微信api配置出错');
-					});
-				}).catch(error => {
-
-					//(error);
-				})
-
-			},
-			//微信分享自定义
-			wxShare() {
-				var img =
-					"http://oss.xiaoxinda.com/charging/chargingconfigure/2022/6/6/ec228c56-487a-4ae1-ac6f-37284060fbba/hongbao.jpg"
-				// img="https://yktwechat.xiaoxinda.com/config/xxd2021.jpg"		
-				// if (indexLogo) {
-				// 	this.indexLogo = indexLogo;
-				// }
-				var info = this.carhelp.getPersonInfo()
-				//var img=require("@/static/img/aboutus.png")
-				////(this.nowItem);
-				var ProjectName = process.car.ProjectName; //info.nickName+
-				var nickName = info.nickName ? info.nickName : '好友';
-				var title = nickName + "邀请你参加'购车险送年卡活动'"
-				//"["+ProjectName+"]"+'和好友一起领5元红包'
-				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;
-				}
-				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.updateAppMessageShareData({
-						title: title,
-						desc: desc,
-						link: joinUrl,
-						imgUrl: img,
-						success: function() {
-							//("updateAppMessageShareData")
-							// 设置成功
-							_this.$emit("wxShare", null);
-						}
-					})
-					wx.updateTimelineShareData({
-						title: title,
-						desc: desc,
-						link: joinUrl,
-						imgUrl: img,
-						success: function() {
-							//("updateTimelineShareData")
-							// 设置成功
-							_this.$emit("wxShare", null);
-						}
-					})
-					console.log("readyreadyreadyreadyready")
-				});
-			}
-		}
-	}
-</script>
-<style>
-	page {}
-</style>
-<style lang="scss" scoped>
-	@import "@/_theme.scss";
-
-	.all {
-		@include themeify {
-			font-size: themed('font-size1');
-		}
-	}
-	.imgHead{
-		padding-top: 72rpx;
-		    display: flex;
-		    flex-direction: column;
-		    align-items: center;
-		
-		.imgHead1{
-			img{
-				height: 20px;
-			}
-			    align-items: center;
-			    display: flex;
-			    justify-content: center;
-		}
-		.imgHead2{
-			
-			    display: flex;
-			img{
-				width: 100%;
-				height: 20px;
-			}
-			    margin-top: 16px;
-		}
-	}
-
-	.main {
-		
-		padding: 22rpx 56rpx 170rpx;
-		
-		.text {
-			color: rgba(255, 255, 255, 100);
-
-			@include themeify {
-				font-size: themed('font-size4');
-			}
-
-			/*		   font-size: 18px;*/
-			text-align: justify;
-			text-indent: 36px;
-
-
-		}
-
-		.suited {
-			background-color: #fff;
-			background: linear-gradient(180deg, rgba(189,255,224,1) 0%,rgba(255,255,255,1) 14%);
-			margin-top: 24px;
-			padding: 24px;
-			border-radius: 16px;
-
-			.title {
-				/*height: 18px;*/
-				color: rgba(16, 16, 16, 100);
-
-				
-
-				font-size: 18px;
-				font-weight: 600;
-			}
-
-			.content {
-				margin: 16rpx 0;
-				//font-weight: 550;
-				color: rgba(102, 102, 102, 1);
-				line-height: 20px;
-				font-size: 14px;
-				p{
-					margin: 8rpx 0;
-				}
-			}
-		}
-
-
-		.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 {
-					font-size:18px;
-				@include themeify {
-				
-					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);
-				margin-top: 12px;
-				overflow-y: scroll;
-
-				@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 {
-					width: 50% !important;
-					margin-top: 4px;
-				}
-			}
-
-		}
-
-		.want {
-			/deep/.u-checkbox {
-				margin-top: 8px;
-			}
-		}
-
-		.hint {
-			margin-top: 12px;
-
-			@include themeify {
-				font-size: themed('font-size2');
-				line-height: themed('font-size5');
-			}
-
-			/*
-			font-size: 14px;
-			line-height: 20px;
-			*/
-			text-align: center;
-
-			.tel-num {
-				color: #9FC7FF;
-			}
-		}
-
-		/deep/.u-btn {
-			border-radius: 50px;
-			margin-top: 24px;
-		}
-	}
-
-	.InviteFriends {
-		background-image: linear-gradient(0deg, #a2e9c9, #01b963);
-
-	}
-
-	
-
-	.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;
-	
-			}
-	}
-	
-	// .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
-	}
+						
+						<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" v-if="branchParameterBl()" >
+						<img  style="width: 252px;height: 28px;" src="@/assets/img/piccShare/4.png"></img>
+					</view>
+				</view>
+			<view class="main">
+				
+				<view class="suited">
+					<p class="title">活动对象 :</p>
+					<view class="content">
+						新能源车及燃油车车主。
+						
+					</view>
+					<p class="title">活动时间 :</p>
+					<view class="content" style="color: red;">
+					<!-- 2023年12月1日-2024年5月31日 --> 活动已结束
+					</view>
+					
+					<p class="title">活动说明 :</p>
+					<view class="content">
+						<p>1.本活动为{{projectName}}发起，由中国人民财产保险股份有限公司荆州分公司提供服务。</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>
+
+				<view class="application-form ">
+					<view class="name" v-if="false">
+						<p><span style="color: red;">*</span>真实姓名</p>
+						<u-input v-model="subForm.realName" :customStyle="placeholderStyle" :placeholderStyle="placeholderStyle"
+							placeholder="请填写真实姓名"></u-input>
+					</view>
+					<view class="tel" v-if="false">
+						<p><span style="color: red;">*</span>联系电话</p>
+						<u-input v-model="subForm.phone" :customStyle="placeholderStyle" 
+							:placeholderStyle="placeholderStyle" placeholder="请填写联系电话"></u-input>
+					</view>
+					
+					<view class="want" v-if="false&&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"  v-if="false">
+						<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"  v-if="false">
+						<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 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="info" >活动已结束</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>
+		</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>
+		
+	</view>
+</template>
+
+<script>
+	import wx from 'weixin-js-sdk'
+	 
+	import {
+		convertCanvasToImage,
+		substrMb
+	} from '@/utils'
+	import {
+		checkPhone
+	} from '@/utils'
+	
+ 	import * as API from '@/apis/friends.js'
+	import * as WxJsApi from '@/utils/wxJsApi.js'
+	import * as API_weixin from '@/apis/weixin.js'
+
+	import ucarkeyboard from '@/components/Ucarkeyboard.vue'
+
+
+	export default {
+		components: {
+			ucarkeyboard
+		},
+		data() {
+			return {
+				isLogin:false,
+				carAuthImg:"",
+				id: "",
+				carTempBl:false,
+				code: "",
+				show: false,
+			 
+				uid: "",
+			 
+				show1: false,
+				show2: false,
+				projectName: "",
+				name: "",
+				 
+				back: true,
+				 
+				subForm: {
+					realName:"",
+					phone: "",
+					carNum:"",
+					licenseFileUrl: "",
+					openId:"",
+					shareUserId: ""
+				},
+
+				
+				placeholderStyle: {
+					'font-size': '16px',
+					
+					'padding': '4px 8px'
+					
+				},
+				shareUserId:"",
+				userInfo:null,
+				carNum:'',
+				 carLicense: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;
+					}
+					
+				}
+			}
+			//console.log(this.shareUserId )
+			if(this.shareUserId ){
+				uni.showToast({
+					title:"来自好友的分享"
+				})
+			}
+		
+			this.get_wx_config();
+
+		},
+		onReady() {
+		
+			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
+			}
+		},
+		onShow() {
+
+			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 = process.car.gzUrl;
+				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
+				   						});
+				   					},
+				   				});
+			},
+			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)
+					}
+				})
+			},
+			 
+			
+			 
+		 
+			//获取微信jssdk配置信息
+			get_wx_config() {
+				//("get_wx_configget_wx_configget_wx_configget_wx_config")
+				var _this = this
+				API_weixin.getConfig().then(response => {
+					var wxconfig = response.data.wxConfig;
+
+					wx.config({
+						debug: false, // 开启调试模式,
+						appId: wxconfig.appId, // 必填，企业号的唯一标识，此处填写企业号corpid
+						timestamp: wxconfig.timestamp, // 必填，生成签名的时间戳
+						nonceStr: wxconfig.nonceStr, // 必填，生成签名的随机串
+						signature: wxconfig.signature, // 必填，签名，见附录1
+						jsApiList: ['updateAppMessageShareData',
+						'updateTimelineShareData','onMenuShareTimeline', 'onMenuShareAppMessage', 'onMenuShareQQ', 'onMenuShareQZone'], // 必填，需要使用的JS接口列表，所有JS接口列表见附录2
+
+					});
+					_this.wxShare()
+					wx.error(function(res) {
+						//('微信api配置出错');
+					});
+				}).catch(error => {
+
+					//(error);
+				})
+
+			},
+			//微信分享自定义
+			wxShare() {
+				var img =
+					"http://oss.xiaoxinda.com/charging/chargingconfigure/2022/6/6/ec228c56-487a-4ae1-ac6f-37284060fbba/hongbao.jpg"
+				// img="https://yktwechat.xiaoxinda.com/config/xxd2021.jpg"		
+				// if (indexLogo) {
+				// 	this.indexLogo = indexLogo;
+				// }
+				var info = this.carhelp.getPersonInfo()
+				//var img=require("@/static/img/aboutus.png")
+				////(this.nowItem);
+				var ProjectName = process.car.ProjectName; //info.nickName+
+				var nickName = info.nickName ? info.nickName : '好友';
+				var title = nickName + "邀请你参加'购车险送年卡活动'"
+				//"["+ProjectName+"]"+'和好友一起领5元红包'
+				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;
+				}
+				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.updateAppMessageShareData({
+						title: title,
+						desc: desc,
+						link: joinUrl,
+						imgUrl: img,
+						success: function() {
+							//("updateAppMessageShareData")
+							// 设置成功
+							_this.$emit("wxShare", null);
+						}
+					})
+					wx.updateTimelineShareData({
+						title: title,
+						desc: desc,
+						link: joinUrl,
+						imgUrl: img,
+						success: function() {
+							//("updateTimelineShareData")
+							// 设置成功
+							_this.$emit("wxShare", null);
+						}
+					})
+					console.log("readyreadyreadyreadyready")
+				});
+			}
+		}
+	}
+</script>
+<style>
+	page {}
+</style>
+<style lang="scss" scoped>
+	@import "@/_theme.scss";
+
+	.all {
+		@include themeify {
+			font-size: themed('font-size1');
+		}
+	}
+	.imgHead{
+		padding-top: 72rpx;
+		    display: flex;
+		    flex-direction: column;
+		    align-items: center;
+		
+		.imgHead1{
+			img{
+				height: 20px;
+			}
+			    align-items: center;
+			    display: flex;
+			    justify-content: center;
+		}
+		.imgHead2{
+			
+			    display: flex;
+			img{
+				width: 100%;
+				height: 20px;
+			}
+			    margin-top: 16px;
+		}
+	}
+
+	.main {
+		
+		padding: 22rpx 56rpx 170rpx;
+		
+		.text {
+			color: rgba(255, 255, 255, 100);
+
+			@include themeify {
+				font-size: themed('font-size4');
+			}
+
+			/*		   font-size: 18px;*/
+			text-align: justify;
+			text-indent: 36px;
+
+
+		}
+
+		.suited {
+			background-color: #fff;
+			background: linear-gradient(180deg, rgba(189,255,224,1) 0%,rgba(255,255,255,1) 14%);
+			margin-top: 24px;
+			padding: 24px;
+			border-radius: 16px;
+
+			.title {
+				/*height: 18px;*/
+				color: rgba(16, 16, 16, 100);
+
+				
+
+				font-size: 18px;
+				font-weight: 600;
+			}
+
+			.content {
+				margin: 16rpx 0;
+				//font-weight: 550;
+				color: rgba(102, 102, 102, 1);
+				line-height: 20px;
+				font-size: 14px;
+				p{
+					margin: 8rpx 0;
+				}
+			}
+		}
+
+
+		.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;
+
+			}
+
+			::v-deep.uni-input-input {
+				margin: 20px;
+			}
+
+			::v-deep.u-input__right-icon {
+				margin-right: 10px;
+			}
+
+			p {
+					font-size:18px;
+				@include themeify {
+				
+					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);
+				margin-top: 12px;
+				overflow-y: scroll;
+
+				@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');
+					}
+				}
+
+				::v-deep.uni-textarea-textarea {
+					width: 90%;
+					padding: 10px 20px;
+
+				}
+
+				::v-deep.u-input__right-icon {
+					display: none;
+				}
+			}
+		}
+
+		.type {
+			.checkbox {
+				margin-top: 12px;
+
+				::v-deep.u-checkbox {
+					width: 50% !important;
+					margin-top: 4px;
+				}
+			}
+
+		}
+
+		.want {
+			::v-deep.u-checkbox {
+				margin-top: 8px;
+			}
+		}
+
+		.hint {
+			margin-top: 12px;
+
+			@include themeify {
+				font-size: themed('font-size2');
+				line-height: themed('font-size5');
+			}
+
+			/*
+			font-size: 14px;
+			line-height: 20px;
+			*/
+			text-align: center;
+
+			.tel-num {
+				color: #9FC7FF;
+			}
+		}
+
+		::v-deep.u-btn {
+			border-radius: 50px;
+			margin-top: 24px;
+		}
+	}
+
+	.InviteFriends {
+		background-image: linear-gradient(0deg, #a2e9c9, #01b963);
+
+	}
+
+	
+
+	.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;
+	
+			}
+	}
+	
+	// .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
+	}
 </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;">{{projectName}}</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>
+<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;">{{projectName}}</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;
+				
+			  }
+			 ::v-deep.uni-input-input{
+			 			  margin: 20px;
+			 }
+			 ::v-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');
+ 					 }
+				 }
+				 ::v-deep.uni-textarea-textarea{
+					 width: 90%;
+					 padding: 10px 20px;
+					  
+				 }
+				 ::v-deep.u-input__right-icon {
+					 display: none;
+				 }
+				
+			  }
+			  .type{
+			  	.checkbox{
+			  		margin-top: 12px;
+			  		::v-deep.u-checkbox{
+			  			
+			  			margin-top: 4px;
+			  		}
+			  	}
+			  	
+			  }
+			  .want{
+				
+				  .radio-box{
+					  margin-top: 12px;
+				  }
+			  ::v-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;
+			  	}
+			  }
+			  ::v-deep.u-btn{
+			  	border-radius: 50px ;
+			  	margin-top: 24px;
+			  }
+		}
+
+	}
+</style>