Merge branch 'dev0731' into zcwy-learn

api/ajax.js

@@ -74,6 +74,8 @@ const jsonRequest=function(method,url,data){
 	let token=getToken();
 	if(!token){
 		token='';
+		// location.href=config.loginPath+"?returnUrl="+encodeURIComponent(window.location.href);
+		// return	
 	}
 	let headers={
 		'XBOE-Access-Token':token
@@ -89,8 +91,8 @@ const jsonRequest=function(method,url,data){
 		        dataType: 'json',
 		        header: headers,
 				success:function(rs,statusCode){
-					if(rs.statusCode==200){
-						if(rs.data.status==401  || rs.data.status==402){
+					if(rs.statusCode==200 || rs.code.code == 200){
+						if(rs.data.status==401  || rs.data.status==402 || (rs.data.data && rs.data.data.status==401)){
 							removeToken();
 							toLogin(reUrl);
 							// let loginPath=config.loginPath;

api/lecturer/certification.js.js

@@ -0,0 +1,37 @@
+/* 
+  讲师认证
+*/
+import config from '@/config/index.js'
+const baseURL = config.apiActivityUrl;
+import ajax from '../ajax';
+/*
+  选择讲师列表
+  @param reviewId  评估ID
+  @param judgesWorkNum  评委工号
+ */
+const lecturerCertificationSave=function(data){
+  return ajax.postJson(baseURL,'/score/save',data);
+}
+/*
+  提交分数
+  @param teacherId  讲师ID
+  @param judgesWorkNum  评委工号
+  @param score  分数
+  @param isSecond  
+*/
+const lecturerCertificationList=function(data){
+  return ajax.postJson(baseURL,'/score/list',data);
+}
+/*
+  讲师详情
+  @param teacherId  讲师ID
+*/
+const lecturerCertificationInfo=function(data){
+  return ajax.postJson(baseURL,'/score/getScores',data);
+}
+
+export default{
+    lecturerCertificationList,
+    lecturerCertificationInfo,
+    lecturerCertificationSave
+}

components/video-player/video-player.vue

@@ -23,7 +23,8 @@
 				</view>
 				<view class="currtime">{{currtime}}</view>
 				<view class='slider-container'>
-					<slider :disabled="!drag" @change.stop="sliderChange" @changing="sliderChanging" step="1" :value="sliderValue" backgroundColor="#9f9587" activeColor="#d6d2cc" block-color="#FFFFFF" block-size="12"/>
+					<slider v-if="drag"  @change.stop="sliderChange" @changing="sliderChanging" step="1" :value="sliderValue" backgroundColor="#9f9587" activeColor="#d6d2cc" block-color="#FFFFFF" block-size="12"/>
+          <slider v-if="!drag" disabled="true" step="1" :value="sliderValue" backgroundColor="#9f9587" activeColor="#d6d2cc" block-color="#FFFFFF" block-size="12"/>
         </view>
 				<view class="druationTime">{{druationTime}}</view>
 				<view class="druationTime">
@@ -166,6 +167,7 @@
 					let second=sliderValue / 100 * duration;
 					if (this.updateState) { //判断拖拽完成后才触发更新，避免拖拽失效
 						this.sliderValue=sliderValue;
+						this.$emit('progress',this.sliderValue);
 					}else{
 						
 					}

config/index.js

@@ -11,7 +11,7 @@ let appId=''
 let fileUrl='';
 let version=1;
 let scormPlayer='';
-
+let apiActivityUrl = '';
 if(process.env.NODE_ENV === 'development'){
 	//本地开发环境
 	apiBaseUrl = '/systemapi';
@@ -23,6 +23,7 @@ if(process.env.NODE_ENV === 'development'){
 	//fileUrl = 'https://u-pre.boe.com/cdn/upload';
 	loginPath='/mobile/pages/login/login';
 	scormPlayer='https://u-pre.boe.com/scorm-player';
+	apiActivityUrl='/activityApi';
 }else if(process.env.ENV_TYPE === 'preview'){
     // 预发布环境，当前配置未使用上
 	context='/mobile-release';
@@ -31,9 +32,10 @@ if(process.env.NODE_ENV === 'development'){
 	oldApiBaseUrl = '/uboeApi';
 	statApiBaseUrl='/statApi-release';
 	socialApiBaseUrl='/socialApi-release';
-	fileUrl = 'https://u.boe.com/upload';
+	fileUrl = 'https://u.com/upload';
 	loginPath='https://u.boe.com/m/loginuser';
 	scormPlayer='https://u.boe.com/newscorm/scorm-player';
+	apiActivityUrl='/activityApi';
 }else if(process.env.ENV_TYPE === 'testing'){
     // 测试环境
 	apiBaseUrl = '/systemapi';
@@ -43,6 +45,7 @@ if(process.env.NODE_ENV === 'development'){
 	fileUrl = 'https://u-pre.boe.com/upload';
 	loginPath='https://u-pre.boe.com/m/loginuser';
 	scormPlayer='https://u-pre.boe.com/newscorm/scorm-player';
+	apiActivityUrl='/activityApi';
 }else{
     // 生产环境
 	apiBaseUrl = '/systemapi';
@@ -50,12 +53,14 @@ if(process.env.NODE_ENV === 'development'){
 	oldApiBaseUrl = '/uboeApi';
 	statApiBaseUrl='/statApi';
 	socialApiBaseUrl='/socialApi';
-	fileUrl = 'https://u.boe.com/upload';
+	fileUrl = 'https://u.com/upload';
 	loginPath='https://u.boe.com/m/loginuser';
 	scormPlayer='https://u.boe.com/newscorm/scorm-player';
+	apiActivityUrl='/activityApi';
 }
 
 export default {
+	apiActivityUrl:apiActivityUrl,
 	apiBaseUrl:apiBaseUrl,
 	oldApiBaseUrl:oldApiBaseUrl,
 	manageApiBaseUrl:manageApiBaseUrl,

hs_err_pid23704.log

@@ -0,0 +1,247 @@
+#
+# There is insufficient memory for the Java Runtime Environment to continue.
+# Native memory allocation (mmap) failed to map 266338304 bytes for G1 virtual space
+# Possible reasons:
+#   The system is out of physical RAM or swap space
+#   The process is running with CompressedOops enabled, and the Java Heap may be blocking the growth of the native heap
+# Possible solutions:
+#   Reduce memory load on the system
+#   Increase physical memory or swap space
+#   Check if swap backing store is full
+#   Decrease Java heap size (-Xmx/-Xms)
+#   Decrease number of Java threads
+#   Decrease Java thread stack sizes (-Xss)
+#   Set larger code cache with -XX:ReservedCodeCacheSize=
+#   JVM is running with Zero Based Compressed Oops mode in which the Java heap is
+#     placed in the first 32GB address space. The Java Heap base address is the
+#     maximum limit for the native heap growth. Please use -XX:HeapBaseMinAddress
+#     to set the Java Heap base and to place the Java Heap above 32GB virtual address.
+# This output file may be truncated or incomplete.
+#
+#  Out of Memory Error (os_windows.cpp:3825), pid=23704, tid=7560
+#
+# JRE version:  (17.0.9+7) (build )
+# Java VM: OpenJDK 64-Bit Server VM (17.0.9+7-b1000.46, mixed mode, sharing, tiered, compressed oops, compressed class ptrs, g1 gc, windows-amd64)
+# No core dump will be written. Minidumps are not enabled by default on client versions of Windows
+#
+
+---------------  S U M M A R Y ------------
+
+Command Line: git4idea.http.GitAskPassApp Username for 'http://10.251.129.121': 
+
+Host: Intel(R) Core(TM) i7-9750H CPU @ 2.60GHz, 12 cores, 15G,  Windows 11 , 64 bit Build 22621 (10.0.22621.3374)
+Time: Tue May 14 19:06:17 2024  Windows 11 , 64 bit Build 22621 (10.0.22621.3374) elapsed time: 0.011895 seconds (0d 0h 0m 0s)
+
+---------------  T H R E A D  ---------------
+
+Current thread (0x0000020375a5c2d0):  JavaThread "Unknown thread" [_thread_in_vm, id=7560, stack(0x0000005082d00000,0x0000005082e00000)]
+
+Stack: [0x0000005082d00000,0x0000005082e00000]
+Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code)
+V  [jvm.dll+0x6886e9]
+V  [jvm.dll+0x841e4a]
+V  [jvm.dll+0x843a8e]
+V  [jvm.dll+0x8440f3]
+V  [jvm.dll+0x24c14f]
+V  [jvm.dll+0x685499]
+V  [jvm.dll+0x679c2a]
+V  [jvm.dll+0x30cf9b]
+V  [jvm.dll+0x314446]
+V  [jvm.dll+0x36425e]
+V  [jvm.dll+0x36448f]
+V  [jvm.dll+0x2e2d68]
+V  [jvm.dll+0x2e3cd4]
+V  [jvm.dll+0x8129f1]
+V  [jvm.dll+0x3720c1]
+V  [jvm.dll+0x7f152c]
+V  [jvm.dll+0x3f5d4f]
+V  [jvm.dll+0x3f7981]
+C  [jli.dll+0x528f]
+C  [ucrtbase.dll+0x29333]
+C  [KERNEL32.DLL+0x1257d]
+C  [ntdll.dll+0x5aa48]
+
+
+---------------  P R O C E S S  ---------------
+
+Threads class SMR info:
+_java_thread_list=0x00007ffb18bcef18, length=0, elements={
+}
+
+Java Threads: ( => current thread )
+
+Other Threads:
+  0x0000020375aca2f0 GCTaskThread "GC Thread#0" [stack: 0x0000005082e00000,0x0000005082f00000] [id=35172]
+  0x0000020375adb000 ConcurrentGCThread "G1 Main Marker" [stack: 0x0000005082f00000,0x0000005083000000] [id=38588]
+  0x0000020375adba20 ConcurrentGCThread "G1 Conc#0" [stack: 0x0000005083000000,0x0000005083100000] [id=39644]
+
+[error occurred during error reporting (printing all threads), id 0xc0000005, EXCEPTION_ACCESS_VIOLATION (0xc0000005) at pc=0x00007ffb18383937]
+
+VM state: not at safepoint (not fully initialized)
+
+VM Mutex/Monitor currently owned by a thread:  ([mutex/lock_event])
+[0x0000020375a56d20] Heap_lock - owner thread: 0x0000020375a5c2d0
+
+Heap address: 0x0000000702400000, size: 4060 MB, Compressed Oops mode: Zero based, Oop shift amount: 3
+
+CDS archive(s) mapped at: [0x0000000000000000-0x0000000000000000-0x0000000000000000), size 0, SharedBaseAddress: 0x0000000800000000, ArchiveRelocationMode: 1.
+Narrow klass base: 0x0000000000000000, Narrow klass shift: 0, Narrow klass range: 0x0
+
+GC Precious Log:
+<Empty>
+
+Heap:
+ garbage-first heap   total 0K, used 0K [0x0000000702400000, 0x0000000800000000)
+  region size 2048K, 0 young (0K), 0 survivors (0K)
+ Metaspace       used 0K, committed 0K, reserved 0K
+  class space    used 0K, committed 0K, reserved 0K
+
+Heap Regions: E=young(eden), S=young(survivor), O=old, HS=humongous(starts), HC=humongous(continues), CS=collection set, F=free, OA=open archive, CA=closed archive, TAMS=top-at-mark-start (previous, next)
+
+Card table byte_map: [0x0000020379f20000,0x000002037a710000] _byte_map_base: 0x000002037670e000
+
+Marking Bits (Prev, Next): (CMBitMap*) 0x0000020375aca910, (CMBitMap*) 0x0000020375aca950
+ Prev Bits: [0x000002037af00000, 0x000002037ee70000)
+ Next Bits: [0x000002030f000000, 0x0000020312f70000)
+
+GC Heap History (0 events):
+No events
+
+Dll operation events (1 events):
+Event: 0.008 Loaded shared library E:\app\webstorm\WebStorm 2023.2.5\jbr\bin\java.dll
+
+Deoptimization events (0 events):
+No events
+
+Classes unloaded (0 events):
+No events
+
+Classes redefined (0 events):
+No events
+
+Internal exceptions (0 events):
+No events
+
+VM Operations (0 events):
+No events
+
+Events (0 events):
+No events
+
+
+Dynamic libraries:
+0x00007ff6b0a10000 - 0x00007ff6b0a1a000 	E:\app\webstorm\WebStorm 2023.2.5\jbr\bin\java.exe
+0x00007ffb942d0000 - 0x00007ffb944e6000 	C:\WINDOWS\SYSTEM32\ntdll.dll
+0x00007ffb92b90000 - 0x00007ffb92c54000 	C:\WINDOWS\System32\KERNEL32.DLL
+0x00007ffb917b0000 - 0x00007ffb91b57000 	C:\WINDOWS\System32\KERNELBASE.dll
+0x00007ffb91c80000 - 0x00007ffb91d91000 	C:\WINDOWS\System32\ucrtbase.dll
+0x00007ffb8a4d0000 - 0x00007ffb8a4e7000 	E:\app\webstorm\WebStorm 2023.2.5\jbr\bin\jli.dll
+0x00007ffb7b260000 - 0x00007ffb7b27b000 	E:\app\webstorm\WebStorm 2023.2.5\jbr\bin\VCRUNTIME140.dll
+0x00007ffb92310000 - 0x00007ffb924be000 	C:\WINDOWS\System32\USER32.dll
+0x00007ffb915f0000 - 0x00007ffb91616000 	C:\WINDOWS\System32\win32u.dll
+0x00007ffb92a30000 - 0x00007ffb92a59000 	C:\WINDOWS\System32\GDI32.dll
+0x00007ffb907e0000 - 0x00007ffb90a73000 	C:\WINDOWS\WinSxS\amd64_microsoft.windows.common-controls_6595b64144ccf1df_6.0.22621.3235_none_270f74e173860f98\COMCTL32.dll
+0x00007ffb91b60000 - 0x00007ffb91c79000 	C:\WINDOWS\System32\gdi32full.dll
+0x00007ffb92a60000 - 0x00007ffb92b07000 	C:\WINDOWS\System32\msvcrt.dll
+0x00007ffb91620000 - 0x00007ffb916ba000 	C:\WINDOWS\System32\msvcp_win.dll
+0x00007ffb93520000 - 0x00007ffb93551000 	C:\WINDOWS\System32\IMM32.DLL
+0x00007ffb8a5b0000 - 0x00007ffb8a5bc000 	E:\app\webstorm\WebStorm 2023.2.5\jbr\bin\vcruntime140_1.dll
+0x00007ffb477d0000 - 0x00007ffb4785d000 	E:\app\webstorm\WebStorm 2023.2.5\jbr\bin\msvcp140.dll
+0x00007ffb18090000 - 0x00007ffb18d13000 	E:\app\webstorm\WebStorm 2023.2.5\jbr\bin\server\jvm.dll
+0x00007ffb941d0000 - 0x00007ffb94282000 	C:\WINDOWS\System32\ADVAPI32.dll
+0x00007ffb92ff0000 - 0x00007ffb93098000 	C:\WINDOWS\System32\sechost.dll
+0x00007ffb91780000 - 0x00007ffb917a8000 	C:\WINDOWS\System32\bcrypt.dll
+0x00007ffb93560000 - 0x00007ffb93675000 	C:\WINDOWS\System32\RPCRT4.dll
+0x00007ffb90f10000 - 0x00007ffb90f5d000 	C:\WINDOWS\SYSTEM32\POWRPROF.dll
+0x00007ffb89be0000 - 0x00007ffb89c14000 	C:\WINDOWS\SYSTEM32\WINMM.dll
+0x00007ffb90e70000 - 0x00007ffb90e79000 	C:\WINDOWS\SYSTEM32\WSOCK32.dll
+0x00007ffb8a300000 - 0x00007ffb8a30a000 	C:\WINDOWS\SYSTEM32\VERSION.dll
+0x00007ffb92b10000 - 0x00007ffb92b81000 	C:\WINDOWS\System32\WS2_32.dll
+0x00007ffb90af0000 - 0x00007ffb90b03000 	C:\WINDOWS\SYSTEM32\UMPDC.dll
+0x00007ffb8fd70000 - 0x00007ffb8fd88000 	C:\WINDOWS\SYSTEM32\kernel.appcore.dll
+0x00007ffb8da70000 - 0x00007ffb8da7a000 	E:\app\webstorm\WebStorm 2023.2.5\jbr\bin\jimage.dll
+0x00007ffb90f60000 - 0x00007ffb91193000 	C:\WINDOWS\SYSTEM32\DBGHELP.DLL
+0x00007ffb92c60000 - 0x00007ffb92fe8000 	C:\WINDOWS\System32\combase.dll
+0x00007ffb93680000 - 0x00007ffb93757000 	C:\WINDOWS\System32\OLEAUT32.dll
+0x00007ffb90de0000 - 0x00007ffb90e12000 	C:\WINDOWS\SYSTEM32\dbgcore.DLL
+0x00007ffb91da0000 - 0x00007ffb91e19000 	C:\WINDOWS\System32\bcryptPrimitives.dll
+0x00007ffb8aae0000 - 0x00007ffb8ab05000 	E:\app\webstorm\WebStorm 2023.2.5\jbr\bin\java.dll
+
+dbghelp: loaded successfully - version: 4.0.5 - missing functions: none
+symbol engine: initialized successfully - sym options: 0x614 - pdb path: .;E:\app\webstorm\WebStorm 2023.2.5\jbr\bin;C:\WINDOWS\SYSTEM32;C:\WINDOWS\WinSxS\amd64_microsoft.windows.common-controls_6595b64144ccf1df_6.0.22621.3235_none_270f74e173860f98;E:\app\webstorm\WebStorm 2023.2.5\jbr\bin\server
+
+VM Arguments:
+java_command: git4idea.http.GitAskPassApp Username for 'http://10.251.129.121': 
+java_class_path (initial): E:/app/webstorm/WebStorm 2023.2.5/plugins/vcs-git/lib/git4idea-rt.jar;E:/app/webstorm/WebStorm 2023.2.5/lib/externalProcess-rt.jar
+Launcher Type: SUN_STANDARD
+
+[Global flags]
+     intx CICompilerCount                          = 4                                         {product} {ergonomic}
+     uint ConcGCThreads                            = 3                                         {product} {ergonomic}
+     uint G1ConcRefinementThreads                  = 10                                        {product} {ergonomic}
+   size_t G1HeapRegionSize                         = 2097152                                   {product} {ergonomic}
+    uintx GCDrainStackTargetSize                   = 64                                        {product} {ergonomic}
+   size_t InitialHeapSize                          = 266338304                                 {product} {ergonomic}
+   size_t MarkStackSize                            = 4194304                                   {product} {ergonomic}
+   size_t MaxHeapSize                              = 4257218560                                {product} {ergonomic}
+   size_t MinHeapDeltaBytes                        = 2097152                                   {product} {ergonomic}
+   size_t MinHeapSize                              = 8388608                                   {product} {ergonomic}
+    uintx NonNMethodCodeHeapSize                   = 5839372                                {pd product} {ergonomic}
+    uintx NonProfiledCodeHeapSize                  = 122909434                              {pd product} {ergonomic}
+    uintx ProfiledCodeHeapSize                     = 122909434                              {pd product} {ergonomic}
+    uintx ReservedCodeCacheSize                    = 251658240                              {pd product} {ergonomic}
+     bool SegmentedCodeCache                       = true                                      {product} {ergonomic}
+   size_t SoftMaxHeapSize                          = 4257218560                             {manageable} {ergonomic}
+     bool UseCompressedClassPointers               = true                           {product lp64_product} {ergonomic}
+     bool UseCompressedOops                        = true                           {product lp64_product} {ergonomic}
+     bool UseG1GC                                  = true                                      {product} {ergonomic}
+     bool UseLargePagesIndividualAllocation        = false                                  {pd product} {ergonomic}
+
+Logging:
+Log output configuration:
+ #0: stdout all=warning uptime,level,tags
+ #1: stderr all=off uptime,level,tags
+
+Environment Variables:
+PATH=E:\git\Git\mingw32\libexec\git-core;E:\git\Git\mingw32\libexec\git-core;E:\git\Git\mingw32\bin;E:\git\Git\usr\bin;C:\Users\zhang\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0;C:\Windows\System32\OpenSSH;C:\Program Files (x86)\NVIDIA Corporation\PhysX\Common;C:\Program Files\NVIDIA Corporation\NVIDIA NvDLISR;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0;C:\WINDOWS\System32\OpenSSH;E:\app\weixinkaifa\΢<><CEA2>web<65><62><EFBFBD><EFBFBD><EFBFBD>߹<EFBFBD><DFB9><EFBFBD>\dll;E:\nod;E:\git\Git\cmd;C:\Users\zhang\AppData\Roaming\nvm;C:\Program Files\nodejs;C:\Users\zhang\AppData\Local\Microsoft\WindowsApps;E:\vscode\Microsoft VS Code\bin;C:\Users\zhang\AppData\Roaming\npm;C:\Users\zhang\AppData\Roaming\nvm;C:\Program Files\nodejs
+USERNAME=zhang
+DISPLAY=:0.0
+LC_ALL=en_US.UTF-8
+TERM=xterm-256color
+TMPDIR=C:\Users\zhang\AppData\Local\Temp
+OS=Windows_NT
+PROCESSOR_IDENTIFIER=Intel64 Family 6 Model 158 Stepping 13, GenuineIntel
+TMP=C:\Users\zhang\AppData\Local\Temp
+TEMP=C:\Users\zhang\AppData\Local\Temp
+
+
+
+Periodic native trim disabled
+
+JNI global refs:
+JNI global refs: 0, weak refs: 0
+
+JNI global refs memory usage: 0, weak refs: 0
+
+OOME stack traces (most recent first):
+Classloader memory used:
+
+
+---------------  S Y S T E M  ---------------
+
+OS:
+ Windows 11 , 64 bit Build 22621 (10.0.22621.3374)
+OS uptime: 21 days 3:01 hours
+
+CPU: total 12 (initial active 12) (6 cores per cpu, 2 threads per core) family 6 model 158 stepping 13 microcode 0xde, cx8, cmov, fxsr, ht, mmx, 3dnowpref, sse, sse2, sse3, ssse3, sse4.1, sse4.2, popcnt, lzcnt, tsc, tscinvbit, avx, avx2, aes, erms, clmul, bmi1, bmi2, adx, fma, vzeroupper, clflush, clflushopt
+Processor Information for all 12 processors :
+  Max Mhz: 2592, Current Mhz: 2592, Mhz Limit: 2592
+
+Memory: 4k page, system-wide physical 16234M (458M free)
+TotalPageFile size 53855M (AvailPageFile size 145M)
+current process WorkingSet (physical memory assigned to process): 11M, peak: 11M
+current process commit charge ("private bytes"): 64M, peak: 318M
+
+vm_info: OpenJDK 64-Bit Server VM (17.0.9+7-b1000.46) for windows-amd64 JRE (17.0.9+7-b1000.46), built on 2023-10-27 by "builduser" with MS VC++ 16.10 / 16.11 (VS2019)
+
+END.

hs_err_pid40096.log

@@ -0,0 +1,247 @@
+#
+# There is insufficient memory for the Java Runtime Environment to continue.
+# Native memory allocation (mmap) failed to map 266338304 bytes for G1 virtual space
+# Possible reasons:
+#   The system is out of physical RAM or swap space
+#   The process is running with CompressedOops enabled, and the Java Heap may be blocking the growth of the native heap
+# Possible solutions:
+#   Reduce memory load on the system
+#   Increase physical memory or swap space
+#   Check if swap backing store is full
+#   Decrease Java heap size (-Xmx/-Xms)
+#   Decrease number of Java threads
+#   Decrease Java thread stack sizes (-Xss)
+#   Set larger code cache with -XX:ReservedCodeCacheSize=
+#   JVM is running with Zero Based Compressed Oops mode in which the Java heap is
+#     placed in the first 32GB address space. The Java Heap base address is the
+#     maximum limit for the native heap growth. Please use -XX:HeapBaseMinAddress
+#     to set the Java Heap base and to place the Java Heap above 32GB virtual address.
+# This output file may be truncated or incomplete.
+#
+#  Out of Memory Error (os_windows.cpp:3825), pid=40096, tid=33300
+#
+# JRE version:  (17.0.9+7) (build )
+# Java VM: OpenJDK 64-Bit Server VM (17.0.9+7-b1000.46, mixed mode, sharing, tiered, compressed oops, compressed class ptrs, g1 gc, windows-amd64)
+# No core dump will be written. Minidumps are not enabled by default on client versions of Windows
+#
+
+---------------  S U M M A R Y ------------
+
+Command Line: git4idea.http.GitAskPassApp Username for 'http://10.251.129.121': 
+
+Host: Intel(R) Core(TM) i7-9750H CPU @ 2.60GHz, 12 cores, 15G,  Windows 11 , 64 bit Build 22621 (10.0.22621.3374)
+Time: Tue May 14 19:05:16 2024  Windows 11 , 64 bit Build 22621 (10.0.22621.3374) elapsed time: 0.092966 seconds (0d 0h 0m 0s)
+
+---------------  T H R E A D  ---------------
+
+Current thread (0x0000025d0145c540):  JavaThread "Unknown thread" [_thread_in_vm, id=33300, stack(0x00000098f1f00000,0x00000098f2000000)]
+
+Stack: [0x00000098f1f00000,0x00000098f2000000]
+Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code)
+V  [jvm.dll+0x6886e9]
+V  [jvm.dll+0x841e4a]
+V  [jvm.dll+0x843a8e]
+V  [jvm.dll+0x8440f3]
+V  [jvm.dll+0x24c14f]
+V  [jvm.dll+0x685499]
+V  [jvm.dll+0x679c2a]
+V  [jvm.dll+0x30cf9b]
+V  [jvm.dll+0x314446]
+V  [jvm.dll+0x36425e]
+V  [jvm.dll+0x36448f]
+V  [jvm.dll+0x2e2d68]
+V  [jvm.dll+0x2e3cd4]
+V  [jvm.dll+0x8129f1]
+V  [jvm.dll+0x3720c1]
+V  [jvm.dll+0x7f152c]
+V  [jvm.dll+0x3f5d4f]
+V  [jvm.dll+0x3f7981]
+C  [jli.dll+0x528f]
+C  [ucrtbase.dll+0x29333]
+C  [KERNEL32.DLL+0x1257d]
+C  [ntdll.dll+0x5aa48]
+
+
+---------------  P R O C E S S  ---------------
+
+Threads class SMR info:
+_java_thread_list=0x00007ffb18bcef18, length=0, elements={
+}
+
+Java Threads: ( => current thread )
+
+Other Threads:
+  0x0000025d014c9850 GCTaskThread "GC Thread#0" [stack: 0x00000098f2000000,0x00000098f2100000] [id=41280]
+  0x0000025d014da560 ConcurrentGCThread "G1 Main Marker" [stack: 0x00000098f2100000,0x00000098f2200000] [id=14792]
+  0x0000025d014daf80 ConcurrentGCThread "G1 Conc#0" [stack: 0x00000098f2200000,0x00000098f2300000] [id=28168]
+
+[error occurred during error reporting (printing all threads), id 0xc0000005, EXCEPTION_ACCESS_VIOLATION (0xc0000005) at pc=0x00007ffb18383937]
+
+VM state: not at safepoint (not fully initialized)
+
+VM Mutex/Monitor currently owned by a thread:  ([mutex/lock_event])
+[0x0000025d01458b20] Heap_lock - owner thread: 0x0000025d0145c540
+
+Heap address: 0x0000000702400000, size: 4060 MB, Compressed Oops mode: Zero based, Oop shift amount: 3
+
+CDS archive(s) mapped at: [0x0000000000000000-0x0000000000000000-0x0000000000000000), size 0, SharedBaseAddress: 0x0000000800000000, ArchiveRelocationMode: 1.
+Narrow klass base: 0x0000000000000000, Narrow klass shift: 0, Narrow klass range: 0x0
+
+GC Precious Log:
+<Empty>
+
+Heap:
+ garbage-first heap   total 0K, used 0K [0x0000000702400000, 0x0000000800000000)
+  region size 2048K, 0 young (0K), 0 survivors (0K)
+ Metaspace       used 0K, committed 0K, reserved 0K
+  class space    used 0K, committed 0K, reserved 0K
+
+Heap Regions: E=young(eden), S=young(survivor), O=old, HS=humongous(starts), HC=humongous(continues), CS=collection set, F=free, OA=open archive, CA=closed archive, TAMS=top-at-mark-start (previous, next)
+
+Card table byte_map: [0x0000025d14800000,0x0000025d14ff0000] _byte_map_base: 0x0000025d10fee000
+
+Marking Bits (Prev, Next): (CMBitMap*) 0x0000025d014c9e70, (CMBitMap*) 0x0000025d014c9eb0
+ Prev Bits: [0x0000025d157e0000, 0x0000025d19750000)
+ Next Bits: [0x0000025d19750000, 0x0000025d1d6c0000)
+
+GC Heap History (0 events):
+No events
+
+Dll operation events (1 events):
+Event: 0.010 Loaded shared library E:\app\webstorm\WebStorm 2023.2.5\jbr\bin\java.dll
+
+Deoptimization events (0 events):
+No events
+
+Classes unloaded (0 events):
+No events
+
+Classes redefined (0 events):
+No events
+
+Internal exceptions (0 events):
+No events
+
+VM Operations (0 events):
+No events
+
+Events (0 events):
+No events
+
+
+Dynamic libraries:
+0x00007ff6b0a10000 - 0x00007ff6b0a1a000 	E:\app\webstorm\WebStorm 2023.2.5\jbr\bin\java.exe
+0x00007ffb942d0000 - 0x00007ffb944e6000 	C:\WINDOWS\SYSTEM32\ntdll.dll
+0x00007ffb92b90000 - 0x00007ffb92c54000 	C:\WINDOWS\System32\KERNEL32.DLL
+0x00007ffb917b0000 - 0x00007ffb91b57000 	C:\WINDOWS\System32\KERNELBASE.dll
+0x00007ffb91c80000 - 0x00007ffb91d91000 	C:\WINDOWS\System32\ucrtbase.dll
+0x00007ffb8a4d0000 - 0x00007ffb8a4e7000 	E:\app\webstorm\WebStorm 2023.2.5\jbr\bin\jli.dll
+0x00007ffb7b260000 - 0x00007ffb7b27b000 	E:\app\webstorm\WebStorm 2023.2.5\jbr\bin\VCRUNTIME140.dll
+0x00007ffb92310000 - 0x00007ffb924be000 	C:\WINDOWS\System32\USER32.dll
+0x00007ffb915f0000 - 0x00007ffb91616000 	C:\WINDOWS\System32\win32u.dll
+0x00007ffb92a30000 - 0x00007ffb92a59000 	C:\WINDOWS\System32\GDI32.dll
+0x00007ffb907e0000 - 0x00007ffb90a73000 	C:\WINDOWS\WinSxS\amd64_microsoft.windows.common-controls_6595b64144ccf1df_6.0.22621.3235_none_270f74e173860f98\COMCTL32.dll
+0x00007ffb91b60000 - 0x00007ffb91c79000 	C:\WINDOWS\System32\gdi32full.dll
+0x00007ffb92a60000 - 0x00007ffb92b07000 	C:\WINDOWS\System32\msvcrt.dll
+0x00007ffb91620000 - 0x00007ffb916ba000 	C:\WINDOWS\System32\msvcp_win.dll
+0x00007ffb93520000 - 0x00007ffb93551000 	C:\WINDOWS\System32\IMM32.DLL
+0x00007ffb7df20000 - 0x00007ffb7df2c000 	E:\app\webstorm\WebStorm 2023.2.5\jbr\bin\vcruntime140_1.dll
+0x00007ffb477d0000 - 0x00007ffb4785d000 	E:\app\webstorm\WebStorm 2023.2.5\jbr\bin\msvcp140.dll
+0x00007ffb18090000 - 0x00007ffb18d13000 	E:\app\webstorm\WebStorm 2023.2.5\jbr\bin\server\jvm.dll
+0x00007ffb941d0000 - 0x00007ffb94282000 	C:\WINDOWS\System32\ADVAPI32.dll
+0x00007ffb92ff0000 - 0x00007ffb93098000 	C:\WINDOWS\System32\sechost.dll
+0x00007ffb91780000 - 0x00007ffb917a8000 	C:\WINDOWS\System32\bcrypt.dll
+0x00007ffb93560000 - 0x00007ffb93675000 	C:\WINDOWS\System32\RPCRT4.dll
+0x00007ffb90e70000 - 0x00007ffb90e79000 	C:\WINDOWS\SYSTEM32\WSOCK32.dll
+0x00007ffb89be0000 - 0x00007ffb89c14000 	C:\WINDOWS\SYSTEM32\WINMM.dll
+0x00007ffb92b10000 - 0x00007ffb92b81000 	C:\WINDOWS\System32\WS2_32.dll
+0x00007ffb8a300000 - 0x00007ffb8a30a000 	C:\WINDOWS\SYSTEM32\VERSION.dll
+0x00007ffb90f10000 - 0x00007ffb90f5d000 	C:\WINDOWS\SYSTEM32\POWRPROF.dll
+0x00007ffb90af0000 - 0x00007ffb90b03000 	C:\WINDOWS\SYSTEM32\UMPDC.dll
+0x00007ffb8fd70000 - 0x00007ffb8fd88000 	C:\WINDOWS\SYSTEM32\kernel.appcore.dll
+0x00007ffb8da70000 - 0x00007ffb8da7a000 	E:\app\webstorm\WebStorm 2023.2.5\jbr\bin\jimage.dll
+0x00007ffb90f60000 - 0x00007ffb91193000 	C:\WINDOWS\SYSTEM32\DBGHELP.DLL
+0x00007ffb92c60000 - 0x00007ffb92fe8000 	C:\WINDOWS\System32\combase.dll
+0x00007ffb93680000 - 0x00007ffb93757000 	C:\WINDOWS\System32\OLEAUT32.dll
+0x00007ffb90de0000 - 0x00007ffb90e12000 	C:\WINDOWS\SYSTEM32\dbgcore.DLL
+0x00007ffb91da0000 - 0x00007ffb91e19000 	C:\WINDOWS\System32\bcryptPrimitives.dll
+0x00007ffb8aae0000 - 0x00007ffb8ab05000 	E:\app\webstorm\WebStorm 2023.2.5\jbr\bin\java.dll
+
+dbghelp: loaded successfully - version: 4.0.5 - missing functions: none
+symbol engine: initialized successfully - sym options: 0x614 - pdb path: .;E:\app\webstorm\WebStorm 2023.2.5\jbr\bin;C:\WINDOWS\SYSTEM32;C:\WINDOWS\WinSxS\amd64_microsoft.windows.common-controls_6595b64144ccf1df_6.0.22621.3235_none_270f74e173860f98;E:\app\webstorm\WebStorm 2023.2.5\jbr\bin\server
+
+VM Arguments:
+java_command: git4idea.http.GitAskPassApp Username for 'http://10.251.129.121': 
+java_class_path (initial): E:/app/webstorm/WebStorm 2023.2.5/plugins/vcs-git/lib/git4idea-rt.jar;E:/app/webstorm/WebStorm 2023.2.5/lib/externalProcess-rt.jar
+Launcher Type: SUN_STANDARD
+
+[Global flags]
+     intx CICompilerCount                          = 4                                         {product} {ergonomic}
+     uint ConcGCThreads                            = 3                                         {product} {ergonomic}
+     uint G1ConcRefinementThreads                  = 10                                        {product} {ergonomic}
+   size_t G1HeapRegionSize                         = 2097152                                   {product} {ergonomic}
+    uintx GCDrainStackTargetSize                   = 64                                        {product} {ergonomic}
+   size_t InitialHeapSize                          = 266338304                                 {product} {ergonomic}
+   size_t MarkStackSize                            = 4194304                                   {product} {ergonomic}
+   size_t MaxHeapSize                              = 4257218560                                {product} {ergonomic}
+   size_t MinHeapDeltaBytes                        = 2097152                                   {product} {ergonomic}
+   size_t MinHeapSize                              = 8388608                                   {product} {ergonomic}
+    uintx NonNMethodCodeHeapSize                   = 5839372                                {pd product} {ergonomic}
+    uintx NonProfiledCodeHeapSize                  = 122909434                              {pd product} {ergonomic}
+    uintx ProfiledCodeHeapSize                     = 122909434                              {pd product} {ergonomic}
+    uintx ReservedCodeCacheSize                    = 251658240                              {pd product} {ergonomic}
+     bool SegmentedCodeCache                       = true                                      {product} {ergonomic}
+   size_t SoftMaxHeapSize                          = 4257218560                             {manageable} {ergonomic}
+     bool UseCompressedClassPointers               = true                           {product lp64_product} {ergonomic}
+     bool UseCompressedOops                        = true                           {product lp64_product} {ergonomic}
+     bool UseG1GC                                  = true                                      {product} {ergonomic}
+     bool UseLargePagesIndividualAllocation        = false                                  {pd product} {ergonomic}
+
+Logging:
+Log output configuration:
+ #0: stdout all=warning uptime,level,tags
+ #1: stderr all=off uptime,level,tags
+
+Environment Variables:
+PATH=E:\git\Git\mingw32\libexec\git-core;E:\git\Git\mingw32\libexec\git-core;E:\git\Git\mingw32\libexec\git-core;E:\git\Git\mingw32\bin;E:\git\Git\usr\bin;C:\Users\zhang\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0;C:\Windows\System32\OpenSSH;C:\Program Files (x86)\NVIDIA Corporation\PhysX\Common;C:\Program Files\NVIDIA Corporation\NVIDIA NvDLISR;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0;C:\WINDOWS\System32\OpenSSH;E:\app\weixinkaifa\΢<><CEA2>web<65><62><EFBFBD><EFBFBD><EFBFBD>߹<EFBFBD><DFB9><EFBFBD>\dll;E:\nod;E:\git\Git\cmd;C:\Users\zhang\AppData\Roaming\nvm;C:\Program Files\nodejs;C:\Users\zhang\AppData\Local\Microsoft\WindowsApps;E:\vscode\Microsoft VS Code\bin;C:\Users\zhang\AppData\Roaming\npm;C:\Users\zhang\AppData\Roaming\nvm;C:\Program Files\nodejs
+USERNAME=zhang
+DISPLAY=:0.0
+LC_ALL=en_US.UTF-8
+TERM=xterm-256color
+TMPDIR=C:\Users\zhang\AppData\Local\Temp
+OS=Windows_NT
+PROCESSOR_IDENTIFIER=Intel64 Family 6 Model 158 Stepping 13, GenuineIntel
+TMP=C:\Users\zhang\AppData\Local\Temp
+TEMP=C:\Users\zhang\AppData\Local\Temp
+
+
+
+Periodic native trim disabled
+
+JNI global refs:
+JNI global refs: 0, weak refs: 0
+
+JNI global refs memory usage: 0, weak refs: 0
+
+OOME stack traces (most recent first):
+Classloader memory used:
+
+
+---------------  S Y S T E M  ---------------
+
+OS:
+ Windows 11 , 64 bit Build 22621 (10.0.22621.3374)
+OS uptime: 21 days 3:00 hours
+
+CPU: total 12 (initial active 12) (6 cores per cpu, 2 threads per core) family 6 model 158 stepping 13 microcode 0xde, cx8, cmov, fxsr, ht, mmx, 3dnowpref, sse, sse2, sse3, ssse3, sse4.1, sse4.2, popcnt, lzcnt, tsc, tscinvbit, avx, avx2, aes, erms, clmul, bmi1, bmi2, adx, fma, vzeroupper, clflush, clflushopt
+Processor Information for all 12 processors :
+  Max Mhz: 2592, Current Mhz: 2592, Mhz Limit: 2592
+
+Memory: 4k page, system-wide physical 16234M (490M free)
+TotalPageFile size 53855M (AvailPageFile size 108M)
+current process WorkingSet (physical memory assigned to process): 11M, peak: 11M
+current process commit charge ("private bytes"): 64M, peak: 318M
+
+vm_info: OpenJDK 64-Bit Server VM (17.0.9+7-b1000.46) for windows-amd64 JRE (17.0.9+7-b1000.46), built on 2023-10-27 by "builduser" with MS VC++ 16.10 / 16.11 (VS2019)
+
+END.

hs_err_pid41712.log

@@ -0,0 +1,247 @@
+#
+# There is insufficient memory for the Java Runtime Environment to continue.
+# Native memory allocation (mmap) failed to map 266338304 bytes for G1 virtual space
+# Possible reasons:
+#   The system is out of physical RAM or swap space
+#   The process is running with CompressedOops enabled, and the Java Heap may be blocking the growth of the native heap
+# Possible solutions:
+#   Reduce memory load on the system
+#   Increase physical memory or swap space
+#   Check if swap backing store is full
+#   Decrease Java heap size (-Xmx/-Xms)
+#   Decrease number of Java threads
+#   Decrease Java thread stack sizes (-Xss)
+#   Set larger code cache with -XX:ReservedCodeCacheSize=
+#   JVM is running with Zero Based Compressed Oops mode in which the Java heap is
+#     placed in the first 32GB address space. The Java Heap base address is the
+#     maximum limit for the native heap growth. Please use -XX:HeapBaseMinAddress
+#     to set the Java Heap base and to place the Java Heap above 32GB virtual address.
+# This output file may be truncated or incomplete.
+#
+#  Out of Memory Error (os_windows.cpp:3825), pid=41712, tid=20440
+#
+# JRE version:  (17.0.9+7) (build )
+# Java VM: OpenJDK 64-Bit Server VM (17.0.9+7-b1000.46, mixed mode, sharing, tiered, compressed oops, compressed class ptrs, g1 gc, windows-amd64)
+# No core dump will be written. Minidumps are not enabled by default on client versions of Windows
+#
+
+---------------  S U M M A R Y ------------
+
+Command Line: git4idea.http.GitAskPassApp Username for 'https://codeup.aliyun.com': 
+
+Host: Intel(R) Core(TM) i7-9750H CPU @ 2.60GHz, 12 cores, 15G,  Windows 11 , 64 bit Build 22621 (10.0.22621.3374)
+Time: Tue May 14 19:06:17 2024  Windows 11 , 64 bit Build 22621 (10.0.22621.3374) elapsed time: 0.010056 seconds (0d 0h 0m 0s)
+
+---------------  T H R E A D  ---------------
+
+Current thread (0x000002479b3ead10):  JavaThread "Unknown thread" [_thread_in_vm, id=20440, stack(0x000000b8ee600000,0x000000b8ee700000)]
+
+Stack: [0x000000b8ee600000,0x000000b8ee700000]
+Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code)
+V  [jvm.dll+0x6886e9]
+V  [jvm.dll+0x841e4a]
+V  [jvm.dll+0x843a8e]
+V  [jvm.dll+0x8440f3]
+V  [jvm.dll+0x24c14f]
+V  [jvm.dll+0x685499]
+V  [jvm.dll+0x679c2a]
+V  [jvm.dll+0x30cf9b]
+V  [jvm.dll+0x314446]
+V  [jvm.dll+0x36425e]
+V  [jvm.dll+0x36448f]
+V  [jvm.dll+0x2e2d68]
+V  [jvm.dll+0x2e3cd4]
+V  [jvm.dll+0x8129f1]
+V  [jvm.dll+0x3720c1]
+V  [jvm.dll+0x7f152c]
+V  [jvm.dll+0x3f5d4f]
+V  [jvm.dll+0x3f7981]
+C  [jli.dll+0x528f]
+C  [ucrtbase.dll+0x29333]
+C  [KERNEL32.DLL+0x1257d]
+C  [ntdll.dll+0x5aa48]
+
+
+---------------  P R O C E S S  ---------------
+
+Threads class SMR info:
+_java_thread_list=0x00007ffb18bcef18, length=0, elements={
+}
+
+Java Threads: ( => current thread )
+
+Other Threads:
+  0x000002479b458e70 GCTaskThread "GC Thread#0" [stack: 0x000000b8ee700000,0x000000b8ee800000] [id=23880]
+  0x000002479b469b80 ConcurrentGCThread "G1 Main Marker" [stack: 0x000000b8ee800000,0x000000b8ee900000] [id=25008]
+  0x000002479b46a5a0 ConcurrentGCThread "G1 Conc#0" [stack: 0x000000b8ee900000,0x000000b8eea00000] [id=20088]
+
+[error occurred during error reporting (printing all threads), id 0xc0000005, EXCEPTION_ACCESS_VIOLATION (0xc0000005) at pc=0x00007ffb18383937]
+
+VM state: not at safepoint (not fully initialized)
+
+VM Mutex/Monitor currently owned by a thread:  ([mutex/lock_event])
+[0x000002479b3e7410] Heap_lock - owner thread: 0x000002479b3ead10
+
+Heap address: 0x0000000702400000, size: 4060 MB, Compressed Oops mode: Zero based, Oop shift amount: 3
+
+CDS archive(s) mapped at: [0x0000000000000000-0x0000000000000000-0x0000000000000000), size 0, SharedBaseAddress: 0x0000000800000000, ArchiveRelocationMode: 1.
+Narrow klass base: 0x0000000000000000, Narrow klass shift: 0, Narrow klass range: 0x0
+
+GC Precious Log:
+<Empty>
+
+Heap:
+ garbage-first heap   total 0K, used 0K [0x0000000702400000, 0x0000000800000000)
+  region size 2048K, 0 young (0K), 0 survivors (0K)
+ Metaspace       used 0K, committed 0K, reserved 0K
+  class space    used 0K, committed 0K, reserved 0K
+
+Heap Regions: E=young(eden), S=young(survivor), O=old, HS=humongous(starts), HC=humongous(continues), CS=collection set, F=free, OA=open archive, CA=closed archive, TAMS=top-at-mark-start (previous, next)
+
+Card table byte_map: [0x00000247ae8a0000,0x00000247af090000] _byte_map_base: 0x00000247ab08e000
+
+Marking Bits (Prev, Next): (CMBitMap*) 0x000002479b459490, (CMBitMap*) 0x000002479b4594d0
+ Prev Bits: [0x00000247af880000, 0x00000247b37f0000)
+ Next Bits: [0x00000247b37f0000, 0x00000247b7760000)
+
+GC Heap History (0 events):
+No events
+
+Dll operation events (1 events):
+Event: 0.006 Loaded shared library E:\app\webstorm\WebStorm 2023.2.5\jbr\bin\java.dll
+
+Deoptimization events (0 events):
+No events
+
+Classes unloaded (0 events):
+No events
+
+Classes redefined (0 events):
+No events
+
+Internal exceptions (0 events):
+No events
+
+VM Operations (0 events):
+No events
+
+Events (0 events):
+No events
+
+
+Dynamic libraries:
+0x00007ff6b0a10000 - 0x00007ff6b0a1a000 	E:\app\webstorm\WebStorm 2023.2.5\jbr\bin\java.exe
+0x00007ffb942d0000 - 0x00007ffb944e6000 	C:\WINDOWS\SYSTEM32\ntdll.dll
+0x00007ffb92b90000 - 0x00007ffb92c54000 	C:\WINDOWS\System32\KERNEL32.DLL
+0x00007ffb917b0000 - 0x00007ffb91b57000 	C:\WINDOWS\System32\KERNELBASE.dll
+0x00007ffb91c80000 - 0x00007ffb91d91000 	C:\WINDOWS\System32\ucrtbase.dll
+0x00007ffb8a4d0000 - 0x00007ffb8a4e7000 	E:\app\webstorm\WebStorm 2023.2.5\jbr\bin\jli.dll
+0x00007ffb7b260000 - 0x00007ffb7b27b000 	E:\app\webstorm\WebStorm 2023.2.5\jbr\bin\VCRUNTIME140.dll
+0x00007ffb92310000 - 0x00007ffb924be000 	C:\WINDOWS\System32\USER32.dll
+0x00007ffb915f0000 - 0x00007ffb91616000 	C:\WINDOWS\System32\win32u.dll
+0x00007ffb92a30000 - 0x00007ffb92a59000 	C:\WINDOWS\System32\GDI32.dll
+0x00007ffb907e0000 - 0x00007ffb90a73000 	C:\WINDOWS\WinSxS\amd64_microsoft.windows.common-controls_6595b64144ccf1df_6.0.22621.3235_none_270f74e173860f98\COMCTL32.dll
+0x00007ffb91b60000 - 0x00007ffb91c79000 	C:\WINDOWS\System32\gdi32full.dll
+0x00007ffb92a60000 - 0x00007ffb92b07000 	C:\WINDOWS\System32\msvcrt.dll
+0x00007ffb91620000 - 0x00007ffb916ba000 	C:\WINDOWS\System32\msvcp_win.dll
+0x00007ffb93520000 - 0x00007ffb93551000 	C:\WINDOWS\System32\IMM32.DLL
+0x00007ffb8a5b0000 - 0x00007ffb8a5bc000 	E:\app\webstorm\WebStorm 2023.2.5\jbr\bin\vcruntime140_1.dll
+0x00007ffb477d0000 - 0x00007ffb4785d000 	E:\app\webstorm\WebStorm 2023.2.5\jbr\bin\msvcp140.dll
+0x00007ffb18090000 - 0x00007ffb18d13000 	E:\app\webstorm\WebStorm 2023.2.5\jbr\bin\server\jvm.dll
+0x00007ffb941d0000 - 0x00007ffb94282000 	C:\WINDOWS\System32\ADVAPI32.dll
+0x00007ffb92ff0000 - 0x00007ffb93098000 	C:\WINDOWS\System32\sechost.dll
+0x00007ffb91780000 - 0x00007ffb917a8000 	C:\WINDOWS\System32\bcrypt.dll
+0x00007ffb93560000 - 0x00007ffb93675000 	C:\WINDOWS\System32\RPCRT4.dll
+0x00007ffb90e70000 - 0x00007ffb90e79000 	C:\WINDOWS\SYSTEM32\WSOCK32.dll
+0x00007ffb92b10000 - 0x00007ffb92b81000 	C:\WINDOWS\System32\WS2_32.dll
+0x00007ffb89be0000 - 0x00007ffb89c14000 	C:\WINDOWS\SYSTEM32\WINMM.dll
+0x00007ffb8a300000 - 0x00007ffb8a30a000 	C:\WINDOWS\SYSTEM32\VERSION.dll
+0x00007ffb90f10000 - 0x00007ffb90f5d000 	C:\WINDOWS\SYSTEM32\POWRPROF.dll
+0x00007ffb90af0000 - 0x00007ffb90b03000 	C:\WINDOWS\SYSTEM32\UMPDC.dll
+0x00007ffb8fd70000 - 0x00007ffb8fd88000 	C:\WINDOWS\SYSTEM32\kernel.appcore.dll
+0x00007ffb8da70000 - 0x00007ffb8da7a000 	E:\app\webstorm\WebStorm 2023.2.5\jbr\bin\jimage.dll
+0x00007ffb90f60000 - 0x00007ffb91193000 	C:\WINDOWS\SYSTEM32\DBGHELP.DLL
+0x00007ffb92c60000 - 0x00007ffb92fe8000 	C:\WINDOWS\System32\combase.dll
+0x00007ffb93680000 - 0x00007ffb93757000 	C:\WINDOWS\System32\OLEAUT32.dll
+0x00007ffb90de0000 - 0x00007ffb90e12000 	C:\WINDOWS\SYSTEM32\dbgcore.DLL
+0x00007ffb91da0000 - 0x00007ffb91e19000 	C:\WINDOWS\System32\bcryptPrimitives.dll
+0x00007ffb8aae0000 - 0x00007ffb8ab05000 	E:\app\webstorm\WebStorm 2023.2.5\jbr\bin\java.dll
+
+dbghelp: loaded successfully - version: 4.0.5 - missing functions: none
+symbol engine: initialized successfully - sym options: 0x614 - pdb path: .;E:\app\webstorm\WebStorm 2023.2.5\jbr\bin;C:\WINDOWS\SYSTEM32;C:\WINDOWS\WinSxS\amd64_microsoft.windows.common-controls_6595b64144ccf1df_6.0.22621.3235_none_270f74e173860f98;E:\app\webstorm\WebStorm 2023.2.5\jbr\bin\server
+
+VM Arguments:
+java_command: git4idea.http.GitAskPassApp Username for 'https://codeup.aliyun.com': 
+java_class_path (initial): E:/app/webstorm/WebStorm 2023.2.5/plugins/vcs-git/lib/git4idea-rt.jar;E:/app/webstorm/WebStorm 2023.2.5/lib/externalProcess-rt.jar
+Launcher Type: SUN_STANDARD
+
+[Global flags]
+     intx CICompilerCount                          = 4                                         {product} {ergonomic}
+     uint ConcGCThreads                            = 3                                         {product} {ergonomic}
+     uint G1ConcRefinementThreads                  = 10                                        {product} {ergonomic}
+   size_t G1HeapRegionSize                         = 2097152                                   {product} {ergonomic}
+    uintx GCDrainStackTargetSize                   = 64                                        {product} {ergonomic}
+   size_t InitialHeapSize                          = 266338304                                 {product} {ergonomic}
+   size_t MarkStackSize                            = 4194304                                   {product} {ergonomic}
+   size_t MaxHeapSize                              = 4257218560                                {product} {ergonomic}
+   size_t MinHeapDeltaBytes                        = 2097152                                   {product} {ergonomic}
+   size_t MinHeapSize                              = 8388608                                   {product} {ergonomic}
+    uintx NonNMethodCodeHeapSize                   = 5839372                                {pd product} {ergonomic}
+    uintx NonProfiledCodeHeapSize                  = 122909434                              {pd product} {ergonomic}
+    uintx ProfiledCodeHeapSize                     = 122909434                              {pd product} {ergonomic}
+    uintx ReservedCodeCacheSize                    = 251658240                              {pd product} {ergonomic}
+     bool SegmentedCodeCache                       = true                                      {product} {ergonomic}
+   size_t SoftMaxHeapSize                          = 4257218560                             {manageable} {ergonomic}
+     bool UseCompressedClassPointers               = true                           {product lp64_product} {ergonomic}
+     bool UseCompressedOops                        = true                           {product lp64_product} {ergonomic}
+     bool UseG1GC                                  = true                                      {product} {ergonomic}
+     bool UseLargePagesIndividualAllocation        = false                                  {pd product} {ergonomic}
+
+Logging:
+Log output configuration:
+ #0: stdout all=warning uptime,level,tags
+ #1: stderr all=off uptime,level,tags
+
+Environment Variables:
+PATH=E:\git\Git\mingw32\libexec\git-core;E:\git\Git\mingw32\libexec\git-core;E:\git\Git\mingw32\bin;E:\git\Git\usr\bin;C:\Users\zhang\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0;C:\Windows\System32\OpenSSH;C:\Program Files (x86)\NVIDIA Corporation\PhysX\Common;C:\Program Files\NVIDIA Corporation\NVIDIA NvDLISR;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0;C:\WINDOWS\System32\OpenSSH;E:\app\weixinkaifa\΢<><CEA2>web<65><62><EFBFBD><EFBFBD><EFBFBD>߹<EFBFBD><DFB9><EFBFBD>\dll;E:\nod;E:\git\Git\cmd;C:\Users\zhang\AppData\Roaming\nvm;C:\Program Files\nodejs;C:\Users\zhang\AppData\Local\Microsoft\WindowsApps;E:\vscode\Microsoft VS Code\bin;C:\Users\zhang\AppData\Roaming\npm;C:\Users\zhang\AppData\Roaming\nvm;C:\Program Files\nodejs
+USERNAME=zhang
+DISPLAY=:0.0
+LC_ALL=en_US.UTF-8
+TERM=xterm-256color
+TMPDIR=C:\Users\zhang\AppData\Local\Temp
+OS=Windows_NT
+PROCESSOR_IDENTIFIER=Intel64 Family 6 Model 158 Stepping 13, GenuineIntel
+TMP=C:\Users\zhang\AppData\Local\Temp
+TEMP=C:\Users\zhang\AppData\Local\Temp
+
+
+
+Periodic native trim disabled
+
+JNI global refs:
+JNI global refs: 0, weak refs: 0
+
+JNI global refs memory usage: 0, weak refs: 0
+
+OOME stack traces (most recent first):
+Classloader memory used:
+
+
+---------------  S Y S T E M  ---------------
+
+OS:
+ Windows 11 , 64 bit Build 22621 (10.0.22621.3374)
+OS uptime: 21 days 3:01 hours
+
+CPU: total 12 (initial active 12) (6 cores per cpu, 2 threads per core) family 6 model 158 stepping 13 microcode 0xde, cx8, cmov, fxsr, ht, mmx, 3dnowpref, sse, sse2, sse3, ssse3, sse4.1, sse4.2, popcnt, lzcnt, tsc, tscinvbit, avx, avx2, aes, erms, clmul, bmi1, bmi2, adx, fma, vzeroupper, clflush, clflushopt
+Processor Information for all 12 processors :
+  Max Mhz: 2592, Current Mhz: 2592, Mhz Limit: 2592
+
+Memory: 4k page, system-wide physical 16234M (454M free)
+TotalPageFile size 53855M (AvailPageFile size 144M)
+current process WorkingSet (physical memory assigned to process): 11M, peak: 11M
+current process commit charge ("private bytes"): 64M, peak: 318M
+
+vm_info: OpenJDK 64-Bit Server VM (17.0.9+7-b1000.46) for windows-amd64 JRE (17.0.9+7-b1000.46), built on 2023-10-27 by "builduser" with MS VC++ 16.10 / 16.11 (VS2019)
+
+END.

manifest.json

@@ -50,7 +50,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "",
+        "appid" : "wxa5b4dd61b812ce01",
         "setting" : {
             "urlCheck" : false
         },

package-lock.json

@@ -1,6 +1,5 @@
 {
-  "name": "trunk",
-  "lockfileVersion": 2,
-  "requires": true,
-  "packages": {}
+  "name": "mobile",
+  "version": "1.0.0",
+  "lockfileVersion": 1
 }

package.json

@@ -22,9 +22,7 @@
           "UNI_PLATFORM": "h5",
           "ENV_TYPE": "testing"
         },
-  				"define": {
-  					
-  				}
+        "define": {}
       },
       "h5:preview": {
         "BROWSER": "Chrome",
@@ -33,9 +31,7 @@
           "UNI_PLATFORM": "h5",
           "ENV_TYPE": "preview"
         },
-  				"define": {
-  					
-  				}
+        "define": {}
       }
     }
   }

pages.json

@@ -77,8 +77,10 @@
 		{"path" : "pages/login/indLabels","style" : {"navigationBarTitleText": "修改个人标签"}},
 		{"path" : "pages/study/courseStudy","style" : {"navigationBarTitleText": "课程学习"}},
 		{"path" : "pages/study/audioTest","style" : {"navigationBarTitleText": "音频测试"}},
-		{"path" : "pages/study/videoTest","style" : {"navigationBarTitleText": "视频频测试"}}
-        ,{
+		{"path" : "pages/study/videoTest","style" : {"navigationBarTitleText": "视频频测试"}},
+        {"path" : "pages/lecturer/certification/list","style" : {"navigationBarTitleText": "讲师信息"}},
+        {"path" : "pages/lecturer/certification/info","style" : {"navigationBarTitleText": "讲师信息"}},
+      {
         "path" : "pages/learnPath/learnPath",
         "style" :
         {

pages/lecturer/certification/info.vue

@@ -0,0 +1,459 @@
+<template>
+  <view class="main">
+    <u-toast ref="uToast"></u-toast>
+	<!--<view class="back-icon"  @click="back()">
+		<u-icon style="position: absolute;" name="arrow-left"></u-icon>
+		<text class="back-icon-title">讲师信息</text>
+	 </view> -->
+    <u-modal :show="showFlag" :closeOnClickOverlay="true" :showCancelButton="true" @cancel="hideDialog" @confirm="submit" :content="scoreNum>=80?'您给讲师打的分数是'+scoreNum+'分， 是否确认提交?':'您给讲师打的分数是'+scoreNum+'分， 低于认证通过的标准80分， 是否确认提交？'"></u-modal>
+ <div class="info">
+   <div class="info_top">
+     <div class="header_img" v-if="lecturersInfo.id">
+        <img style="width: 144rpx;height: 144rpx;border-radius: 72rpx;" :src="lecturersInfo.avatar&&imageBaseUrl+lecturersInfo.avatar ||  (lecturersInfo.gender==2?'../../../static/images/lecturer/teacher-girl.png':lecturersInfo.gender==1?'../../../static/images/lecturer/teacher.png':'')"></img>
+     </div>
+     <div class="base_info">
+       <div class="base_info_1">
+         <div class="name">{{lecturersInfo.teacherName}}</div>
+         <div class="number">{{lecturersInfo.teacherNo}}</div>
+       </div>
+       <div class="base_info_2">{{lecturersInfo.orgName}}</div>
+       <div class="base_info_3">
+         <div>{{lecturersInfo.positionName}}</div>
+         <!-- <div>{{lecturersInfo.bandCode}}</div> -->
+       </div>
+     </div>
+   </div>
+   <div class="info_buttom">
+     <span>认证课程名称:</span>{{lecturersInfo.courseName}}
+   </div>
+ </div>
+ <div class="curriculumDevelopment">
+   <div class="title">课程开发（35分）</div>
+   <div class="topic">
+     <div class="substance">
+       1.对课程主题理解有深度，在编写/优化课件时，能理论结合实际；<span>（20分）</span>
+     </div>
+     <div class="fraction">
+              <u-number-box v-model="score.one" :disabled="scoreDisabled" min="0" max="20" @change="stepperChange('one')"></u-number-box>
+     </div>
+   </div>
+   <div class="topic" style="border: none">
+     <div class="substance">
+       2.了解学员，善于将课程内容与学员情况相结合，使用他们熟悉的语言和场景进行讲授，促使学员更快地理解并接受课程内容；<span>（15分）</span>
+     </div>
+     <div class="fraction">
+       <u-number-box v-model="score.two" :disabled="scoreDisabled" min="0" max="15" @change="stepperChange('two')"></u-number-box>
+     </div>
+   </div>
+ </div>
+ <div class="curriculumDevelopment">
+   <div class="title">课程讲授与互动（45分）</div>
+   <div class="topic">
+     <div class="substance">
+       1.富有教师思维，能够根据成人的学习习惯，运用多种教学手段，使课堂生动活泼，提升课堂效率；
+       <span>（15分）</span>
+     </div>
+     <div class="fraction">
+       <u-number-box v-model="score.three" :disabled="scoreDisabled" min="0" max="15" @change="stepperChange('three')"></u-number-box>
+     </div>
+   </div>
+   <div class="topic">
+     <div class="substance">
+       2.具备所讲授课程的专业知识或实战经验，能够应对学员在课堂上提出的普通问题或挑战性问题；
+       <span>（15分）</span>
+     </div>
+     <div class="fraction">
+       <u-number-box v-model="score.four" :disabled="scoreDisabled" min="0" max="15" @change="stepperChange('four')"></u-number-box>
+     </div>
+   </div>
+   <div class="topic">
+     <div class="substance">
+       3.心态开放，有较强的临场应变技能，能够通过正向引导，化解课堂中的“危机”，推进课程正常进行；
+       <span>（10分）</span>
+     </div>
+     <div class="fraction">
+       <u-number-box v-model="score.five" :disabled="scoreDisabled" min="0" max="10" @change="stepperChange('five')"></u-number-box>
+     </div>
+   </div>
+   <div class="topic" style="border: none">
+     <div class="substance">
+       4.语言正向、积极，富有感染力，传递知识的同时，传递能量；
+       <span>（5分）</span>
+     </div>
+     <div class="fraction">
+       <u-number-box v-model="score.six" :disabled="scoreDisabled" min="0" max="5" @change="stepperChange('six')"></u-number-box>
+     </div>
+   </div>
+ </div>
+ <div class="curriculumDevelopment">
+   <div class="title">仪表与仪态（20分）</div>
+   <div class="topic">
+     <div class="substance">
+       1.着装符合课程主题的要求；（10分）
+       <span>（10分）</span>
+     </div>
+     <div class="fraction">
+              <u-number-box v-model="score.seven" :disabled="scoreDisabled" min="0" max="10" @change="stepperChange('seven')"></u-number-box>
+     </div>
+   </div>
+   <div class="topic">
+     <div class="substance">
+       2.站立行走落落大方，不卑不亢；
+       <span>（5分）</span>
+     </div>
+     <div class="fraction">
+              <u-number-box v-model="score.eight" :disabled="scoreDisabled" min="0" max="5" @change="stepperChange('eight')"></u-number-box>
+     </div>
+   </div>
+   <div class="topic">
+     <div class="substance">
+       3.普通话标准，语言文明健康，讲授适度、接地气；
+       <span>（5分）</span>
+     </div>
+     <div class="fraction">
+       <u-number-box v-model="score.nine" :disabled="scoreDisabled" min="0" max="5" @change="stepperChange('nine')"></u-number-box>
+     </div>
+   </div>
+ </div>
+  <div class="curriculumDevelopment">
+	  <div class="title">评语</div>
+	  <div class="topic" style="border: none;padding-bottom: 100px;margin-bottom: 0px;">
+	    <u--textarea v-model="remark" placeholder="请输入内容" count maxlength="50"  :disabled="scoreDisabled"></u--textarea>
+	  </div>
+  </div>
+<div class="foot" >
+   <view class="fraction">您的评分：<span>{{scoreNum}}分</span></view>
+   <view class="submit" v-if="!lecturersInfo.scores" @click="showDialog()">提交</view>
+ </div>
+  </view>
+</template>
+<script>
+	import config from '@/config/index.js'
+    import apiLecturerCert from "@/api/lecturer/certification.js";
+    export default {
+            data() {
+                    return {
+							imageBaseUrl: config.fileUrl,
+                            showFlag: false,
+                            lecturersInfo: {},
+                            score:{
+                              "one": 0,
+                              "two": 0,
+                              "three": 0,
+                              "four": 0,
+                              "five": 0,
+                              "six": 0,
+                              "seven": 0,
+                              "eight": 0,
+                              "nine": 0
+                            },
+							scoreDisabled: false,
+                            scoreNum: 0,
+							reviewId: '',
+							remark: '',
+                    }
+            },
+            onPullDownRefresh() {
+                    
+            },
+            onReachBottom() {
+                    
+            },
+            onLoad(options) {
+                    this.teacherId = options.teacherId
+					this.reviewId = options.reviewId
+                    this.info(options.teacherId)
+            },
+            methods:{
+				   back(){
+						   uni.navigateBack();     
+				   },
+                    showDialog(){
+                            if(this.scoreNum<=0){
+                                    this.$refs.uToast.show({message:"请先进行评份",type:'error'});
+                                    return;
+                            }
+                            this.showFlag=true
+                    },
+                    hideDialog(){
+                            this.showFlag=false
+                    },
+                    stepperChange(name){
+                            setTimeout(()=>{
+                                    this.scoreNum = this.score.one + this.score.two + this.score.three + this.score.four + this.score.five + this.score.six + this.score.seven + this.score.eight + this.score.nine
+                            },50)
+                    },
+                    info(teacherId){
+                            apiLecturerCert.lecturerCertificationInfo({
+                                    teacherId: teacherId
+                            }).then(res => {
+								console.log('res::',res)
+                                    if (res.code == 200 && res.data) {
+                                            this.lecturersInfo = res.data.examineTeacher || {}
+											this.remark = this.lecturersInfo.comment
+											//this.lecturersInfo.scores="" //"1,2,3,1,2,3,1,2,3"
+											if(this.lecturersInfo.scores&&this.lecturersInfo.scores.length>1){
+												this.scoreDisabled = true
+												var arr = this.lecturersInfo.scores.split(',')
+												var key = 0
+												for (var name in this.score) {
+													this.score[name] = Number(arr[key])
+													key++
+												}
+												this.stepperChange()
+											}
+                                    } else {
+											this.lecturersInfo = {}
+                                            this.$refs.uToast.show({message:res.msg,type:'error'});
+                                    }
+                            });
+                            this.showFlag=false
+                    },
+                    submit(){
+						var scores = []
+						for (var key in this.score) {
+							scores.push(this.score[key])
+						}
+						// return
+						apiLecturerCert.lecturerCertificationSave({
+								teacherId: parseInt(this.teacherId),
+								score: this.scoreNum,
+								scores: String(scores),
+								comment: this.remark
+						}).then(res => {
+								// 评分完成回列表
+								if (res.code == 200) {
+									uni.navigateTo({
+											url:'/pages/lecturer/certification/list?reviewId='+this.reviewId
+									})
+								} else {
+										this.$refs.uToast.show({message:res.msg,type:'error'});
+								}
+						});
+						this.showFlag=false
+                    }
+            }
+    }
+</script>
+<style scoped lang="scss">
+.back-icon{
+       background: #ffffff;
+       background-position: 0 0;
+       position: relative;
+       height: 40px;
+       display: flex;
+       align-items: center;
+}
+.back-icon-title{
+       flex: 1;
+       text-align: center;
+}
+.main {
+  background: #F9F9F9;
+  overflow:hidden ;
+  .info {
+ text-align: left;
+ background: #fff;
+ padding: 20px 16px 16px 16px;
+
+ .info_top {
+	display: flex;
+	margin-left: 9px;
+	align-items: center;
+	min-height: 87px;;
+   .header_img {
+     img {
+       width: 144rpx;
+       height: 144rpx;
+       border-radius: 50%;
+     }
+   }
+
+   .base_info {
+     margin-left: 20px;
+     margin-top: 3px;
+
+     .base_info_1 {
+       display: flex;
+       align-items: center;
+       .name {
+         font-weight: 600;
+         font-size: 16px;
+         color: #333333;
+         line-height: 22px;
+         text-align: left;
+         font-style: normal;
+       }
+
+       .number {
+         margin-left: 9px;
+         font-weight: 400;
+         font-size: 14px;
+         color: #333333;
+         line-height: 20px;
+         text-align: left;
+         font-style: normal;
+       }
+     }
+     .base_info_2 {
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 2;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: normal;
+		margin: 5px 0 0;
+		font-size: 14px;
+		color: #333333;
+		line-height: 16px;
+		text-align: left;
+		font-style: normal;
+     }
+     .base_info_3 {
+       display: flex;
+       align-items: center;
+       margin-top: 5px;
+	   font-size: 14px;
+     }
+     .base_info_3:first-child {
+       margin-right: 20px;
+     }
+   }
+ }
+ .info_buttom {
+   margin-top: 10px;
+   font-weight: 400;
+   font-size: 14px;
+   color: #333333;
+   line-height: 20px;
+   text-align: left;
+   font-style: normal;
+   span{
+		width: 102px;
+		display: inline-block;
+   }
+ }
+ }  
+	.curriculumDevelopment {
+		background: #fff;
+		margin-top: 10px;
+		padding: 0 16px;
+		.title {
+		padding-top: 18px;
+		font-weight: 500;
+		font-size: 16px;
+		color: #333333;
+		line-height: 22px;
+		text-align: left;
+		font-style: normal;
+		margin-bottom: 15px;
+		}
+		.topic {
+		padding-bottom: 20px;
+		border-bottom: 1px solid rgba(83, 83, 83, 0.06);
+		margin-bottom: 17px;
+		.substance {
+		 font-weight: 400;
+		 font-size: 14px;
+		 color: #666666;
+		 line-height: 20px;
+		 text-align: justify;
+		 font-style: normal;
+		 span {
+		   color: #409EFF;
+		 }
+		}
+		.fraction {
+		 margin-top: 4px;
+		 display: flex;
+		 justify-content: flex-end;
+		}
+	}
+}
+ .foot {
+ height: 81px;
+ background: #F8F8F8;
+ border-radius: 16px 16px 0px 0px;
+ display: flex;
+ justify-content: space-evenly;
+ align-items: center;
+    position: fixed;
+    bottom: 0px;
+    width: 100vw;
+ .fraction{
+   font-weight: 500;
+   font-size: 16px;
+   color: #333333;
+   line-height: 22px;
+   text-align: left;
+   font-style: normal;
+   span{
+     color: #409EFF;
+   }
+ }
+ .submit{
+   width: 180px;
+   height: 44px;
+   background: #409EFF;
+   box-shadow: 0px 2px 7px 1px rgba(104,102,102,0.08);
+   border-radius: 22px;
+   color: #FFFFFF;
+   font-size: 16px;
+   font-weight: 500;
+   line-height: 44px;
+      text-align: center;
+ }
+  }
+ :deep(.a-popup--center){
+ width: 288px;
+ height: 150px;
+ background: #FFFFFF;
+ border-radius: 14px;
+ .content{
+   width: 196px;
+   height: 44px;
+   font-weight: 600;
+   font-size: 16px;
+   color: #333333;
+   line-height: 22px;
+   text-align: center;
+   font-style: normal;
+   margin-top: 31px;
+   margin-left: 46px;
+ }
+ .buttons{
+   position:absolute;
+   bottom: 0;
+   left: 0;
+   display: flex;
+   justify-content: center;
+   align-items: center;
+   overflow: hidden;
+   .qx{
+     border-right: 1px solid rgba(153,153,153,0.18);
+     font-weight: 400;
+     font-size: 16px;
+     color: #333333;
+     line-height: 22px;
+     font-style: normal;
+   }
+   .qr{
+     font-weight: 400;
+     font-size: 16px;
+     color: #387DF7;
+     line-height: 22px;
+     font-style: normal;
+   }
+   div{
+     width: 144px;
+     height: 47px;
+     display: flex;
+     justify-content: center;
+     align-items: center;
+     border-top: 1px solid rgba(153,153,153,0.18);
+   }
+ }
+
+  }
+}
+</style>

pages/lecturer/certification/list.vue

@@ -0,0 +1,186 @@
+<template>
+       <view class="ranking-list-info">
+			<u-toast ref="uToast"></u-toast>
+			<!-- view class="back-icon">
+				   <u-icon style="position: absolute;" name="arrow-left"></u-icon>
+				   <text class="back-icon-title">讲师信息</text>
+			</view> -->
+			<view class="ranking-list-box">
+				   <view class="main">
+						   <view class="tip" v-if="lecturersList.length">请选择您要评分的讲师（共{{lecturersList.length}}位）</view>
+						   <view class="lecturers">
+							 <view  v-for="( itemes, index) in lecturersList" :key="itemes.id" class="lecturers_item" @click="gotoInfo(itemes)">
+								   <view class="avatar">
+									 <img  style="width: 144rpx;height: 144rpx;border-radius: 72rpx;" :src="itemes.avatar&&imageBaseUrl+itemes.avatar ||  (itemes.gender==2?'../../../static/images/lecturer/teacher-girl.png':(itemes.gender==1?'../../../static/images/lecturer/teacher.png':''))"></img>
+								   </view>
+								   <view class="information">
+									 <view class="information_1">
+										   <view class="name">{{ itemes.teacherName }}</view>
+										   <view class="numbering">{{itemes.teacherNo}}</view>
+									 </view>
+									 <view class="information_2">{{itemes.orgName}}</view>
+									 <view class="information_3">
+										   <view class="posts">{{ itemes.positionName }}</view>
+										   <!-- <view class="rank">{{ itemes.bandCode }}</view> -->
+									 </view>
+								   </view>
+								   <view v-if="itemes.score && itemes.score<80" class="status" style="color: #FF4040">{{itemes.score}}分</view>
+								   <view v-if="itemes.score && itemes.score>=80" class="status" style="color:#31AF0D">{{itemes.score}}分</view>
+								   <view v-if="!itemes.score && examineResult==0" class="status" style="color:#409EFF">去评分</view>
+								   <view v-if="!itemes.score && examineResult==1" class="status" style="color:#d9d9d9">已结束</view>
+							 </view>
+						   </view>
+						   <u-empty  v-if="lecturersList.length == 0 && lecturersList!==''" mode="data" icon="http://cdn.uviewui.com/uview/empty/car.png"></u-empty>
+				   </view>
+			</view>
+		</view>
+</template>
+
+<script>
+		import config from '@/config/index.js'
+       import apiLecturerCert from "@/api/lecturer/certification.js";
+       export default {
+               data() {
+                       return {
+                               lecturersList: '',
+							   examineResult: '',
+							   imageBaseUrl: config.fileUrl
+                       }
+               },
+               onPullDownRefresh() {
+                       
+               },
+               onReachBottom() {
+                       
+               },
+               onLoad(options) {
+						if(options.reviewId){
+							this.reviewId = options.reviewId
+							apiLecturerCert.lecturerCertificationList({
+								   reviewId: this.reviewId
+							}).then(res => {
+								if (res.code == 200) {
+									this.examineResult = res.data.examineResult
+									this.lecturersList = res.data.list
+								} else {
+									this.lecturersList = []
+									// this.$refs.uToast.show({message:res.msg,type:'error'});
+								}
+							});
+						}
+               },
+               methods:{
+                       gotoInfo(item){
+							   if(this.examineResult==1&&!item.score){
+								   this.$refs.uToast.show({message:"该评审已结束",type:'error'});
+								   return
+							   }
+                               uni.navigateTo({
+                                       url:'/pages/lecturer/certification/info?reviewId='+this.reviewId+'&teacherId='+item.id
+                               })
+                       }
+               }
+       }
+</script>
+
+<style scoped lang="scss">
+.back-icon{
+       background: #ffffff;
+       background-position: 0 0;
+       position: relative;
+       height: 40px;
+       display: flex;
+       align-items: center;
+}
+.back-icon-title{
+       flex: 1;
+       text-align: center;
+}
+.main {
+       height: calc(100vh - 60px);
+       padding: 10px 13px 10px 16px;
+       background: #ffffff;
+       .tip {
+         font-weight: 400;
+         font-size: 16px;
+         color: #666666;
+         line-height: 22px;
+         text-align: left;
+         font-style: normal;
+       }
+       .lecturers{
+         .lecturers_item{
+               padding: 20rpx 0 10rpx;
+               border-bottom: 1px solid rgba(83,83,83,0.06);
+               width: 100%;
+               display: flex;
+			   align-items: center;
+               .avatar{
+                 margin-left: 9px;
+                 margin-right: 21px;
+                 img{
+                       width: 72px;
+                       height: 72px;
+                       border-radius: 50%;
+                 }
+               }
+               .information{
+                 flex:1;
+                 .information_1{
+                       display: flex;
+                       align-items: center;
+                       .name{
+                         font-weight: 600;
+                         font-size: 16px;
+                         color: #333333;
+                         line-height: 22px;
+                         text-align: left;
+                         font-style: normal;
+                       }
+                       .numbering{
+                         font-weight: 400;
+                         font-size: 14px;
+                         color: #333333;
+                         line-height: 20px;
+                         text-align: left;
+                         font-style: normal;
+                         margin-left: 9px;
+                       }
+                 }
+                 .information_2{
+                         display: -webkit-box;
+                         -webkit-box-orient: vertical;
+                         -webkit-line-clamp: 2;
+                         overflow: hidden;
+                         text-overflow: ellipsis;
+                         white-space: normal;
+                       font-weight: 400;
+                       font-size: 14px;
+                       color: #333333;
+                       text-align: left;
+                       font-style: normal;
+                       margin-top: 5px;
+					   line-height: 18px;
+                 }
+                 .information_3{
+                       margin-top: 5px;
+                       font-weight: 400;
+                       font-size: 14px;
+                       color: #666666;
+                       line-height: 20px;
+                       text-align: left;
+                       font-style: normal;
+                       align-items: center;
+                       .posts{
+                         margin-right: 20px;
+                       }
+                 }
+               }
+               .status{
+                 width:50px ;
+                 text-align: right;
+               }
+         }
+       }
+}
+</style>

pages/study/courseStudy.vue

@@ -19,6 +19,8 @@
 							@ended="onPlayerEnded"
 							@timeupdate="onPlayerPlaying"
 							@fullscreenchange="onFullScreen"
+							:drag="curriculumData.isDrag"
+							@progress="progress"
 							style="width: 100%; object-fit: fill">
 						></video-player>
 						<view class="player-box" v-if="playerBoxShow">
@@ -426,6 +428,8 @@
 	export default {
 		data(){
 			return{
+				progressData: 0,
+				contentTypeV: '',
 				trueFalse: true,
 				loading:false,//加载中
 				courseId:'',//当前课程的id
@@ -626,6 +630,7 @@
 				let $this=this;
 				uni.showLoading({title:'加载中...'})
 				apiCourseStudy.studyIndex(this.courseId).then(rs=>{
+					// this.courseType = rs.result.course.type
 					if(rs.status != 200) {
 						uni.hideLoading();
 						uni.showToast({title:rs.message,type:'fail'});
@@ -879,6 +884,7 @@
 				//this.curContent=0;
 				// console.log(con,'con');
 				this.playerBoxShow=false;
+				this.contentTypeV = con.contentType
 				if(con.contentType==40){
 					//如果是文档，需要再次加载pdf
 					if(con.content!='' && con.content.indexOf('.pdf')==-1){
@@ -1294,6 +1300,9 @@
 				//console.log(e);
 				this.scrollInfo = e.detail;
 			},
+			progress(val) {
+				this.progressData = (val).toFixed(2);
+			},
 			//以下是播放相关的处理
 			saveStudyDuration(duration) { //保存本地存储的学习时长
 			  if (duration > 0) {
@@ -1310,7 +1319,11 @@
 			        "objInfo": ""+this.courseInfo.name,
 			        "aid":this.userInfo.aid, //当前登录人的id
 			        "aname":this.userInfo.name,//当前人的姓名
-			        "status": 1 //状态
+			        "status": 1, //状态
+					"contentId": this.curContent.id,
+			      }
+				  if(this.contentTypeV == 10) {
+					  postData.progress = this.progressData
 				  }
 			      //静默处理
 			      apiStat.sendEvent(postData).then(rs=>{

unpackage/dist/build/h5/index.html

@@ -19,4 +19,4 @@
 	    hm.src = "https://hm.baidu.com/hm.js?ea89f02dca369037a73c5e3907e2c14a";
 	    var s = document.getElementsByTagName("script")[0];
 	    s.parentNode.insertBefore(hm, s);
-	  })();</script></head><body><div id=app></div><script src=/mobile/static/js/chunk-vendors.7c4a142a.js></script><script src=/mobile/static/js/index.9e700f8c.js></script></body></html>
+	  })();</script></head><body><div id=app></div><script src=/mobile/static/js/chunk-vendors.7c4a142a.js></script><script src=/mobile/static/js/index.bd815cd8.js></script></body></html>