From 1691f8244fb64fbf7e5c48b94964dfe4d3a5f067 Mon Sep 17 00:00:00 2001
From: ran <17633066053@163.com>
Date: Thu, 28 Apr 2022 16:13:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B4=A6=E6=88=B7=E6=98=B5?=
 =?UTF-8?q?=E7=A7=B0=E8=BF=87=E9=95=BF=E9=97=AE=E9=A2=98=E4=BB=A5=E5=8F=8A?=
 =?UTF-8?q?viper=20=E5=9C=A8pr=E4=B8=8A=E6=8F=90=E7=9A=84Bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manager/src/views/main.scss                   | 28 +++-------
 manager/src/views/order/order/orderDetail.vue | 24 ++++-----
 .../views/personal-center/personal-center.vue |  4 +-
 seller/src/views/main.scss                    | 54 +++++++++++--------
 4 files changed, 54 insertions(+), 56 deletions(-)

diff --git a/manager/src/views/main.scss b/manager/src/views/main.scss
index e743f5e0..f12849bc 100644
--- a/manager/src/views/main.scss
+++ b/manager/src/views/main.scss
@@ -149,7 +149,7 @@
       right: 0;
       top: 0;
       height: 100%;
-      width: 260px;
+
 
       .options {
         .ivu-select-dropdown {
@@ -161,20 +161,6 @@
         }
       }
 
-      .language {
-        display: inline-block;
-        width: 30px;
-        padding: 18px 0;
-        text-align: center;
-        cursor: pointer;
-        vertical-align: middle;
-      }
-
-      .switch-theme-con {
-        display: inline-block;
-        width: 40px;
-        height: 100%;
-      }
 
       .message-con {
         display: inline-block;
@@ -204,15 +190,17 @@
 
       .user-dropdown {
         &-menu-con {
-          position: absolute;
-          right: 0;
-          top: 0;
-          height: 100%;
+
           .main-user-name {
             font-size: 14px;
             display: inline-block;
             cursor: pointer;
             margin-right: 5px;
+            width: 200px;
+            overflow: hidden;
+            word-wrap: normal;
+            white-space: nowrap;
+            text-overflow: ellipsis;
 
             vertical-align: middle;
             overflow: hidden;
@@ -328,4 +316,4 @@
   right: 4px;
   z-index: 100;
   top: 1px;
-}
\ No newline at end of file
+}
diff --git a/manager/src/views/order/order/orderDetail.vue b/manager/src/views/order/order/orderDetail.vue
index 7a113845..61ba503f 100644
--- a/manager/src/views/order/order/orderDetail.vue
+++ b/manager/src/views/order/order/orderDetail.vue
@@ -60,18 +60,18 @@
             <div class="div-item-left">发票抬头：</div>
             <div class="div-item-right">
               {{
-                orderInfo.receipt.receiptTitle ? orderInfo.receipt.receiptTitle : "暂无"
+                orderInfo.receipt && orderInfo.receipt.receiptTitle ? orderInfo.receipt.receiptTitle : "暂无"
               }}
             </div>
           </div>
 
           <div
             class="div-item"
-            v-if="orderInfo.order.needReceipt == true && orderInfo.receipt.taxpayerId"
+            v-if="orderInfo.order.needReceipt == true && orderInfo.receipt &&  orderInfo.receipt.taxpayerId"
           >
             <div class="div-item-left">发票税号：</div>
             <div class="div-item-right">
-              {{ orderInfo.receipt.taxpayerId ? orderInfo.receipt.taxpayerId : "暂无" }}
+              {{ orderInfo.receipt && orderInfo.receipt.taxpayerId ? orderInfo.receipt.taxpayerId : "暂无" }}
             </div>
           </div>
 
@@ -79,7 +79,7 @@
             <div class="div-item-left">发票内容：</div>
             <div class="div-item-right">
               {{
-                orderInfo.receipt.receiptContent
+                orderInfo.receipt && orderInfo.receipt.receiptContent
                   ? orderInfo.receipt.receiptContent
                   : "暂无"
               }}
@@ -90,7 +90,7 @@
             <div class="div-item-left">发票金额：</div>
             <div class="div-item-right">
               {{
-                orderInfo.receipt.receiptPrice
+                orderInfo.receipt && orderInfo.receipt.receiptPrice
                   ? orderInfo.receipt.receiptPrice
                   : "暂无" | unitPrice("￥")
               }}
@@ -100,7 +100,7 @@
           <div class="div-item" v-if="orderInfo.order.needReceipt == true">
             <div class="div-item-left">是否开票：</div>
             <div class="div-item-right">
-              {{ orderInfo.receipt.receiptStatus == 0 ? "未开" : "已开" }}
+              {{ orderInfo.receipt?(orderInfo.receipt.receiptStatus == 0 ? "未开" : "已开"):"空" }}
             </div>
           </div>
         </div>
@@ -135,18 +135,18 @@
             <div class="div-item-left">发票抬头：</div>
             <div class="div-item-right">
               {{
-                orderInfo.receipt.receiptTitle ? orderInfo.receipt.receiptTitle : "暂无"
+                orderInfo.receipt && orderInfo.receipt.receiptTitle ? orderInfo.receipt.receiptTitle : "暂无"
               }}
             </div>
           </div>
 
           <div
             class="div-item"
-            v-if="orderInfo.order.needReceipt == true && orderInfo.receipt.taxpayerId"
+            v-if="orderInfo.order.needReceipt == true && orderInfo.receipt && orderInfo.receipt.taxpayerId"
           >
             <div class="div-item-left">发票税号：</div>
             <div class="div-item-right">
-              {{ orderInfo.receipt.taxpayerId ? orderInfo.receipt.taxpayerId : "暂无" }}
+              {{ orderInfo.receipt && orderInfo.receipt.taxpayerId ? orderInfo.receipt.taxpayerId : "暂无" }}
             </div>
           </div>
 
@@ -154,7 +154,7 @@
             <div class="div-item-left">发票内容：</div>
             <div class="div-item-right">
               {{
-                orderInfo.receipt.receiptContent
+                orderInfo.receipt && orderInfo.receipt.receiptContent
                   ? orderInfo.receipt.receiptContent
                   : "暂无"
               }}
@@ -165,7 +165,7 @@
             <div class="div-item-left">发票金额：</div>
             <div class="div-item-right">
               {{
-                orderInfo.receipt.receiptPrice
+                orderInfo.receipt && orderInfo.receipt.receiptPrice
                   ? orderInfo.receipt.receiptPrice
                   : "暂无" | unitPrice("￥")
               }}
@@ -175,7 +175,7 @@
           <div class="div-item" v-if="orderInfo.order.needReceipt == true">
             <div class="div-item-left">是否开票：</div>
             <div class="div-item-right">
-              {{ orderInfo.receipt.receiptStatus == 0 ? "未开" : "已开" }}
+              {{ orderInfo.receipt?(orderInfo.receipt.receiptStatus == 0 ? "未开" : "已开"):"空" }}
             </div>
           </div>
 
diff --git a/manager/src/views/personal-center/personal-center.vue b/manager/src/views/personal-center/personal-center.vue
index 1e22aae2..b58c979e 100644
--- a/manager/src/views/personal-center/personal-center.vue
+++ b/manager/src/views/personal-center/personal-center.vue
@@ -24,7 +24,7 @@
                   {{ userForm.username }}
                 </FormItem>
                 <FormItem label="昵称：" prop="nickName">
-                  <Input v-model="userForm.nickName" style="width: 250px"/>
+                  <Input maxlength="20" v-model="userForm.nickName" style="width: 250px"/>
                 </FormItem>
                 <FormItem>
                   <Button
@@ -195,4 +195,4 @@ export default {
   }
 }
 
-</style>
\ No newline at end of file
+</style>
diff --git a/seller/src/views/main.scss b/seller/src/views/main.scss
index 49ee2b20..f12849bc 100644
--- a/seller/src/views/main.scss
+++ b/seller/src/views/main.scss
@@ -1,3 +1,13 @@
+.lock-screen-back {
+  border-radius: 50%;
+  z-index: -1;
+  box-shadow: 0 0 0 0 #667aa6 inset;
+  position: fixed;
+  left: 50%;
+  top: 50%;
+  transform: translate(-50%, -50%);
+  transition: all 3s;
+}
 
 .main {
   position: absolute;
@@ -133,11 +143,13 @@
     }
 
     .header-avator-con {
+      display: flex;
+      align-items: center;
       position: absolute;
       right: 0;
       top: 0;
       height: 100%;
-      width: 300px;
+
 
       .options {
         .ivu-select-dropdown {
@@ -149,20 +161,6 @@
         }
       }
 
-      .language {
-        display: inline-block;
-        width: 30px;
-        padding: 18px 0;
-        text-align: center;
-        cursor: pointer;
-        vertical-align: middle;
-      }
-
-      .switch-theme-con {
-        display: inline-block;
-        width: 40px;
-        height: 100%;
-      }
 
       .message-con {
         display: inline-block;
@@ -192,15 +190,17 @@
 
       .user-dropdown {
         &-menu-con {
-          position: absolute;
-          right: 0;
-          top: 0;
-          height: 100%;
+
           .main-user-name {
             font-size: 14px;
             display: inline-block;
             cursor: pointer;
             margin-right: 5px;
+            width: 200px;
+            overflow: hidden;
+            word-wrap: normal;
+            white-space: nowrap;
+            text-overflow: ellipsis;
 
             vertical-align: middle;
             overflow: hidden;
@@ -243,13 +243,14 @@
 
   .single-page-con {
     min-width: 740px;
-    left: 180px;
     position: relative;
+    left: 180px;
     top: 100px;
     right: 0;
     bottom: 0;
     height: calc(100% - 110px);
     width: calc(100% - 180px);
+    overflow: auto;
     background-color: #f0f0f0;
     z-index: 1;
     transition: left 0.3s;
@@ -267,6 +268,9 @@
   }
 }
 
+.taglist-moving-animation-move {
+  transition: transform 0.3s;
+}
 
 .logo-con {
   width: 100%;
@@ -286,8 +290,6 @@
 }
 
 .menu-bar::-webkit-scrollbar {
-  // width: 6px;
-  // height: 6px;
   display: none;
 }
 
@@ -300,6 +302,14 @@
   background: #fff;
 }
 
+.nav-item {
+  font-size: 14px;
+}
+
+.main-nav-menu {
+  bottom: 10px;
+  position: relative;
+}
 
 .loading-position {
   position: absolute;