更新

src/business-components/calendar/index.tsx

@@ -8,10 +8,12 @@ import IconClock from '@/common/images/icon_clock.png'
 export default defineComponent({
   name: 'calendar',
   props: {
+    // 选中的数据
     selectList: {
       type: Array,
       default: []
     },
+    // 接口数据
     list: {
       type: Object,
       default: {}
@@ -169,7 +171,7 @@ export default defineComponent({
       dataList.forEach((item: any) => {
         item.start = dayjs(item.startTime).format('HH:mm')
         item.end = dayjs(item.endTime).format('HH:mm')
-        const isExist = this.selectList?.some(
+        const isExist = this.selectDays?.some(
           (course: any) => course.startTime === item.startTime
         )
         item.checked = isExist

src/teacher/live-class/create-components/arrange.tsx

@@ -75,7 +75,6 @@ export default defineComponent({
     onSelectDay(obj: any) {
       const result = obj || []
       let list = [...createState.selectCourseList]
-      console.log(list, result)
       result.forEach((item: any) => {
         const isExist = list.some(
           (course: any) => course.startTime === item.startTime

src/views/order-detail/payment/index.tsx

@@ -1,5 +1,9 @@
 import request from '@/helpers/request'
-import { postMessage } from '@/helpers/native-message'
+import {
+  listenerMessage,
+  postMessage,
+  removeListenerMessage
+} from '@/helpers/native-message'
 import {
   Button,
   Cell,
@@ -44,6 +48,9 @@ export default defineComponent({
       pay_channel: ''
     }
   },
+  unmounted() {
+    // removeListenerMessage('paymentOperation', this.onClose)
+  },
   methods: {
     onClose() {
       Dialog.confirm({
@@ -107,23 +114,35 @@ export default defineComponent({
             payInfo: `alipays://platformapi/startapp?saId=10000007&qrcode=${res.data.pay_info}`
           }
         })
-        // pay_info
-        Toast.loading({
-          message: '支付中...',
-          forbidClick: true,
-          duration: 3000,
-          loadingType: 'spinner',
-          onClose: () => {
-            this.$emit('update:modelValue', false)
-            this.$router.replace({
-              path: '/tradeDetail',
-              query: {
-                orderNo: this.orderInfo.orderNo
-              }
-            })
+
+        // 唤起支付时状态
+        listenerMessage('paymentOperation', (res: any) => {
+          if (res.status === 'success') {
+            Toast.success('支付成功')
+          } else if (res.status === 'cancel') {
+            Toast.fail('支付取消')
+          } else if (res.status === 'fail') {
+            Toast.fail('支付失败')
           }
         })
-        this.$emit('update:modelValue', false)
+
+        // pay_info
+        // Toast.loading({
+        //   message: '支付中...',
+        //   forbidClick: true,
+        //   duration: 3000,
+        //   loadingType: 'spinner',
+        //   onClose: () => {
+        //     this.$emit('update:modelValue', false)
+        //     this.$router.replace({
+        //       path: '/tradeDetail',
+        //       query: {
+        //         orderNo: this.orderInfo.orderNo
+        //       }
+        //     })
+        //   }
+        // })
+        // this.$emit('update:modelValue', false)
       } catch {}
     }
   },