From c6ac1561db0b2f1c8e3a799d7f49808f4bae67c7 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 27 May 2025 15:55:58 +0800
Subject: [PATCH] refactor(mall): 优化订单收货类型判断逻辑

---
 src/main/resources/templates/febs/views/modules/goods/goodsList.html |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/templates/febs/views/modules/goods/goodsList.html b/src/main/resources/templates/febs/views/modules/goods/goodsList.html
index 5737be2..bab8894 100644
--- a/src/main/resources/templates/febs/views/modules/goods/goodsList.html
+++ b/src/main/resources/templates/febs/views/modules/goods/goodsList.html
@@ -28,7 +28,7 @@
                             </div>
                         </div>
                     </form>
-                    <table lay-filter="userTable" lay-data="{id: 'userTable'}"></table>
+                    <table lay-filter="goodsListTable" lay-data="{id: 'goodsListTable'}"></table>
                     <style type="text/css">
                         .layui-table-cell{
                             text-align:center;
@@ -82,8 +82,10 @@
 <script type="text/html" id="goodsTypeFormat">
     {{# if(d.isNormal == 1) { }}
         <span>普通商品</span>
+    {{# }else if(d.isNormal == 3) { }}
+        <span>微信小店</span>
     {{# } else { }}
-        <span>套餐</span>
+        <span>普通商品</span>
     {{# } }}
 </script>
 <style>
@@ -104,7 +106,7 @@
             $reset = $view.find('#reset'),
             $searchForm = $view.find('form'),
             $add = $view.find('#add'),
-            sortObject = {field: 'phone', type: null},
+            sortObject = {field: 'isSale', type: 'asc'},
             tableIns;
 
         form.render();
@@ -115,7 +117,7 @@
         initTable();
 
         // 初始化表格操作栏各个按钮功能
-        table.on('tool(userTable)', function (obj) {
+        table.on('tool(goodsListTable)', function (obj) {
             var data = obj.data,
                 layEvent = obj.event;
             if (layEvent === 'downGoods') {
@@ -227,7 +229,7 @@
         function initTable() {
             tableIns = febs.table.init({
                 elem: $view.find('table'),
-                id: 'userTable',
+                id: 'goodsListTable',
                 url: ctx + 'admin/goods/goodsList?goodsType=1',
                 cols: [[
                     {field: 'goodsNo', title: '商品编号', minWidth: 100,align:'left'},

--
Gitblit v1.9.1