Przeglądaj źródła

修改:1.调整icon的url;2.课程详情报名按钮样式修改;3.学分明细调整间距

littleblue55 15 godzin temu
rodzic
commit
b016dbdf79

+ 3 - 3
pages/goOnEdu/course/courseDetail/courseDetail.vue

@@ -525,8 +525,8 @@
 			background-color: #fe0000;
 			background-color: #fe0000;
 			color: #fff;
 			color: #fff;
 			// position: absolute;
 			// position: absolute;
-			// bottom: 0;
-			padding:20rpx  0 calc(20rpx + env(safe-area-inset-bottom, 0));
+			// bottom: 0; calc(20rpx + env(safe-area-inset-bottom, 0))
+			padding:20rpx  0 20rpx;
 		}
 		}
 	}
 	}
 
 
@@ -541,7 +541,7 @@
 		position: fixed;
 		position: fixed;
 		bottom: 0;
 		bottom: 0;
 		box-sizing: content-box;
 		box-sizing: content-box;
-		padding-bottom: env(safe-area-inset-bottom, 0);
+		// padding-bottom: env(safe-area-inset-bottom, 0);
 	}
 	}
 	.section-bottom {
 	.section-bottom {
 		height: 90rpx;
 		height: 90rpx;

+ 6 - 6
pages/goOnEdu/course/courseMine/mineCredits/mineCredits.vue

@@ -5,10 +5,10 @@
 				<view class="list-item">
 				<view class="list-item">
 					学习年度
 					学习年度
 				</view>
 				</view>
-				<view class="list-item" style="width: 40%;">
+				<view class="list-item" style="width: 35%;">
 					会员网络教育<br/>完成学分情况
 					会员网络教育<br/>完成学分情况
 				</view>
 				</view>
-				<view class="list-item" style="width: 35%;">
+				<view class="list-item" style="width: 40%;">
 					学分明细
 					学分明细
 				</view>
 				</view>
 				<!-- <view class="list-item">
 				<!-- <view class="list-item">
@@ -22,10 +22,10 @@
 				<view class="list-item">
 				<view class="list-item">
 					{{item.year}}
 					{{item.year}}
 				</view>
 				</view>
-				<view class="list-item" style="width: 40%;">
+				<view class="list-item" style="width: 35%;">
 					{{item.gotCredit}}/{{item.credit}}
 					{{item.gotCredit}}/{{item.credit}}
 				</view>
 				</view>
-				<view class="list-item" style="width: 35%;">
+				<view class="list-item" style="width: 40%;">
 					<view class="button" :class="['primary']" @click="toPage(item.year)">
 					<view class="button" :class="['primary']" @click="toPage(item.year)">
 						点击查看学分明细
 						点击查看学分明细
 					</view>
 					</view>
@@ -94,9 +94,9 @@
 					}
 					}
 				}
 				}
 			}
 			}
-			padding: 15rpx 0;
+			padding: 25rpx 0;
 			text-align: center;
 			text-align: center;
-			font-size: $uni-font-size-2;
+			font-size: 26rpx;
 			font-weight: bold;
 			font-weight: bold;
 			display: flex;
 			display: flex;
 			align-items: center;
 			align-items: center;

+ 20 - 18
pages/goOnEdu/course/courseMine/mineRecord/recordDetail.vue

@@ -8,7 +8,7 @@
 				<view class="list-item" style="width: 50%;">
 				<view class="list-item" style="width: 50%;">
 					课程名称
 					课程名称
 				</view>
 				</view>
-				<view class="list-item" style="width: 25%;">
+				<view class="list-item" style="width: 20%;">
 					学分
 					学分
 				</view>
 				</view>
 				<!-- <view class="list-item">
 				<!-- <view class="list-item">
@@ -26,8 +26,8 @@
 					<view class="list-item" style="width: 50%;">
 					<view class="list-item" style="width: 50%;">
 						{{item.source}}
 						{{item.source}}
 					</view>
 					</view>
-					<view class="list-item" style="width: 25%;">
-						{{ item.credit }}
+					<view class="list-item" style="width: 20%;">
+						{{item.credit}}
 					</view>
 					</view>
 					<!-- <view class="list-item" v-html="item.annIns!=='学分未达标不能申请年检' ? item.annIns : '学分未达标,<br/>不能申请年检'"></view>
 					<!-- <view class="list-item" v-html="item.annIns!=='学分未达标不能申请年检' ? item.annIns : '学分未达标,<br/>不能申请年检'"></view>
 					<view class="list-item">
 					<view class="list-item">
@@ -55,7 +55,7 @@
 	const list = ref([])
 	const list = ref([])
 	const currentYear = ref("");
 	const currentYear = ref("");
 	const pageNumber = ref(1);
 	const pageNumber = ref(1);
-	const pageSize = ref(30);
+	const pageSize = ref(20);
 	const count = ref(0);
 	const count = ref(0);
 	const status = ref("loadmore")
 	const status = ref("loadmore")
 	const initList = () => {
 	const initList = () => {
@@ -70,13 +70,16 @@
 		uni.showLoading({
 		uni.showLoading({
 			title: '加载中',
 			title: '加载中',
 		})
 		})
+		status.value = 'loading'
 		loadCreditDatial(data).then(res => {
 		loadCreditDatial(data).then(res => {
 			uni.hideLoading()
 			uni.hideLoading()
 			if (res && res?.code === 0) {
 			if (res && res?.code === 0) {
 				count.value = res.count;
 				count.value = res.count;
 				list.value = [...list.value, ...res.data];
 				list.value = [...list.value, ...res.data];
-				if(list.value.length ===count.value){
+				if(list.value.length === count.value){
 					status.value = 'nomore'
 					status.value = 'nomore'
+				}else{
+					status.value = 'loadmore'
 				}
 				}
 				pageNumber.value = pageNumber.value + 1;
 				pageNumber.value = pageNumber.value + 1;
 			}
 			}
@@ -133,12 +136,12 @@
 		.list-item-box {
 		.list-item-box {
 			&:first-child {
 			&:first-child {
 				border-bottom: 5rpx solid #E6E6E6;
 				border-bottom: 5rpx solid #E6E6E6;
-				font-size: $uni-font-size-1;
+				font-size: 26rpx;
 				font-weight: bold;
 				font-weight: bold;
 				flex: 0 0 auto;
 				flex: 0 0 auto;
 
 
 				.list-item {
 				.list-item {
-					width: 25%;
+					width: 30%;
 					text-align: center;
 					text-align: center;
 
 
 					&:last-child {
 					&:last-child {
@@ -148,19 +151,19 @@
 				}
 				}
 			}
 			}
 
 
-			padding: 15rpx 0;
+			padding: 25rpx 0;
 			text-align: center;
 			text-align: center;
-			font-size: $uni-font-size-2;
+			font-size: 26rpx;
 			font-weight: bold;
 			font-weight: bold;
 			display: flex;
 			display: flex;
 			align-items: center;
 			align-items: center;
 
 
 			.list-item {
 			.list-item {
-				width: 25%;
+				width: 30%;
 				text-align: center;
 				text-align: center;
 
 
 				&:last-child {
 				&:last-child {
-					color: $uni-text-color-inverse;
+					
 					font-weight: normal;
 					font-weight: normal;
 				}
 				}
 			}
 			}
@@ -196,21 +199,20 @@
 			// 		}
 			// 		}
 			// 	}
 			// 	}
 			// }
 			// }
-			padding: 15rpx 0;
+			padding: 25rpx 0;
 			text-align: center;
 			text-align: center;
-			font-size: $uni-font-size-2;
+			font-size: 26rpx;
 			font-weight: bold;
 			font-weight: bold;
 			display: flex;
 			display: flex;
 			align-items: center;
 			align-items: center;
 
 
 			.list-item {
 			.list-item {
-				width: 25%;
+				width: 30%;
 				text-align: center;
 				text-align: center;
 
 
-				&:last-child {
-					color: $uni-text-color-inverse;
-					font-weight: normal;
-				}
+				// &:last-child {
+				// 	font-weight: normal;
+				// }
 			}
 			}
 
 
 			.button {
 			.button {

+ 2 - 3
utils/baseurl.js

@@ -3,11 +3,10 @@ let FILE_URL = ''
 // baseurl  联调时改url
 // baseurl  联调时改url
 if (process.env.NODE_ENV == 'development') {
 if (process.env.NODE_ENV == 'development') {
 	BASE_URL = 'https://www.gzrea.cn:8443/wxmp/api';
 	BASE_URL = 'https://www.gzrea.cn:8443/wxmp/api';
-	// BASE_URL = 'https://www.gzrea.org.cn:8443/wxmp/api';
-	FILE_URL = 'http://www.gzrea.org.cn:8543/icon/wxmp';
+	FILE_URL = 'https://www.gzrea.cn:8443/wxmp/static/icon';
 }else{
 }else{
 	BASE_URL = 'https://www.gzrea.cn:8443/wxmp/api';
 	BASE_URL = 'https://www.gzrea.cn:8443/wxmp/api';
-	FILE_URL = 'http://www.gzrea.org.cn:8543/icon/wxmp';
+	FILE_URL = 'https://www.gzrea.cn:8443/wxmp/static/icon';
 }
 }
 
 
 const configService = {
 const configService = {