From 45c6d6e44e9e8428718fc635d71e0869556da2c3 Mon Sep 17 00:00:00 2001
From: 移动系统liao <liaoxujun@qq.com>
Date: 星期一, 20 五月 2024 15:36:53 +0800
Subject: [PATCH] no message
---
CoreCms.Net.Web.Admin/wwwroot/views/order/orders/index.html | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/order/orders/index.html b/CoreCms.Net.Web.Admin/wwwroot/views/order/orders/index.html
index 7a9b825..a9fff6e 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/order/orders/index.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/order/orders/index.html
@@ -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>
--
Gitblit v1.9.1