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

全部显示物流

Browse Source
This commit is contained in:
ghusermoon 2020-08-21 10:18:10 +08:00
parent 3d2e0a9525
commit fc44bb5fd6
7 changed files with 15 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/api/user.js
View File

@ -251,8 +251,8 @@ export default {
// return vm.$u.post('order/afterSaleList', { page: page }); // return vm.$u.post('order/afterSaleList', { page: page });
// }, // },
// 试穿列表 // 试穿列表
goodsTryOrderList() { goodsTryOrderList({ page }) {
return vm.$u.post('order/goodsTryOrderList'); return vm.$u.post('order/goodsTryOrderList', { page });
}, },
// 试穿订单确认完成 // 试穿订单确认完成
goodsTryConfirm({ id }) { goodsTryConfirm({ id }) {

4
pageC/components/merchant/list-item.vue
View File

@ -1,6 +1,5 @@
<template> <template>
<view class="listItem"> <view class="listItem">
<!-- <video :src="url" :show-fullscreen-btn="true"></video> -->
<view v-if="type == '2'" class="video-container"> <view v-if="type == '2'" class="video-container">
<image :src="url" mode="aspectFill" class="video"></image> <image :src="url" mode="aspectFill" class="video"></image>
<view class="backs"></view> <view class="backs"></view>
@ -58,8 +57,5 @@ export default {
} }
}, },
props:['url','type'], props:['url','type'],
created() {
console.log(this.url, this.type);
}
} }
</script> </script>

13
pageE/mine/MemberServeCoupon.vue
View File

@ -1,8 +1,5 @@
<template> <template>
<view class="coupon-swiper"> <view class="coupon-swiper">
<!-- <scroll-view scroll-x="true" class="classify-coupon">
<view v-for="(classify, index) in couponGroupList" :key="index" class="classify-item" :class="{ 'active': couponCurrent == index }" @click="couponTabsChange(index)">{{ classify.gc_name }}</view>
</scroll-view> -->
<u-tabs :list="couponGroupList" name="gc_name" :is-scroll="true" :current="couponCurrent" @change="couponTabsChange" active-color="#FF780F" :show-bar="false" height="88" font-size="24" inactive-color="#333333"></u-tabs> <u-tabs :list="couponGroupList" name="gc_name" :is-scroll="true" :current="couponCurrent" @change="couponTabsChange" active-color="#FF780F" :show-bar="false" height="88" font-size="24" inactive-color="#333333"></u-tabs>
<swiper :current="swiperCouponCurrent" @animationfinish="couponAnimationFinish" :style="{ height: swiperHeight }"> <swiper :current="swiperCouponCurrent" @animationfinish="couponAnimationFinish" :style="{ height: swiperHeight }">
<swiper-item class="swiper-coupon-item" v-for="(_, i) in couponGroupList" :key="i"> <swiper-item class="swiper-coupon-item" v-for="(_, i) in couponGroupList" :key="i">
@ -11,17 +8,10 @@
<Coupon :couponInfo="coupon" :status='0' :type="0" @exchange="exchangeCoupon($event)"></Coupon> <Coupon :couponInfo="coupon" :status='0' :type="0" @exchange="exchangeCoupon($event)"></Coupon>
</view> </view>
<u-empty text="暂无优惠券" mode="coupon" color="#000" v-if="!couponList[i] || !couponList[i].length"></u-empty> <u-empty text="暂无优惠券" mode="coupon" color="#000" v-if="!couponList[i] || !couponList[i].length"></u-empty>
<u-loadmore :status="loadStatus" bgColor="#FFF" margin-bottom="60" v-if="!couponList[i] || couponList[i].length>=pageSize" @loadmore="onreachBottom"></u-loadmore> <u-loadmore :status="loadStatus" bgColor="#FFF" margin-bottom="60" v-if="couponList[i] && couponList[i].length>=pageSize" @loadmore="onreachBottom"></u-loadmore>
</scroll-view> </scroll-view>
</swiper-item> </swiper-item>
</swiper> </swiper>
<!-- <scroll-view scroll-y style="height: 100%;" @scrolltolower="onreachBottom" class="coupon-scroll" :style="{ height: swiperHeight }">
<view v-for="(coupon, index) in couponList" :key="index" class="coupon-item">
<Coupon :couponInfo="coupon" :status='0' :type="0" @exchange="exchangeCoupon($event)"></Coupon>
</view>
<u-loadmore :status="loadStatus" bgColor="#FFF" margin-top="20" margin-bottom="20" v-if="couponList.length>=pageSize" @loadmore="onreachBottom"></u-loadmore>
<u-empty text="暂无优惠券" mode="coupon" color="#000" v-if="!couponList.length"></u-empty>
</scroll-view> -->
</view> </view>
</template> </template>
<script> <script>
@ -49,7 +39,6 @@ export default {
}, },
watch: { watch: {
couponCurrent(index) { couponCurrent(index) {
// this.couponList = [];
const id = this.couponGroupList[index].gc_id; const id = this.couponGroupList[index].gc_id;
this.getCouponList({ gc_id: id, load: 'reload' }); this.getCouponList({ gc_id: id, load: 'reload' });
}, },

5
pageE/more/Complaints.vue
View File

@ -5,7 +5,7 @@
<view class="suggestions"> <view class="suggestions">
<view class="text">{{ item.fb_content }}</view> <view class="text">{{ item.fb_content }}</view>
<view class="image"> <view class="image">
<image v-for="(url, index) in item.fb_images" :key="index" :src="url" mode="aspectFit" @click="previewImage(item.fb_images)"></image> <image v-for="(url, index) in item.fb_images" :key="index" :src="url" mode="aspectFit" @click="previewImage(item.fb_images, index)"></image>
</view> </view>
</view> </view>
<view class="reply" v-if="item.is_reply"> <view class="reply" v-if="item.is_reply">
@ -45,10 +45,11 @@ export default {
} }
}) })
}, },
previewImage(urls) { previewImage(urls, index) {
// console.log(urls); // console.log(urls);
uni.previewImage({ uni.previewImage({
urls: urls, urls: urls,
current: urls[index]
}); });
}, },
}, },

7
pageE/order/Index.vue
View File

@ -1,7 +1,6 @@
<template> <template>
<view class="order"> <view class="order">
<view> <view>
<!-- <u-tabs-swiper ref="tabs" :list="list" active-color="#FF780F" :current="current" font-size="26" @change="tabsChange" height="88" :gutter="30"></u-tabs-swiper> -->
<u-tabs :list="list" name="gc_name" :is-scroll="true" :current="current" @change="tabsChange" active-color="#FF780F" :show-bar="false" height="88" font-size="26" :gutter="20" inactive-color="#333333"></u-tabs> <u-tabs :list="list" name="gc_name" :is-scroll="true" :current="current" @change="tabsChange" active-color="#FF780F" :show-bar="false" height="88" font-size="26" :gutter="20" inactive-color="#333333"></u-tabs>
</view> </view>
<swiper :current="swiperCurrent" @animationfinish="animationfinish" :style="{ height: swiperHeight }"> <swiper :current="swiperCurrent" @animationfinish="animationfinish" :style="{ height: swiperHeight }">
@ -14,7 +13,7 @@
</view> </view>
</view> </view>
<u-empty text="暂无订单" mode="order" color="#000000" v-if="!orderList[index] || !orderList[index].length"></u-empty> <u-empty text="暂无订单" mode="order" color="#000000" v-if="!orderList[index] || !orderList[index].length"></u-empty>
<u-loadmore :status="loadStatus[index]" bgColor="#ECECEC" font-size="14" margin-bottom="20" v-if="current != 4 && (!orderList[index] || orderList[index].length>3)" class="order-loadmore"></u-loadmore> <u-loadmore :status="loadStatus[index]" bgColor="#ECECEC" font-size="14" margin-bottom="20" v-if="current != 4 && (orderList[index] && orderList[index].length>3)" class="order-loadmore"></u-loadmore>
</scroll-view> </scroll-view>
</swiper-item> </swiper-item>
</swiper> </swiper>
@ -175,8 +174,8 @@ export default {
let promise; let promise;
// if(this.current == 6) promise = this.getAfterSaleList(); // if(this.current == 6) promise = this.getAfterSaleList();
// else // else
// if(this.current == 4) promise = this.goodsTryOrderList(); if(this.current == 4) promise = this.goodsTryOrderList();
promise = this.getOrderList(); else promise = this.getOrderList();
promise.then(length => { promise.then(length => {
this.loadStatus.splice(this.current, 1, "nomore"); this.loadStatus.splice(this.current, 1, "nomore");
if(length == 0) this.page--; if(length == 0) this.page--;

2
pageE/order/Logistics.vue
View File

@ -22,7 +22,7 @@
<view class="title">物流跟踪</view> <view class="title">物流跟踪</view>
<view class="main"> <view class="main">
<view v-for="(item, index) in list" :key="index" class="logistics-item"> <view v-for="(item, index) in list" :key="index" class="logistics-item">
<view class="info u-line-2">{{ item.content }}</view> <view class="info">{{ item.content }}</view>
<view class="date">{{ item.kd_time }}</view> <view class="date">{{ item.kd_time }}</view>
</view> </view>
<u-empty text="暂无物流信息" mode="data" icon-size="88" margin-top="60" v-if="!list.length"></u-empty> <u-empty text="暂无物流信息" mode="data" icon-size="88" margin-top="60" v-if="!list.length"></u-empty>

7
pages/mine/index.vue
View File

@ -317,7 +317,7 @@ export default {
height: $image-height !important; height: $image-height !important;
} }
} }
@mixin common-mine($content-padding-top, $content-padding-bottom, $image-width, $image-height) { @mixin common-mine($content-padding-top, $content-padding-row, $content-padding-bottom, $image-width, $image-height) {
box-sizing: border-box; box-sizing: border-box;
width: 710rpx; width: 710rpx;
background: rgba(255,255,255,1); background: rgba(255,255,255,1);
@ -337,7 +337,7 @@ export default {
color: #999; color: #999;
} }
.content { .content {
padding: $content-padding-top 20rpx $content-padding-bottom; padding: $content-padding-top $content-padding-row $content-padding-bottom;
display: flex; display: flex;
> view { > view {
text-align: center; text-align: center;
@ -357,6 +357,7 @@ export default {
.order { .order {
@include common-mine( @include common-mine(
$content-padding-top: 22rpx, $content-padding-top: 22rpx,
$content-padding-row: 30rpx,
$content-padding-bottom: 30rpx, $content-padding-bottom: 30rpx,
$image-height: 36rpx, $image-height: 36rpx,
$image-width: 36rpx $image-width: 36rpx
@ -434,6 +435,7 @@ export default {
.tool { .tool {
@include common-mine( @include common-mine(
$content-padding-top: 24rpx, $content-padding-top: 24rpx,
$content-padding-row: 20rpx,
$content-padding-bottom: 25rpx, $content-padding-bottom: 25rpx,
$image-height: 71rpx, $image-height: 71rpx,
$image-width: 71rpx $image-width: 71rpx
@ -450,6 +452,7 @@ export default {
.more-tool { .more-tool {
@include common-mine( @include common-mine(
$content-padding-top: 24rpx, $content-padding-top: 24rpx,
$content-padding-row: 20rpx,
$content-padding-bottom: 48rpx, $content-padding-bottom: 48rpx,
$image-height: 71rpx, $image-height: 71rpx,
$image-width: 71rpx $image-width: 71rpx