选课跳转处理

src/pages/base/components/XsPicker/index.vue

@@ -94,10 +94,14 @@ const switchXs = (xs: any) => {
 }
 
 // 如果是bar形式，则默认打开选择器
-if (props.isBar && getUser.xsList.length > 1 
+if (props.isBar
 //&& (getCurXs === null || !getCurXs.id)
 ) {
+  if (getUser.xsList.length > 1 ) {
     showPicker();
+  } else {
+    switchXs(getUser.xsList[0]);
+  }
 }
 </script>
 

src/pages/base/course-selection/club-selection.vue

@@ -89,11 +89,25 @@ const submit = async () => {
   const res = await jzXkQkjApi(params);
   uni.hideLoading();
   if (res.resultCode === 1) {
-    // 跳转到支付页面
+    selectedXkkcIds.value = [];
+    uni.setStorageSync("selectedXkkcIds", []);
+    res.result.backUrl = "/pages/base/course-selection/club-selection";
     setData(res.result);
-    uni.reLaunch({
+    xsFlag.value = true;
+    setTimeout(() => { 
+      xsFlag.value = false;
+    }, 1000);
+    if (curXk.value.sfjf === 1) {
+      // 跳转到支付页面
+      uni.navigateTo({
         url: "/pages/base/course-selection/payment",
       });
+    } else {
+      // 不需要支付，直接跳转到支付成功页面
+      uni.navigateTo({
+        url: "/pages/base/course-selection/payment-success",
+      });
+    }
   } else {
     uni.showToast({
       title: res.message,

src/pages/base/course-selection/index.vue

@@ -91,11 +91,24 @@ const submit = async () => {
   const res = await jzXkQkjApi(params);
   uni.hideLoading();
   if (res.resultCode === 1) {
-    // 跳转到支付页面
+    selectedXkkcIds.value = [];
+    uni.setStorageSync("selectedXkkcIds", []);
+    res.result.backUrl = "/pages/base/course-selection/index";
     setData(res.result);
-    uni.reLaunch({
+    setTimeout(() => { 
+      xsFlag.value = false;
+    }, 1000);
+    if (curXk.value.sfjf === 1) {
+      // 跳转到支付页面
+      uni.navigateTo({
         url: "/pages/base/course-selection/payment",
       });
+    } else {
+      // 不需要支付，直接跳转到支付成功页面
+      uni.navigateTo({
+        url: "/pages/base/course-selection/payment-success",
+      });
+    }
   } else {
     uni.showToast({
       title: res.message,

src/pages/base/course-selection/payment.vue

@@ -89,7 +89,9 @@ const totalJe = computed(() => {
 
 // 返回上一页
 const goBack = () => {
-  uni.navigateBack();
+  uni.reLaunch({
+    url: getData.backUrl
+  });
 };
 
 // 取消报名
@@ -107,9 +109,7 @@ const cancelRegistration = () => {
           title: "已取消报名",
           icon: "success",
         });
-        setTimeout(() => {
         goBack();
-        }, 1500);
       }
     },
   });