From 71e821ab5e6b3014fac9b691d6957bcc09704b70 Mon Sep 17 00:00:00 2001
From: 移动系统liao <liaoxujun@qq.com>
Date: 星期三, 29 五月 2024 11:45:04 +0800
Subject: [PATCH] 修改定制封面逻辑

---
 CoreCms.Net.Web.Admin/wwwroot/views/order/orders/index.html |   38 ++++++++++++++++++++++++++++----------
 1 files changed, 28 insertions(+), 10 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 3def2a0..f676c6b 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',
@@ -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,24 +1305,32 @@
     <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 style="width: 40px;">鏁伴噺</th>
-                    <th style="width: 40px;">鍗曚环</th>
-                    <th style="width: 40px;">浼樻儬</th>
-                    <th style="width: 40px;">鍚堣</th>
+                    <th colspan="1" style="width: 400px;">鍟嗗搧鍚嶇О</th>
+                    <th colspan="2" style="width: 300px;">璐у搧</th>
+                    <th style="width: 60px;">鏁伴噺</th>
+                    <th style="width: 60px;">鍗曚环</th>
+                    <th style="width: 60px;">鏄惁瀹氬埗</th>
+                    <th style="width: 60px;">浼樻儬</th>
+                    <th style="width: 80px;">鍚堣</th>
                 </tr>
             </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>
@@ -1326,6 +1339,11 @@
                     </td>
                     <td>{{item.nums}}</td>
                     <td>{{item.price}}</td>
+                    {{#if (item.isCustomizable == true){}}
+                    <td style="color: red;" >鏄�</td>
+                    {{#}else{}}
+                    <td >鍚�</td>
+                    {{#}}}
                     <td>{{item.promotionAmount}}</td>
                     <td>{{item.amount}}</td>
                 </tr>

--
Gitblit v1.9.1