隐藏运势

src/custom-tab-bar/index.js

@@ -1,7 +1,8 @@
 
 Component({
 	data: {
-		active: 0,
+		//默认是2
+		active: 2,
 		isBazi:false,
 		list2: [
 			{
@@ -37,7 +38,7 @@ Component({
 			"text": "教学视频"
 		},
 		{
-			"pagePath": "/pages/fortune/index",
+			"pagePath": "/pages/future/index",
 			"iconPath": "/static/imgs/fortune.png",
 			"selectedIconPath": "/static/imgs/fortune-active.png",
 			"text": "运势"
@@ -79,7 +80,13 @@ Component({
 		switchTab(e) {
 			const data = e.currentTarget.dataset
 			const url = data.path
+			if(url=='/pages/future/index'){
+				wx.navigateTo({
+					url:'/pages/future/index'
+				})
+				return
 
+			}
 			wx.switchTab({ url })
 			// this.setData({
 			// 	active: data.index

src/pages.json

@@ -73,9 +73,9 @@
       }
     },
     {
-      "path": "pages/fortune/index",
+      "path": "pages/future/index",
       "style": {
-        "navigationBarTitleText": "运势测算"
+        "navigationBarTitleText": "人生报告"
       }
     },
     {
@@ -494,12 +494,6 @@
         "selectedIconPath": "static/imgs/video-active.png",
         "text": "教学视频"
       },
-      {
-        "pagePath": "pages/fortune/index",
-        "iconPath": "static/imgs/fortune.png",
-        "selectedIconPath": "static/imgs/fortune-active.png",
-        "text": "运势报告"
-      },
       {
         "pagePath": "pages/user/index",
         "iconPath": "static/imgs/user.png",
@@ -522,6 +516,7 @@
     "navigationBarBackgroundColor": "#F8F8F8",
     "backgroundColor": "#F8F8F8",
     "usingComponents": {
+      "custom-tab-bar":"./custom-tab-bar/index",
       "van-empty": "./wxcomponents/vant/empty/index",
       "van-overlay": "./wxcomponents/vant/overlay/index",
       "van-tabbar": "./wxcomponents/vant/tabbar/index",

src/pages/forecast/index.vue

@@ -1027,27 +1027,27 @@ export default {
 }
 
 [data-theme=blue] .score {
-    border: 3px solid #006494;
+    border: 2px solid #006494;
 }
 
 [data-theme=yellow] .score {
 
-    border: 3px solid #D19C03;
+    border: 2px solid #D19C03;
 }
 
 [data-theme=brown] .score {
 
-    border: 3px solid #70390D;
+    border: 2px solid #70390D;
 }
 
 [data-theme=red] .score {
 
-    border: 3px solid #A42705;
+    border: 2px solid #A42705;
 }
 
 [data-theme=green] .score {
 
-    border: 3px solid #519669;
+    border: 2px solid #519669;
 }
 
 
@@ -1058,39 +1058,40 @@ export default {
     height: 296rpx;
     border: 3px solid transparent;
     margin: 0 auto;
+    
 
-    [data-theme=blue] .score-outer {
+    [data-theme=blue].score-outer {
         width: 100%;
         height: 100%;
-        background-color: #006494;
+        background-color: #1293D0;
         padding: 20rpx;
     }
 
     [data-theme=yellow].score-outer {
         width: 100%;
         height: 100%;
-        background-color: #D19C03;
+        background-color: #FFD65C;
         padding: 20rpx;
     }
 
     [data-theme=brown].score-outer {
         width: 100%;
         height: 100%;
-        background-color: #70390D;
+        background-color: #9C4B08;
         padding: 20rpx;
     }
 
     [data-theme=red].score-outer {
         width: 100%;
         height: 100%;
-        background-color: #A42705;
+        background-color: #CB2C00;
         padding: 20rpx;
     }
 
     [data-theme=green].score-outer {
         width: 100%;
         height: 100%;
-        background-color: #519669;
+        background-color: #5BC781;
         padding: 20rpx;
     }
 

src/pages/fortune/index.vue → src/pages/future/index.vue

@@ -1,7 +1,17 @@
 <template>
 	<view class="content iPhoneX">
+		<view v-if="isWatchFutureVideo == '0'" class="video">
+			<video :initial-time="videoTime" id="futureVideo" autoplay show-play-btn :controls="false"
+				:src="videoSrc"></video>
+			<view style="width: 100%;padding-top: 15rpx;display: flex;" class="">
+				<button @click="resetVideo" type="primary" style="width: 150rpx;">重播</button>
+				<button @click="() => {
+					isWatchFutureVideo = '1'
+				}" type="warn" style="width: 150rpx;">关闭</button>
+			</view>
+		</view>
 		<image class="bg" src="https://ndata.zzxcx.net/xpgx-xcx/index/bg1.png"></image>
-		<image mode="widthFix" class="logo" src="https://ndata.zzxcx.net/xpgx-xcx/index/bg4.png"></image>
+		<image mode="widthFix" class="logo" src="https://ndata.zzxcx.net/xpgx-xcx/index/bg5.png"></image>
 		<view class="form">
 			<view class="content">
 				<image class="content-title" mode="widthFix" src="https://ndata.zzxcx.net/xpgx-xcx/index/title.png"></image>
@@ -54,7 +64,8 @@
 								</view>
 							</picker>
 							<navigator style="height: 80rpx;" open-type="navigate" url="/otherPages/forecastHistory/index">
-								<button  	hover-class="none" style="background: #EEBB65;color: #fff;line-height: 80rpx;height: 80rpx;">
+								<button hover-class="none"
+									style="background: #EEBB65;color: #fff;line-height: 80rpx;height: 80rpx;">
 									历史记录
 								</button>
 							</navigator>
@@ -106,9 +117,9 @@
 
 		</view>
 
-
+		<custom-tab-bar></custom-tab-bar>
 		<view style="height: 48px;width: 100%;">
-			
+
 		</view>
 	</view>
 </template>
@@ -119,6 +130,9 @@ import calendar from 'js-calendar-converter'
 export default {
 	data() {
 		return {
+			videoSrc: "https://ndata.zzxcx.net/xpgx-xcx/video/8zi.mp4",
+			videoTime: 0,
+			isWatchFutureVideo: uni.getStorageSync("isWatchFutureVideo") || "0",
 			title: '国学',
 			downArrowImg: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACwAAAAgCAYAAABpRpp6AAAAAXNSR0IArs4c6QAABI5JREFUWEfVmHtsFFUUxr8zQ3Gh7c62UUNIiFHUVKLGVirBNyERoZ3lITXRBBIkKUkjuo8afBCtkGCi3ZlCYzTiH2Ag0ZQ0sLOV+IqPEJFUqM8QEyMqqGkIdmdLa0u7c/S2bGnLXPfZGu9/u+fx/ebsd+/MLOF/tijFG15ZssBx1O0EqgD4W3bwrNlh//RfXU9ghe82VXW2MZT5AE5QElsj78Z/GQFuXF1ytTOsngRQngJkwhkHwwt3Rvu6pxs6rJdWMCtfgKCN0z6lDHpuGQEO6b4AwKYL2EenPfaytjYkpwu6Xp87uxh9Rwm41UVz7SiwX3sGjB1uUATaFrHiL0wXcEjX3gSw0U2PmR4bARb+ZUf9BoDqkphkBQ+ah+wPpxo6VOtbD+K9Ep2+JA3Pv7TpdN+LDH5ektztFA1VtrT3/zFV0IGakpsURf0SwGxXDUa9EbN3jwHX1UGdN6C9B2CpBOrT0x576VT4Wfi2BP2dAC9w16Z9hhVfJ2JjwOLDUyuK5yTVGV0A5rh6CNhhWvZzhZ5yyO/dC6b1kr4nlUFPdfP73X2XAY9uQN8SMH8g8TOTw8sjHQnxSxRkBXVtIwFio7mtfoZ6h2n9+X0qOGHCqS+Dtd6tRLRd0uQs84xKM3but3yJG2vKbnYU55jUt6ANhhXfM17HFbipCUriuHYYwAPuUHzE25tY0vQJhnOFbqi7qsQzcKETQIVEY49hJTZMjrkCi6TRu5/SBdBcya592YjZW3IFDunafgCPSuq/O4/iRW9Yv/dnDCwSgzVl95DifCzzs0KsN0cTHdlCh3Rt0z8b+3VJXZ/jJKtbOs6LR4XLlnTCqcxwrfY0E16SFJ8bYqVqV6zn10yhxUONovLnAGa51hCvM6KJfbJ+aYHF0RfUtQ4Clkugj5Z67Pub2nAhHfTm5eXeoqJkJxg3usNitxG16/+tTybACOulVzKUEwDmSaZiGNFEOB1wWNfeYeBhSd7X7CldbLad+StvYNEg4C+9S2FF+LnIpSEzaLVpxQ/JxIK6t4FAr0rivUlyqndGe39Id9EZTTjVJKRrjQBekTTtcVSqajkY/3lyPFCrVSkE4dsr3GqZ+BEzmng7HayIZwUs8kO6LwpwraR5p9dj3z3ez1vqyrShAUfY6TrXGsZrRsxuyAQ2F2AEl3nLaSYJgGvcRajVsOJPXIyJDXuAgDUSoK6hYXtx62EMThmwaNy40rvIcegzADNdTw6ihyLReHtY925m0C7JZG1WeKEZTfyYKWxOE77kZ+lrFcCwAWwC4S3pRTHqIjH7QDaweQGP+llrB7AqW1Fggm2yKs92001oHljl8ylJFn6+NgvV416PfWcmNxpXu2Uh5JoartFuZ2XkyHL186SiuAJUNVv2qVx185pwSjTo9z5OTK1pIJhAayJW/GCusPl6eIJu0K+1EWOtDIbBpmklQvnAFhT44g1CvPVePxmKGce0Wfa9ufp2fL+CWGLsqPP7KsF8ZNIrz1lKUrX4Xyzf6RZ0wmN+1n33EVg8b9zAwFcqKU82R3vEnzQFWQWdcEGI0jT5G9p5ijo2ng6iAAAAAElFTkSuQmCC",
 			yearsRange: [2020, 2021, 2022],
@@ -150,6 +164,7 @@ export default {
 		}
 	},
 	onLoad() {
+		uni.setStorageSync("isWatchFutureVideo", "1")
 		uni.login({
 			success: res => {
 				console.log(res)
@@ -174,6 +189,17 @@ export default {
 		}
 	},
 	methods: {
+		resetVideo() {
+			//const query = wx.createSelectorQuery()
+			//const video =query.select('#futureVideo')
+			//console.log(video)
+			var videoContext = wx.createVideoContext('futureVideo', this);
+			videoContext.seek(0)
+			videoContext.play()
+			// this.videoSrc =''
+			// this.videoSrc = "https://ndata.zzxcx.net/xpgx-xcx/video/8zi.mp4"
+
+		},
 		submitForm() {
 			let that = this
 			// api.openApi.openApiBirthdayLog({
@@ -228,6 +254,21 @@ export default {
 	position: relative;
 	height: 1500rpx;
 
+	.video {
+		position: absolute;
+		top: 10vh;
+		z-index: 100;
+		display: flex;
+		justify-content: center;
+		width: 100%;
+		flex-wrap: wrap;
+
+		video {
+			width: 100%;
+			height: 60vh;
+		}
+	}
+
 	.bg {
 		width: 100%;
 		min-height: 100%;

src/utils/responseDecorator.js

@@ -21,7 +21,7 @@ const switchTextToHexColor = (text) => {
         case '蓝':
             color = '#006494'
             break;
-        case '黄':
+        case '橙':
             color = '#D19C03'
             break;
         default:
@@ -44,7 +44,7 @@ const switchTextToEnColor = (text) => {
         case '蓝':
             color = 'blue'
             break;
-        case '黄':
+        case '橙':
             color = 'yellow'
             break;
         default: