Baozhangchao 3 лет назад
Родитель
Сommit
9963290eb9
4 измененных файлов: 6 добавлений и 14 удалений
  1. 1
    1
      src/components/CalendarPoster.vue
  2. 1
    1
      src/components/MyWinning.vue
  3. 3
    11
      src/pages/Honghe.vue
  4. 1
    1
      src/pages/SaveShare.vue

+ 1
- 1
src/components/CalendarPoster.vue Просмотреть файл

90
       backimg: require('../assets/buttonImg/backImg.png'),
90
       backimg: require('../assets/buttonImg/backImg.png'),
91
       shaerBut: require('../assets/buttonImg/sayFriend.png'),
91
       shaerBut: require('../assets/buttonImg/sayFriend.png'),
92
       pressImage: require('../assets/buttonImg/pressSave.png'),
92
       pressImage: require('../assets/buttonImg/pressSave.png'),
93
-      shaerButRed: require('../assets/buttonImg/shaerLuckyRed.png'),
93
+      shaerButRed: require('../assets/buttonImg/sayFriend.png'),
94
       pressLucky: require('../assets/buttonImg/happyAccept.png')
94
       pressLucky: require('../assets/buttonImg/happyAccept.png')
95
     }
95
     }
96
   },
96
   },

+ 1
- 1
src/components/MyWinning.vue Просмотреть файл

89
       backimg: require('../assets/buttonImg/backImg.png'),
89
       backimg: require('../assets/buttonImg/backImg.png'),
90
       shaerBut: require('../assets/buttonImg/sayFriend.png'),
90
       shaerBut: require('../assets/buttonImg/sayFriend.png'),
91
       pressImage: require('../assets/buttonImg/pressSave.png'),
91
       pressImage: require('../assets/buttonImg/pressSave.png'),
92
-      shaerButRed: require('../assets/buttonImg/shaerLuckyRed.png'),
92
+      shaerButRed: require('../assets/buttonImg/sayFriendd.png'),
93
       pressLucky: require('../assets/buttonImg/happyAccept.png')
93
       pressLucky: require('../assets/buttonImg/happyAccept.png')
94
     }
94
     }
95
   },
95
   },

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

16
             <!-- <img
16
             <!-- <img
17
               :class="`section-item-image ${rotateY?'backImag':''}` "
17
               :class="`section-item-image ${rotateY?'backImag':''}` "
18
               src="../assets/popupImg/backImag.jpg"
18
               src="../assets/popupImg/backImag.jpg"
19
-<<<<<<< HEAD
20
-            /> -->
21
-=======
22
-            />
23
->>>>>>> 1642bbb59612c65d05be612782386af72e35bd92
19
+            />-->
24
           </div>
20
           </div>
25
         </div>
21
         </div>
26
       </div>
22
       </div>
149
 export default {
145
 export default {
150
   name: 'Honghe',
146
   name: 'Honghe',
151
   components: {
147
   components: {
152
-<<<<<<< HEAD
153
     Popup: () => import('@/components/Popup.vue'),
148
     Popup: () => import('@/components/Popup.vue'),
154
     MyWinning: () => import('@/components/MyWinning.vue'),
149
     MyWinning: () => import('@/components/MyWinning.vue'),
155
     ImgBox: () => import('@/components/imgbox.vue')
150
     ImgBox: () => import('@/components/imgbox.vue')
156
-=======
157
-    Popup: () => import('@/components/Popup.vue')
158
->>>>>>> 1642bbb59612c65d05be612782386af72e35bd92
159
   },
151
   },
160
   data() {
152
   data() {
161
     return {
153
     return {
186
       this.showPopup = false
178
       this.showPopup = false
187
       this.list.map((item) => {
179
       this.list.map((item) => {
188
         if (item.id == this.currentMonth.id) {
180
         if (item.id == this.currentMonth.id) {
189
-          item.mode=3
181
+          item.mode = 3
190
         }
182
         }
191
       })
183
       })
192
     },
184
     },
193
     handleMonthClick(month) {
185
     handleMonthClick(month) {
194
       this.list.map((item) => {
186
       this.list.map((item) => {
195
         if (item.id == month.id) {
187
         if (item.id == month.id) {
196
-          item.mode=2
188
+          item.mode = 2
197
         }
189
         }
198
       })
190
       })
199
       this.currentMonth = month
191
       this.currentMonth = month

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

76
       backimg: require('../assets/saverShaerImg/back.png'),
76
       backimg: require('../assets/saverShaerImg/back.png'),
77
       shaerBut: require('../assets/saverShaerImg/shaerLucky.png'),
77
       shaerBut: require('../assets/saverShaerImg/shaerLucky.png'),
78
       pressImage: require('../assets/saverShaerImg/PressImage.png'),
78
       pressImage: require('../assets/saverShaerImg/PressImage.png'),
79
-      shaerButRed: require('../assets/saverShaerImg/shaerLuckyRed.png'),
79
+      shaerButRed: require('../assets/saverShaerImg/sayFriendd.png'),
80
       pressLucky: require('../assets/saverShaerImg/PressLucky.png')
80
       pressLucky: require('../assets/saverShaerImg/PressLucky.png')
81
     }
81
     }
82
   },
82
   },