Browse Source

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

张延森 3 years ago
parent
commit
adb592034e
4 changed files with 9 additions and 120 deletions
  1. 0
    32
      src/components/ShaerPopup.vue
  2. 0
    53
      src/components/WinningPopup.vue
  3. 9
    25
      src/pages/Honghe.vue
  4. 0
    10
      src/pages/SaveShare.vue

+ 0
- 32
src/components/ShaerPopup.vue View File

@@ -250,38 +250,6 @@ export default {
250 250
       }
251 251
     }
252 252
   }
253
-  .section-box {
254
-    position: absolute;
255
-    right: 15vw;
256
-    top: 98px;
257
-    height: 394px;
258
-    display: flex;
259
-    flex-direction: column;
260
-    width: 36px;
261
-    justify-content: space-between;
262
-
263
-    img {
264
-      width: 36px;
265
-      background-size: 100% auto;
266
-      margin-top: 0;
267
-      border-radius: 18px;
268
-    }
269
-
270
-    &-receive {
271
-      width: 36px;
272
-      background-size: 100% auto;
273
-      margin-top: 0;
274
-    }
275
-    &-save {
276
-      width: 36px;
277
-      border-radius: 18px;
278
-      background-size: 100% auto;
279
-      width: 36px;
280
-      margin-top: 0;
281
-
282
-      // background: url('../assets/popupImg/receiveImage.png') no-repeat;
283
-    }
284
-  }
285 253
 }
286 254
 </style>
287 255
 

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

@@ -9,7 +9,6 @@
9 9
           <div class="dialog-body">
10 10
             <div class="card-wrapper">
11 11
               <div :class="`dialog-popuImag ${classDivAA?'flipped':''}`">
12
-                <!-- <img src="../assets/popupImg/popuBody.jpg" alt /> -->
13 12
                 <div class="back" :style="`background-image: url(${backimg});`">
14 13
                   <img
15 14
                     style="width: 180px; height:492px"
@@ -81,12 +80,6 @@ export default {
81 80
         this.myShareShow = false
82 81
       }
83 82
       this.transform()
84
-
85
-      // if (!val) {
86
-      //   this.closeMyself()
87
-      // } else {
88
-      //   this.showSelf = val
89
-      // }
90 83
     }
91 84
   },
92 85
   created() {
@@ -100,7 +93,6 @@ export default {
100 93
   },
101 94
   methods: {
102 95
     canckle() {
103
-      // this.showPopupCalendarPoster = false
104 96
     },
105 97
     shareClick() {
106 98
       this.$router.replace({
@@ -228,14 +220,6 @@ export default {
228 220
         transform-style: preserve-3d;
229 221
         transition: all 1.2s ease;
230 222
 
231
-        // div {
232
-        //   // position: relative;
233
-        //   position: absolute;
234
-        //   width: 100%;
235
-        //   height: 100%;
236
-        //   /* 背面不显示 */
237
-        //   // backface-visibility: hidden;
238
-        // }
239 223
         .front {
240 224
         }
241 225
         .back {
@@ -245,8 +229,6 @@ export default {
245 229
           height: 492px;
246 230
           background-size: 100% auto;
247 231
           background-repeat: no-repeat;
248
-
249
-          // animation: change 0.8s linear forwards;
250 232
         }
251 233
 
252 234
         img {
@@ -254,14 +236,12 @@ export default {
254 236
         }
255 237
       }
256 238
       .flipped {
257
-        // animation: change 0.8s linear forwards;
258 239
       }
259 240
     }
260 241
 
261 242
     //底部按钮
262 243
     .dialog-footer {
263 244
       width: 140px;
264
-
265 245
       margin: 10px auto 0;
266 246
       .btn {
267 247
         background-position: 50% 50%;
@@ -271,39 +251,6 @@ export default {
271 251
       }
272 252
     }
273 253
   }
274
-  .section-box {
275
-    position: absolute;
276
-    right: 15vw;
277
-    top: 98px;
278
-    height: 394px;
279
-    display: flex;
280
-    flex-direction: column;
281
-    width: 36px;
282
-    justify-content: space-between;
283
-    margin-top: 2em;
284
-
285
-    img {
286
-      width: 36px;
287
-      background-size: 100% auto;
288
-      margin-top: 0;
289
-      border-radius: 18px;
290
-    }
291
-
292
-    &-receive {
293
-      width: 36px;
294
-      background-size: 100% auto;
295
-      margin-top: 0;
296
-    }
297
-    &-save {
298
-      width: 36px;
299
-      border-radius: 18px;
300
-      background-size: 100% auto;
301
-      width: 36px;
302
-      margin-top: 0;
303
-
304
-      // background: url('../assets/popupImg/receiveImage.png') no-repeat;
305
-    }
306
-  }
307 254
 }
308 255
 </style>
309 256
 

+ 9
- 25
src/pages/Honghe.vue View File

@@ -27,12 +27,15 @@ import { drawLottery, getPrizeList } from '@/services/person'
27 27
 import { rand, shuffle } from '@/utils/math'
28 28
 import { hideLoading } from '@/utils'
29 29
 
30
-// 月份信息
31
-//posterImg关闭的图片
32
-//popImg 打开的图片
33
-//shareImg分享图片
34
-//screenImg屏保
35
-//calendarImg日历图片
30
+/**
31
+ * 月份信息
32
+ * posterImg关闭的图片
33
+ * popImg 打开的图片
34
+ * shareImg分享图片
35
+ * screenImg屏保
36
+ * calendarImg日历图片
37
+ */
38
+
36 39
 const monthList = [
37 40
   {
38 41
     id: 1,
@@ -307,25 +310,6 @@ export default {
307 310
         border-top: 1px solid #d0b69a;
308 311
         display: inline-flex;
309 312
         overflow: hidden;
310
-        &-image {
311
-          width: 22vw;
312
-
313
-          background-size: 100% 100%;
314
-        }
315
-        .backImag {
316
-          // position: relative;
317
-          width: 22vw;
318
-          animation: change 0.8s linear forwards;
319
-        }
320
-        @keyframes change {
321
-          from {
322
-            width: 44vw;
323
-            transform: rotateY(180deg);
324
-          }
325
-          to {
326
-            width: 22vw;
327
-          }
328
-        }
329 313
       }
330 314
     }
331 315
   }

+ 0
- 10
src/pages/SaveShare.vue View File

@@ -87,7 +87,6 @@ export default {
87 87
   watch: {
88 88
     '$route.query.states': {
89 89
       handler(val) {
90
-        console.log('🚀 ~ file: SaveShare.vue ~ line 24 ~ val', val)
91 90
 
92 91
         if (val) {
93 92
           this.item = val
@@ -113,7 +112,6 @@ export default {
113 112
 }
114 113
 .backhome {
115 114
   width: 85px;
116
-
117 115
   height: 42px;
118 116
   position: fixed;
119 117
   left: 1rem;
@@ -169,12 +167,6 @@ export default {
169 167
 
170 168
 // 第二个页面
171 169
 .page {
172
-  // z-index: 1;
173
-  // position: relative;
174
-  // overflow-y: auto;
175
-  // width: 100vw;
176
-  // height: 100vh;
177
-
178 170
   .group1 {
179 171
     .wrap3 {
180 172
       z-index: 13;
@@ -183,7 +175,6 @@ export default {
183 175
       align-self: center;
184 176
       margin-left: 0;
185 177
       .subhaibao {
186
-        // position: absolute;
187 178
         width: 100%;
188 179
         left: 0;
189 180
         top: 0;
@@ -192,7 +183,6 @@ export default {
192 183
     .wrap5 {
193 184
       height: 137px;
194 185
       background-color: #efe9e0;
195
-      // margin-top: 19px;
196 186
       width: 100vw;
197 187
       justify-content: center;
198 188
       align-items: center;