Merge branch 'dev5.8.1' of Software/android-cloud-H5 into master

nuxt.config.js

@@ -17,7 +17,6 @@ dotenv.config({
 });
 
 export default {
-  target: 'static',
   // Disable server-side rendering: https://go.nuxtjs.dev/ssr-mode
   ssr: false,
   // Global page headers: https://go.nuxtjs.dev/config-head
@@ -274,13 +273,6 @@ export default {
   router: {
     base: '/h5/',
     middleware: ['auth'],
-    extendRoutes(routes, resolve) {
-      routes.push({
-        name: 'claim-cloud-phone',
-        path: '/claimCloudPhone/:id',
-        component: resolve(__dirname, 'pages/claimCloudPhone/_type.vue')
-      });
-    }
   },
   styleResources: {
     scss: ['~/assets/style/variables.scss'],

pages/claimCloudPhone/components/bargainingAssistance.vue

@@ -311,6 +311,14 @@
         为您带来更多精彩的活动和内容。<br />
       </div> -->
     </van-dialog>
+    <van-dialog style="background: #fff !important" v-model="copyVisble" showCancelButton :showConfirmButton="false">
+      <div class="copy-visble">请手动复制以下内容</div>
+      <van-field
+        v-model="copyValue"
+        rows="4"
+        type="textarea"
+      />
+    </van-dialog>
     <Verify
       @success="success"
       mode="pop"
@@ -395,6 +403,8 @@ export default {
       species,
       redPacket,
       glory,
+      copyVisble: false,
+      copyValue: ''
     };
   },
   components: {
@@ -754,9 +764,8 @@ export default {
                         });
                       },
                       () => {
-                        setTimeout(() => {
-                          this.$toast('链接复制失败');
-                        });
+                        this.copyValue = res.data.link
+                        this.copyVisble = true
                       },
                     );
                   }
@@ -1689,4 +1698,8 @@ export default {
 .mask {
   z-index: 4000;
 }
+
+.copy-visble {
+  padding: 16px;
+}
 </style>

pages/claimCloudPhone/components/setMealItem.vue

@@ -94,7 +94,7 @@ export default {
           .then((res) => {
             if (res.success) {
               if (!res.data.bargainingStatus) {
-                let url = '/claimCloudPhone/1?menuRuleId=' + data.id;
+                let url = '/claimCloudPhone/type?type=1&menuRuleId=' + data.id;
                 if (this.$route.query.userCardId) {
                   url += `&userCardId=${this.$route.query.userCardId}`;
                 }

pages/claimCloudPhone/index.vue

@@ -48,8 +48,8 @@ export default {
         window.atob(operateActivityId),
       );
       this.$router.replace({
-        path: '/claimCloudPhone/0',
-        query: this.$route.query,
+        path: '/claimCloudPhone/type',
+        query: {...this.$route.query, type: 0},
       });
       return;
     }
@@ -98,7 +98,7 @@ export default {
                 break;
               default:
                 this.$router.replace(
-                  '/claimCloudPhone/' + res.data.bargainingStatus,
+                  '/claimCloudPhone/type?type=' + res.data.bargainingStatus,
                 );
                 break;
             }

pages/claimCloudPhone/_type.vue

@@ -3,7 +3,7 @@
     <!-- type 1（砍一刀） 2（邀请好友） 3 （失败） 4 （成功）都是邀请人  0 是被邀请人 -->
     <bargainingAssistance
       ref="bargainingAssistance"
-      :type="$route.params.type"
+      :type="$route.query.type"
       :operateActivityId="operateActivityId"
       :getSystemTime="getSystemTime"
       :leaveFun="leaveFun"

plugins/plugins.js

@@ -24,7 +24,7 @@ export function writeToClipboard(text, success = () => { }, error = () => { }) {
             setTimeout(() => {
                 navigator.clipboard.writeText(text).then(() => {
                     success()
-                }).catch(() => {
+                }).catch((err) => {
                     error()
                 })
             }, 0);