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

manager/src/views/home/home.vue

@@ -496,7 +496,7 @@ export default {
 
         lastNum.push({
           date: item.date.substring(5),
-          title: "上周记录",
+          title: "上一周期",
           lastNum: item.lastNum || 0,
           res: item.lastNum || 0,
         });

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()

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;