From f930d73a6a3d89ab6a0374c4061d30d101ae67e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com>
Date: Fri, 17 Jun 2022 18:50:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E9=80=89=E6=8B=A9=E5=99=A8?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=9B=B6=E5=94=AE=E5=95=86=E5=93=81=E6=89=B9?=
 =?UTF-8?q?=E5=8F=91=E5=95=86=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manager/src/views/lili-dialog/goods-dialog.vue | 4 +++-
 manager/src/views/lili-dialog/style.scss       | 2 +-
 seller/src/views/lili-dialog/goods-dialog.vue  | 4 ++--
 seller/src/views/lili-dialog/style.scss        | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/manager/src/views/lili-dialog/goods-dialog.vue b/manager/src/views/lili-dialog/goods-dialog.vue
index 4fb9ded7..976e3d1c 100644
--- a/manager/src/views/lili-dialog/goods-dialog.vue
+++ b/manager/src/views/lili-dialog/goods-dialog.vue
@@ -23,6 +23,7 @@
             <div class="wap-content-desc">
               <div class="wap-content-desc-title">{{ item.goodsName }}</div>
               <div class="wap-sku">{{ item.goodsUnit }}</div>
+              <div class="wap-sku"><Tag :color="item.salesModel === 'RETAIL' ? 'default' : 'geekblue'">{{item.salesModel === "RETAIL" ? "零售型" : "批发型"}}</Tag></div>
               <div class="wap-content-desc-bottom">
                 <div>￥{{ item.price | unitPrice }}</div>
               </div>
@@ -54,6 +55,7 @@ export default {
         categoryPath: "",
         marketEnable: "UPPER",
         authFlag: "PASS",
+        sort:"createTime"
       },
       category: [], // 分类
       goodsData: [], // 商品数据
@@ -62,7 +64,7 @@ export default {
     };
   },
   props: {
-    selectedWay: { 
+    selectedWay: {
       type: Array,
       default: function(){
         return new Array()
diff --git a/manager/src/views/lili-dialog/style.scss b/manager/src/views/lili-dialog/style.scss
index df97c871..2e40c4fa 100644
--- a/manager/src/views/lili-dialog/style.scss
+++ b/manager/src/views/lili-dialog/style.scss
@@ -71,7 +71,7 @@
   cursor: pointer;
 
   display: flex;
-  height: 80px;
+  height: 100px;
   padding: 2px;
   overflow: hidden;
   align-items: center;
diff --git a/seller/src/views/lili-dialog/goods-dialog.vue b/seller/src/views/lili-dialog/goods-dialog.vue
index aa5ccb4a..13d00de2 100644
--- a/seller/src/views/lili-dialog/goods-dialog.vue
+++ b/seller/src/views/lili-dialog/goods-dialog.vue
@@ -24,6 +24,7 @@
             <div class="wap-content-desc">
               <div class="wap-content-desc-title">{{ item.goodsName }}</div>
               <div class="wap-sku">{{ item.goodsUnit }}</div>
+              <div class="wap-sku"><Tag :color="item.salesModel === 'RETAIL' ? 'default' : 'geekblue'">{{item.salesModel === "RETAIL" ? "零售型" : "批发型"}}</Tag></div>
               <div class="wap-content-desc-bottom">
                 <div>￥{{ item.price | unitPrice }}</div>
               </div>
@@ -65,6 +66,7 @@ export default {
         categoryPath: "",
         marketEnable: "UPPER",
         authFlag: "PASS",
+        sort:"createTime"
       },
       category: [], // 选中的商品分类
       goodsData: [], // 商品列表
@@ -244,9 +246,7 @@ export default {
   margin: 10px 7px;
   padding: 6px 0;
 }
-// .wap-content-item{
 
-// }
 .active {
   background: url("../../assets/selected.png") no-repeat;
   background-position: right;
diff --git a/seller/src/views/lili-dialog/style.scss b/seller/src/views/lili-dialog/style.scss
index acff3c75..5faf806f 100644
--- a/seller/src/views/lili-dialog/style.scss
+++ b/seller/src/views/lili-dialog/style.scss
@@ -65,7 +65,7 @@
     cursor: pointer;
 
     display: flex;
-    height: 80px;
+    height: 100px;
     padding: 2px;
     overflow: hidden;
     align-items: center;