Commit d6a2e11a authored by liwei's avatar liwei

liwei

parent f9d6b564
...@@ -37,8 +37,7 @@ ...@@ -37,8 +37,7 @@
<span class="line"></span> <span class="line"></span>
</div> </div>
</div> </div>
<transition name="fade"> <van-swipe
<van-swipe
:loop="false" :loop="false"
:show-indicators="false" :show-indicators="false"
:touchable="true" :touchable="true"
...@@ -47,7 +46,13 @@ ...@@ -47,7 +46,13 @@
@change="swipeChange" @change="swipeChange"
> >
<van-swipe-item @click="swipeItemClick"> <van-swipe-item @click="swipeItemClick">
<scroll :style="{maxHeight: height +'px'}" v-if="starNum!=0&&tabIndex==1" ref="scrollItem" :data="starList" :bounce="false"> <scroll
:style="{maxHeight: height +'px'}"
v-if="starNum!=0&&tabIndex==1"
ref="scrollItem"
:data="starList"
:bounce="false"
>
<div class="container"> <div class="container">
<div class="stageBox" v-if="starInfo.code!=2001"> <div class="stageBox" v-if="starInfo.code!=2001">
<div <div
...@@ -80,7 +85,7 @@ ...@@ -80,7 +85,7 @@
<img :src="starPage.star_prize2" alt> <img :src="starPage.star_prize2" alt>
</div> </div>
</div> </div>
<div class="addr" @click="goAddr($event)" v-if="!addressObj"> <div class="addr" @click="goAddr($event)" v-if="!addressObj">
点击这里,快去填写收货地址吧 点击这里,快去填写收货地址吧
<i class="iconfont icon-youjiantou"></i> <i class="iconfont icon-youjiantou"></i>
</div> </div>
...@@ -186,7 +191,6 @@ ...@@ -186,7 +191,6 @@
</scroll> </scroll>
</van-swipe-item> </van-swipe-item>
</van-swipe> </van-swipe>
</transition>
</div> </div>
</template> </template>
...@@ -227,13 +231,13 @@ export default { ...@@ -227,13 +231,13 @@ export default {
}, },
components: {}, components: {},
methods: { methods: {
swipeItemClick(e){ swipeItemClick(e) {
console.log('swipeItemClick',e); console.log("swipeItemClick", e);
this.isClick = true; this.isClick = true;
}, },
swipeChange(index) { swipeChange(index) {
this.tabIndex = index + 1; this.tabIndex = index + 1;
this.isClick = false; this.isClick = false;
}, },
goResult() { goResult() {
this.$router.push({ this.$router.push({
...@@ -242,37 +246,37 @@ export default { ...@@ -242,37 +246,37 @@ export default {
}); });
}, },
goAddr(e) { goAddr(e) {
if(this.isClick){ if (this.isClick) {
if (this.addressObj) { if (this.addressObj) {
this.$router.push({ this.$router.push({
name: "activityAddr" name: "activityAddr"
}); });
} else { } else {
this.$router.push({ this.$router.push({
name: "addressEdit" name: "addressEdit"
}); });
}
} }
}
}, },
goDetail(index,e) { goDetail(index, e) {
console.log('goDetail',e); console.log("goDetail", e);
if(this.isClick){ if (this.isClick) {
let obj = {}; let obj = {};
obj.index = index; obj.index = index;
if (index == 1) { if (index == 1) {
obj.start_at = this.starInfo.start_at; obj.start_at = this.starInfo.start_at;
obj.first_over_at = this.starInfo.first_over_at; obj.first_over_at = this.starInfo.first_over_at;
obj.user_category_integral_last_ten = this.starInfo.user_category_integral_last_ten; obj.user_category_integral_last_ten = this.starInfo.user_category_integral_last_ten;
} else { } else {
obj.start_at = this.starInfo.start_at; obj.start_at = this.starInfo.start_at;
obj.second_over_at = this.starInfo.second_over_at; obj.second_over_at = this.starInfo.second_over_at;
obj.user_category_integral_last_twenty = this.starInfo.user_category_integral_last_twenty; obj.user_category_integral_last_twenty = this.starInfo.user_category_integral_last_twenty;
}
this.$router.push({
name: "starDetail",
query: { starInfo: obj }
});
} }
this.$router.push({
name: "starDetail",
query: { starInfo: obj }
});
}
}, },
onReachBottom() { onReachBottom() {
if (!this.finished && this.loading) { if (!this.finished && this.loading) {
...@@ -383,12 +387,6 @@ export default { ...@@ -383,12 +387,6 @@ export default {
<style scoped lang="less"> <style scoped lang="less">
@import "../../util/public"; @import "../../util/public";
.fade-enter-active, .fade-leave-active {
transition: opacity .5s;
}
.fade-enter, .fade-leave-to /* .fade-leave-active below version 2.1.8 */ {
opacity: 0;
}
.star-activity-page { .star-activity-page {
border-top: 1px solid transparent; border-top: 1px solid transparent;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment