From 01e64fe75bb1914c00ac2da749511296c6588f96 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 24 二月 2023 18:25:51 +0800
Subject: [PATCH] 司机管理完善，佣金管理完成

---
 management/guns-admin/src/main/webapp/static/modular/system/tCoupon/tCoupon.js |   32 +++++++++++++++++++++-----------
 1 files changed, 21 insertions(+), 11 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 ba2c3b4..2041f60 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
@@ -15,7 +15,7 @@
     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: 'createTime', visible: true, align: 'center', valign: 'middle'},
             {title: '优惠券名称', field: 'couponName', visible: true, align: 'center', valign: 'middle'},
             {title: '优惠券类型', field: 'couponType', visible: true, align: 'center', valign: 'middle',
                 formatter: function (value, row) {
@@ -29,20 +29,20 @@
             {title: '优惠券码', field: 'couponCode', visible: true, align: 'center', valign: 'middle'},
             {title: '优惠券状态', field: 'couponStatus', visible: true, align: 'center', valign: 'middle',
                 formatter: function (value, row) {
-                    if (row.couponType === 1){
+                    if (row.couponStatus === 1){
                         return '<span>未发放</span>'
-                    }else if (row.couponType === 2){
+                    }else if (row.couponStatus === 2){
                         return '<span>未使用</span>'
-                    }else if (row.couponType === 3){
+                    }else if (row.couponStatus === 3){
                         return '<span>已使用</span>'
-                    }else if (row.couponType === 4){
+                    }else if (row.couponStatus === 4){
                         return '<span>已过期</span>'
                     }
                 }
             },
             {title: '服务类型', field: 'couponServiceType', visible: true, align: 'center', valign: 'middle',
                 formatter: function (value, row) {
-                    if (row.couponType === 1){
+                    if (row.couponServiceType === 1){
                         return '<span>通用型</span>'
                     }
                 }
@@ -51,13 +51,23 @@
             {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: 'couponState', visible: true, align: 'center', valign: 'middle',
+                formatter: function (value, row) {
+                    if (row.couponState === 1){
+                        return '<span>正常</span>'
+                    }else if (row.couponState === 2){
+                        return '<span>冻结</span>'
+                    }else if (row.couponState === 3){
+                        return '<span>已删除</span>'
+                    }
+                }},
             {title: '操作', visible: true, align: 'center', valign: 'middle',width:150,
                 formatter: function (value, row) {
-                    if (row.state === 1){
-                        return '<a href="#" onclick="TCoupon.stop('+row.id+','+row.status+')" style="color:red">停用</a>' +'&nbsp;' +
+                    if (row.couponState === 1){
+                        return '<a href="#" onclick="TCoupon.stop('+row.id+','+row.couponState+')" style="color:red">停用</a>' +'&nbsp;' +
                             '<a href="#" onclick="TCoupon.delete('+row.id+')" style="color:red">删除</a>'
-                    }else if (row.state === 2){
-                        return '<a href="#" onclick="TCoupon.start('+row.id+','+row.status+')" style="color:green">启用</a>' +'&nbsp;' +
+                    }else if (row.couponState === 2){
+                        return '<a href="#" onclick="TCoupon.start('+row.id+','+row.couponState+')" style="color:green">启用</a>' +'&nbsp;' +
                             '<a href="#" onclick="TCoupon.delete('+row.id+')" style="color:red">删除</a>'
                     }
                 }
@@ -134,7 +144,7 @@
     var queryData = {};
     queryData['couponType'] = $("#couponType").val();
     queryData['couponServiceType'] = $("#couponServiceType").val();
-    queryData['createtime'] = $("#createtime").val();
+    queryData['createTime'] = $("#createTime").val();
     TCoupon.table.refresh({query: queryData});
 };
 

--
Gitblit v1.7.1