xc-mall.git - Gitblit

			@@ -321,9 +321,21 @@
			layEvent = obj.event;
			if (layEvent === 'deliverGoods') {
			febs.modal.open('发货', 'modules/order/deliverGoods/' + data.id, {
			btn: ['确认', '取消'],
			btn: ['确认','取消'],
			yes: function (index, layero) {
			$('#deliver-update').find('#submit').trigger('click');
			// $query.click();
			},
			btn2: function () {
			layer.closeAll();
			}
			});
			}
			if (layEvent === 'updateDeliver') {
			febs.modal.open('修改物流信息', 'modules/order/deliverGoods/' + data.id, {
			btn: ['确认','取消'],
			yes: function (index, layero) {
			$('#deliver-update').find('#deliverInfoSubmit').trigger('click');
			// $query.click();
			},
			btn2: function () {
			@@ -442,6 +454,9 @@
			if(d.status === 2){
			return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="seeOrder" shiro:hasPermission="user:update">详情</button>'
			+'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="deliverGoods" shiro:hasPermission="user:update">发货</button>'
			}else if(d.status === 3){
			return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="seeOrder" shiro:hasPermission="user:update">详情</button>'
			+'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="updateDeliver" shiro:hasPermission="user:update">修改物流信息</button>'
			}else{
			return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="seeOrder" shiro:hasPermission="user:update">详情</button>'
			}
			@@ -518,7 +533,7 @@
			//用于包含内容
			var v = document.createElement("div");
			//页面头部，导入css ，media="print"表示打印时使用该样式
			var f = ["<head>", "<style>", "div{font-size:8px;}", ".main{width:100%;height:10%}",
			var f = ["<head>", "<style>", "div{font-size:8px;}", ".main{width:100%;}",
			".main div{width:100%;display:inline-block;}", "</style>", "</head>"
			].join("");
			var contentHtml = "";
			@@ -527,12 +542,11 @@
			var template =
			"<div class='main'>" +
			"<div style='text-align: center;font-size: 10px;font-weight: bold;margin-bottom: 10px'>订单编号：" + data.orderNo + "</div>" +
			"<div>收货人：" + data.name + "，电话：" + data.phone + "，地址：" + data.address + "</div><br><br>" +
			// "<div>电话：" + data.phone + "</div><br><br>" +
			// "<div>地址：" + data.address + "</div><br><br>" +
			// "<div>编号：" + data.orderNo + "</div><br><br>" +
			"<div>商品：" + data.goodsName + "</div><br><br>" +
			"<div>备注：" + data.remark + "</div><br><br>" +
			"<span style='font-size: 10px;font-weight: bold;'>收货人：</span><span>" + data.name + "，</span>" +
			"<span style='font-size: 10px;font-weight: bold;'>电话：</span><span>" + data.phone + "，</span>" +
			"<span style='font-size: 10px;font-weight: bold;'>地址：</span><span>" + data.address + "</span><br>" +
			"<span style='font-size: 10px;font-weight: bold;'>商品：</span><span>" + data.goodsName + "</span><br>" +
			"<span style='font-size: 10px;font-weight: bold;'>备注：</span><span>" + data.remark + "</span><br>" +
			"</div>"

			contentHtml += template;