From 05e13dc68b3db44868d9e02a10ccc330366a49c6 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 08 八月 2023 11:58:36 +0800
Subject: [PATCH] 修改bug
---
management/guns-admin/src/main/webapp/static/modular/system/tAppUser/tCoupon.js | 35 +++++++++++++++++++++++++----------
1 files changed, 25 insertions(+), 10 deletions(-)
diff --git a/management/guns-admin/src/main/webapp/static/modular/system/tAppUser/tCoupon.js b/management/guns-admin/src/main/webapp/static/modular/system/tAppUser/tCoupon.js
index 2b6198e..df9f65a 100644
--- a/management/guns-admin/src/main/webapp/static/modular/system/tAppUser/tCoupon.js
+++ b/management/guns-admin/src/main/webapp/static/modular/system/tAppUser/tCoupon.js
@@ -14,17 +14,31 @@
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: 'couponType', visible: true, align: 'center', valign: 'middle'},
- {title: '优惠券码', field: 'couponCode', visible: true, align: 'center', valign: 'middle'},
- {title: '优惠券状态', field: 'couponStatus', visible: true, align: 'center', valign: 'middle'},
- {title: '服务类型', field: 'couponServiceType', 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){
+ return '<span>活动券</span>'
+ }else if (row.couponType === 2){
+ return '<span>新人券</span>'
+ }
+ }
+ },
+ {title: '优惠券码', field: 'couponCode', visible: false, align: 'center', valign: 'middle'},
+ {title: '优惠券状态', field: 'couponStatus', visible: false, align: 'center', valign: 'middle'},
{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: 'couponValidity', visible: false, align: 'center', valign: 'middle'},
+ {title: '赠送数量', field: 'couponSendQuantity', visible: false, align: 'center', valign: 'middle'}
];
};
@@ -104,6 +118,7 @@
});
ajax.setData({
userIds:$("#userIds").val(),
+ couponId:this.seItem.id,
couponName:this.seItem.couponName
})
ajax.start();
@@ -133,13 +148,13 @@
*/
TCoupon.search = function () {
var queryData = {};
- queryData['condition'] = $("#condition").val();
+ queryData['couponName'] = $("#couponName").val();
TCoupon.table.refresh({query: queryData});
};
$(function () {
var defaultColunms = TCoupon.initColumn();
- var table = new BSTable(TCoupon.id, "/tCoupon/list", defaultColunms);
+ var table = new BSTable(TCoupon.id, "/tCoupon/activityCouponList", defaultColunms);
table.setPaginationType("client");
TCoupon.table = table.init();
});
--
Gitblit v1.7.1