调整选课支付

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

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

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

@@ -4,9 +4,9 @@
     <view class="selection-header">
       <view class="header-content">
         <!-- 选课类型选择部分 -->
-        <XkPicker title="俱乐部信息" :is-qk="true" xklx-id="816059832" :xs-id="curXs.id" @change="switchXk" />
+        <XkPicker title="俱乐部信息" :is-qk="true" xklx-id="816059832" :xs-id="curXs.id" @change="switchXk" v-if="!xsFlag" />
         <!-- 学生选择部分 -->
-        <XsPicker :is-bar="true" />
+        <XsPicker :is-bar="true" @change="switchXs" />
         <!-- 倒计时-->
         <XkCountdown :xk="curXk" @over="xkTimeOver" v-if="curXk && curXk.id" />
       </view>
@@ -14,7 +14,7 @@
 
     <!-- 可滚动的内容区域 -->
     <view class="scrollable-content">
-      <XkkcList :xk="curXk" :can-selected="true" :multiple="true" @change="changeXkkc" />
+      <XkkcList :xk="curXk" :can-selected="true" :multiple="true" @change="changeXkkc" v-if="!xsFlag" />
     </view>
 			
     <!-- 底部报名按钮 - 固定部分 -->
@@ -43,11 +43,18 @@ const { sign_file } = getData;
 const curXs = computed(() => getCurXs);
 const curXk = ref<any>({});
 const selectedXkkcIds = ref<any>([]);
+
+const xsFlag = ref(true);
+
 // 切换选课
 const switchXk = (xk: any) => {
   curXk.value = xk;
 }
 
+const switchXs = (xs: any) => { 
+  xsFlag.value = false;
+}
+
 // 选课时间结束
 const xkTimeOver = (val: any) => { 
   console.log(val);

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

@@ -4,9 +4,9 @@
     <view class="selection-header">
       <view class="header-content">
         <!-- 选课类型选择部分 -->
-        <XkPicker title="俱乐部信息" :is-qk="true" xklx-id="962488654" :xs-id="curXs.id" @change="switchXk" />
+        <XkPicker title="俱乐部信息" :is-qk="true" xklx-id="962488654" :xs-id="curXs.id" @change="switchXk" v-if="!xsFlag" />
         <!-- 学生选择部分 -->
-        <XsPicker :is-bar="true" />
+        <XsPicker :is-bar="true" @change="switchXs" />
         <!-- 倒计时-->
         <XkCountdown :xk="curXk" @over="xkTimeOver" v-if="curXk && curXk.id" />
       </view>
@@ -14,7 +14,7 @@
 
     <!-- 可滚动的内容区域 -->
     <view class="scrollable-content">
-      <XkkcList :xk="curXk" :can-selected="true" @change="changeXkkc" />
+      <XkkcList :xk="curXk" :can-selected="true" @change="changeXkkc" v-if="!xsFlag" />
     </view>
 			
     <!-- 底部报名按钮 - 固定部分 -->
@@ -44,11 +44,19 @@ const user = computed(() => getUser);
 const curXs = computed(() => getCurXs);
 const curXk = ref<any>({});
 const selectedXkkcIds = ref<any>([]);
+
+const xsFlag = ref(true);
+
 // 切换选课
 const switchXk = (xk: any) => {
   curXk.value = xk;
 }
 
+// 切换学生
+const switchXs = (xs: any) => { 
+  xsFlag.value = false;
+}
+
 // 选课时间结束
 const xkTimeOver = (val: any) => { 
   console.log(val);

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

@@ -44,11 +44,11 @@
           mode="aspectFill"
         ></image>
         <view class="course-details">
-          <view class="course-name">{{ xkqd.kcmc }}</view>
+          <view class="course-name">{{ xkqd.xkmc }}</view>
           <view class="course-teacher">开课老师：{{ xkqd.jsxm }}</view>
           <view class="course-location">上课地点：{{ xkqd.kcdd }}</view>
           <view class="course-price"
-            >金额：<text class="price-value">¥{{ xkqd.kcje }}</text></view
+            >金额：<text class="price-value">¥{{ xkqd.jfje }}</text></view
           >
         </view>
       </view>
@@ -90,7 +90,7 @@ const totalJe = computed(() => {
   }
   let total = 0;
   for (let i = 0; i < xkqdList.value.length; i++) {
-    total += xkqdList.value[i].kcje;
+    total += xkqdList.value[i].jfje;
   }
   return total;
 });
@@ -153,18 +153,18 @@ const cancelRegistration = () => {
 
 // 立即支付
 const payNow = async () => {
-  // const res = await jzXkFqJfjApi({
+  const res = await jzXkFqJfjApi({
-  //   xsId: getData.xsId,
+    xsId: getData.xsId,
-  //   xkId: getData.xkId,
+    xkId: getData.xkId,
-  //   jffs: "四川农信", // TODO: 目前只支持四川农信
+    jffs: "四川农信", // TODO: 目前只支持四川农信
-  //   jzId: getUser.jzId,
+    jzId: getUser.jzId,
-  //   userId: getUser.userId,
+    userId: getUser.userId,
-  //   openId: getUser.openId,
+    openId: getUser.openId,
-  // });
+  });
-  const res = {
+  // const res = {
-    resultCode: 1,
+  //   resultCode: 1,
-    result: "https://pay.weixin.qq.com/wxpay/pay.action?prepay_id=wx20191018103005f5c0c0f5c0c"
+  //   result: "https://pay.weixin.qq.com/wxpay/pay.action?prepay_id=wx20191018103005f5c0c0f5c0c"
-  }
+  // }
   if (res.resultCode === 1 && res.result) {
     uni.redirectTo({
       url: `/pages/base/course-selection/pay-wait?payUrl=${encodeURIComponent(res.result)}`