Commit 8f2986b25e3b4fd7a57f4080f6183066b8db3d44

Authored by zhiyangdu
1 parent 4bac3856

优化

src/pages/goodDetails/goodDetails.less
@@ -19,7 +19,6 @@ @@ -19,7 +19,6 @@
19 .back-box{ 19 .back-box{
20 background-color: #FFF; 20 background-color: #FFF;
21 position:fixed; 21 position:fixed;
22 - position: fixed;  
23 } 22 }
24 .goods-img{ 23 .goods-img{
25 display: block; 24 display: block;
src/pages/goodDetails/goodDetails.vue
@@ -148,6 +148,22 @@ export default { @@ -148,6 +148,22 @@ export default {
148 toLink () { 148 toLink () {
149 149
150 }, 150 },
  151 +
  152 + /**
  153 + * 后退
  154 + */
  155 + back () {
  156 + // 判断是否有处理函数
  157 + if (typeof this.$parent.back === 'function') {
  158 +
  159 + // 后退
  160 + this.$parent.back();
  161 + } else {
  162 +
  163 + // 后退
  164 + window.history.go(-1);
  165 + }
  166 + },
151 /** 167 /**
152 * 跳转商品详情 168 * 跳转商品详情
153 * @param {Object} item [数据对象] 169 * @param {Object} item [数据对象]
src/pages/pointsMall/pointsMall.less
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 .back-box{ 20 .back-box{
21 background-color: #FFF; 21 background-color: #FFF;
22 position:fixed; 22 position:fixed;
23 - position: fixed; 23 + z-index:1
24 } 24 }
25 .main_box{ 25 .main_box{
26 width: 100%; 26 width: 100%;
src/pages/pointsMall/pointsMall.vue
1 <template> 1 <template>
2 <div> 2 <div>
3 - <!-- H5唤起App组件 -->  
4 - <call-app-box class="call-app-box" ref="callApp" v-if="!isCNLive.value"  
5 - :callApps="$parent.callApps"> 3 + <!-- H5唤起App组件 -->
  4 + <call-app-box
  5 + class="call-app-box"
  6 + :style="'padding-top: ' + $parent.top.value + 'px'"
  7 + ref="callApp"
  8 + v-if="!isCNLive.value"
  9 + :callApps="$parent.callApps"
  10 + >
6 </call-app-box> 11 </call-app-box>
7 -  
8 - <!-- 后退导航 -->  
9 - <back-box class="back-box" :style="'padding-top: ' + $parent.top.value + 'px'" ref="backBox" v-if="isCNLive.value && $route.query.showBack == true" @back="back"  
10 - :backs="backs"> 12 + <back-box
  13 + v-if="isCNLive.value"
  14 + :class="{'hide': $route.query.hideBack == true}"
  15 + class="back-box"
  16 + :style="'padding-top: ' + $parent.top.value + 'px'"
  17 + @back="back"
  18 + :backs="backs"
  19 + >
11 </back-box> 20 </back-box>
12 -  
13 - <!-- pl -->  
14 - <div class="pl" :class="{'is-cnlive': isCNLive.value && $route.query.showBack == true, 'is-open-app': $parent.isOpenApp.value}"></div> 21 + <!-- pl -->
  22 + <div class="pl" :class="{'is-cnlive': isCNLive.value, 'is-open-app': $parent.isOpenApp.value, 'hide': $route.query.hideBack == true}"></div>
15 <div class="main_box"> 23 <div class="main_box">
16 <div class="top_main"> 24 <div class="top_main">
17 <!-- 头部 --> 25 <!-- 头部 -->