w-front-end / select_good · Commits

Commit 9f9a7f64cf582d6e7766f3c9f24a818ed4911d06

Authored by 王强
1 parent 37734dfa

购好物，App内，hideBack参数适配~

Inline Side-by-side
Showing 4 changed files with 24 additions and 6 deletions
src/pages/actList/actList.less
  View file @9f9a7f6
@@ -10,6 +10,9 @@ @@ -10,6 +10,9 @@
10 background-color: #ffffff; 10 background-color: #ffffff;
11 width: 100%; 11 width: 100%;
12 height: auto; 12 height: auto;
  13 + &.no-padding-top {
  14 + padding-top: 0 !important;
  15 + }
13 .call-app-box { 16 .call-app-box {
14 width: 100%; 17 width: 100%;
15 } 18 }
@@ -17,6 +20,9 @@ @@ -17,6 +20,9 @@
17 background-color: #ffffff; 20 background-color: #ffffff;
18 width: 100%; 21 width: 100%;
19 border-bottom: 1px solid #E5E5E5; 22 border-bottom: 1px solid #E5E5E5;
  23 + &.is-hide {
  24 + display: none !important;
  25 + }
20 } 26 }
21 } 27 }
22 .pl { 28 .pl {
@@ -42,6 +48,9 @@ @@ -42,6 +48,9 @@
42 } 48 }
43 } 49 }
44 } 50 }
  51 + &.no-padding-top {
  52 + padding-top: 0 !important;
  53 + }
45 } 54 }
46 .main-box { 55 .main-box {
47 .section { 56 .section {
src/pages/actList/actList.vue
  View file @9f9a7f6
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <div class="act-list-page" v-if="tabs.list[tabs.active]"> 2 <div class="act-list-page" v-if="tabs.list[tabs.active]">
3 3
4 <!-- 导航区域 --> 4 <!-- 导航区域 -->
5 - <div class="nav-box" :style="'padding-top: ' + $parent.top.value + 'px'" ref='navBox'> 5 + <div class="nav-box" :class="{'no-padding-top': $route.query.hideBack == true}" :style="'padding-top: ' + $parent.top.value + 'px'" ref='navBox'>
6 6
7 <!-- H5唤起App组件 --> 7 <!-- H5唤起App组件 -->
8 <call-app-box class="call-app-box" ref="callApp" v-if="!isCNLive.value && $parent.isOpenApp.value" 8 <call-app-box class="call-app-box" ref="callApp" v-if="!isCNLive.value && $parent.isOpenApp.value"
@@ -10,13 +10,13 @@ @@ -10,13 +10,13 @@
10 </call-app-box> 10 </call-app-box>
11 11
12 <!-- 后退导航 --> 12 <!-- 后退导航 -->
13 - <back-box class="back-box" :class="{'hide': $route.query.hideBack == true}" v-if="isCNLive.value" @back="back" 13 + <back-box class="back-box" :class="{'is-hide': $route.query.hideBack == true}" v-if="isCNLive.value" @back="back"
14 :backs="backs"> 14 :backs="backs">
15 </back-box> 15 </back-box>
16 </div> 16 </div>
17 17
18 <!-- pl --> 18 <!-- pl -->
19 - <div class="pl" :class="{'is-cnlive': isCNLive.value, 'is-open-app': $parent.isOpenApp.value, 'is-hide': $route.query.hideBack == true, 'tabsFixed': tabs.fixed}" :style="'padding-top: ' + $parent.top.value + 'px'"></div> 19 + <div class="pl" :class="{'is-cnlive': isCNLive.value, 'is-open-app': $parent.isOpenApp.value, 'is-hide': $route.query.hideBack == true, 'tabsFixed': tabs.fixed, 'no-padding-top': $route.query.hideBack == true}" :style="'padding-top: ' + $parent.top.value + 'px'"></div>
20 20
21 <!-- 主区域 --> 21 <!-- 主区域 -->
22 <div class="main-box"> 22 <div class="main-box">
src/pages/shopList/shopList.less
  View file @9f9a7f6
@@ -10,6 +10,9 @@ @@ -10,6 +10,9 @@
10 background-color: #ffffff; 10 background-color: #ffffff;
11 width: 100%; 11 width: 100%;
12 height: auto; 12 height: auto;
  13 + &.no-padding-top {
  14 + padding-top: 0 !important;
  15 + }
13 .call-app-box { 16 .call-app-box {
14 width: 100%; 17 width: 100%;
15 } 18 }
@@ -17,6 +20,9 @@ @@ -17,6 +20,9 @@
17 background-color: #ffffff; 20 background-color: #ffffff;
18 width: 100%; 21 width: 100%;
19 border-bottom: 1px solid #E5E5E5; 22 border-bottom: 1px solid #E5E5E5;
  23 + &.is-hide {
  24 + display: none !important;
  25 + }
20 } 26 }
21 } 27 }
22 .pl { 28 .pl {
@@ -42,6 +48,9 @@ @@ -42,6 +48,9 @@
42 } 48 }
43 } 49 }
44 } 50 }
  51 + &.no-padding-top {
  52 + padding-top: 0 !important;
  53 + }
45 } 54 }
46 .main-box { 55 .main-box {
47 .section { 56 .section {
src/pages/shopList/shopList.vue
  View file @9f9a7f6
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <div class="shop-list-page" v-if="tabs.list[tabs.active]"> 2 <div class="shop-list-page" v-if="tabs.list[tabs.active]">
3 3
4 <!-- 导航区域 --> 4 <!-- 导航区域 -->
5 - <div class="nav-box" :style="'padding-top: ' + $parent.top.value + 'px'" ref='navBox'> 5 + <div class="nav-box" :class="{'no-padding-top': $route.query.hideBack == true}" :style="'padding-top: ' + $parent.top.value + 'px'" ref='navBox'>
6 6
7 <!-- H5唤起App组件 --> 7 <!-- H5唤起App组件 -->
8 <call-app-box class="call-app-box" ref="callApp" v-if="!isCNLive.value && $parent.isOpenApp.value" 8 <call-app-box class="call-app-box" ref="callApp" v-if="!isCNLive.value && $parent.isOpenApp.value"
@@ -10,13 +10,13 @@ @@ -10,13 +10,13 @@
10 </call-app-box> 10 </call-app-box>
11 11
12 <!-- 后退导航 --> 12 <!-- 后退导航 -->
13 - <back-box class="back-box" :class="{'hide': $route.query.hideBack == true}" v-if="isCNLive.value" @back="back" 13 + <back-box class="back-box" :class="{'is-hide': $route.query.hideBack == true}" v-if="isCNLive.value" @back="back"
14 :backs="backs"> 14 :backs="backs">
15 </back-box> 15 </back-box>
16 </div> 16 </div>
17 17
18 <!-- pl --> 18 <!-- pl -->
19 - <div class="pl" :class="{'is-cnlive': isCNLive.value, 'is-open-app': $parent.isOpenApp.value, 'is-hide': $route.query.hideBack == true, 'tabsFixed': tabs.fixed}" :style="'padding-top: ' + $parent.top.value + 'px'"></div> 19 + <div class="pl" :class="{'is-cnlive': isCNLive.value, 'is-open-app': $parent.isOpenApp.value, 'is-hide': $route.query.hideBack == true, 'tabsFixed': tabs.fixed, 'no-padding-top': $route.query.hideBack == true}" :style="'padding-top: ' + $parent.top.value + 'px'"></div>
20 20
21 <!-- 主区域 --> 21 <!-- 主区域 -->
22 <div class="main-box"> 22 <div class="main-box">