2

src/pages/index/components/indexassembly.vue

@@ -187,7 +187,9 @@
 						res.Data.Account = data.obj.phoneNum;
 						uni.setStorageSync("userInfo", res.Data);
 						Toast.success("登录成功");
-						emit('success')
+						setTimeout(()=>{
+							emit('success')
+						},1000)
 						data.showPhone = false
 						uni.showTabBar()
 					} else {
@@ -198,13 +200,11 @@
 						}
 						uni.hideLoading();
 						if (res.Data.Error == -1) { //如果没找到电话号码 就跳入登录
-
 							// setTimeout(() => {
 							//   uni.reLaunch({
 							//   	url: '/pages/login/login'
 							//   });
 							// }, 1000);
-
 						}
 
 					}

src/pages/study/courseList.vue

@@ -107,14 +107,15 @@
 </style>
 <template>
 	<view class="studyCourse">
+		<div class="loading" v-if="isShowLoad">
+			<van-loading type="spinner" color="#fff" />
+		</div>
 		<template v-if="ChapterList.length>0">
 			<view class="Course_Top">
 				<view class="CourseBan">《{{CourseName}}》</view>
 				<view class="CourseTotal" v-if="TotalHours>0">共 {{TotalHours}}课</view>
 			</view>
-			<div class="loading" v-if="isShowLoad">
-				<van-loading type="spinner" color="#fff" />
-			</div>
+			
 			<view class="Course_Bottom">
 				<view class="Course_List" v-for="(item,index) in ChapterList" :key="index">
 					<view class="CourseList_One" @click="getReview(index)">
@@ -216,6 +217,8 @@
 								x.isShow = false
 							})
 						}
+					}).catch(err=>{
+						data.isShowLoad = false;
 					});
 				},
 				getSpeed(score) {

src/pages/timetable/timeTable-item.vue

@@ -6,7 +6,15 @@
       :key="index"
     >
       <view class="flex flex_start_center title-row">
-        <view class="class-time">{{ item.StartTime }} </view>
+        <view class="class-time">
+			<view class="" style="font-size: 22rpx;font-weight: 400;color: #111111;">
+				{{data.DateMonth}}-{{data.DateDay}}
+			</view>
+			<view class="">
+				{{ item.StartTime }} 
+			</view>
+				
+		</view>
         <view class="circle"></view>
         <view class="class-title one_line flex">
           {{ data.ClassName }}
@@ -65,7 +73,7 @@ import {
 } from "vue";
 export default {
   name: "",
-  props: { data: Object },
+  props: { data: Object},
   components: {},
   setup(props) {
     let methods = {

src/pages/word/wordStudy.vue

 <template>
 	<view class="word">
-		<swiper class="swiper" next-margin="60rpx" @change="swiperChange" :current="current">
+		<van-skeleton title row="10" v-if="loading" />
+		<van-empty description="暂无数据" v-if="nodata"/>
+		<swiper class="swiper" next-margin="60rpx" @change="swiperChange" :current="current" v-if="!loading&&!nodata">
 			<swiper-item v-for="(item,index) in StudyList" v-if="Type==2" :key="index" class="swiper-item">
 				<Pronunciation :item="item" :cur="index+1" :total="StudyList.length"></Pronunciation>
 			</swiper-item>
@@ -57,14 +59,24 @@
 				},
 				Type:1, //1复习 2 单词
 				TotalHours:0,
-				CourseName:''
+				CourseName:'',
+				loading: false,
+				nodata: false,
 			})
 			let methods = {
 				getData() {
+					data.loading=true
 					proxy.$request('/AppletWords/GetStudyWords', data.msg).then(res => {
+						data.loading=false
 						data.StudyList = res.Data.StudyList
 						data.ReviewList = res.Data.ReviewList;
 					    data.current = 0
+						if (data.StudyList.length === 0 && data.ReviewList.length == 0) {
+							data.nodata = true
+						}
+					}).catch(err=>{
+						data.loading=false
+						data.nodata = true
 					})
 				},
 				swiperChange(val) {

src/utils/date.js

@@ -24,6 +24,16 @@ export let getWeek = (year, month) => {
 	return arr
 }
 
+export let getMonthMaxDay = (y, m) => {
+	let maxDay = 30
+	if(y&&m){
+		maxDay= new Date(y, m, "0").getDate();
+	}else{
+		const d=new Date()
+		maxDay= new Date( d.getFullYear(),d.getMonth()+1,0).getDate();
+	}
+	return maxDay
+}
 export let getToday = (y, m, d) => {
 	let date = new Date()
 	let year = date.getFullYear()