From 336cc1da02624db3d42ad09187b6b51b98ee35dc Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 05 三月 2024 14:20:40 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0
---
cloud-server-management/src/main/webapp/static/modular/system/tGoods/tGoods.js | 41 ++++++++++++++++++++++-------------------
1 files changed, 22 insertions(+), 19 deletions(-)
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tGoods/tGoods.js b/cloud-server-management/src/main/webapp/static/modular/system/tGoods/tGoods.js
index a913f80..5d80600 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/tGoods/tGoods.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tGoods/tGoods.js
@@ -14,7 +14,7 @@
TPointProducts.initColumn = function () {
return [
{field: 'selectItem', radio: true},
- {title: 'id', field: 'id', visible: false, align: 'center', valign: 'middle'},
+ {title: '序号', field: 'id', visible: true, align: 'center', valign: 'middle'},
{title: '商品类型', field: 'type', visible: true, align: 'center', valign: 'middle',
formatter: function (value, row, index) {
return {1: "实体商品", 2: "课包商品", 3: "门票商品", 4: "优惠券"}[value]
@@ -49,8 +49,10 @@
},
{title: '排序', field: 'sort', visible: true, align: 'center', valign: 'middle'
},
- {title: '活动状态', field: 'state', visible: true, align: 'center', valign: 'middle'
-
+ {title: '活动状态', field: 'activeStatus', visible: true, align: 'center', valign: 'middle',
+ formatter: function (value, row, index) {
+ return {1: "未开始", 2: "已开始", 3: "已结束"}[value]
+ }
},
{title: '可售状态', field: 'shelves', visible: true, align: 'center', valign: 'middle',
formatter: function (value, row, index) {
@@ -128,11 +130,11 @@
if (this.check()) {
var index = layer.open({
type: 2,
- title:'编辑',
+ title:'详情',
area: ['100%', '100%'], //宽高
fix: false, //不固定
maxmin: true,
- content: Feng.ctxPath + '/tGoods/tCity_update/' + TPointProducts.seItem.id
+ content: Feng.ctxPath + '/tGoods/goods_info/' + TPointProducts.seItem.id
});
this.layerIndex = index;
}
@@ -145,11 +147,11 @@
if (this.check()) {
var index = layer.open({
type: 2,
- title:'编辑',
- area: ['100%', '100%'], //宽高
+ title:'购买详情',
+ area: ['70%', '70%'], //宽高
fix: false, //不固定
maxmin: true,
- content: Feng.ctxPath + '/tGoods/tCity_update/' + TPointProducts.seItem.id
+ content: Feng.ctxPath + '/tGoods/tPay_detail/' + TPointProducts.seItem.id
});
this.layerIndex = index;
}
@@ -166,7 +168,7 @@
area: ['100%', '100%'], //宽高
fix: false, //不固定
maxmin: true,
- content: Feng.ctxPath + '/tGoods/tCity_update/' + TPointProducts.seItem.id
+ content: Feng.ctxPath + '/tGoods/tGoods_update/' + TPointProducts.seItem.id
});
this.layerIndex = index;
}
@@ -178,16 +180,17 @@
*/
TPointProducts.grounding = function (m) {
console.log('m:',m);
- // if (this.check()) {
- // var ajax = new $ax(Feng.ctxPath + "/tGoods/freeze", function (data) {
- // Feng.success("冻结成功!");
- // TPointProducts.table.refresh();
- // }, function (data) {
- // Feng.error("冻结失败!" + data.responseJSON.message + "!");
- // });
- // ajax.set("id",this.seItem.id);
- // ajax.start();
- // }
+ if (this.check()) {
+ var ajax = new $ax(Feng.ctxPath + "/tGoods/grounding", function (data) {
+ Feng.success("操作成功!");
+ TPointProducts.table.refresh();
+ }, function (data) {
+ Feng.error("操作失败!" + data.responseJSON.message + "!");
+ });
+ ajax.set("id",this.seItem.id);
+ ajax.set("type",m);
+ ajax.start();
+ }
};
--
Gitblit v1.7.1