合并

dist/index.html

@@ -58,7 +58,11 @@
       //   }
   </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 crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-45a1347b.js"></script>
+=======
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-f974112b.js"></script>
+>>>>>>> iteration-1130
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/index-legacy-d223e03b.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>
 

src/components/m-image-preview/index.tsx

@@ -82,7 +82,7 @@ export default defineComponent({
           }
         });
         if (res?.content?.status === 'success') {
-          showSuccessToast('保存成功');
+          showSuccessToast('已保存到相册');
         } else {
           showFailToast('保存失败');
         }

src/views/activity-record/detail.tsx

@@ -285,7 +285,7 @@ export default defineComponent({
         }
       });
       if (res?.content?.status === 'success') {
-        showSuccessToast('保存成功');
+        showSuccessToast('已保存到相册');
       } else {
         showFailToast('保存失败');
       }