From 9287d741e0ef55d9cc2f530aa5e2a6d2de7cf711 Mon Sep 17 00:00:00 2001
From: Eratosici <ZL769@163.com>
Date: Tue, 2 Nov 2021 16:48:42 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E9=A1=B5=E9=9D=A2=E5=BE=AE?=
 =?UTF-8?q?=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mall4v/src/views/modules/order/order.vue     |  6 ++---
 mall4v/src/views/modules/order/orderInfo.vue | 26 +++++++++++++++-----
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/mall4v/src/views/modules/order/order.vue b/mall4v/src/views/modules/order/order.vue
index 39066f3..5676f11 100644
--- a/mall4v/src/views/modules/order/order.vue
+++ b/mall4v/src/views/modules/order/order.vue
@@ -85,7 +85,7 @@
                     </div>
                     <div class="prod-price">
                       <span>￥{{orderItem.price}}</span>
-                      <span>X{{orderItem.prodCount}}</span>
+                      <span>×{{orderItem.prodCount}}</span>
                     </div>
                   </div>
                 </div>
@@ -140,7 +140,7 @@
                     <el-button v-if="isAuth('order:order:update')"
                                type="text"
                                size="small"
-                               @click="addOrUpdateHandle(order.orderNumber)">修改</el-button>
+                               @click="addOrUpdateHandle(order.orderNumber)">查看</el-button>
                   </div>
                 </div>
               </el-col>
@@ -430,7 +430,7 @@ export default {
   .prod-price {
     position: absolute;
     right: 40px;
-    text-align: center;
+    text-align: right;
   }
   .prod-price span {
     display: block;
diff --git a/mall4v/src/views/modules/order/orderInfo.vue b/mall4v/src/views/modules/order/orderInfo.vue
index 187ee12..3b68d87 100644
--- a/mall4v/src/views/modules/order/orderInfo.vue
+++ b/mall4v/src/views/modules/order/orderInfo.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="!dataForm.orderNumber ? '新增' : '修改'" :close-on-click-modal="false" :visible.sync="visible" width="80%">
+  <el-dialog :title="!dataForm.orderNumber ? '新增' : '查看'" :close-on-click-modal="false" :visible.sync="visible" width="80%">
     <el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
       <div class="main">
         <div class="content">
@@ -98,8 +98,10 @@
                 <el-table :data="dataForm.orderItems" border>
                   <el-table-column prop="" label="商品">
                     <template slot-scope="scope">
-                      <img :src="resourcesUrl + scope.row.pic" width="100" height="100"/>
-                      <span>{{scope.row.prodName}}</span>
+                      <div class="prod-con">
+                        <img :src="resourcesUrl + scope.row.pic" class="prod-img"/>
+                        <span>{{scope.row.prodName}}</span>
+                      </div>
                     </template>
                   </el-table-column>
                   <el-table-column prop="price" label="单价" width="180" align="center">
@@ -439,7 +441,7 @@
 }
 
 .order-state .item-info {
-  padding-left: 70%;
+  padding-left: 80%;
   margin: 25px 0;
 }
 
@@ -463,13 +465,25 @@
   width: 100%;
   line-height: 50px;
   font-weight: bold;
-  border-bottom: 1px dashed #e9eaec;
+  /* border-bottom: 1px dashed #e9eaec; */
 }
 
 .order-log .log-cont {
-  margin-top: 15px;
+  /* margin-top: 15px; */
   color: #4395ff;
 }
+.order-log .log-cont .el-form-item__content {
+  line-height: 1.5em;
+}
+
+.item-list .prod-con {
+  display: flex;
+}
+.item-list .prod-con .prod-img {
+  width: 100px;
+  height: 100px;
+  margin-right: 8px;
+}
 </style>