Merge branch 'master' of https://gitee.com/he2802/saas_applet

common/httpList/order.js

@@ -39,5 +39,12 @@ export default {
 			method: 'post',
 			data: data
 		})
+	},
+	refundSmallOrder(data) {
+		return myRequest({
+			url: '/order/refund',
+			method: 'post',
+			data: data
+		})
 	}
 }

components/course/courseChapter.vue

@@ -18,7 +18,11 @@
 							<view class="eTag">{{itemM.doType==1?'练习':'考试'}}</view>
 							<view style="margin-left: 15rpx;">{{itemM.name}}</view>
 						</view>
-						<view v-if="itemM.learning==1" class="tagGreen">已做完</view>
+						<view v-if="isRebuild||itemM.rebuild>0" class="tagRe">待重修</view>
+						<view v-else>
+							<view v-if="itemM.learning==1" class="tagGreen">已做完</view>
+						</view>
+						
 					</view>
 				</view>
 			</view>
@@ -172,6 +176,16 @@ export default {
 </script>
 
 <style scoped>
+
+	.tagRe{
+		width: 80rpx;
+		height: 28rpx;
+		background: #FF3B30;
+		border-radius: 8rpx;
+		font-size: 20rpx;
+		color: #FFFFFF;
+		text-align: center;
+	}
 	.tagGreen{
 		width: 80rpx;
 		height: 28rpx;

pages/course/index.vue

@@ -47,8 +47,10 @@
 							</view>
 							<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="blackFont">{{item.classHours}}</text> 学时</view>
-								<view class="priceTag">¥ {{item.standPrice}}</view>
+								共 <text class="blackFont">{{item.subjectNum}}</text> 
+								<text class="margin30">科</text>
+								<text class="blackFont">{{item.classHours}}</text> 学时</view>
+								<view class="priceTag">¥ {{item.standPrice.toFixed(2)}}</view>
 							</view>
 						</view>
 					</navigator>
@@ -66,8 +68,10 @@
 							</view>
 							<view style="display: flex;justify-content: space-between;margin-top: 13rpx;" v-if="false">
 								<view class="noteTag"><image src="/static/icon/wk_icon1.png" class="wk_icon"></image>
-								共 <text class="blackFont">6</text> 张卷 <text class="blackFont">120</text>道题  </view>
-								<view class="priceTag">¥ {{item.standPrice}}</view>
+								共 <text class="blackFont">6</text> 
+								<view class="margin30">张卷</view>
+								<text class="blackFont">120</text>道题  </view>
+								<view class="priceTag">¥ {{item.standPrice.toFixed(2)}}</view>
 							</view>
 						</view>
 					</navigator>
@@ -322,13 +326,16 @@ export default {
 		color: #FFFFFF;
 	}
 	.tylszB{
+		text-align: center;
 		padding:20rpx 10rpx;
 		background: #FFFFFF;
 		border: 2rpx solid #EEEEEE;
 		border-radius: 16rpx;
 		margin-top: 15rpx;
 		font-size: 30rpx;
-		white-space: nowrap; 
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
 	}
 	.activeStys{
 		background: linear-gradient(90deg, rgba(1,94,234,0.2),rgba(255,255,255,.6));
@@ -337,11 +344,9 @@ export default {
 		color: #007AFF!important;
 	}
 	.tylsz{
-		height: 66rpx;
-		line-height: 66rpx;
 		color: #666;
 		font-size: 30rpx;
-		padding:0 30rpx;
+		padding:20rpx 10rpx;
 		margin-top: 15rpx;
 		white-space: nowrap;
 	}
@@ -406,7 +411,10 @@ export default {
 	}
 	.blackFont{
 		color: #333333;
-		margin: 0 4rpx;
+		margin: 0 10rpx;
+	}
+	.margin30 {
+		margin:0 20rpx 0 0;
 	}
 	.wk_icon{
 		width: 24rpx;
@@ -448,12 +456,12 @@ export default {
 		box-shadow: 0rpx 10rpx 9rpx 1rpx rgba(165, 196, 239, 0.1);
 		border-radius: 24rpx;
 		width: 100%;
-		padding: 20rpx;
-		margin-bottom: 20rpx;
+		padding: 24rpx;
+		margin-bottom: 24rpx;
 	}
 	.listBox{
 		background-color: #EAEEF1;
-		padding: 30rpx;
+		padding: 24rpx;
 		position: relative;
 		top: 235rpx;
 	}
@@ -482,6 +490,6 @@ export default {
 		border-radius: 16rpx;
 		padding: 3rpx 8rpx;
 		margin-top: 11rpx;
-		color: #666666;
+		color:#666666;
 	}
 </style>

pages/shopping/shoppingCart.vue

@@ -8,20 +8,21 @@
 			<view v-else>
 				<view style="padding: 30rpx;padding-bottom: 98rpx;">
 					<uni-swipe-action>
-						<u-checkbox-group @change="checkboxGroupChange" placement="column">
+						<u-checkbox-group @change="checkboxGroupChange" placement="column" >
 							<view>
 								<uni-swipe-action-item :autoClose="false" @change="swipeChange($event, item)" :show="item.show" v-for="(item, index) in list" :key="index">
 									<view class="item">
 										<view style="width: 100%;">
-											<view style="display: flex;padding-bottom: 15rpx;">
-												<view style="display: flex;align-items:center;">
-													<u-checkbox @change="checkboxChange" v-model="list[index].checked" shape="circle" :name="index"></u-checkbox>
-												</view>
-												<view><image :src="$method.splitImgHost(item.coverUrl, true)" style="width: 278rpx;height: 134rpx;"></image></view>
-												<view style="margin-left: 20rpx;flex: 1;">
-													<view style="color: #333333;font-size: 30rpx;font-weight: bold;">{{ item.goodsName }}</view>
-													<view class="priceTag">¥ {{ item.standPrice }}</view>
-												</view>
+											<view style="display: flex;align-items:center;">
+												<u-checkbox @change="checkboxChange"  style="width: 100%;" v-model="list[index].checked" shape="circle" :name="index">
+													<view style="display: flex;padding-bottom: 15rpx;width:610rpx;">
+														<view><image :src="$method.splitImgHost(item.coverUrl, true)" style="width: 278rpx;height: 134rpx;"></image></view>
+														<view style="margin-left: 20rpx;flex: 1;">
+															<view style="color: #333333;font-size: 30rpx;font-weight: bold;text-align: right;">{{ item.goodsName }}</view>
+															<view class="priceTag">¥ {{ item.standPrice }}</view>
+														</view>
+													</view>
+												</u-checkbox>
 											</view>
 											<view v-if="item.templateType != null && item.goodsType == 1">
 												<u-line color="#D6D6DB" />

pages2/bank/my_question.vue

@@ -19,7 +19,7 @@
 					<view style="color: #999999;font-size: 24rpx;">刷题进度：{{item.doNum}}/{{item.totalNum}}</view>
 					<view class="box_progress">
 						<view style="width: 60%;">
-							<u-line-progress :show-percent="false" active-color="#007AFF" :percent="(item.doNum/item.totalNum)*100"></u-line-progress>
+							<u-line-progress :show-percent="false" height="22" active-color="#007AFF" :percent="(item.doNum/item.totalNum)*100"></u-line-progress>
 						</view>
 						<view>
 							<!-- <navigator  hover-class="none" :url="'/pages2/bank/question_detail?id='+item.goodsId"> -->

pages2/class/detail.vue

@@ -35,7 +35,7 @@
 			</view>
 			<u-line color="#D6D6DB" />
 			<view style="display: flex;justify-content: center;">
-				<view><u-tabs :list="list" font-size="24" bar-width="80" :current="current" @change="change" active-color="#007AFF"></u-tabs></view>
+				<view><u-tabs :list="list" font-size="24" :is-scroll="false" bar-width="80" :current="current" @change="change" active-color="#007AFF"></u-tabs></view>
 			</view>
 			<u-line color="#D6D6DB" />
 		</view>

pages2/course/detail.vue

@@ -35,7 +35,7 @@
 			</view>
 			<u-line color="#D6D6DB" />
 			<view style="height: 80rpx;">
-				<view style="width: 160px;margin: 0 auto;"><u-tabs :list="list" item-width="150" font-size="24" bar-width="110" :current="current" @change="change" active-color="#007AFF"></u-tabs></view>
+				<view><u-tabs :list="list" item-width="50%" font-size="24" bar-width="110"  :current="current" @change="change" active-color="#007AFF"></u-tabs></view>
 			</view>
 			
 		</view>

pages2/order/confirm_list.vue

@@ -3,7 +3,7 @@
 		<view style="padding: 30rpx;padding-bottom: 98rpx;">
 			<view  >
 				<view class="item">
-					<view style="display: flex;justify-content: space-between;padding-bottom: 15rpx;">
+					<view style="display: flex;justify-content: space-between;padding: 16rpx;">
 						<image :src="$method.splitImgHost(detail.coverUrl)" style="height: 134rpx;width: 278rpx;border-radius: 16rpx;"></image>
 						<view style="margin-left: 20rpx;">
 							<view style="color: #333333;font-size: 30rpx;font-weight: bold;">
@@ -16,11 +16,11 @@
 					</view>
 					<view v-if="detail.templateType!=null&&detail.goodsType==1">
 						<u-line color="#D6D6DB" />
-						<view v-if="detail.templateType=='class'" style="display: flex;justify-content: space-between;align-items: center;height: 50rpx;" @click="openPopup(0)">
+						<view v-if="detail.templateType=='class'" style="display: flex;justify-content: space-between;align-items: center;height: 80rpx;padding:16rpx;" @click="openPopup(0)">
 							<view style="color: #666666;font-size: 24rpx;">{{gradeIndex < 0 ?'选择班级':gradeList[gradeIndex].className}}</view>
 							<view><u-icon name="arrow-right" color="#999999" size="28"></u-icon></view>
 						</view>
-						<view v-if="detail.templateType=='apply'"  style="display: flex;justify-content: space-between;align-items: center;height: 50rpx;" @click="openPopup(1)">
+						<view v-if="detail.templateType=='apply'"  style="display: flex;justify-content: space-between;align-items: center;height: 80rpx;padding:16rpx;" @click="openPopup(1)">
 							<view style="color: #666666;font-size: 24rpx;" >{{!applyAreas.areaName?'报考地区':examDate.examineName+'-'+applyAreas.areaName+'-'+applyAreas.cityName}}</view>
 							<view><u-icon name="arrow-right" color="#999999" size="28"></u-icon></view>
 						</view>
@@ -31,7 +31,7 @@
 		<view class="bottomBox safeArea">
 			<view class="priceTag">¥ {{detail.standPrice}}</view>
 			<view style="display: flex;color: #FFFFFF;align-items: center;">
-				<view class="btn2" @click="goBuy()">确认购买</view>
+				<view class="btn2" :class="{able:isAble()}" @click="goBuy()">确认购买</view>
 			</view>
 		</view>
 		
@@ -243,6 +243,24 @@ export default {
 			// }
 			return true
 		},
+		isAble() {
+			if(this.detail.templateType=='class'&&this.detail.goodsType==1){
+				if(this.gradeValue<0){
+					return false
+				}
+			}
+			else if(this.detail.templateType=='apply'&&this.detail.goodsType==1){
+				if(!this.applyObj.examDateJson){
+					uni.showModal({
+						title: "提示",
+						content: '请选择考期',
+						showCancel: false
+					})
+					return false
+				}
+			}
+			return true;
+		},
 		checkData(){
 			if(this.detail.templateType=='class'&&this.detail.goodsType==1){
 				if(this.gradeValue<0){
@@ -433,7 +451,6 @@ export default {
 		background: #FFFFFF;
 		border-radius: 16rpx;
 		margin-bottom: 20rpx;
-		padding: 15rpx;
 	}
 	.priceTag{
 		font-size: 30rpx;
@@ -451,6 +468,10 @@ export default {
 		border-radius: 32rpx;
 		text-align: center;
 		line-height: 64rpx;
+		
+		&.able {
+			opacity: 1;
+		}
 	}
 	.bottomBox{
 		position: fixed;

pages2/order/confirm_pay.vue

@@ -6,7 +6,7 @@
 					<view class="title2">支付信息</view>
 					<u-line color="#D6D6DB" />
 					<view style="padding:10rpx 30rpx;" v-for="(item,index) in shoppingCartList" :key="index">
-						<view class="list_item">
+						<view class="list_title">
 							<view class="txt_left">商品名称</view>
 							<view class="txt_right">{{item.goodsName}}</view>
 						</view>
@@ -14,9 +14,9 @@
 							<view class="txt_left">应付金额</view>
 							<view class="txt_right_price">¥ {{item.standPrice}}</view>
 						</view>
-						<u-line color="#D6D6DB" />
 					</view>
 					<view style="padding:10rpx 30rpx;" >
+						<u-line color="#D6D6DB" />
 						<view class="list_item">
 							<view class="txt_left">应付总金额</view>
 							<view class="txt_right_price">¥ {{totalPrice}}</view>
@@ -237,22 +237,27 @@ export default {
 		color: #666666;
 	}
 	.txt_right{
+		text-align: right;
 		color: #333333;
 		font-weight: bold;
 		width: 75%;
 	}
+	.list_title {
+		display: flex;
+		justify-content: space-between;
+	}
 	.list_item{
 		display: flex;
 		justify-content: space-between;
-		height: 90rpx;
+		height: 80rpx;
 		align-items: center;
 	}
 	.title2{
 		font-size: 30rpx;
 		font-weight: bold;
 		color: #333333;
-		height: 90rpx;
-		line-height: 90rpx;
+		height: 80rpx;
+		line-height: 80rpx;
 		margin-left: 30rpx;
 	}
 	.box2{
@@ -294,5 +299,6 @@ export default {
 		line-height: 98rpx;
 		font-weight: bold;
 		font-size: 30rpx;
+		border-radius: 0;
 	}
 </style>

pages2/order/confirm_success.vue

@@ -204,6 +204,7 @@ export default {
 		color: #666666;
 	}
 	.txt_right{
+		text-align: right;
 		color: #333333;
 		font-weight: bold;
 		width: 75%;
@@ -211,15 +212,15 @@ export default {
 	.list_item{
 		display: flex;
 		justify-content: space-between;
-		height: 90rpx;
+		height: 80rpx;
 		align-items: center;
 	}
 	.title2{
 		font-size: 30rpx;
 		font-weight: bold;
 		color: #333333;
-		height: 90rpx;
-		line-height: 90rpx;
+		height: 80rpx;
+		line-height: 80rpx;
 		margin-left: 30rpx;
 	}
 	.box2{

pages2/order/index.vue

@@ -13,14 +13,19 @@
 					</view>
 					<u-line color="#D6D6DB" />
 					<view
-						style="display: flex;justify-content: space-between;padding: 25rpx 0;border-bottom: 1rpx solid #eee;"
+						style="padding: 25rpx 0;border-bottom: 1rpx solid #eee;"
 						v-for="(items, indexs) in item.orderGoodsList"
 						:key="indexs" @click="goCourse(items,item.orderStatus)"
 					>
-						<image :src="$method.splitImgHost(items.coverUrl)" style="height: 134rpx;width: 278rpx;border-radius: 16rpx;flex-shrink: 0;"></image>
-						<view style="margin-left: 20rpx;flex:1;display: flex;flex-direction: column;">
-							<view style="color: #333333;font-size: 30rpx;font-weight: bold;flex:1">{{ items.goodsName }}</view>
-							<view class="priceTag">¥ {{ items.goodsRealPrice }}</view>
+						<view style="display: flex;justify-content: space-between;">
+							<image :src="$method.splitImgHost(items.coverUrl)" style="height: 134rpx;width: 278rpx;border-radius: 16rpx;flex-shrink: 0;"></image>
+							<view style="margin-left: 20rpx;flex:1;display: flex;flex-direction: column;">
+								<view style="color: #333333;font-size: 30rpx;font-weight: bold;flex:1">{{ items.goodsName }}</view>
+								<view class="priceTag">¥ {{ items.goodsRealPrice }}</view>
+							</view>
+						</view>
+						<view style="display: flex;flex-direction: row-reverse;padding: 10rpx 0;">
+							<view class="btn2" v-if="item.orderFrom === 2&&(item.orderStatus === 1 || item.orderStatus === 2)&&(items.goodsType == '1' || items.goodsType == '2')" @click.stop="refund(item.orderSn,items.goodsId)">退款</view>
 						</view>
 					</view>
 					<view style="height: 80rpx;display: flex;justify-content: space-between;align-items: center;">
@@ -31,8 +36,7 @@
 						</view>
 						<view style="display: flex;align-items: center;">
 							<view class="btn2" v-if="item.orderStatus === 0&&item.orderFrom === 2" @click="resumeOrder(item)">继续支付</view>
-							<!-- <view class="btn2" v-if="item.orderStatus === -1 || item.orderStatus === -2" @click="againBuy(item)">重新购买</view> -->
-							<!--<view class="btn2" v-if="item.orderStatus === 1 || item.orderStatus === 2" >退款</view> -->
+							<!-- <view class="btn2" v-if="item.orderStatus === -1 || item.orderStatus === -2" @click="againBuy(item)">重新购买</view> --> 
 							<view class="btn1" v-if="item.orderStatus === -1 || item.orderStatus === -2" @click="delOrder(item)">删除订单</view>
 							<view class="btn1" @click="closeOrder(item)" v-if="item.orderStatus === 0">取消订单</view>
 						</view>
@@ -96,6 +100,18 @@ export default {
 		this.getFY();
 	},
 	methods: {
+		refund(orderSn,goodsId){
+			let self = this
+			this.$api.refundSmallOrder({orderSn:orderSn,goodsId:goodsId}).then(res => {
+				if(res.data.code==200){
+					uni.showModal({
+						title: "提示",
+						content: res.data.msg,
+						showCancel: false
+					})
+				}
+			});
+		},
 		/**
 		 * 跳转课程
 		 */

pages2/plan/create.vue

@@ -1,5 +1,5 @@
 <template>
-	<view style="padding: 30rpx;">
+	<view style="padding: 16rpx;">
 		<view class="list_box">
 			<view class="item" v-for="(item, index) in list" :key="index">
 				<image :src="item.coverUrl"></image>
@@ -10,7 +10,7 @@
 				<view class="del_icon"><u-icon name="minus-circle-fill" color="#EB4D3D" size="40" @click="delItem(index)"></u-icon></view>
 			</view>
 			<view class="item" style="vertical-align: top;">
-				<view class="item_add" @click="openSel"><u-icon name="plus-circle-fill" color="#32467B" size="32"></u-icon></view>
+				<view class="item_add" @click="openSel"><u-icon name="plus-circle-fill" color="#007AFF" size="32"></u-icon></view>
 				<view style="color:#999;text-align: center;">添加网课</view>
 			</view>
 		</view>
@@ -68,39 +68,47 @@
 		</u-popup>
 		<u-popup v-model="show" mode="bottom">
 			<view class="popup_box">
-				<view class="popup_title">
-					<u-row>
-						<u-col span="6"><view class="title_r">我的课程</view></u-col>
-						<u-col span="3" offset="3"><view class="title_l" @click="submit">确认</view></u-col>
-					</u-row>
+				<view>
+					<view class="line1"></view>
+					<view class="grade">选择课程</view>
+					<u-line></u-line>
 				</view>
 				<view class="popup_list" v-if="list2.length !== 0">
-					<view class="popup_item" v-for="(item, index) in list2" :key="index">
-						
-							<u-checkbox
-								:disabled="item.disabled"
-								@change="checkboxChange"
-								shape="circle"
-								active-color="#32467B"
-								v-model="item.checked"
-								:key="index"
-								:name="item.goodsId"
-							>
-								<view style="display: flex;align-items: center;">
-									<view style="display: flex;align-items: center;"><image :src="item.coverUrl" style="width: 278rpx;height: 134rpx;"></image></view>
-									<view style="margin: 30rpx;">
-										<view>{{ item.goodsName }}</view>
-										<view style="color:#999;">{{ item.secAllNum }}节</view>
+					<scroll-view class="list_in" scroll-y="true">
+						<view class="popup_item" v-for="(item, index) in list2" :key="index">
+							
+								<u-checkbox
+									:disabled="item.disabled"
+									@change="checkboxChange"
+									shape="circle"
+									active-color="#007AFF"
+									v-model="item.checked"
+									:key="index"
+									:name="item.goodsId"
+								>
+									<view class="course_item" :class="{selected:item.checked}">
+										<view style="display: flex;align-items: center;"><image :src="item.coverUrl" style="width: 278rpx;height: 134rpx;"></image></view>
+										<view style="margin: 16rpx;">
+											<view>{{ item.goodsName }}</view>
+											<view style="color:#999;">{{ item.secAllNum }}节</view>
+										</view>
 									</view>
-								</view>
-							</u-checkbox>
-						
-					</view>
+								</u-checkbox>
+							
+						</view>
+					</scroll-view>
+					
+				</view>
+				<view class="popup_list" v-else><u-empty text="请前往购买课程" mode="list"></u-empty></view>
+				
+				<view class="submit_wrap">
+					<view class="title_l" @click="submit">确认</view>
+				
 				</view>
-				<view v-else><u-empty text="请前往购买课程" mode="list"></u-empty></view>
 			</view>
 		</u-popup>
 		<view @click="resultForm" class="submit_btn">确认计划</view>
+		
 	</view>
 </template>
 
@@ -408,7 +416,7 @@ export default {
 	overflow: hidden;
 }
 </style>
-<style scope>
+<style scope lang="scss">
 .dis_ss {
 	display: flex;
 	align-items: center;
@@ -440,34 +448,60 @@ export default {
 }
 .form {
 	padding: 0 16rpx !important;
-	margin-top: 30rpx;
+	margin-top: 16rpx;
 }
 input {
 	text-align: right;
 }
 .popup_item {
 	width: 100%;
-	/* height: 182rpx; */
-	background: #ffffff;
-	box-shadow: 0rpx 0rpx 16rpx 4rpx rgba(145, 156, 178, 0.1);
 	border-radius: 32rpx;
-	margin: 20rpx 0;
-	padding: 10rpx;
+	margin: 10rpx 0;
+	padding: 0 20rpx;
 	display: flex;
+	
+	.course_item {
+		display: flex;
+		align-items: center;
+		width:660rpx;
+		padding:26rpx;
+		
+		&.selected {
+			background:#EBF5FF;
+			border-radius: 24rpx;
+		}
+	}
 }
 .popup_list {
-	height: 500rpx;
+	position:relative;
+	flex:1;
 	padding: 0 20rpx;
+	
+	.list_in {
+		position: absolute;
+		left:0;
+		top:0;
+		width:100%;
+		height:100%;
+		overflow: scroll;
+	}
 }
-.title_l {
-	width: 88rpx;
-	height: 48rpx;
-	background: #32467b;
-	border-radius: 16rpx;
-	font-size: 28rpx;
-	color: #ffffff;
-	text-align: center;
-	line-height: 48rpx;
+.submit_wrap {
+	background:#fff;
+	padding:18rpx 0;
+	
+	
+	.title_l {
+		margin:0 auto;
+		text-align: center;
+		line-height: 64rpx;
+		width: 200rpx;
+		height: 64rpx;
+		background: linear-gradient(0deg, #015EEA, #00C0FA);
+		border-radius: 32rpx;
+		color:#fff;
+		font-size: 30rpx;
+	}
 }
 .title_r {
 	font-size: 30rpx;
@@ -475,12 +509,25 @@ input {
 	font-weight: bold;
 	color: #2f4379;
 }
-.popup_title {
-	width: 100%;
-	margin: 40rpx;
+.grade {
+	font-size: 24rpx;
+	color: #999999;
+	margin: 0 auto;
+	margin: 10rpx 0;
+	text-align: center;
+}
+.line1 {
+	width: 80rpx;
+	height: 8rpx;
+	background: #999999;
+	border-radius: 4rpx;
+	margin: 0 auto;
+	margin-top: 15rpx;
 }
 .popup_box {
-	height: 600rpx;
+	height: 680rpx;
+	display: flex;
+	flex-direction: column;
 }
 .del_icon {
 	position: absolute;
@@ -514,12 +561,11 @@ input {
 .list_box {
 	width: 100%;
 	background: #ffffff;
-	box-shadow: 0rpx 0rpx 1rpx 4rpx rgba(145, 156, 178, 0.1);
 	border-radius: 32rpx;
 	padding: 20rpx 0;
 }
 
 page {
-	background: #ffffff;
+	background:rgba(234,238,241,1)
 }
 </style>

pages2/wd/class.vue

@@ -26,7 +26,7 @@
 					学习进度：{{ item.stuAllNum }}/{{ item.secAllNum }}
 				</view>
 				<view class="box_progress">
-					<view style="width: 60%;"><u-line-progress :showText="false" active-color="#ff9900" :show-percent="false" :percent="(item.stuAllNum / item.secAllNum) * 100"></u-line-progress></view>
+					<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 type="warning" size="mini" @click.stop="studyIn(item.goodsId,item.gradeId)">进入学习</u-button></view>
 				</view>
 				<view class="box_progress" v-if="item.applyStatus === 1">

pages2/wd/course.vue

@@ -14,7 +14,7 @@
 					学习进度：{{ item.stuAllNum }}/{{ item.secAllNum }}
 				</view>
 				<view class="box_progress">
-					<view style="width: 60%;"><u-line-progress :show-percent="false" active-color="#ff9900" :percent="(item.stuAllNum / item.secAllNum) * 100"></u-line-progress></view>
+					<view style="width: 60%;"><u-line-progress height="22" :show-percent="false" active-color="#ff9900" :percent="(item.stuAllNum / item.secAllNum) * 100"></u-line-progress></view>
 					<view><u-button type="warning" size="mini" @click.stop="studyIn(item)">进入学习</u-button></view>
 				</view>
 			</view>