Merge branch 'iteration-20241115' into dev

src/views/activation-code/activation-register/index.tsx

@@ -1509,11 +1509,15 @@ export default defineComponent({
                 forms.reslutPopupType === 'ACTIVATING' ||
                 forms.reslutPopupType === 'ACTIVATING-TWO'
               ) {
-                let url = '/download'
                 if(route.query.wx === 'wx_lite') {
-                  url += '?wx=wx_lite'
+                  // @ts-ignore
+                  wx.miniProgram.redirectTo({
+                    url: 'page/download/download'
+                  })
+                } else {
+                  router.push('/download');
                 }
-                router.push('/download');
+                
               } else {
                 forms.showResultPopup = false;
               }

src/views/activation-code/download/index.tsx

@@ -7,10 +7,10 @@ import MSticky from '@/components/m-sticky';
 export default defineComponent({
   name: 'activation-download',
   setup() {
-    const onDownload = () => {
-      // @ts-ignore
-      window.wx.downloadImage('https://oss.dayaedu.com/ktyq/1733226456374.png')
-    }
+    // const onDownload = () => {
+    //   // @ts-ignore
+    //   window.wx.downloadImage('https://oss.dayaedu.com/ktyq/1733226456374.png')
+    // }
     const onDownload2 = () => {
       console.log('发送消息')
       // @ts-ignore
@@ -21,7 +21,9 @@ export default defineComponent({
         }
       })
       // @ts-ignore
-      wx.miniProgram.navigateBack()
+      wx.miniProgram.redirectTo({
+        url: 'page/download/download'
+      })
     }
     return () => (
       <div class={styles.activationDownload}>