Merge branch 'develop' of Software/android-cloud-H5 into release/v5.4.1

pages/activity/invite-user/guide-pc.vue

@@ -1,14 +1,16 @@
 <template>
   <div class="bg-guide">
     <v-carousel :show-arrows="false" cycle interval="3000" height="120" hide-delimiter-background class="w345h120" delimiter-icon="mdi-minus">
-      <v-carousel-item v-for="item in topADList" :key="item.id" :src="item.imgUrls[0]" @click="playAd(item)"></v-carousel-item>
+      <v-carousel-item v-for="item in topADList" :key="item.id">
+        <img :src="item.imgUrls[0]" style="width: 100%;height: 100%;" alt="" @click="playAd(item)">
+      </v-carousel-item>
     </v-carousel>
     <v-tabs v-model="tab" color="#3666F2" background-color="transparent" style="height: 42px;">
       <v-tab v-for="item in videoList" :key="item.plateId" style="height: 42px;">{{item.plateName}}</v-tab>
       <v-tabs-items v-model="tab">
-        <v-tab-item v-for="(item, index) in videoList" :key="item.plateId" style="padding: 10px;background: #FAFAFA;min-height: calc(100vh - 162px);">
+        <v-tab-item v-for="(item, num) in videoList" :key="item.plateId" style="padding: 10px;background: #FAFAFA;min-height: calc(100vh - 162px);">
           <div v-for="(ele, i) in item.videoCourseList" :key="ele.id" class="video-card">
-            <img class="w165h148" :src="videoURL(ele.coverImageKey)" @click="play(item, ele, index, i)" />
+            <img class="w165h148" :src="videoURL(ele.coverImageKey)" @click="play(item, ele, num, i)" />
           </div>
         </v-tab-item>
       </v-tabs-items>
@@ -98,7 +100,7 @@ export default {
     playAd(item) {
       this.submit(item, '', 2)
       if (item.actionType === '1' || item.actionType === '3' || item.actionType === '4' || item.actionType === '5' || item.actionType === '6') {
-        window.open('', '_blank', item.clickUrl)
+        window.open(item.clickUrl, '_blank', '')
       }
     },
     submit(item, ele, flag) {
@@ -160,7 +162,7 @@ export default {
     border-radius: 5px;
     position: relative;
     display: inline-block;
-    margin-right: 30px;
+    margin-right: 25px;
     z-index: 1;
     &:nth-of-type(4n + 0) {
       margin-right: 0px;

pages/activity/invite-user/guide.vue

@@ -1,14 +1,16 @@
 <template>
   <div class="bg2C2C2D">
     <v-carousel :show-arrows="false" cycle interval="3000" height="120" hide-delimiter-background class="w345h120" delimiter-icon="mdi-minus">
-      <v-carousel-item v-for="item in topADList" :key="item.id" :src="item.imgUrls[0]" @click="playAd(item)"></v-carousel-item>
+      <v-carousel-item v-for="item in topADList" :key="item.id">
+        <img :src="item.imgUrls[0]" style="width: 100%;height: 100%;" alt="" @click="playAd(item)">
+      </v-carousel-item>
     </v-carousel>
-    <div v-for="(item, index) in videoList" :key="item.plateId">
+    <div v-for="(item, num) in videoList" :key="item.plateId">
       <div class="fs16">{{item.plateName}}</div>
       <div :class="item.displayMode === 1 ? 'jcjc-list' : 'jjjc-list'">
         <div v-for="(ele, i) in item.videoCourseList" :key="ele.id" class="video-card">
           <img 
-            class="w165h148" :src="videoURL(ele.coverImageKey)" @click="play(item, ele, index, i)" />
+            class="w165h148" :src="videoURL(ele.coverImageKey)" @click="play(item, ele, num, i)" />
         </div>
       </div>
     </div>
@@ -100,7 +102,7 @@ export default {
     playAd(item) {
       this.submit(item, '', 2)
       if (item.actionType === '1' || item.actionType === '3' || item.actionType === '4' || item.actionType === '5' || item.actionType === '6') {
-        window.open('', '_blank', item.clickUrl)
+        window.open(item.clickUrl, '_blank')
       }
     },
     submit(item, ele, flag) {