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

Skip to content

L
liquidnet-bus-v1
Commit 490f0d06 authored by 胡佳晨's avatar 胡佳晨
Browse files
Options

Merge remote-tracking branch 'origin/dev' into dev

parents 7ec033ae 591f8364
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 16 deletions
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/adam/order/orderList/order.html
View file @ 490f0d06
s<!DOCTYPE html> <!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro"> <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head> <head>
<th:block th:include="include :: header('【请填写功能名称】列表')" /> <th:block th:include="include :: header('【请填写功能名称】列表')" />
...@@ -100,11 +100,11 @@ s<!DOCTYPE html> ...@@ -100,11 +100,11 @@ s<!DOCTYPE html>
title: '订单号' title: '订单号'
}, },
{ {
field: 'uid', field: 'state',
title: '订单状态' title: '订单状态'
}, },
{ {
field: 'mode', field: 'payType',
title: '支付方式' title: '支付方式'
}, },
{ {
...@@ -112,15 +112,15 @@ s<!DOCTYPE html> ...@@ -112,15 +112,15 @@ s<!DOCTYPE html>
title: '价格(元)' title: '价格(元)'
}, },
{ {
field: 'pricePaid', field: 'paymentAt',
title: '支付时间' title: '支付时间'
}, },
{ {
field: 'memberName', field: 'createdAt',
title: '创建时间' title: '创建时间'
}, },
{ {
field: 'memberId', field: 'uid',
title: '用户ID' title: '用户ID'
}, },
{ {
...@@ -128,7 +128,7 @@ s<!DOCTYPE html> ...@@ -128,7 +128,7 @@ s<!DOCTYPE html>
title: '手机号' title: '手机号'
}, },
{ {
field: 'days', field: 'source',
title: '客户端' title: '客户端'
}, },
{ {
...@@ -140,7 +140,7 @@ s<!DOCTYPE html> ...@@ -140,7 +140,7 @@ s<!DOCTYPE html>
align: 'center', align: 'center',
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.edit(\'' + row.mid + '\')"><i class="fa fa-edit"></i>编辑</a> '); actions.push('<a class="btn btn-warning btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.orderNo + '\')"><i class="fa fa-search"></i>详细</a>');
return actions.join(''); return actions.join('');
} }
}] }]
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/order/orderList/orderList.html
View file @ 490f0d06
...@@ -107,6 +107,9 @@ ...@@ -107,6 +107,9 @@
<script th:inline="javascript"> <script th:inline="javascript">
var detailFlag = [[${@permission.hasPermi('kylin:order:orderlist:detail')}]]; var detailFlag = [[${@permission.hasPermi('kylin:order:orderlist:detail')}]];
var prefix = ctx + "kylin/order/orderList"; var prefix = ctx + "kylin/order/orderList";
var orderStatusDic = [[${@dict.getType('zhengzai_order_status')}]];
var getTicketTypeDic = [[${@dict.getType('zhengzai_get_ticket_type')}]];
var payTypeDic = [[${@dict.getType('zhengzai_pay_type')}]];
$(function() { $(function() {
var options = { var options = {
...@@ -117,32 +120,45 @@ ...@@ -117,32 +120,45 @@
columns: [{ columns: [{
checkbox: true checkbox: true
}, },
{
field: '-',
title: '第三方'
},
{ {
field: 'orderCode', field: 'orderCode',
title: '订单号' title: '订单号'
}, },
{ {
field: 'performanceTitle', field: 'title',
title: '订单状态' title: '演出名称'
}, },
{ {
field: 'getTicketType', field: 'status',
title: '支付方式' title: '订单状态',
formatter: function(value, row, index) {
return $.table.selectDictLabel(orderStatusDic, value);
}
}, },
{ {
field: 'getTicketType', field: 'getTicketType',
title: '取票方式' title: '取票方式',
formatter: function(value, row, index) {
return $.table.selectDictLabel(getTicketTypeDic, value);
}
}, },
{ {
field: 'paymentType', field: 'paymentType',
title: '支付方式' title: '支付方式'
// formatter: function(value, row, index) {
// return $.table.selectDictLabel(payTypeDic, value);
// }
}, },
{ {
field: 'userId', field: 'tied',
title: '搭售' title: '搭售'
}, },
{ {
field: 'userName', field: 'priceActual',
title: '总价格' title: '总价格'
}, },
{ {
...@@ -162,7 +178,7 @@ ...@@ -162,7 +178,7 @@
title: '手机号' title: '手机号'
}, },
{ {
field: 'qrCode', field: 'orderSource',
title: '客户端' title: '客户端'
}, },
{ {
......
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