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

@@ -545,7 +545,6 @@ 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'})
@@ -557,11 +556,14 @@ function submitForm2(flag) {
       content: `请确认人员照片是否已更新?`,
       content: `请确认人员照片是否已更新?`,
       success: function (res) {
       success: function (res) {
         if (res.confirm) {
         if (res.confirm) {
-          saveStep2(flag).then(() => {
+          // saveStep2(flag).then(() => {
+          //   uni.navigateTo({
+          //     url: `/level/paymentDetail?examId=${form.value.examId}`
+          //   })
+          // })
           uni.navigateTo({
           uni.navigateTo({
             url: `/level/paymentDetail?examId=${form.value.examId}`
             url: `/level/paymentDetail?examId=${form.value.examId}`
           })
           })
-          })
         }
         }
       }
       }
     })
     })

@@ -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()