From 6a541b2ba408c47c874419cf4cddceae0af93aa3 Mon Sep 17 00:00:00 2001
From: From-wh <from-wh@hotmail.com>
Date: Fri, 7 Jul 2023 11:23:05 +0800
Subject: [PATCH] =?UTF-8?q?improve:=20=E8=AE=A2=E5=8D=95=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=B1=95=E7=A4=BA/=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89=E5=88=86=E7=B1=BB=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/src/components/goodsList/index.vue  |  2 +-
 .../order/orderList/handle/orderDetails.vue   | 29 +++++++++++++++++--
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/template/admin/src/components/goodsList/index.vue b/template/admin/src/components/goodsList/index.vue
index 2e8bd8cb3..cb67842b2 100644
--- a/template/admin/src/components/goodsList/index.vue
+++ b/template/admin/src/components/goodsList/index.vue
@@ -13,7 +13,7 @@
               v-model="formValidate.cate_id"
               size="small"
               :options="treeSelect"
-              :props="{ emitPath: false }"
+              :props="{ checkStrictly: true, emitPath: false }"
               clearable
             ></el-cascader>
           </FormItem>
diff --git a/template/admin/src/pages/order/orderList/handle/orderDetails.vue b/template/admin/src/pages/order/orderList/handle/orderDetails.vue
index 09d94574c..431d77e46 100644
--- a/template/admin/src/pages/order/orderList/handle/orderDetails.vue
+++ b/template/admin/src/pages/order/orderList/handle/orderDetails.vue
@@ -97,7 +97,21 @@
             >虚拟发货备注：{{ orderDatalist.orderInfo.fictitious_content }}</Col
           >
         </Row>
-
+        <Divider style="margin: 20px 0 !important" />
+        <div class="ivu-description-list-title">商品信息</div>
+        <Row class="mb10">
+          <div class="tabBox" v-for="(val, i) in orderDatalist.orderInfo.cartInfo" :key="i">
+            <div class="tabBox_img" v-viewer>
+              <img v-lazy="val.productInfo.attrInfo ? val.productInfo.attrInfo.image : val.productInfo.image" />
+            </div>
+            <span class="tabBox_tit"
+              >{{ val.productInfo.store_name + ' | '
+              }}{{ val.productInfo.attrInfo ? val.productInfo.attrInfo.suk : '' }}</span
+            >
+            <span class="tabBox_pice">{{ '￥' + val.truePrice + ' x ' + val.cart_num }}</span>
+          </div>
+        </Row>
+        <Divider v-if="orderDatalist.orderInfo.invoice" style="margin: 20px 0 !important" />
         <div v-if="orderDatalist.orderInfo.invoice">
           <Divider style="margin: 20px 0 !important" />
           <div class="ivu-description-list-title">发票信息</div>
@@ -151,7 +165,6 @@
             <Col span="12">联系邮箱：{{ orderDatalist.orderInfo.invoice.email || '' }}</Col>
             <Col span="12">联系电话：{{ orderDatalist.orderInfo.invoice.user_phone || '' }}</Col>
           </Row>
-
           <div v-if="orderDatalist.orderInfo.invoice.header_type === 2 && orderDatalist.orderInfo.invoice.type === 2">
             <Row class="mb10">
               <Col span="12"
@@ -188,7 +201,6 @@
             <Col span="12">开票状态：{{ orderDatalist.orderInfo.invoice.is_invoice ? '已开票' : '未开票' }}</Col>
           </Row>
         </div>
-
         <Divider style="margin: 20px 0 !important" v-if="orderDatalist.orderInfo.custom_form.length" />
         <div class="ivu-description-list-title" v-if="orderDatalist.orderInfo.custom_form.length">表单信息</div>
         <Row class="mb10" v-if="orderDatalist.orderInfo.custom_form.length">
@@ -431,4 +443,15 @@ export default {
     height: 100%;
   }
 }
+.tabBox{
+  display:flex;
+  align-items center
+  .tabBox_img{
+    margin-right 10px
+  }
+  .tabBox_tit{
+    margin-right 20px
+
+  }
+}
 </style>