关注链接调整

pages/login/login.vue

@@ -139,7 +139,7 @@
 		methods: {
 			gotoGz(){
 				this.carhelp.setGzDate()
-				var url="https://mp.weixin.qq.com/mp/profile_ext?action=home&__biz=Mzg4Njc5ODEyMw==#wechat_redirect";
+				var url="https://mp.weixin.qq.com/s/mCHz1nNvg0xAICiBeIyKRQ";
 				window.location.href=url
 				
 			},

pages/monthlyCardActivity/monthlyCardBuy.vue

@@ -18,18 +18,18 @@
 		</view>
 		<view class="slogan-2">
 			单次购买、整月受益!
-		</view>
-		<view class="slogan-3" style="color: #ead9b4;" >
-			限时活动结束时间2022年8月8日0点结束
+		</view>
+		<view class="slogan-3" style="color: #ead9b4;" >
+			限时活动结束时间2022年8月8日0点结束
 		</view>
 		<view class="slogan-3" >
 			仅限车主购买，适用于平台对外开放充电站
-		</view>
-		<view class="slogan-4" @click="gotoUrl('pages/monthlyCardActivity/monthlyCardList?cardId='+cardId)">
-			查看适用站点
-		</view>
-		
-		
+		</view>
+		<view class="slogan-4" @click="gotoUrl('pages/monthlyCardActivity/monthlyCardList?cardId='+cardId)">
+			查看适用站点
+		</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="扫码支付">
@@ -43,78 +43,80 @@
 							">请使用支付宝扫码</view>
 
 		</u-modal>
-		<img id="qrcode" style="display: none;">
-		
-		<view class="bottom" v-if="!show2" @click="gotoGz" >
-			<button class="dredge" >关注公众号</button>
-		</view>
-		<view class="bottom" v-else-if="!infoSet" @click="gotoUrl('pages/user/dataSet')" >
-			<button class="dredge" >完善个人信息</button>
-		</view>
-		<view class="bottom" v-else-if="!endCardBool" >
-			<button class="dredge" >已下架</button>
-			
-		</view>
-		
-		<!-- 立即开通 -->
-		<view class="bottom" v-else-if="ispay" >
-			<button class="dredge" >已购买</button>
-		</view>
+		<img id="qrcode" style="display: none;">
+		
+		<view class="bottom" v-if="!show2" @click="gotoGz" >
+			<button class="dredge" >关注公众号</button>
+		</view>
+		<view class="bottom" v-else-if="!infoSet" @click="gotoUrl('pages/user/dataSet')" >
+			<button class="dredge" >完善个人信息</button>
+		</view>
+		<view class="bottom" v-else-if="!endCardBool" >
+			<button class="dredge" >已下架</button>
+			
+		</view>
+		
+		<!-- 立即开通 -->
+		<view class="bottom" v-else-if="ispay" >
+			<button class="dredge" >已购买</button>
+		</view>
 		
 		<!-- 立即开通 -->
 		<view class="bottom" v-else-if="!ispay&&detail.price" >
 			<button class="dredge" v-if="detail.putShelf&&!detail.isVip" @click="show = true">立即开通 ￥{{detail.price.toFixed(2)}}/月</button>
-			<button class="dredge" v-if="detail.putShelf&&detail.isVip" @click="show = true">{{detail.platformText}}车主特惠 ￥{{detail.price.toFixed(2)}}/月<span style="font-size: 12px;    text-decoration: line-through;">￥{{detail.oldPrice.toFixed(2)}}</span></button>
-			
-			<button class="dredge" v-if="!detail.putShelf" @click="putShelf" > 已下架</button>
-		
+			<button class="dredge" v-if="detail.putShelf&&detail.isVip" @click="show = true">{{detail.platformText}}车主特惠 ￥{{detail.price.toFixed(2)}}/月<span style="font-size: 12px;    text-decoration: line-through;">￥{{detail.oldPrice.toFixed(2)}}</span></button>
+			
+			<button class="dredge" v-if="!detail.putShelf" @click="putShelf" > 已下架</button>
+		
 			<p>开通表示阅读并同意
 				<text class="agreement" @click="gotoUrl('pages/article/details?code=FWFZKXY')">《服务费折扣协议》</text>
 			</p>
-		</view>
-		
-		
-		<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>
+		</view>
+		
+		
+		<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>
 	</view>
 </template>
 
-<script>
-	import * as API_weixin from '@/apis/weixin.js'
+<script>
+	import * as API_weixin from '@/apis/weixin.js'
 	
 	import * as Pay from '@/apis/weixin.js'
 	import * as API from '@/apis/card.js'
-	import * as loginApi from '@/apis/login.js'
+	import * as loginApi from '@/apis/login.js'
 
 	import QRCode from 'qrcodejs2'
-	import {
+	import {
 		newDate,
 		convertCanvasToImage,
 	} from '@/utils'
@@ -123,10 +125,10 @@
 	} from '@/utils/wxpay'
 	export default {
 		data() {
-			return {
+			return {
 				cardId:'3e1b0f8f-61b0-405f-a285-929b5346479f',
 				qrCodeImg: "",
-				showModel: false,
+				showModel: false,
 				projectName:"",
 				list: [{
 					text: '微信',
@@ -134,179 +136,179 @@
 				}, {
 					text: '支付宝'
 				}],
-				show: false,
-				submitForm:{},
-				detail:{},
-				ispay:true,
-				show2:false,
-				show1:false,
-				infoSet:false,
-				infoSet1:false,
+				show: false,
+				submitForm:{},
+				detail:{},
+				ispay:true,
+				show2:false,
+				show1:false,
+				infoSet:false,
+				infoSet1:false,
 				endTime:"2022-08-08"
 			}
-		},
-		onLoad() {
-			this.projectName=process.car.ProjectName;
-			
-		},
-		onReady() {
-			
-			//this.checkSubscribe()
-			
-		},
-		 onShow(){
-			 this.checkSubscribe();
-		 },
-		 computed:{
-			 endCardBool(){
-			 	var date=new Date().getTime()
-			 	var date2=new Date(this.endTime).getTime();
-			 
-			 	if(date<date2){
-			 		return true;
-			 	}else{
-			 		return false;
-			 	}
-			 }
+		},
+		onLoad() {
+			this.projectName=process.car.ProjectName;
+			
+		},
+		onReady() {
+			
+			//this.checkSubscribe()
+			
+		},
+		 onShow(){
+			 this.checkSubscribe();
+		 },
+		 computed:{
+			 endCardBool(){
+			 	var date=new Date().getTime()
+			 	var date2=new Date(this.endTime).getTime();
+			 
+			 	if(date<date2){
+			 		return true;
+			 	}else{
+			 		return false;
+			 	}
+			 }
 		 },
-		methods: {
-			gotoGz(){
-				this.carhelp.setGzDate()
-				var url="https://mp.weixin.qq.com/mp/profile_ext?action=home&__biz=Mzg4Njc5ODEyMw==#wechat_redirect";
-				window.location.href=url
-				
-			},
-			checkSubscribe(){
-				API_weixin.checkSubscribe({
-					openId: this.carhelp.getOpenId() 
-				}).then((res) => {
-					
-					if(res.data=="0"){
-						this.show1=true
-						
-					}else{
-						this.getInfo();
-						this.getUserInfo()
-						this.show2=true;
-						//this.carhelp.setGzDate() 
-					}
-					
-					//setGzDate
-				}).catch(error => {
-					uni.showToast({
-						title: error
-					})
-				})
-				
-			},
-			userCardBool(userCard){
-				
-				
-				if(userCard){
-					var date=new Date().getTime()
-					var date2=newDate(userCard.endTime).getTime();
-					if(date<date2){
-						return true;
-					}
-				}
-				return false
-			},
-		
-			getUserInfo(){
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})		
-				loginApi.findByOpenId({
-					openId: this.carhelp.getOpenId(),
-					noerror:true
-				}).then((res) => {
-					uni.hideLoading();
-					
-					if (res.code == 200&&res.result) {
-						
-						if(res.data.regUser){
-							var userInfo=res.data.regUser
-							
-							if(userInfo.carId&&userInfo.nickName){
-								this.infoSet=true;
-								
-							}else{
-								this.infoSet=false;
-								this.infoSet1=true;
-							}
-							
-							var userCard=res.data.userCard;
-							this.ispay=	this.userCardBool(userCard)
-							
-						}else{
-							
-						}
-					
-					}
-					
-					
-					
-				
-				}).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) => {
-					console.log(response)
-					this.detail=response.data.monthlyRentCard
-					uni.hideLoading()
+		methods: {
+			gotoGz(){
+				this.carhelp.setGzDate()
+				var url="https://mp.weixin.qq.com/s/mCHz1nNvg0xAICiBeIyKRQ";
+				window.location.href=url
+				
+			},
+			checkSubscribe(){
+				API_weixin.checkSubscribe({
+					openId: this.carhelp.getOpenId() 
+				}).then((res) => {
+					
+					if(res.data=="0"){
+						this.show1=true
+						
+					}else{
+						this.getInfo();
+						this.getUserInfo()
+						this.show2=true;
+						//this.carhelp.setGzDate() 
+					}
+					
+					//setGzDate
 				}).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
-					})
-				})
-				
+				})
+				
+			},
+			userCardBool(userCard){
+				
+				
+				if(userCard){
+					var date=new Date().getTime()
+					var date2=newDate(userCard.endTime).getTime();
+					if(date<date2){
+						return true;
+					}
+				}
+				return false
+			},
+		
+			getUserInfo(){
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})		
+				loginApi.findByOpenId({
+					openId: this.carhelp.getOpenId(),
+					noerror:true
+				}).then((res) => {
+					uni.hideLoading();
+					
+					if (res.code == 200&&res.result) {
+						
+						if(res.data.regUser){
+							var userInfo=res.data.regUser
+							
+							if(userInfo.carId&&userInfo.nickName){
+								this.infoSet=true;
+								
+							}else{
+								this.infoSet=false;
+								this.infoSet1=true;
+							}
+							
+							var userCard=res.data.userCard;
+							this.ispay=	this.userCardBool(userCard)
+							
+						}else{
+							
+						}
+					
+					}
+					
+					
+					
+				
+				}).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) => {
+					console.log(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({
@@ -358,7 +360,7 @@
 
 				})
 			},
-			confirm() {
+			confirm() {
 				this.getUserInfo();
 				uni.redirectTo({
 					url: "/pages/user/finance/rechargeRes?id=" + this.outOrderNo
@@ -366,7 +368,7 @@
 			},
 			click(index) {
 				console.log(`点击了第${index + 1}项，内容为：${this.list[index].text}`)
-				this.submit(index);
+				this.submit(index);
 			}
 		}
 
@@ -440,12 +442,12 @@
 		font-size: 28rpx;
 		text-align: center;
 	}
-	.slogan-4 {
-		text-decoration:underline;
-		height: 20px;
-		color: #9F9C99;
-		font-size: 32rpx;
-		text-align: center;
+	.slogan-4 {
+		text-decoration:underline;
+		height: 20px;
+		color: #9F9C99;
+		font-size: 32rpx;
+		text-align: center;
 	}
 	// 立即开通
 	.bottom {
@@ -458,7 +460,7 @@
 		right: 0;
 
 		.dredge {
-			// width: 72.2%;
+			// width: 72.2%;
 			margin: 0 20px;
 			border-radius: 50px;
 			font-size: 36rpx;
@@ -477,4 +479,4 @@
 			color: #897a69;
 		}
 	}
-</style>
+</style>

pages/searchPile/chargeProcess/dcCharging.vue

@@ -81,15 +81,15 @@
 					<view class="info-text" style="color:red">
 						{{couponObj&&couponObj.status=='1'?couponObj.text:'未使用'}}
 					</view>
-				</view>
-				<view class="info" v-if="userCardBool" >
-					<view class="info-name">
-						会员活动
-					</view>
-					<view class="info-text">
-						充电服务费包月卡
-					</view>
-				</view>
+				</view>
+				<view class="info" v-if="userCardBool" >
+					<view class="info-name">
+						会员活动
+					</view>
+					<view class="info-text">
+						充电服务费包月卡
+					</view>
+				</view>
 				
 				<view class="info" v-if="chargingRecord.remark">
 					<view class="info-name">
@@ -162,12 +162,12 @@
 				</u-circle-progress>
 			</view>
 			<view class="starting"  v-if="chargingGun.gunType==1">
-				
-				<span  v-if="chargingRecord.status==4">
-					可用功率不足，您可以换桩或继续排队等待...
-				</span>
-				<span v-else>
-					{{chargingRecord.statusText}}...
+				
+				<span  v-if="chargingRecord.status==4">
+					可用功率不足，您可以换桩或继续排队等待...
+				</span>
+				<span v-else>
+					{{chargingRecord.statusText}}...
 				</span>
 			</view>
 
@@ -301,7 +301,7 @@
 	import * as API_weixin from '@/apis/weixin.js'
 	import * as userAPI from '@/apis/user.js'
 	
-	import {
+	import {
 		newDate,
 		secondsDistance,
 		hourDistanceArr
@@ -327,16 +327,16 @@
 				show2: false,
 				isReady:true,
 				waitNum:'',
-				projectName:"",
+				projectName:"",
 				userCard:null,
 			}
 		},
 		onLoad(op) {
 			this.projectName=process.car.ProjectName;
-			
-			var plus=this.carhelp.getPersonInfoPlus()
-			if(plus){
-				this.userCard=plus.userCard;
+			
+			var plus=this.carhelp.getPersonInfoPlus()
+			if(plus){
+				this.userCard=plus.userCard;
 			}
 			if (op.id) {
 				this.id = op.id;
@@ -353,8 +353,8 @@
 		},
 		onShow() {
 		
-			if(!this.isReady){
-				this.isReady=true;
+			if(!this.isReady){
+				this.isReady=true;
 				this.addpercent();
 				this.getInfo()
 			}
@@ -376,15 +376,15 @@
 				this.theme('standard')
 				
 			this.addpercent()
-		},
-		computed:{
-			userCardBool(){
-				if(this.chargingRecord&&this.chargingRecord.userCardId){
-					
-					return true;
-				}
-				return false
-			}
+		},
+		computed:{
+			userCardBool(){
+				if(this.chargingRecord&&this.chargingRecord.userCardId){
+					
+					return true;
+				}
+				return false
+			}
 		},
 		methods: {
 			submitMessage() {
@@ -434,7 +434,7 @@
 			},
 			gotoGz(){
 				this.carhelp.setGzDate()
-				var url="https://mp.weixin.qq.com/mp/profile_ext?action=home&__biz=Mzg4Njc5ODEyMw==#wechat_redirect";
+				var url="https://mp.weixin.qq.com/s/mCHz1nNvg0xAICiBeIyKRQ";
 				window.location.href=url
 				
 			},
@@ -567,7 +567,7 @@
 							this.checkSubscribe()
 							
 						}
-					}
+					}
 					
 					if(this.isReady&&this.chargingRecord.status!=2){
 						var time=500;

pages/user/InviteFriends.vue

@@ -152,7 +152,7 @@
 		methods: {
 			gotoGz(){
 				this.carhelp.setGzDate()
-				var url="https://mp.weixin.qq.com/mp/profile_ext?action=home&__biz=Mzg4Njc5ODEyMw==#wechat_redirect";
+				var url="https://mp.weixin.qq.com/s/mCHz1nNvg0xAICiBeIyKRQ";
 				window.location.href=url
 				
 			},
@@ -270,7 +270,7 @@
 				var info=this.carhelp.getPersonInfo()
 				//var img=require("@/static/img/aboutus.png")
 				////(this.nowItem);
-				var ProjectName=process.car.ProjectName;//info.nickName+
+				var ProjectName=process.car.ProjectName;//info.nickName+
 				var nickName=info.nickName?info.nickName:'好友';
 				var title=nickName+"邀请你一起领取新能源车充电红包"
 				//"["+ProjectName+"]"+'和好友一起领5元红包'

pages/user/finance/recharge.vue

@@ -177,7 +177,7 @@
 		methods: {
 			gotoGz(){
 				this.carhelp.setGzDate()
-				var url="https://mp.weixin.qq.com/mp/profile_ext?action=home&__biz=Mzg4Njc5ODEyMw==#wechat_redirect";
+				var url="https://mp.weixin.qq.com/s/mCHz1nNvg0xAICiBeIyKRQ";
 				window.location.href=url
 				
 			},