5 Commits 37046da3b6 ... 1a1864d3ea

Author SHA1 Message Date
  double 1a1864d3ea Merge branch 'feat/lihai' into zhp 2 years ago
  黎海 d8684465cb Merge branch 'zhp' of http://code.qutaovip.com/lihai/pad_spa into feat/lihai 2 years ago
  黎海 7448211e47 Merge branch 'zhp' of http://code.qutaovip.com/lihai/pad_spa into feat/lihai 2 years ago
  黎海 130229dfbb Merge branch 'zhp' of http://code.qutaovip.com/lihai/pad_spa into feat/lihai 2 years ago
  黎海 2076269695 feat: 更改导航样式 2 years ago

+ 5 - 5
src/components/common/layout/layout.vue

@@ -7,18 +7,18 @@
7
     </div>
7
     </div>
8
     <div class="content">
8
     <div class="content">
9
       <header>
9
       <header>
10
-
11
         <div class="back-icon"
10
         <div class="back-icon"
12
              v-if="isback"
11
              v-if="isback"
13
              @click="goBack"><img src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/slices/back.png"
12
              @click="goBack"><img src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/slices/back.png"
14
                alt=""></div>
13
                alt=""></div>
15
         <div>
14
         <div>
16
           <div class="left"
15
           <div class="left"
17
-              v-if="menuIndex==0 && $route.path === '/home'">
16
+               v-if="menuIndex==0 && $route.path === '/home'">
18
             <div class="address">{{userInfo.store_name}}</div>
17
             <div class="address">{{userInfo.store_name}}</div>
19
           </div>
18
           </div>
20
         </div>
19
         </div>
21
-        <div class="center" v-if="$route.name">
20
+        <div class="center"
21
+             v-if="$route.name">
22
           {{$route.name}}
22
           {{$route.name}}
23
         </div>
23
         </div>
24
         <div class="right">
24
         <div class="right">
@@ -312,7 +312,6 @@ export default {
312
       api.getUserInfo().then(res => {
312
       api.getUserInfo().then(res => {
313
         if (res.code == 200) {
313
         if (res.code == 200) {
314
           this.userInfo = res.data
314
           this.userInfo = res.data
315
-
316
         }
315
         }
317
       })
316
       })
318
     },
317
     },
@@ -566,7 +565,8 @@ export default {
566
 .menu-wrapper {
565
 .menu-wrapper {
567
   height: 100%;
566
   height: 100%;
568
   text-align: center;
567
   text-align: center;
569
-  overflow: auto;
568
+  overflow-y: auto;
569
+  overflow-x: hidden;
570
   background-color: #fa7d22;
570
   background-color: #fa7d22;
571
 
571
 
572
   .el-menu {
572
   .el-menu {

+ 1 - 0
src/components/common/layout/leftMenu.vue

@@ -139,6 +139,7 @@ export default {
139
   line-height: 46px !important;
139
   line-height: 46px !important;
140
   background: url("https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/select_icon.png")
140
   background: url("https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/select_icon.png")
141
     no-repeat;
141
     no-repeat;
142
+  margin-right: -2px;
142
   background-size: 100% 100%;
143
   background-size: 100% 100%;
143
   background-color: #fa7d22 !important;
144
   background-color: #fa7d22 !important;
144
   color: #fa7d22 !important;
145
   color: #fa7d22 !important;