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

buyer/src/assets/styles/goodsList.scss

@@ -30,8 +30,14 @@
   margin-top: 6px;
 }
 .goods-show-detail {
+  height: 36px;
   font-size: 12px;
   margin: 6px 0px;
+  overflow:hidden;
+  text-overflow: ellipsis;
+  display:-webkit-box;
+  -webkit-line-clamp:2;
+  -webkit-box-orient:vertical;
 }
 .goods-show-num {
   font-size: 12px;

buyer/src/pages/GoodsList.vue

@@ -69,7 +69,7 @@
                 >人评价
               </div>
               <div class="goods-show-seller">
-                <Tag v-if="item.content.selfOperated" style="padding:0 4px;" size="default" color="error">自营</Tag><span>{{ item.content.storeName }}</span>
+                <Tag class="goods-show-buyer" v-if="item.content.selfOperated" size="default" color="error">自营</Tag>{{ item.content.storeName }}
               </div>
             </div>
           </div>
@@ -207,6 +207,13 @@ export default {
 
 <style scoped lang="scss">
 @import '../assets/styles/goodsList.scss';  
+.goods-show-info>.goods-show-seller>.goods-show-buyer{
+    height:16px;width:30px;
+    white-space: nowrap;
+    line-height:16px;
+    padding:0 3px;
+    background-color:#E23A3A;
+  }
 .container {
   margin: 15px auto;
   width: 1200px;
@@ -284,6 +291,7 @@ export default {
     display: block;
     clear: left;
   }
+
   .price-sort {
     span {
       display: inline-block;

buyer/src/pages/user/Home.vue

@@ -66,7 +66,22 @@ export default {
   },
   computed: {
     userInfo () { // 用户信息  
-      return JSON.parse(Storage.getItem('userInfo'));
+      if(Storage.getItem('userInfo')){
+         return JSON.parse(Storage.getItem('userInfo'));  
+      } else{
+         this.$Modal.confirm({
+          title:'请登录',
+          content:"<p>请登录后执行此操作</p>",
+          okText: '立即登录',
+          cancelText: '继续浏览',
+          onOk:()=>{
+            if(true){
+              this.$router.push('/login');
+            }
+          }
+        }) 
+          return {}
+      }  
     }
   },