theluyuan/deming
2
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request 'xbx' (#225) from xbx into master

Browse Source 
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/225
This commit is contained in:
luyuan 2020-08-17 18:09:43 +08:00
commit 3e6f7ebf1b
6 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/shop/group/item.vue
View File

@ -61,9 +61,10 @@ export default {
margin-top: 10rpx;
}
.price{
// display: flex;
display: flex;
// align-items: center;
// justify-content: space-between;
align-content: flex-end;
justify-content: space-between;
margin-top: 10rpx;
> view:first-child{
font-size: 26rpx;
@ -72,6 +73,7 @@ export default {
}
> view:last-child{
font-size: 22rpx;
height: 22rpx;
color: #FDD360;
}
}

3
components/shop/list/index.vue
View File

@ -72,6 +72,7 @@ export default {
},
getGoodsClassRecommend() {
this.$u.api.getGoodsClassRecommend().then(res => {
console.log(res)
if (res.errCode == 0) {
// 初始化 current
this.current = 0;
@ -84,6 +85,8 @@ export default {
page: page,
gc_id: gc_id,
})
console.log(res)
// this.swiperCurrent = this.current;
if (res.errCode == 0) {
this.timer = true;

2
components/shop/list/item.vue
View File

@ -4,7 +4,7 @@
<view class="info">
<text class="title u-line-2">{{ info.goods_name }}</text>
<!-- <text class="jianjie u-line-1">{{ info.goods_advword }}</text> -->
<text class="price">￥{{ info.goods_price }}</text>
<text class="price">￥{{ info.goods_price }}<text style="font-size:22rpx;color:#999;text-decoration:line-through;display: inline-block;margin-left:20rpx"> ￥{{info.goods_marketprice}}</text></text>
</view>
</view>
</template>

6
pageB/search/searchGoods.vue
View File

@ -17,7 +17,9 @@
<view class="right">
<view class="name u-line-1">{{ goods.goods_name }}</view>
<view class="briefing u-line-1">{{ goods.goods_advword }}</view>
<view class="price">￥{{ goods.goods_price }}</view>
<view class="price">￥{{ goods.goods_price }}
<text style="font-size:22rpx;color:#999;text-decoration:line-through;display: inline-block;margin-left:20rpx"> ￥{{goods.goods_marketprice}}</text>
</view>
</view>
</view>
<u-loadmore :status="loadStatus" bgColor="#FFFFFF" margin-top="20" margin-bottom="20" v-if="goodsList.length >= pageSize"></u-loadmore>
@ -122,6 +124,7 @@ export default {
if(load == 'reload') this.goodsList = res.data.data;
else if(load == 'loadmore') this.goodsList.push(...res.data.data);
}
console.log(res)
return res.data.data.length;
},
loadMore() {
@ -164,6 +167,7 @@ export default {
};
</script>
<style lang="scss" scoped>
.classify-goods {
.tab-container {
box-sizing: border-box;

6
pages/index/index.vue
View File

@ -52,8 +52,12 @@
:key="item.live_id" :name="item.room_name" :image="item.cover_img" :url="item.url" :item="item" @updateList="updateList"></zhiboItem>
</view>
</view>
<u-loadmore class="load-size" color="#999999" :status="status" icon-type="iconType" margin-top="50" margin-bottom="50" :load-text="loadText" />
<view style="height:600rpx" v-if="tabLiveLists.length == 0">
<u-empty text="暂无直播信息" mode="list"></u-empty>
</view>
<u-loadmore class="load-size" color="#999999" :status="status" v-if="tabLiveLists.length !=0" icon-type="iconType" margin-top="50" margin-bottom="50" :load-text="loadText" />
</view>
</scroll-view>
</swiper-item>
<swiper-item>

8
pages/zhibo/index.nvue
View File

@ -508,6 +508,14 @@ export default {
});
},
guanzhu(){
if(!this.$store.state.hasLogin){
uni.showToast({
title: '请先登录',
duration: 2000,
icon:"none"
});
return ;
}
const token = uni.getStorageSync('token');
let that = this
console.log(token)