From 9173f6e5b34a12c01804676d76842031e9ec6724 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 26 六月 2024 11:52:16 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/baifenbaishop
---
CoreCms.Net.Web.Admin/wwwroot/views/corecmsplanorder/details.html | 163 ++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 145 insertions(+), 18 deletions(-)
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/corecmsplanorder/details.html b/CoreCms.Net.Web.Admin/wwwroot/views/corecmsplanorder/details.html
index fc0958e..8aaa265 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/corecmsplanorder/details.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/corecmsplanorder/details.html
@@ -7,37 +7,64 @@
<tbody>
<tr>
- <td width="25%">
+ <td width="17%">
<label for="orderId">璁㈠崟鍙�</label>
</td>
- <td width="25%">
+ <td width="34%" colspan="2">
{{ d.params.data.model.orderId || '' }}
</td>
- <td width="25%">
+ <td width="17%">
<label for="shipAddress">瀛︽牎</label>
</td>
- <td width="25%">
+ <td width="34%" colspan="2">
{{ d.params.data.model.shipAddress || '' }}
</td>
</tr>
+ <tr>
+ <td>
+ <label for="shi">甯�</label>
+ </td>
+ <td colspan="2">
+ {{ d.params.data.model.shi || '' }}
+ </td>
+ <td>
+ <label for="quxian">鍖哄幙</label>
+ </td>
+ <td colspan="2">
+ {{ d.params.data.model.quxian || '' }}
+ </td>
+ </tr>
-
+ <tr>
+ <td>
+ <label for="pianqu">鐗囧尯</label>
+ </td>
+ <td colspan="2">
+ {{ d.params.data.model.pianqu || '' }}
+ </td>
+ <td>
+ <label for="quxian">鏀惰揣鍦板潃</label>
+ </td>
+ <td colspan="2">
+ {{ d.params.data.model.shouhuoAddress || '' }}
+ </td>
+ </tr>
<tr>
<td>
<label for="shipName">鑱旂郴浜�</label>
</td>
- <td>
+ <td colspan="2">
{{ d.params.data.model.shipName || '' }}
</td>
<td>
<label for="shipMobile">鑱旂郴鐢佃瘽</label>
</td>
- <td>
+ <td colspan="2">
{{ d.params.data.model.shipMobile || '' }}
</td>
</tr>
@@ -46,13 +73,13 @@
<td>
<label for="oldOrderAmount">璁″垝閲戦</label>
</td>
- <td>
+ <td colspan="2">
{{ d.params.data.model.oldOrderAmount || '' }}
</td>
<td>
<label for="orderAmount">璋冩暣閲戦</label>
</td>
- <td>
+ <td style="color:red;" colspan="2">
{{ d.params.data.model.orderAmount || '' }}
</td>
</tr>
@@ -62,13 +89,13 @@
<td>
<label for="keYongAmount">鍙敤浣欓</label>
</td>
- <td>
- {{ d.params.data.model.keYongAmount || '' }}
+ <td style="color:red;" colspan="2">
+ {{ d.params.data.model.keYongAmount}}
</td>
<td>
<label for="status">璁㈠崟鐘舵��</label>
</td>
- <td>
+ <td colspan="2">
{{ d.params.data.model.statusText || '' }}
</td>
</tr>
@@ -77,18 +104,23 @@
<td>
<label for="createTime">寤虹珛鏃堕棿</label>
</td>
- <td>
+ <td colspan="2">
{{ d.params.data.model.createTime || '' }}
</td>
<td>
<label for="upDataTime">淇敼鏃堕棿</label>
</td>
- <td>
+ <td colspan="2">
{{ d.params.data.model.upDataTime || '' }}
</td>
</tr>
+ <!--<tr>
+ <td style="background-color:lightsteelblue;" colspan="4">
+ 鍘熻鍗�
+ </td>
+ </tr>-->
<tr>
<td style="background-color:lightsteelblue;">
鍟嗗搧鍚嶇О
@@ -97,14 +129,20 @@
鍗曚环锛堝厓锛�
</td>
<td style="background-color:lightsteelblue;">
- 鏁伴噺
+ 璁″垝鏁伴噺
</td>
- <td style="background-color:lightsteelblue;" >
- 鎬讳环锛堝厓锛�
+ <td style="background-color:lightsteelblue;">
+ 璁″垝閲戦锛堝厓锛�
+ </td>
+ <td style="background-color:lightsteelblue;">
+ 璋冩暣鏁伴噺
+ </td>
+ <td style="background-color:lightsteelblue;">
+ 璋冩暣閲戦锛堝厓锛�
</td>
</tr>
- {{# layui.each(d.params.data.modelItem, function(index, item){ }}
+ {{# layui.each(d.params.data.modelItem1, function(index, item){ }}
<tr>
<td>
{{ item.name }} {{ item.specification }}
@@ -118,10 +156,99 @@
<td>
{{ item.amount }}
</td>
+ <td>
+ {{ item.numsnew }}
+ </td>
+ <td>
+ {{ item.amountnew }}
+ </td>
+ </tr>
+ {{# }); }}
+ <tr>
+ <td style="background-color:lightsteelblue;" colspan="6">
+ 鏅�氬晢鍝�
+ </td>
+
+ </tr>
+ <tr>
+ <td style="background-color:lightsteelblue;">
+ 鍟嗗搧鍚嶇О
+ </td>
+ <td style="background-color:lightsteelblue;">
+ 鍗曚环锛堝厓锛�
+ </td>
+ <td style="background-color:lightsteelblue;">
+ 鏁伴噺
+ </td>
+ <td style="background-color:lightsteelblue;">
+ 閲戦锛堝厓锛�
+ </td>
+ <td style="background-color:lightsteelblue;">
+ </td>
+ <td style="background-color:lightsteelblue;">
+ </td>
+ </tr>
+
+ {{# layui.each(d.params.data.coreCmsOrderItems, function(index, item){ }}
+ <tr>
+ <td>
+ {{ item.name }} {{ item.addon }}
+ </td>
+ <td>
+ {{ item.price }}
+ </td>
+ <td>
+ {{ item.nums }}
+ </td>
+ <td>
+ {{ item.amount }}
+ </td>
+ <td>
+
+ </td>
+ <td>
+
+ </td>
</tr>
{{# }); }}
+ <!--<tr>
+ <td style="background-color:lightsteelblue;" colspan="4">
+ 淇敼璁㈠崟
+ </td>
+ </tr>
+ <tr>
+ <td style="background-color:lightsteelblue;">
+ 鍟嗗搧鍚嶇О
+ </td>
+ <td style="background-color:lightsteelblue;">
+ 鍗曚环锛堝厓锛�
+ </td>
+ <td style="background-color:lightsteelblue;">
+ 鏁伴噺
+ </td>
+ <td style="background-color:lightsteelblue;">
+ 鎬讳环锛堝厓锛�
+ </td>
+ </tr>
+
+ {{# layui.each(d.params.data.modelItem2, function(index, item){ }}
+ <tr>
+ <td>
+ {{ item.name }} {{ item.specification }}
+ </td>
+ <td>
+ {{ item.price }}
+ </td>
+ <td>
+ {{ item.nums }}
+ </td>
+ <td>
+ {{ item.amount }}
+ </td>
+ </tr>
+ {{# }); }}-->
</tbody>
</table>
--
Gitblit v1.9.1