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

store css 8.18

Browse Source
This commit is contained in:
ghusermoon 2020-08-18 10:06:20 +08:00
parent a702558eac
commit cada935c17
8 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/api/user.js
View File

@ -421,7 +421,7 @@ export default {
couponGoodsList({ voucher_id, page, order }) {
return vm.$u.post('Coupon/couponGoodsList', {
page: page,
voucher_id: voucher_id,
vouchertemplate_id: voucher_id,
order: order,
});
},

8
pageB/sdetails/index.vue
View File

@ -129,7 +129,7 @@
<view class="head">
<image class="image" :src="goodsInfo.goods_image"></image>
<view class="info">
<text class="u-line-2">{{goodsInfo.goods_name}}</text>
<view class="goods-name u-line-2">{{goodsInfo.goods_name}}</view>
<text v-if="type == 1">￥{{ goodsInfo.goods_price }}</text>
<text v-else-if="type == 2">￥{{ goodsInfo.pintuan_price }}</text>
<text v-else-if="type == 3">￥{{ groupbuyInfo.groupbuy_price }}</text>
@ -1206,11 +1206,13 @@ export default {
justify-content: space-between;
margin-left: 27rpx;
flex-direction: column;
>text:first-child{
.goods-name {
height: 76rpx;
line-height: 38rpx;
font-size: 28rpx;
color: #333;
}
>text:last-child{
> text:last-child {
font-size: 30rpx;
color: #ff3131;
}

2
pageC/merchant/goods.vue
View File

@ -18,7 +18,7 @@
<goodsItem :info="goods"></goodsItem>
</view>
</view>
<u-loadmore :status="loadStatus" bgColor="#FFFFFF" margin-top="20" margin-bottom="20" v-if="goodsList.length >= pageSize"></u-loadmore>
<u-loadmore :status="loadStatus" bgColor="#FFFFFF" margin-bottom="120" v-if="goodsList.length >= pageSize"></u-loadmore>
<u-empty mode="list" v-if="!goodsList.length"></u-empty>
</scroll-view>
</view>

10
pageC/merchant/index.vue
View File

@ -220,7 +220,7 @@ export default {
},
setViewHeight() {
const res = uni.getSystemInfoSync();
this.scrollHeiht = res.windowHeight - (73 + 20 + 170) + 'px';
this.scrollHeiht = res.windowHeight - res.windowWidth / 750 * (350 + 140 + 20) + 'px';
this.paddingTop = res.windowWidth / 750 * (90 + 50) + 'px';
// console.log(this.paddingTop);
}
@ -240,6 +240,7 @@ export default {
// min-height: 100vh;
background-color: #ECECEC;
padding-top: calc(350rpx - var(--window-top));
overflow: hidden;
.top {
position: fixed;
top: 0;
@ -312,6 +313,7 @@ export default {
}
}
.follow {
height: 140rpx;
background-color: #ffffff;
width: 100%;
margin-bottom: 20rpx;
@ -365,7 +367,8 @@ export default {
}
.main{
.video-image {
padding-bottom: 98rpx;
box-sizing: border-box;
padding-bottom: 100rpx;
}
.container-top {
> view {
@ -381,9 +384,6 @@ export default {
margin-bottom: 10rpx;
}
}
// > view {
// margin-top: 20rpx;
// }
}
.tabbar {
border-top: 1rpx #DBDADA solid;

2
pageE/tool/MineCoupon.vue
View File

@ -81,7 +81,7 @@ export default {
// });
// }
this.$u.route('pageE/useCoupon/index', {
cid: coupon.voucher_id,
cid: coupon.vouchertemplate_id,
});
},
setViewHeight() {

2
pageE/tool/MineHistory.vue
View File

@ -19,7 +19,7 @@
</view>
<u-action-sheet :list="actionList" v-model="showAction" :cancel-btn="true" @click="delHistory" border-radius="20"></u-action-sheet>
<u-empty text="暂无足迹" mode="list" color="#000" v-if="!historyList.length"></u-empty>
<u-loadmore :status="loadStatus" bgColor="#ECECEC" margin-top="20" margin-bottom="20" v-if="historyList.length > pageSize" @loadmore="reachBottom"></u-loadmore>
<u-loadmore class="load-size" :status="loadStatus" bgColor="#ECECEC" margin-top="20" margin-bottom="20" v-if="historyList.length > pageSize" @loadmore="reachBottom"></u-loadmore>
</scroll-view>
</view>
</template>

6
pageE/useCoupon/index.vue
View File

@ -78,10 +78,10 @@ export default {
})
this.timer = true;
if(res.errCode == 0) {
if(load == 'reload') this.goodsList = res.data.data;
else if(load == 'loadmore') this.goodsList.push(...res.data.data);
if(load == 'reload') this.goodsList = res.data;
else if(load == 'loadmore') this.goodsList.push(...res.data);
}
return res.data.data.length;
return res.data.length;
},
loadMore() {
if(this.goodsList.length < this.pageSize) return false;

2
pages.json
View File

@ -370,7 +370,7 @@
"searchInput": {
"align": "left",
"borderRadius": "15px",
"placeholder": "搜索您需要的商品",
"placeholder": "搜索您需要的本店铺商品",
"backgroundColor": "rgb(236,236,236)",
"disabled": true
}