From adb18caa714692ccabf111ae3ab3481bf04844d4 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 28 二月 2023 18:03:01 +0800
Subject: [PATCH] 订单管理,优惠券管理

---
 management/guns-admin/src/main/webapp/static/modular/system/tCoupon/tCoupon.js |   26 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/management/guns-admin/src/main/webapp/static/modular/system/tCoupon/tCoupon.js b/management/guns-admin/src/main/webapp/static/modular/system/tCoupon/tCoupon.js
index 2041f60..01dae4c 100644
--- a/management/guns-admin/src/main/webapp/static/modular/system/tCoupon/tCoupon.js
+++ b/management/guns-admin/src/main/webapp/static/modular/system/tCoupon/tCoupon.js
@@ -14,9 +14,16 @@
 TCoupon.initColumn = function () {
     return [
         {field: 'selectItem', radio: true},
-            {title: '主键', field: 'id', visible: true, align: 'center', valign: 'middle'},
-            {title: '创建时间', field: 'createTime', visible: true, align: 'center', valign: 'middle'},
+            {title: '主键', field: 'id', visible: false, align: 'center', valign: 'middle'},
+            {title: '添加时间', field: 'createTime', visible: true, align: 'center', valign: 'middle'},
             {title: '优惠券名称', field: 'couponName', visible: true, align: 'center', valign: 'middle'},
+        {title: '服务类型', field: 'couponServiceType', visible: true, align: 'center', valign: 'middle',
+            formatter: function (value, row) {
+                if (row.couponServiceType === 1){
+                    return '<span>通用型</span>'
+                }
+            }
+        },
             {title: '优惠券类型', field: 'couponType', visible: true, align: 'center', valign: 'middle',
                 formatter: function (value, row) {
                     if (row.couponType === 1){
@@ -26,8 +33,8 @@
                     }
                 }
             },
-            {title: '优惠券码', field: 'couponCode', visible: true, align: 'center', valign: 'middle'},
-            {title: '优惠券状态', field: 'couponStatus', visible: true, align: 'center', valign: 'middle',
+            {title: '优惠券码', field: 'couponCode', visible: false, align: 'center', valign: 'middle'},
+            {title: '优惠券状态', field: 'couponStatus', visible: false, align: 'center', valign: 'middle',
                 formatter: function (value, row) {
                     if (row.couponStatus === 1){
                         return '<span>未发放</span>'
@@ -40,17 +47,10 @@
                     }
                 }
             },
-            {title: '服务类型', field: 'couponServiceType', visible: true, align: 'center', valign: 'middle',
-                formatter: function (value, row) {
-                    if (row.couponServiceType === 1){
-                        return '<span>通用型</span>'
-                    }
-                }
-            },
             {title: '条件金额', field: 'couponConditionalAmount', visible: true, align: 'center', valign: 'middle'},
             {title: '优惠金额', field: 'couponPreferentialAmount', visible: true, align: 'center', valign: 'middle'},
-            {title: '有效期', field: 'couponValidity', visible: true, align: 'center', valign: 'middle'},
-            {title: '赠送数量', field: 'couponSendQuantity', visible: true, align: 'center', valign: 'middle'},
+        {title: '数量', field: 'couponCount', visible: true, align: 'center', valign: 'middle'},
+        {title: '有效期', field: 'couponValidity', visible: true, align: 'center', valign: 'middle'},
             {title: '状态', field: 'couponState', visible: true, align: 'center', valign: 'middle',
                 formatter: function (value, row) {
                     if (row.couponState === 1){

--
Gitblit v1.7.1