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

王强
2 parents 5f55c435 9f3d916d
Showing 2 changed files with 35 additions and 6 deletions
src/main.js
src/pages/mall/mall.vue
@@ -9,7 +9,7 @@ import { Toast, Indicator,InfiniteScroll } from &quot;mint-ui&quot;;
 import { Rate, Popup, Lazyload, Search, PullRefresh, Picker, Image, ImagePreview, Tab, Tabs} from "vant";
 import App from "./App";
 import IdCard from './common/IdCard';
-import VueClipboard from 'vue-clipboard2'
+import VueClipboard from 'vue-clipboard2';
 import VueBus from 'vue-bus';
 Vue.use(Vuex);
 Vue.use(VueResource);
@@ -50,7 +50,7 @@ import &#39;url-search-params-polyfill&#39;;
 Vue.config.productionTip = false;
  
 // 部署模式设置（开发模式："dev"，测试模式："test"，生产模式："prod"）
-Vue.prototype.mode = "dev";
+Vue.prototype.mode = "test";
  
 // 微信JS-SDK对象
 Vue.prototype.jweixin = {
@@ -3,15 +3,23 @@
         <!-- 下拉刷新 -->
         <!-- <van-pull-refresh v-model="isLoading" pulling-text="下拉刷新..." loosing-text="释放刷新" loading-text="加载中..." success-text="刷新成功" @refresh="onRefresh"> -->
         <!-- nav -->
-        <!-- nav -->
-        <!-- <back-box
+        <!-- H5唤起App组件 -->
+        <call-app-box
+            class="call-app-box"
+            :style="'padding-top: ' + $parent.top.value + 'px'"
+            ref="callApp"
+            v-if="!isCNLive.value"
+            :callApps="$parent.callApps"
+        >
+        </call-app-box>
+        <back-box
             v-if="$parent.isBack && $parent.isCNLive.value"
             class="back-box"
             :style="'padding-top: ' + $parent.top.value + 'px'"
             @back="back"
             :backs="backs"
         >
-        </back-box> -->
+        </back-box>
         <!--轮播-->
         <swiper
             v-if="banner"
@@ -86,6 +94,7 @@
 <script>
 // 引入组件
 import { Toast, Indicator } from "mint-ui";
+import callAppBox from "@/components/callAppBox/callAppBox";
 import swiper from "@/components/swiper/swiper";
 import swiperItem from "@/components/swiperItem/swiperItem";
 import discountZone from "@/components/discountZone/discountZone";
@@ -118,7 +127,8 @@ export default {
         style7,
         horizList,
         tabBox,
-        backBox
+        backBox,
+        callAppBox
     },
     created() {
         // 获取优选库精选活动
@@ -147,6 +157,25 @@ export default {
             });
         }
     },
+    mounted() {
+        // 唤起详情页
+        if (typeof this.$parent.getOpenApp === "function") {
+            this.$parent.getOpenApp({
+                type: 38,
+                id: this.$route.query.id || 0,
+                url: ""
+            });
+        }
+
+        // 分享详情页
+        if (typeof this.$parent.getShareData === "function") {
+            this.$parent.getShareData({
+                type: 38,
+                id: this.$route.query.id || 0,
+                url: ""
+            });
+        }
+    },
     methods: {
         // 下拉刷新
         // onRefresh() {