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

upgrade 8.6

Browse Source
This commit is contained in:
ghusermoon
2020-08-06 17:52:25 +08:00
parent 8bf42a75dd
commit 1a1a0de460
17 changed files with 183 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
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">
<view class="cancel" v-if="order.view_type == 3 || order.view_type == 2" @click="toOtherPage('RefundOrder')">申请退款</view>
<view class="cancel" v-if="(order.view_type == 3 || order.view_type == 2) && order.is_refund == 1" @click="toOtherPage('RefundOrder')">申请退款</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>
<view class="comment" v-if="order.view_type == 4" @click="toOtherPage('Comment')">立即评价</view>
@@ -47,7 +47,7 @@ export default {
props: {
order: Object
},
created() {
mounted() {
this.viewState();
},
methods: {
@@ -81,6 +81,7 @@ export default {
default:
break;
}
// console.log(state);
this.state = state;
},
cancelOrder() {

2
components/shop/group/index.vue
View File

@@ -10,7 +10,7 @@
<view class="label">
<u-tabs-swiper ref="group" :list="classifyList" name="gc_name" :is-scroll="true" active-color="#FF780F" :current="current" font-size="24" :show-bar="false" @change="tabsChange" height="60"></u-tabs-swiper>
</view>
<swiper :current="swiperCurrent" @animationfinish="animationfinish" style="height: 260rpx">
<swiper :current="swiperCurrent" @animationfinish="animationfinish" style="height: 340rpx">
<swiper-item class="swiper-item list" v-for="(_, i) in classifyList" :key="i">
<!-- 最多显示3个 -->
<sitem :info="info" v-for="(info, index) in groupList.slice(0, 3)" :key="index"></sitem>