From fc44bb5fd65cfd4b34f4ac6a3594ecad4d61d7f2 Mon Sep 17 00:00:00 2001
From: ghusermoon <2673031505@qq.com>
Date: Fri, 21 Aug 2020 10:18:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E9=83=A8=E6=98=BE=E7=A4=BA=E7=89=A9?=
 =?UTF-8?q?=E6=B5=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/api/user.js                      |  4 ++--
 pageC/components/merchant/list-item.vue |  4 ----
 pageE/mine/MemberServeCoupon.vue        | 13 +------------
 pageE/more/Complaints.vue               |  5 +++--
 pageE/order/Index.vue                   |  7 +++----
 pageE/order/Logistics.vue               |  2 +-
 pages/mine/index.vue                    |  7 +++++--
 7 files changed, 15 insertions(+), 27 deletions(-)

diff --git a/common/api/user.js b/common/api/user.js
index e084b8a..459f496 100644
--- a/common/api/user.js
+++ b/common/api/user.js
@@ -251,8 +251,8 @@ export default {
 			// 	return vm.$u.post('order/afterSaleList', { page: page });
 			// },
 			// 试穿列表
-			goodsTryOrderList() {
-				return vm.$u.post('order/goodsTryOrderList');
+			goodsTryOrderList({ page }) {
+				return vm.$u.post('order/goodsTryOrderList', { page });
 			},
 			// 试穿订单确认完成
 			goodsTryConfirm({ id }) {
diff --git a/pageC/components/merchant/list-item.vue b/pageC/components/merchant/list-item.vue
index c2fa52c..ae5944a 100644
--- a/pageC/components/merchant/list-item.vue
+++ b/pageC/components/merchant/list-item.vue
@@ -1,6 +1,5 @@
 <template>
     <view class="listItem">
-        <!-- <video  :src="url" :show-fullscreen-btn="true"></video> -->
 		<view v-if="type == '2'" class="video-container">
 			<image :src="url" mode="aspectFill" class="video"></image>
 			<view class="backs"></view>
@@ -58,8 +57,5 @@ export default {
         }
     },
 	props:['url','type'],
-	created() {
-		console.log(this.url, this.type);
-	}
 }
 </script>
\ No newline at end of file
diff --git a/pageE/mine/MemberServeCoupon.vue b/pageE/mine/MemberServeCoupon.vue
index a20dac1..3446666 100644
--- a/pageE/mine/MemberServeCoupon.vue
+++ b/pageE/mine/MemberServeCoupon.vue
@@ -1,8 +1,5 @@
 <template>
 	<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>
 		<swiper :current="swiperCouponCurrent" @animationfinish="couponAnimationFinish" :style="{ height: swiperHeight }">
 			<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>
 					</view>
 					<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>
 			</swiper-item>
 		</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>
 </template>
 <script>
@@ -49,7 +39,6 @@ export default {
 	},
 	watch: {
 		couponCurrent(index) {
-			// this.couponList = [];
 			const id = this.couponGroupList[index].gc_id;
 			this.getCouponList({ gc_id: id, load: 'reload' });
 		},
diff --git a/pageE/more/Complaints.vue b/pageE/more/Complaints.vue
index f4e9117..b3fc3fd 100644
--- a/pageE/more/Complaints.vue
+++ b/pageE/more/Complaints.vue
@@ -5,7 +5,7 @@
 				<view class="suggestions">
 					<view class="text">{{ item.fb_content }}</view>
 					<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 class="reply" v-if="item.is_reply">
@@ -45,10 +45,11 @@ export default {
 				}
 			})
 		},
-		previewImage(urls) {
+		previewImage(urls, index) {
 			// console.log(urls);
 			uni.previewImage({
 				urls: urls,
+				current: urls[index]
 			});
 		},
 	},
diff --git a/pageE/order/Index.vue b/pageE/order/Index.vue
index 96b7c4c..e04e4b2 100644
--- a/pageE/order/Index.vue
+++ b/pageE/order/Index.vue
@@ -1,7 +1,6 @@
 <template>
 	<view class="order">
 		<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>
 		</view>
 		<swiper :current="swiperCurrent" @animationfinish="animationfinish" :style="{ height: swiperHeight }">
@@ -14,7 +13,7 @@
 						</view>
 					</view>
 					<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>
 			</swiper-item>
 		</swiper>
@@ -175,8 +174,8 @@ export default {
 			let promise;
 			// if(this.current == 6) promise = this.getAfterSaleList();
 			// else 
-			// if(this.current == 4) promise = this.goodsTryOrderList();
-			promise = this.getOrderList();
+			if(this.current == 4) promise = this.goodsTryOrderList();
+			else promise = this.getOrderList();
 			promise.then(length => {
 				this.loadStatus.splice(this.current, 1, "nomore");
 				if(length == 0) this.page--;
diff --git a/pageE/order/Logistics.vue b/pageE/order/Logistics.vue
index 64b78d4..d51588b 100644
--- a/pageE/order/Logistics.vue
+++ b/pageE/order/Logistics.vue
@@ -22,7 +22,7 @@
 			<view class="title">物流跟踪</view>
 			<view class="main">
 				<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>
 				<u-empty text="暂无物流信息" mode="data" icon-size="88" margin-top="60" v-if="!list.length"></u-empty>
diff --git a/pages/mine/index.vue b/pages/mine/index.vue
index 05c19d3..e23d63c 100644
--- a/pages/mine/index.vue
+++ b/pages/mine/index.vue
@@ -317,7 +317,7 @@ export default {
 				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;
 			width: 710rpx;
 			background: rgba(255,255,255,1);
@@ -337,7 +337,7 @@ export default {
                 color: #999;
             }
 			.content {
-				padding: $content-padding-top 20rpx $content-padding-bottom;
+				padding: $content-padding-top $content-padding-row $content-padding-bottom;
 				display: flex;
 				> view {
 					text-align: center;
@@ -357,6 +357,7 @@ export default {
 		.order {
 			@include common-mine(
 				$content-padding-top: 22rpx, 
+				$content-padding-row: 30rpx,
 				$content-padding-bottom: 30rpx, 
 				$image-height: 36rpx,
 				$image-width: 36rpx
@@ -434,6 +435,7 @@ export default {
 		.tool {
 			@include common-mine(
 				$content-padding-top: 24rpx,
+				$content-padding-row: 20rpx,
 				$content-padding-bottom: 25rpx, 
 				$image-height: 71rpx,
 				$image-width: 71rpx
@@ -450,6 +452,7 @@ export default {
 		 .more-tool {
 			@include common-mine(
 				$content-padding-top: 24rpx, 
+				$content-padding-row: 20rpx,
 				$content-padding-bottom: 48rpx, 
 				$image-height: 71rpx,
 				$image-width: 71rpx
-- 
2.47.2