合并分支 'Branch_liuzhen' 到 'master'

Branch liuzhen



查看合并请求 !330

@@ -153,6 +153,7 @@
 			<label class="control-label col-xs-12 col-sm-2"></label>
 			<div class="col-xs-12 col-sm-8">
 				<button type="button" id="send" data-type="send" class="btn btn-success btn-embossed">确认完成</button>
+				<button type="reset" class="btn btn-primary btn-embossed btn-close" onclick="Layer.closeAll();">{:__('Close')}</button>
 			</div>
 		</div>
 	{/in}

@@ -32,6 +32,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'pay_time', title: __('Pay_time'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
                         // {field: 'freight_time', title: __('Freight_time'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
                         // {field: 'receipt_time', title: __('Receipt_time'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
+                        {field: 'pay_status', title: __('Pay_status'), searchList: {"10":__('Pay_status 10'),"20":__('Pay_status 20')},
+                            formatter: Controller.api.status_formatter},
                         {field: 'order_status', title: __('Order_status'), searchList: {"10":__('Order_status 10'),"20":__('Order_status 20'),"30":__('Order_status 30')}, 
                                                 formatter: Controller.api.status_formatter},
                         {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},