From 475eea21b99d4cd0e52c68b46ca46555f4aa5e64 Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Mon, 9 Jun 2025 11:06:05 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B6=85=E5=B8=82=E8=AE=A2=E5=8D=95=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/superStore/orderShenhe.js         |  2 +-
 src/api/superStore/superOrder.js          |  2 +-
 src/views/superstore/superOrder/index.vue | 43 +++++++++++------------
 3 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/src/api/superStore/orderShenhe.js b/src/api/superStore/orderShenhe.js
index fa773277..38997331 100644
--- a/src/api/superStore/orderShenhe.js
+++ b/src/api/superStore/orderShenhe.js
@@ -138,7 +138,7 @@ export function refundOrderPartApi(data) {
 // 订单-退单
 export function refundOrderApi(data) {
     return request({
-      url: '/smart-canteen/api/v2/web/order/refund',
+      url: '/smart-canteen/order/refund/'+data.orderId,
       method: 'post',
       headers: {
           "merchant-id":"378915229716713472",
diff --git a/src/api/superStore/superOrder.js b/src/api/superStore/superOrder.js
index 05bff840..c927aae7 100644
--- a/src/api/superStore/superOrder.js
+++ b/src/api/superStore/superOrder.js
@@ -135,7 +135,7 @@ export function refundOrderPartApi(data) {
 // 订单-退单
 export function refundOrderApi(data) {
     return request({
-      url: '/smart-canteen/api/v2/web/order/refund',
+      url: '/smart-canteen/order/refund/'+data.orderId,
       method: 'post',
       headers: {
           "merchant-id":"378915229716713472",
diff --git a/src/views/superstore/superOrder/index.vue b/src/views/superstore/superOrder/index.vue
index 26e6c7d6..7c831e63 100644
--- a/src/views/superstore/superOrder/index.vue
+++ b/src/views/superstore/superOrder/index.vue
@@ -115,7 +115,7 @@
         <!-- <el-table-column label="流水号" align="center" prop="mealCode" :show-overflow-tooltip="true" width="80"/> -->
         <el-table-column label="商品明细" align="center" prop="orderDetailList" :show-overflow-tooltip="true" width="120">
             <template slot-scope="scope">
-                <span v-for="item in scope.row.orderDetailList" :key="item.detailId">{{ item.goodsDishesName }}*{{ item.goodsGetNum }};</span>
+                <span v-for="item in scope.row.orderDetailList" :key="item.detailId">{{ item.goodsName }}*{{ item.quantity }};</span>
             </template>
         </el-table-column>
         <el-table-column label="订单类型" align="center" prop="orderType" :show-overflow-tooltip="true" width="100"> 
@@ -128,11 +128,11 @@
                 <span>{{ (scope.row.payableAmount/100).toFixed(2) }}</span>
             </template>
         </el-table-column>
-        <el-table-column label="配送费" align="center" prop="deliveryAmount" :show-overflow-tooltip="true" width="80">
+        <!-- <el-table-column label="配送费" align="center" prop="deliveryAmount" :show-overflow-tooltip="true" width="80">
             <template slot-scope="scope">
                 <span>{{ (scope.row.deliveryAmount/100).toFixed(2) }}</span>
             </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column label="实付金额" align="center" prop="realAmount" :show-overflow-tooltip="true" width="80">
             <template slot-scope="scope">
                 <span>{{ (scope.row.realAmount/100).toFixed(2) }}</span>
@@ -162,16 +162,17 @@
               type="text" 
               @click="handleView(scope.row)" 
             >详情</el-button>
+            <el-button
+              size="mini" style="color: red;"
+              type="text" v-if="scope.row.orderState==1||scope.row.orderState==4"
+              @click="handleRefund(scope.row)" 
+            >退单</el-button>
             <!-- <el-button
               size="mini"
               type="text" v-if="scope.row.orderStateMix==1||scope.row.orderStateMix==11"
               @click="handleRefundPart(scope.row)" 
             >部分退款</el-button>
-            <el-button
-              size="mini" style="color: red;"
-              type="text" v-if="scope.row.orderStateMix==1||scope.row.orderStateMix==11"
-              @click="handleRefund(scope.row)" 
-            >退单</el-button>
+            
             <el-button
               size="mini" 
               type="text" v-if="scope.row.orderStateMix==1"
@@ -234,23 +235,23 @@
                     <template slot="label">	订单金额</template> 
                     {{ (orderInfoData.payableAmount/100).toFixed(2) }}
                 </el-descriptions-item>  
-                <el-descriptions-item>
+                <!-- <el-descriptions-item>
                     <template slot="label">	配送费</template>
                     {{ (orderInfoData.deliveryAmount/100).toFixed(2) }}
-                </el-descriptions-item> 
+                </el-descriptions-item>  -->
                 <el-descriptions-item>
                     <template slot="label">	实付金额</template>
                     {{ (orderInfoData.realAmount/100).toFixed(2) }}
                 </el-descriptions-item>
-                <el-descriptions-item>
+                <!-- <el-descriptions-item>
                     <template slot="label">	配送方式</template> 
-                    <!-- <div v-for="item in deliveryTypeOptions" :key="item.key" v-if="item.key==orderInfoData.deliveryType">
+                    <div v-for="item in deliveryTypeOptions" :key="item.key" v-if="item.key==orderInfoData.deliveryType">
                         {{ item.value }}
-                    </div> -->
-                </el-descriptions-item>
+                    </div>
+                </el-descriptions-item> -->
                 <el-descriptions-item>
                     <template slot="label">	支付方式</template>
-                    {{orderInfoData.payTypesStr}}
+                    <dict-tag :options="dict.type.sm_order_pay_type" :value="orderInfoData.payType"/> 
                 </el-descriptions-item>
 
                 <el-descriptions-item>
@@ -264,14 +265,12 @@
   
                 <el-descriptions-item>
                     <template slot="label">	订单状态</template>
-                    <!-- <div v-for="item in orderStateOptions" :key="item.key" v-if="item.key==orderInfoData.orderStateMix">
-                        {{ item.value }}
-                    </div> -->
+                    <dict-tag :options="dict.type.sm_order_status" :value="orderInfoData.orderState"/> 
                 </el-descriptions-item>
-                <el-descriptions-item>
+                <!-- <el-descriptions-item>
                     <template slot="label">	流水号</template>
                     {{ orderInfoData.mealCode }}
-                </el-descriptions-item>
+                </el-descriptions-item> -->
                 <el-descriptions-item>
                     <template slot="label">	备注</template>
                     {{ orderInfoData.remark }}
@@ -279,7 +278,7 @@
             </el-descriptions>
             <div style="margin: 10px 0;font-weight: bold;font-size: 16px;color: #000;">商品信息</div>
             <el-table :data="orderInfoData.orderDetailList">
-                <el-table-column label="商品名称" align="center" prop="goodsDishesName" :show-overflow-tooltip="true"/>
+                <el-table-column label="商品名称" align="center" prop="goodsName" :show-overflow-tooltip="true"/>
                 <el-table-column label="单价(元)" align="center" prop="prefPrice" :show-overflow-tooltip="true">
                     <template slot-scope="scope">
                         <span>{{ (scope.row.prefPrice/100).toFixed(2) }}</span>
@@ -309,7 +308,7 @@
       <!-- 部分退款对话框 -->
       <el-dialog title="部分退款" :visible.sync="openPart" width="80%" append-to-body> 
             <el-table :data="orderDetailList">
-                <el-table-column label="商品名称" align="center" prop="goodsDishesName" :show-overflow-tooltip="true"/>
+                <el-table-column label="商品名称" align="center" prop="goodsName" :show-overflow-tooltip="true"/>
                 <el-table-column label="商品单价" align="center" prop="prefPrice" :show-overflow-tooltip="true">
                     <template slot-scope="scope">
                         <span>{{ (scope.row.prefPrice/100).toFixed(2) }}</span>