Merge branch 'develop' of http://25.13.9.101:9000/K17_AITS/tra-app into develop

src/pages/course/study.vue

@@ -166,6 +166,7 @@ const pageTopPadding = computed(() => statusBarHeight + 'px')
 const isContinue = ref('N')
 // 初始化数据
 const getData = async flag => {
+	isContinue.value = "N"
   try {
     const { body } = await getCourseStudyInfoApi({
       crsId: crsId.value
@@ -188,7 +189,8 @@ const getData = async flag => {
             body: {
               crsId: crsId.value,
               teacherNo: choiceTeacher.value,
-              studyType: isPreview.value ? 'P' : 'S'
+              studyType: isPreview.value ? 'P' : 'S',
+              isContinue: isContinue.value
             }
           })
           return
@@ -334,7 +336,8 @@ const nextStep = () => {
       body: {
         crsId: crsId.value,
         teacherNo: choiceTeacher.value,
-        studyType: isPreview.value ? 'P' : 'S'
+        studyType: isPreview.value ? 'P' : 'S',
+				isContinue: isContinue.value
       }
     })
     step.value = 2
@@ -649,18 +652,6 @@ const logId = ref('')
 // ws 初始化逻辑
 const initsocketTask = () => {
   socketStore.creatSocket()
-  // unref(SocketObj).on('open', (res)=>{
-  // 	if(startPgrphId.value){
-  // 		sendMessage({
-  // 			"commond" : 'STDY',
-  // 			"body" : {
-  // 				crsId: crsId.value,
-  // 				teacherNo: choiceTeacher.value
-  // 			}
-  // 		})
-  // 		step.value = 2
-  // 	}
-  // 	})
   unref(SocketObj).on('message', res => {
     const { rtnCode, body, commond } = JSON.parse(res.data)
     if (rtnCode === '0000') {

src/pages/index/preview.vue

@@ -49,16 +49,18 @@ export default {
       wv.setStyle({
         top: 80
       })
-      // uni.onKeyboardHeightChange(setHeight)
+      uni.onKeyboardHeightChange(setHeight)
     }, 1000)
     // #endif
   },
   methods: {
-    // setHeight(res){
-    // 	wv.setStyle({
-    // 		top: res.height + 20
-    // 	})
-    // },
+    setHeight(res){
+			//#ifdef APP-PLUS
+    	wv.setStyle({
+    		top: res.height + 20
+    	})
+			// #endif
+    },
     backRouter() {
       common.navigateBack()
     },