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

upgrade 9.4

Browse Source
This commit is contained in:
ghusermoon
2020-08-04 20:00:58 +08:00
parent 1f9299602e
commit 13bdc08c86
6 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/mine/order-item/index.vue
View File

@@ -25,7 +25,7 @@
</view>
</view>
<view class="order-btn" v-if="[1, 2, 3, 4, 8].indexOf(order.view_type) >= 0">
<!-- @click="toOtherPage('RefundOrder')" -->
<!-- @click="toOtherPage('RefundOrder')" -->
<view class="cancel" v-if="order.view_type == 3 || order.view_type == 2">申请退款</view>
<view class="cancel" v-if="order.view_type == 3" @click="toOtherPage('Logistics')">查看物流</view>
<view class="logistics" v-if="order.view_type == 3" @click="confirmReceive">确认收货</view>

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

@@ -93,7 +93,8 @@ export default {
},
setSwiperHeight() {
// height: 230px, margin-bottom: 13
this.swiperHeight = Math.ceil(this.goodsList.length / 2) * (230 + 13) + 'px';
const height = Math.ceil(this.goodsList.length / 2) * (230 + 13);
this.swiperHeight = height == 0 ? '230px' : height + 'px';
},
// tabs通知swiper切换
tabsChange(index) {

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

@@ -2,8 +2,8 @@
<view class="item" @click="toDetailsPage">
<image :src="info.goods_image" class="img"></image>
<view class="info">
<text class="title u-line-1">{{ info.goods_name }}</text>
<text class="jianjie u-line-2">{{ info.goods_advword }}</text>
<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>
</view>
</view>
@@ -62,6 +62,7 @@ export default {
flex-direction: column;
justify-content: space-around;
.title{
line-height: 34rpx;
font-size: 30rpx;
color: #333;
margin-bottom: 13rpx;