没考场定位到河南

src/api/request.js

@@ -12,7 +12,7 @@ const service = axios.create({
 	// axios中请求配置有baseURL选项，表示请求URL公共部分
 	//#ifdef MP-WEIXIN
 	//baseURL: process.env.NODE_ENV === 'development' ? 'https://jpcj-admin1.zzxcx.net/stage-api' : 'https://jpcj-admin.zzxcx.net/prod-api',
-	baseURL: process.env.NODE_ENV === 'development' ? 'https://nbjk1.zzxcx.net/nbjk-admin/' : 'https://nbjk.zzxcx.net/nbjk-admin/',
+	baseURL: process.env.NODE_ENV === 'development' ? 'https://nbjk1.zzxcx.net/nbjk-admin/' : 'https://107j18o08.vicp.fun/',
 	
 	//#endif
 	//#ifdef MP-TOUTIAO

src/components/m-disease-blur/m-disease-blur.vue

@@ -1,11 +1,11 @@
 <template>
     <view>
         <view v-for="(item, index) in list">
-            <view v-if="index==0&&isBlur" class="">
+            <view v-if="index==0&&isBlur" class="blur-heavy">
                 <text> {{ item.part }}:</text>
                 <text> {{ item.symp }}</text>
             </view>
-            <view v-else-if="index==1&&isBlur" class="blur-medium">
+            <view v-else-if="index==1&&isBlur" class="blur-heavy">
                 <text> {{ item.part }}:</text>
                 <text> {{ item.symp }}</text>
             </view>

src/components/m-line-blur/m-line-blur.vue

@@ -1,7 +1,7 @@
 <template>
     <div>
-        <text v-if="isBlur">{{ text1 }}</text>
-        <text v-if="isBlur" class="blur-medium">{{ text2 }}</text>
+        <text class="blur-heavy" v-if="isBlur">{{ text1 }}</text>
+        <text v-if="isBlur" class="blur-heavy">{{ text2 }}</text>
         <text v-if="isBlur" class="blur-heavy">{{ text3 }}</text>
         <text v-if="!isBlur">{{ text }}</text>
     </div>

src/components/m-map-blur/m-map-blur.vue

@@ -1,9 +1,9 @@
 <template>
     <div>
         <div v-if="isBlur" v-for="(item, index) in map" :key="index">
-            <text v-if="index <= begin">{{ index }}.{{ item }}</text>
-            <text v-if="index == begin + 1" class="blur-light">{{ index }}.{{ item }}</text>
-            <text v-if="index == begin + 2" class="blur-medium">{{ index }}.{{ item }}</text>
+            <text class="blur-heavy" v-if="index <= begin">{{ index }}.{{ item }}</text>
+            <text v-if="index == begin + 1" class="blur-heavy">{{ index }}.{{ item }}</text>
+            <text v-if="index == begin + 2" class="blur-heavy">{{ index }}.{{ item }}</text>
             <text v-if="index > begin + 2" class="blur-heavy">{{ index }}.{{ item }}</text>
         </div>
 

src/components/m-number-blur/m-number-blur.vue

@@ -2,7 +2,7 @@
     <view>
         <view  v-for="(item, index) in list" style="position: relative;margin-bottom: 10px;"
             class="">
-            <view v-if="index==0&&isBlur">
+            <view class="blur-heavy" v-if="index==0&&isBlur">
                 <image class="icon1" mode="widthFix" :src="'/static/icon/' + theme + '_xysz_rect@2x.png'" />
                 <view class="lucktext">数字{{ item.id }}</view>
                 <text>
@@ -12,7 +12,7 @@
                     {{ item.taoHua }}
                 </view>
             </view>
-            <view class="blur-medium" v-else-if="index==1&&isBlur">
+            <view class="blur-heavy" v-else-if="index==1&&isBlur">
                 <image class="icon1" mode="widthFix" :src="'/static/icon/' + theme + '_xysz_rect@2x.png'" />
                 <view class="lucktext">数字{{ item.id }}</view>
                 <text>

src/otherPages/examRoadVideo/index.vue

@@ -347,12 +347,12 @@ export default {
                   });
               } else {
                 that.city = {
-                  city: "",
-                  cityId: "",
+                  city: "郑州市",
+                  cityId: "4101",
                 };
                 that.province = {
-                  province: "",
-                  provinceId: "",
+                  province: "河南省",
+                  provinceId: "41",
                 };
                 that.county = { county: "" };
                 api.exam

src/pages/forecast/index.vue

@@ -39,7 +39,7 @@
 
         </view>
 
-        <view :data-theme="theme" v-if="goodsStatus.isPay == -1" @click="pay" class="pay">
+        <view :data-theme="theme" v-if="baZiIsPay=='1'" @click="pay" class="pay">
             <view class="pay-button"> 开通会员立即查看</view>
         </view>
         <scroll-view :scroll-into-view="currentPoint" :scroll-with-animation="false" :scroll-y="true" class="content">
@@ -171,7 +171,7 @@
                 <view class="result-content" :data-theme="theme">
                     <view class="result-desc result-desc_limit">
                         <!-- <div v-for="(item, index) in userData.guoGuanMap" :key="index">{{ index }}.{{ item }}</div> -->
-                        <m-map-blur :begin="2" :isBlur="goodsStatus.isPay == -1" :map="userData.guoGuanMap"></m-map-blur>
+                        <m-map-blur :begin="2" :isBlur="false" :map="userData.guoGuanMap"></m-map-blur>
                     </view>
 
                     <!-- <img  mode="widthFix" src="https://ndata.zzxcx.net/xpgx-xcx/forecast/bg_middle.png" /> -->
@@ -194,7 +194,7 @@
                     :src="'https://ndata.zzxcx.net/xpgx-xcx/forecast/reportBg/bg_' + theme + '_top@2x.png'" />
                 <view class="result-content" :data-theme="theme">
                     <view class="result-desc">
-                        <m-map-blur :isBlur="goodsStatus.isPay == -1" :map="userData.caiYun"></m-map-blur>
+                        <m-map-blur :isBlur="baZiIsPay=='1'&&goodsStatus.isPay==0" :map="userData.caiYun"></m-map-blur>
 
 
 
@@ -218,7 +218,7 @@
                     :src="'https://ndata.zzxcx.net/xpgx-xcx/forecast/reportBg/bg_' + theme + '_top@2x.png'" />
                 <view class="result-content" :data-theme="theme">
                     <view class="result-desc">
-                        <m-map-blur :isBlur="goodsStatus.isPay == -1" :map="userData.qingGan"></m-map-blur>
+                        <m-map-blur :isBlur="baZiIsPay=='1'&&goodsStatus.isPay==0" :map="userData.qingGan"></m-map-blur>
                         <!-- <div v-for="(item,index) in userData.qingGan" :key="item">{{index}}.{{ item }}</div> -->
 
 
@@ -242,7 +242,7 @@
                     :src="'https://ndata.zzxcx.net/xpgx-xcx/forecast/reportBg/bg_' + theme + '_top@2x.png'" />
                 <view class="result-content" :data-theme="theme">
                     <view class="result-desc">
-                        <m-map-blur :isBlur="goodsStatus.isPay == -1" :map="userData.ziNvYun"></m-map-blur>
+                        <m-map-blur :isBlur="baZiIsPay=='1'&&goodsStatus.isPay==0" :map="userData.ziNvYun"></m-map-blur>
                         <!-- <div v-for="(item,index) in userData.qingGan" :key="item">{{index}}.{{ item }}</div> -->
 
 
@@ -267,7 +267,7 @@
                     :src="'https://ndata.zzxcx.net/xpgx-xcx/forecast/reportBg/bg_' + theme + '_top@2x.png'" />
                 <view class="result-content" :data-theme="theme">
                     <view class="result-desc">
-                        <m-line-blur :isBlur="goodsStatus.isPay == -1"
+                        <m-line-blur :isBlur="baZiIsPay=='1'&&goodsStatus.isPay==0"
                             :text="(userData.reportMap['缺失五行评语'] + userData.reportMap['潮湿平衡'] + userData.reportMap['缺失十神评语'])"></m-line-blur>
                         <!-- <div>{{ userData.reportMap['缺失五行评语'] }}</div>
 
@@ -307,7 +307,7 @@
                     :src="'https://ndata.zzxcx.net/xpgx-xcx/forecast/reportBg/bg_' + theme + '_top@2x.png'" />
                 <view class="result-content" :data-theme="theme">
                     <view class="result-desc">
-                        <m-number-blur :isBlur="goodsStatus.isPay == -1" :theme="theme"
+                        <m-number-blur :isBlur="baZiIsPay=='1'&&goodsStatus.isPay==0" :theme="theme"
                             :list="userData.numberYunMap.numberYunList"></m-number-blur>
                         <!-- <view v-for="(item,index) in userData.numberYunMap.numberYunList"
                             style="position: relative;margin-bottom: 10px;" class="">
@@ -356,7 +356,7 @@
                     :src="'https://ndata.zzxcx.net/xpgx-xcx/forecast/reportBg/bg_' + theme + '_top@2x.png'" />
                 <view class="result-content" :data-theme="theme">
                     <view class="result-desc">
-                        <m-line-blur :text="userData.piQi" :isBlur="goodsStatus.isPay == -1"></m-line-blur>
+                        <m-line-blur :text="userData.piQi" :isBlur="baZiIsPay=='1'&&goodsStatus.isPay==0"></m-line-blur>
                         <!-- <view>{{ userData.piQi }}</view> -->
 
 
@@ -385,7 +385,7 @@
                             <m-line-blur :is-blur="false" :text="userData.chenGuMap['称骨重量']"></m-line-blur>
                         </div>
 
-                        <m-line-blur :isBlur="goodsStatus.isPay == -1" :text="userData.chenGuMap['称骨评语']"></m-line-blur>
+                        <m-line-blur :isBlur="baZiIsPay=='1'&&goodsStatus.isPay==0" :text="userData.chenGuMap['称骨评语']"></m-line-blur>
                         <!-- <view style="text-align: left;">称骨重量:{{ userData.chenGuMap['称骨重量'] }}</view>
                         <view>{{ userData.chenGuMap['称骨评语'] }}</view> -->
 
@@ -412,7 +412,7 @@
                 <view class="result-content" :data-theme="theme">
                     <view class="result-desc">
                         <view class="result-disease">
-                            <m-disease-blur :isBlur="goodsStatus.isPay == -1"
+                            <m-disease-blur :isBlur="baZiIsPay=='1'&&goodsStatus.isPay==0"
                                 :list="userData.diseasePartList"></m-disease-blur>
                         </view>
 
@@ -438,7 +438,7 @@
                     :src="'https://ndata.zzxcx.net/xpgx-xcx/forecast/reportBg/bg_' + theme + '_top@2x.png'" />
                 <view class="result-content" :data-theme="theme">
                     <view class="result-desc">
-                        <m-map-blur :isBlur="goodsStatus.isPay == -1" :map="userData.xiFangWei"></m-map-blur>
+                        <m-map-blur :isBlur="baZiIsPay=='1'&&goodsStatus.isPay==0" :map="userData.xiFangWei"></m-map-blur>
 
                     </view>
                     <m-more-alert v-if="goodsStatus.isPay != 0"  :theme="theme"></m-more-alert>
@@ -463,7 +463,7 @@
                     :src="'https://ndata.zzxcx.net/xpgx-xcx/forecast/reportBg/bg_' + theme + '_top@2x.png'" />
                 <view class="result-content" :data-theme="theme">
                     <view class="result-desc">
-                        <m-line-blur :text="userData.guiren" :isBlur="goodsStatus.isPay == -1"></m-line-blur>
+                        <m-line-blur :text="userData.guiren" :isBlur="baZiIsPay=='1'&&goodsStatus.isPay==0"></m-line-blur>
                     </view>
                     <m-more-alert v-if="goodsStatus.isPay != 0"  :theme="theme"></m-more-alert>
 
@@ -486,7 +486,7 @@
                     :src="'https://ndata.zzxcx.net/xpgx-xcx/forecast/reportBg/bg_' + theme + '_top@2x.png'" />
                 <view class="result-content" :data-theme="theme">
                     <view class="result-desc">
-                        <m-line-blur :text="userData.industry" :isBlur="goodsStatus.isPay == -1"></m-line-blur>
+                        <m-line-blur :text="userData.industry" :isBlur="baZiIsPay=='1'&&goodsStatus.isPay==0"></m-line-blur>
                     </view>
                     <m-more-alert v-if="goodsStatus.isPay != 0"  :theme="theme"></m-more-alert>
 
@@ -565,6 +565,7 @@ import mLineBlur from '@/components/m-line-blur/m-line-blur.vue'
 import mDiseaseBlur from '@/components/m-disease-blur/m-disease-blur.vue'
 import mNumberBlur from '@/components/m-number-blur/m-number-blur.vue'
 import mMoreAlert from '@/components/m-more-alert/m-more-alert.vue'
+import { mapGetters, mapState } from "vuex";
 export default {
     data() {
         return {
@@ -923,6 +924,13 @@ export default {
 
         }
     },
+    computed: {
+        ...mapState({
+			baZiIsPay: (state) => {
+				return state.user.baZiIsPay
+			}
+		})
+    },
     components: {
         mMapBlur,
         mDiseaseBlur,

src/pages/future/index.vue

@@ -112,22 +112,20 @@
 			</view>
 
 		</view>
-		<van-popup round close-on-click-overlay safe-area-tab-bar  :show="wxadWatchTip">
+		<van-popup round close-on-click-overlay safe-area-tab-bar :show="wxadWatchTip">
 			<view class="wxad">
-				<image src="https://ndata.zzxcx.net/ctjk/mp-wx/future/wxad_bg@2x.png" mode="widthFix"></image>
+				<image style="width: 100%;" src="https://ndata.zzxcx.net/ctjk/mp-wx/future/wxad_bg@2x.png" mode="widthFix"></image>
 				<view class="buttons">
 					<view @click="watchWxAd()" class="button1">
 						<van-icon custom-style="margin-right:10rpx;" color="#A21D0F" name="video-o" /><text>看广告免费领取</text>
 					</view>
-					<view @click="()=>{
-						wxadWatchTip=false
+					<view @click="() => {
+						wxadWatchTip = false
 					}" class="button2">
 						<van-icon custom-style="margin-right:10rpx;" color="#B35B23" name="close" />取消
 					</view>
 				</view>
 			</view>
-
-
 		</van-popup>
 		<custom-tab-bar></custom-tab-bar>
 		<view style="height: 48px;width: 100%;">
@@ -144,7 +142,7 @@ export default {
 	data() {
 		return {
 
-			wxadWatchTip: true,
+			wxadWatchTip: false,
 			videoSrc: "https://ndata.zzxcx.net/xpgx-xcx/video/8zi.mp4",
 			videoTime: 0,
 			isWatchFutureVideo: uni.getStorageSync("isWatchFutureVideo") || "0",
@@ -222,20 +220,23 @@ export default {
 				videoAd = wx.createRewardedVideoAd({
 					adUnitId: "adunit-f0e94618f34d4baf",
 				});
-				videoAd.onLoad(() => { });
+				videoAd.onLoad(() => { 
+				
+				});
 				videoAd.onError((err) => {
 					console.log(err)
 				});
 				videoAd.offClose();
 				videoAd.onClose((res) => {
+
 					if (!res.isEnded) {
 						return
 					}
+					that.wxadWatchTip=false
 					uni.navigateTo({
 						url: `/pages/forecast/index?birthday=${that.form.birthday + ' ' + that.form.birthHour + ':00'}&sex=${that.form.sex}&username=${that.form.username}`
 					})
 				});
-
 				videoAd.show().catch(() => {
 					// 失败重试
 					videoAd
@@ -245,7 +246,6 @@ export default {
 							console.log("激励视频 广告显示失败");
 						});
 				});
-
 			} else if (res.cancel) {
 				console.log('用户点击取消')
 			}
@@ -256,6 +256,7 @@ export default {
 				this.wxadWatchTip = true
 				return
 			}
+
 			// wx.showModal({
 			// 	title: '看广告免费测算',
 			// 	content: '是否观看激励广告',
@@ -299,14 +300,16 @@ export default {
 			// 	}
 
 			// })
-			api.openApi.openApiBirthdayLog({
-				name:this.form.name,
-				sex:this.form.sex,
-				birthday:this.form.birthday+' '+this.form.birthHour+':00',
-				isPay:this.form.isPay
-			})
-
+			// api.openApi.openApiBirthdayLog({
+			// 	name: this.form.name,
+			// 	sex: this.form.sex,
+			// 	birthday: this.form.birthday + ' ' + this.form.birthHour + ':00',
+			// 	isPay: this.form.isPay
+			// })
 
+			uni.navigateTo({
+				url: `/pages/forecast/index?birthday=${that.form.birthday + ' ' + that.form.birthHour + ':00'}&sex=${that.form.sex}&username=${that.form.username}`
+			})
 
 		},
 		selectRadioByForm(e) {

src/store/modules/user.js

@@ -152,7 +152,7 @@ const user = {
 			})
 			console.log(IS_VIDEO_FREE,"IS_VIDEO_FREE")
 			store.commit("SET_ISVIDEOFREE",IS_VIDEO_FREE[0].dictValue)
-			store.commit('BAZI_IS_PAY',BAZI_IS_PAY[0].dictValue)
+			store.commit('SET_BAZIISPAY',BAZI_IS_PAY[0].dictValue)
 		},
 		/**
 		 * 获取用户信息