添加题目数量+考试时长灵活设置

2024-09-11 17:05:56 +08:00
parent 72dcbfdd82
commit c71b2c67b4
7 changed files with 327 additions and 353 deletions
--- 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": "请你务必审慎阅读、充分理解“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。<br/>　　你可阅读<a href='https://wumen.taihumed.com/agreement.html'>《用户协议》</a>和<a href='https://wumen.taihumed.com/privacy.html'>《隐私协议》</a>了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。",
-				"buttonAccept": "同意",
-				"buttonRefuse": "暂不同意"
-			}
-		},
-		"modules": {
-			"Payment": {},
-			"Share": {},
-			"Camera": {},
-			"OAuth": {},
-			"VideoPlayer": {}
-		},
-		"distribute": {
-			"apple": {
-				"devices": "universal"
-			},
-			// "UIBackgroundModes" : [ "audio" ]
-			"android": {
-				"permissionPhoneState": {
-					"request": "none",
-					"prompt": "为保证您正常、安全地使用，需要获取设备识别码（部分手机提示为获取手机号码）使用权限，请允许。"
-				},
-				"permissionExternalStorage": {
-					"request": "none",
-					"prompt": "应用保存运行状态等信息，需要获取读写手机存储（系统提示为访问设备上的照片、媒体内容和文件）权限，请允许。"
-				},
-				"permissions": [
-					"<uses-feature android:name=\"android.hardware.camera\"/>",
-					"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
-					"<uses-permission android:name=\"android.permission.CAMERA\"/>",
-					"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-					"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-					"<uses-permission android:name=\"android.permission.INSTALL_PACKAGES\"/>",
-					"<uses-permission android:name=\"android.permission.INTERNET\"/>",
-					"<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
-					"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-					"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.RECEIVE_BOOT_COMPLETED\"/>",
-					"<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
-					"<uses-permission android:name=\"android.permission.REQUEST_INSTALL_PACKAGES\"/>",
-					"<uses-permission android:name=\"android.permission.SYSTEM_ALERT_WINDOW\"/>",
-					"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-					"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-					"<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
-					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-				],
-				"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" : "请你务必审慎阅读、充分理解“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。<br/>　　你可阅读<a href='https://wumen.taihumed.com/agreement.html'>《用户协议》</a>和<a href='https://wumen.taihumed.com/privacy.html'>《隐私协议》</a>了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。",
+                "buttonAccept" : "同意",
+                "buttonRefuse" : "暂不同意"
+            }
+        },
+        "modules" : {
+            "Payment" : {},
+            "Share" : {},
+            "Camera" : {},
+            "OAuth" : {},
+            "VideoPlayer" : {}
+        },
+        "distribute" : {
+            "apple" : {
+                "devices" : "universal"
+            },
+            // "UIBackgroundModes" : [ "audio" ]
+            "android" : {
+                "permissionPhoneState" : {
+                    "request" : "none",
+                    "prompt" : "为保证您正常、安全地使用，需要获取设备识别码（部分手机提示为获取手机号码）使用权限，请允许。"
+                },
+                "permissionExternalStorage" : {
+                    "request" : "none",
+                    "prompt" : "应用保存运行状态等信息，需要获取读写手机存储（系统提示为访问设备上的照片、媒体内容和文件）权限，请允许。"
+                },
+                "permissions" : [
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.INSTALL_PACKAGES\"/>",
+                    "<uses-permission android:name=\"android.permission.INTERNET\"/>",
+                    "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.RECEIVE_BOOT_COMPLETED\"/>",
+                    "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
+                    "<uses-permission android:name=\"android.permission.REQUEST_INSTALL_PACKAGES\"/>",
+                    "<uses-permission android:name=\"android.permission.SYSTEM_ALERT_WINDOW\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                ],
+                "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
+        }
+    }
 }
-// 小程序特有相关
+// 小程序特有相关
+
--- a/pages/miniClass/classInfo.vue
+++ b/pages/miniClass/classInfo.vue
@@ -51,11 +51,16 @@
 				<!-- v-if="thisClass.state == '3'" -->
 				<view class="optionsBox">
 					<!-- v-show="thisClass.state == '2'" -->
-					<view class="chengji">
+					<view class="chengji" style="text-align: center;">
 						<view style="margin-top: 20rpx;">总成绩：
 							<text class="scoreNumber greenScore">{{performanceScore.userScore}}</text>分
-							<text
-								class="c999">（{{performanceScore.examScore}}分考试分+{{performanceScore.usualScore}}分平时表现分）</text>
+							<view class="">
+								<view class="">
+									<text class="c999">（{{performanceScore.examScore}}分考试分 <uni-icons type="eye" size="20" color="#999"
+										@click="showPaperList = true"></uni-icons></text>
+									<text class="c999">，{{performanceScore.usualScore}}分平时表现分）</text>
+								</view>
+							</view>							
 						</view>
 						<!-- <view>
 							恭喜您获得
@@ -71,14 +76,14 @@
 					</view>
 				</view>
 			</view>
-			<view class="pingfenBox testBox" v-if="thisClass.state == '3' && classModel.isExam == 1">
+			<view class="pingfenBox testBox" v-if="(thisClass.state == '3') && classModel.isExam == 1">
 				<view class="scoreTitle">
 					<view class="titles flex_box">
 						<text>笔试分</text><uni-icons type="help" size="18" color="#fff"
 							@click="showTestTips = true"></uni-icons>
 					</view>
 				</view>
-				<view class="optionsBox" v-if="thisClass.state == '3'">
+				<view class="optionsBox" v-if="thisClass.state == '3'">					
 					<view class=" ">
 						<view class="">
 							<!--  -->
@@ -98,10 +103,10 @@
 											@click="continueTest(examId)">继续考试</text>
 									</view>
 								</view>
-
 							</view>
 							<view class="flex_box flex_center align-items_box userScore" v-else
 								style="color: #666; justify-content: space-around !important">
+								
 								<view class="flex_box align-items_box">
 									<text><text class="PM_font mainTxt" style="font-size: 60rpx; ">{{paperSore}}</text>
 										分 </text>
@@ -117,7 +122,7 @@
 					</view>
 				</view>
 			</view>
-			<view class="pingfenBox" v-if="thisClass.state == '1' || thisClass.state == '3'">
+			<view class="pingfenBox" v-if="thisClass.state == '1' || thisClass.state == '3' || thisClass.state == '2'">
 				<view class="scoreTitle">
 					<view class="titles flex_box">
 						<text>表现分</text><uni-icons type="help" size="18" color="#fff" @click="clickHelp"></uni-icons>
@@ -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
 							}
--- a/pages/miniClass/classInfoMan.vue
+++ b/pages/miniClass/classInfoMan.vue
@@ -122,7 +122,7 @@
 						</view>

 						<view class="item overClass" @click="changeClassStatu('2')"
-							v-if="classModel.isExam == 1 && thisClass.state == '1' && thisClass.showOverBtn && (roleCode.includes('1') || roleCode.includes('2'))">
+							v-if="classModel.isExam == 0 && thisClass.state == '1' && thisClass.showOverBtn && (roleCode.includes('1') || roleCode.includes('2'))">
 							<!-- (无考试) -->
 							<text>结班</text>
 						</view>
@@ -162,22 +162,7 @@
 									<view class="item flex_box">
 										<span class="zmVip"></span><text>国学VIP</text>
 									</view>
-								</view>
-								<!-- <view v-if="thisClass.state == '2'"
-									class=" zhiliang flex_box flex_between align-items_box" style="margin-top: 20rpx;">
-									<view class="">
-										<text>A证：</text>
-										<text>20 人</text>
-									</view>
-									<view class="">
-										<text>B证：</text>
-										<text>20 人</text>
-									</view>
-									<view class="">
-										<text>不合格：</text>
-										<text>20 人</text>
-									</view>
-								</view> -->
+								</view>								
 							</view>
 							<view class="newBox">
 								<view :class="['item',
@@ -210,50 +195,7 @@
 												<text class="userType" v-if="item.student.vip == '2' ">医学VIP用户</text>
 												<text class="userType" v-if="item.student.vip == '3' ">国学VIP用户</text> -->
 										</view>
-									</view>
-									<!-- <view class="" v-if="thisClass.state == '3' || thisClass.state == '2'">
-										<view class="scoreBox flex_box flex_between border_radius_10 ">
-											<view class="">
-												<view class="ciyao">
-													平时成绩
-												</view>
-												<text class="score">{{item.student.score.peacetimeScore}}</text>
-											</view>
-											<template v-if="classModel.isExam == 1">
-												<template v-if="item.student.score.testScore.length == 0">
-													<view class="" v-if="thisClass.state == '3'">
-														<view class="" style="color: #ff9496;">
-															未考试
-														</view>
-													</view>
-													<view class="" v-if="thisClass.state == '2'">
-														<view class="ciyao">
-															考试成绩
-														</view>
-														<text class="score">0</text>
-													</view>
-												</template>
-												<template v-else>
-													<view class="" v-if="thisClass.state == '3'">
-														<view class="" style="color: #55aa7f;">
-															等待公布分数
-														</view>
-													</view>
-													<view v-if="thisClass.state == '2'">
-														<view class="ciyao">
-															考试成绩
-														</view>
-														<text
-															class="score">{{item.student.score.testScoreNumber}}</text>
-													</view>
-												</template>
-											</template>
-											
-											<view v-if="classModel.isExam == 1 && thisClass.state == '2'"
-												:class="['PM_font','zhengshu',item.student.score.certificateType == 'A' ? 'Azheng' : 'Bzheng']">
-											</view>
-										</view>
-									</view> -->
+									</view>									
 								</view>
 							</view>
 						</view>
@@ -389,7 +331,7 @@
 			</view>
 		</u-popup>
 		<u-popup key="3" v-if="showStudentScoreBlank" :show="showStudentScoreBlank" :round="10" @close="closePup" ref="">
-			<view class="upopBox" style="">
+			<view class="upopBox manScoreBox" style="">
 				<h3 style="margin-bottom: 20rpx;">
 					{{thisStudentScore.user.nickname != null && thisStudentScore.user.nickname != '' ? thisStudentScore.user.nickname : "匿名用户"}}
 				</h3>
@@ -1962,4 +1904,11 @@
 			z-index: 1;
 		}
 	}
+	.manScoreBox{
+		.item{padding: 20rpx 0;}
+		.scoreBox{margin-top: 20rpx; padding: 20rpx;
+		
+			.ciyao{padding-bottom: 20rpx;}
+		}
+	}
 </style>
--- a/pages/miniClass/classInfoWork.vue
+++ b/pages/miniClass/classInfoWork.vue
@@ -268,7 +268,7 @@
 		</u-popup>
 		<u-popup key="3" v-if="showStudentScoreBlank" :show="showStudentScoreBlank" :round="10" @close="closePup"
 			ref="">
-			<view class="upopBox" style="">
+			<view class="upopBox manScoreBox" style="">
 				<h3 style="margin-bottom: 20rpx;">
 					{{thisStudentScore.user.nickname != null && thisStudentScore.user.nickname != '' ? thisStudentScore.user.nickname : "匿名用户"}}
 				</h3>
@@ -1513,4 +1513,11 @@
 			z-index: 1;
 		}
 	}
+	.manScoreBox{
+		.item{padding: 20rpx 0;}
+		.scoreBox{margin-top: 20rpx; padding: 20rpx;
+		
+			.ciyao{padding-bottom: 20rpx;}
+		}
+	}
 </style>
--- 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        // 时间差 毫秒
--- 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){
--- 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