Baozhangchao 3 лет назад
Родитель
Сommit
fda2ccf943
3 измененных файлов: 27 добавлений и 31 удалений
  1. 2
    21
      src/components/ShaerPopup.vue
  2. 10
    7
      src/pages/Honghe.vue
  3. 15
    3
      src/pages/SaveShare.vue

+ 2
- 21
src/components/ShaerPopup.vue Просмотреть файл

@@ -2,10 +2,10 @@
2 2
   <div v-if="showSelf" class="dialog" :style="{'z-index': zIndex}">
3 3
     <div class="dialog-mark" @click="closeMyself" :style="{'z-index': zIndex + 1}">
4 4
       <div v-show="myShareShow" class="sharetiptxt" style>
5
-        <img style="width:100%; height:100%;" src="../assets/popupImg/myShare.png" alt />
5
+        <img style="width:100%; height:100%; z-index:46" src="../assets/popupImg/myShare.png" alt />
6 6
       </div>
7 7
       <transition name="dialog">
8
-        <div class="dialog-sprite" :style="{'z-index': zIndex + 2}">
8
+        <div class="dialog-sprite">
9 9
           <div class="dialog-body">
10 10
             <div class="bd2 flex-col">
11 11
               <img class="pic1" src="../assets/ShaerPopupImg/popuBgc.jpg" alt />
@@ -47,29 +47,10 @@ export default {
47 47
       default: false,
48 48
       required: true
49 49
     },
50
-    title: {
51
-      type: String,
52
-      required: true
53
-    },
54
-    showCancel: {
55
-      typs: Boolean,
56
-      default: false,
57
-      required: false
58
-    },
59 50
     cancelText: {
60 51
       type: String,
61 52
       default: '取消',
62 53
       required: false
63
-    },
64
-    confirmText: {
65
-      type: String,
66
-      default: '确定',
67
-      required: false
68
-    },
69
-    LoadingShow: {
70
-      type: Boolean,
71
-      default: false,
72
-      required: true
73 54
     }
74 55
   },
75 56
 

+ 10
- 7
src/pages/Honghe.vue Просмотреть файл

@@ -1,6 +1,7 @@
1 1
 <template>
2 2
   <div class="index-box">
3 3
     <popup :show="showPopup" @cancel="cancelFrom" />
4
+    <!-- <SaveShare :show="sSaveSharehowPopup" @cancel="cancelFrom" /> -->
4 5
     <div>
5 6
       <div>
6 7
         <img class="topImage" src="../assets/hareTop.png" alt />
@@ -10,11 +11,11 @@
10 11
       <div class="outer6 flex-col">
11 12
         <div v-for="item in indexJPG" :key="item" class="section-item">
12 13
           <div @click="baga">
13
-            <!-- <img class="section-item-image" src="../assets/coverIndex.jpg" /> -->
14
-            <img
14
+            <img class="section-item-image" src="../assets/coverIndex.jpg" />
15
+            <!-- <img
15 16
               :class="`section-item-image ${!showPopup?'backImag':''}` "
16 17
               src="../assets/popupImg/backImag.jpg"
17
-            />
18
+            />-->
18 19
           </div>
19 20
         </div>
20 21
       </div>
@@ -28,20 +29,22 @@ import { useModel } from '@/store'
28 29
 export default {
29 30
   name: 'Honghe',
30 31
   components: {
31
-    Popup: () => import('@/components/Popup.vue')
32
+    Popup: () => import('@/components/Popup.vue'),
33
+    SaveShare: () => import('./SaveShare.vue')
32 34
   },
33 35
   data() {
34 36
     return {
35 37
       indexJPG: new Array(12).fill(null),
36
-      showPopup: false
38
+      showPopup: false,
39
+      sSaveSharehowPopup: false
37 40
     }
38 41
   },
39 42
   computed: {
40 43
     person: {
41
-      get () {
44
+      get() {
42 45
         return useModel('person')[0]
43 46
       },
44
-      set (val) {
47
+      set(val) {
45 48
         useModel('person')[1](val)
46 49
       }
47 50
     }

+ 15
- 3
src/pages/SaveShare.vue Просмотреть файл

@@ -1,7 +1,7 @@
1 1
 <template>
2
-  <div style=" height:100vh; width:100%;">
2
+  <div style=" height:100vh; width:100%;" v-if="showSelf">
3 3
     <!-- 弹窗 -->
4
-    <ShaerPopup :show="shaerShow" @closeMyself="cancelFrom" />
4
+    <ShaerPopup :show="show" @closeMyself="cancelFrom" />
5 5
     <!-- 弹窗 -->
6 6
 
7 7
     <router-link :to="{path:'/'}">
@@ -13,7 +13,7 @@
13 13
         <!-- 领取屏保 -->
14 14
         <div class="outer3 flex-col">
15 15
           <div class="haibao">
16
-            <img class="haibao" src="../assets/saverShaerImg/haibao.jpg" alt />
16
+            <img class="haibao" src="~@/assets/saverShaerImg/haibao.jpg" alt />
17 17
           </div>
18 18
           <div class="mod2 flex-col">
19 19
             <div class="block1 flex-col">
@@ -55,6 +55,18 @@ export default {
55 55
   components: {
56 56
     ShaerPopup: () => import('@/components/ShaerPopup.vue')
57 57
   },
58
+  props: {
59
+    show: {
60
+      type: Boolean,
61
+      default: false,
62
+      required: true
63
+    },
64
+    cancelText: {
65
+      type: String,
66
+      default: '取消',
67
+      required: false
68
+    }
69
+  },
58 70
   data() {
59 71
     return {
60 72
       item: null,