Merge branch 'master' of https://code.itechtop.cn/yangyang/ztx_wx_gzt

@@ -426,14 +426,14 @@ function getChosedStudentList() {
       } else {
       } else {
         d.levelRecommend = '9'
         d.levelRecommend = '9'
       }
       }
-
+      
       // 原级别是一级时，levelNew 默认为空，不使用推荐值
       // 原级别是一级时，levelNew 默认为空，不使用推荐值
       if (d.levelOld === '1') {
       if (d.levelOld === '1') {
         d.levelNew = ''
         d.levelNew = ''
       } else if (!d.levelNew) {
       } else if (!d.levelNew) {
         d.levelNew = d.levelRecommend
         d.levelNew = d.levelRecommend
       }
       }
-
+      
       if (!d.isPass) {
       if (!d.isPass) {
         d.isPass = '1'
         d.isPass = '1'
       }
       }
@@ -545,22 +545,24 @@ function submitForm2(flag) {
       return
       return
     }
     }
   }
   }
-
   if (flag === 1) {
   if (flag === 1) {
     if (infoList.value.length == 0) {
     if (infoList.value.length == 0) {
       uni.showToast({title: '请选择考生', icon: 'none'})
       uni.showToast({title: '请选择考生', icon: 'none'})
       return
       return
     }
     }
-
+    
     uni.showModal({
     uni.showModal({
       title: '提示',
       title: '提示',
       content: `请确认人员照片是否已更新?`,
       content: `请确认人员照片是否已更新?`,
       success: function (res) {
       success: function (res) {
         if (res.confirm) {
         if (res.confirm) {
-          saveStep2(flag).then(() => {
-            uni.navigateTo({
-              url: `/level/paymentDetail?examId=${form.value.examId}`
-            })
+          // saveStep2(flag).then(() => {
+          //   uni.navigateTo({
+          //     url: `/level/paymentDetail?examId=${form.value.examId}`
+          //   })
+          // })
+          uni.navigateTo({
+            url: `/level/paymentDetail?examId=${form.value.examId}`
           })
           })
         }
         }
       }
       }
@@ -887,7 +889,7 @@ function handleDelete(row) {
           position: relative;
           position: relative;
           z-index: 99;
           z-index: 99;
         }
         }
-
+        
         .exam-level-select {
         .exam-level-select {
           position: relative;
           position: relative;
           z-index: 999;
           z-index: 999;

@@ -52,7 +52,7 @@
 
 
 <script setup>
 <script setup>
 import {ref} from 'vue'
 import {ref} from 'vue'
-import {onLoad,onShow, onReachBottom} from '@dcloudio/uni-app'
+import {onLoad, onShow, onReachBottom} from '@dcloudio/uni-app'
 import {getMyRecentExam} from '@/common/api'
 import {getMyRecentExam} from '@/common/api'
 
 
 const app = getApp()
 const app = getApp()