Commit d6a2e11a authored by liwei's avatar liwei

liwei

parent f9d6b564
......@@ -37,8 +37,7 @@
<span class="line"></span>
</div>
</div>
<transition name="fade">
<van-swipe
<van-swipe
:loop="false"
:show-indicators="false"
:touchable="true"
......@@ -47,7 +46,13 @@
@change="swipeChange"
>
<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="stageBox" v-if="starInfo.code!=2001">
<div
......@@ -80,7 +85,7 @@
<img :src="starPage.star_prize2" alt>
</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>
</div>
......@@ -186,7 +191,6 @@
</scroll>
</van-swipe-item>
</van-swipe>
</transition>
</div>
</template>
......@@ -227,13 +231,13 @@ export default {
},
components: {},
methods: {
swipeItemClick(e){
console.log('swipeItemClick',e);
swipeItemClick(e) {
console.log("swipeItemClick", e);
this.isClick = true;
},
swipeChange(index) {
this.tabIndex = index + 1;
this.isClick = false;
this.isClick = false;
},
goResult() {
this.$router.push({
......@@ -242,37 +246,37 @@ export default {
});
},
goAddr(e) {
if(this.isClick){
if (this.isClick) {
if (this.addressObj) {
this.$router.push({
name: "activityAddr"
});
} else {
this.$router.push({
name: "addressEdit"
});
this.$router.push({
name: "activityAddr"
});
} else {
this.$router.push({
name: "addressEdit"
});
}
}
}
},
goDetail(index,e) {
console.log('goDetail',e);
if(this.isClick){
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;
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 }
});
}
this.$router.push({
name: "starDetail",
query: { starInfo: obj }
});
}
},
onReachBottom() {
if (!this.finished && this.loading) {
......@@ -383,12 +387,6 @@ export default {
<style scoped lang="less">
@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 {
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