修复bug

components/course/courseChapter.vue

@@ -105,6 +105,7 @@ export default {
 		 * 去做题
 		 */
 		async toDo(id,goodsId =0,moduleId = 0, chapterId = 0,item,index) {
+			this.$emit('toDo',index)
 			if(this.learningOrder == 1) {
 				if(this.canLearn) {
 					

components/course/courseModule.vue

@@ -7,7 +7,7 @@
 		</view>
 		<view v-if="!down">
 			<view v-for="(itemM,indexM) in list" >
-				<courseChapter :courseId="courseId" :learningOrder="learningOrder" :goodsId="goodsId" :isBuy="isBuy" :gradeId="gradeId" :isRebuild="isRebuild"  :menuItem="itemM" :levelId="levelId+'-'+itemM.chapterId"></courseChapter>
+				<courseChapter @toDo="toDo($event)" :courseId="courseId" :learningOrder="learningOrder" :goodsId="goodsId" :isBuy="isBuy" :gradeId="gradeId" :isRebuild="isRebuild"  :menuItem="itemM" :levelId="levelId+'-'+itemM.chapterId"></courseChapter>
 				<u-line v-if="indexM<list.length-1"></u-line>
 			</view>
 		</view>
@@ -69,6 +69,9 @@ export default {
 		
 	},
 	methods: {
+		toDo(index) {
+			this.$emit('toDo',index)
+		},
 		openModule(item){
 			this.down = !this.down
 			if(!this.down&&this.list.length==0){

pages/course/index.vue

@@ -48,7 +48,7 @@
 							<view style="display: flex;justify-content: space-between;margin-top: 13rpx;">
 								<view class="noteTag"><image src="/static/icon/wk_icon1.png" class="wk_icon"></image>
 								共 <text class="blackFont">{{item.subjectNum}}</text> 
-								<text class="margin30">科</text>
+								<text class="margin30">课程</text>
 								<text class="blackFont">{{item.classHours}}</text> 学时</view>
 								<view class="priceTag">¥ {{item.standPrice.toFixed(2)}}</view>
 							</view>

pages/index/index.vue

@@ -101,7 +101,7 @@
 								{{item.classHours}}
 								<text>学时</text>
 							</view>
-							<view class="right">¥ {{item.standPrice}}</view>
+							<view class="right">¥ {{toFixed(item.standPrice)}}</view>
 						</view>
 					</view>
 					
@@ -120,7 +120,7 @@
 								{{item.classHours}}
 								<text>学时</text>
 							</view>
-							<view class="right">¥ {{item.standPrice}}</view>
+							<view class="right">¥ {{toFixed(item.standPrice)}}</view>
 						</view>
 					</view>
 					
@@ -215,6 +215,13 @@ export default {
 		};
 	},
 	methods: {
+		toFixed(number) {
+			if(number > 0) {
+				return number.toFixed(2)
+			} else {
+				return '0.00'
+			}
+		},
 		/**
 		 * banner图片加载完成
 		 */

pages2/bank/questionBank.vue

@@ -863,10 +863,12 @@ export default {
 						doQuestionIds.push(item.questionId)
 					}
 				} else if (item.type == 4) {
+					allScore += item.score;
 					if (item.ques && item.ques.length) {
 						doQuestionNum++;
 					}
 				} else if (item.type == 5) {
+					allScore += item.score;
 					if (item.ques) {
 						doQuestionNum++;
 					}
@@ -1560,10 +1562,12 @@ export default {
 						doQuestionIds.push(item.questionId)
 					}
 				} else if (item.type == 4) {
+					allScore += item.score;
 					if (item.ques && item.ques.length) {
 						doQuestionNum++;
 					}
 				} else if (item.type == 5) {
+					allScore += item.score;
 					if (item.ques) {
 						doQuestionNum++;
 					}

pages2/bank/questionBankContinue.vue

@@ -868,10 +868,12 @@ export default {
 						doQuestionIds.push(item.questionId)
 					}
 				} else if (item.type == 4) {
+					allScore += item.score;
 					if (item.ques && item.ques.length) {
 						doQuestionNum++;
 					}
 				} else if (item.type == 5) {
+					allScore += item.score;
 					if (item.ques) {
 						doQuestionNum++;
 					}

pages2/bank/question_report.vue

@@ -71,7 +71,7 @@
 						<canvas canvas-id="Canvas2"></canvas>
 					</view>
 					
-					<view class="item" v-show="reportdata.score">
+					<view class="item" v-show="reportdata.score != -1">
 						<view class="title">试卷得分
 							<text>（含简答和案例题）</text>
 						</view>
@@ -183,7 +183,7 @@ export default {
 							context2.draw();
 						}
 						
-						if(this.reportdata.score) {
+						if(this.reportdata.score != -1) {
 							var context3 = uni.createCanvasContext('Canvas3');
 							this.context3 = context3;
 							context3.setStrokeStyle('#EEEEEE');

pages2/class/questionBank.vue

@@ -1045,6 +1045,8 @@ export default {
 						item.scoreResult = 0;
 					}
 					allScore += item.score;
+				} else {
+					allScore += item.score;
 				}
 			});
 
@@ -1643,10 +1645,12 @@ export default {
 						doQuestionIds.push(item.questionId)
 					}
 				} else if (item.type == 4) {
+					allScore += item.score;
 					if (item.ques && item.ques.length) {
 						doQuestionNum++;
 					}
 				} else if (item.type == 5) {
+					allScore += item.score;
 					if (item.ques) {
 						doQuestionNum++;
 					}

pages2/learn/my_learn.vue

@@ -27,7 +27,6 @@
 										: ''
 								}}
 							</text>
-							\n
 							<view v-if="item.periodStatus === 3" style="font-size: 24rpx;color:#666;">
 								有
 								<text style="color:#FF3B30;">{{ item.rebuild }}节</text>
@@ -52,25 +51,25 @@
 					<view v-if="item.periodStatus !== 2">
 						<u-line color="#EEEEEE" />
 						<view v-if="item.periodStatus === -1">
-							<view class="btnBox"><view class="btn" @click="jumpPage(item, 1)">课程学习</view></view>
+							<view class="btnBox"><view class="btn" @click="jumpPage(item, 1,index)">课程学习</view></view>
 						</view>
 						<view>
 							<view v-if="item.periodStatus === 1 && item.applyStatus === 1">
 								<view class="subTitle">{{ item.applyName }}</view>
-								<view class="btnBox"><view class="btn" @click="jumpPage(item, 2)">预约考试</view></view>
+								<view class="btnBox"><view class="btn" @click="jumpPage(item, 2,index)">预约考试</view></view>
 							</view>
 							<u-line color="#EEEEEE" v-if="item.periodStatus === 1 && item.applyStatus === 1" />
 							<view v-if="item.periodStatus === 1 && item.beforeStatus === 1">
 								<view class="subTitle">{{ item.beforeName }}</view>
-								<view class="btnBox"><view class="btn" @click="jumpPage(item, 3)">进入刷题</view></view>
+								<view class="btnBox"><view class="btn" @click="jumpPage(item, 3,index)">进入刷题</view></view>
 							</view>
 						</view>
 
 						<view v-if="item.periodStatus === 3 && item.rebuildStatus === 0">
-							<view class="btnBox"><view class="btn" @click="jumpPage(item, 4)">查看详情</view></view>
+							<view class="btnBox"><view class="btn" @click="jumpPage(item, 4,index)">查看详情</view></view>
 						</view>
 						<view v-if="item.periodStatus === 3 && item.rebuildStatus === 1">
-							<view class="btnBox"><view class="btn" @click="jumpPage(item, 5)">重修目录</view></view>
+							<view class="btnBox"><view class="btn" @click="jumpPage(item, 5,index)">重修目录</view></view>
 						</view>
 					</view>
 				</view>
@@ -108,14 +107,42 @@ export default {
 					name: '学习凭证'
 				}
 			],
+			param:{
+				pageNum:1,
+				pageSize:10
+			},
+			total:0,
+			itemIndex:'',
 			listData: []
 		};
 	},
-	onLoad(option) {},
+	onLoad(option) {
+		this.getcourseperiodlistGoods();
+	},
 	onShow() {
-		this.getInfos();
+		if(this.itemIndex !== '') {
+			this.refreshByIndex();
+		}
+	},
+	onReachBottom() {
+		console.log(111)
+		if(this.listData.length < this.total) {
+			this.param.pageNum++;
+			this.getcourseperiodlistGoods();
+			
+		}
 	},
 	methods: {
+		refreshByIndex() {
+			this.$api.getcourseperiodlistGoods({
+				pageNum:this.itemIndex + 1,
+				pageSize:1
+			}).then(res => {
+				if (res.data.code === 200) {
+					this.$set(this.listData,this.itemIndex,res.data.rows[0])
+				}
+			});
+		},
 		copyText() {
 			uni.setClipboardData({
 				data: 'http://gdzczx.gdcic.net/',
@@ -128,7 +155,8 @@ export default {
 				}
 			});
 		},
-		jumpPage(v, int) {
+		jumpPage(v, int,index) {
+			this.itemIndex = index;
 			//int 1.课程学习 2.预约考试 3.进入刷题 4.查看详情 5.重修目录
 			if (int === 1) {
 				this.$navTo.togo(`/pages2/wd/course?id=${v.goodsId}&gid=${v.gradeId}`);
@@ -146,10 +174,11 @@ export default {
 				this.$navTo.togo(`/pages2/wd/course?id=${v.goodsId}&gid=${v.gradeId}`);
 			}
 		},
-		getInfos() {
-			this.$api.getcourseperiodlistGoods().then(res => {
+		getcourseperiodlistGoods() {
+			this.$api.getcourseperiodlistGoods(this.param).then(res => {
 				if (res.data.code === 200) {
-					this.listData = res.data.rows;
+					this.listData = [...this.listData,...res.data.rows];
+					this.total = res.data.total;
 				}
 			});
 		},
@@ -210,7 +239,6 @@ export default {
 			});
 		}
 	},
-	onReachBottom() {},
 	computed: { ...mapGetters(['userInfo']) }
 };
 </script>

pages2/order/index.vue

@@ -3,12 +3,10 @@
 		<view style="width: 100%;text-align: center;position: fixed;height: 96rpx;z-index: 999;">
 			<u-tabs :list="list" sticky :current="current" @change="change" active-color="#007AFF"></u-tabs>
 		</view>
-		<view style="padding: 96rpx 8rpx 8rpx;">
+		<view style="padding: 96rpx 8rpx 96rpx;">
 			<view v-if="!order.length" class="noData">您暂无相关订单哦~</view>
 			<template v-else>
-				<navigator url="/pages2/invoice/index">
-					<u-button type="primary" size="medium" style="margin:8rpx;">发票申请</u-button>
-				</navigator>
+				
 				
 				<view v-for="(item, index) in order" :key="index" class="lisChild">
 					<view class="item">
@@ -50,6 +48,11 @@
 				</view>
 			</template>
 			
+
+			<template v-if="current == 1 && order.length">
+				<view class="apply-invoice" @click="goInvoice">发票申请</view>
+			</template>
+			
 		</view>
 	</view>
 </template>
@@ -107,39 +110,56 @@ export default {
 		this.getFY();
 	},
 	methods: {
+		/**
+		 * 跳转发票申请页面
+		 */
+		goInvoice() {
+			uni.navigateTo({
+				url:`/pages2/invoice/index`
+			})
+		},
 		refund(orderSn,goodsId){
-			let self = this
-			this.$api.refundSmallOrder({orderSn:orderSn,goodsId:goodsId}).then(res => {
-				if(res.data.code==200){
-					if (res.data.code === 200) {
-						self.$method.showToast('退款成功');
-						self.getOrderList();
+			uni.showModal({
+				title:'提示',
+				content:'确定要退款吗',
+				success:(res) => {
+					if(res.confirm) {
+						let self = this
+						this.$api.refundSmallOrder({orderSn:orderSn,goodsId:goodsId}).then(res => {
+							if(res.data.code==200){
+								if (res.data.code === 200) {
+									self.$method.showToast('退款成功');
+									self.getOrderList();
+								}
+							} else {
+								uni.showToast({
+									icon:'none',
+									title:'不可以退款哦'
+								})
+							}
+						});
 					}
-				} else {
-					uni.showToast({
-						icon:'none',
-						title:'不可以退款哦'
-					})
 				}
-			});
+			})
+			
 		},
 		/**
 		 * 跳转课程
 		 */
 		goCourse(item,orderStatus) {
-			if(orderStatus == 1 || orderStatus == 2) {
-				console.log(item)
-				if(item.goodsType == 1) { //网课
-					uni.navigateTo({
-						url:'/pages2/wd/course?gid='+item.gradeId+'&id='+item.goodsId
-					})
-				} else if(item.goodsType == 2) { //题库
-					uni.navigateTo({
-						url:'/pages2/bank/question_detail?id='+item.goodsId
-					})
-				}
+			// if(orderStatus == 1 || orderStatus == 2) {
+			// 	console.log(item)
+			// 	if(item.goodsType == 1) { //网课
+			// 		uni.navigateTo({
+			// 			url:'/pages2/wd/course?gid='+item.gradeId+'&id='+item.goodsId
+			// 		})
+			// 	} else if(item.goodsType == 2) { //题库
+			// 		uni.navigateTo({
+			// 			url:'/pages2/bank/question_detail?id='+item.goodsId
+			// 		})
+			// 	}
 				
-			}
+			// }
 		},
 		resumeOrder(item){
 			let self = this
@@ -421,6 +441,23 @@ page {
 	margin: 160rpx 0;
 }
 
+.apply-invoice {
+	z-index: 100;
+	position:fixed;
+	left:0;
+	right:0;
+	bottom:40rpx;
+	margin:0 auto;
+	width: 526rpx;
+	height: 80rpx;
+	text-align: center;
+	line-height: 80rpx;
+	color:#fff;
+	background: #007AFF;
+	box-shadow: 0rpx 8rpx 7rpx 1rpx rgba(0, 122, 255, 0.1);
+	border-radius: 40rpx;
+}
+
 
 .bottomBox {
 	position: fixed;

pages2/verify/input.vue

@@ -699,7 +699,6 @@ export default {
 			this.resultForm(1);
 		},
 		async changePhotoListHeader1(lists, name) {
-			console.log(lists[0].url);
 			if (lists.length) {
 				this.fileList1 = lists;
 				if (lists[0].url.indexOf('//tmp') !== -1 || lists[0].url.indexOf('//temp') !== -1) {

pages2/wd/class.vue

@@ -2,7 +2,7 @@
 	<view style="padding: 30rpx;">
 		<view class="class" v-for="(item, index) in goodsList" :key="index">
 			
-				<view class="class_item" @click.stop="studyIn(item.goodsId,item.gradeId,item)">
+				<view class="class_item" @click.stop="studyIn(item.goodsId,item.gradeId,item,index)">
 						<image :src="$method.splitImgHost(item.coverUrl, true)" class="class_img"></image>
 						<view class="class_text">
 							<view class="class_title">{{ item.goodsName }}</view>
@@ -23,7 +23,7 @@
 							</view>
 						</view>
 						
-						
+						<!-- 不在学习有效期 -->
 						<template v-if="sysTime < item.validityStartTime || sysTime > item.validityEndTime">
 							<view class="class-warm" v-if="item.gradeId != 0 && item.gradeStatus == 1">
 								<view class="class-warm__text">
@@ -57,19 +57,19 @@
 								</view>
 							</template>
 							
-							<!-- 在班级有效期之间 -->
+							<!-- 在班级有效期之间或者没有班级有效期 -->
 							<template v-else>
 								
 								<!-- 学时审核状态不可审核 -->
 								<template v-if="item.periodStatus == -1">
-									<view class="class-warm" v-if="item.gradeId != 0 && item.gradeStatus == 1">
+									<view class="class-warm" v-if="item.gradeId != 0 && item.gradeStatus == 1 && item.classStatus != null">
 										<view class="class-warm__text">
 											<view class="date">
 												班级状态：
-												<text v-if="item.learningStatus == 1 || (item.learningStatus == 3 && item.learningTimeStart < sysTime)">已开班</text>
-												<text v-if="item.learningStatus == 2">未开班</text>
+												<text v-if="item.classStatus == 1">已开班</text>
+												<text v-if="item.classStatus == 0">未开班</text>
 											</view>
-											<view class="state" v-if="item.learningStatus == 2">教务处正在为您开通班级，请耐心等待</view>
+											<view class="state" v-if="item.classStatus == 0">教务处正在为您开通班级，请耐心等待</view>
 										</view>
 									</view>
 									
@@ -93,7 +93,8 @@
 										<view class="class-warm__text">
 											<view class="date">
 												资料审核状态：
-												<text v-if="item.profileStatus == 1">已通过</text>
+												<text v-if="item.profileStatus == null">未提交资料</text>
+												<text v-else-if="item.profileStatus == 1">已通过</text>
 												<text v-else-if="item.profileStatus == 2">审核中</text>
 												<text v-else-if="item.profileStatus == 3">待完善</text>
 											</view>
@@ -113,7 +114,7 @@
 										</view>
 									</view>
 									
-									<view class="class-warm" v-if="item.periodStatus == 1">
+									<view class="class-warm" v-if="item.applyStatus == 1 && item.periodStatus == 1">
 										<view class="class-warm__text">
 											<view class="date">
 												<text v-if="item.subExamStatus === null">待预约考试</text>
@@ -135,11 +136,6 @@
 							</template>
 							
 							
-							
-							
-							
-							
-							
 						</template>
 						
 						
@@ -147,7 +143,7 @@
 			
 			
 			<view class="bottomBox">
-				<template v-if="item.gradeStatus == 1 && item.status == 1 && (item.studyEndTime > sysTime) &&  (item.classEndTime && (item.classEndTime < sysTime)) && (item.periodStatus == 0 || item.periodStatus == -1) && item.studyCount > 0">
+				<template v-if="item.gradeStatus == 1 && item.status == 1 && (item.studyEndTime > sysTime) && (item.studyStartTime < sysTime) &&  (item.classEndTime && (item.classEndTime < sysTime)) && (item.periodStatus == 0 || item.periodStatus == -1) && item.studyCount > 0">
 					<view class="restart" @click.stop="selectClass(item)">
 						选班重学
 					</view>
@@ -161,7 +157,7 @@
 					<view class="box_progress">
 						<view style="width: 60%;"><u-line-progress :showText="false" height="22" active-color="#ff9900" :show-percent="false" :percent="(item.stuAllNum / item.secAllNum) * 100"></u-line-progress></view>
 						
-						<view><u-button :class="{disabled:sysTime <= item.validityStartTime || sysTime >= item.validityEndTime || (item.classStartTime && sysTime <= item.classStartTime) || (item.classEndTime && sysTime >= item.classEndTime) || item.learningStatus == 2}" type="warning" size="mini" @click.stop="studyIn(item.goodsId,item.gradeId,item)">进入学习</u-button></view>
+						<view><u-button :class="{disabled:sysTime <= item.validityStartTime || sysTime >= item.validityEndTime || (item.classStartTime && sysTime <= item.classStartTime) || (item.classEndTime && sysTime >= item.classEndTime) || item.learningStatus == 2 || item.classStatus == 0 || (item.learningStatus == 3 && sysTime < item.learningTimeStart)}" type="warning" size="mini" @click.stop="studyIn(item.goodsId,item.gradeId,item,index)">进入学习</u-button></view>
 					</view>
 					<view class="box_progress" v-if="item.applyStatus === 1">
 						<view style="width: 60%;">
@@ -244,6 +240,7 @@ export default {
 			},
 			total: 0,
 			sysTime:0,
+			itemIndex:'',
 			selectItem:{}
 		};
 	},
@@ -251,6 +248,9 @@ export default {
 		this.courseGoodsList();
 	},
 	onShow() {
+		if(this.itemIndex !== '') {
+			this.refreshByIndex();
+		}
 		this.commonSystemTime()
 	},
 	onReachBottom() {
@@ -260,6 +260,20 @@ export default {
 		}
 	},
 	methods: {
+		/**
+		 * 返回刷新之前进入的课程数据
+		 */
+		refreshByIndex() {
+			let self = this;
+			this.$api.courseGoodsList({
+				pageNum: this.itemIndex+1,
+				pageSize: 1
+			}).then(res => {
+				if (res.data.code == 200) {
+					this.$set(this.goodsList,this.itemIndex,res.data.rows[0])
+				}
+			});
+		},
 		commonSystemTime() {
 			this.$api.commonSystemTime().then(res => {
 				this.sysTime = res.data.data;
@@ -327,28 +341,54 @@ export default {
 				}
 			});
 		},
-		async studyIn(v,i,item) {
-			if(this.sysTime <= item.validityStartTime || this.sysTime >= item.validityEndTime || (item.classStartTime && this.sysTime <= item.classStartTime) || (item.classEndTime && this.sysTime >= item.classEndTime) ) {
+		async studyIn(v,i,item,index) {
+			if(this.sysTime <= item.validityStartTime || this.sysTime >= item.validityEndTime ) {
 				uni.showToast({
 					icon:'none',
-					title:'不在学习时间，不能进入学习'
+					title:'不在学习有效期，不能进入学习'
 				})
 				return;
 			}
 			
+			if( (item.classStartTime && this.sysTime <= item.classStartTime) || (item.classEndTime && this.sysTime >= item.classEndTime)) {
+				uni.showToast({
+					icon:'none',
+					title:'不在班级有效期，不能进入学习'
+				})
+				return
+			}
+			
 			if(item.learningStatus == 2) {
 				uni.showToast({
 					icon:'none',
-					title:'未开班'
+					title:'开放学习时间待定，不能进入学习'
+				})
+				return
+			}
+			
+			if(item.classStatus == 0) {
+				uni.showToast({
+					icon:'none',
+					title:'尚未开班,不能进入学习'
 				})
 				return 
 			}
 			
+			if(item.learningStatus == 3 && (this.sysTime < item.learningTimeStart)) {
+				uni.showToast({
+					icon:'none',
+					title:'不在开放学习时间,不能进入学习'
+				})
+				return ;
+			}
+			
 			if(item.gradeStatus == 1 && item.status == 1 && (item.studyEndTime > this.sysTime) &&  (item.classEndTime && (item.classEndTime < this.sysTime)) && (item.periodStatus == 0 || item.periodStatus == -1) && item.studyCount > 0) {
 				this.selectClass(item);
 				return ;
 			}
 			
+			this.itemIndex = index;
+			
 			let rebuildStatus = await this.courseGoodsRebuildStatus(item.goodsId)
 			
 			if(rebuildStatus == 0) {

pages2/wd/course.vue

@@ -63,6 +63,8 @@ export default {
 			this.$api.courseCourseList({
 				pageNum: this.itemIndex+1,
 				pageSize: 1,
+				goodsId:this.goodsId,
+				gradeId:this.gradeId
 			}).then(res => {
 				if (res.data.code == 200) {
 					this.$set(this.courseList,this.itemIndex,res.data.rows[0])

pages3/course/detail.vue

@@ -168,8 +168,10 @@ export default {
 			})
 		},
 		toFixed(number) {
-			if(number) {
+			if(number > 0) {
 				return number.toFixed(2)
+			} else {
+				return '0.00'
 			}
 		},
 		onStateChange(newstate, oldstate) {

pages3/polyv/detail.vue

@@ -55,9 +55,9 @@
 			<view v-show="current == 0">
 				<view class="menuBox" v-for="(item, index) in menuList" :key="index">
 					<!--模块 -->
-					<view v-if="item.type == 1"><courseModule :courseId="courseId" :goodsId="goodsId" :gradeId="gradeId" :isBuy="true" :menuItem="item" :levelId="item.menuId"></courseModule></view>
+					<view v-if="item.type == 1"><courseModule @toDo="toDo($event)" :courseId="courseId" :goodsId="goodsId" :gradeId="gradeId" :isBuy="true" :menuItem="item" :levelId="item.menuId"></courseModule></view>
 					<!--章 -->
-					<view v-if="item.type == 2"><courseChapter :courseId="courseId" :goodsId="goodsId" :gradeId="gradeId" :isBuy="true" :menuItem="item" :levelId="'0-' + item.menuId"></courseChapter></view>
+					<view v-if="item.type == 2"><courseChapter @toDo="toDo($event)" :courseId="courseId" :goodsId="goodsId" :gradeId="gradeId" :isBuy="true" :menuItem="item" :levelId="'0-' + item.menuId"></courseChapter></view>
 					<!--节 -->
 					<view v-if="item.type == 3"><courseSection :courseId="courseId" :goodsId="goodsId" :gradeId="gradeId" :isBuy="true" :menuItem="item" :levelId="'0-0-' + item.menuId"></courseSection></view>
 				</view>
@@ -443,6 +443,9 @@ export default {
 		});
 	},
 	methods: {
+		toDo(index) {
+			console.log(index)
+		},
 		/**
 		 * 计算tabs宽度
 		 */