Baozhangchao 3 years ago
parent
commit
fda2ccf943
3 changed files with 27 additions and 31 deletions
  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 View File

2
   <div v-if="showSelf" class="dialog" :style="{'z-index': zIndex}">
2
   <div v-if="showSelf" class="dialog" :style="{'z-index': zIndex}">
3
     <div class="dialog-mark" @click="closeMyself" :style="{'z-index': zIndex + 1}">
3
     <div class="dialog-mark" @click="closeMyself" :style="{'z-index': zIndex + 1}">
4
       <div v-show="myShareShow" class="sharetiptxt" style>
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
       </div>
6
       </div>
7
       <transition name="dialog">
7
       <transition name="dialog">
8
-        <div class="dialog-sprite" :style="{'z-index': zIndex + 2}">
8
+        <div class="dialog-sprite">
9
           <div class="dialog-body">
9
           <div class="dialog-body">
10
             <div class="bd2 flex-col">
10
             <div class="bd2 flex-col">
11
               <img class="pic1" src="../assets/ShaerPopupImg/popuBgc.jpg" alt />
11
               <img class="pic1" src="../assets/ShaerPopupImg/popuBgc.jpg" alt />
47
       default: false,
47
       default: false,
48
       required: true
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
     cancelText: {
50
     cancelText: {
60
       type: String,
51
       type: String,
61
       default: '取消',
52
       default: '取消',
62
       required: false
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 View File

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

+ 15
- 3
src/pages/SaveShare.vue View File

1
 <template>
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
     <router-link :to="{path:'/'}">
7
     <router-link :to="{path:'/'}">
13
         <!-- 领取屏保 -->
13
         <!-- 领取屏保 -->
14
         <div class="outer3 flex-col">
14
         <div class="outer3 flex-col">
15
           <div class="haibao">
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
           </div>
17
           </div>
18
           <div class="mod2 flex-col">
18
           <div class="mod2 flex-col">
19
             <div class="block1 flex-col">
19
             <div class="block1 flex-col">
55
   components: {
55
   components: {
56
     ShaerPopup: () => import('@/components/ShaerPopup.vue')
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
   data() {
70
   data() {
59
     return {
71
     return {
60
       item: null,
72
       item: null,