~jiangyouyao/beauty-erp.git

			@@ -78,11 +78,15 @@
			<th data-field="orderTime" data-formatter="MGrid.getTime"
			data-sortable="true">下单时间</th>
			<th data-field="total">订单总价</th>

			<th data-field="zkTotal">折后价</th>
			<th data-field="payTime" data-formatter="MGrid.getTime"
			data-sortable="true">支付时间</th>
			<th data-field="staffName">下单顾问</th>
			<th data-field="cashPay">现金支付金额</th>
			<th data-field="cardPay">卡支付金额</th>
			<th data-field="arrears">欠款金额</th>

			<th data-field="statu">订单状态</th>
			<th data-field="remark">备注</th>

			@@ -216,20 +220,26 @@
			function cancelOrder() {
			var id=myGrid.getSelectItemId();
			layer.confirm('确定取消此订单？', {
			btn: ['确认', '取消并删除', '取消'] //可以无限个按钮
			btn: ['确认', '取消'] //可以无限个按钮
			}, function(index, layero){
			$.post(basePath+'/admin/order/cancelOrder?id='+id+'&del=0', {}, function(data){
			parent.layer.msg(data.info,{icon: 1});
			if (data.status == '200') {
			parent.layer.msg(data.info,{icon: 1});
			} else {
			parent.layer.msg(data.info,{icon: 2});
			}
			layer.closeAll();
			myGrid.serchData();
			});
			}, function(index){
			$.post(basePath+'/admin/order/cancelOrder?id='+id+'&del=1', {}, function(data){
			parent.layer.msg(data.info,{icon: 1});
			layer.closeAll();
			myGrid.serchData();
			});
			}, function(index){
			},
			// function(index){
			// $.post(basePath+'/admin/order/cancelOrder?id='+id+'&del=1', {}, function(data){
			// parent.layer.msg(data.info,{icon: 1});
			// layer.closeAll();
			// myGrid.serchData();
			// });
			// },
			function(index){
			//按钮【按钮二】的回调
			});
			}