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

# Conflicts:
#	manager/vue.config.js
#	seller/vue.config.js

buyer/src/components/header/Header.vue

@@ -45,14 +45,14 @@
                 </div>
                 <div class="sign-out" @click="signOutFun">
                   <Icon type="md-exit"></Icon>
-                  <p>退出登陆</p>
+                  <p>退出登录</p>
                 </div>
               </div>
             </DropdownMenu>
           </Dropdown>
         </li>
-        <li class="hover-color" @click="goUserCenter('home/MyOrder')"><span class="nav-item">我的订单</span></li>
-        <li class="hover-color" @click="goUserCenter('home/MyTracks')"><span class="nav-item">我的足迹</span></li>
+        <li class="hover-color" @click="goUserCenter('/home/MyOrder')"><span class="nav-item">我的订单</span></li>
+        <li class="hover-color" @click="goUserCenter('/home/MyTracks')"><span class="nav-item">我的足迹</span></li>
         <li v-if="$route.name !== 'Cart'" style="position:relative;" @mouseenter="getCartList">
           <i class="cart-badge" v-show="cartNum">{{cartNum < 100 ? cartNum : '99'}}</i>
           <Dropdown placement="bottom-start">
@@ -83,7 +83,7 @@
                   </div>
                   <div class="shopping-cart-info">
                     <div class="shopping-cart-title ">
-                      <p class="hover-pointer goods-title">{{ item.goodsSku.goodsName }}</p>
+                      <p class="hover-pointer goods-title ellipsis">{{ item.goodsSku.goodsName }}</p>
                     </div>
                     <div class="shopping-cart-detail">
                       <p>
@@ -173,6 +173,8 @@ export default {
       storage.removeItem('accessToken');
       storage.removeItem('refreshToken');
       storage.removeItem('userInfo');
+      storage.removeItem('cartNum');
+      this.$store.commit('SET_CARTNUM', 0)
       this.$router.push('/login');
     },
     goUserCenter (path) { // 跳转我的订单，我的足迹
@@ -301,7 +303,7 @@ export default {
 .shopping-cart-list {
   padding: 10px 15px;
   box-sizing: border-box;
-  height: 300px;
+  max-height: 300px;
   overflow: scroll;
 }
 .shopping-cart-box {

buyer/src/pages/Login.vue

@@ -245,6 +245,7 @@ export default {
             this.$Message.success('验证码发送成功');
             let that = this;
             this.interval = setInterval(() => {
+              console.log(that.time);
               that.time--;
               if (that.time === 0) {
                 that.time = 60;

buyer/src/pages/shopEntry/first-apply.vue

@@ -193,9 +193,7 @@ export default {
   components: { region },
   props: {
     content: {
-      default () {
-        return {};
-      },
+      default: {},
       type: Object
     }
   },
@@ -325,11 +323,13 @@ export default {
   },
   mounted () {
     this.accessToken.accessToken = storage.getItem('accessToken');
-    this.form = JSON.parse(JSON.stringify(this.content));
-    if (this.form.licencePhoto) {
-      this.form.legalPhoto = this.content.legalPhoto.split(',');
-      this.form.licencePhoto = this.content.licencePhoto.split(',');
-      this.address = this.form.addressIdPath;
+    if (Object.keys(this.content).length) {
+      this.form = JSON.parse(JSON.stringify(this.content));
+      if (this.form.licencePhoto) {
+        this.form.legalPhoto = this.content.legalPhoto.split(',');
+        this.form.licencePhoto = this.content.licencePhoto.split(',');
+        this.address = this.form.addressIdPath;
+      }
     }
   }
 };

buyer/src/plugins/request.js

@@ -9,6 +9,7 @@ import {
 import Storage from './storage';
 import config from '@/config';
 import router from '../router/index.js';
+import store from '../vuex/store';
 import {
   handleRefreshToken
 } from '@/api/index';
@@ -80,7 +81,6 @@ service.interceptors.response.use(
     const errorData = errorResponse.data || {};
 
     if (errorResponse.status === 403) {
-
       isRefreshToken++;
 
       if (isRefreshToken === 1) {
@@ -96,6 +96,9 @@ service.interceptors.response.use(
           Storage.removeItem('accessToken');
           Storage.removeItem('refreshToken');
           Storage.removeItem('userInfo');
+          Storage.setItem('cartNum', 0)
+          store.commit('SET_CARTNUM', 0)
+          console.log('1111');
           Modal.confirm({
             title: '请登录',
             content: '<p>请登录后执行此操作</p>',