From 17cea8fe652d1566e856e168d528a1af628e2140 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 14 Jul 2025 10:22:00 +0800
Subject: [PATCH] feat(mall): 添加订单角标数量接口并优化相关功能

---
 src/main/resources/templates/febs/views/modules/clothesType/orderList.html |   31 +++++++++++++++++--------------
 1 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/main/resources/templates/febs/views/modules/clothesType/orderList.html b/src/main/resources/templates/febs/views/modules/clothesType/orderList.html
index 486eb98..d5a50f8 100644
--- a/src/main/resources/templates/febs/views/modules/clothesType/orderList.html
+++ b/src/main/resources/templates/febs/views/modules/clothesType/orderList.html
@@ -159,16 +159,19 @@
                 }
                 let ids = "";
                 for(let i = 0;i < data.length;i++){
-                    if(data[i].status != 1){
+                    if(data[i].status != 2){
                         febs.alert.warn('请选择待发货的订单');
                         return;
+                    }else{
+                        ids = data[i].id;
                     }
                 }
+                console.log(ids);
                 if(ids == null || ids == ""){
                     febs.alert.warn('请选择订单');
                     return;
                 }
-                febs.modal.open('发货', 'modules/clothesType/deliverGoods/' + data.id, {
+                febs.modal.open('发货', 'modules/clothesType/deliverGoods/' + ids, {
                     btn: ['确认','取消'],
                     yes: function (index, layero) {
                         $('#deliver-update-clothes').find('#submit').trigger('click');
@@ -190,13 +193,15 @@
                     if(data[i].status != 2){
                         febs.alert.warn('请选择待收货的订单');
                         return;
+                    }else{
+                        ids = data[i].id;
                     }
                 }
                 if(ids == null || ids == ""){
                     febs.alert.warn('请选择订单');
                     return;
                 }
-                febs.modal.open('修改物流信息', 'modules/clothesType/deliverGoods/' + data.id, {
+                febs.modal.open('修改物流信息', 'modules/clothesType/deliverGoods/' + ids, {
                     btn: ['确认','取消'],
                     yes: function (index, layero) {
                         $('#deliver-update-clothes').find('#deliverInfoSubmit').trigger('click');
@@ -215,7 +220,7 @@
                 }
                 let ids = "";
                 for(let i = 0;i < data.length;i++){
-                    if(data[i].status == 2 ){
+                    if(data[i].status != 2 ){
                         febs.alert.warn('请选择待发货的订单');
                         return;
                     }else{
@@ -247,7 +252,7 @@
                     febs.alert.warn('请选择订单');
                     return;
                 }
-                febs.get(ctx + 'admin/clothesType/confirmOrder?ids='+ids, null, function () {
+                febs.get(ctx + 'admin/clothesType/confirmOrder/'+ids, null, function () {
                     febs.alert.success('操作成功');
                     $query.click();
                 });
@@ -278,7 +283,7 @@
         });
 
         function refundOrder(id) {
-            febs.get(ctx + 'admin/clothesType/refundOrder' + id, null, function () {
+            febs.get(ctx + 'admin/clothesType/refundOrder/' + id, null, function () {
                 febs.alert.success('操作成功');
                 $query.click();
             });
@@ -334,14 +339,15 @@
                 cols: [[
                         {type: 'checkbox', fixed: 'left'},
                         {type: 'numbers', title: '', width: 80},
-                        {title: '操作',
-                            templet: function (d) {
-                                    return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="seeOrder">详情</button>'
-                            },minWidth: 200,align:'center'},
+                        // {title: '操作',
+                        //     templet: function (d) {
+                        //             return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="seeOrder">详情</button>'
+                        //     },minWidth: 200,align:'center'},
                         {field: 'orderNo', title: '订单编号', minWidth: 200,align:'left' ,totalRowText:"合计"},
                         {field: 'memberName', title: '购买人', minWidth: 100,align:'left'},
                         {field: 'typeName', title: '类型', minWidth: 100,align:'left'},
-                        {field: 'typeImage', title: '图片', minWidth: 100,align:'left'},
+                        // {field: 'goodsName', title: '商品', minWidth: 160,align:'left'},
+                        // {field: 'typeImage', title: '图片', minWidth: 100,align:'left'},
                         {field: 'goodsCnt', title: '数量', minWidth: 120,align:'left'},
                         {field: 'status', title: '状态',
                             templet: function (d) {
@@ -359,7 +365,6 @@
                                     return ''
                                 }
                             }, minWidth: 80,align:'center'},
-                        {field: 'goodsName', title: '商品', minWidth: 160,align:'left'},
                         {field: 'amount', title: '总价', minWidth: 80,align:'left', totalRow:true},
                         {field: 'discountAmount', title: '优惠', minWidth: 80,align:'left', totalRow:true},
                         {field: 'carriage', title: '邮费', minWidth: 80,align:'left', totalRow:true},
@@ -388,8 +393,6 @@
                 orderNo: $searchForm.find('input[name="orderNo"]').val().trim(),
                 payResult: $searchForm.find("select[name='payResult']").val(),
                 status: $searchForm.find("select[name='status']").val(),
-                isHome: $searchForm.find("select[name='isHome']").val(),
-                uniqueCode: $searchForm.find("select[name='uniqueCode']").val(),
             };
         }
 

--
Gitblit v1.9.1