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

nuxt.config.js

@@ -83,6 +83,7 @@ export default {
     '~/plugins/jweixin',
     // '~/plugins/umeng-datasources',
     '@/plugins/vant',
+    '@/plugins/vue-clipboard2',
     '~/plugins/common',
 
   ],

package.json

@@ -48,6 +48,7 @@
     "vconsole": "^3.14.6",
     "vee-validate": "^3.4.14",
     "vue": "^2.7.8",
+    "vue-clipboard2": "^0.3.3",
     "vue-data-dict": "^1.0.6",
     "vue-lottie": "^0.2.1",
     "vue-server-renderer": "^2.7.8",

pages/claimCloudPhone/components/bargainingAssistance.vue

@@ -178,8 +178,8 @@
       <template v-if="bargainingTipsBool">
         <div class="bargaining-amount">
           <div class="bargaining-amount-text">
-            <div> 恭喜您</div>
-            砍价成功<span>10.52元</span>
+            <div>恭喜您</div>
+            砍价成功<span>{{ bargainingAmount }}元</span>
           </div>
           <lottie
             class="species"
@@ -312,14 +312,15 @@
         为您带来更多精彩的活动和内容。<br />
       </div> -->
     </van-dialog>
-    <van-dialog style="background: #fff !important" v-model="copyVisble" showCancelButton :showConfirmButton="false">
+    <!-- <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>
+      <van-field v-model="copyValue" rows="4" type="textarea" />
+    </van-dialog> -->
     <Verify
       @success="success"
       mode="pop"
@@ -339,8 +340,8 @@ import customProgress from './customProgress.vue';
 import loadList from '@/components/loadList';
 import { fileKeyToUrl } from '@/plugins/file-center.js';
 import Verify from '@/components/verifition/Verify';
-import { writeToClipboard } from '@/plugins/plugins.js';
 import lottie from '@/components/lottie';
+import { writeToClipboard } from '@/plugins/plugins.js';
 export default {
   props: {
     operateActivityId: {
@@ -404,8 +405,8 @@ export default {
       species,
       redPacket,
       glory,
-      copyVisble: false,
-      copyValue: ''
+      // copyVisble: false,
+      // copyValue: '',
     };
   },
   components: {
@@ -765,8 +766,18 @@ export default {
                         });
                       },
                       () => {
-                        this.copyValue = res.data.link
-                        this.copyVisble = true
+                        this.$copyText(res.data.link).then(
+                          (e) => {
+                            setTimeout(() => {
+                              this.$toast('链接复制成功');
+                            });
+                          },
+                          (e) => {
+                            setTimeout(() => {
+                              this.$toast('链接复制失败');
+                            });
+                          },
+                        );
                       },
                     );
                   }

plugins/vue-clipboard2.js

@@ -0,0 +1,5 @@
+import Vue from 'vue'
+import VueClipboard from 'vue-clipboard2'
+
+VueClipboard.config.autoSetContainer = true // add this line
+Vue.use(VueClipboard)