.

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>
@@ -35,113 +31,118 @@ import { rand, shuffle } from '@/utils/math'
 import { hideLoading } from '@/utils'
 
 // 月份信息
+//posterImg关闭的图片
+//popImg 打开的图片
+//shareImg分享图片
+//screenImg屏保
+//calendarImg日历图片
 const monthList = [
   {
     id: 1,
-    posterImg: '',
-    popImg: '',
-    shareImg: '',
-    screenImg: '',
-    calendarImg: '',
+    posterImg: require('../assets/indexImg/imgex_MEW/1.jpg'),
+    popImg: require('../assets/luckyImg/1.jpg'),
+    shareImg: require('../assets/sharePagesImg/1.jpg'),
+    screenImg: require('../assets/screenImg/1.jpg'),
+    calendarImg: require('../assets/screenImg/January1.jpg'),
     mode: 1
   },
   {
     id: 2,
-    posterImg: '',
-    popImg: '',
-    shareImg: '',
-    screenImg: '',
-    calendarImg: '',
+    posterImg: require('../assets/indexImg/imgex_MEW/2.jpg'),
+    popImg: require('../assets/luckyImg/2.jpg'),
+    shareImg: require('../assets/sharePagesImg/2.jpg'),
+    screenImg: require('../assets/screenImg/2.jpg'),
+    calendarImg: require('../assets/screenImg/February2.jpg'),
     mode: 1
   },
   {
     id: 3,
-    posterImg: '',
-    popImg: '',
-    shareImg: '',
-    screenImg: '',
-    calendarImg: '',
+    posterImg: require('../assets/indexImg/imgex_MEW/3.jpg'),
+    popImg: require('../assets/luckyImg/3.jpg'),
+    shareImg: require('../assets/sharePagesImg/3.jpg'),
+    screenImg: require('../assets/screenImg/3.jpg'),
+    calendarImg: require('../assets/screenImg/March3.jpg'),
     mode: 1
   },
   {
     id: 4,
-    posterImg: '',
-    popImg: '',
-    shareImg: '',
-    screenImg: '',
-    calendarImg: '',
+    posterImg: require('../assets/indexImg/imgex_MEW/4.jpg'),
+    popImg: require('../assets/luckyImg/4.jpg'),
+    shareImg: require('../assets/sharePagesImg/4.jpg'),
+    screenImg: require('../assets/screenImg/4.jpg'),
+    calendarImg: require('../assets/screenImg/April4.jpg'),
     mode: 1
   },
   {
     id: 5,
-    posterImg: '',
-    popImg: '',
-    shareImg: '',
-    screenImg: '',
-    calendarImg: '',
+    posterImg: require('../assets/indexImg/imgex_MEW/5.jpg'),
+    popImg: require('../assets/luckyImg/5.jpg'),
+    shareImg: require('../assets/sharePagesImg/5.jpg'),
+    screenImg: require('../assets/screenImg/5.jpg'),
+    calendarImg: require('../assets/screenImg/May5.jpg'),
     mode: 1
   },
   {
     id: 6,
-    posterImg: '',
-    popImg: '',
-    shareImg: '',
-    screenImg: '',
-    calendarImg: '',
+    posterImg: require('../assets/indexImg/imgex_MEW/6.jpg'),
+    popImg: require('../assets/luckyImg/6.jpg'),
+    shareImg: require('../assets/sharePagesImg/6.jpg'),
+    screenImg: require('../assets/screenImg/6.jpg'),
+    calendarImg: require('../assets/screenImg/June6.jpg'),
     mode: 1
   },
   {
     id: 7,
-    posterImg: '',
-    popImg: '',
-    shareImg: '',
-    screenImg: '',
-    calendarImg: '',
+    posterImg: require('../assets/indexImg/imgex_MEW/7.jpg'),
+    popImg: require('../assets/luckyImg/7.jpg'),
+    shareImg: require('../assets/sharePagesImg/7.jpg'),
+    screenImg: require('../assets/screenImg/7.jpg'),
+    calendarImg: require('../assets/screenImg/July7.jpg'),
     mode: 1
   },
   {
     id: 8,
-    posterImg: '',
-    popImg: '',
-    shareImg: '',
-    screenImg: '',
-    calendarImg: '',
+    posterImg: require('../assets/indexImg/imgex_MEW/8.jpg'),
+    popImg: require('../assets/luckyImg/8.jpg'),
+    shareImg: require('../assets/sharePagesImg/8.jpg'),
+    screenImg: require('../assets/screenImg/8.jpg'),
+    calendarImg: require('../assets/screenImg/August8.jpg'),
     mode: 1
   },
   {
     id: 9,
-    posterImg: '',
-    popImg: '',
-    shareImg: '',
-    screenImg: '',
-    calendarImg: '',
+    posterImg: require('../assets/indexImg/imgex_MEW/9.jpg'),
+    popImg: require('../assets/luckyImg/9.jpg'),
+    shareImg: require('../assets/sharePagesImg/9.jpg'),
+    screenImg: require('../assets/screenImg/9.jpg'),
+    calendarImg: require('../assets/screenImg/September9.jpg'),
     mode: 1
   },
   {
     id: 10,
-    posterImg: '',
-    popImg: '',
-    shareImg: '',
-    screenImg: '',
-    calendarImg: '',
+    posterImg: require('../assets/indexImg/imgex_MEW/10.jpg'),
+    popImg: require('../assets/luckyImg/10.jpg'),
+    shareImg: require('../assets/sharePagesImg/10.jpg'),
+    screenImg: require('../assets/screenImg/10.jpg'),
+    calendarImg: require('../assets/screenImg/October10.jpg'),
     mode: 1
   },
   {
     id: 11,
-    posterImg: '',
-    popImg: '',
-    shareImg: '',
-    screenImg: '',
-    calendarImg: '',
+    posterImg: require('../assets/indexImg/imgex_MEW/11.jpg'),
+    popImg: require('../assets/luckyImg/11.jpg'),
+    shareImg: require('../assets/sharePagesImg/11.jpg'),
+    screenImg: require('../assets/screenImg/11.jpg'),
+    calendarImg: require('../assets/screenImg/November11.jpg'),
     mode: 1
   },
   {
     id: 12,
-    posterImg: '',
-    popImg: '',
-    shareImg: '',
-    screenImg: '',
-    calendarImg: '',
+    posterImg: require('../assets/indexImg/imgex_MEW/12.jpg'),
+    popImg: require('../assets/luckyImg/12.jpg'),
+    shareImg: require('../assets/sharePagesImg/12.jpg'),
+    screenImg: require('../assets/screenImg/12.jpg'),
+    calendarImg: require('../assets/screenImg/December12.jpg'),
     mode: 1
   }
 ]
@@ -149,13 +150,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 {