Baozhangchao 3 anos atrás
pai
commit
dbfa658e4d

+ 11
- 8
src/components/CalendarPoster.vue Ver arquivo

@@ -3,7 +3,7 @@
3 3
     <div style=" height:100vh; width:100%;
4 4
     ">
5 5
       <!-- 弹窗 -->
6
-      <ShaerPopup :show="shaerShow" @closeMyself="cancelPopup" />
6
+      <ShaerPopup :show="shaerShow" @closeMyself="cancelPopup" :current-month="currentMonth" />
7 7
       <!-- 弹窗 -->
8 8
 
9 9
       <!-- <router-link :to="{path:'/'}"> -->
@@ -19,7 +19,7 @@
19 19
           <!-- 领取屏保 -->
20 20
           <div class="outer3 flex-col">
21 21
             <div class="haibao">
22
-              <img class="haibao" src="~@/assets/saverShaerImg/haibao.jpg" alt />
22
+              <img class="haibao" :src="currentMonth.calendarImg" alt />
23 23
             </div>
24 24
             <div class="mod2 flex-col">
25 25
               <div class="block1 flex-col">
@@ -38,7 +38,7 @@
38 38
           <div class="page flex-col">
39 39
             <div class="group1 flex-col">
40 40
               <div class="wrap3 flex-col">
41
-                <img src="~@/assets/saverShaerImg/calendar.jpg" class="subhaibao" />
41
+                <img :src="currentMonth.calendarImg" class="subhaibao" />
42 42
               </div>
43 43
               <div class="wrap5 flex-col">
44 44
                 <span class="txt1" :style="`background-image: url(${pressLucky});`"></span>
@@ -75,6 +75,9 @@ export default {
75 75
       default: '取消',
76 76
       required: false
77 77
     },
78
+    currentMonth: {
79
+      type: Object
80
+    },
78 81
 
79 82
     stater: {
80 83
       type: Number
@@ -84,11 +87,11 @@ export default {
84 87
   data() {
85 88
     return {
86 89
       shaerShow: false,
87
-      backimg: require('../assets/saverShaerImg/back.png'),
88
-      shaerBut: require('../assets/saverShaerImg/shaerLucky.png'),
89
-      pressImage: require('../assets/saverShaerImg/PressImage.png'),
90
-      shaerButRed: require('../assets/saverShaerImg/shaerLuckyRed.png'),
91
-      pressLucky: require('../assets/saverShaerImg/PressLucky.png')
90
+      backimg: require('../assets/buttonImg/backImg.png'),
91
+      shaerBut: require('../assets/buttonImg/sayFriend.png'),
92
+      pressImage: require('../assets/buttonImg/pressSave.png'),
93
+      shaerButRed: require('../assets/buttonImg/shaerLuckyRed.png'),
94
+      pressLucky: require('../assets/buttonImg/happyAccept.png')
92 95
     }
93 96
   },
94 97
 

+ 10
- 8
src/components/MyWinning.vue Ver arquivo

@@ -19,7 +19,7 @@
19 19
           <!-- 领取屏保 -->
20 20
           <div class="outer3 flex-col">
21 21
             <div class="haibao">
22
-              <img class="haibao" src="~@/assets/saverShaerImg/haibao.jpg" alt />
22
+              <img class="haibao" :src="currentMonth.calendarImg" alt />
23 23
             </div>
24 24
             <div class="mod2 flex-col">
25 25
               <!-- <div class="block1 flex-col">
@@ -38,7 +38,7 @@
38 38
           <div class="page flex-col">
39 39
             <div class="group1 flex-col">
40 40
               <div class="wrap3 flex-col">
41
-                <img src="~@/assets/saverShaerImg/calendar.jpg" class="subhaibao" />
41
+                <img :src="currentMonth.calendarImg" class="subhaibao" />
42 42
               </div>
43 43
               <!-- <div class="wrap5 flex-col">
44 44
                 <span class="txt1" :style="`background-image: url(${pressLucky});`"></span>
@@ -75,7 +75,9 @@ export default {
75 75
       default: '取消',
76 76
       required: false
77 77
     },
78
-
78
+    currentMonth: {
79
+      type: Object
80
+    },
79 81
     stater: {
80 82
       type: Number
81 83
     }
@@ -84,11 +86,11 @@ export default {
84 86
   data() {
85 87
     return {
86 88
       shaerShow: false,
87
-      backimg: require('../assets/saverShaerImg/back.png'),
88
-      shaerBut: require('../assets/saverShaerImg/shaerLucky.png'),
89
-      pressImage: require('../assets/saverShaerImg/PressImage.png'),
90
-      shaerButRed: require('../assets/saverShaerImg/shaerLuckyRed.png'),
91
-      pressLucky: require('../assets/saverShaerImg/PressLucky.png')
89
+      backimg: require('../assets/buttonImg/backImg.png'),
90
+      shaerBut: require('../assets/buttonImg/sayFriend.png'),
91
+      pressImage: require('../assets/buttonImg/pressSave.png'),
92
+      shaerButRed: require('../assets/buttonImg/shaerLuckyRed.png'),
93
+      pressLucky: require('../assets/buttonImg/happyAccept.png')
92 94
     }
93 95
   },
94 96
 

+ 22
- 18
src/components/Popup.vue Ver arquivo

@@ -1,54 +1,59 @@
1 1
 <template>
2 2
   <div v-if="showSelf" class="dialog">
3
-    <CalendarPoster :show="showPopupCalendarPoster" @cancelPopus="canckle" :stater="stater" />
3
+    <CalendarPoster
4
+      :show="showPopupCalendarPoster"
5
+      @cancelPopus="canckle"
6
+      :stater="stater"
7
+      :current-month="currentMonth"
8
+    />
4 9
 
5 10
     <!-- 我的奖品 -->
6
-    <MyWinning :show="MyWinningShow" @cancel="()=>this.MyWinningShow=false" />
11
+    <MyWinning
12
+      :show="MyWinningShow"
13
+      @cancel="()=>this.MyWinningShow=false"
14
+      :current-month="currentMonth"
15
+    />
7 16
 
8 17
     <div class="dialog-mark" @click.self="closeMyself">
9 18
       <div v-show="myShareShow" class="sharetiptxt" style>
10
-        <img style="width:100%; height:100%;" src="../assets/popupImg/myShare.png" alt />
19
+        <img style="width:100%; height:100%;" src="../assets/buttonImg/shareText.png" alt />
11 20
       </div>
12 21
       <transition name="dialog">
13 22
         <div class="dialog-sprite">
14 23
           <div class="dialog-body">
15 24
             <div class="card-wrapper">
16 25
               <div :class="`dialog-popuImag ${classDivAA?'flipped':''}`">
17
-                <!-- <img src="../assets/popupImg/popuBody.jpg" alt /> -->
26
+                <!-- <img src="../assets/buttonImg/popuBody.jpg" alt /> -->
18 27
                 <div class="back">
19
-                  <img style="width: 180px; height:492px" src="../assets/popupImg/popuBody.jpg" alt />
28
+                  <img style="width: 180px; height:492px" :src="currentMonth.screenImg" alt />
20 29
                 </div>
21 30
 
22 31
                 <div class="front">
23
-                  <img
24
-                    style="width: 180px; height:492px "
25
-                    src="../assets/popupImg/backImag.jpg"
26
-                    alt
27
-                  />
32
+                  <img style="width: 180px; height:492px " :src="currentMonth.calendarImg" alt />
28 33
                 </div>
29 34
               </div>
30 35
             </div>
31 36
 
32 37
             <div class="dialog-footer">
33
-              <img @click="cancel" class="btn" src="../assets/popupImg/cancelmage.png" alt />
38
+              <img @click="cancel" class="btn" src="../assets/buttonImg/closeBut.png" alt />
34 39
             </div>
35 40
           </div>
36 41
           <!-- 右侧 -->
37 42
           <div class="section-box">
38 43
             <div class="section-box-share" @click="()=>{this.MyWinningShow=true}">
39
-              <img src="../assets/popupImg/shareImage.png" alt />
44
+              <img src="../assets/buttonImg/myPrize.png" alt />
40 45
             </div>
41 46
             <div
42 47
               class="section-box-receive"
43 48
               @click="()=>{this.showPopupCalendarPoster=true,this.stater=0}"
44 49
             >
45
-              <img src="../assets/popupImg/receiveImage.png" alt />
50
+              <img src="../assets/buttonImg/saveHaibao.png" alt />
46 51
             </div>
47 52
             <div
48 53
               class="section-box-save"
49 54
               @click="()=>{this.showPopupCalendarPoster=true,this.stater=1}"
50 55
             >
51
-              <img src="../assets/popupImg/saveImage.png" alt />
56
+              <img src="../assets/buttonImg/saveMonth.png" alt />
52 57
             </div>
53 58
           </div>
54 59
         </div>
@@ -70,10 +75,9 @@ export default {
70 75
       default: false,
71 76
       required: true
72 77
     },
73
-    // title: {
74
-    //   type: String,
75
-    //   required: true
76
-    // },
78
+    currentMonth: {
79
+      type: Object
80
+    },
77 81
     showCancel: {
78 82
       typs: Boolean,
79 83
       default: false,

+ 10
- 3
src/components/ShaerPopup.vue Ver arquivo

@@ -2,13 +2,17 @@
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%; z-index:46" src="../assets/popupImg/myShare.png" alt />
5
+        <img
6
+          style="width:100%; height:100%; z-index:46"
7
+          src="../assets/buttonImg/shareText.png"
8
+          alt
9
+        />
6 10
       </div>
7 11
       <transition name="dialog">
8 12
         <div class="dialog-sprite">
9 13
           <div class="dialog-body">
10 14
             <div class="bd2 flex-col">
11
-              <img class="pic1" src="../assets/ShaerPopupImg/popuBgc.jpg" alt />
15
+              <img class="pic1" src="../assets/sharePagesImg/1.jpg" alt />
12 16
             </div>
13 17
 
14 18
             <div class="bd1 flex-col">
@@ -51,6 +55,9 @@ export default {
51 55
       type: String,
52 56
       default: '取消',
53 57
       required: false
58
+    },
59
+    currentMonth: {
60
+      type: Object
54 61
     }
55 62
   },
56 63
 
@@ -60,7 +67,7 @@ export default {
60 67
       showSelf: false,
61 68
       zIndex: this.getZIndex(),
62 69
       bodyOverflow: '',
63
-      popuSave: require('../assets/ShaerPopupImg/popuSave.png'),
70
+      popuSave: require('../assets/sharePagesImg/2.png'),
64 71
 
65 72
       myShareShow: true
66 73
     }

+ 2
- 2
src/components/WinningPopup.vue Ver arquivo

@@ -2,7 +2,7 @@
2 2
   <div v-if="showSelf" class="dialog">
3 3
     <div class="dialog-mark" @click.self="closeMyself">
4 4
       <div class="sharetiptxt" style>
5
-        <img style="width:100%; height:100%;" src="../assets/popupImg/myShare.png" alt />
5
+        <img style="width:100%; height:100%;" src="../assets/buttonImg/shareText.png" alt />
6 6
       </div>
7 7
       <transition name="dialog">
8 8
         <div class="dialog-sprite">
@@ -17,7 +17,7 @@
17 17
                 <div class="front">
18 18
                   <img
19 19
                     style="width: 180px; height:492px "
20
-                    src="../assets/popupImg/backImag.jpg"
20
+                    src="../assets/buttonImg/backImg.png"
21 21
                     alt
22 22
                   />
23 23
                 </div>