记得上下班打卡 | git大法好，push需谨慎

Skip to content

L
liquidnet-bus-v1
Commit 76ec3216 authored by 张国柄's avatar 张国柄
Browse files
Options

页面调整;

parent 096d44cf
Show whitespace changes
Inline Side-by-side
Showing with 198 additions and 173 deletions
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/adam/member/member.html
View file @ 76ec3216
......@@ -24,10 +24,11 @@
updateUrl: prefix + "/info/{id}",
sortName: "memberId",
sortOrder: "asc",
modalName: "设置",
columns: [{
checkbox: true
},
modalName: "会员设置",
columns: [
// {
// checkbox: true
// },
{
field: 'memberId',
title: '会员卡ID'
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/adam/order/orderList/order.html
View file @ 76ec3216
......@@ -92,9 +92,10 @@
createUrl: prefix + "/add",
detailUrl: prefix + "/detail/{id}",
modalName: "会员订单",
columns: [{
checkbox: true,
},
columns: [
// {
// checkbox: true,
// },
{
field: 'orderNo',
title: '订单号',
......@@ -124,15 +125,18 @@
},
{
field: 'paymentAt',
title: '支付时间'
// formatter: function(value, row, index) {
// return [[${#dates.format(value, 'yyyy-MM-dd')}]];
// }
title: '支付时间',
formatter: function (value, row, index) {
return $.common.sprintf("<span>%s</span>", value.substring(0, 19));
}
},
{
field: 'createdAt',
title: '创建时间'
},+
title: '创建时间',
formatter: function (value, row, index) {
return $.common.sprintf("<span>%s</span>", value.substring(0, 19));
}
},
{
field: 'uid',
title: '用户ID'
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/candy/coupon/mgt/coupon1.html
View file @ 76ec3216
......@@ -10,7 +10,7 @@
<form id="coupon-form">
<div class="select-list">
<ul>
<input type="hidden" name="couType" th:value="${couType}" />
<input type="hidden" name="couType" th:value="${couType}"/>
<li>
<input type="text" name="keyword" placeholder="搜索"/>
</li>
......@@ -23,7 +23,7 @@
<li>
适用范围：<select name="busiType" th:with="type=${@dict.getType('zhengzai_coupon_busi_type')}">
<option value="">所有</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}"th:value="${dict.dictValue}"></option>
</select>
</li>
<li>
......@@ -36,7 +36,7 @@
</div>
<div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-success" th:onclick="$.operate.add([[${couType}]])" shiro:hasPermission="candy:coupon:mgt:add">
<a class="btn btn-success" th:onclick="$.operate.addTab([[${couType}]])" shiro:hasPermission="candy:coupon:mgt:add">
<i class="fa fa-plus"></i> 新增
</a>
</div>
......@@ -46,12 +46,12 @@
</div>
</div>
</div>
<th:block th:include="include :: footer" />
<th:block th:include="include :: footer"/>
<script th:inline="javascript">
var couponCodeListFlag = [[${@permission.hasPermi('system:role:edit')}]];
var prefix = ctx + "candy/coupon/mgt";
$(function() {
$(function () {
var options = {
url: prefix + "/list",
createUrl: prefix + "/add/{id}",
......@@ -66,48 +66,54 @@
// },
{
field: 'valFace',
title: '金额'
title: '金额',
formatter: function (value, row, index) {
return '¥' + value;
}
},
{
field: 'eventAmt',
title: '数量',
title: '数量'
},
{
field: 'bindType',
title: '类型',
sortable: true
title: '类型'
},
{
field: 'busiType',
title: '适用范围',
sortable: true
title: '适用范围'
},
{
field: 'title',
title: '标题',
title: '标题'
},
{
field: 'notice',
title: '描述',
title: '描述'
},
{
field: 'operator',
title: '创建人',
title: '创建人'
},
{
field: 'createdAt',
title: '生成时间',
sortable: true
sortable: true,
formatter: function (value, row, index) {
return $.common.sprintf("<span>%s</span>", value.substring(0, 19));
}
},
{
field: 'expireAt',
title: '失效时间',
sortable: true
formatter: function (value, row, index) {
return $.common.sprintf("<span>%s</span>", value);
}
},
{
title: '操作',
align: 'center',
formatter: function(value, row, index) {
formatter: function (value, row, index) {
var actions = [];
actions.push('<a class="btn btn-info btn-xs" href="javascript:void(0)" onclick="couponCodeList(\'' + row.couponId + '\')"><i class="fa fa-list-ul"></i>查看码列表</a> ');
return actions.join('');
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/candy/coupon/mgt/coupon2.html
View file @ 76ec3216
......@@ -36,7 +36,7 @@
</div>
<div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-success" th:onclick="$.operate.add([[${couType}]])" shiro:hasPermission="candy:coupon:mgt:add">
<a class="btn btn-success" th:onclick="$.operate.addTab([[${couType}]])" shiro:hasPermission="candy:coupon:mgt:add">
<i class="fa fa-plus"></i> 新增
</a>
</div>
......@@ -66,43 +66,49 @@
// },
{
field: 'valFace',
title: '金额'
title: '金额',
formatter: function (value, row, index) {
return '¥' + value;
}
},
{
field: 'eventAmt',
title: '数量',
title: '数量'
},
{
field: 'bindType',
title: '类型',
sortable: true
title: '类型'
},
{
field: 'busiType',
title: '适用范围',
sortable: true
title: '适用范围'
},
{
field: 'title',
title: '标题',
title: '标题'
},
{
field: 'notice',
title: '描述',
title: '描述'
},
{
field: 'operator',
title: '创建人',
title: '创建人'
},
{
field: 'createdAt',
title: '生成时间',
sortable: true
sortable: true,
formatter: function (value, row, index) {
return $.common.sprintf("<span>%s</span>", value.substring(0, 19));
}
},
{
field: 'expireAt',
title: '失效时间',
sortable: true
formatter: function (value, row, index) {
return $.common.sprintf("<span>%s</span>", value);
}
},
{
title: '操作',
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/candy/coupon/mgt/coupon3.html
View file @ 76ec3216
......@@ -36,7 +36,7 @@
</div>
<div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-success" th:onclick="$.operate.add([[${couType}]])" shiro:hasPermission="candy:coupon:mgt:add">
<a class="btn btn-success" th:onclick="$.operate.addTab([[${couType}]])" shiro:hasPermission="candy:coupon:mgt:add">
<i class="fa fa-plus"></i> 新增
</a>
</div>
......@@ -70,29 +70,34 @@
},
{
field: 'eventAmt',
title: '数量',
title: '数量'
},
{
field: 'title',
title: '标题',
title: '标题'
},
{
field: 'notice',
title: '描述',
title: '描述'
},
{
field: 'operator',
title: '创建人',
title: '创建人'
},
{
field: 'createdAt',
title: '生成时间',
sortable: true
sortable: true,
formatter: function (value, row, index) {
return $.common.sprintf("<span>%s</span>", value.substring(0, 19));
}
},
{
field: 'expireAt',
title: '失效时间',
sortable: true
formatter: function (value, row, index) {
return $.common.sprintf("<span>%s</span>", value);
}
},
{
title: '操作',
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/candy/coupon/mgt/coupon4.html
View file @ 76ec3216
......@@ -36,7 +36,7 @@
</div>
<div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-success" th:onclick="$.operate.add([[${couType}]])" shiro:hasPermission="candy:coupon:mgt:add">
<a class="btn btn-success" th:onclick="$.operate.addTab([[${couType}]])" shiro:hasPermission="candy:coupon:mgt:add">
<i class="fa fa-plus"></i> 新增
</a>
</div>
......@@ -68,7 +68,7 @@
field: 'discount',
title: '折扣',
formatter: function (value, row, index) {
return '<span class="nav-label">' + value*10 + '折</span>';
return '<span>' + value*10 + '折</span>';
}
},
{
......@@ -77,13 +77,11 @@
},
{
field: 'bindType',
title: '类型',
sortable: true
title: '类型'
},
{
field: 'busiType',
title: '适用范围',
sortable: true
title: '适用范围'
},
{
field: 'title',
......@@ -100,12 +98,17 @@
{
field: 'createdAt',
title: '生成时间',
sortable: true
sortable: true,
formatter: function (value, row, index) {
return $.common.sprintf("<span>%s</span>", value.substring(0, 19));
}
},
{
field: 'expireAt',
title: '失效时间',
sortable: true
formatter: function (value, row, index) {
return $.common.sprintf("<span>%s</span>", value);
}
},
{
title: '操作',
......
liquidnet-bus-do/liquidnet-service-candy-do/src/main/java/com/liquidnet/service/candy/dto/admin/CandyMgtCouponInfoDto.java
View file @ 76ec3216
......@@ -28,10 +28,10 @@ public class CandyMgtCouponInfoDto implements Serializable {
private Integer overlayLevel;
private Integer validity;
private Integer redeemValidity;
private LocalDateTime redeemStart;
private LocalDateTime redeemStop;
private LocalDateTime effectAt;
private LocalDateTime expireAt;
private String redeemStart;
private String redeemStop;
private String effectAt;
private String expireAt;
//private String operator;
//private LocalDateTime createdAt;
//private LocalDateTime updatedAt;
......@@ -44,10 +44,10 @@ public class CandyMgtCouponInfoDto implements Serializable {
private Integer eventAmt;
private Integer eventType;
private String eventLimit;
private LocalDateTime eventAt;
private String eventAt;
private String operator;
private LocalDateTime createdAt;
private LocalDateTime updatedAt;
private String createdAt;
private String updatedAt;
//private String comment;
// 适用演出名称
......
liquidnet-bus-do/liquidnet-service-candy-do/src/main/resources/com/liquidnet/service/candy/mapper/CandyMgtCouponMapper.xml
View file @ 76ec3216
......@@ -20,10 +20,10 @@
<result column="overlay_level" jdbcType="TINYINT" property="overlayLevel"/>
<result column="validity" jdbcType="INTEGER" property="validity"/>
<result column="redeem_validity" jdbcType="INTEGER" property="redeemValidity"/>
<result column="redeem_start" jdbcType="TIMESTAMP" property="redeemStart"/>
<result column="redeem_stop" jdbcType="TIMESTAMP" property="redeemStop"/>
<result column="effect_at" jdbcType="TIMESTAMP" property="effectAt"/>
<result column="expire_at" jdbcType="TIMESTAMP" property="expireAt"/>
<result column="redeem_start" jdbcType="VARCHAR" property="redeemStart"/>
<result column="redeem_stop" jdbcType="VARCHAR" property="redeemStop"/>
<result column="effect_at" jdbcType="VARCHAR" property="effectAt"/>
<result column="expire_at" jdbcType="VARCHAR" property="expireAt"/>
<!-- <result column="operator" jdbcType="VARCHAR" property="operator" />-->
<!-- <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />-->
<!-- <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />-->
......@@ -36,10 +36,10 @@
<result column="event_amt" jdbcType="INTEGER" property="eventAmt"/>
<result column="event_type" jdbcType="TINYINT" property="eventType"/>
<result column="event_limit" jdbcType="VARCHAR" property="eventLimit"/>
<result column="event_at" jdbcType="TIMESTAMP" property="eventAt"/>
<result column="event_at" jdbcType="VARCHAR" property="eventAt"/>
<result column="operator" jdbcType="VARCHAR" property="operator"/>
<result column="created_at" jdbcType="TIMESTAMP" property="createdAt"/>
<result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt"/>
<result column="created_at" jdbcType="VARCHAR" property="createdAt"/>
<result column="updated_at" jdbcType="VARCHAR" property="updatedAt"/>
<!-- <result column="comment" jdbcType="VARCHAR" property="comment" />-->
</resultMap>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment