免费的模式更改

src/api/request.js

@@ -6,14 +6,13 @@ axios.defaults.adapter = mpAdapter
 
 import mock from './mock'
 
-const baseUrl = 'https://zzjs.zzxcx.net/prod-api';
 
 // 创建axios实例
 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://107j18o08.vicp.fun/' : 'https://nbjk.zzxcx.net/nbjk-admin/',
 	
 	//#endif
 	//#ifdef MP-TOUTIAO

src/custom-tab-bar/index.js

@@ -4,6 +4,7 @@ Component({
 		//默认是2
 		active: 2,
 		isBazi:false,
+		
 		list2: [
 			{
 				"pagePath": "/pages/carVideo/index",
@@ -41,7 +42,7 @@ Component({
 			"pagePath": "/pages/future/index",
 			"iconPath": "/static/imgs/fortune.png",
 			"selectedIconPath": "/static/imgs/fortune-active.png",
-			"text": "运势"
+			"text": "人生报告"
 		},
 		{
 			"pagePath": "/pages/user/index",
@@ -54,20 +55,23 @@ Component({
 		let that =this
 		// const baseUrl = wx.getSystemInfoSync().platform === 'devtools' ? 'https://nbjk1.zzxcx.net/nbjk-admin/' : 'https://nbjk.zzxcx.net/nbjk-admin/'
 		const baseUrl =  wx.getStorageSync("NODE_ENV")==='development'? 'https://nbjk1.zzxcx.net/nbjk-admin/' : 'https://nbjk.zzxcx.net/nbjk-admin/'
+	
 		wx.request({
 			url:baseUrl+"open-api/system/dict/data/configKey/IS_BAZI",
 			method:'GET',
 			success(res){
-				console.log('八字是否开启',res.data.data)
+				
 				if(res.data.data=='1'){
 				
 					that.setData({
-						isBazi:true
+						isBazi:true,
+					
 					})
 				}
 				else{
 					that.setData({
-						isBazi:false
+						isBazi:false,
+					
 					})
 				}
 			
@@ -80,6 +84,7 @@ Component({
 		switchTab(e) {
 			const data = e.currentTarget.dataset
 			const url = data.path
+			
 			if(url=='/pages/future/index'){
 				wx.navigateTo({
 					url:'/pages/future/index'

src/otherPages/courseCatalog/components/courseCatalog.vue

@@ -1,27 +1,10 @@
 <template>
   <view class="bg">
     <view class="video">
-      <view
-        @click="playRoadExamVideo(item)"
-        v-for="(item, index) in list"
-        :key="index"
-        class="video-item"
-      >
-        <image
-          v-if="item.permission == 1"
-          class="video-item-angle"
-          :src="try_angle"
-        ></image>
-        <image
-          v-if="item.permission == 2"
-          class="video-item-angle"
-          :src="vip_angle"
-        ></image>
-        <image
-          class="video-item-left"
-          mode="widthFix"
-          :src="item.videoCover"
-        ></image>
+      <view @click="playRoadExamVideo(item)" v-for="(item, index) in list" :key="index" class="video-item">
+        <image v-if="item.permission == 1" class="video-item-angle" :src="try_angle"></image>
+        <image v-if="item.permission == 2" class="video-item-angle" :src="vip_angle"></image>
+        <image class="video-item-left" mode="widthFix" :src="item.videoCover"></image>
         <view class="video-item-right">
           <view style="width: 100%">{{ item.videoName }}</view>
           <view class="video-item-right-icon">学习中</view>
@@ -50,22 +33,13 @@
         </view>
       </view> -->
     </view>
-    <view
-      v-if="!roadExamIds.includes(examId)"
-      v-show="isVideoFree=='0'"
-      style="width: 100%; padding-left: 30rpx"
-    >
+    <view v-if="!roadExamIds.includes(examId)" v-show="isVideoFree == '0'" style="width: 100%; padding-left: 30rpx">
       <van-checkbox-group :value="userAgreement" @change="changeUserAgreement">
         <van-checkbox name="userAgree">
-          <span
-            >开通前请阅读
-            <navigator
-              url="/pages/extraWeb/index?src=https://ndata.zzxcx.net/agreement/ctjk-sf.html&paramsMode=1"
-              style="color: #498ef5; display: inline"
-              >《用户服务协议》</navigator
-            ></span
-          ></van-checkbox
-        >
+          <span>开通前请阅读
+            <navigator url="/pages/extraWeb/index?src=https://ndata.zzxcx.net/agreement/ctjk-sf.html&paramsMode=1"
+              style="color: #498ef5; display: inline">《用户服务协议》</navigator>
+          </span></van-checkbox>
       </van-checkbox-group>
 
       <!-- <checkbox-group @change="changeUserAgreement">
@@ -81,54 +55,29 @@
         </label>
       </checkbox-group> -->
     </view>
-    <view
-      @click="
-        !roadExamIds.includes(examId) && isVideoFree == '0'
-          ? buyRoadCourse()
-          : ''
-      "
-      class="pay"
-    >
+    <view @click="
+      !roadExamIds.includes(examId) && isVideoFree == '0'
+        ? buyRoadCourse()
+        : ''
+      " class="pay">
       <view class="pay-text">
-        <text v-if="!roadExamIds.includes(examId) && isVideoFree == '0'"
-          >立即支付&nbsp;&nbsp;¥{{ price / 100 }}</text
-        >
-        <icon
-          v-if="roadExamIds.includes(examId) && isVideoFree == '0'"
-          type="success_no_circle"
-          color="#ffffff"
-          size="16"
-          style="margin-right: 15rpx"
-        ></icon>
-        <text v-if="roadExamIds.includes(examId) && isVideoFree == '0'"
-          >已购买</text
-        >
+        <text v-if="!roadExamIds.includes(examId) && isVideoFree == '0'">立即支付&nbsp;&nbsp;¥{{ price / 100 }}</text>
+        <icon v-if="roadExamIds.includes(examId) && isVideoFree == '0'" type="success_no_circle" color="#ffffff" size="16"
+          style="margin-right: 15rpx"></icon>
+        <text v-if="roadExamIds.includes(examId) && isVideoFree == '0'">已购买</text>
         <text v-if="isVideoFree == '1'">限时免费</text>
       </view>
-      <image
-        v-if="!roadExamIds.includes(examId) && isVideoFree == '0'"
-        style="width: 100%"
-        mode="widthFix"
-        src="https://ndata.zzxcx.net/ctjk/mp-wx/courseCatalog/payBg.png"
-      ></image>
-      <image
-        v-if="roadExamIds.includes(examId) && isVideoFree == '0'"
-        mode="widthFix"
-        src="https://ndata.zzxcx.net/ctjk/mp-wx/courseCatalog/alreadyPay.png"
-      ></image>
-      <image
-        v-if="isVideoFree == '1'"
-        mode="widthFix"
-        src="https://ndata.zzxcx.net/ctjk/mp-wx/courseCatalog/alreadyPay.png"
-      ></image>
+      <image v-if="!roadExamIds.includes(examId) && isVideoFree == '0'" style="width: 100%" mode="widthFix"
+        src="https://ndata.zzxcx.net/ctjk/mp-wx/courseCatalog/payBg.png"></image>
+      <image v-if="roadExamIds.includes(examId) && isVideoFree == '0'" mode="widthFix"
+        src="https://ndata.zzxcx.net/ctjk/mp-wx/courseCatalog/alreadyPay.png"></image>
+      <image v-if="isVideoFree == '1'" mode="widthFix"
+        src="https://ndata.zzxcx.net/ctjk/mp-wx/courseCatalog/alreadyPay.png"></image>
     </view>
     <view class="advantage">
       <view class="advantage-title"> 实拍优势</view>
       <view class="advantage-img">
-        <image
-          mode="widthFix"
-          src="https://ndata.zzxcx.net/ctjk/mp-wx/courseCatalog/advantage.png"
-        ></image>
+        <image mode="widthFix" src="https://ndata.zzxcx.net/ctjk/mp-wx/courseCatalog/advantage.png"></image>
       </view>
     </view>
   </view>
@@ -159,20 +108,78 @@ export default {
       console.log(this.userAgreement);
     },
     playRoadExamVideo(item) {
+      //播放试看的视频
+      if (item.permission == 1) {
+        uni.setStorageSync("storageWebSrc", item.videoUrl);
+        uni.navigateTo({
+          url: "/otherPages/playStorageWebSrc/index",
+        });
+        return
+      }
       if (this.isVideoFree == "0") {
-        if (!this.roadExamIds.includes(this.examId) && item.permission == 2) {
+        if (!this.roadExamIds.includes(this.examId)) {
           uni.showToast({
             title: "请购买",
             icon: "none",
           });
           return;
         }
+        else {
+          uni.setStorageSync("storageWebSrc", item.videoUrl);
+          uni.navigateTo({
+            url: "/otherPages/playStorageWebSrc/index",
+          });
+        }
+      }
+      if (this.isVideoFree == "1") {
+        wx.showModal({
+          title: '看广告免费观看',
+          content: '是否观看激励广告',
+          success(res) {
+
+            if (res.confirm) {
+              console.log('用户点击确定')
+              let videoAd = null;
+              if (wx.createRewardedVideoAd) {
+                videoAd = wx.createRewardedVideoAd({
+                  adUnitId: "adunit-f0e94618f34d4baf",
+                });
+                videoAd.onLoad(() => { });
+                videoAd.onError((err) => {
+                  console.log(err)
+                });
+                videoAd.offClose();
+                videoAd.onClose((res) => {
+                  if (!res.isEnded) {
+                    return
+                  }
+                  uni.setStorageSync("storageWebSrc", item.videoUrl);
+                  uni.navigateTo({
+                    url: "/otherPages/playStorageWebSrc/index",
+                  });
+                });
+
+                videoAd.show().catch(() => {
+                  // 失败重试
+                  videoAd
+                    .load()
+                    .then(() => videoAd.show())
+                    .catch((err) => {
+                      console.log("激励视频 广告显示失败");
+                    });
+                });
+
+              } else if (res.cancel) {
+                console.log('用户点击取消')
+              }
+            }
+          }
+
+        })
       }
 
-      uni.setStorageSync("storageWebSrc", item.videoUrl);
-      uni.navigateTo({
-        url: "/otherPages/playStorageWebSrc/index",
-      });
+
+
     },
     buyRoadCourse() {
       let that = this;
@@ -249,18 +256,21 @@ export default {
   width: 100%;
   display: inline-block;
   height: 100%;
+
   .video {
     white-space: normal;
     padding: 0 30rpx;
     padding-top: 40rpx;
     display: inline-block;
     width: 100%;
+
     .video-item {
       width: 100%;
       display: flex;
       margin-bottom: 40rpx;
       position: relative;
     }
+
     .video-item-angle {
       width: 60rpx;
       height: 60rpx;
@@ -268,17 +278,20 @@ export default {
       top: 0;
       left: 0;
     }
+
     .video-item-left {
       width: 250rpx;
       font-size: 30rpx;
       flex-shrink: 0;
     }
+
     .video-item-right {
       padding-left: 30rpx;
       display: flex;
       flex-wrap: wrap;
       font-size: 30rpx;
     }
+
     .video-item-right-icon {
       width: 94rpx;
       height: 40rpx;
@@ -290,17 +303,20 @@ export default {
       line-height: 40rpx;
       text-align: center;
     }
+
     .video-item-right-icon_vip {
       background: rgba(255, 77, 83, 0.3);
       color: rgba(255, 77, 83, 1);
     }
   }
+
   .pay {
     padding: 0 30rpx;
     position: relative;
     display: flex;
     justify-content: center;
     flex-wrap: wrap;
+
     .pay-text {
       position: absolute;
       top: 50%;
@@ -313,13 +329,16 @@ export default {
       align-items: center;
     }
   }
+
   .advantage {
     padding: 0 30rpx;
+
     .advantage-title {
       font-size: 42rpx;
       color: #0a1a33;
       font-weight: 600;
     }
+
     .advantage-img {
       width: 100%;
       display: flex;

src/otherPages/selectRulePaper/index.vue

@@ -2,59 +2,37 @@
   <view style="display: flex">
     <image class="bg" mode="widthFix" :src="bg"></image>
     <view class="buttons">
-      <view
-        @click="
-          () => {
-            watchShow = true;
-            extraQuery = {
-              category: 3,
-              title: '新规秘卷一',
-            };
-          }
-        "
-        class="buttons-left"
-        >进入秘卷一
+      <view @click="() => {
+        watchShow = true;
+        extraQuery = {
+          category: 3,
+          title: '新规秘卷一',
+        };
+      }
+        " class="buttons-left">进入秘卷一
       </view>
-      <view
-        @click="
-          watchShow = true;
-          extraQuery = {
-            category: 4,
-            title: '新规秘卷二',
-          };
-        "
-        class="buttons-right"
-        >进入秘卷二</view
-      >
+      <view @click="
+        watchShow = true;
+      extraQuery = {
+        category: 4,
+        title: '新规秘卷二',
+      };
+      " class="buttons-right">进入秘卷二</view>
       <van-popup round :show="watchShow">
         <view class="ad">
-          <image
-            style="width: 100%"
-            mode="widthFix"
-            src="https://ndata.zzxcx.net/ctjk/mp-wx/selectRulePaper/dialog_bg.png"
-          ></image>
+          <image style="width: 100%" mode="widthFix"
+            src="https://ndata.zzxcx.net/ctjk/mp-wx/selectRulePaper/dialog_bg.png"></image>
           <view class="ad-buttons">
             <view @click="watchAdGoExerciseMi(extraQuery)" class="ad-button1">
-              <image
-                style="width: 36rpx; margin-right: 15rpx"
-                mode="widthFix"
-                src="https://ndata.zzxcx.net/ctjk/mp-wx/selectRulePaper/watchAd.png"
-              ></image
-              ><text>看广告免费领秘卷</text>
+              <image style="width: 36rpx; margin-right: 15rpx" mode="widthFix"
+                src="https://ndata.zzxcx.net/ctjk/mp-wx/selectRulePaper/watchAd.png"></image><text>看广告免费领秘卷</text>
             </view>
-            <view
-              @click="
-                () => {
-                  watchShow = false;
-                }
-              "
-              class="ad-button2"
-            >
-              <image
-                style="width: 36rpx; margin-right: 15rpx"
-                mode="widthFix"
-                src="https://ndata.zzxcx.net/ctjk/mp-wx/selectRulePaper/cancel.png"
-              ></image>
+            <view @click="() => {
+              watchShow = false;
+            }
+              " class="ad-button2">
+              <image style="width: 36rpx; margin-right: 15rpx" mode="widthFix"
+                src="https://ndata.zzxcx.net/ctjk/mp-wx/selectRulePaper/cancel.png"></image>
               <text>取消</text>
             </view>
           </view>
@@ -98,11 +76,15 @@ export default {
         videoAd = wx.createRewardedVideoAd({
           adUnitId: "adunit-f0e94618f34d4baf",
         });
-        videoAd.onLoad(() => {});
-        videoAd.onError((err) => {});
+        videoAd.onLoad(() => { });
+        videoAd.onError((err) => { });
         videoAd.offClose();
         videoAd.onClose((res) => {
+          if (!res.isEnded) {
+            return
+          }
           this.watchShow = false;
+
           uni.navigateTo({
             url: "/otherPages/exerciseMi/index?" + utils.mapToUrlQuery(query),
           });
@@ -160,6 +142,7 @@ export default {
     justify-content: center;
   }
 }
+
 .ad {
   width: 580rpx;
   height: 652rpx;
@@ -167,6 +150,7 @@ export default {
   overflow-y: hidden;
   background: #fff;
   font-size: 0rpx;
+
   .ad-buttons {
     display: flex;
     justify-content: center;
@@ -174,6 +158,7 @@ export default {
     align-items: center;
     align-content: center;
     padding-top: 80rpx;
+
     .ad-button1 {
       width: 480rpx;
       height: 90rpx;
@@ -189,6 +174,7 @@ export default {
       font-size: 34rpx;
       color: #fff;
     }
+
     .ad-button2 {
       display: flex;
       border-radius: 50rpx 50rpx 50rpx 50rpx;

src/otherPages/threeExam/index.vue

@@ -1,11 +1,7 @@
 <template>
   <view class="threeExam">
     <view class="topad">
-      <ad
-        class="wxad"
-        :ad-intervals="100"
-        unit-id="adunit-f9ac1a546be5b3f0"
-      ></ad>
+      <ad class="wxad" :ad-intervals="100" unit-id="adunit-f9ac1a546be5b3f0"></ad>
     </view>
     <view class="problem">
       <!-- <text class="problem-type"> 判断题 </text> -->
@@ -14,43 +10,28 @@
           problemList[problemListIndex].question
         }}</text
       > -->
-      <rich-text
-        style="font-size: 42rpx; vertical-align: top"
-        :nodes="
-          createProblemTypeHtml(problemList[problemListIndex].type) +
-          (problemListIndex + 1) +
-          '、' +
-          problemList[problemListIndex].question
-        "
-      ></rich-text>
+      <rich-text style="font-size: 42rpx; vertical-align: top" :nodes="createProblemTypeHtml(problemList[problemListIndex].type) +
+        (problemListIndex + 1) +
+        '、' +
+        problemList[problemListIndex].question
+        "></rich-text>
       <view class="problem-radio">
-        <van-radio-group
-          v-if="!problemList[problemListIndex].isComplete"
-          @change="changeUserAnswer"
-          :value="problemList[problemListIndex].userAnswer"
-        >
+        <van-radio-group v-if="!problemList[problemListIndex].isComplete" @change="changeUserAnswer"
+          :value="problemList[problemListIndex].userAnswer">
           <view :key="index" v-for="(item, index) in anLength">
-            <van-radio
-              v-if="problemList[problemListIndex]['an' + (index + 1)]"
-              label-class="pl0"
-              custom-class="mt40"
-              use-icon-slot
-              :name="index + 1"
-            >
+            <van-radio v-if="problemList[problemListIndex]['an' + (index + 1)]" label-class="pl0" custom-class="mt40"
+              use-icon-slot :name="index + 1">
               <view class="problem-radio-flex">
                 <view class="problem-radio-icon">
                   <view class="problem-radio-letter">{{
                     numberToLetter(index)
                   }}</view>
                 </view>
-                <text
-                  style="
+                <text style="
                     font-size: 42rpx;
                     font-weight: bold;
                     margin-left: 20rpx;
-                  "
-                  >{{ problemList[problemListIndex]["an" + (index + 1)] }}</text
-                >
+                  ">{{ problemList[problemListIndex]["an" + (index + 1)] }}</text>
               </view>
             </van-radio>
           </view>
@@ -170,74 +151,42 @@
             </view>
           </van-radio> -->
         </van-radio-group>
-        <van-radio-group
-          v-if="problemList[problemListIndex].isComplete"
-          :value="problemList[problemListIndex].userAnswer"
-        >
+        <van-radio-group v-if="problemList[problemListIndex].isComplete"
+          :value="problemList[problemListIndex].userAnswer">
           <view :key="index" v-for="(item, index) in anLength">
-            <van-radio
-              v-if="problemList[problemListIndex]['an' + (index + 1)]"
-              label-class="pl0"
-              custom-class="mt40"
-              use-icon-slot
-              :name="index + 1"
-            >
+            <van-radio v-if="problemList[problemListIndex]['an' + (index + 1)]" label-class="pl0" custom-class="mt40"
+              use-icon-slot :name="index + 1">
               <view class="problem-radio-flex">
                 <view class="problem-radio-icon">
-                  <icon
-                    type="clear"
-                    v-if="
-                      index + 1 ==
-                        problemList[problemListIndex].userAnswerIndex &&
-                      problemList[problemListIndex].userAnswerIndex !=
-                        problemList[problemListIndex].answertrue
-                    "
-                    class="problem-radio-letter"
-                    color="red"
-                    size="60rpx"
-                  ></icon>
-                  <icon
-                    type="success"
-                    v-else-if="
-                      index + 1 ==
-                        problemList[problemListIndex].userAnswerIndex &&
-                      problemList[problemListIndex].userAnswerIndex ==
-                        problemList[problemListIndex].answertrue
-                    "
-                    class="problem-radio-letter"
-                    color="#33CDA4"
-                    size="60rpx"
-                  ></icon>
+                  <icon type="clear" v-if="index + 1 ==
+                    problemList[problemListIndex].userAnswerIndex &&
+                    problemList[problemListIndex].userAnswerIndex !=
+                    problemList[problemListIndex].answertrue
+                    " class="problem-radio-letter" color="red" size="60rpx"></icon>
+                  <icon type="success" v-else-if="index + 1 ==
+                    problemList[problemListIndex].userAnswerIndex &&
+                    problemList[problemListIndex].userAnswerIndex ==
+                    problemList[problemListIndex].answertrue
+                    " class="problem-radio-letter" color="#33CDA4" size="60rpx"></icon>
                   <view v-else class="problem-radio-letter">{{
                     numberToLetter(index)
                   }}</view>
                 </view>
-                <text
-                  style="
+                <text style="
                     font-size: 42rpx;
                     font-weight: bold;
                     margin-left: 20rpx;
-                  "
-                  >{{ problemList[problemListIndex]["an" + (index + 1)] }}</text
-                >
+                  ">{{ problemList[problemListIndex]["an" + (index + 1)] }}</text>
               </view>
             </van-radio>
           </view>
         </van-radio-group>
       </view>
       <view class="problem-media">
-        <image
-          mode="widthFix"
-          v-if="getFileType(problemList[problemListIndex].mediaUrl) == 'image'"
-          :src="problemList[problemListIndex].mediaUrl"
-        ></image>
-        <video
-          :controls="false"
-          autoplay
-          loop
-          v-if="getFileType(problemList[problemListIndex].mediaUrl) == 'video'"
-          :src="problemList[problemListIndex].mediaUrl"
-        ></video>
+        <image mode="widthFix" v-if="getFileType(problemList[problemListIndex].mediaUrl) == 'image'"
+          :src="problemList[problemListIndex].mediaUrl"></image>
+        <video :controls="false" autoplay loop v-if="getFileType(problemList[problemListIndex].mediaUrl) == 'video'"
+          :src="problemList[problemListIndex].mediaUrl"></video>
       </view>
     </view>
     <view class="bottom">
@@ -247,21 +196,11 @@
       </view>
       <view class="submit">
         <view>
-          <view
-            v-if="query.showSubmit == '1'"
-            @click="
-              () => {
-                submitExamVisible = true;
-              }
-            "
-            class="submit-button"
-            ><text>交卷</text
-            ><countDown
-              @change="getThreeExamTime"
-              @end="submitExam"
-              background=""
-              :time="examTime"
-            ></countDown>
+          <view v-if="query.showSubmit == '1'" @click="() => {
+            submitExamVisible = true;
+          }
+            " class="submit-button"><text>交卷</text>
+            <countDown @change="getThreeExamTime" @end="submitExam" background="" :time="examTime"></countDown>
           </view>
         </view>
 
@@ -278,11 +217,12 @@
               falseNum
             }}</text>
           </view>
-          <view class="col">
+          <view @click="() => {
+                selectQuestionVisible = true
+              }" class="col">
             <van-icon name="description" />
-            <text style="font-size: 24rpx; color: #8a9099; margin-left: 8rpx"
-              >{{ problemListIndex + 1 }}/{{ problemList.length }}</text
-            >
+            <text style="font-size: 24rpx; color: #8a9099; margin-left: 8rpx">{{ problemListIndex + 1 }}/{{
+              problemList.length }}</text>
           </view>
         </view>
       </view>
@@ -293,105 +233,116 @@
         <view class="score">
           <view class="score-list">
             <view class="score-dont">
-              {{ problemList.length - trueNum - falseNum }}</view
-            >
+              {{ problemList.length - trueNum - falseNum }}</view>
             <view style="font-size: 28rpx; color: #8a9099">未答题数</view>
           </view>
-          <view class="score-list"
-            ><view class="score-rest" style="margin: 0 auto">
-              {{ restTime }}</view
-            >
-            <view style="font-size: 28rpx; color: #8a9099">剩余时间</view></view
-          >
-          <view class="score-list"
-            ><view class="score-exam"> {{ score }}</view>
-            <view style="font-size: 28rpx; color: #8a9099">考试得分</view></view
-          >
+          <view class="score-list">
+            <view class="score-rest" style="margin: 0 auto">
+              {{ restTime }}</view>
+            <view style="font-size: 28rpx; color: #8a9099">剩余时间</view>
+          </view>
+          <view class="score-list">
+            <view class="score-exam"> {{ score }}</view>
+            <view style="font-size: 28rpx; color: #8a9099">考试得分</view>
+          </view>
         </view>
         <view class="bottom">
-          <view
-            @click="
-              () => {
-                submitExamVisible = false;
-              }
-            "
-            class="left"
-            >继续答题</view
-          >
-          <view
-            @click="
-              () => {
-                resultExamVisible = true;
-                submitExamVisible = false;
-              }
-            "
-            class="right"
-            >现在交卷</view
-          >
+          <view @click="() => {
+            submitExamVisible = false;
+          }
+            " class="left">继续答题</view>
+          <view @click="() => {
+            resultExamVisible = true;
+            submitExamVisible = false;
+          }
+            " class="right">现在交卷</view>
         </view>
       </view>
     </van-popup>
     <van-popup :zIndex="1006" round :show="resultExamVisible">
       <view class="tip2">
         <view style="position: relative">
-          <image
-            mode="widthFix"
-            style="width: 628rpx"
-            src="https://ndata.zzxcx.net/ctjk/mp-wx/threeExam/bg_dialog.png"
-          ></image>
-          <image
-            mode="widthFix"
-            v-if="score < 90"
-            class="tip2-cry"
-            style="width: 187rpx"
-            src="https://ndata.zzxcx.net/ctjk/mp-wx/threeExam/cry.png"
-          ></image>
-          <image
-            mode="widthFix"
-            v-if="score >= 90"
-            class="tip2-cry"
-            style="width: 187rpx"
-            src="https://ndata.zzxcx.net/ctjk/mp-wx/threeExam/laugh.png"
-          ></image>
+          <image mode="widthFix" style="width: 628rpx" src="https://ndata.zzxcx.net/ctjk/mp-wx/threeExam/bg_dialog.png">
+          </image>
+          <image mode="widthFix" v-if="score < 90" class="tip2-cry" style="width: 187rpx"
+            src="https://ndata.zzxcx.net/ctjk/mp-wx/threeExam/cry.png"></image>
+          <image mode="widthFix" v-if="score >= 90" class="tip2-cry" style="width: 187rpx"
+            src="https://ndata.zzxcx.net/ctjk/mp-wx/threeExam/laugh.png"></image>
           <view class="tip2-text">
             <view>恭喜您</view>
-            <view
-              >您的成绩<text style="color: #01c18d" v-if="score >= 90"
-                >合格</text
-              ><text style="color: #ff4d53" v-if="score < 90"
-                >不合格</text
-              ></view
-            >
-            <view class="tip2-text-line3"
-              >当前已答错<text style="color: #ff4d53; padding: 0 8rpx">{{
-                falseNum
-              }}</text>
-              题</view
-            >
+            <view>您的成绩<text style="color: #01c18d" v-if="score >= 90">合格</text><text style="color: #ff4d53"
+                v-if="score < 90">不合格</text></view>
+            <view class="tip2-text-line3">当前已答错<text style="color: #ff4d53; padding: 0 8rpx">{{
+              falseNum
+            }}</text>
+              题</view>
             <view class="tip2-bottom">
               <!-- <view class="tip2-bottom-1">试试答题技巧，提分更快</view> -->
-              <view
-                @click="
-                  goPath('/otherPages/threeExamScore/index?score=' + score)
-                "
-                class="tip2-bottom-2"
-                >现在交卷</view
-              >
-              <view
-                @click="
-                  () => {
-                    resultExamVisible = false;
-                    submitExamVisible = false;
-                  }
-                "
-                class="tip2-bottom-3"
-                >继续答题</view
-              >
+              <view @click="
+              goPath('/otherPages/threeExamScore/index?score=' + score)
+                " class="tip2-bottom-2">现在交卷</view>
+              <view @click="() => {
+                resultExamVisible = false;
+                submitExamVisible = false;
+              }
+                " class="tip2-bottom-3">继续答题</view>
             </view>
           </view>
         </view>
       </view>
     </van-popup>
+    <van-overlay :zIndex="1007" round :show="selectQuestionVisible">
+      <view class="select-problem">
+        <view class="problem-index">
+          <view class="problem-header">
+            <view class="problem-header-left">
+              <view class="problem-dui">
+                <icon class="icon-box-img" color="#06c05f" type="success" size="18"></icon>
+                <text style="color: #06c05f; font-size: 14px; margin-left: 8rpx">{{ trueNum }}</text>
+              </view>
+              <view class="problem-cuo" style="margin-left: 16rpx">
+                <icon class="icon-box-img" type="cancel" size="18"></icon>
+                <text style="color: red; font-size: 14px; margin-left: 8rpx">{{ falseNum }}</text>
+              </view>
+            </view>
+            <view class="problem-header-right">
+              <van-icon size="18px" name="description" />
+              <view style="font-size: 14px; display: flex; align-items: center">{{ problemListIndex + 1 }}/{{
+                problemList.length }}</view>
+            </view>
+          </view>
+          <view class="problem-body">
+            <view class="problem-listBody">
+              <view class="problem-listItem" :key="index" @click="() => {
+                 problemListIndex=index
+                }
+                " v-for="(item, index) in problemList" :class="{
+    'problem-listItem_current': problemListIndex == index,
+    'problem-listItem_dui':
+      item.userAnswer.length && item.userAnswer == item.answer,
+    'problem-listItem_cuo':
+      item.userAnswer.length && item.userAnswer !== item.answer,
+  }">
+                {{ index + 1 }}
+              </view>
+            </view>
+          </view>
+          <view class="problem-bottom">
+            <!-- <view @click="
+                () => {
+                  selectProblemListVisible = false;
+                }
+              " class="problem-bottom-sure">确定
+              </view> -->
+            <view @click="() => {
+                selectQuestionVisible = false;
+              }
+              " class="problem-bottom-close">
+              关闭</view>
+          </view>
+        </view>
+      </view>
+    </van-overlay>
   </view>
 </template>
 
@@ -482,6 +433,7 @@ export default {
       problemListIndex: 0,
       submitExamVisible: false,
       resultExamVisible: false,
+      selectQuestionVisible: false,
       examTime: 1000 * 60 * 20,
       restTime: "",
       useTime: "",
@@ -594,7 +546,7 @@ export default {
 
       this.problemList[this.problemListIndex].isComplete = true;
       this.problemList[this.problemListIndex].userAnswerIndex ==
-      this.problemList[this.problemListIndex].answertrue
+        this.problemList[this.problemListIndex].answertrue
         ? this.trueNum++
         : this.falseNum++;
     },
@@ -640,6 +592,7 @@ export default {
 .topad {
   padding: 0 30rpx;
 }
+
 .threeExam {
   background: #fff;
   width: 100%;
@@ -647,9 +600,126 @@ export default {
   display: flex;
   flex-direction: column;
 }
+
 .wxad {
   border: none;
 }
+.select-problem {
+  display: flex;
+  width: 100vw;
+  height: 100vh;
+  align-content: flex-end;
+  align-items: flex-end;
+
+  .problem-index {
+    width: 100vw;
+    height: 650rpx;
+    background: #fff;
+    border-top-right-radius: 16rpx;
+    border-top-left-radius: 16rpx;
+    padding-top: 50rpx;
+    -webkit-overflow-scrolling: touch;
+  }
+
+  .problem-bottom {
+    width: 100%;
+    display: flex;
+    height: 80rpx;
+
+    .problem-bottom-sure {
+      width: 50%;
+      height: 100%;
+      border-right: 2rpx solid #d8d8d8;
+      border-top: 2rpx solid #d8d8d8;
+      text-align: center;
+      color: #498ef5;
+      line-height: 80rpx;
+    }
+
+    .problem-bottom-close {
+      width: 100%;
+      height: 100%;
+      color: red;
+      text-align: center;
+      border-top: 2rpx solid #d8d8d8;
+      line-height: 80rpx;
+    }
+  }
+
+  .problem-header {
+    display: flex;
+    justify-content: space-between;
+    align-content: center;
+    align-items: center;
+    padding: 0rpx 30rpx;
+
+    .problem-header-left {
+      display: flex;
+
+      .problem-dui {
+        display: flex;
+        align-content: center;
+        align-items: center;
+      }
+
+      .problem-cuo {
+        display: flex;
+        align-content: center;
+        align-items: center;
+      }
+    }
+
+    .problem-header-right {
+      display: flex;
+      align-content: center;
+    }
+  }
+
+  .problem-body {
+    height: 480rpx;
+    padding-top: 30rpx;
+    overflow-y: scroll;
+    -webkit-overflow-scrolling: touch;
+
+    .problem-listBody {
+      display: inline-block;
+      overflow-y: scroll;
+      -webkit-overflow-scrolling: touch;
+
+      .problem-listItem {
+        display: inline-block;
+        width: 99rpx;
+        height: 99rpx;
+        line-height: 100rpx;
+        text-align: center;
+        border-radius: 50%;
+        border: 2rpx #d8d8d8 solid;
+        margin-bottom: 15rpx;
+        margin-left: 13rpx;
+        margin-right: 13rpx;
+        font-size: 40rpx;
+      }
+
+      .problem-listItem_current {
+        background: rgba(138, 144, 153, 0.15);
+        border-color: #bfbfbf;
+        color: #5c6066;
+      }
+
+      .problem-listItem_dui {
+        background: #c1e6db;
+        color: #4eb79a;
+        border-color: #4eb79a;
+      }
+
+      .problem-listItem_cuo {
+        background: #ffbcbe;
+        color: #e65055;
+        border-color: #e65055;
+      }
+    }
+  }
+}
 .problem {
   padding: 0 30rpx;
   height: 500rpx;
@@ -667,12 +737,14 @@ export default {
     margin-right: 10rpx;
     vertical-align: middle;
   }
+
   .problem-issue {
     font-size: 42rpx;
     vertical-align: middle;
     font-weight: bold;
     color: #0a1a33;
   }
+
   .problem-radio {
     .problem-radio-flex {
       display: flex;
@@ -680,6 +752,7 @@ export default {
       flex-wrap: wrap;
       align-items: center;
     }
+
     .problem-radio-icon {
       width: 70rpx;
       height: 70rpx;
@@ -700,28 +773,33 @@ export default {
       }
     }
   }
+
   .problem-media {
     width: 100%;
     display: flex;
     justify-content: center;
     padding-top: 15rpx;
-    > image {
+
+    >image {
       width: 100%;
     }
   }
 }
+
 .bottom {
   // position: absolute;
   // bottom: 0;
   width: 100%;
   padding-bottom: constant(safe-area-inset-bottom);
   padding-bottom: env(safe-area-inset-bottom);
+
   .switch {
     bottom: 48rpx;
     padding: 0 30rpx;
     display: flex;
     justify-content: space-between;
     width: 100%;
+
     .pre {
       width: 156rpx;
       height: 76rpx;
@@ -733,6 +811,7 @@ export default {
       border: 2rpx solid #707070;
       text-align: center;
     }
+
     .next {
       width: 156rpx;
       height: 76rpx;
@@ -745,6 +824,7 @@ export default {
       text-align: center;
     }
   }
+
   .submit {
     margin-top: 50rpx;
     width: 100%;
@@ -755,6 +835,7 @@ export default {
     align-content: center;
     align-items: center;
     padding: 0 30rpx;
+
     .submit-button {
       width: 180rpx;
       line-height: 68rpx;
@@ -769,19 +850,23 @@ export default {
       justify-content: space-evenly;
     }
   }
+
   .count {
     width: 390rpx;
     display: flex;
     justify-content: space-between;
+
     .col {
       display: flex;
     }
   }
 }
+
 .tip1 {
   width: 580rpx;
   height: 402rpx;
   padding: 0 30rpx;
+
   .title {
     color: #0a1a33;
     width: 100%;
@@ -790,11 +875,13 @@ export default {
     margin-top: 48rpx;
     text-align: center;
   }
+
   .score {
     display: flex;
     justify-content: space-between;
     font-size: 0;
     width: 100%;
+
     .score-list {
       text-align: center;
       color: #ff4d53;
@@ -802,27 +889,32 @@ export default {
       display: inline-block;
       margin-top: 64rpx;
     }
+
     .score-dont {
       font-size: 42rpx;
 
       text-align: center;
     }
+
     .score-rest {
       text-align: center;
       font-size: 42rpx;
       color: #0a1a33;
     }
+
     .score-exam {
       text-align: center;
       font-size: 42rpx;
       color: #0a1a33;
     }
   }
+
   .bottom {
     width: 100%;
     display: flex;
     justify-content: space-between;
     margin-top: 48rpx;
+
     .left {
       width: 250rpx;
       line-height: 80rpx;
@@ -833,6 +925,7 @@ export default {
 
       font-size: 30rpx;
     }
+
     .right {
       width: 250rpx;
       line-height: 80rpx;
@@ -845,6 +938,7 @@ export default {
     }
   }
 }
+
 .tip2 {
   .tip2-cry {
     position: absolute;
@@ -853,6 +947,7 @@ export default {
     top: 48rpx;
     transform: translate(-50%, 0);
   }
+
   .tip2-text {
     position: absolute;
     top: 284rpx;
@@ -863,13 +958,16 @@ export default {
     font-weight: bold;
     line-height: 1.5;
   }
+
   .tip2-text-line3 {
     color: #0a1a33;
     font-size: 30rpx;
     margin-top: 25rpx;
   }
+
   .tip2-bottom {
     width: 100%;
+
     .tip2-bottom-1 {
       width: 480rpx;
       line-height: 80rpx;
@@ -881,6 +979,7 @@ export default {
       color: #ffffff;
       margin-top: 60rpx;
     }
+
     .tip2-bottom-2 {
       width: 480rpx;
       line-height: 80rpx;
@@ -891,6 +990,7 @@ export default {
       font-size: 30rpx;
       margin-top: 30rpx;
     }
+
     .tip2-bottom-3 {
       margin-top: 30rpx;
       color: #5c6066;

src/pages/carVideo/index.vue

@@ -480,7 +480,7 @@ export default {
         uni.setStorageSync("userInfo", res.data);
         this.$store.commit("SET_USERINFO", res.data);
         this.$store.dispatch("GetRoadExamVip");
-        this.$store.dispatch("GetRoadExamIsAllFree");
+        this.$store.dispatch("GetVideoFreeAndBaziPay");
         // if (!res.data.nickName) {
         //   uni.showModal({
         //     title: "新用户更新信息",

src/pages/forecast/index.vue

@@ -39,7 +39,7 @@
 
         </view>
 
-        <view :data-theme="theme" v-if="goodsStatus.isPay == 0" @click="pay" class="pay">
+        <view :data-theme="theme" v-if="goodsStatus.isPay == -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 == 0" :map="userData.guoGuanMap"></m-map-blur>
+                        <m-map-blur :begin="2" :isBlur="goodsStatus.isPay == -1" :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 == 0" :map="userData.caiYun"></m-map-blur>
+                        <m-map-blur :isBlur="goodsStatus.isPay == -1" :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 == 0" :map="userData.qingGan"></m-map-blur>
+                        <m-map-blur :isBlur="goodsStatus.isPay == -1" :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 == 0" :map="userData.ziNvYun"></m-map-blur>
+                        <m-map-blur :isBlur="goodsStatus.isPay == -1" :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 == 0"
+                        <m-line-blur :isBlur="goodsStatus.isPay == -1"
                             :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 == 0" :theme="theme"
+                        <m-number-blur :isBlur="goodsStatus.isPay == -1" :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 == 0"></m-line-blur>
+                        <m-line-blur :text="userData.piQi" :isBlur="goodsStatus.isPay == -1"></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 == 0" :text="userData.chenGuMap['称骨评语']"></m-line-blur>
+                        <m-line-blur :isBlur="goodsStatus.isPay == -1" :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 == 0"
+                            <m-disease-blur :isBlur="goodsStatus.isPay == -1"
                                 :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 == 0" :map="userData.xiFangWei"></m-map-blur>
+                        <m-map-blur :isBlur="goodsStatus.isPay == -1" :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 == 0"></m-line-blur>
+                        <m-line-blur :text="userData.guiren" :isBlur="goodsStatus.isPay == -1"></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 == 0"></m-line-blur>
+                        <m-line-blur :text="userData.industry" :isBlur="goodsStatus.isPay == -1"></m-line-blur>
                     </view>
                     <m-more-alert v-if="goodsStatus.isPay != 0"  :theme="theme"></m-more-alert>
 

src/pages/future/index.vue

@@ -57,9 +57,9 @@
 										style="height: 15rpx;width: 22rpx;margin-left: 8rpx;" :src="downArrowImg"></image>
 								</view>
 							</picker>
-							<picker :range="chinaHours" @change="changeFormBirthChinaHour" mode="selector">
+							<picker @change="changeFormBirthHour" mode="time">
 								<view class="content-inputs-row-menu">
-									{{ form.birthChinaHour }} <image style="height: 15rpx;width: 22rpx;margin-left: 8rpx;"
+									{{ form.birthHour }} <image style="height: 15rpx;width: 22rpx;margin-left: 8rpx;"
 										:src="downArrowImg"></image>
 								</view>
 							</picker>
@@ -150,7 +150,7 @@ export default {
 			form: {
 				isPay: 0,
 				birthday: '1995-01-01',
-				birthHour: '23:00',
+				birthHour: '00:00',
 				birthChinaHour: '子时',
 				isSave: 0, //是否保存 0:不保存 1保存
 				sex: 1, //性别 1:男 2:女
@@ -198,15 +198,57 @@ export default {
 		},
 		submitForm() {
 			let that = this
+
+			wx.showModal({
+				title: '看广告免费测算',
+				content: '是否观看激励广告',
+				success(res) {
+
+					if (res.confirm) {
+						console.log('用户点击确定')
+						let videoAd = null;
+						if (wx.createRewardedVideoAd) {
+							videoAd = wx.createRewardedVideoAd({
+								adUnitId: "adunit-f0e94618f34d4baf",
+							});
+							videoAd.onLoad(() => { });
+							videoAd.onError((err) => {
+								console.log(err)
+							});
+							videoAd.offClose();
+							videoAd.onClose((res) => {
+								if (!res.isEnded) {
+									return
+								}
+								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
+									.load()
+									.then(() => videoAd.show())
+									.catch((err) => {
+										console.log("激励视频 广告显示失败");
+									});
+							});
+
+						} else if (res.cancel) {
+							console.log('用户点击取消')
+						}
+					}
+				}
+
+			})
 			// 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 + ' ' + this.form.birthHour + ':00'}&sex=${that.form.sex}&username=${that.form.username}`
-			})
+
 
 
 		},
@@ -224,9 +266,8 @@ export default {
 					break;
 			}
 		},
-		changeFormBirthChinaHour(e) {
-			this.form.birthChinaHour = this.chinaHours[Number(e.detail.value)].split(' ')[0]
-			this.form.birthHour = this.chinaHours[Number(e.detail.value)].split(' ')[1].split('-')[0]
+		changeFormBirthHour(e) {
+			this.form.birthHour = e.detail.value
 		},
 		changeFormBirthDay(e) {
 			console.log(e.detail)

src/store/modules/user.js

@@ -11,6 +11,7 @@ const user = {
 
 		},
 		isVideoFree:"0",
+		baziispay:'0',
 		roadExamList:[],
 		openExamRoom: [],
 		userInfo: '',
@@ -31,6 +32,9 @@ const user = {
 		}
 	},
 	mutations: {
+		SET_BAZIISPAY:(state,baziispay)=>{
+			state.baziispay = baziispay
+		},
 		SET_ISVIDEOFREE:(state,isVideoFree)=>{
 			state.isVideoFree = isVideoFree
 
@@ -128,6 +132,28 @@ const user = {
 			store.commit("SET_ISVIDEOFREE",IS_VIDEO_FREE[0].dictValue)
 			
 		},
+		async GetBaziispay(store){
+			let res = await openApi.systemDictDataType("nbjk_set")
+		
+			let BAZI_IS_PAY = res.data.filter(item=>{
+				return item.dictLabel=='BAZI_IS_PAY'
+			})
+
+			store.commit('BAZI_IS_PAY',BAZI_IS_PAY[0].dictValue)
+
+		},
+		async GetVideoFreeAndBaziPay(store){
+			let res = await openApi.systemDictDataType("nbjk_set")
+			let IS_VIDEO_FREE = res.data.filter(item=>{
+				return item.dictLabel=='IS_VIDEO_FREE'
+			})
+			let BAZI_IS_PAY = res.data.filter(item=>{
+				return item.dictLabel=='BAZI_IS_PAY'
+			})
+			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)
+		},
 		/**
 		 * 获取用户信息
 		 * @param {Object} store