1

dist/index.html

@@ -67,7 +67,11 @@
   
   <!-- <script type="module" src="/src/teacher/main.ts"></script> -->
   <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
+<<<<<<< HEAD
   <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.adaf99d0.js"></script>
+=======
+  <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.5747c6e2.js"></script>
+>>>>>>> iteration-20241205
   <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.1ff34718.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>
 

dist/teacher.html

@@ -64,7 +64,11 @@
   <div id="app"></div>
   
   <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
+<<<<<<< HEAD
   <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.adaf99d0.js"></script>
+=======
+  <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.5747c6e2.js"></script>
+>>>>>>> iteration-20241205
   <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.de51cea6.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>
 

dist/tenant.html

@@ -66,7 +66,11 @@
   
   <!-- <script type="module" src="/src/teacher/main.ts"></script> -->
   <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
+<<<<<<< HEAD
   <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.adaf99d0.js"></script>
+=======
+  <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.5747c6e2.js"></script>
+>>>>>>> iteration-20241205
   <script nomodule id="vite-legacy-entry" data-src="./assets/tenant-legacy.b886b29b.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>
 

src/views/order-detail/index.tsx

@@ -380,23 +380,40 @@ export default defineComponent({
           this.orderInfo = orderStatus.orderObject.paymentConfig || {}
           this.orderNo = orderStatus.orderObject.orderNo
           const paymentChannel = this.orderInfo.paymentConfig.paymentChannel
-          if (paymentChannel) {
-            // 判断是否为原生支付
-            if (
-              this.orderInfo.paymentVendor?.indexOf('wxpay') > -1 ||
-              this.orderInfo.paymentVendor?.indexOf('alipay') > -1
-            ) {
-              this.submitNativePay()
-            } else {
+          // 判断是否为原生支付
+          if (
+            this.orderInfo.paymentVendor?.indexOf('wxpay') > -1 ||
+            this.orderInfo.paymentVendor?.indexOf('alipay') > -1
+          ) {
+            this.paymentStatus = true
+          } else {
+            if (paymentChannel) {
               const payCode = beforeSubmit(paymentChannel)
               this.onConfirm({
                 payCode,
                 pay_channel: paymentChannel
               })
+            } else {
+              this.paymentStatus = true
             }
-          } else {
-            this.paymentStatus = true
           }
+          // if (paymentChannel) {
+          //   // 判断是否为原生支付
+          //   if (
+          //     this.orderInfo.paymentVendor?.indexOf('wxpay') > -1 ||
+          //     this.orderInfo.paymentVendor?.indexOf('alipay') > -1
+          //   ) {
+          //     this.submitNativePay()
+          //   } else {
+          //     const payCode = beforeSubmit(paymentChannel)
+          //     this.onConfirm({
+          //       payCode,
+          //       pay_channel: paymentChannel
+          //     })
+          //   }
+          // } else {
+          //   this.paymentStatus = true
+          // }
           
         }
         return