flx

src/components/CalendarPoster.vue

@@ -90,7 +90,7 @@ export default {
       backimg: require('../assets/buttonImg/backImg.png'),
       shaerBut: require('../assets/buttonImg/sayFriend.png'),
       pressImage: require('../assets/buttonImg/pressSave.png'),
-      shaerButRed: require('../assets/buttonImg/shaerLuckyRed.png'),
+      shaerButRed: require('../assets/buttonImg/sayFriend.png'),
       pressLucky: require('../assets/buttonImg/happyAccept.png')
     }
   },

src/components/MyWinning.vue

@@ -89,7 +89,7 @@ export default {
       backimg: require('../assets/buttonImg/backImg.png'),
       shaerBut: require('../assets/buttonImg/sayFriend.png'),
       pressImage: require('../assets/buttonImg/pressSave.png'),
-      shaerButRed: require('../assets/buttonImg/shaerLuckyRed.png'),
+      shaerButRed: require('../assets/buttonImg/sayFriendd.png'),
       pressLucky: require('../assets/buttonImg/happyAccept.png')
     }
   },

src/pages/Honghe.vue

@@ -16,11 +16,7 @@
             <!-- <img
               :class="`section-item-image ${rotateY?'backImag':''}` "
               src="../assets/popupImg/backImag.jpg"
-<<<<<<< HEAD
-            /> -->
-=======
-            />
->>>>>>> 1642bbb59612c65d05be612782386af72e35bd92
+            />-->
           </div>
         </div>
       </div>
@@ -149,13 +145,9 @@ const monthList = [
 export default {
   name: 'Honghe',
   components: {
-<<<<<<< HEAD
     Popup: () => import('@/components/Popup.vue'),
     MyWinning: () => import('@/components/MyWinning.vue'),
     ImgBox: () => import('@/components/imgbox.vue')
-=======
-    Popup: () => import('@/components/Popup.vue')
->>>>>>> 1642bbb59612c65d05be612782386af72e35bd92
   },
   data() {
     return {
@@ -186,14 +178,14 @@ export default {
       this.showPopup = false
       this.list.map((item) => {
         if (item.id == this.currentMonth.id) {
-          item.mode=3
+          item.mode = 3
         }
       })
     },
     handleMonthClick(month) {
       this.list.map((item) => {
         if (item.id == month.id) {
-          item.mode=2
+          item.mode = 2
         }
       })
       this.currentMonth = month

src/pages/SaveShare.vue

@@ -76,7 +76,7 @@ export default {
       backimg: require('../assets/saverShaerImg/back.png'),
       shaerBut: require('../assets/saverShaerImg/shaerLucky.png'),
       pressImage: require('../assets/saverShaerImg/PressImage.png'),
-      shaerButRed: require('../assets/saverShaerImg/shaerLuckyRed.png'),
+      shaerButRed: require('../assets/saverShaerImg/sayFriendd.png'),
       pressLucky: require('../assets/saverShaerImg/PressLucky.png')
     }
   },