baifenbaishop.git

			@@ -42,7 +42,7 @@

			<script type="text/html" id="LAY-app-CoreCmsOrder-pagebar">
			<div class="layui-btn-container">
			<button class="layui-btn layui-btn-sm" lay-event="payOrderArray"><i class="layui-icon layui-icon-cart"></i>批量支付</button>
			<!-- <button class="layui-btn layui-btn-sm" lay-event="payOrderArray"><i class="layui-icon layui-icon-cart"></i>批量支付</button> -->
			<button class="layui-btn layui-btn-sm" lay-event="shipOrderArray"><i class="layui-icon layui-icon-templeate-1"></i>合并发货</button>
			<button class="layui-btn layui-btn-sm" lay-event="batchCancelOrder"><i class="layui-icon layui-icon-close"></i>取消订单</button>
			<button class="layui-btn layui-btn-sm" lay-event="batchDeleteOrder"><i class="layui-icon layui-icon-delete"></i>批量删除</button>
			@@ -295,7 +295,7 @@
			},
			{ field: 'orderAmount', title: '订单总额', width: 120, align: 'center', templet: '#orderAmount', totalRow: true },
			{
			field: 'item', title: '货品', align: 'center', width: 330, templet: "#orderItems"
			field: 'item', title: '货品', align: 'center', width: 550, templet: "#orderItems"
			},
			{
			field: 'orderAmount',
			@@ -317,7 +317,7 @@
			align: 'center',
			width: 80,
			templet: function (data) {
			var html = '<a class="layui-btn layui-btn-warm layui-btn-xs" lay-active="shoppingPrintCloud" data-id="' + data.orderId + '" class="cursor">打小票单</a><br>';
			var html = '';// '<a class="layui-btn layui-btn-warm layui-btn-xs" lay-active="shoppingPrintCloud" data-id="' + data.orderId + '" class="cursor">打小票单</a><br>';
			html += '<a class="layui-btn layui-btn-primary layui-btn-xs" lay-active="shoppingPrint" data-id="' + data.orderId + '" class="cursor">打购物单</a><br>';
			html += '<a class="layui-btn layui-btn-primary layui-btn-xs" lay-active="distributionPrint" data-id="' + data.orderId + '" class="cursor">打配送单</a><br>';
			html += '<a class="layui-btn layui-btn-primary layui-btn-xs" lay-active="unionPrint" data-id="' + data.orderId + '" class="cursor">打联合单</a><br>';
			@@ -378,7 +378,10 @@
			templet: function (data) {
			for (var i = 0; i < d.data.shipStatus.length; i++) {
			if (data.shipStatus == d.data.shipStatus[i].value) {
			return d.data.shipStatus[i].description;
			if(d.data.shipStatus[i].description == "已发货")
			return "√"

			return d.data.shipStatus[i].description;
			}
			}
			return "";
			@@ -391,7 +394,9 @@
			templet: function (data) {
			for (var i = 0; i < d.data.confirmStatus.length; i++) {
			if (data.confirmStatus == d.data.confirmStatus[i].value) {
			return d.data.confirmStatus[i].description;
			if(d.data.confirmStatus[i].description == "已确认收货")
			return "√"
			return d.data.confirmStatus[i].description;
			}
			}
			return "";
			@@ -1300,15 +1305,18 @@
			<div class="order-min-table">
			<table class="layui-table" lay-size="sm">
			<colgroup>

			<col width="500">
			<col width="40">
			<col width="200">
			<col width="300">
			<col width="40">
			<col width="40">
			<col width="40">
			</colgroup>
			<thead>
			<tr>
			<th colspan="2" style="width: 200px;">货品</th>
			<th colspan="1" style="width: 400px;">商品名称</th>
			<th colspan="2" style="width: 300px;">货品</th>
			<th style="width: 40px;">数量</th>
			<th style="width: 40px;">单价</th>
			<th style="width: 40px;">优惠</th>
			@@ -1317,7 +1325,11 @@
			</thead>
			<tbody>
			{{# layui.each(d.items, function(index, item){ }}

			<tr lay-tips="{{item.name}}">
			<td >
			{{item.name}}
			</td>
			<td>
			<a href="javascript:void(0);" onclick="layui.coreHelper.viewImage('{{item.imageUrl}}')"><image style="max-width: 30px; max-height: 30px;" src="{{item.imageUrl}}" /></a>
			</td>