626

src/components/star/starRank.vue

@@ -43,22 +43,12 @@
       :touchable="true"
       :initial-swipe="tabIndex-1"
       class="scroll"
-      @change="swipeChange"
-    >
-      <van-swipe-item @click="swipeItemClick">
-        <scroll
-          :style="{maxHeight: height +'px'}"
-          v-if="starNum!=0&&tabIndex==1"
-          ref="scrollItem"
-          :data="starList"
-          :bounce="false"
-        >
+      @change="swipeChange">
+      <van-swipe-item>
+        <scroll :style="{maxHeight: height +'px'}" v-if="starNum!=0&&tabIndex==1" ref="scrollItem" :data="starList" :bounce="false">
           <div class="container">
             <div class="stageBox" v-if="starInfo.code!=2001">
-              <div
-                class="result"
-                v-if="starInfo.code!=2003&&starInfo.code!=2004&&starInfo.activity_result.result!=15&&starInfo.activity_result.result!=16"
-              >
+              <div  class="result"  v-if="starInfo.code!=2003&&starInfo.code!=2004&&starInfo.activity_result.result!=15&&starInfo.activity_result.result!=16">
                 <div class="float">结果公示</div>
                 <div v-if="starInfo.activity_result.result==11">
                   <h2>恭喜两个阶段全勤挑战成功</h2>
@@ -69,9 +59,7 @@
                     <img :src="starPage.star_prize2" alt>
                   </div>
                 </div>
-                <div
-                  v-if="starInfo.activity_result.result==12||starInfo.activity_result.result==13"
-                >
+                <div v-if="starInfo.activity_result.result==12||starInfo.activity_result.result==13">
                   <h2>恭喜第一阶段全勤挑战成功</h2>
                   <p>赠送 猜猜我是谁系列双语洞洞书（4册）</p>
                   <div class="imgbox">
@@ -85,7 +73,7 @@
                     <img :src="starPage.star_prize2" alt>
                   </div>
                 </div>
-                <div class="addr" @click="goAddr($event)" v-if="!addressObj">
+                <div class="addr" @click="goAddr" v-if="!addressObj">
                   点击这里，快去填写收货地址吧
                   <i class="iconfont icon-youjiantou"></i>
                 </div>
@@ -123,7 +111,7 @@
                     <span class="add">{{starInfo.user_category_integral_last_ten}}/20</span>
                     <img :src="starPage.star_inner" alt>
                   </div>
-                  <div class="tip" v-on:click="goDetail(1,$event)">
+                  <div class="tip" @click="goDetail(1)">
                     查看明细
                     <i class="iconfont icon-youjiantou"></i>
                   </div>
@@ -138,7 +126,7 @@
                     <span class="add">{{starInfo.user_category_integral_last_twenty}}/40</span>
                     <img :src="starPage.star_inner" alt>
                   </div>
-                  <div class="tip" @click="goDetail(2,$event)">
+                  <div class="tip" @click="goDetail(2)">
                     查看明细
                     <i class="iconfont icon-youjiantou"></i>
                   </div>
@@ -210,7 +198,6 @@ export default {
   name: "starRank",
   data() {
     return {
-      isClick: true,
       height: 0,
       pullup: true,
       rankBg: rankBg,
@@ -231,13 +218,9 @@ export default {
   },
   components: {},
   methods: {
-    swipeItemClick(e) {
-      console.log("swipeItemClick", e);
-      this.isClick = true;
-    },
     swipeChange(index) {
+      console.log(222)
       this.tabIndex = index + 1;
-      this.isClick = false;
     },
     goResult() {
       this.$router.push({
@@ -245,39 +228,35 @@ export default {
         query: { starInfo: this.starInfo }
       });
     },
-    goAddr(e) {
-      if (this.isClick) {
-        if (this.addressObj) {
-          this.$router.push({
-            name: "activityAddr"
-          });
-        } else {
-          this.$router.push({
-            name: "addressEdit"
-          });
-        }
-      }
-    },
-    goDetail(index, e) {
-      console.log("goDetail", e);
-      if (this.isClick) {
-        let obj = {};
-        obj.index = index;
-        if (index == 1) {
-          obj.start_at = this.starInfo.start_at;
-          obj.first_over_at = this.starInfo.first_over_at;
-          obj.user_category_integral_last_ten = this.starInfo.user_category_integral_last_ten;
-        } else {
-          obj.start_at = this.starInfo.start_at;
-          obj.second_over_at = this.starInfo.second_over_at;
-          obj.user_category_integral_last_twenty = this.starInfo.user_category_integral_last_twenty;
-        }
+    goAddr() {
+      if (this.addressObj) {
+        this.$router.push({
+          name: "activityAddr"
+        });
+      } else {
         this.$router.push({
-          name: "starDetail",
-          query: { starInfo: obj }
+          name: "addressEdit"
         });
       }
     },
+    goDetail(index) {
+      console.log(243)
+      let obj = {};
+      obj.index = index;
+      if (index == 1) {
+        obj.start_at = this.starInfo.start_at;
+        obj.first_over_at = this.starInfo.first_over_at;
+        obj.user_category_integral_last_ten = this.starInfo.user_category_integral_last_ten;
+      } else {
+        obj.start_at = this.starInfo.start_at;
+        obj.second_over_at = this.starInfo.second_over_at;
+        obj.user_category_integral_last_twenty = this.starInfo.user_category_integral_last_twenty;
+      }
+      this.$router.push({
+        name: "starDetail",
+        query: { starInfo: obj }
+      });
+    },
     onReachBottom() {
       if (!this.finished && this.loading) {
         this.loading = false;