Browse Source

Merge branch 'master' of http://git.ycjcjy.com/honghe/h5-draw-lots into master

张延森 3 years ago
parent
commit
30744eb1b4

BIN
src/assets/monthImg/April4.jpg View File


BIN
src/assets/monthImg/August8.jpg View File


BIN
src/assets/monthImg/December12.jpg View File


BIN
src/assets/monthImg/February2.jpg View File


BIN
src/assets/monthImg/January1.jpg View File


BIN
src/assets/monthImg/July7.jpg View File


BIN
src/assets/monthImg/June6.jpg View File


BIN
src/assets/monthImg/March3.jpg View File


BIN
src/assets/monthImg/May5.jpg View File


BIN
src/assets/monthImg/November11.jpg View File


BIN
src/assets/monthImg/October10.jpg View File


BIN
src/assets/monthImg/September9.jpg View File


BIN
src/assets/sharePagesImg/1.jpg View File


BIN
src/assets/sharePagesImg/10.jpg View File


BIN
src/assets/sharePagesImg/11.jpg View File


BIN
src/assets/sharePagesImg/12.jpg View File


BIN
src/assets/sharePagesImg/2.jpg View File


BIN
src/assets/sharePagesImg/3.jpg View File


BIN
src/assets/sharePagesImg/4.jpg View File


BIN
src/assets/sharePagesImg/5.jpg View File


BIN
src/assets/sharePagesImg/6.jpg View File


BIN
src/assets/sharePagesImg/7.jpg View File


BIN
src/assets/sharePagesImg/8.jpg View File


BIN
src/assets/sharePagesImg/9.jpg View File


+ 2
- 2
src/components/Popup.vue View File

260
         display: flex;
260
         display: flex;
261
         justify-content: center;
261
         justify-content: center;
262
         transform-style: preserve-3d;
262
         transform-style: preserve-3d;
263
-        transition: all 1.2s ease;
263
+        transition: all 0.8s ease;
264
 
264
 
265
         .front {
265
         .front {
266
         }
266
         }
270
         }
270
         }
271
       }
271
       }
272
       .flipped {
272
       .flipped {
273
-        animation: change 0.8s linear forwards;
273
+        animation: change 0.6s linear forwards;
274
       }
274
       }
275
     }
275
     }
276
     @keyframes change {
276
     @keyframes change {

+ 0
- 2
src/components/WinningPopup.vue View File

68
       bodyOverflow: '',
68
       bodyOverflow: '',
69
       classDivAA: false,
69
       classDivAA: false,
70
       myShareShow: false,
70
       myShareShow: false,
71
-      canlParez: {},
72
       backimg: require('../assets/luckyImg/2.jpg')
71
       backimg: require('../assets/luckyImg/2.jpg')
73
     }
72
     }
74
   },
73
   },
112
     cancel() {
111
     cancel() {
113
       this.$emit('cancel', true)
112
       this.$emit('cancel', true)
114
     },
113
     },
115
-    canlParez() {},
116
 
114
 
117
     /** 确认按钮操作 */
115
     /** 确认按钮操作 */
118
     confirm() {
116
     confirm() {

+ 8
- 2
src/pages/Honghe.vue View File

162
     Popup: () => import('@/components/Popup.vue'),
162
     Popup: () => import('@/components/Popup.vue'),
163
     WinningPopup: () => import('@/components/WinningPopup.vue'),
163
     WinningPopup: () => import('@/components/WinningPopup.vue'),
164
     ImgBox: () => import('@/components/imgbox.vue'),
164
     ImgBox: () => import('@/components/imgbox.vue'),
165
-    BgMusic: () => import('@/components/BgMusic.vue'),
166
-    MyWinning: () => import('@/components/MyWinning.vue')
165
+    BgMusic: () => import('@/components/BgMusic.vue')
166
+    // MyWinning: () => import('@/components/MyWinning.vue')
167
   },
167
   },
168
   data() {
168
   data() {
169
     return {
169
     return {
211
     },
211
     },
212
     canclMyWinning() {
212
     canclMyWinning() {
213
       this.showMyWinning = false
213
       this.showMyWinning = false
214
+      this.list.map((item) => {
215
+        if (item.id == this.currentMonth.id) {
216
+          item.mode = 3
217
+        }
218
+      })
214
     },
219
     },
215
     handleMonthClick(month) {
220
     handleMonthClick(month) {
216
       this.list.map((item) => {
221
       this.list.map((item) => {
248
           // 更新人员信息
253
           // 更新人员信息
249
           this.person = res
254
           this.person = res
250
           this.showMyWinning = true
255
           this.showMyWinning = true
256
+          console.log('showMyWinning-----------')
251
 
257
 
252
           // 其他动作
258
           // 其他动作
253
         })
259
         })