From db19393427d8631863625cf57f0e6abe67a7222f Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Wed, 13 Dec 2023 21:17:31 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20=E8=AE=A2=E5=8D=95=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=EF=BC=9A=E8=AE=A2=E5=8D=95=E9=A1=B9=E7=9A=84=E5=94=AE?=
 =?UTF-8?q?=E5=90=8E=E7=8A=B6=E6=80=81=E6=8E=A5=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json             | 10 ----------
 pages/order/detail.vue | 41 +++++++----------------------------------
 pages/order/list.vue   | 12 ++----------
 3 files changed, 9 insertions(+), 54 deletions(-)

diff --git a/pages.json b/pages.json
index 56d1201e..74ed57a9 100644
--- a/pages.json
+++ b/pages.json
@@ -209,16 +209,6 @@
             "title": "发票详情"
           }
         },
-        {
-          "path": "dispatch/content",
-          "style": {
-            "navigationBarTitleText": "发货内容"
-          },
-          "meta": {
-            "auth": true,
-            "title": "发货内容"
-          }
-        },
         {
           "path": "aftersale/apply",
           "style": {
diff --git a/pages/order/detail.vue b/pages/order/detail.vue
index c3165bc5..b7becfb6 100644
--- a/pages/order/detail.vue
+++ b/pages/order/detail.vue
@@ -58,7 +58,7 @@
           >
 						<template #tool>
 							<view class="ss-flex">
-								<button class="ss-reset-button apply-btn" v-if="item.buttons.includes('aftersale')"
+								<button class="ss-reset-button apply-btn" v-if="[10, 20, 30].includes(state.orderInfo.status) && item.afterSaleStatus === 0"
 									@tap.stop="
                     sheep.$router.go('/pages/order/aftersale/apply', {
                       item: JSON.stringify(item),
@@ -66,30 +66,21 @@
                   ">
 									申请售后
 								</button>
-								<button class="ss-reset-button apply-btn" v-if="item.buttons.includes('re_aftersale')"
+								<button class="ss-reset-button apply-btn" v-if="item.afterSaleStatus === 10"
 									@tap.stop="
-                    sheep.$router.go('/pages/order/aftersale/apply', {
+                    sheep.$router.go('/pages/order/aftersale/detail', {
                       item: JSON.stringify(item),
                     })
                   ">
-									重新售后
+									退款中
 								</button>
-
-								<button class="ss-reset-button apply-btn" v-if="item.buttons.includes('aftersale_info')"
+								<button class="ss-reset-button apply-btn" v-if="item.afterSaleStatus === 20"
 									@tap.stop="
                     sheep.$router.go('/pages/order/aftersale/detail', {
                       id: item.ext.aftersale_id,
                     })
                   ">
-									售后详情
-								</button>
-								<button class="ss-reset-button apply-btn" v-if="item.buttons.includes('buy_again')"
-									@tap.stop="
-                    sheep.$router.go('/pages/goods/index', {
-                      id: item.goods_id,
-                    })
-                  ">
-									再次购买
+									退款成功
 								</button>
 							</view>
 						</template>
@@ -225,6 +216,7 @@
 		});
 	}
 
+  // 查看商品
 	function onGoodsDetail(id) {
 		sheep.$router.go('/pages/goods/index', {
 			id
@@ -248,25 +240,6 @@
 		});
 	}
 
-	// 申请退款
-	async function onRefund(orderId) {
-		uni.showModal({
-			title: '提示',
-			content: '确定要申请退款吗?',
-			success: async function(res) {
-				if (res.confirm) {
-					const {
-						error,
-						data
-					} = await sheep.$api.order.applyRefund(orderId);
-					if (error === 0) {
-						getOrderDetail(data.order_sn);
-					}
-				}
-			},
-		});
-	}
-
 	// 查看物流 TODO 芋艿：待测试
 	async function onExpress(orderId) {
 		sheep.$router.go('/pages/order/express/list', {
diff --git a/pages/order/list.vue b/pages/order/list.vue
index d1f9bb7c..6e436762 100644
--- a/pages/order/list.vue
+++ b/pages/order/list.vue
@@ -34,7 +34,6 @@
 				<view class="order-card-footer ss-flex ss-col-center ss-p-x-20"
               :class="order.buttons.length > 3 ? 'ss-row-between' : 'ss-row-right'">
 					<view class="ss-flex ss-col-center">
-            <!-- TODO 芋艿：再次购买 -->
 						<button v-if="order.buttons.includes('combination')" class="tool-btn ss-reset-button"
 							@tap.stop="onOrderGroupon(order)">
               拼团详情
@@ -80,15 +79,8 @@
 </template>
 
 <script setup>
-	import {
-		computed,
-		reactive
-	} from 'vue';
-	import {
-		onLoad,
-		onReachBottom,
-		onPullDownRefresh
-	} from '@dcloudio/uni-app';
+	import { reactive } from 'vue';
+	import { onLoad, onReachBottom, onPullDownRefresh } from '@dcloudio/uni-app';
   import {
     fen2yuan,
     formatOrderColor, formatOrderStatus, handleOrderButtons,