Browse Source

修改tabd 上的bug

huyajie 6 năm trước cách đây
mục cha
commit
e62c602880

BIN
src/assets/awards/discount.png


BIN
src/assets/awards/discount3.png


BIN
src/assets/awards/discount5.png


BIN
src/assets/awards/discount8.png


+ 32 - 6
src/components/Awards.vue

@@ -1,6 +1,7 @@
 <template>
     <div class="awards">
         <p class="residue_gold">剩余金币:{{pointsTotal}}</p>
+        <p class="stop_timer">兑奖截至日期:2018.07.31</p>
         <div class="list">
             <div class="list_hd">
                 <span>奖品</span>
@@ -24,7 +25,8 @@
         <div v-show="popup2" class="conceal_tier" />
         <div v-show="popup2" class="exchange_succeed">
             <p class="discount_text">{{name}}</p>
-            <div class="popup2_yes_btn" @click="popup2YesBtn"/>
+            <span class="popup2_yes_btn" @click="popup2YesBtn"/>
+            <span class="popup2_no_btn" @click="popup2NoBtn"/>
         </div>
         <!-- 实物邮寄地址 -->
         <div v-show="popup" class="conceal_tier"/>
@@ -128,8 +130,14 @@ export default {
         spinnerType: 'fading-circle'
       })
     },
+    popup2NoBtn () {
+      this.popup2 = false
+    },
     backBtn2 () {
       this.popup = false
+      this.parms.phone = ''
+      this.parms.name = ''
+      this.parms.address = ''
     },
     submit () {
       if (!this.parms.name) {
@@ -183,6 +191,9 @@ export default {
                 // console.log(e)
               }
             )
+            this.parms.phone = ''
+            this.parms.name = ''
+            this.parms.address = ''
           }
         },
         e => {
@@ -266,6 +277,14 @@ export default {
   font-weight: bold;
   margin-bottom: .463rem;
 }
+.stop_timer {
+  margin-left: 0.75rem;
+  color: #ff6000;
+  font-size: 0.4rem;
+  letter-spacing: 0.02rem;
+  font-weight: bold;
+  margin-bottom: .463rem;
+}
 .list {
   width: 96%;
   margin: auto;
@@ -384,7 +403,7 @@ export default {
   top: 50%;
   left: 50%;
   margin-left: -5.1rem;
-  margin-top: -4.5rem;
+  margin-top: -7rem;
   z-index: 100;
 }
 .shiwu_succeed_popup {
@@ -398,7 +417,7 @@ export default {
   top: 50%;
   left: 50%;
   margin-left: -5.1rem;
-  margin-top: -5.5rem;
+  margin-top: -7rem;
   z-index: 100;
 }
 .discount_text {
@@ -410,14 +429,21 @@ export default {
   background-color: #fcdb00;
   border-radius: 1rem;
 }
+.popup2_no_btn {
+  position: absolute;
+  width: 27%;
+  height: 1.3rem;
+  opacity: 0.5;
+  bottom: 0.1rem;
+  left: 11%;
+}
 .popup2_yes_btn {
   position: absolute;
-  width: 42%;
+  width: 27%;
   height: 1.3rem;
-  // background-color: red;
   opacity: 0.5;
   bottom: 0.1rem;
-  left: 18%;
+  left: 42%;
 }
 .user_address,
 .user_phone,

+ 6 - 2
src/components/Matches.vue

@@ -15,7 +15,8 @@
                     <img v-else-if="item.subtypeCode == '1002'" src="@/assets/matches/two_finals.png" class="xFinals2 left" alt="">
                     <img v-else-if="item.subtypeCode == '1001'" src="@/assets/matches/finals.png" class="xFinals1 left" alt="">
                     <span class="match_time">{{ item.startTime }}</span>
-                    <span class="right matach_state">{{ item.statusShow }}</span>
+                    <span v-if="item.statusShow == '进行中'"  class="right matach_state matach_state_ongoing">{{ item.statusShow }}</span>
+                    <span v-else class="right matach_state">{{ item.statusShow }}</span>
                 </div>
                 <div class="match_ct flexbox">
                     <div class="match_ct_left flex1">
@@ -274,10 +275,13 @@ export default {
   line-height: 0.78rem;
   position: absolute;
   top: 0;
-  right: 0.78em;
+  right: 7%;
   font-size: 0.46rem;
   color: #ffffff;
 }
+.matach_state_ongoing {
+  color: RGBA(255, 246, 0, 1);
+}
 .match_ct_left,
 .match_ct_right {
   height: 100%;

+ 2 - 2
src/components/News.vue

@@ -98,8 +98,8 @@ export default {
 .back_btn {
   display: block;
   margin: auto;
-  width: 3.07407407rem;
-  height: 1.222222222rem;
+  width: 3.2rem;
+  height: 1.17rem;
   background: url(../assets/home/back_btn.png) no-repeat center center;
   background-size: cover;
   margin-top: 1rem;

+ 1 - 1
src/components/Ranks.vue

@@ -44,7 +44,7 @@ export default {
       params.url = apis.top_points
       params.data = {
         activityId: this.$store.state.activityId,
-        pageSize: '100',
+        pageSize: '30',
         page: '1'
       }
       net.req(params, this).then(

+ 1 - 1
src/views/Home.vue

@@ -66,7 +66,7 @@ export default {
   height: 100%;
   position: relative;
   background: url(../assets/home/home_bg.png) no-repeat center center;
-  background-size: 100% 100%;
+  background-size: cover;
 }
 .wrap .rule_ico {
   width: 0.9rem;