Merge branch 'iteration-20241115' into dev

src/main.ts

@@ -58,8 +58,8 @@ postMessage({ api: 'getNavHeight' }, (res: any) => {
   }
 });
 
-import Vconsole from 'vconsole';
-const vconsole = new Vconsole();
+// import Vconsole from 'vconsole';
+// const vconsole = new Vconsole();
 
 const app = createApp(App);
 

src/router/router-root.ts

@@ -97,7 +97,7 @@ export default [
   },
   {
     path: '/payResultWechat',
-    name: 'payResult',
+    name: 'payResultWechat',
     component: () => import('@/views/adapay/pay-result-wechat'),
     meta: {
       title: '支付'

src/views/adapay/pay-result-wechat/index.tsx

@@ -222,6 +222,8 @@ export default defineComponent({
             //     '/classroom-app/#/payment-result?orderNo=' +
             //     state.orderNo
             // );
+            // 向小程序发送消息
+            window.parent.postMessage({type: 'webViewResult', err_msg: res.err_msg, orderNo: state.orderNo}, '*')
           } else {
             // 使用以上方式判断前端返回,微信团队郑重提示：
             //res.err_msg将在用户支付成功后返回ok，但并不保证它绝对可靠。
@@ -231,6 +233,7 @@ export default defineComponent({
             //     '/classroom-app/#/payment-result?orderNo=' +
             //     state.orderNo
             // );
+            window.parent.postMessage({type: 'webViewResult', err_msg: res.err_msg, orderNo: state.orderNo}, '*')
           }
         }
       );
@@ -250,6 +253,14 @@ export default defineComponent({
 
     onMounted(() => {
       init();
+
+      document.addEventListener('DOMContentLoaded', function() {
+        // 监听返回按钮点击事件
+        window.addEventListener('popstate', function() {
+          // 向小程序发送消息
+          window.parent.postMessage({type: 'webViewBack'}, '*')
+        });
+      });
     });
 
     return () => (