新增学时和视频数

common/request.js

@@ -7,10 +7,10 @@ var num = 1
 //接口api   
 // export const BASE_URL = 'https://api.xyyxt.net'   //release
 // export const BASE_URL = 'https://test.xyyxt.net'   //预发布
-export const BASE_URL = 'http://120.79.166.78:19012' // 测试环境
+// export const BASE_URL = 'http://120.79.166.78:19012' // 测试环境
 // export const BASE_URL = 'http://42.192.164.187:19005'    //test(后端本地)
 // export const BASE_URL = 'http://192.168.1.222:5055'    //后端本地更新到222
-// export const BASE_URL = 'http://192.168.1.24:5055'    //后端本地
+export const BASE_URL = 'http://192.168.1.24:5055'    //后端本地
 // export const BASE_URL = 'http://192.168.1.7:5055'    //后端本地
 
  //图片上传api

pages/learn/index.scss

@@ -144,8 +144,6 @@
 		.c_downs {
 			display: flex;
 			align-items: center;
-			// justify-content: flex-start;
-			justify-content: space-between;
 			padding-top: 24rpx;
 		}
 		// 状态
@@ -232,7 +230,7 @@
 		width: 204rpx;
 		height: 120rpx;
 		border-radius: 12rpx;
-		margin-right: 48rpx;
+		margin-right: 26rpx;
 		position: relative;
 		top: 0;
 		left: 0;
@@ -257,7 +255,7 @@
 		}
 	}
 	.rights {
-		width: 380rpx;
+		width: 400rpx;
 		height: 120rpx;
 		display: flex;
 		flex-direction: column;
@@ -271,11 +269,25 @@
 			justify-content: space-between;
 		}
 		.progress_up {
-			font-size: 24rpx;
-			color: #999999;
 			width: 100%;
+			.classHour {
+				font-size: 28rpx;
+				font-weight: bold;
+				color: #666666;
+				margin-bottom: 16rpx;
+			}
+			.scheduling {
+				display: flex;
+				align-items: center;
+			}
+			.sche_bar {
+				font-size: 24rpx;
+				color: #999999;
+				margin-right: 20rpx;
+			}
 			.progress_bar {
-				margin-top: 16rpx;
+				flex: 1;
+
 			}
 		}
 		.progress_down {

pages/learn/index.vue

@@ -231,13 +231,20 @@
 								<view v-else class="learn_progress">
 									<view class="progress_up">
 										<!-- 学习进度 (已做试卷+已做节)/(试卷数+节数) -->
-										<view>
-											学习进度：{{ item.stuAllNum+item.recordNum }}/{{ item.secAllNum+item.examNum }}
+										<view class="classHour">
+											<text>{{ item.classHours || item.classHours == 0 ? item.classHours : '-' }}学时/</text>
+											<text>{{ item.secAllNum || item.secAllNum == 0 ? item.secAllNum : '-' }}视频</text>
 										</view>
-										<view class="progress_bar" style="width: 100%;">
-											<u-line-progress :showText="false" height="22" active-color="#ff9900" :show-percent="false"
-												:percent="((item.stuAllNum+item.recordNum) / (item.secAllNum+item.examNum)) * 100"></u-line-progress>
+										<view class="scheduling">
+											<view class="sche_bar">
+												进度：{{ item.stuAllNum+item.recordNum }}/{{ item.secAllNum+item.examNum }}
+											</view>
+											<view class="progress_bar">
+												<u-line-progress :showText="false" height="22" active-color="#ff9900" :show-percent="false"
+													:percent="((item.stuAllNum+item.recordNum) / (item.secAllNum+item.examNum)) * 100"></u-line-progress>
+											</view>
 										</view>
+										
 									</view>
 								</view>
 							</view>