no message

src/components/index/workSituation/examList.vue

@@ -359,7 +359,7 @@
 		position: absolute;
 		top: 0;
 		height: 100%;
-		right: -96rpx;
+		right: -111rpx;
 		width:232px;
 		-webkit-transform: translate3d(100%, 0, 0);
 		transform: translate3d(100%, 0, 0);

src/components/signOut.vue

@@ -37,10 +37,11 @@
                 content: '将退出登录,是否继续',
                 success: function(res) {
                     if (res.confirm) {
+                      uni.removeStorageSync('userInfo') 
                         uni.reLaunch({
                             url: '/pages/login/accountLogin'
                         });
-                        uni.removeStorageSync('userInfo') 
+                        
                     } else if (res.cancel) {
                         
                     }

src/pages/index/workSituation.vue

@@ -130,6 +130,11 @@
 				CourseName:''
 			});
 			data.userData=uni.getStorageSync("userInfo")
+			if(data.userData && data.userData.AccountType==2){
+				uni.redirectTo({
+					url:'/pages/index/index'
+				})
+			}
 			let methods = {
 				changePopStatusHandler(status){
 					data.showPopu=status==1
@@ -153,7 +158,8 @@
 					})
 				},
 				changeCourseHandler(id,name){
-					data.Msg.courseId=id
+					data.Msg.CourseId=id
+					data.Msg.ExamName = name
 					data.OperationMsg.courseId=id
 					data.currentCourseId=id
 					data.CourseName = name
@@ -203,30 +209,32 @@
 				},
 				//获取考试信息列表
 				getExamPageList(){
-					data.pageState = "loading";
-					uni.showLoading()
-					proxy.$request("/Exam/GetExamPageList", data.Msg).then(res => {
-						if(res){
-							uni.hideLoading()
-							data.titleList.forEach(item => {
-								if(item.name=='考试信息'){
-									item.num = res.Data.RowsCount
+					if(data.Msg.CourseId){
+						data.pageState = "loading";
+						uni.showLoading()
+						proxy.$request("/Exam/GetExamPageList", data.Msg).then(res => {
+							if(res){
+								uni.hideLoading()
+								data.titleList.forEach(item => {
+									if(item.name=='考试信息'){
+										item.num = res.Data.RowsCount
+									}
+								});
+								if (data.timer) data.timer = null;
+								if (data.Msg.PageIndex === 1) {
+									data.exams = res.Data.PageData;
+								} else {
+									data.exams = [...res.Data.PageData, ...data.exams];
+								}
+								data.pageCount = res.Data.PageCount;
+								if (data.Msg.PageIndex >= res.Data.PageCount) {
+									data.pageState = "none";
+								} else {
+									data.pageState = "more";
 								}
-							});
-							if (data.timer) data.timer = null;
-							if (data.Msg.PageIndex === 1) {
-								data.exams = res.Data.PageData;
-							} else {
-								data.exams = [...res.Data.PageData, ...data.exams];
-							}
-							data.pageCount = res.Data.PageCount;
-							if (data.Msg.PageIndex >= res.Data.PageCount) {
-								data.pageState = "none";
-							} else {
-								data.pageState = "more";
 							}
-						}
-					})
+						})
+					}
 				},
 				lower(e) {
 					if (data.Msg.PageIndex < data.pageCount) {

src/pages/login/login.vue

@@ -35,7 +35,7 @@
 
 			let methods = {
 				login() {
-					uni.reLaunch({
+					uni.navigateTo({
 							url: '/pages/login/accountLogin' 
 					});
 				},