快速注册样式

components/QuickRegistration.vue

@@ -0,0 +1,122 @@
+<template>
+	<view v-show="show1">
+		<view class="QuickRegistration">
+			<view class="view1">
+				<image class="quick1" src="@/assets/img/quick/1.png"></image>
+			</view>
+		
+			<view  class="view2">
+				
+				<view class="view3">
+					<image class="quick4" @click="close"
+					 src="@/assets/img/quick/4.png"></image>
+				</view>
+				
+				<view class="view4">
+					
+					<image class="quick2" src="@/assets/img/quick/2.png"></image>
+					
+					<view class="viewbtn">
+						
+						<image class="quick3" src="@/assets/img/quick/3.png"></image>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name:"QuickRegistration",
+		data() {
+			return {
+				show1:true,
+				show2:false
+			};
+		},
+		methods:{
+			open(){
+				
+			},
+			close() {
+				// 标记关闭是内部发生的，否则修改了value值，导致watch中对value检测，导致再执行一遍close
+				// 造成@close事件触发两次
+				this.show1=false
+				this.$emit("close");
+			},
+		}
+	}
+</script>
+
+<style  lang="scss" scoped>
+	.QuickRegistration{
+		position: fixed;
+		bottom: 80rpx;
+		z-index: 1000;
+		    width: 100%;
+		    display: flex;
+		    flex-direction: column;
+		    align-items: center;
+			
+		.quick1{
+			width: 240rpx;
+			height: 190rpx;
+			position: relative;
+			    bottom: -100rpx;
+		}
+		.quick2{
+			
+			width: 500rpx;
+			height: 72rpx;
+			    margin-bottom: 26rpx;
+		}
+		.quick3{
+			width: 176rpx;
+			height: 60rpx;
+		}
+		.quick4{
+			width: 40rpx;
+			height: 40rpx;
+			position: fixed;
+			right: 70rpx;
+		}
+		.view4{
+			    display: flex;
+			    align-items: center;
+			    justify-content: center;
+			    flex-direction: column;
+		}
+		.view3{
+			
+		}
+		.view1{
+			
+		}
+		.view2{
+			background: linear-gradient(180deg, rgba(79,205,145,1) 0%,rgba(30,159,84,1) 100%);
+			box-shadow: 0px 2px 8px 0px rgba(34, 125, 63, 0.5);
+			border: 1px solid rgba(79, 205, 145, 1);
+			border-radius: 12px;
+			width: 670rpx;
+			height: 320rpx;
+			
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			justify-content: space-between;
+			padding: 24rpx 0 40rpx 0;
+		}
+		.viewbtn{
+			width: 448rpx;
+			height: 88rpx;
+			border-radius: 50px;
+			background: linear-gradient(180deg, rgba(255,228,0,1) 0%,rgba(255,188,0,1) 100%);
+		
+			    display: flex;
+			    align-items: center;
+			    justify-content: center;
+		}
+	}
+	
+</style>

config/.env.dev.ud.js

@@ -2,7 +2,7 @@ const UNI_APP = {
 	ProjectName :"优电联盟",
 	BASE_URL: 'https://51team.xiaoxinda.com/charging-station-server/',
 	//
-	//BASE_URL: 'https://charging.xiaoxinda.com/charging-station-test/',
+	BASE_URL: 'https://charging.xiaoxinda.com/charging-station-test/',
 
 	//BASE_URL: 'http://192.168.77.162:8081/charging-station/' ,
 	//PARK_URL: 'http://192.168.11.120:8082/charging-parking/' ,

pages/login/completeInfo.vue

@@ -157,7 +157,7 @@
 				form: {
 					nickName: '',
 					headImg: '',
-					carNum: '鄂',
+					carNum: '',
 					defaultFlag: true,
 				},
 				usage:"",

pages/parking/search.vue

@@ -142,7 +142,7 @@
 				keyShow: true,
 				detail:{},
 				form: {
-					carNum: '鄂',
+					carNum: '',
 					parkId: "",
 				},
 				

pages/searchPile/chargeProcess/charge.vue

@@ -160,7 +160,7 @@
 
 			</view>
 			<!-- 优惠券2 -->
-			<view v-if="personInfo.userType == '1'"  class="greyTips" >
+			<view v-if="personInfo.userType == '1'&&0"   class="greyTips" >
 				车主注册会员可享受至少5%优惠，并可快速进入会员注册页面
 			</view>
 
@@ -463,7 +463,8 @@
 				</u-popup>
 
 			</view>
-		</template>
+		</template>
+		<quickRegistration></quickRegistration>
 	</view>
 </template>
 
@@ -484,10 +485,14 @@
 	
 	import * as Pay from '@/apis/weixin.js'
 // import { contentStore } from 'core/core.model'
+	import quickRegistration from '@/components/QuickRegistration.vue'
+	
 
 
-
-	export default {
+	export default {
+		components: {
+			quickRegistration
+		},
 		data() {
 			return {
 				fee: 0,

pages/searchPile/searchPile.vue

@@ -33,7 +33,7 @@
 						</view>
 					</view>
 					<view class="tagListSelect" >
-						<view class="tagBtn tagBtnAc" v-for="(item,i) in tagBtnAcList">
+						<view class="tagBtn tagBtnAc" v-for="(item,i) in tagBtnAcList" :key="i" >
 							{{item}}
 						</view>
 						

pages/searchPile/stationAndPile/chargingPileDetails.vue

@@ -218,7 +218,7 @@
 					<view class="chat-box" v-show="priceListBl">
 						<view class="chat_hhh">
 
-							<view class="chatTime" v-for="(item,i) in pricesInfo" :style="'width:'+getW(item)" :class="{
+							<view class="chatTime" v-for="(item,i) in pricesInfo"  :key="i" :style="'width:'+getW(item)" :class="{
 								 current1: pricesInfoCurrent.startTime==item.startTime,
 								 
 								current2: pricesInfoCurrent2.startTime==item.startTime,
@@ -688,7 +688,7 @@
 
 					</view>
 
-					<view class="btnview2" @click="show3=false">暂不注册,先充电</view>
+					<view class="btnview2" @click="show3=false,show4=true">暂不注册,先充电</view>
 				</view>
 			</view>
 		</u-modal>
@@ -775,6 +775,8 @@
 			return {
 				show1: false,
 				show2: false,
+				show3: false,
+				show4: false,
 				
 				carImg3Bl:false,
 				carImg4Bl:false,
@@ -786,7 +788,7 @@
 				show3: false,
 				temporaryCarNum: "",
 				form: {
-					carNum: '鄂',
+					carNum: '',
 					defaultFlag: true,
 				},
 				priceListBl: false,
@@ -1814,18 +1816,8 @@
 				})
 			},
 			startCarCharging(){
-				var time1=newDate("2024-05-18 12:00:00")
-				var time2=newDate("2024-06-08 12:00:00")
-				var time3=new Date()
-				
-				if(this.branchParameterBl('ud')&&time3>time1&&time3<time2){
-					uni.showModal({
-						title: '提示',
-						showCancel:false,
-						content:"暂停使用快捷充电\n两周年活动结束时恢复",
-						
-					})
-				}else if(this.gun&&this.gun.workStatus==2){
+				
+				 if(this.gun&&this.gun.workStatus==2){
 					uni.showModal({
 						title: '提示',
 						showCancel:false,
@@ -2354,7 +2346,7 @@
 			
 				.cost-explain2{
 					.car-number{
-						color: #00b962;
+						color: #FF3D00;
 					}
 				}
 				// 费用说明
@@ -2377,7 +2369,8 @@
 					.text {
 						font-size: 36rpx;
 						color: #101010;
-						width: 330rpx;
+						//width: 330rpx;
+						white-space: pre;
 					}
 				
 					.iconfont {

pages/user/car/carDet.vue

@@ -149,7 +149,7 @@
 				code:"",
 				codeId:"",
 				form: {
-					carNum: '鄂',
+					carNum: '',
 					defaultFlag: true,
 				},
 				selectIndex:-1,