From 512008bde8bb9f0baf7965683054ddef1c06fe6f Mon Sep 17 00:00:00 2001
From: chris <510148846@qq.com>
Date: Thu, 7 Nov 2024 09:20:22 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC=EF=BC=9A0.0.0.12=201?=
 =?UTF-8?q?=E3=80=81=E6=B7=BB=E5=8A=A0=E9=A6=96=E9=A1=B5=E6=A3=80=E6=9F=A5?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=EF=BC=9B2=E3=80=81=E6=9B=B4=E6=8D=A2?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E8=80=83=E8=AF=95=E5=88=97=E8=A1=A8=E6=89=80?=
 =?UTF-8?q?=E5=8F=96id=E5=80=BCid=20-->=20studentid=EF=BC=9B=203=E3=80=81?=
 =?UTF-8?q?=E8=80=83=E8=AF=95=E8=AF=A6=E6=83=85=E6=B7=BB=E5=8A=A0=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E7=8A=B6=E6=80=81=EF=BC=8C=E4=BC=98=E5=8C=96=E8=80=83?=
 =?UTF-8?q?=E8=AF=95=E6=8F=90=E4=BA=A4=E9=80=BB=E8=BE=91=EF=BC=9B4?=
 =?UTF-8?q?=E3=80=81=E7=AD=94=E9=A2=98=E5=99=A8=E5=8F=96=E6=B6=88=E7=A1=AE?=
 =?UTF-8?q?=E5=AE=9A=E7=AA=97=E5=8F=A3=EF=BC=9B5=E3=80=81=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8Dbug=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                       | 15 +++++
 .../ch-image-uploader/ch-image-uploader.vue   |  8 ++-
 manifest.json                                 | 18 +-----
 pages/IClicker/IClicker.vue                   | 39 +++++------
 pages/exam/exam.vue                           |  2 +-
 pages/examDetails/examDetails.vue             | 64 ++++++++++++++-----
 pages/index/index.scss                        |  8 ++-
 pages/index/index.vue                         |  5 +-
 pages/quesDetail/quesDetail.scss              |  7 +-
 pages/quesDetail/quesDetail.vue               | 25 ++++++--
 pages/setting/setting.vue                     | 34 ++++++----
 utils/network/request.js                      |  2 +-
 12 files changed, 144 insertions(+), 83 deletions(-)

diff --git a/App.vue b/App.vue
index f86a9fe..7a3252b 100644
--- a/App.vue
+++ b/App.vue
@@ -3,6 +3,7 @@
 	import { onBeforeMount } from 'vue'
 	
 	// #ifdef APP
+	import checkUpdate from '@/uni_modules/uni-upgrade-center-app/utils/check-update';
 	import { useSystemStore } from '@/store/system.js';
 	const systemStore = useSystemStore()
 	// #endif
@@ -15,6 +16,7 @@
 		// #ifdef APP
 		const appInfo = uni.getAppBaseInfo()
 		systemStore.setAppInfo(appInfo)
+		checkAppUpdate()
 		// #endif
 		
 		uni.getNetworkType({
@@ -46,6 +48,19 @@
 			userStore.setUserInfo(userInfo)
 		}
 	})
+	
+	// 检查更新
+	function checkAppUpdate () {
+		// #ifdef APP
+		checkUpdate().then(res => {
+			console.log('检查更新结果：', res)
+		}).catch(error => { 
+			console.log("检查更新错误：", error)
+		}).finally(() => {
+			console.log('检查更新结束')
+		})
+		// #endif
+	}
 </script>
 
 <style>
diff --git a/components/ch-image-uploader/ch-image-uploader.vue b/components/ch-image-uploader/ch-image-uploader.vue
index e3496a1..0331245 100644
--- a/components/ch-image-uploader/ch-image-uploader.vue
+++ b/components/ch-image-uploader/ch-image-uploader.vue
@@ -133,7 +133,11 @@ function upload () {
 			name: 'task-image',
 			success: (uploadFileRes) => {
 				uni.showToast({
-					title: '上传成功'
+					title: '上传成功',
+					icon: 'success',
+					// success: () => {
+					// 	resolve(uploadFileRes)
+					// }
 				})
 				resolve(uploadFileRes)
 			},
@@ -142,8 +146,8 @@ function upload () {
 					icon: 'fail',
 					title: '上传失败'
 				})
-				reject(error)
 				console.log('上传失败', error)
+				reject(error)
 			}
 		})
 	})
diff --git a/manifest.json b/manifest.json
index 91a6b78..170d05c 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "studypen",
     "appid" : "__UNI__C183B0D",
     "description" : "",
-    "versionName" : "0.0.0.9",
-    "versionCode" : 101,
+    "versionName" : "0.0.0.12",
+    "versionCode" : 103,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -99,20 +99,6 @@
                     "pid" : "",
                     "parameters" : {}
                 }
-            },
-            "XM-SysPrinter" : {
-                "__plugin_info__" : {
-                    "name" : "双端系统打印插件 - [试用版，仅用于自定义调试基座]",
-                    "description" : "XM-SysPrinter是一款在原生系统中调起系统打印页面的插件，支持图片、pdf、office、网页等。",
-                    "platforms" : "Android,iOS",
-                    "url" : "https://ext.dcloud.net.cn/plugin?id=9567",
-                    "android_package_name" : "",
-                    "ios_bundle_id" : "",
-                    "isCloud" : true,
-                    "bought" : 0,
-                    "pid" : "9567",
-                    "parameters" : {}
-                }
             }
         }
     },
diff --git a/pages/IClicker/IClicker.vue b/pages/IClicker/IClicker.vue
index 64d2281..d5c0b0e 100644
--- a/pages/IClicker/IClicker.vue
+++ b/pages/IClicker/IClicker.vue
@@ -60,29 +60,22 @@ function selectOpt (e) {
 }
 
 function submitAnswer () {
-	uni.showModal({
-		content: '确定要提交答案？',
-		confirmText: '提交',
-		cancelText: '放弃',
-		success: () => {
-			const params = {
-				studentanswer: selectOpts.value.join(','),
-				studentid: userId
-			}
-			
-			submitIClickerData(params).then(res => {
-				uni.showToast({
-					icon: 'success',
-					title: '已提交'
-				})
-				refresh();
-			}).catch(() => {
-				uni.showToast({
-					icon:'error',
-					title: '提交失败'
-				})
-			})
-		}
+	const params = {
+		studentanswer: selectOpts.value.sort().join(','),
+		studentid: userId
+	}
+	
+	submitIClickerData(params).then(res => {
+		uni.showToast({
+			icon: 'success',
+			title: '已提交'
+		})
+		refresh();
+	}).catch(() => {
+		uni.showToast({
+			icon:'error',
+			title: '提交失败'
+		})
 	})
 }
 
diff --git a/pages/exam/exam.vue b/pages/exam/exam.vue
index 0f7fce4..b5098e3 100644
--- a/pages/exam/exam.vue
+++ b/pages/exam/exam.vue
@@ -28,7 +28,7 @@ import { getExamList } from '@/api/exam.js';
 const userStore = useUserStore();
 const userId = userStore.userId;
 const params = {
-	id: userId,
+	studentid: userId,
 	status: 1,
 }
 
diff --git a/pages/examDetails/examDetails.vue b/pages/examDetails/examDetails.vue
index b2cfd3d..6f8c92f 100644
--- a/pages/examDetails/examDetails.vue
+++ b/pages/examDetails/examDetails.vue
@@ -3,7 +3,8 @@
 		<ch-nav-bar title="考试详情" :height="66"></ch-nav-bar>
 		<uni-list>
 			<uni-list-item :showArrow="false" title="考试名称" :rightText="exam.examname" />
-			<uni-list-item :showArrow="false" title="提交状态" :rightText="status" />
+			<uni-list-item :showArrow="false" title="考试状态" :rightText="status" />
+			<uni-list-item :showArrow="false" title="提交状态" :rightText="studentStatus" />
 			<uni-list-item :showArrow="false" title="得分" :rightText="exam.studentscore + ''" />
 			<uni-list-item :showArrow="false" title="考试图片" />
 			<!-- <uni-file-picker
@@ -27,7 +28,7 @@
 				:url="uploadUrl">
 			</ch-image-uploader>
 		</uni-list>
-		<button class="submit-btn" type="primary" :loading="uploading" :disabled="isDisable" @click="submitExam">提交图片</button>
+		<button class="submit-btn" type="primary" :loading="uploading" :disabled="isDisable" @click="submitExam" v-if="status === '进行中'">提 交</button>
 	</view>
 </template>
 
@@ -59,8 +60,7 @@ const data = reactive({
 const { exam, img, imgStyle , files, examId, uploading } = toRefs(data);
 
 const isDisable = computed(() => {
-	console.log('files', files.value)
-	!files.value.length || uploading.value
+	return !files.value.length || uploading.value
 })
 
 const status = computed(() => {
@@ -69,6 +69,12 @@ const status = computed(() => {
 	return exam.value.status == 1 ? '进行中' : '已结束'
 })
 
+const studentStatus = computed(() => {
+	if (!exam.value.studentstatus) return ''
+	
+	return exam.value.studentstatus == 1 ? '已提交' : '未提交'
+})
+
 const uploadUrl = computed(() => {
 	return `${config.baseUrl}/api/user.ashx?act=subexaminfo&studentid=${userId}&examid=${examId.value}`
 })
@@ -86,24 +92,52 @@ onMounted(() => {
 	// 	examid: 1,
 	// 	studentid: 1
 	// }
-	getExamInfo(params, { loading: true }).then(info => {
-		exam.value = info;
-		if (!info.studentimg) return;
-		files.value = [{
-			name: 'studentimg',
-			extname: 'image/png',
-			path: `${info.studentimg}`
-		}]
-	})
+	getInfo(params, true)
 })
 
 // 提交图片
 function submitExam () {
 	uploading.value = true;
-	console.log(imgUploader)
 	imgUploader.value.upload()
+	.then(() => {
+		console.log('上传成功')
+		uni.showToast({
+			title: '提交成功',
+			icon: 'success'
+		})
+		setTimeout(() => {
+			getInfo({
+				examid: examId.value,
+				studentid: userId
+			})
+		}, 1000)
+	})
+	.catch(() => {
+		uni.showToast({
+			title: '提交失败',
+			icon: 'error'
+		})
+	})
 	.finally(() => {
-		uploading.value = false;
+		uploading.value = false
+	})
+}
+
+function getInfo (params, loading = false) {
+	return new Promise((resolve, reject) => {
+		getExamInfo(params, { loading }).then(info => {
+			exam.value = info;
+			if (!info.studentimg) return;
+			files.value = [{
+				name: 'studentimg',
+				extname: 'image/png',
+				path: `${info.studentimg}`
+			}]
+			resolve(info)
+		})
+		.catch(error => {
+			reject(error)
+		})
 	})
 }
 
diff --git a/pages/index/index.scss b/pages/index/index.scss
index f440ae2..a03ec0d 100644
--- a/pages/index/index.scss
+++ b/pages/index/index.scss
@@ -8,8 +8,12 @@
 }
 
 .user__info-item {
-	font-size: $uni-font-size-sm;
-	margin: 4px;
+	// font-size: 30px;
+	margin: 2px;
+}
+
+.user__info-item text {
+	font-size: 29px;
 }
 
 .uni-grid-item {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index f5181ec..d181e1d 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -7,13 +7,13 @@
 		</ch-nav-bar>
 		<view class="top-container">
 			<uni-row :gutter="10">
-				<uni-col :span="8">
+				<uni-col :span="7">
 					<view class="user__info-item">
 						<text>姓名：</text>
 						<text>{{ userInfo.studentname }}</text>
 					</view>
 				</uni-col>
-				<uni-col :span="8">
+				<uni-col :span="9">
 					<view class="user__info-item">
 						<text>学号：</text>
 						<text>{{ userInfo.studentno }}</text>
@@ -99,6 +99,7 @@ function enterSetting () {
 		url: '/pages/setting/setting'
 	})
 }
+
 </script>
 
 <style lang="scss" scoped>
diff --git a/pages/quesDetail/quesDetail.scss b/pages/quesDetail/quesDetail.scss
index efd43c2..025d857 100644
--- a/pages/quesDetail/quesDetail.scss
+++ b/pages/quesDetail/quesDetail.scss
@@ -1,7 +1,3 @@
-::v-deep uni-page-wrapper {
-	overflow: hidden;
-}
-
 .ques-details-page {
 	height: 100vh;
 	overflow: hidden;
@@ -9,7 +5,6 @@
 
 .ques-content {
 	height: 100%;
-	overflow-y: auto;
 	margin: 0 20rpx;
 	flex: 26;
 }
@@ -22,7 +17,7 @@
 .toggle-btn {
 	padding: 0 16rpx;
 	line-height: 2;
-	flex: 1;
+	flex: 1.5;
 }
 
 .uni-icons {
diff --git a/pages/quesDetail/quesDetail.vue b/pages/quesDetail/quesDetail.vue
index e73455d..5f11851 100644
--- a/pages/quesDetail/quesDetail.vue
+++ b/pages/quesDetail/quesDetail.vue
@@ -11,7 +11,7 @@
 			<button class="toggle-btn" type="warn" :disabled="questionId == quesIds[0]" @click="toggleQues(-1)">
 				<uni-icons type="arrow-left" size="28" color="#fff"></uni-icons>
 			</button>
-			<view class="ques-content">
+			<scroll-view scroll-y="true" class="ques-content" :scroll-top="scrollTop">
 				<view v-html="question.questioncontent"></view>
 				<view class="ques-options">
 					<view class="option" v-for="item in question.option">
@@ -26,7 +26,23 @@
 					<text>解析</text>
 					<view v-html="question.questionexplain"></view>
 				</view>
-			</view>
+			</scroll-view>
+			<!-- <view class="ques-content">
+				<view v-html="question.questioncontent"></view>
+				<view class="ques-options">
+					<view class="option" v-for="item in question.option">
+						{{ item.optionnumber }}. <view v-html="item.optioncontent"></view>
+					</view>
+				</view>
+				<view class="answer">
+					<text>答案</text>
+					<view v-html="question.questionanswer"></view>
+				</view>
+				<view class="analysis">
+					<text>解析</text>
+					<view v-html="question.questionexplain"></view>
+				</view>
+			</view> -->
 			<button class="toggle-btn" type="warn" :disabled="questionId == quesIds[quesIds.length - 1]" @click="toggleQues(1)">
 				<uni-icons type="arrow-right" size="28" color="#fff"></uni-icons>
 			</button>
@@ -45,10 +61,11 @@ import renderMath from '@/utils/mathJax/renderMath';
 const data = reactive({
 	question: {},
 	questionId: 1,
-	quesIds: []
+	quesIds: [],
+	scrollTop: 0
 })
 
-const { question, questionId, quesIds } = toRefs(data)
+const { question, questionId, quesIds, scrollTop } = toRefs(data)
 
 const isExit = computed(() => {
 	return question.value && JSON.stringify(question.value) !== '{}'
diff --git a/pages/setting/setting.vue b/pages/setting/setting.vue
index a153ca3..ac8c6b6 100644
--- a/pages/setting/setting.vue
+++ b/pages/setting/setting.vue
@@ -10,7 +10,7 @@
 			</uni-list-item>
 			<uni-list-item title="家长二维码" show-arrow="true" clickable @click="checkQrcode">
 			</uni-list-item>
-			<uni-list-item title="清除数据" show-arrow="true" clickable @click="clearStorage">
+			<uni-list-item title="退出登录" show-arrow="true" clickable @click="clearStorage">
 			</uni-list-item>
 		</uni-list>
 		<uni-popup ref="qrcodePopupRef" type="dialog">
@@ -65,17 +65,29 @@ function checkQrcode () {
 }
 
 function clearStorage () {
-	count.value++;
-	if (count.value < 3) return; 
-	uni.clearStorageSync();
-	uni.showToast({
-		title: '清除成功',
-		success() {
-			uni.reLaunch({
-				url: '/pages/login/login'
-			})
+	// count.value++;
+	// if (count.value < 3) return; 
+	uni.showModal({
+		title: '提示',
+		content: '确定要退出登录吗？',
+		success: function (res) {
+			if (res.confirm) {
+				uni.clearStorageSync();
+				uni.reLaunch({
+					url: '/pages/login/login'
+				})
+			}
 		}
-	})
+	});
+	// uni.clearStorageSync();
+	// uni.showToast({
+	// 	title: '退出成功',
+	// 	success() {
+	// 		uni.reLaunch({
+	// 			url: '/pages/login/login'
+	// 		})
+	// 	}
+	// })
 }
 </script>
 
diff --git a/utils/network/request.js b/utils/network/request.js
index c5cd01a..38cc885 100644
--- a/utils/network/request.js
+++ b/utils/network/request.js
@@ -57,7 +57,7 @@ function requestFun ({ url, method, data = {} }, config = { loading: true }) {
 	const requestConfig = Object.assign({}, config);
 	delete requestConfig.loading;
 	
-	config.loading && uni.showLoading()
+	config.loading && uni.showLoading({ mask: true })
 	
 	return new Promise((resolve, reject) => {
 		const task = uni.request({