Browse Source

周年活动,细节调整

zhengkaixin 1 year ago
parent
commit
01052a6848

+ 4 - 1
README.md

@@ -120,4 +120,7 @@ u-loadmore//加载更多
 
 
 
-//pages/discountCard/productDetails
+//pages/discountCard/productDetails
+
+
+npm install node-sass --ignore-scripts

+ 1 - 1
config/.env.dev.js

@@ -2,7 +2,7 @@ const UNI_APP = {
 	ProjectName :"51充电联盟",
 	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/' ,

+ 2 - 2
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/' ,
@@ -19,7 +19,7 @@ const UNI_APP = {
 	
 	wechatUrl:"/youdian",
 	openId:"oSruR6YkhP7QDroLnZGxWis43Kn0",//zkx
-	//openId:"oK9Wr59rru-i3bm7dtTtxnkR-i4s",//杨所
+	openId:"oSruR6dZcmSM4ATuweZ5fjHGQsiA",//杨所
  
 	//小鹏管家appid
 	//VUE_APP_WXAPPID:"wx7e70eb62a8459869",

+ 1 - 1
config/.env.js

@@ -10,7 +10,7 @@
     if (process.env.NODE_ENV === "development") {  
 		 
          ENV_VAR = require('@/config/.env.dev.js');
-		// ENV_VAR = require('@/config/.env.dev.ud.js');
+		 //ENV_VAR = require('@/config/.env.dev.ud.js');
 		 
 		
     } else if (process.env.NODE_ENV === "production") {  

+ 7 - 0
pages.json

@@ -157,6 +157,13 @@
 			"style": {
 				//"navigationStyle": "custom" // 隐藏系统导航栏
 			}
+		},
+		{
+			"name": "退款申请",
+			"path": "pages/user/finance/refundInfo",
+			"style": {
+				//"navigationStyle": "custom" // 隐藏系统导航栏
+			}
 		},
 		{
 			"name": "关于我们",

+ 9 - 4
pages/login/login.vue

@@ -9,7 +9,7 @@
 		<view class="login">
 			<view class="login-title">
 				
-				<h3>手机号登录/注册
+				<h3 ><span style="font-weight: bold;">手机号登录/注册</span>
 				<span class="login-title-span"  v-if="!personInfo&&!member"  @click="show3=true" >游客模式</span>
 				</h3>
 				<p>欢迎来到{{projectName}}</p>
@@ -20,16 +20,21 @@
 
 			<view class="login-form">
 				<view class="login-form-item">
-					<view class="title">手机号</view>
+					<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">未注册的手机号验证后将自动注册</view>
+					<view class="tips"><span style="color: red;">*</span>未注册的手机号验证后将自动注册</view>
+					<view class="tips" style="color: red;" v-if="branchParameterBl('ud')" >
+						
+						
+						*原51充电联盟会员使用原手机号登录后可同步您的余额、优惠券等账户信息
+					</view>
 				</view>
 				<view class="login-form-item">
-					<view class="title">验证码</view>
+					<view class="title"  style="font-weight: bold;">验证码</view>
 					<view class="input">
 						<u-input :customStyle="customStyle" :placeholderStyle="placeholderStyle"
 							v-model="form.verifyCode" type="number" placeholder="请输入验证码"

+ 4 - 1
pages/record/details.vue

@@ -103,7 +103,10 @@
 
 
 				<view class="details-row">
-					<p>优惠券抵扣</p><span style="color:#ef7041">{{userCouponObj? userCouponObj.useText : '未使用'}}</span>
+					<p>优惠券抵扣</p><span style="color:#ef7041">
+					{{userCouponObj&&userCouponObj.useText?(userCouponObj.useText=='服务费0折'?'免服务费':userCouponObj.useText):'未使用'}}
+					
+					 </span>
 				</view>
 				
 

+ 1 - 1
pages/searchPile/chargeProcess/dcCharging.vue

@@ -527,7 +527,7 @@
 						</view>
 						<view class="detail">
 
-							{{couponObj&&couponObj.useText?couponObj.useText:'未使用优惠券'}}
+							{{couponObj&&couponObj.useText?(couponObj.useText=='服务费0折'?'免服务费':couponObj.useText):'未使用优惠券'}}
 
 						</view>
 

+ 314 - 31
pages/searchPile/stationAndPile/chargingPileDetails.vue

@@ -356,8 +356,116 @@
 			
 			</view>
 			
-			
-		
+			<view class="slogan-4 " v-show="bannerListTop.length"
+				@click="showTop=true,getBannerInfoTopBl=true">
+			
+				<u-icon :class="{
+								imageshake :true
+							 }" size="45" name="gift"></u-icon>
+			
+			</view>
+			<u-modal v-model="showTop" v-if="getBannerInfoTopBl" class="showOss showOssK" :show-title="false"
+				:show-confirm-button="false">
+				<view class="slot-content">
+					<swiper class="swiper" circular :indicator-dots="true" :autoplay="true" :interval="2500"
+						:duration="500">
+			
+						<swiper-item class="swiperitem" v-if="showNt">
+			
+			
+							<u-image width="600" style="margin: auto;min-height: 250px;" mode="widthFix"
+								v-show="showNtStep==0" src="@/assets/img/nt/f5surprised-1.png">
+			
+								<view slot="loading" style="height: 200px;">
+									<u-loading mode="flower" size="186">
+			
+									</u-loading>
+			
+								</view>
+			
+							</u-image>
+							<view style="color: #ecc07d;
+										font-size: 64rpx;
+										position: relative;
+										top: -220rpx;
+										right: -100rpx; width: 400rpx;" @click="showNtStepClick" v-show="showNtStep==0">
+								<span>.</span>
+							</view>
+			
+							<u-image width="600" height="700" style="margin: auto;;min-height: 250px;"
+								mode="scaleToFill" v-show="showNtStep==1" src="@/assets/img/nt/f5surprised-2.png">
+			
+							</u-image>
+							<u-image width="600" style="margin: auto;min-height: 250px;" mode="widthFix"
+								v-show="showNtStep==2" src="@/assets/img/nt/nt-activity-3.png">
+			
+							</u-image>
+							<u-image width="500" style="color: #FFFFFF;
+										font-size: 64rpx;
+										position: relative;
+										top: -540rpx;
+										right: -60rpx;height: 0;
+									" mode="widthFix" v-show="showNtStep==2" src="@/assets/img/nt/f5surprised-3.png">
+			
+							</u-image>
+			
+			
+							<view style="color: #ecc07d;
+										font-size: 72rpx;
+										position: relative;
+										top: -180rpx;
+										right: -144rpx; width: 310rpx;" @click="showNtStepClick" v-show="showNtStep==2">
+								<span>.</span>
+							</view>
+			
+							<view style="color: #FFFFFF;
+										font-size: 64rpx;
+										position: relative;
+										top: -528rpx;
+										right: -80rpx;" :style="{
+									right:showNtValue>99?'-80rpx':(showNtValue>9?'-95rpx':'-110rpx')
+								}" v-show="showNtStep==1"><b>{{showNtValue}}</b>
+								<span style="font-size: 28rpx;">元</span>
+							</view>
+			
+							<view style="color: #ecc07d;
+								 		font-size: 72rpx;
+								 		position: relative;
+								 		top: -270rpx;
+								 		right: -144rpx; width: 310rpx;" @click="showNtStepClick" v-show="showNtStep==1">
+								<span>.</span>
+							</view>
+			
+			
+			
+			
+						</swiper-item>
+			
+						<swiper-item class="swiperitem" v-for="(item,i) in bannerListTop" :key="i">
+			
+			
+			
+							<u-image width="500" height="500" bgColor="#ff000000"
+								style="margin: auto;min-height: 250px;" mode="widthFix" @click="clickBannerTopI(i)"
+								:src="item.picUrl">
+								<view slot="loading" style="height: 200px;">
+									<u-loading mode="flower" size="186">
+			
+									</u-loading>
+			
+								</view>
+			
+							</u-image>
+			
+						</swiper-item>
+					</swiper>
+			
+			
+					<u-image width="36px" style="margin: auto; margin-top: 10px;" mode="widthFix" @click="showTop=false"
+						src="@/assets/img/if-close-line-circled.png"></u-image>
+			
+				</view>
+			</u-modal>
 			<view class="bottom">
 
 				<!-- 解锁中 -->
@@ -736,6 +844,11 @@
 				projectName: "",
 				
 				showrecharge:"",
+				bannerListTop:[],
+				getBannerInfoTopBl:true,
+				showTop:false,
+				showTopImg:"",
+				showTopIndex: 0,
 				 
 			}
 		},
@@ -834,7 +947,8 @@
 						icon: "none"
 					})
 				})
-			},
+			},
+			
 			chatShowBtn(item) {
 				if(this.chatShow == false){
 					this.chatShow = true
@@ -845,28 +959,53 @@
 				}
 				
 				this.pricesInfoCurrent2=item
+			},
+			clickBannerTopI(i) {
+				var mod = this.bannerListTop[i];
+				//this.showTop = false;
+				this.clickBanner(0, true, mod)
+			},
+			clickBannerTop() {
+				var mod = this.bannerListTop[this.showTopIndex];
+				this.showTop = false;
+				this.clickBanner(0, true, mod)
 			},
-			clickBanner(index) {
-				var mod = this.bannerList[index]
-
-				if (mod.linkUrl.indexOf('http') == 0) {
-					window.location = mod.linkUrl;
-				} else if (mod.linkUrl.indexOf('#/') == 0) {
-					if (mod.linkUrl.indexOf("?") == -1) {
-						mod.linkUrl += '?';
-					}
-					//window.location=mod.linkUrl;
-					var url = mod.linkUrl.split("#")[1]
-					//window.location = mod.clickUrl;
-					uni.navigateTo({
-						url: url
-					})
-				} else if (mod.linkUrl == '#' || mod.linkUrl == '') {
-
-				} else {
-					uni.navigateTo({
-						url: mod.linkUrl
-					})
+			clickBanner(index, bl, modout) {
+				var uurl = "";
+				var mod = this.bannerList[index]
+				if (modout) {
+					mod = modout;
+				}
+				mod.clickUrl = mod.linkUrl
+				
+				if (mod.linkPicUrl && !bl) {
+				
+					this.showOss = true;
+					this.showOssImg = mod.linkPicUrl;
+					this.showOssIndex = index;
+				
+				} else if (mod.clickUrl == null) {
+				
+				} else if (mod.clickUrl.indexOf('http') == 0) {
+				
+					window.location = mod.clickUrl + uurl;
+				} else if (mod.clickUrl.slice(-5) == 'login' && this.userId) {
+				
+				} else if (mod.clickUrl.indexOf('#/') == 0) {
+					if (mod.clickUrl.indexOf("?") == -1) {
+						mod.clickUrl += '?';
+					}
+					var url = mod.clickUrl.split("#")[1]
+					//window.location = mod.clickUrl;
+					uni.navigateTo({
+						url: url + uurl
+					})
+				} else if (mod.clickUrl == '#' || mod.clickUrl == '') {
+				
+				} else {
+					uni.navigateTo({
+						url: mod.clickUrl + uurl
+					})
 				}
 
 			},
@@ -1593,13 +1732,80 @@
 					})
 
 				}
+			},
+			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.getBannerInfoTop()
+							this.getBannerInfoTop("home-top2");	
+						}
+					}
+					
+			
+			
+				}).catch(error => {
+			
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
 			},
-			getBannerInfoTop() {
-				var personInfo = this.carhelp.getPersonInfo()
-
-				if (personInfo && personInfo.userType == "1") {
-					this.showVin = true
-				}
+			getBannerInfoTop(code) {
+				var nowtime = parseUnixTime(currentTimeStamp(), '{y}-{m}-{d}')
+				var time = this.carhelp.get("bannerListTop");
+				if ((time && nowtime == time)) {
+					this.getBannerInfoTopBl = false;
+				}
+				//特殊活动不考虑
+				this.getBannerInfoTopBl = true;
+				// uni.showLoading({
+				// 	title: "加载中",
+				// 	mask: true,
+				// })
+				
+				newsApi.getBannerInfo(code).then((res) => {
+				
+				
+					this.bannerListTop = res.data;
+				
+				
+					if (this.bannerListTop.length) {
+						this.showTop = true;
+						this.showTopImg = this.bannerListTop[0].picUrl;
+						this.showTopIndex = 0;
+				
+					}
+					this.carhelp.set("bannerListTop", nowtime);
+					//this.test()
+					var userInfo = this.carhelp.getPersonInfo();
+				
+					if (userInfo && userInfo.id) {
+						//this.getf5surprised()
+					} else {}
+				
+				
+				
+					//uni.hideLoading()
+					//document.getElementsByClassName("uni-swiper-wrapper")[0].parentNode.style="background-color: rgb(255, 255, 255); height: 120px;"
+				}).catch(error => {
+					uni.showToast({
+				
+						title: error,
+						icon: "none"
+					})
+				})
 			},
 			startCarCharging(){
 				var time1=newDate("2024-05-11")
@@ -1736,7 +1942,9 @@
 			if (carDetText) {
 				this.carDetText = carDetText
 			}
-			
+			if( this.branchParameterBl('ud')){
+				this.getf5surprised()
+			}
 			
 		},
 		onLoad(op) {
@@ -2517,5 +2725,80 @@
 			
 			
 		}
+	}
+	
+	
+	.slogan-4 {
+		z-index: 2;
+		margin-top: 10px;
+		display: flex;
+		justify-content: center;
+		/* text-decoration: underline; */
+	
+	
+		text-align: center;
+		position: fixed;
+		/* top: 40px; */
+		bottom: 180px;
+		right: 20px;
+		height: 80rpx;
+		width: 80rpx;
+		line-height: 20px;
+		font-size: 16px;
+		background: linear-gradient(95deg, #FF9800, #FF5722);
+		box-shadow: 0 4rpx 24rpx 0 #FF5722;
+		//padding-top: 8px;
+		color: #fff;
+		border-radius: 25px;
+	
+	}
+	
+	
+	.imageshake {
+		position: relative;
+		animation: shake 0.5s ease-in-out infinite;
+	}
+	
+	@keyframes shake {
+		0% {
+			transform: rotate(0deg);
+		}
+	
+		25% {
+			transform: rotate(8deg);
+		}
+	
+		50% {
+			transform: rotate(0deg);
+		}
+	
+		75% {
+			transform: rotate(-8deg);
+		}
+	
+		100% {
+			transform: rotate(0deg);
+		}
+	}
+	.showOssK {
+	
+		/deep/.u-model,
+		/deep/.u-mode-center-box {
+			background-color: transparent;
+		}
+	}
+	// .showOss {
+	
+	// 	/deep/.u-model,
+	// 	/deep/.u-mode-center-box {
+	// 		background-color: transparent;
+	// 	}
+	// }
+	.swiper {
+		height: 700rpx;
+	
+		.swiperitem {
+			height: 700rpx;
+		}
 	}
 </style>

+ 41 - 21
pages/temporary/anniversary2024.vue

@@ -111,40 +111,60 @@
 					})
 				},
 			exchangeBtn(){
-				if(!this.key){
-					return
-				}
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				userApi.exchange({
-					key: this.key
-				}).then((res) => {
-					uni.hideLoading();
-					this.getf5surprised()
+				var user=this.carhelp.getPersonInfo()
+				if(user.userType==1){
 					uni.showModal({
 						
 						title:"提示",
-						content:"领取成功",
-						confirmText:"返回首页",
+						content:"游客无法兑换,是否前往注册?",
+						confirmText:"前往注册",
 						success: res1 => {
 							if (res1.confirm) {
 								uni.redirectTo({
-									url: '/pages/index/index'
+									url: '/pages/login/login'
 								})
 							} else if (res1.cancel) {
 								//('用户点击取消');
 							}
 						}
 					})
-				}).catch(error => {
-					//this.showNt = false;
-					uni.showToast({
-						title: error,
-						icon: "none"
+				}else{
+					if(!this.key){
+						return
+					}
+					uni.showLoading({
+						title: "加载中",
+						mask: true,
+					})
+					userApi.exchange({
+						key: this.key
+					}).then((res) => {
+						uni.hideLoading();
+						this.getf5surprised()
+						uni.showModal({
+							
+							title:"提示",
+							content:"领取成功",
+							confirmText:"返回首页",
+							success: res1 => {
+								if (res1.confirm) {
+									uni.redirectTo({
+										url: '/pages/index/index'
+									})
+								} else if (res1.cancel) {
+									//('用户点击取消');
+								}
+							}
+						})
+					}).catch(error => {
+						//this.showNt = false;
+						uni.showToast({
+							title: error,
+							icon: "none"
+						})
 					})
-				})
+				}
+				
 			},
 			getf5surprised() {
 				uni.showLoading({