Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui into dev-gl

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;

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;