1

mer_plat_admin/src/api/express.js

@@ -0,0 +1,259 @@
+// +----------------------------------------------------------------------
+// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+// +----------------------------------------------------------------------
+// | Author: CRMEB Team <admin@crmeb.com>
+// +----------------------------------------------------------------------
+
+import request from '@/utils/request';
+
+/**
+ * 添加二手交易分类
+ * @param pram
+ */
+export function secondHandCategoryAddApi(data) {
+  return request({
+    url: `/admin/platform/secondHand/category/add`,
+    method: 'post',
+    data,
+  });
+}
+
+/**
+ * 删除二手交易分类
+ * @param pram
+ */
+export function secondHandCategoryDelApi(id) {
+  return request({
+    url: `/admin/platform/secondHand/category/delete/${id}`,
+    method: 'post',
+  });
+}
+
+/**
+ * 二手交易分类显示开关
+ * @param pram
+ */
+export function secondHandCategoryShowApi(id) {
+  return request({
+    url: `/admin/platform/secondHand/category/show/${id}`,
+    method: 'post',
+  });
+}
+
+/**
+ * 二手交易分类分页列表
+ * @param pram
+ */
+export function secondHandCategoryListApi(params) {
+  return request({
+    url: `/admin/platform/secondHand/category/page/list`,
+    method: 'get',
+    params,
+  });
+}
+
+/**
+ * 编辑社二手交易分类
+ * @param pram
+ */
+export function secondHandCategoryUpdateApi(data) {
+  return request({
+    url: `/admin/platform/secondHand/category/update`,
+    method: 'post',
+    data,
+  });
+}
+/**
+ * 获取社区配置
+ * @param pram
+ */
+export function secondHandConfigApi() {
+  return request({
+    url: `/admin/platform/secondHand/category/get/config`,
+    method: 'GET',
+  });
+}
+
+/**
+ * 更新社区配置
+ * @param pram
+ */
+export function secondHandConfigUpdateApi(data) {
+  return request({
+    url: `/admin/platform/secondHand/category/update/config`,
+    method: 'post',
+    data,
+  });
+}
+
+/**
+ * 社区内容分页列表
+ * @param pram
+ */
+export function secondHandProdListApi(params) {
+  return request({
+    url: `/admin/platform/secondHand/prod/page/list`,
+    method: 'GET',
+    params,
+  });
+}
+/**
+ * 社区内容审核
+ * @param pram
+ */
+export function secondHandProdAuditApi(data) {
+  return request({
+    url: `/admin/platform/secondHand/prod/audit`,
+    method: 'post',
+    data,
+  });
+}
+/**
+ * 社区内容详情
+ * @param pram
+ */
+export function secondHandProdDetailApi(id) {
+  return request({
+    url: `/admin/platform/secondHand/prod/detail/${id}`,
+    method: 'GET',
+  });
+}
+/**
+ * 社区内容强制下架
+ * @param pram
+ */
+export function secondHandProdForcedDownApi(data) {
+  return request({
+    url: `/admin/platform/secondHand/prod/forced/down/${data.id}`,
+    method: 'POST',
+    data,
+  });
+}
+/**
+ * 社区内容删除
+ * @param pram
+ */
+export function secondHandProdDelApi(id) {
+  return request({
+    url: `/admin/platform/secondHand/prod/delete/${id}`,
+    method: 'post',
+  });
+}
+/**
+ * 社区笔记分类批量修改
+ */
+export function secondHandCategoryBatchApi(data) {
+  return request({
+    url: `/admin/platform/secondHand/prod/category/batch/update`,
+    method: 'POST',
+    data,
+  });
+}
+
+/**
+ *获取退款订单各状态数量
+ */
+export function refundStatusNumApi(params) {
+  return request({
+    url: `/admin/platform/secondhand/refund/order/status/num`,
+    method: 'GET',
+    params,
+  });
+}
+/**
+ *退款列表
+ */
+export function refundListApi(params) {
+  return request({
+    url: `/admin/platform/secondhand/refund/order/list`,
+    method: 'get',
+    params,
+  });
+}
+/**
+ * 平台强制退款
+ * @param refundOrderNo
+ * @returns {*}
+ */
+export function orderRefundCompulsoryApi(refundOrderNo) {
+  return request({
+    url: `/admin/platform/secondhand/refund/order/compulsory/refund/${refundOrderNo}`,
+    method: 'post',
+  });
+}
+/**
+ *平台备注退款订单
+ */
+export function refundMarkApi(data) {
+  return request({
+    url: `/admin/platform/secondhand/refund/order/mark`,
+    method: 'post',
+    data,
+  });
+}
+/**
+ * 平台端退款订单详情
+ * @param refundOrderNo 订单号
+ */
+export function refundOrderDetailApi(refundOrderNo) {
+  return request({
+    url: `/admin/platform/secondhand/refund/order/detail/${refundOrderNo}`,
+    method: 'get',
+  });
+}
+/**
+ * 订单 列表 获取各状态数量
+ * @param params
+ */
+export function orderStatusNumApi(params) {
+  return request({
+    url: '/admin/platform/express/order/status/num',
+    method: 'get',
+    params,
+  });
+}
+/**
+ * 订单 列表
+ * @param prams
+ */
+export function orderListApi(params) {
+  return request({
+    url: '/admin/platform/express/order/list',
+    method: 'get',
+    params,
+  });
+}
+/**
+ * 订单 详情
+ * @param prams
+ */
+export function orderDetailApi(params) {
+  return request({
+    url: '/admin/platform/express/order/info',
+    method: 'get',
+    params,
+  });
+}
+/**
+ * 获取订单发货单列表
+ * @param orderNo 订单号
+ */
+export function orderInvoiceListApi(orderNo) {
+  return request({
+    url: `/admin/platform/secondhand/order/${orderNo}/invoice/list`,
+    method: 'get',
+  });
+}
+/**
+ *平台端订单物流详情
+ */
+export function getLogisticsInfoApi(invoiceId) {
+  return request({
+    url: `/admin/platform/secondhand/order/get/${invoiceId}/logistics/info`,
+    method: 'get',
+  });
+}

mer_plat_admin/src/filters/order.js

@@ -38,7 +38,22 @@ export function orderStatusFilter(status) {
   };
   return statusMap[status];
 }
-
+/**
+ * @description 订单状态
+ * 2,已收货，待评价
+ */
+export function orderExpressStatusFilter(status) {
+  const statusMap = {
+    0: '待支付',
+    1: '待接单',
+    2: '待收件',
+    3: '配送中',
+    4: '已收件',
+    5: '已完成',
+    9: '已取消',
+  };
+  return statusMap[status];
+}
 /**
  * @description 订单中的退款状态
  * 2,已收货，待评价

mer_plat_admin/src/router/index.js

@@ -29,7 +29,7 @@ import merchant from './modules/merchant';
 import pagediy from '@/router/modules/pagediy';
 import riderRouter from '@/router/modules/rider';
 import secondhandRouter from './modules/secondhand';
-// import expressRouter from './modules/express';
+import expressRouter from './modules/express';
 /**
  * Note: sub-menu only appear when route children.length >= 1
  * Detail see: https://panjiachen.github.io/vue-element-admin-site/guide/essentials/router-and-nav.html
@@ -82,7 +82,7 @@ export const constantRoutes = [
   //二手交易
   secondhandRouter,
   //快递
-  // expressRouter,
+  expressRouter,
 
   {
     path: '/404',

mer_plat_admin/src/views/express/components/orderDetail.vue

@@ -6,7 +6,10 @@
           <div class="full">
             <div class="order_icon"><span class="iconfont icon-dingdan"></span></div>
             <div class="text">
-              <div class="title">{{ orderDatalist.type | orderTypeFilter }}</div>
+              <div class="title">快递订单
+			  <span v-if="orderDatalist.type === 0">（取件）</span>
+			  <span v-else>（寄件）</span>
+			  </div>
               <div>
                 <span class="mr20">订单号：{{ orderDatalist.orderNo }}</span>
               </div>
@@ -17,7 +20,7 @@
               <div class="title">订单状态</div>
               <div class="color-warning">
                 <span v-if="orderDatalist.refundStatus === 3">已退款</span>
-                <span v-else>{{ orderDatalist.status | orderStatusFilter }}</span>
+                <span v-else>{{ orderDatalist.status | orderExpressStatusFilter }}</span>
               </div>
             </li>
             <li class="item">
@@ -51,23 +54,23 @@
                 </li>
               </ul>
             </div>
-            <div v-show="orderDatalist.shippingType < 2 " class="detailSection">
-              <div class="title">收货信息</div>
+            <div  class="detailSection">
+              <div class="title">收件信息</div>
               <ul class="list">
                 <li class="item">
-                  <div class="lang">收货人：</div>
+                  <div class="lang" >收件人：</div>
                   <div class="value">
-                    {{ orderDatalist.realName }}
+                    {{ orderDatalist.userName }}
                   </div>
                 </li>
                 <li class="item">
-                  <div class="lang">收货电话：</div>
+                  <div class="lang">联系电话：</div>
                   <div class="value">
                     {{ orderDatalist.userPhone }}
                   </div>
                 </li>
                 <li class="item">
-                  <div class="lang">收货地址：</div>
+                  <div class="lang">收件地址：</div>
                   <div class="value">
                     {{ orderDatalist.userAddress }}
                   </div>
@@ -78,11 +81,11 @@
               <div class="title">订单信息</div>
               <ul class="list">
                 <li class="item">
-                  <div class="lang">商品总价：</div>
+                  <div class="lang">配送费总价：</div>
                   <div class="value">{{ orderDatalist.proTotalPrice }}</div>
                 </li>
                 <li class="item">
-                  <div class="lang">商品总数：</div>
+                  <div class="lang">快递数量：</div>
                   <div class="value">{{ orderDatalist.totalNum }}</div>
                 </li>
                 <li class="item">
@@ -98,7 +101,7 @@
                   <div class="value">{{ orderDatalist.payPrice || '0.0' }}</div>
                 </li>
                 <li class="item">
-                  <div class="lang">商户优惠金额：</div>
+                  <div class="lang">优惠金额：</div>
                   <div class="value">{{ orderDatalist.merCouponPrice || '0.0' }}</div>
                 </li>
                 <li class="item">
@@ -123,9 +126,7 @@
                 </li>
                 <li class="item">
                   <div class="lang">配送方式：</div>
-                  <div v-if="Number(orderDatalist.secondType) > 4" class="value">自动发货</div>
-                  <div v-else-if="Number(orderDatalist.secondType) == 2" class="value">虚拟发货</div>
-                  <div v-else class="value">{{ orderDatalist.shippingType | shippingTypeFilter }}</div>
+                  <div class="value">骑手配送</div>
                 </li>
                 <li class="item">
                   <div class="lang">支付时间：</div>
@@ -134,18 +135,10 @@
               </ul>
             </div>
             <div class="detailSection">
-              <div class="title">买家留言</div>
+              <div class="title">备注</div>
               <ul class="list">
                 <li class="item">
-                  <div>{{ orderDatalist.userRemark | filterEmpty }}</div>
-                </li>
-              </ul>
-            </div>
-            <div class="detailSection">
-              <div class="title">商家备注</div>
-              <ul class="list">
-                <li class="item">
-                  <div>{{ orderDatalist.merchantRemark | filterEmpty }}</div>
+                  <div>{{ orderDatalist.remark | filterEmpty }}</div>
                 </li>
               </ul>
             </div>
@@ -172,22 +165,22 @@
               </ul>
             </div>
           </el-tab-pane>
-          <el-tab-pane label="商品信息" name="goods">
+          <el-tab-pane label="快递信息" name="goods">
             <el-table class="mt20 orderDetailList" :data="orderDatalist.orderDetailList" size="small">
-              <el-table-column label="商品信息" min-width="400" :show-overflow-tooltip="true">
+              <el-table-column label="快递信息" min-width="180" :show-overflow-tooltip="true">
                 <template slot-scope="scope">
                   <div class="acea-row row-middle">
                     <div class="demo-image__preview mr15 line-heightOne">
                       <el-image :src="scope.row.image" :preview-src-list="[scope.row.image]" />
                     </div>
-                    <div style="width: 408px">
-                      <div class="line1 mb10">{{ scope.row.productName }}</div>
-                      <div class="line1 color-909399 line-heightOne">规格：{{ scope.row.sku }}</div>
+                    <div style="width: 150px">
+                      <div class="line1 mb10">{{ scope.row.expNum }}</div>
+                      <div class="line1 color-909399 line-heightOne">规格：{{ scope.row.spec }}</div>
                     </div>
                   </div>
                 </template>
               </el-table-column>
-              <el-table-column label="商品售价" min-width="90">
+              <el-table-column label="配送费用" min-width="90">
                 <template slot-scope="scope">
                   <div class="acea-row row-middle">
                     <div class="line1">
@@ -196,29 +189,46 @@
                   </div>
                 </template>
               </el-table-column>
-              <el-table-column label="购买数量" min-width="90">
+              <el-table-column label="驿站" min-width="90">
                 <template slot-scope="scope">
                   <div class="acea-row row-middle">
                     <div class="line1">
-                      {{ scope.row.payNum }}
+                      {{ scope.row.postName	 }}
                     </div>
                   </div>
                 </template>
               </el-table-column>
-              <el-table-column :label="orderDatalist.shippingType == 2 ? '核销数量' : '发货数量'" min-width="90">
+			  <el-table-column label="驿站地址" min-width="90">
+			    <template slot-scope="scope">
+			      <div class="acea-row row-middle">
+			        <div class="line1">
+			          {{ scope.row.postAddress}}
+			        </div>
+			      </div>
+			    </template>
+			  </el-table-column>
+              <el-table-column label="取件码" min-width="90">
                 <template slot-scope="scope">
                   <div class="acea-row row-middle">
                     <div class="line1">
-                      {{ scope.row.deliveryNum }}
+                      {{ scope.row.pickUpCode }}
                     </div>
                   </div>
                 </template>
               </el-table-column>
-              <el-table-column label="售后数量" min-width="90">
+			  <el-table-column label="快递单号" min-width="90">
+			    <template slot-scope="scope">
+			      <div class="acea-row row-middle">
+			        <div class="line1">
+			          {{ scope.row.expressNo }}
+			        </div>
+			      </div>
+			    </template>
+			  </el-table-column>
+              <el-table-column label="快递公司" min-width="90">
                 <template slot-scope="scope">
                   <div class="acea-row row-middle">
-                    <div class="line1 mb10 line-heightOne">退款中：{{ scope.row.applyRefundNum }}</div>
-                    <div class="line1 line-heightOne">退款成功：{{ scope.row.refundNum }}</div>
+                    <div class="line1">{{ scope.row.expressCompany	 }}</div>
                   </div>
                 </template>
               </el-table-column>
@@ -296,16 +306,6 @@
                 </el-table>
               </div>
             </template>
-            <!--            <div v-if="parseFloat(orderDatalist.shippingType) === 2">-->
-            <!--              <div class="detailSection">-->
-            <!--                <ul class="list">-->
-            <!--                  <li class="item">-->
-            <!--                    <div>核销员名称：</div>-->
-            <!--                    <div class="value">{{ orderDatalist.clerkName }} | {{ orderDatalist.clerkId }}</div>-->
-            <!--                  </li>-->
-            <!--                </ul>-->
-            <!--              </div>-->
-            <!--            </div>-->
           </el-tab-pane>
         </el-tabs>
       </div>
@@ -347,7 +347,7 @@
 // +----------------------------------------------------------------------
 // | Author: CRMEB Team <admin@crmeb.com>
 // +----------------------------------------------------------------------
-import { getLogisticsInfoApi, orderInvoiceListApi, orderDetailApi, refundOrderDetailApi } from '@/api/secondHand';
+import { getLogisticsInfoApi, orderInvoiceListApi, orderDetailApi, refundOrderDetailApi } from '@/api/express';
 import { checkPermi } from '@/utils/permission'; // 权限判断函数
 import { OrderSecondTypeEnum } from '@/enums/productEnums';
 export default {
@@ -421,7 +421,7 @@ export default {
       orderDetailApi({ orderNo: id })
         .then((res) => {
           this.orderDatalist = res;
-          this.orderExtend = res.orderExtend ? JSON.parse(res.orderExtend) : [];
+          //this.orderExtend = res.orderExtend ? JSON.parse(res.orderExtend) : [];
           this.activeName = 'detail';
           this.loading = false;
         })

mer_plat_admin/src/views/express/index.vue

@@ -5,7 +5,7 @@
       shadow="never"
       class="ivu-mt"
       :body-style="{ padding: 0 }"
-      v-hasPermi="['platform:order:page:list']"
+      v-hasPermi="['platform:express:order:page:list']"
     >
       <div class="padding-add">
         <el-form size="small" inline label-position="right" @submit.native.prevent>
@@ -19,7 +19,7 @@
               @keyup.enter.native="handleSearchList"
             />
           </el-form-item>
-          <el-form-item label="订单类型：">
+          <!-- <el-form-item label="订单类型：">
             <el-select
               v-model="tableFrom.type"
               clearable
@@ -30,7 +30,7 @@
             >
               <el-option v-for="(item, i) in fromType" :key="i" :label="item.text" :value="item.value" />
             </el-select>
-          </el-form-item>
+          </el-form-item> -->
           <el-form-item label="时间选择：">
             <el-date-picker
               v-model="timeVal"
@@ -47,7 +47,7 @@
           <el-form-item label="用户搜索：" label-for="nickname">
             <UserSearchInput v-model="tableFrom" />
           </el-form-item>
-          <el-form-item label="商户名称：">
+         <!-- <el-form-item label="商户名称：">
             <el-input
               v-model.trim="tableFrom.merName"
               placeholder="请输入商户名称"
@@ -56,7 +56,7 @@
               clearable
               @keyup.enter.native="handleSearchList"
             />
-          </el-form-item>
+          </el-form-item> -->
           <el-form-item>
             <el-button type="primary" size="small" @click="handleSearchList">查询</el-button>
             <el-button size="small" @click="handleReset">重置</el-button>
@@ -68,18 +68,16 @@
       <el-tabs class="list-tabs" v-model="tableFrom.status" @tab-click="handleSearchList">
         <el-tab-pane name="all" :label="`全部(${orderChartType.all || 0})`"></el-tab-pane>
         <el-tab-pane name="unPaid" :label="`未支付(${orderChartType.unPaid || 0})`"></el-tab-pane>
-        <el-tab-pane name="notShipped" :label="`未发货(${orderChartType.notShipped || 0})`"></el-tab-pane>
-        <el-tab-pane name="spike" :label="`待收货(${orderChartType.spike || 0})`"></el-tab-pane>
-        <el-tab-pane name="awaitVerification" :label="`待核销(${orderChartType.verification || 0})`"></el-tab-pane>
-        <el-tab-pane name="receiving" :label="`已收货(${orderChartType.receiving || 0})`"></el-tab-pane>
+        <el-tab-pane name="notShipped" :label="`待接单(${orderChartType.notShipped || 0})`"></el-tab-pane>
+        <el-tab-pane name="spike" :label="`待收件(${orderChartType.spike || 0})`"></el-tab-pane>
+        <el-tab-pane name="receiving" :label="`已收件(${orderChartType.receiving || 0})`"></el-tab-pane>
         <el-tab-pane name="complete" :label="`已完成(${orderChartType.complete || 0})`"></el-tab-pane>
-        <el-tab-pane name="refunded" :label="`已退款(${orderChartType.refunded || 0})`"></el-tab-pane>
         <el-tab-pane name="cancel" :label="`已取消(${orderChartType.cancel || 0})`"></el-tab-pane>
         <el-tab-pane name="deleted" :label="`已删除(${orderChartType.deleted || 0})`"></el-tab-pane>
       </el-tabs>
-      <div class="mt5">
+      <!--div class="mt5">
         <el-button size="small" @click="exports" v-hasPermi="['platform:export:order:excel']">导出</el-button>
-      </div>
+      </div-->
       <el-table
         v-loading="listLoading"
         :data="tableData.data"
@@ -95,8 +93,6 @@
         <el-table-column label="订单编号" min-width="220" v-if="checkedCities.includes('订单编号')">
           <template slot-scope="scope">
             <div class="acea-row">
-              <font v-show="scope.row.type === 1" class="mr5">[秒杀]</font>
-              <font v-show="scope.row.type === 2" class="mr5">[拼团]</font>
               <span
                 style="display: block"
                 v-text="scope.row.orderNo"
@@ -111,7 +107,13 @@
             <span v-show="scope.row.isUserDel" class="colorPrompt" style="display: block">用户已删除</span>
           </template>
         </el-table-column>
-        <el-table-column prop="merName" label="商户名称" min-width="150" v-if="checkedCities.includes('商户名称')" />
+        <el-table-column prop="type" label="类型" min-width="150" v-if="checkedCities.includes('类型')">
+			<template slot-scope="scope">
+			  <span v-if="scope.row.type == 0" class="colorPrompt">取件</span>
+			  <span v-if="scope.row.type == 1" class="colorPrompt">寄件</span>
+			</template>
+		</el-table-column>
+		<el-table-column prop="totalPrice" label="配送费用" min-width="80" v-if="checkedCities.includes('配送费用')" />
         <el-table-column prop="nickName" label="用户昵称" min-width="150" v-if="checkedCities.includes('用户昵称')">
           <template slot-scope="scope">
             <span :class="scope.row.isLogoff == true ? 'colorPrompt' : ''">{{ scope.row.nickName }}</span>
@@ -127,20 +129,10 @@
         </el-table-column>
         <el-table-column label="订单状态" min-width="100" v-if="checkedCities.includes('订单状态')">
           <template slot-scope="scope">
-            <span class="textE93323 tag-background notStartTag tag-padding" v-if="scope.row.refundStatus === 3"
-              >已退款</span
-            >
            <span
              :class="scope.row.status < 5 ? 'doingTag' : 'endTag'"
              class="tag-background tag-padding"
-             v-else-if="
-               scope.row.groupBuyRecordStatus == 99 || scope.row.status == 9 || scope.row.groupBuyRecordStatus == 10 || scope.row.status < 9
-             "
-             >{{ scope.row.status | orderStatusFilter }}</span
-           >
-           <span class="textE93323 tag-background notStartTag tag-padding" v-else>{{
-             scope.row.groupBuyRecordStatus == 0 ? '拼团中' : '拼团失败'
-           }}</span>
+             v-if="scope.row.status == 9 || scope.row.status < 9">{{ scope.row.status | orderExpressStatusFilter }}</span>
           </template>
         </el-table-column>
         <el-table-column prop="createTime" label="下单时间" min-width="140" v-if="checkedCities.includes('下单时间')" />
@@ -152,7 +144,7 @@
             </p>
           </template>
           <template slot-scope="scope">
-            <a v-if="scope.row.groupBuyRecordStatus != 0" @click="onOrderDetails(scope.row.orderNo)"> 详情</a>
+            <a  @click="onOrderDetails(scope.row.orderNo)"> 详情</a>
           </template>
         </el-table-column>
       </el-table>
@@ -198,16 +190,14 @@
 // +---------------------------------------------------------------------
 // | Author: CRMEB Team <admin@crmeb.com>
 // +---------------------------------------------------------------------
-import { orderStatusNumApi, orderListApi, orderExcelApi } from '@/api/secondHand';
+import { orderStatusNumApi, orderListApi } from '@/api/express';
 import detailsFrom from './components/orderDetail.vue';
-import merchantName from '@/components/merchantName';
 import { isWriteOff } from '@/utils';
 import { checkPermi } from '@/utils/permission'; // 权限判断函数
 export default {
   name: 'orderlistDetails',
   components: {
     detailsFrom,
-    merchantName,
   },
   data() {
     return {
@@ -278,14 +268,14 @@ export default {
       active: false,
       card_select_show: false,
       checkAll: false,
-      checkedCities: ['订单编号', '商户名称', '用户昵称', '实际支付', '支付方式', '订单状态', '下单时间'],
-      columnData: ['订单编号', '商户名称', '用户昵称', '实际支付', '支付方式', '订单状态', '下单时间'],
+      checkedCities: ['订单编号', '类型',  '配送费用','用户昵称', '实际支付', '支付方式', '订单状态', '下单时间'],
+      columnData: ['订单编号', '类型',,  '配送费用', '用户昵称', '实际支付', '支付方式', '订单状态', '下单时间'],
       isIndeterminate: true,
     };
   },
   mounted() {
-    if (checkPermi(['platform:order:page:list'])) this.getList();
-    if (checkPermi(['platform:order:status:num'])) this.getOrderStatusNum();
+    if (checkPermi(['platform:express:order:page:list'])) this.getList();
+    if (checkPermi(['platform:express:order:status:num'])) this.getOrderStatusNum();
   },
   methods: {
     checkPermi,
@@ -319,7 +309,7 @@ export default {
     onOrderDetails(id) {
       this.orderNo = id;
       this.$refs.orderDetail.getDetail(id);
-      this.$refs.orderDetail.getOrderInvoiceList(id);
+      //this.$refs.orderDetail.getOrderInvoiceList(id);
       this.$refs.orderDetail.dialogVisible = true;
     },
     handleClose() {

mer_plat_admin/src/views/secondhand/order/list.vue

@@ -77,9 +77,9 @@
         <el-tab-pane name="cancel" :label="`已取消(${orderChartType.cancel || 0})`"></el-tab-pane>
         <el-tab-pane name="deleted" :label="`已删除(${orderChartType.deleted || 0})`"></el-tab-pane>
       </el-tabs>
-      <div class="mt5">
+      <!--div class="mt5">
         <el-button size="small" @click="exports" v-hasPermi="['platform:export:order:excel']">导出</el-button>
-      </div>
+      </div-->
       <el-table
         v-loading="listLoading"
         :data="tableData.data"