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

Skip to content

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

页面调整

parent bd6e74fd
Hide whitespace changes
Inline Side-by-side
Showing with 47 additions and 32 deletions
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/candy/CandyMgtCouponAdminController.java
View file @ 79045f0f
...@@ -52,7 +52,7 @@ public class CandyMgtCouponAdminController extends BaseController { ...@@ -52,7 +52,7 @@ public class CandyMgtCouponAdminController extends BaseController {
public TableDataInfo list(CandyMgtCouponListParam listParam) { public TableDataInfo list(CandyMgtCouponListParam listParam) {
startPage(); startPage();
List<CandyMgtCouponInfoDto> list = candyMgtCouponAdminService.listForMgtCouponInfoDto(listParam); List<CandyMgtCouponInfoDto> list = candyMgtCouponAdminService.listForMgtCouponInfoDto(listParam);
if (CollectionUtils.isEmpty(list)) { if (!CollectionUtils.isEmpty(list)) {
switch (listParam.getCouType()) { switch (listParam.getCouType()) {
case 3: case 3:
String[] couponIdArr = list.stream().map(CandyMgtCouponInfoDto::getCouponId).toArray(String[]::new); String[] couponIdArr = list.stream().map(CandyMgtCouponInfoDto::getCouponId).toArray(String[]::new);
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/adam/member/member.html
View file @ 79045f0f
...@@ -26,9 +26,9 @@ ...@@ -26,9 +26,9 @@
sortOrder: "asc", sortOrder: "asc",
modalName: "会员设置", modalName: "会员设置",
columns: [ columns: [
// { {
// checkbox: true checkbox: true
// }, },
{ {
field: 'memberId', field: 'memberId',
title: '会员卡ID' title: '会员卡ID'
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
formatter: function(value, row, index) { formatter: function(value, row, index) {
var actions = []; var actions = [];
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.editTab(\'' + row.memberId + '\')"><i class="fa fa-edit"></i>编辑</a> '); actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.editTab(\'' + row.memberId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="memberCodeList(\'' + row.memberId + '\')"><i class="fa fa-edit"></i>兑换码列表</a> '); actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="memberCodeList(\'' + row.memberId + '\')"><i class="fa fa-edit"></i>会员码</a> ');
return actions.join(''); return actions.join('');
} }
}] }]
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/adam/order/orderList/detail.html
View file @ 79045f0f
...@@ -39,11 +39,11 @@ ...@@ -39,11 +39,11 @@
<p class="pull-right">[[${orderDetailsVo.adamUserInfoVo.area}]]</p> <p class="pull-right">[[${orderDetailsVo.adamUserInfoVo.area}]]</p>
</li> </li>
<li class="list-group-item"><i class="fa fa-phone"></i> <li class="list-group-item"><i class="fa fa-phone"></i>
<b class="font-noraml">手机号码：</b> <b class="font-noraml">手机号码：</b>
<p class="pull-right">[[${orderDetailsVo.adamUser.mobile}]]</p> <p class="pull-right">[[${orderDetailsVo.adamUser.mobile}]]</p>
</li> </li>
<li class="list-group-item"><i class="fa fa-plane"></i> <li class="list-group-item"><i class="fa fa-plane"></i>
<b class="font-noraml">会员地址：</b> <b class="font-noraml">会员地址：</b>
<p class="pull-right"> <p class="pull-right">
[[${orderDetailsVo.adamMemberOrderExtVo.expressReceiver}]] [[${orderDetailsVo.adamMemberOrderExtVo.expressReceiver}]]
</p> </p>
...@@ -54,14 +54,14 @@ ...@@ -54,14 +54,14 @@
</p> </p>
</li> </li>
<li class="list-group-item"><i class="fa fa-heart"></i> <li class="list-group-item"><i class="fa fa-heart"></i>
<b class="font-noraml">会员状态：</b> <b class="font-noraml">会员状态：</b>
<p class="pull-right"> <p class="pull-right">
<span class='badge badge-primary' th:if="${orderDetailsVo.adamUserMemberVo.state == 1}">正常 / [[${#temporals.format(orderDetailsVo.adamUserMemberVo.expiryAt, 'dd-MM-yyyy')}]]</span> <span class='badge badge-primary' th:if="${orderDetailsVo.adamUserMemberVo.state == 1}">正常 / [[${#temporals.format(orderDetailsVo.adamUserMemberVo.expiryAt, 'dd-MM-yyyy')}]]</span>
<span class='badge badge-danger' th:if="${orderDetailsVo.adamUserMemberVo.state != 1}">到期 / [[${#temporals.format(orderDetailsVo.adamUserMemberVo.expiryAt, 'dd-MM-yyyy')}]]</span> <span class='badge badge-danger' th:if="${orderDetailsVo.adamUserMemberVo.state != 1}">到期 / [[${#temporals.format(orderDetailsVo.adamUserMemberVo.expiryAt, 'dd-MM-yyyy')}]]</span>
</p> </p>
</li> </li>
<li class="list-group-item"><i class="fa fa-calendar-check-o"></i> <li class="list-group-item"><i class="fa fa-calendar-check-o"></i>
<b class="font-noraml">创建时间：</b> <b class="font-noraml">创建时间：</b>
<p class="pull-right">[[${#temporals.format(orderDetailsVo.adamUserMemberVo.createdAt, 'yyyy-MM-dd HH:mm')}]]</p> <p class="pull-right">[[${#temporals.format(orderDetailsVo.adamUserMemberVo.createdAt, 'yyyy-MM-dd HH:mm')}]]</p>
</li> </li>
</ul> </ul>
...@@ -117,9 +117,18 @@ ...@@ -117,9 +117,18 @@
</ul> </ul>
</div> </div>
<div class="text-center" style="margin-top: -15px;margin-bottom: 10px;"> <!-- <div class="text-center" style="margin-top: -15px;margin-bottom: 10px;">-->
<a data-toggle="modal" class="btn btn-danger" href="#" onclick="closeItem()">关&nbsp;&nbsp;&nbsp;&nbsp;闭</a>&nbsp;&nbsp; <!-- <a data-toggle="modal" class="btn btn-danger" href="#" onclick="closeItem()">关&nbsp;&nbsp;&nbsp;&nbsp;闭</a>&nbsp;&nbsp;-->
<a data-toggle="modal" class="btn btn-primary" href="#member-refund-form">申请退款</a>
<!-- <a data-toggle="modal" class="btn btn-primary" href="#member-refund-form">申请退款</a>-->
<!-- </div>-->
<div class="text-center" id="toolbar" role="group" style="margin-top: -15px;margin-bottom: 10px;">
<a class="btn btn-danger" href="#" onclick="closeItem()">
<i class="fa fa-reply-all"></i> 关&nbsp;&nbsp;&nbsp;闭
</a>
<a class="btn btn-primary" style="margin-left: 15px;" href="#member-refund-form" shiro:hasPermission="adam:order:orderlist:refund" th:if="${orderDetailsVo.adamMemberOrderVo.state == 1 && orderDetailsVo.adamUserMemberVo.state == 1}">
申请退款
</a>
</div> </div>
<div id="member-refund-form" class="modal fade" aria-hidden="true"> <div id="member-refund-form" class="modal fade" aria-hidden="true">
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/adam/order/orderList/order.html
View file @ 79045f0f
...@@ -93,9 +93,9 @@ ...@@ -93,9 +93,9 @@
detailUrl: prefix + "/detail/{id}", detailUrl: prefix + "/detail/{id}",
modalName: "会员订单", modalName: "会员订单",
columns: [ columns: [
// { {
// checkbox: true, checkbox: true,
// }, },
{ {
field: 'orderNo', field: 'orderNo',
title: '订单号', title: '订单号',
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/candy/coupon/mgt/coupon1.html
View file @ 79045f0f
...@@ -62,9 +62,9 @@ ...@@ -62,9 +62,9 @@
sortName: "createdAt", sortName: "createdAt",
modalName: "代金券", modalName: "代金券",
columns: [ columns: [
// { {
// checkbox: true checkbox: true
// }, },
{ {
field: 'valFace', field: 'valFace',
title: '金额', title: '金额',
...@@ -122,9 +122,9 @@ ...@@ -122,9 +122,9 @@
align: 'center', align: 'center',
formatter: function (value, row, index) { formatter: function (value, row, index) {
var actions = []; var actions = [];
if (row.bindType) { if (row.bindType === 0) {
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> ');
} }
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(''); 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 @ 79045f0f
...@@ -62,9 +62,9 @@ ...@@ -62,9 +62,9 @@
sortName: "createdAt", sortName: "createdAt",
modalName: "满减券", modalName: "满减券",
columns: [ columns: [
// { {
// checkbox: true checkbox: true
// }, },
{ {
field: 'valFace', field: 'valFace',
title: '金额', title: '金额',
...@@ -122,7 +122,9 @@ ...@@ -122,7 +122,9 @@
align: 'center', align: 'center',
formatter: function(value, row, index) { formatter: function(value, row, index) {
var actions = []; 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> '); if (row.bindType === 0) {
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(''); return actions.join('');
} }
}] }]
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/candy/coupon/mgt/coupon3.html
View file @ 79045f0f
...@@ -61,9 +61,9 @@ ...@@ -61,9 +61,9 @@
sortName: "createdAt", sortName: "createdAt",
modalName: "兑换券", modalName: "兑换券",
columns: [ columns: [
// { {
// checkbox: true checkbox: true
// }, },
{ {
field: 'couponRuleScopeName', field: 'couponRuleScopeName',
title: '适用演出' title: '适用演出'
...@@ -104,7 +104,9 @@ ...@@ -104,7 +104,9 @@
align: 'center', align: 'center',
formatter: function(value, row, index) { formatter: function(value, row, index) {
var actions = []; 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> '); if (row.bindType === 0) {
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(''); return actions.join('');
} }
}] }]
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/candy/coupon/mgt/coupon4.html
View file @ 79045f0f
...@@ -62,9 +62,9 @@ ...@@ -62,9 +62,9 @@
sortName: "createdAt", sortName: "createdAt",
modalName: "折扣券", modalName: "折扣券",
columns: [ columns: [
// { {
// checkbox: true checkbox: true
// }, },
{ {
field: 'discount', field: 'discount',
title: '折扣', title: '折扣',
...@@ -122,7 +122,9 @@ ...@@ -122,7 +122,9 @@
align: 'center', align: 'center',
formatter: function(value, row, index) { formatter: function(value, row, index) {
var actions = []; 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> '); if (row.bindType === 0) {
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(''); return actions.join('');
} }
}] }]
......
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