From f7de85f3a03576f1ee96a3396f243985622ace31 Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Sat, 24 Feb 2024 21:14:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E8=AE=A2=E5=8D=95=E5=94=AE?=
 =?UTF-8?q?=E5=90=8E=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/index.vue                |  32 +++++-
 pages/order/refund/freight.vue       |  12 +--
 pages/order/refund/refund.vue        |   1 -
 pages/order/refund/refundDetail1.vue | 147 ++++++++++++++++++++-------
 pages/refund/detail.vue              |  17 ++--
 pages/refund/index.vue               |   6 +-
 static/daichu.png                    | Bin 0 -> 3061 bytes
 7 files changed, 160 insertions(+), 55 deletions(-)
 create mode 100644 static/daichu.png

diff --git a/pages/order/index.vue b/pages/order/index.vue
index a5a3c10..a7fadc1 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -9,8 +9,9 @@
 				</view>
 			</view>
 			<!-- tab栏 -->
-			<u-tabs :list="tabs" bg-color="#fafafa" :is-scroll="false" height="120" font-size="32" :current="curTab"
-				bar-width="0" active-color="#111111" :duration="0.2" @change="onChangeTab" />
+			<u-tabs :list="tabs" bg-color="#fafafa" :is-scroll="true" height="120" font-size="32" :current="curTab"
+				bar-width="56" bar-height="6" active-color="#3B3B3B" :show-bar='true' :duration="0.2"
+				@change="onChangeTab" />
 			<!-- 订单列表 -->
 			<view class="order-list">
 				<view class="item" v-for="(item,index) in list" v-if="list.length>0">
@@ -163,6 +164,9 @@
 
 	// tab栏数据
 	const tabs = [{
+		name: `全部`,
+		value: 'all'
+	}, {
 		name: `待付款`,
 		value: 'pay'
 	}, {
@@ -174,6 +178,12 @@
 	}, {
 		name: `已完成`,
 		value: 'complete'
+	}, {
+		name: `已取消`,
+		value: 'cancel'
+	}, {
+		name: `退货/售后`,
+		value: 'refund'
 	}, ]
 
 	export default {
@@ -332,8 +342,15 @@
 				const app = this
 				// 设置当前选中的标签
 				app.curTab = index
-				// 刷新订单列表
-				app.getOrderList()
+				if (index == 6) {
+					uni.navigateTo({
+						url: '/pages/refund/index'
+					})
+				} else {
+					// 刷新订单列表
+					app.getOrderList()
+				}
+
 			},
 
 			// 刷新订单列表
@@ -492,6 +509,11 @@
 		padding: 100rpx 0;
 	}
 
+	::v-deep .u-tab-bar {
+		bottom: 12rpx !important;
+		background-color: rgb(255, 98, 87) !important;
+	}
+
 	.order {
 		.receive {
 			width: 100%;
@@ -824,7 +846,7 @@
 				font-family: PingFang SC, PingFang SC;
 				font-weight: 400;
 				color: #727272;
-				line-height: 33rpx;
+				line-height: 38rpx;
 				margin-left: 48rpx;
 				margin-top: 28rpx;
 			}
diff --git a/pages/order/refund/freight.vue b/pages/order/refund/freight.vue
index d44e683..9e3345c 100644
--- a/pages/order/refund/freight.vue
+++ b/pages/order/refund/freight.vue
@@ -18,17 +18,17 @@
 				</view>
 			</view>
 		</view>
-		<view class="fright-bd">
+	<!-- 	<view class="fright-bd">
 			<image :src="$picUrl+'/static/home/phone.jpg'"  class="icon"></image>
 			<view class="info">
 				<view class="a">我要退货退款我要退货退款我要退货退款我要退货退款我要退货退款</view>
 				<view class="b">已收货</view>
 			</view>
 			<view class="btn" @click="openPage">申请售后</view>
-		</view>
-		<view class="fright-fd">
+		</view> -->
+		<!-- <view class="fright-fd">
 			运费常见问题<image class="arrow" src="/static/news/icon-arrow.png"></image>
-		</view>
+		</view> -->
 	</view>
 </template>
 
@@ -73,8 +73,8 @@
 		&-hd {
 			padding: 40rpx;
 			box-sizing: border-box;
-			margin-top: 20rpx;
-			background: linear-gradient(180deg, #FFE0E0 0%, #FFFFFF 100%);
+			margin-top: 12rpx;
+			background: linear-gradient(180deg, #FFE0E0 0%, #FFFFFF 30%);
 			border-radius: 0px 0px 0px 0px;
 
 			.a {
diff --git a/pages/order/refund/refund.vue b/pages/order/refund/refund.vue
index ee3f72f..a3f32a9 100644
--- a/pages/order/refund/refund.vue
+++ b/pages/order/refund/refund.vue
@@ -195,7 +195,6 @@
 			},
 			// 获取当前订单信息
 			toDetail(canReset = false) {
-				this.uploadFile()
 				const app = this
 				if (app.logisticsIndex == -1) {
 					uni.showToast({
diff --git a/pages/order/refund/refundDetail1.vue b/pages/order/refund/refundDetail1.vue
index 5ba72c3..4b83aaa 100644
--- a/pages/order/refund/refundDetail1.vue
+++ b/pages/order/refund/refundDetail1.vue
@@ -1,46 +1,63 @@
 <template>
 	<view class="refund">
 		<view class="refund-navbar">
-			<u-navbar title="退货退款详情" :border-bottom="false" :background="background"></u-navbar>
+			<u-navbar title="退货退款详情" :border-bottom="false" back-icon-color='#000000' title-color="#000000"
+				:background="background"></u-navbar>
 		</view>
-		<view class="refund-hd">
-			<view class="l">
-				<view class="a">商家已同意退货/退款申请</view>
-				<view class="b">
-					剩余：<u-count-down :timestamp="timestamp" format="DD天HH时mm分ss秒"></u-count-down>
+		<view>
+			<view class="refund-hd">
+				<view class="l">
+					<view class="a">商家已同意退货/退款申请</view>
+					<view class="b">
+						剩余：<u-count-down :timestamp="timestamp" format="DD天HH时mm分ss秒"></u-count-down>
+					</view>
+				</view>
+				<view class="r">
+					<image :src="$picUrl+'/static/news/refund-01.png'"></image>
 				</view>
 			</view>
-			<view class="r">
-				<image :src="$picUrl+'/static/news/refund-01.png'"></image>
-			</view>
-		</view>
-		<view class="refund-bd">
-			<view class="a">卖家已同意退货申请，请尽早发货</view>
-			<view class="b">
-				<view class="l">退货说明：</view>
-				<view class="r"><text>●</text>未与商家协商一致请勿平邮或到付。</view>
-				<view class="r"><text>●</text>我是退货说明。</view>
+			<view class="refund-bd">
+				<view class="a">卖家已同意退货申请，请尽早发货</view>
+				<view class="b">
+					<view class="l">退货说明：</view>
+					<view class="r"><text>●</text>未与商家协商一致请勿平邮或到付。</view>
+					<view class="r"><text>●</text>我是退货说明。</view>
+				</view>
+				<view class="c" @click="getRevoke()">
+					<view class="btn">撤销申请</view>
+				</view>
 			</view>
-			<view class="c" @click="getRevoke()">
-				<view class="btn">撤销申请</view>
+			<view class="refund-fd">
+				<view class="l">
+					<view class="a">退款原因</view>
+					<view class="b">{{refundDetails.refuse_desc}}</view>
+				</view>
+				<view class="l">
+					<view class="a">退款金额</view>
+					<view class="b">¥{{refundDetails.refund_money}}</view>
+				</view>
+				<view class="l">
+					<view class="a">退款时间</view>
+					<view class="b">{{refundDetails.create_time}}</view>
+				</view>
+				<view class="l">
+					<view class="a">退款编号</view>
+					<view class="b">{{refundDetails.create_time}}</view>
+				</view>
 			</view>
 		</view>
-		<view class="refund-fd">
-			<view class="l">
-				<view class="a">退款原因</view>
-				<view class="b">{{refundDetails.refuse_desc}}</view>
-			</view>
-			<view class="l">
-				<view class="a">退款金额</view>
-				<view class="b">¥{{refundDetails.refund_money}}</view>
+		<view class="unshipped" style="display: none;">
+			<view class="fright-hd">
+				<image class="img" src="/static/daichu.png" mode="aspectFit"></image>
+				<view class="title">退款中</view>
 			</view>
-			<view class="l">
-				<view class="a">退款时间</view>
-				<view class="b">{{refundDetails.create_time}}</view>
+			<view class="boer">
 			</view>
-			<view class="l">
-				<view class="a">退款编号</view>
-				<view class="b">{{refundDetails.create_time}}</view>
+			<view class="wuliu">
+				<view class="wuliu-name">
+					退货物流<text>顺丰快递 SF234568990</text>
+				</view>
+				<u-icon name="arrow-right" color="#B7B7B7" size="30"></u-icon>
 			</view>
 		</view>
 	</view>
@@ -86,8 +103,8 @@
 				let app = this
 				refundApi.detail(orderRefundId)
 					.then(result => {
-						app.refundDetails = result.data.detail
-						console.log(app.refundDetails)
+						app.refundDetails = result.data.detail;
+						console.log(result.data.detail)
 					})
 			},
 		}
@@ -95,6 +112,68 @@
 </script>
 
 <style lang="scss" scoped>
+	.unshipped {
+		overflow: hidden;
+		background: linear-gradient(180deg, #FFE0E0 0%, #FFFFFF 70%);
+	
+		.boer {
+			height: 12rpx;
+			width: 100%;
+			background: #F7F8FA;
+		}
+	
+		.wuliu {
+			height: 118rpx;
+			background: #FFFFFF;
+			margin-top: 12rpx;
+			margin: 0 45rpx;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+	
+			.wuliu-name {
+				font-family: PingFang SC, PingFang SC;
+				font-weight: 400;
+				font-size: 28rpx;
+				color: #292929;
+				text-align: left;
+				font-style: normal;
+				text-transform: none;
+	
+				text {
+					color: #484848;
+					margin-left: 50rpx;
+				}
+			}
+		}
+	
+		.fright-hd {
+			padding: 50rpx 0 70rpx 0;
+			box-sizing: border-box;
+			margin-top: 12rpx;
+			border-radius: 0px 0px 0px 0px;
+			height: 310rpx;
+	
+			.img {
+				display: block;
+				width: 131rpx;
+				height: 131rpx;
+				margin: auto;
+			}
+	
+			.title {
+				font-family: PingFang SC, PingFang SC;
+				font-weight: 500;
+				font-size: 36rpx;
+				color: #262626;
+				text-align: left;
+				font-style: normal;
+				text-transform: none;
+				text-align: center;
+				margin-top: 15rpx;
+			}
+		}
+	}
 	.refund {
 		width: 100%;
 		overflow: hidden;
diff --git a/pages/refund/detail.vue b/pages/refund/detail.vue
index 2a55ac9..5552979 100644
--- a/pages/refund/detail.vue
+++ b/pages/refund/detail.vue
@@ -2,7 +2,7 @@
 	<view v-if="!isLoading" class="container p-bottom" :style="appThemeStyle">
 
 		<!-- 顶部状态栏 -->
-		<view class="detail-header dis-flex flex-y-center">
+		<view class="detail-header dis-flex flex-y-center">	
 			<view class="header-backdrop">
 				<image class="image" src="/static/order/refund-bg.png"></image>
 			</view>
@@ -12,7 +12,7 @@
 		</view>
 
 		<!-- 商品详情 -->
-		<view class="detail-goods b-f m-top20 dis-flex flex-dir-row" @click="onRefundDetail(detail.order_refund_id)">
+		<view style="margin-top: 0;" class="detail-goods b-f m-top20 dis-flex flex-dir-row" @click="onRefundDetail(detail.order_refund_id)">
 			<view class="left">
 				<image class="goods-image" :src="detail.orderGoods.goods_image"></image>
 			</view>
@@ -50,7 +50,8 @@
 		</view>
 
 		<!-- 售后信息 -->
-		<view v-if="detail.status == RefundStatusEnum.REJECTED.value" class="detail-refund b-f m-top20">
+		<!-- v-if="detail.status == RefundStatusEnum.REJECTED.value" -->
+		<view class="detail-refund b-f m-top20">
 			<view class="detail-refund__row dis-flex">
 				<view class="text">
 					<text>售后类型：</text>
@@ -81,7 +82,7 @@
 		</view>
 
 		<!-- 售后信息 -->
-		<view v-if="detail.status.value == 10" class="detail-refund b-f m-top20">
+		<view v-if="detail.status == RefundStatusEnum.REJECTED.value" class="detail-refund b-f m-top20">
 			<view class="detail-refund__row dis-flex">
 				<view class="text">
 					<text class="col-m">拒绝原因：</text>
@@ -105,9 +106,9 @@
 				<view class="address-details__row">
 					<text>物流单号：{{ detail.express_no }}</text>
 				</view>
-				<!-- <view class="address-details__row">
-          <text>发货状态：{{ detail.is_user_send ? '已发货' : '未发货' }}</text>
-        </view> -->
+				<view class="address-details__row">
+					<text>发货状态：{{ detail.is_user_send ? '已发货' : '未发货' }}</text>
+				</view>
 				<view class="address-details__row">
 					<text>发货时间：{{ detail.send_time }}</text>
 				</view>
@@ -391,7 +392,7 @@
 	}
 
 	.detail-order {
-		padding: 15rpx 20rpx;
+		padding: 20rpx;
 		font-size: 26rpx;
 
 		.item {
diff --git a/pages/refund/index.vue b/pages/refund/index.vue
index 4ce01d6..9e5c28f 100644
--- a/pages/refund/index.vue
+++ b/pages/refund/index.vue
@@ -8,7 +8,7 @@
 
       <!-- 退款/售后单 -->
       <view class="widget-list">
-        <view class="widget-detail" v-for="(item, index) in list.data" :key="index">
+        <view class="widget-detail" v-if="list.data.length>0" v-for="(item, index) in list.data" :key="index">
           <view class="row-block dis-flex flex-y-center">
             <view class="flex-box">{{ item.create_time }}</view>
             <view class="flex-box t-r">
@@ -43,6 +43,7 @@
             <view class="detail-btn btn-detail" @click.stop="handleTargetDetail(item.order_refund_id)">查看详情</view>
           </view>
         </view>
+		<u-empty text="暂无数据显示哦～" v-else mode="list"></u-empty>
       </view>
 
     </mescroll-body>
@@ -175,6 +176,9 @@
 </script>
 
 <style lang="scss" scoped>
+	::v-deep .u-empty {
+		padding: 100rpx 0;
+	}
   .widget-detail {
     box-sizing: border-box;
     background: #fff;
diff --git a/static/daichu.png b/static/daichu.png
new file mode 100644
index 0000000000000000000000000000000000000000..fc4a314eba92713b05422c434ad991c45f0000c2
GIT binary patch
literal 3061
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

literal 0
HcmV?d00001