From 2fdc11a7f356bec787a7c7f6301af0b94ef87a4c Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Wed, 14 Apr 2021 18:18:49 +0800
Subject: [PATCH] 修改bug4

---
 zq-erp/src/main/resources/templates/views/admin/shop/shopOrder-list.html |   12 ++++--------
 1 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/zq-erp/src/main/resources/templates/views/admin/shop/shopOrder-list.html b/zq-erp/src/main/resources/templates/views/admin/shop/shopOrder-list.html
index 6fae16b..ae18480 100644
--- a/zq-erp/src/main/resources/templates/views/admin/shop/shopOrder-list.html
+++ b/zq-erp/src/main/resources/templates/views/admin/shop/shopOrder-list.html
@@ -130,21 +130,17 @@
                     <th data-checkbox="true"></th>
                     <th data-formatter="MGrid.indexfn" data-align="center" data-width="30px">序号</th>
                     <th data-align="center" data-width="195px" data-field="id" data-formatter="buidOperate">操作</th>
-                    <th data-field="deliveryInfo.receiveAddress" data-formatter="buildLogistics">发货信息</th>
-                    <!--<th data-field="userName">客户姓名</th>-->
-                    <!--<th data-field="userTel">客户电话</th>-->
+                    <th data-field="userName">客户</th>
+                    <th data-field="details" data-formatter="buildDetails">购买商品</th>
+                    <th data-field="deliveryInfo.receiveAddress" data-formatter="buildLogistics">收货信息</th>
                     <th data-field="orderStatus" data-formatter="buildOrderStatus">订单状态</th>
                     <th data-field="deliveryInfo.waybillNo" data-formatter="buildDelivery">物流信息</th>
                     <th data-field="orderTime" data-formatter="MGrid.getTime">下单时间</th>
-                    <th data-field="details" data-formatter="buildDetails">购买商品</th>
-                    <!--<th data-field="purchaseQuantity">购买件数</th>-->
                     <th data-field="orderMoney">订单金额</th>
                     <th data-field="discountAmount">优惠总金额</th>
-                    <th data-field="shippingMethod"  data-formatter="buildShippingMethod" >配送方式</th>
-                    <!--<th data-field="orderType" data-formatter="orderTypeFormatter">订单类型</th>-->
                     <th data-field="orderNo">订单编号</th>
+                    <th data-field="shippingMethod"  data-formatter="buildShippingMethod" >配送方式</th>
                     <th data-field="storeName">店铺名称</th>
-                    <!--<th data-field="applyStatus" data-formatter="applyStatusFormatter">是否已提现</th>-->
                 </tr>
                 </thead>
             </table>

--
Gitblit v1.9.1