From 4f8b4bba111628b5b0faab6fa3a7086b059f134a Mon Sep 17 00:00:00 2001
From: "@fawn-nine" <1271023382@qq.com>
Date: Mon, 21 Oct 2024 13:58:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/orderCoupon.vue    | 24 +++++++++++++-----------
 pages/miniClass/classInfo.vue |  4 ++--
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/components/orderCoupon.vue b/components/orderCoupon.vue
index 2994f5b..171d822 100644
--- a/components/orderCoupon.vue
+++ b/components/orderCoupon.vue
@@ -4,8 +4,9 @@
 		<u-popup :show="youhuiShow" :round="10" @close="closePup">
 			<view class="tanchu">
 				<view class="dp_title">请选择优惠券</view>
-				<view  v-if="list.length > 0">
-					<view style="max-height: 40vh;overflow-y: scroll;" :class="youhuiIndex === index ? 'youhuiItem youItem_style' : 'youhuiItem'"
+				<template v-if="list.length > 0" >
+				<view  style="max-height:40vh;overflow-y: scroll;">
+					<view :class="youhuiIndex === index ? 'youhuiItem youItem_style' : 'youhuiItem'"
 						v-for="(item,index) in list" :key="index" @click="choseYouhui(index)">
 						<view style="width: 25%;color:#fd6004;text-align: center;">
 							<text>￥</text>
@@ -41,17 +42,18 @@
 							</template>
 						</view>
 						<br clear="both">
-					</view>
-					<view class="btnBox flex_box flex_between">
-						<view class="" style="width: 48%;">
-							<button type="default" @click="confirmCoupon('none')">不使用优惠券</button>
-						</view>
-						<view class="" style="width: 48%;">
-							<button type="primary" @click="confirmCoupon()">选好了</button>
-						</view>
-					</view>
+					</view>					
 					<!-- <view style="font-size: 20rpx;color: #aaa;margin-top: 30rpx;">* 每笔订单只能使用一张优惠价</view> -->
 				</view>
+				<view class="btnBox flex_box flex_between">
+										<view class="" style="width: 48%;">
+											<button type="default" @click="confirmCoupon('none')">不使用优惠券</button>
+										</view>
+										<view class="" style="width: 48%;">
+											<button type="primary" @click="confirmCoupon()">选好了</button>
+										</view>
+									</view>
+				</template>
 				<view class="" v-else>
 					<u-divider text="暂无可用优惠券哦"></u-divider>
 				</view>
diff --git a/pages/miniClass/classInfo.vue b/pages/miniClass/classInfo.vue
index 48d236d..d91929c 100644
--- a/pages/miniClass/classInfo.vue
+++ b/pages/miniClass/classInfo.vue
@@ -343,7 +343,7 @@
 												</template>
 												<template 
 													v-if="!item.reply && thisClass.state == '1'">
-													<text class="no" v-if="index+1<=currentStudyNumber">未提交答案 点击开始答题</text>
+													<text class="no" v-if="index+1 <= currentStudyNumber || currentStudyNumber == 0">未提交答案 点击开始答题</text>
 													<text class="no" v-else style="color: #a0a1a7;">暂未开始学习</text>
 												</template>
 												<template 
@@ -1491,7 +1491,7 @@
 					})
 					return
 				}
-				if(index+1<=this.currentStudyNumber){
+				if(index+1<=this.currentStudyNumber || this.currentStudyNumber == 0){
 uni.navigateTo({
 					url: `/pages/miniClass/taskDetail?id=${item.id}&classState=${this.thisClass.state}`
 				})