From 76d028277a138884fad352f734e9fac15e2e4c58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E8=89=AFking?= <2244255345@qq.com>
Date: Tue, 28 Dec 2021 17:51:23 +0800
Subject: [PATCH] =?UTF-8?q?buyer=E4=B8=80=E4=BA=9B=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E5=92=8C=E4=B8=80=E4=B8=AA=E5=BC=B9=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buyer/src/assets/styles/goodsList.scss |  6 ++++++
 buyer/src/pages/GoodsList.vue          | 12 ++++++++++--
 buyer/src/pages/user/Home.vue          | 17 +++++++++++++++--
 3 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/buyer/src/assets/styles/goodsList.scss b/buyer/src/assets/styles/goodsList.scss
index dc3df752..767c58b6 100644
--- a/buyer/src/assets/styles/goodsList.scss
+++ b/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;
diff --git a/buyer/src/pages/GoodsList.vue b/buyer/src/pages/GoodsList.vue
index 55fbb20c..85959d4a 100644
--- a/buyer/src/pages/GoodsList.vue
+++ b/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>
@@ -206,7 +206,14 @@ export default {
 </script>
 
 <style scoped lang="scss">
-@import '../assets/styles/goodsList.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;
diff --git a/buyer/src/pages/user/Home.vue b/buyer/src/pages/user/Home.vue
index 86ee3f28..de9d7049 100644
--- a/buyer/src/pages/user/Home.vue
+++ b/buyer/src/pages/user/Home.vue
@@ -65,8 +65,21 @@ export default {
     };
   },
   computed: {
-    userInfo () { // 用户信息
-      return JSON.parse(Storage.getItem('userInfo'));
+    userInfo () { // 用户信息  
+      if(Storage.getItem('userInfo')){
+         return JSON.parse(Storage.getItem('userInfo'));  
+      } else{
+         this.$Modal.confirm({
+          title:'登录失效',
+          content:"<p>登录已失效，请再次登录</p>",
+          onOk:()=>{
+            if(true){
+              this.$router.push('/login');
+            }
+          }
+        }) 
+          return {}
+      }  
     }
   },