Merge branch 'master' of http://gitlab.oytour.com/xiangwei/educationstu into master

src/pages/study/components/indexNo.vue

@@ -90,7 +90,7 @@
 						<view style="margin-left: 17px;"> 
 							<view style="font-size: 13px;font-family: PingFang SC;font-weight: bold;color: #111111;">暂无课程</view>
 							<view style="font-size: 10px;font-family: PingFang SC;font-weight: 400;color: #888888;margin-top: 10px;">购买课程后可回顾</view>
-							<view class="lijigoumai row">立即购课</view>
+							<!-- <view class="lijigoumai row">立即购课</view> -->
 						
 						</view>
 						<view>
@@ -106,7 +106,7 @@
 			<view class="reviewcenter" >
 				<view style="font-size: 13px;font-family: PingFang SC;font-weight: bold;color: #111111;">暂无课程</view>
 				<view style="font-size: 10px;font-family: PingFang SC;font-weight: 400;color: #888888;margin-top: 10px;">购买课程后可回顾</view>
-				<view class="lijigoumai2 row">了解课程</view>
+				<!-- <view class="lijigoumai2 row">了解课程</view> -->
 			</view>
 		</view>
 		<view style="margin-left: 18px;font-size: 14px;font-family: PingFang SC;font-weight: 400;color: #666666;margin-top: 30px;">

src/pages/study/index.vue

@@ -140,7 +140,7 @@
 	}
 	.examination-boxb{
 		width: 200rpx;
-		height: 100%;
+		/* height: 100%; */
 		display: inline-block;
 		padding: 10px 0;
 		box-sizing: border-box;
@@ -180,6 +180,7 @@
 			color: #A3A3A3;
 			font-size: 19px;
 			font-weight: bold;
+			margin:16rpx 0;
 	}
 
 	.examination-box-btnbox{
@@ -247,8 +248,7 @@
 						<view class="row" style="justify-content: space-between;">
 							<view class="row" style="color: #111111;font-size: 14px;font-weight: bold;">
 								<view >单词积分 </view>
-								<view style="margin-left: 5px;">80 </view>
-								<image style="width: 17px;height: 16px;margin:-2px 0 0 10px;" src="../../static/image/xingxing.png"></image>
+								<view style="margin-left: 5px;">{{InfoData.TotalScore}}</view>
 							</view>
 							<view style="font-size: 11px;color: #4C50E7;" @click="gourl()">所有单词</view>
 						</view>
@@ -269,8 +269,8 @@
 							</view>
 						</view>
 						<view class="box_tb_b">
-							<view style="font-size: 11px;color: #999999;">预计用时10分钟</view>
-							<view class="btn">立即学习</view>
+							<view style="font-size: 11px;color: #999999;visibility: hidden;">预计用时10分钟</view>
+							<view class="btn" @click="jumpStudyPage()">立即学习</view>
 						</view>
 					</view>
 				</view>
@@ -458,6 +458,7 @@
 				CourseInfoMsg:{
 					ClassId:0,
 					GuestId:0,
+					CourseId:0
 				},
 				InfoData:null,
 				current:0,
@@ -473,6 +474,7 @@
 							if(data.CourseList.length>0){
 								data.CourseInfoMsg.ClassId = data.CourseList[0].ClassId;
 								data.CourseInfoMsg.GuestId = data.CourseList[0].GuestId;
+								data.CourseInfoMsg.CourseId = data.CourseList[0].CourseId;
 								that.getCourseInfo()
 							}
 						}
@@ -572,6 +574,12 @@
 				    url: url,
 				  });
 				},
+				jumpStudyPage(){
+					let url = `/pages/word/word?CourseId=${data.InfoData.Words.CourseId}&&ChapterId=${data.InfoData.Words.NextCourseNo}&&ReviewChapterId=${data.InfoData.Words.ReviewCourseNo}`
+					uni.navigateTo({
+					  url: url
+					});
+				},
 				gourlkaoshixq(item){
 					let indexData = uni.getStorageSync("indexData")
 					//ExamStatus 1未开始 2已开始 3已考试 4缺考 5已阅卷

src/pages/word/word.vue

@@ -61,8 +61,13 @@
 				getData() {
 					proxy.$request('/AppletWords/GetStudyWords', data.msg).then(res => {
 						data.StudyList = res.Data.StudyList
-						data.ReviewList = res.Data.ReviewList
-						data.current=res.Data.StartIndex
+						data.ReviewList = res.Data.ReviewList;
+						const total = data.StudyList.length + data.ReviewList.length;
+						if(res.Data.StartIndex>total||res.Data.StartIndex==total){
+						   data.current = 0
+						}else{
+						   data.current = res.Data.StartIndex;
+						}
 					})
 				},
 				swiperChange(val) {