feat: 订单详情 拼团详情 取消订单 改为传参orderNo

src/app/shop/admin/order/order.service.js

@@ -205,7 +205,7 @@ const api = {
       return request({
         url: '/mall/order/cancel',
         method: 'POST',
-        params: { id: idsString },
+        params: { orderNo: idsString },
       });
     },
     // 退款订单
@@ -270,10 +270,10 @@ const api = {
         method: 'POST',
       }),
     // 获取拼团信息
-    getPinkList: (id) =>
+    getPinkList: (orderNo) =>
       request({
         url: `/mall/pink/orderPink`,
-        params: { id },
+        params: { orderNo },
         method: 'GET',
       }),
   },

src/app/shop/admin/order/order/batchDispatch.vue

@@ -11,7 +11,7 @@
             <el-upload action :http-request="onImportFile" :show-file-list="false" accept=".xlsx,.xls">
               <el-button v-if="!state.file">{{ t('modules.order.importDeliveryList') }}</el-button>
               <el-button class="is-link" type="primary" v-if="state.file">{{ t('modules.order.reSelectFile')
-                }}</el-button>
+              }}</el-button>
             </el-upload>
           </div>
           <div class="sa-m-t-22" v-if="state.file">

src/app/shop/admin/order/order/detail.vue

@@ -310,7 +310,7 @@ async function getOrderDetail() {
       state.orderDetail = data;
       // 获取拼团信息
 
-      if (data.storePink?.id) await getPinkList(data.storePink.id);
+      if (data.storePink?.orderId) await getPinkList(data.storePink.orderId);
     }
   } catch (error) {
     console.error('获取订单详情失败:', error);
@@ -321,10 +321,10 @@ async function getOrderDetail() {
 }
 
 // 获取拼团信息
-async function getPinkList(orderId) {
-  if (!orderId) return;
+async function getPinkList(orderNo) {
+  if (!orderNo) return;
   try {
-    const { code, data } = await api.order.getPinkList(orderId);
+    const { code, data } = await api.order.getPinkList(orderNo);
     if (code == 200) {
       state.pinkList = data || [];
     }

src/app/shop/admin/order/order/index.vue

@@ -126,10 +126,10 @@
                   <div class="sa-flex">
                     <el-button v-if="scope.row.status === 5" class="is-link" type="primary"
                       @click="onSend(scope.row)">{{ t('modules.order.shipOrder') }}</el-button>
-                    <el-button class="is-link" type="primary" @click="detailRow(scope.row.id)">{{
+                    <el-button class="is-link" type="primary" @click="detailRow(scope.row.orderId)">{{
                       t('modules.order.viewDetail') }}</el-button>
                     <el-button v-if="scope.row.status === 1" class="is-link sa-m-l-12" type="danger"
-                      @click="cancelOrder(scope.row.id)">
+                      @click="cancelOrder(scope.row.orderId)">
                       {{ t('modules.order.cancelOrder') }}
                     </el-button>
                   </div>
@@ -490,13 +490,13 @@ function batchHandle() {
   );
 }
 
-function detailRow(id) {
+function detailRow(orderNo) {
   useModal(
     OrderDetail,
     {
       title: t('modules.order.orderDetail'),
       type: 'detail',
-      id,
+      orderNo,
     },
     {
       confirm: () => {
@@ -509,7 +509,7 @@ function detailRow(id) {
   );
 }
 
-async function cancelOrder(id) {
+async function cancelOrder(orderNo) {
   try {
     await ElMessageBox.confirm(t('modules.order.confirmCancelOrder'), t('common.tip'), {
       confirmButtonText: t('common.confirm'),
@@ -517,7 +517,7 @@ async function cancelOrder(id) {
       type: 'warning',
     });
 
-    const { code, message } = await api.order.cancel(id);
+    const { code, message } = await api.order.cancel(orderNo);
     if (code == 200) {
       ElMessage.success(t('modules.order.cancelOrderSuccess'));
       getData(); // 刷新列表

src/app/shop/admin/user/list/detail.vue

@@ -771,7 +771,7 @@ const openDetailModal = (type, row) => {
       component: OrderDetail,
       title: '订单详情',
       width: '90%',
-      id: row.id,
+      orderNo: row.orderId,
     },
     subordinateUser: {
       component: userDetail,