2

src/components/word/fillInTheBlanks.vue

@@ -165,7 +165,6 @@
 				}
 			}
 			onMounted(()=>{
-				console.log(137,props.item)
 			})
 			let that = methods;
 			return {

src/pages/index/index.vue

@@ -96,7 +96,9 @@
 				</view>
 			</view>
 			<view class="courseTitle">
-				下节课
+				<text v-if="pageData.ClassNext.ClassPlanState==1">上课中</text>
+				<text v-else-if="pageData.ClassNext.ClassPlanState==2">下节课</text>
+				<text v-else>暂无</text>
 			</view>
 		</view>
 		<view class="learningGarden" v-if="pageData.LearningGardenList.length>0">

src/pages/person/person.vue

@@ -5,7 +5,7 @@
 				<!-- <view class="date">
 					2021年12月30日
 				</view> -->
-				<view class="name"> Hello，{{ pageData.StuName }} </view>
+				<view class="name"> Hello，{{ pageData.StuName||'' }} </view>
 			</view>
 			<view class="right">
 				<image :src="pageData.StuIcon" mode="aspectFill" style="width:100%;height:100%;border-radius: 50%;">
@@ -171,8 +171,10 @@
 			};
 		},
 		onShow() {
+			if(this.$isLogin()){
 				this.getData();
 			}
+		}
 	};
 </script>
 

src/pages/study/components/vear-carousel/vear-carousel.vue

@@ -176,6 +176,8 @@
 		font-size: 20rpx;
 		color: #333333;
 		text-align: center;
+		box-sizing: border-box;
+		padding: 5rpx 8rpx;
 	}
 
 	@keyframes to-mini

src/pages/study/index.vue

@@ -640,8 +640,9 @@
 			};
 		},
 		onShow() {
+			if(this.$isLogin()){
 				 this.getCourseList()//我的课程列表
-		  
+			}
 		},
 	}
 	 

src/pages/timetable/timeTable.vue

@@ -81,14 +81,14 @@
           style="width: 90%"
           v-if="isShowAllDay"
         >
-          <van-icon name="arrow-up" color="#00ACF9" @click="changeCalendar" />
+          <van-icon name="arrow-up" size="40rpx" color="#00ACF9"  @click="changeCalendar"/>
         </van-divider>
         <van-divider
           contentPosition="center"
           style="width: 90%"
           v-if="!isShowAllDay"
         >
-          <van-icon name="arrow-down" color="#00ACF9" @click="changeCalendar" />
+          <van-icon name="arrow-down" size="40rpx" color="#00ACF9"   @click="changeCalendar"/>
         </van-divider>
       </view>
     </view>
@@ -190,8 +190,9 @@ export default {
     let isShowAllDay = ref(false);
     let sliceWeekArr = ref([]);
     let sliceWeek = (item) => {
-	  let w =item.$orig?.week??item.week
-	  let d = item.$orig?.day||item.day
+	  let w =item.week||item.$orig?.week
+	  let d =item.day||item.$orig?.day
+	  
       let newArr = calendar.value.slice(emptyArr.length, calendar.value.length);
       let s = d - (w + 1) <= 0 ? 0 : d - (w + 1);
       let e = d + (6 - w);
@@ -322,10 +323,12 @@ export default {
 	const indexData=uni.getStorageSync('indexData')
 	// this.msg.ClassId = JSON.parse(options.classId);
 	this.msg.ClassId = indexData.ClassId
-	this.getAllData()
     this.msg.StartTime = getToday();
     this.msg.EndTime = getToday();
+	if(this.$isLogin()){
+		this.getAllData()
 		this.getData();
+	}
   },
 };
 </script>

src/utils/date.js

@@ -5,7 +5,7 @@ export let getWeek = (year, month) => {
 	let maxDay = d.getDate();
 	let arr = []
 	for (let i = 1; i <= maxDay; i++) {
-		let date = new Date(year + '-' + month + '-' + i)
+		let date = new Date(year + '/' + month + '/' + i)// '/'兼容ios
 		let week = date.getDay()
 		let weekStr = ""
 		let isToday = 0

src/utils/index.js

@@ -201,24 +201,13 @@ export let changeNumToHan = (num) => {
 	return result;
 }
 // 判断登录
-export let isLogin = () => {
-	let userinfo = uni.getStorageSync('userInfo');
-	if (!userinfo || userinfo === "") {
-		uni.showToast({
-			title: '请登录账号',
-			duration: 2000,
-			icon: "error",
-			// success: () => {
-			//     setTimeout(() => {
-			//         uni.navigateTo({
-			//             url: '/pages/login/login'
-			//         });
-			//         clearTimeout();
-			//     }, 2000)
-
-			// }
-		});
-
+export const isLogin = () => {
+	const userinfo = uni.getStorageSync('userInfo');
+	if (userinfo && userinfo.Id > 0) {
+		return true
+	}
+	else{
+		return false
 	}
 }
 export let getImageColor = async (canvasID, imgID, imgSrc) => {
@@ -233,13 +222,13 @@ export let getImageColor = async (canvasID, imgID, imgSrc) => {
 
 	await new Promise(resolve => {
 		uni.createSelectorQuery().select("#" + imgID).boundingClientRect(res => {
-			imgWidth = res?.width??100;
-			imgHeight = res?.height??100;
+			imgWidth = res?.width ?? 100;
+			imgHeight = res?.height ?? 100;
 			resolve()
 		}).exec()
 	})
 	canvas.fillRect(0, 0, imgWidth, imgHeight)
-	let base64Img= await netUrlTobase64(imgSrc)
+	let base64Img = await netUrlTobase64(imgSrc)
 	canvas.drawImage(base64Img, 0, 0, imgWidth, imgHeight)
 	res = await new Promise((resolve, reject) => {
 		canvas.draw(true, (e) => {
@@ -298,22 +287,22 @@ export let getImageColor = async (canvasID, imgID, imgSrc) => {
 	return res
 }
 // 网络图片转base64
-export let netUrlTobase64= async (url,suc)=> {
-	let toBase64Url="";
-	let newUrl=url
+export let netUrlTobase64 = async (url, suc) => {
+	let toBase64Url = "";
+	let newUrl = url
 	let flag = url.indexOf('https')
-	if(flag==-1){
-		newUrl=url.replace(/http/,'https')
+	if (flag == -1) {
+		newUrl = url.replace(/http/, 'https')
 	}
-	toBase64Url= await new Promise(resolve => {
+	toBase64Url = await new Promise(resolve => {
 		uni.request({
 			url: newUrl,
 			method: 'GET',
 			responseType: 'arraybuffer',
 			success(res) {
 				const base64 = wx.arrayBufferToBase64(res.data); //把arraybuffer转成base64
-				const conType =res.header['Content-Type']
-				toBase64Url = 'data:'+conType+';base64,' + base64; 
+				const conType = res.header['Content-Type']
+				toBase64Url = 'data:' + conType + ';base64,' + base64;
 				resolve(toBase64Url)
 			}
 		});