提示优化

.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/' ,
@@ -13,7 +13,7 @@ const UNI_APP = {
 	defaultStation:["3865b3a3-13fd-461a-8145-ee9711df35a2","da6e714d-c5a8-4f76-8132-5f4a56677130"],
 	defaultStation:["e012f9fe-90a8-4a47-bb64-26ea139c3c05"],
 	//defaultStation:[],
-	openId:"zkxtest",//zkx
+	//openId:"zkxtest",//zkx
 	
 	openId:"oK9Wr54VbEh3xvWYmD_zT5NbH4AY",//zkx
 	//openId:"oK9Wr59rru-i3bm7dtTtxnkR-i4s",//杨所
@@ -24,7 +24,7 @@ const UNI_APP = {
 	//openId:"oK9Wr53qHzp7kOSiue_PYjwEqivM",
 	//openId:"oK9Wr55J1J1eL6BqI2tW749NTxNU",//zq
 	//openId:"oK9Wr50iQUjEAam1s_RpHpXJS5xg",//月卡用户
-	//openId:"oK9Wr5yvyBbFqaiO7ZM1GXpMzkD4",
+	//openId:"oK9Wr5zv8lvirni3txbxRkmpg8d0",//sz
 	//小鹏管家appid
 	//VUE_APP_WXAPPID:"wx7e70eb62a8459869",
 	VUE_APP_WXAPPID:"wx3afdb1b60188c1e5",

components/u-navbar/u-navbar.vue

@@ -201,6 +201,10 @@
 			customBack: {
 				type: Function,
 				default: null
+			},
+			startGz:{
+				type: Boolean,
+				default: true
 			}
 		},
 		data() {
@@ -285,7 +289,7 @@
 			 		
 			 	})
 			 }
-			 if (this.carhelp.getGzDate() && !this.gotoGzShow) {
+			 if (this.startGz&&this.carhelp.getGzDate() && !this.gotoGzShow) {
 			 
 			 	this.checkSubscribe()
 			 

pages/searchPile/stationAndPile/chargingPileDetails.vue

@@ -11,7 +11,9 @@
 		</u-popup>
 
 		<view v-show="step==1">
-			<ujp-navbar title="费用说明页" :custom-back="customback2" ref="ujpnavbar">
+			<ujp-navbar title="费用说明页" :startGz="false"
+			 
+			 :custom-back="customback2" ref="ujpnavbar">
 
 			</ujp-navbar>
 			<view class="main2">
@@ -79,7 +81,7 @@
 			</view>
 		</view>
 		<view v-show="step==0">
-			<ujp-navbar title="充电枪详情" :custom-back="customback">
+			<ujp-navbar title="充电枪详情" :startGz="false" :custom-back="customback">
 				<view class="iconfont service" @click="openModal">
 					&#xe60d;
 				</view>
@@ -635,6 +637,10 @@
 				当前绑定的车牌号为<span style="color:#19be6b">{{car?car.carNum:''}}</span><br/>
 				车辆充电，车牌号一致可<span style="color:#FF5722">减免停车费</span>，不一致可使用临时车牌号，用于出入停车场
 			</view>
+		</u-modal>
+		<u-modal v-model="show1" @confirm="gotoGz" cancel-text="暂不关注" confirm-text="前往关注" :show-cancel-button="false"
+			confirm-color="#53b56b" ref="uModal2" :asyncClose="true">
+			<view style="padding: 15px;">请先关注<span style=" color:  #53b56b;">{{projectName}}</span>公众号，然后进行车辆充电</view>
 		</u-modal>
 
 	</view>
@@ -646,6 +652,8 @@
 	import * as userApi from '@/apis/user.js'
 	import * as newsApi from '@/apis/news.js'
 	import ucarkeyboard from '@/components/Ucarkeyboard.vue'
+	
+	import * as API_weixin from '@/apis/weixin.js'
 
 	import {
 		newDate,
@@ -660,7 +668,10 @@
 			ucarkeyboard
 		},
 		data() {
-			return {
+			return {
+				show1: false,
+				show2: false,
+				
 				carImg3Bl:false,
 				carImg4Bl:false,
 				carImg3span1:0,
@@ -731,7 +742,8 @@
 				chatShow: false,
 				startCarChargingBl:false,
 				quickChargingBl:false,
-				carplateMustModel:false,
+				carplateMustModel:false,
+				projectName: "",
 			}
 		},
 
@@ -765,13 +777,49 @@
 		},
 		onShow() {
 			uni.hideToast();
-
+			this.checkSubscribe()
 			if (this.onShowRole) {
 				this.getPile()
 			}
 
 		},
 		methods: {
+			cancelGz() {
+				this.carhelp.setGzDate()
+			},
+			gotoGz() {
+				this.carhelp.setGzDate()
+			//	this.gotoGzShow = false;
+				var url = "https://mp.weixin.qq.com/s/mCHz1nNvg0xAICiBeIyKRQ";
+				window.location.href = url
+			
+			},
+			checkSubscribe() {
+				API_weixin.checkSubscribe({
+					openId: this.carhelp.getOpenId()
+				}).then((res) => {
+			
+					if (res.data == "0") {
+						this.show1 = true
+						
+					} else {
+						//this.init();
+						this.show1 = false;
+						this.show2 = true;
+			
+			
+						//this.carhelp.setGzDate() 
+			
+					}
+			
+					//setGzDate
+				}).catch(error => {
+					uni.showToast({
+						title: error
+					})
+				})
+			
+			},
 			checkedChange2(checked2) {
 			
 				uni.showLoading({
@@ -1629,7 +1677,8 @@
 
 		onReady() {
 
-
+			this.projectName = process.car.ProjectName;
+			
 			var consumerPhone = "400-8899-619"
 			// img="https://yktwechat.xiaoxinda.com/config/xxd2021.jpg"		
 			if (consumerPhone) {

pages/user/index.vue

@@ -1,5 +1,7 @@
 <template>
 	<view>
+		<ujp-navbar title="折扣卡购买" :show="false"></ujp-navbar>
+		
 		<view class="header">
 			<!-- 用户信息 -->
 			<view class="userinfo" :class="{