Skip to content

S
shop_mobile_uni
Commit 33e0ae6b authored by 王建威's avatar 王建威
1 Browse files
Options

bug fix

parent aa261a21
Hide whitespace changes
Inline Side-by-side
Showing with 66 additions and 23 deletions
pages/home/home.vue
View file @ 33e0ae6b
......@@ -150,7 +150,7 @@
const {code, data} = res.data;
if(code === 0 && !data){
if(reg_time > timestamp && reg_time < end_timestamp){
this.$refs.popup.open();
// this.$refs.popup.open();
}
}
}
......
pages/integralRecord/integralRecord.vue
View file @ 33e0ae6b
......@@ -17,6 +17,7 @@
@scrolltolower="getData(i_type, inCurrent)"
:show-scrollbar="false"
style="height: 100%"
:scroll-top="scrolltop"
>
<view class="list_item" v-for="(item, index) in inData" :key="index">
<view>
......@@ -33,9 +34,10 @@
<scroll-view
v-if="outData.length"
scroll-y
@scrolltolower="getData(i_type, inCurrent)"
@scrolltolower="getData(i_type, outCurrent)"
:show-scrollbar="false"
style="height: 100%"
:scroll-top="scrolltop"
>
<view class="list_item" v-for="(item, index) in outData" :key="index">
<view>
......@@ -44,6 +46,7 @@
</view>
<view class="integral">-{{item.point}}</view>
</view>
<uni-load-more :status="outLoadingType"></uni-load-more>
</scroll-view>
<view v-else class="none_data">暂无数据</view>
</view>
......@@ -67,7 +70,8 @@
inFlag: true,
outFlag: true,
inLoadingType: 'more',
outLoadingType: 'more'
outLoadingType: 'more',
scrolltop: 0
}
},
onLoad() {
......@@ -78,6 +82,7 @@
if(type === this.i_type) {
return
}
this.scrolltop = 0;
this.i_type = type;
if(type === '3') {
return
......@@ -87,13 +92,13 @@
current = this.inCurrent;
this.getData(type, current);
} else if (type === '2' && !this.outData.length) {
current = this.outCurrent
current = this.outCurrent;
this.getData(type, current);
}
},
getData(type, current) {
if(!this.inFlag || !this.outFlag) {
if((!this.inFlag && type === '1') || (!this.outFlag && type === '2')) {
return
}
if(type === '1') {
......
pages/levelStrategy/levelStrategy.vue
View file @ 33e0ae6b
......@@ -14,11 +14,9 @@
<text>如何提升账户等级？</text>
</view>
<view class="answer">
<view class="item"><text>a.</text>每日登录可获取积分，用来提升账户等级</view>
<view class="item"><text>b.</text>每次消费再确认收货之后可以获得购物积分，可以提
升账户等级</view>
<view class="item"><text>c.</text>推荐新用户注册，新用户账号审核通过后推荐人可获
取积分，提升等级</view>
<view class="item"><text>a.</text>每日登录可获取经验值，用来提升账户等级</view>
<view class="item"><text>b.</text>每次消费再确认收货之后可以获得购物积分，可以提升账户等级</view>
<view class="item"><text>c.</text>推荐新用户注册，新用户账号审核通过后推荐人可获取积分，提升等级</view>
<view class="item"><text>d.</text>由谛宝多多官方规定的其它方式</view>
</view>
<view class="diamond"></view>
......
pages/signin/signin.vue
View file @ 33e0ae6b
......@@ -2,7 +2,7 @@
<view class="main">
<view class="sign_top_card">
<view class="return_icon" @click="$backup()"><view class="eosfont">&#xe622;</view></view>
<view class="title" @click="$jump('/pages/integralRecord/integralRecord')">我的积分<text class="eosfont">&#xe608;</text></view>
<view class="title" @click="$jump('/pages/integralRecord/integralRecord',2)">我的积分<text class="eosfont">&#xe608;</text></view>
<view class="integral">{{integral}}</view>
<view class="sign_tab">
<text class="title2">花积分：</text>
......@@ -19,7 +19,10 @@
</view>
<view class="days">
<view class="day_item" v-for="(item, index) in sign_list" :key="index">
<view class="item_bg" :class="{act: item.is_sign === '1'}">+{{item.point}}</view>
<view v-if="item.sign_goods_logo" class="item_bg" style="background-color: transparent;">
<image :src="item.sign_goods_logo"></image>
</view>
<view class="item_bg" v-else :class="{act: item.is_sign === '1'}">+{{item.point}}</view>
<view class="day" v-if="item.date_diff !== '0'" :class="{seven: index === 6}">第{{index+1}}天</view>
<view class="day actDay" v-else>今天</view>
</view>
......@@ -46,7 +49,7 @@
<view class="goods_box">
<view class="goods_item" v-for="(item, index) in integral_list" :key="index" @click="$jump(`${php}app=my_integral_goods&act=detail&id=${item.goods_id}&integral=${integral}`)">
<view>
<image class="goods_img" :src="item.goods_logo"></image>
<image class="goods_img" :src="item.goods_logo || $noGoodsImg"></image>
<view class="goods_name">{{item.goods_name}}</view>
<view class="goods_price">{{item.goods_point}}积分</view>
</view>
......@@ -55,11 +58,14 @@
</view>
<uni-popup ref="popup" type="center" :maskClick="true">
<view class='sign_dialog'>
<view class="dialog_title">连续签到<text>{{sign_days_continues}}</text>天</view>
<view class="dialog_title">连续签到<text>{{sign_days}}</text>天</view>
<view class="dialog_tips">以7天为一个周期，中途断签则重新计算</view>
<view class="dialog_content">
<view class="day_item day_item2" v-for="(item, index) in sign_list" :key="index">
<view class="item_bg item_bg2" :class="{act: item.is_sign === '1'}">+{{item.point}}</view>
<view class="item_bg item_bg2" v-if="item.sign_goods_logo">
<image :src="item.sign_goods_logo"></image>
</view>
<view v-else class="item_bg item_bg2" :class="{act: item.is_sign === '1'}">+{{item.point}}</view>
<view class="day" v-if="item.date_diff !== '0'">第{{index+1}}天</view>
<view class="day actDay" v-else>今天</view>
</view>
......@@ -97,6 +103,7 @@
sign_list: [],
is_sign_today: '0',
sign_days_continues: '0',
sign_days: '',
sign_id: '',
gift: {
continue_days: 0,
......@@ -132,12 +139,16 @@
this.sign_list = res.data.data.sign_list;
this.is_sign_today = res.data.data.is_sign_today;
this.sign_days_continues = res.data.data.sign_days_continues;
this.sign_days = res.data.data.sign_days;
this.sign_id = res.data.data.sign_id;
let arr = []
for(let i=0,j=res.data.data.grade_list.length;i<j;i+=8) {
arr.push(res.data.data.grade_list.slice(i,i+8));
}
this.grade_list = arr;
} else if (res.data.code === -1) {
// 未登录状态
this.$jump(`${php}app=member&act=login`)
}
}
});
......@@ -362,6 +373,11 @@
font-weight:500;
box-sizing: border-box;
margin: 0 auto;
overflow: hidden;
}
.item_bg image {
width: 100%;
height: 100%;
}
.item_bg2 {
width: 96rpx;
......@@ -410,7 +426,7 @@
margin: 0 auto;
.swiper_item {
display: flex;
justify-content: space-between;
// justify-content: space-between;
flex-wrap: wrap;
.benefit_item {
width: 160rpx;
......@@ -425,6 +441,13 @@
font-weight:500;
padding: 16rpx;
box-sizing: border-box;
margin-left: 20rpx;
}
.benefit_item:nth-of-type(4n-3) {
margin-left: 0;
}
.benefit_item::-webkit-scrollbar {
display: none;
}
}
}
......
pages/vipCenter/vipCenter.vue
View file @ 33e0ae6b
......@@ -19,12 +19,13 @@
</view>
</view>
<view class="card_bottom">
<text class="growth_diff">您距离下一等级还需{{member_list[0].growth_diff}}经验值</text>
<text class="growth_diff" v-if="member_list.length > 1">您距离下一等级还需{{member_list[0].growth_diff}}经验值</text>
<text v-else></text>
<view class="levelStrategy" @click="$jump('/pages/levelStrategy/levelStrategy' ,2)"><text class="picon" :class="`picon${member_list[0].grade}`"></text><text>升级攻略</text></view>
</view>
</view>
</swiper-item>
<swiper-item style="left: -30rpx;" :style="[1 === index ? {'left':0} : null]">
<swiper-item style="left: -30rpx;" v-if="member_list.length > 1" :style="[1 === index ? {'left':0} : null]">
<view class="swiper_card" :class="[{scale: 1 !== index}, `level${member_list[1].grade}`]" :style="[member_list.length === 1 ? {width: '100%'} : null]">
<text class="now_level">{{member_list[1].grade_name}}</text>
<view class="card_flex">
......@@ -59,7 +60,7 @@
</view>
<view class="goods_box">
<view class="goods_item" v-for="(item, index) in integral_list" :key="index" @click="$jump(`${php}app=my_integral_goods&act=detail&id=${item.goods_id}&integral=${member_list[0].integral}`)">
<image class="goods_img" :src="item.goods_logo"></image>
<image class="goods_img" :src="item.goods_logo || $noGoodsImg"></image>
<text class="goods_name">{{item.goods_name}}</text>
<text class="goods_price">{{item.goods_point}}积分</text>
</view>
......@@ -79,10 +80,12 @@
integral_list: [],
member_list: [{
grade: '',
grade_name: ''
grade_name: '',
grade_list: []
}, {
grade: '',
grade_name: ''
grade_name: '',
grade_list: []
}],
index: 0,
moreFlag: true,
......@@ -99,6 +102,9 @@
this.integral_list = res.data.data.integral_list;
this.member_list = res.data.data.member_list;
this.changeHeight(res.data.data.member_list[0].grade_list, 0);
} else if (res.data.code === -1) {
// 未登录状态
this.$jump(`${php}app=member&act=login`)
}
}
});
......@@ -117,10 +123,18 @@
}
let n = data.length % 4,
init = Math.ceil(data.length / 4);
this.height = init * 160 + (init - 1) * 16;
this.height = init * 160 + init * 16;
},
swiperChange(e) {
this.index = e.detail.current;
var current = e.detail.current;
this.index = current;
let length = this.member_list[current].grade_list.length;
if(length > 8) {
this.moreFlag = true;
} else {
this.moreFlag = false;
}
this.changeHeight(this.member_list[current].grade_list, current);
}
},
components: {
......@@ -343,6 +357,9 @@
background-size: 100% 100%;
}
}
.benefit_item::-webkit-scrollbar {
display: none;
}
.benefit_item:nth-of-type(4n-3) {
margin-left: 0;
}
......
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