From c71b2c67b4de3c856aa15a083ce866d62cf3fc40 Mon Sep 17 00:00:00 2001
From: "@fawn-nine" <1271023382@qq.com>
Date: Wed, 11 Sep 2024 17:05:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A2=98=E7=9B=AE=E6=95=B0?=
=?UTF-8?q?=E9=87=8F+=E8=80=83=E8=AF=95=E6=97=B6=E9=95=BF=E7=81=B5?=
=?UTF-8?q?=E6=B4=BB=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
manifest.json | 539 +++++++++++++++---------------
pages/miniClass/classInfo.vue | 26 +-
pages/miniClass/classInfoMan.vue | 73 +---
pages/miniClass/classInfoWork.vue | 9 +-
pages/miniClass/continueTest.vue | 14 +-
pages/miniClass/test.vue | 7 +-
pages/peanut/home.vue | 12 +-
7 files changed, 327 insertions(+), 353 deletions(-)
diff --git a/manifest.json b/manifest.json
index adb1224..3a13828 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,270 +1,273 @@
{
- "name": "吴门医述",
- "appid": "__UNI__C7475A8",
- "description": "吴门医述",
- "networkTimeout": {
- "request": 15000
- },
- "transformPx": false,
- "icons": [{
- "sizes": "分辨率，192x192",
- "src": "图片路径"
- }],
- "versionName": "1.0.18",
- "versionCode": 1018,
- "app-plus": {
- "nvueCompiler": "weex",
- "compatible": {
- "ignoreVersion": true
- },
- "screenOrientation": [
- "portrait-primary",
- "portrait-secondary",
- "landscape-primary",
- "landscape-secondary"
- ],
- "privacy": {
- "prompt": "template",
- "template": {
- "title": "用户协议和隐私政策",
- "message": "请你务必审慎阅读、充分理解“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。
你可阅读《用户协议》和《隐私协议》了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。",
- "buttonAccept": "同意",
- "buttonRefuse": "暂不同意"
- }
- },
- "modules": {
- "Payment": {},
- "Share": {},
- "Camera": {},
- "OAuth": {},
- "VideoPlayer": {}
- },
- "distribute": {
- "apple": {
- "devices": "universal"
- },
- // "UIBackgroundModes" : [ "audio" ]
- "android": {
- "permissionPhoneState": {
- "request": "none",
- "prompt": "为保证您正常、安全地使用，需要获取设备识别码（部分手机提示为获取手机号码）使用权限，请允许。"
- },
- "permissionExternalStorage": {
- "request": "none",
- "prompt": "应用保存运行状态等信息，需要获取读写手机存储（系统提示为访问设备上的照片、媒体内容和文件）权限，请允许。"
- },
- "permissions": [
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- ""
- ],
- "abiFilters": ["armeabi-v7a", "arm64-v8a", "x86"],
- "minSdkVersion": 21,
- "targetSdkVersion": 30,
- "schemes": "medicine"
- },
- "sdkConfigs": {
- "ad": {},
- "maps": {},
- "share": {
- "weixin": {
- "appid": "wx6b17b40171dea988",
- "UniversalLinks": "https://verification.nuttyreading.com/uni-universallinks/__UNI__C7475A8/"
- }
- },
- "payment": {
- "alipay": {
- "__platform__": ["ios", "android"]
- },
- "appleiap": {},
- "weixin": {
- "__platform__": ["ios", "android"],
- "appid": "wx6b17b40171dea988",
- "UniversalLinks": "https://verification.nuttyreading.com/uni-universallinks/__UNI__C7475A8/"
- }
- },
- "oauth": {},
- "push": {}
- },
- "splashscreen": {
- "iosStyle": "common",
- "androidStyle": "default",
- "useOriginalMsgbox": true
- },
- "ios": {
- "dSYMs": false,
- // "UIBackgroundModes" : [ "audio" ], // 背景播放音乐
- "capabilities": {
- "entitlements": {
- "com.apple.developer.associated-domains": ["applinks:verification.nuttyreading.com"]
- }
- },
- "idfa": false,
- "urltypes": "medicine",
- "urlschemewhitelist": "nuttyreading,zmzm",
- "privacyDescription": {
- "NSPhotoLibraryUsageDescription": "保障您在此app中的修改头像、申诉反馈上传图片、留言上传图片功能的正常使用",
- "NSCameraUsageDescription": "保障您在此app中的修改头像、申诉反馈上传图片、留言上传图片功能的正常使用",
- "NSPhotoLibraryAddUsageDescription": "保障您在此app中的修改头像、申诉反馈上传图片、留言上传图片功能的正常使用"
- }
- },
- "icons": {
- "android": {
- "hdpi": "unpackage/res/icons/72x72.png",
- "xhdpi": "unpackage/res/icons/96x96.png",
- "xxhdpi": "unpackage/res/icons/144x144.png",
- "xxxhdpi": "unpackage/res/icons/192x192.png"
- },
- "ios": {
- "appstore": "unpackage/res/icons/1024x1024.png",
- "ipad": {
- "app": "unpackage/res/icons/76x76.png",
- "app@2x": "unpackage/res/icons/152x152.png",
- "notification": "unpackage/res/icons/20x20.png",
- "notification@2x": "unpackage/res/icons/40x40.png",
- "proapp@2x": "unpackage/res/icons/167x167.png",
- "settings": "unpackage/res/icons/29x29.png",
- "settings@2x": "unpackage/res/icons/58x58.png",
- "spotlight": "unpackage/res/icons/40x40.png",
- "spotlight@2x": "unpackage/res/icons/80x80.png"
- },
- "iphone": {
- "app@2x": "unpackage/res/icons/120x120.png",
- "app@3x": "unpackage/res/icons/180x180.png",
- "notification@2x": "unpackage/res/icons/40x40.png",
- "notification@3x": "unpackage/res/icons/60x60.png",
- "settings@2x": "unpackage/res/icons/58x58.png",
- "settings@3x": "unpackage/res/icons/87x87.png",
- "spotlight@2x": "unpackage/res/icons/80x80.png",
- "spotlight@3x": "unpackage/res/icons/120x120.png"
- }
- }
- }
- },
- "compilerVersion": 3,
- "nvueLaunchMode": "fast",
- "splashscreen": {
- "alwaysShowBeforeRender": false
- },
- "nativePlugins": {},
- "uniStatistics": {
- "enable": true
- },
- "safearea": {
- //安全区域配置，仅iOS平台生效
- "bottom": {
- // 底部安全区域配置
- "offset": "none" // 底部安全区域偏移，"none"表示不空出安全区域，"auto"自动计算空出安全区域，默认值为"none"
- }
- }
- },
- // 5+App特有相关
- "quickapp": {},
- // 快应用特有相关
- "mp-weixin": {
- "setting": {
- "urlCheck": false,
- "es6": true,
- "postcss": true,
- "minified": true
- },
- "usingComponents": true,
- "appid": "wxd3ba52b7661b36be",
- "permission": {
- "scope.userLocation": {
- "desc": "你的位置信息将用于小程序位置接口的效果展示"
- }
- },
- "uniStatistics": {
- "enable": true
- }
- },
- "h5": {
- "template": "template.h5.html",
- "router": {
- "mode": "hash",
- "base": "/uniappDemo/"
- },
- "optimization": {
- "treeShaking": {
- "enable": true
- }
- },
- "uniStatistics": {
- "enable": true
- }
- },
- "_spaceID": "mp-3614b80b-2d75-4462-a481-4998f8187274",
- "uniStatistics": {
- "version": "2",
- "enable": true
- },
- "mp-alipay": {
- "uniStatistics": {
- "enable": true
- }
- },
- "mp-baidu": {
- "uniStatistics": {
- "enable": true
- }
- },
- "mp-jd": {
- "uniStatistics": {
- "enable": true
- }
- },
- "mp-kuaishou": {
- "uniStatistics": {
- "enable": true
- }
- },
- "mp-lark": {
- "uniStatistics": {
- "enable": true
- }
- },
- "mp-qq": {
- "uniStatistics": {
- "enable": true
- }
- },
- "mp-toutiao": {
- "uniStatistics": {
- "enable": true
- }
- },
- "quickapp-webview-huawei": {
- "uniStatistics": {
- "enable": true
- }
- },
- "quickapp-webview-union": {
- "uniStatistics": {
- "enable": true
- }
- }
+ "name" : "吴门医述",
+ "appid" : "__UNI__C7475A8",
+ "description" : "吴门医述",
+ "networkTimeout" : {
+ "request" : 15000
+ },
+ "transformPx" : false,
+ "icons" : [
+ {
+ "sizes" : "分辨率，192x192",
+ "src" : "图片路径"
+ }
+ ],
+ "versionName" : "1.0.19",
+ "versionCode" : 1019,
+ "app-plus" : {
+ "nvueCompiler" : "weex",
+ "compatible" : {
+ "ignoreVersion" : true
+ },
+ "screenOrientation" : [
+ "portrait-primary",
+ "portrait-secondary",
+ "landscape-primary",
+ "landscape-secondary"
+ ],
+ "privacy" : {
+ "prompt" : "template",
+ "template" : {
+ "title" : "用户协议和隐私政策",
+ "message" : "请你务必审慎阅读、充分理解“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。
你可阅读《用户协议》和《隐私协议》了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。",
+ "buttonAccept" : "同意",
+ "buttonRefuse" : "暂不同意"
+ }
+ },
+ "modules" : {
+ "Payment" : {},
+ "Share" : {},
+ "Camera" : {},
+ "OAuth" : {},
+ "VideoPlayer" : {}
+ },
+ "distribute" : {
+ "apple" : {
+ "devices" : "universal"
+ },
+ // "UIBackgroundModes" : [ "audio" ]
+ "android" : {
+ "permissionPhoneState" : {
+ "request" : "none",
+ "prompt" : "为保证您正常、安全地使用，需要获取设备识别码（部分手机提示为获取手机号码）使用权限，请允许。"
+ },
+ "permissionExternalStorage" : {
+ "request" : "none",
+ "prompt" : "应用保存运行状态等信息，需要获取读写手机存储（系统提示为访问设备上的照片、媒体内容和文件）权限，请允许。"
+ },
+ "permissions" : [
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ ""
+ ],
+ "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ],
+ "minSdkVersion" : 21,
+ "targetSdkVersion" : 30,
+ "schemes" : "medicine"
+ },
+ "sdkConfigs" : {
+ "ad" : {},
+ "maps" : {},
+ "share" : {
+ "weixin" : {
+ "appid" : "wx6b17b40171dea988",
+ "UniversalLinks" : "https://verification.nuttyreading.com/uni-universallinks/__UNI__C7475A8/"
+ }
+ },
+ "payment" : {
+ "alipay" : {
+ "__platform__" : [ "ios", "android" ]
+ },
+ "appleiap" : {},
+ "weixin" : {
+ "__platform__" : [ "ios", "android" ],
+ "appid" : "wx6b17b40171dea988",
+ "UniversalLinks" : "https://verification.nuttyreading.com/uni-universallinks/__UNI__C7475A8/"
+ }
+ },
+ "oauth" : {},
+ "push" : {}
+ },
+ "splashscreen" : {
+ "iosStyle" : "common",
+ "androidStyle" : "default",
+ "useOriginalMsgbox" : true
+ },
+ "ios" : {
+ "dSYMs" : false,
+ // "UIBackgroundModes" : [ "audio" ], // 背景播放音乐
+ "capabilities" : {
+ "entitlements" : {
+ "com.apple.developer.associated-domains" : [ "applinks:verification.nuttyreading.com" ]
+ }
+ },
+ "idfa" : false,
+ "urltypes" : "medicine",
+ "urlschemewhitelist" : "nuttyreading,zmzm",
+ "privacyDescription" : {
+ "NSPhotoLibraryUsageDescription" : "保障您在此app中的修改头像、申诉反馈上传图片、留言上传图片功能的正常使用",
+ "NSCameraUsageDescription" : "保障您在此app中的修改头像、申诉反馈上传图片、留言上传图片功能的正常使用",
+ "NSPhotoLibraryAddUsageDescription" : "保障您在此app中的修改头像、申诉反馈上传图片、留言上传图片功能的正常使用"
+ }
+ },
+ "icons" : {
+ "android" : {
+ "hdpi" : "unpackage/res/icons/72x72.png",
+ "xhdpi" : "unpackage/res/icons/96x96.png",
+ "xxhdpi" : "unpackage/res/icons/144x144.png",
+ "xxxhdpi" : "unpackage/res/icons/192x192.png"
+ },
+ "ios" : {
+ "appstore" : "unpackage/res/icons/1024x1024.png",
+ "ipad" : {
+ "app" : "unpackage/res/icons/76x76.png",
+ "app@2x" : "unpackage/res/icons/152x152.png",
+ "notification" : "unpackage/res/icons/20x20.png",
+ "notification@2x" : "unpackage/res/icons/40x40.png",
+ "proapp@2x" : "unpackage/res/icons/167x167.png",
+ "settings" : "unpackage/res/icons/29x29.png",
+ "settings@2x" : "unpackage/res/icons/58x58.png",
+ "spotlight" : "unpackage/res/icons/40x40.png",
+ "spotlight@2x" : "unpackage/res/icons/80x80.png"
+ },
+ "iphone" : {
+ "app@2x" : "unpackage/res/icons/120x120.png",
+ "app@3x" : "unpackage/res/icons/180x180.png",
+ "notification@2x" : "unpackage/res/icons/40x40.png",
+ "notification@3x" : "unpackage/res/icons/60x60.png",
+ "settings@2x" : "unpackage/res/icons/58x58.png",
+ "settings@3x" : "unpackage/res/icons/87x87.png",
+ "spotlight@2x" : "unpackage/res/icons/80x80.png",
+ "spotlight@3x" : "unpackage/res/icons/120x120.png"
+ }
+ }
+ }
+ },
+ "compilerVersion" : 3,
+ "nvueLaunchMode" : "fast",
+ "splashscreen" : {
+ "alwaysShowBeforeRender" : false
+ },
+ "nativePlugins" : {},
+ "uniStatistics" : {
+ "enable" : true
+ },
+ "safearea" : {
+ //安全区域配置，仅iOS平台生效
+ "bottom" : {
+ // 底部安全区域配置
+ "offset" : "none" // 底部安全区域偏移，"none"表示不空出安全区域，"auto"自动计算空出安全区域，默认值为"none"
+ }
+ }
+ },
+ // 5+App特有相关
+ "quickapp" : {},
+ // 快应用特有相关
+ "mp-weixin" : {
+ "setting" : {
+ "urlCheck" : false,
+ "es6" : true,
+ "postcss" : true,
+ "minified" : true
+ },
+ "usingComponents" : true,
+ "appid" : "wxd3ba52b7661b36be",
+ "permission" : {
+ "scope.userLocation" : {
+ "desc" : "你的位置信息将用于小程序位置接口的效果展示"
+ }
+ },
+ "uniStatistics" : {
+ "enable" : true
+ }
+ },
+ "h5" : {
+ "template" : "template.h5.html",
+ "router" : {
+ "mode" : "hash",
+ "base" : "/uniappDemo/"
+ },
+ "optimization" : {
+ "treeShaking" : {
+ "enable" : true
+ }
+ },
+ "uniStatistics" : {
+ "enable" : true
+ }
+ },
+ "_spaceID" : "mp-3614b80b-2d75-4462-a481-4998f8187274",
+ "uniStatistics" : {
+ "version" : "2",
+ "enable" : true
+ },
+ "mp-alipay" : {
+ "uniStatistics" : {
+ "enable" : true
+ }
+ },
+ "mp-baidu" : {
+ "uniStatistics" : {
+ "enable" : true
+ }
+ },
+ "mp-jd" : {
+ "uniStatistics" : {
+ "enable" : true
+ }
+ },
+ "mp-kuaishou" : {
+ "uniStatistics" : {
+ "enable" : true
+ }
+ },
+ "mp-lark" : {
+ "uniStatistics" : {
+ "enable" : true
+ }
+ },
+ "mp-qq" : {
+ "uniStatistics" : {
+ "enable" : true
+ }
+ },
+ "mp-toutiao" : {
+ "uniStatistics" : {
+ "enable" : true
+ }
+ },
+ "quickapp-webview-huawei" : {
+ "uniStatistics" : {
+ "enable" : true
+ }
+ },
+ "quickapp-webview-union" : {
+ "uniStatistics" : {
+ "enable" : true
+ }
+ }
}
-// 小程序特有相关
\ No newline at end of file
+// 小程序特有相关
+
diff --git a/pages/miniClass/classInfo.vue b/pages/miniClass/classInfo.vue
index c0aef5d..c695207 100644
--- a/pages/miniClass/classInfo.vue
+++ b/pages/miniClass/classInfo.vue
@@ -51,11 +51,16 @@
-
+
总成绩：
{{performanceScore.userScore}}分
- （{{performanceScore.examScore}}分考试分+{{performanceScore.usualScore}}分平时表现分）
+
+
+ （{{performanceScore.examScore}}分考试分
+ ，{{performanceScore.usualScore}}分平时表现分）
+
+
@@ -98,10 +103,10 @@
@click="continueTest(examId)">继续考试
-
+
{{paperSore}}
分
@@ -117,7 +122,7 @@
-
+
表现分
@@ -661,10 +666,12 @@
var severNowTime = -1
// paperData = await this.getlocaltestInfo('paperEndTime')
var historyPaper = await this.getingPaper()
+ console.log('正在进行中的试卷信息', historyPaper);
this.ingPaper = historyPaper
// console.log('对比----------------', historyPaper.classId, this.classId);
if (historyPaper&& historyPaper != null && historyPaper.classId == this.classId) {
- paperEndTime = this.hourUp(historyPaper.startTime, 1) // 结束的时间戳
+ var planEndTimeDate = new Date(historyPaper.planEndTime)
+ paperEndTime = planEndTimeDate.getTime(); // 结束的时间戳
this.examId = historyPaper.id
} else {
this.examId = undefined
@@ -1092,7 +1099,8 @@
console.log('考试中999999999999999999', res);
if (res.code == 0) {
if (res.classExamUser != null) {
- obj = res.classExamUser
+ obj = {...res.classExamUser, planEndTime:res.planEndTime}
+ // obj
} else {
obj = undefined
}
diff --git a/pages/miniClass/classInfoMan.vue b/pages/miniClass/classInfoMan.vue
index 05e133e..43f1e24 100644
--- a/pages/miniClass/classInfoMan.vue
+++ b/pages/miniClass/classInfoMan.vue
@@ -122,7 +122,7 @@
+ v-if="classModel.isExam == 0 && thisClass.state == '1' && thisClass.showOverBtn && (roleCode.includes('1') || roleCode.includes('2'))">
结班
@@ -162,22 +162,7 @@
国学VIP
-
-
+
医学VIP用户
国学VIP用户 -->
-
-
+
@@ -389,7 +331,7 @@
-
+
{{thisStudentScore.user.nickname != null && thisStudentScore.user.nickname != '' ? thisStudentScore.user.nickname : "匿名用户"}}
@@ -1962,4 +1904,11 @@
z-index: 1;
}
}
+ .manScoreBox{
+ .item{padding: 20rpx 0;}
+ .scoreBox{margin-top: 20rpx; padding: 20rpx;
+
+ .ciyao{padding-bottom: 20rpx;}
+ }
+ }
\ No newline at end of file
diff --git a/pages/miniClass/classInfoWork.vue b/pages/miniClass/classInfoWork.vue
index 25b586e..237028f 100644
--- a/pages/miniClass/classInfoWork.vue
+++ b/pages/miniClass/classInfoWork.vue
@@ -268,7 +268,7 @@
-
+
{{thisStudentScore.user.nickname != null && thisStudentScore.user.nickname != '' ? thisStudentScore.user.nickname : "匿名用户"}}
@@ -1513,4 +1513,11 @@
z-index: 1;
}
}
+ .manScoreBox{
+ .item{padding: 20rpx 0;}
+ .scoreBox{margin-top: 20rpx; padding: 20rpx;
+
+ .ciyao{padding-bottom: 20rpx;}
+ }
+ }
\ No newline at end of file
diff --git a/pages/miniClass/continueTest.vue b/pages/miniClass/continueTest.vue
index 5d285e6..3f367c0 100644
--- a/pages/miniClass/continueTest.vue
+++ b/pages/miniClass/continueTest.vue
@@ -172,7 +172,7 @@
computed: {
...mapState(["userInfo"]),
getallLIst() {
- const numbers = Array.from(Array(100).keys(), n => n + 1);
+ const numbers = Array.from(Array(this.questionList.length).keys(), n => n + 1);
console.log('numbers', numbers);
return numbers
}
@@ -458,7 +458,7 @@
.then(async res => {
uni.hideLoading()
if (res.code == 0) {
- console.log('试卷信息',res.examPaper);
+ console.log('试卷信息',res);
var subOptions = JSON.parse(res.examPaper.subject)
this.answerIdsList = JSON.parse(res.examPaper.answer)
var newAnswerIdsList = [...this.answerIdsList ]
@@ -472,7 +472,7 @@
code++
})
var temList = newAnswerIdsList[index].split(',')
- console.log('temList474',temList);
+ // console.log('temList474',temList);
if(temList == ''){
temList = []
}else{
@@ -484,10 +484,10 @@
this.noAnswerList = this.getNoAnswerList()
this.haveAnswerList = this.gethaveAnswerList()
// console.log('this.answerIdsList', this.answerIdsList);
- this.testPaper = res.examPaper
- // this.examId = res.id
- // this.paperCreateTime = 1
- this.endTime = this.hourUp(res.examPaper.startTime,1) // 结束的时间戳
+ this.testPaper = res.examPaper
+ var planEndTimeDate = new Date(res.planEndTime)
+ this.endTime = planEndTimeDate.getTime(); // 结束的时间戳
+
console.log('this.endTime',this.endTime);
var severNowTime = await this.getServerTime()
this.secondTimeDif = this.endTime - severNowTime // 时间差 毫秒
diff --git a/pages/miniClass/test.vue b/pages/miniClass/test.vue
index 7fd55fd..ea9931c 100644
--- a/pages/miniClass/test.vue
+++ b/pages/miniClass/test.vue
@@ -170,7 +170,7 @@
computed: {
...mapState(["userInfo"]),
getallLIst() {
- const numbers = Array.from(Array(100).keys(), n => n + 1);
+ const numbers = Array.from(Array(this.testPaper.length).keys(), n => n + 1);
console.log('numbers', numbers);
return numbers
}
@@ -453,7 +453,10 @@
this.testPaper = res.examPaper
this.examId = res.id
this.paperCreateTime = 1
- this.endTime = this.hourUp(res.startTime,2) // 结束的时间戳
+ // this.endTime = this.hourUp(res.startTime,2) // 结束的时间戳
+ var planEndTimeDate = new Date(res.planEndTime)
+ this.endTime = planEndTimeDate.getTime();
+
var severNowTime = await this.getServerTime()
this.secondTimeDif = this.endTime - severNowTime // 时间差 毫秒
if(this.secondTimeDif > 0){
diff --git a/pages/peanut/home.vue b/pages/peanut/home.vue
index d6b5012..a911fbc 100644
--- a/pages/peanut/home.vue
+++ b/pages/peanut/home.vue
@@ -387,8 +387,9 @@
var severNowTime = -1
// paperData = await this.getlocaltestInfo('paperEndTime')
var historyPaper = await this.getingPaper()
- if(historyPaper){
- paperEndTime = this.hourUp(historyPaper.startTime,1) // 结束的时间戳
+ if(historyPaper && historyPaper != null){
+ var planEndTimeDate = new Date(historyPaper.planEndTime)
+ paperEndTime = planEndTimeDate.getTime(); // 结束的时间戳
this.examId = historyPaper.id
this.classId = historyPaper.classId
}else{
@@ -484,9 +485,12 @@
.then(async (res) => {
console.log('考试中',res);
if (res.code == 0 && res.classExamUser != null) {
- obj = res.classExamUser
+ obj = {...res.classExamUser, planEndTime:res.planEndTime}
+ }else{
+ obj = undefined
}
- }).catch(e => {
+ }).catch(e => {
+ obj = undefined
});
return obj