Merge branch 'master' of codeup.aliyun.com:6265f483e4166464dc2f9c14/boeu/mobile

components/gonggao/index.vue

@@ -0,0 +1,68 @@
+<template>
+	<view>
+		<u-overlay :show="showGonggao">
+			<view class="warp">
+				<view class="gonggao">
+					<view class="gonggao-title">最新公告</view>
+					<view class="gonggao-text">
+						为了保障信息安全，为您提供更优质的服务，学习平台计划在2022年11月9日0点-11月9日早6点进行服务器升级，
+						在此期间，您无法登录学习，给您带来不便，还请谅解，感谢您的理解与支持。
+					</view>
+				</view>
+				
+			</view>
+		</u-overlay>
+	</view>
+</template>
+
+<script>
+	export default {
+		data(){
+			return {
+				showGonggao:false
+			}
+		},
+		mounted() {
+			let now=new Date();
+			let min=new Date(2022,10,9,0,0,0);
+			let max=new Date(2022,10,9,6,0,0);
+			//console.log(now,min,max);
+			//console.log(now.getTime(),min.getTime(),max.getTime());
+			if(now.getTime()>min.getTime() && now.getTime()<max.getTime()){
+			  //console.log('open')
+			  this.showGonggao=true;
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.warp {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		height: 100%;
+	}
+	.gonggao{
+		background: url("/mobile/static/images/gonggao/dlg_bg.png") no-repeat;
+		background-size: cover;
+		width:471upx;
+		height:495upx;
+		padding: 40upx;
+	}
+	.gonggao-title{
+		color: #333333;
+		font-size: 32upx;
+		margin-top: 190upx;
+		padding: 10upx 0px;
+		text-align: center;
+		font-weight: 900;
+		font-family: PingFangSC-Regular, sans-serif;
+	}
+	.gonggao-text{
+		color: #333333;
+		font-size: 22upx;
+		line-height: 35upx;
+		padding: 10upx 20upx;
+	}
+</style>

pages/index/index.vue

@@ -189,7 +189,7 @@
 	    <view >
 			<uni-load-more :status="loadStatus"></uni-load-more>
 		</view>
-		<u-overlay :show="signInShow">
+		<!-- <u-overlay :show="signInShow">
 			<view style="padding-top: 180upx;">
 				<view style="margin-top: 180upx;width:624upx;margin: 0px auto;position: relative;">
 					<img usemap="#HotMap" src="/mobile/static/images/dlg.png" style="width:624upx;height: 864upx;">
@@ -197,7 +197,8 @@
 					<mapelement></mapelement>
 				</view>
 			</view>
-		</u-overlay>
+		</u-overlay> -->
+		<gonggao></gonggao>
 	</view>
 </template>
 <script>
@@ -212,6 +213,7 @@
 	import apiMessage from '@/api/system/message.js'
 	import {toScore} from '@/utils/tools.js'
 	import apiBoeCourse from '@/api/boe/course.js'
+	import gonggao from '@/components/gonggao/index.vue'
 	export default {
 		data(){
 			return {
@@ -281,6 +283,7 @@
 			this.countNoReadMsg();
 		},
 		components:{
+			gonggao,
 		    'mapelement': {
 			  render: function(createElement) {
 				

pages/study/index.vue

@@ -292,20 +292,19 @@
 				</view>
 			</view>
 		</u-overlay>
+		<gonggao></gonggao>
 	</view>
 </template>
 <script>
 	import apicourseStudy from "../../api/modules/courseStudy.js"
 	import apiCoursePortal from '@/api/modules/coursePortal.js'
 	import apiBoeCourse from '@/api/boe/course.js';
-	import {
+	import {formatDate} from '@/utils/tools.js';
-		formatDate
-	} from '@/utils/tools.js';
 	import apiUser from '@/api/system/user.js'
-	import {
+	import {mapGetters} from 'vuex'
-		mapGetters
+	import gonggao from '@/components/gonggao/index.vue'
-	} from 'vuex'
 	export default {
+		components:{gonggao},
 		computed: {
 			...mapGetters(['userInfo', 'isOneStady'])
 		},