Commit f44d2290 by liujinsa

Merge branch 'nativehome_tst' of http://code.mayi888.com/chengmo/mayi-mp-shop into nativehome_tst

parents d342a3da dd55dc5a
<template> <template>
<div class="domain"> <div class="domain">
<view class="ant-daipinglun">1</view> <!-- <view class="ant-daipinglun">1</view> -->
<!-- <goods-list id="goodsList"></goods-list> --> <!-- <goods-list id="goodsList"></goods-list> -->
<scroll-view @scroll="scrolls" @scrolltolower="scrolltolower" style="height:100vh;" scroll-y="true"> <scroll-view @scroll="scrolls" @scrolltolower="scrolltolower" style="height:100vh;" scroll-y="true">
<div style="position:relative"> <div style="position:relative">
...@@ -65,13 +65,9 @@ import links from '@/components/basicTool/link/index.vue' ...@@ -65,13 +65,9 @@ import links from '@/components/basicTool/link/index.vue'
import interval from '@/components/basicTool/interval/index.vue' import interval from '@/components/basicTool/interval/index.vue'
import partition from '@/components/basicTool/partition/index.vue' import partition from '@/components/basicTool/partition/index.vue'
import shopPopup from '@/components/basicTool/shop-popup/index.vue' import shopPopup from '@/components/basicTool/shop-popup/index.vue'
import { setTabBarActive, checkTabbarPage } from "../../utils/mayi.js"; // import { setTabBarActive, checkTabbarPage } from "../../utils/mayi.js";
export default { export default {
components: {
bottomCont,
ThemeDataPlant
},
data() { data() {
return { return {
pageInfo: {}, pageInfo: {},
...@@ -83,6 +79,8 @@ export default { ...@@ -83,6 +79,8 @@ export default {
interval, interval,
partition, partition,
shopPopup, shopPopup,
bottomCont,
ThemeDataPlant
}, },
onShareAppMessage: function(res) { onShareAppMessage: function(res) {
if (res.from === "button") { if (res.from === "button") {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment