Merge branch 'master' of http://bj.gitlab.cnlive.com/w-front-end/select_good

王强
2 parents da22e283 3182fe4d
Showing 1 changed file with 2 additions and 2 deletions
src/pages/mall/mall.vue
 <template>
-    <div class="mall-box" :style="'margin-top:'+ ($parent.isBack ? 62 : 10)+'px'">
+    <div class="mall-box" :style="'margin-top:'+ ($parent.isBack ? 0 : 10)+'px'">
         <!-- 下拉刷新 -->
         <!-- <van-pull-refresh v-model="isLoading" pulling-text="下拉刷新..." loosing-text="释放刷新" loading-text="加载中..." success-text="刷新成功" @refresh="onRefresh"> -->
         <!-- nav -->
@@ -215,7 +215,7 @@ export default {
         toShare() {
             // 判断分享
             if (typeof this.$parent.toShare === "function") {
-                this.$parent.toShare(37, this.$route.query.id || 0);
+                this.$parent.toShare(38, this.$route.query.id || 0);
             }
         },
         /**