From 1d07f8271751880bdfbf3ea41e696f9ee719888b Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期四, 17 八月 2023 08:48:36 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-management/src/main/webapp/static/modular/system/tIntegral/tIntegral.js | 51 +++++++++++++++++++++++++++++----------------------
1 files changed, 29 insertions(+), 22 deletions(-)
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tIntegral/tIntegral.js b/cloud-server-management/src/main/webapp/static/modular/system/tIntegral/tIntegral.js
index b95ac37..700a94f 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/tIntegral/tIntegral.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tIntegral/tIntegral.js
@@ -15,22 +15,28 @@
return [
{field: 'selectItem', radio: true},
{title: '主键ID', field: 'id', visible: false, align: 'center', valign: 'middle'},
- {title: '省', field: 'insertTime', visible: true, align: 'center', valign: 'middle',width:'20%',
+ {title: '省', field: 'province', visible: true, align: 'center', valign: 'middle',width:'20%',
},
- {title: '市', field: 'name', visible: true, align: 'center', valign: 'middle',
+ {title: '市', field: 'city', visible: true, align: 'center', valign: 'middle',
},
- {title: '姓名', field: 'insertUserId', visible: false, align: 'center', valign: 'middle'},
- {title: '联系电话', field: 'insertUser', visible: true, align: 'center', valign: 'middle',
+ {title: '姓名', field: 'name', visible: true, align: 'center', valign: 'middle'},
+ {title: '联系电话', field: 'phone', visible: true, align: 'center', valign: 'middle',
},
- {title: '积分类型', field: 'province', visible: true, align: 'center', valign: 'middle',
+ {title: '积分类型', field: 'type', visible: true, align: 'center', valign: 'middle',
+ formatter:function (data) {
+ return{1:"赠送积分", 2:"兑换商品",3:"完成课后练习",4:"观看教学视频"}[data]
+ }
},
- {title: '积分明细', field: 'lineNum', visible: true, align: 'center', valign: 'middle',
+ {title: '积分明细', field: 'integral', visible: true, align: 'center', valign: 'middle',
},
- {title: '变动类型', field: 'state', visible: true, align: 'center', valign: 'middle',
+ {title: '变动类型', field: 'category', visible: true, align: 'center', valign: 'middle',
+ formatter:function (data) {
+ return{1:"增加", 2:"减少"}[data]
+ }
},
- {title: '时间', field: 'state', visible: true, align: 'center', valign: 'middle',
+ {title: '时间', field: 'insertTime', visible: true, align: 'center', valign: 'middle',
},
- {title: '备注', field: 'state', visible: true, align: 'center', valign: 'middle',
+ {title: '备注', field: 'remark', visible: true, align: 'center', valign: 'middle',
}
];
};
@@ -71,14 +77,15 @@
/**
* 点击添加跨城站点管理
*/
-TSite.openAddTSite = function () {
+let language =1
+TSite.openAdd = function () {
var index = layer.open({
type: 2,
- title: language==1?'添加':(language==2?'Add':'Tambahkan'),
- area: ['100%', '100%'], //宽高
+ title: language==1?'赠送积分':(language==2?'Add':'Tambahkan'),
+ area: ['50%', '50%'], //宽高
fix: false, //不固定
maxmin: true,
- content: Feng.ctxPath + '/tSite/tSite_add'
+ content: Feng.ctxPath + '/tIntegral/tIntegral_add'
});
this.layerIndex = index;
};
@@ -171,20 +178,20 @@
*/
TSite.search = function () {
var queryData = {};
- queryData['insertTime'] = $("#insertTime").val();
queryData['name'] = $("#name").val();
- queryData['insertUser'] = $("#insertUser").val();
- queryData['city'] = $("#city").val();
- queryData['state'] = $("#state").val();
+ queryData['phone'] = $("#phone").val();
+ queryData['type'] = $("#type").val();
+ queryData['category'] = $("#category").val();
+ queryData['time'] = $("#time").val();
TSite.table.refresh({query: queryData});
};
TSite.resetSearch = function () {
- $("#insertTime").val("");
- $("#name").val("");
- $("#insertUser").val("");
- $("#city").val("");
- $("#state").val("");
+ $("#name").val('');
+ $("#phone").val('');
+ $("#type").val('');
+ $("#category").val('');
+ $("#time").val('');
TSite.search();
};
--
Gitblit v1.7.1