增加装修功能

api/public.js

@@ -8,6 +8,14 @@ export function getHomeData() {
   return request.get("index", {}, { login: false });
 }
 
+/**
+ * 首页
+ * @returns {*}
+ */
+export function getCanvas() {
+  return request.get("/getCanvas?terminal=3", {}, { login: false });
+}
+
 /**
  * 文章 轮播列表
  * @returns {*}

config/index.js

@@ -2,7 +2,8 @@
 // export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api';
 // export const VUE_APP_API_URL = 'https://wxapi.yixiang.co/api';
 // export const VUE_APP_API_URL = 'http://192.168.31.223:8008/api';
- export const VUE_APP_API_URL = 'https://tapi.xinxintuan.co/api';
+ export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api';
+ // export const VUE_APP_API_URL = 'https://tapi.xinxintuan.co/api';
 //  export const VUE_APP_API_URL = 'https://h5api.xinxintuan.co/api';
 // export const VUE_APP_API_URL = 'https://h5api.xinxintuan.co/api';
 export const VUE_APP_RESOURCES_URL = 'https://wx.yixiang.co/static';

package-lock.json

@@ -287,6 +287,11 @@
       "resolved": "https://registry.npm.taobao.org/ms/download/ms-2.1.2.tgz",
       "integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk="
     },
+    "mutation-observer": {
+      "version": "1.0.3",
+      "resolved": "http://192.168.1.56:8081/repository/npm-public/mutation-observer/-/mutation-observer-1.0.3.tgz",
+      "integrity": "sha1-QukiKxAbyoLlup1aes9KFMDyY9A="
+    },
     "normalize-url": {
       "version": "4.5.0",
       "resolved": "https://registry.npm.taobao.org/normalize-url/download/normalize-url-4.5.0.tgz?cache=0&sync_timestamp=1596373090568&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fnormalize-url%2Fdownload%2Fnormalize-url-4.5.0.tgz",
@@ -399,6 +404,11 @@
       "resolved": "https://registry.npm.taobao.org/to-readable-stream/download/to-readable-stream-1.0.0.tgz",
       "integrity": "sha1-zgqgwvPfat+FLvtASng+d8BHV3E="
     },
+    "transitionEnd": {
+      "version": "1.0.2",
+      "resolved": "http://192.168.1.56:8081/repository/npm-public/transitionEnd/-/transitionEnd-1.0.2.tgz",
+      "integrity": "sha1-GRTbW0Wn79w0oBr2koWjppOHFjM="
+    },
     "url-parse-lax": {
       "version": "3.0.0",
       "resolved": "https://registry.npm.taobao.org/url-parse-lax/download/url-parse-lax-3.0.0.tgz",
@@ -407,6 +417,15 @@
         "prepend-http": "^2.0.0"
       }
     },
+    "vconsole": {
+      "version": "3.4.0",
+      "resolved": "http://192.168.1.56:8081/repository/npm-public/vconsole/-/vconsole-3.4.0.tgz",
+      "integrity": "sha1-LPL/qobNerc2mXoitj0FYnxqtWc=",
+      "requires": {
+        "mutation-observer": "^1.0.3",
+        "transitionEnd": "^1.0.2"
+      }
+    },
     "vue": {
       "version": "2.6.12",
       "resolved": "https://registry.npm.taobao.org/vue/download/vue-2.6.12.tgz",

pages/home/index.vue

@@ -1,34 +1,14 @@
 <template>
 	<view class="index">
-    <!-- 导航栏 -->
+		<view v-for="(item,index) in homeData" :key="index">
-    <!--		<view class="head_box " :style="{ background: bgcolor }" :class="{ active: bgcolor }">-->
+			<view class="head_box" v-if="item.type=='header'" :style="{ background: bgcolor }" :class="{ active: bgcolor }">
-    <!--			<view class="cu-custom" :style="[{height:CustomBar+ 'px',}]">-->
-    <!--				<view class="cu-bar fixed" :style="customStyle" :class="[bgcolor]">-->
-    <!--					<view class="action">-->
-    <!--						<text class="nav-title Shop-selector-rect">{{ 'yshop商城' }}</text>-->
-    <!--					</view>-->
-    <!--					<view class="content" :style="[{top:StatusBar + 'px'}]">-->
-
-    <!--					</view>-->
-    <!--				</view>-->
-    <!--			</view>-->
-    <!--		</view>-->
-
-    <view
-      class="head_box"
-      :style="{ background: bgcolor }"
-      :class="{ active: bgcolor }"
-    >
 				<cu-custom :isBack="true" :bgColor="bgcolor">
 					<block slot="backText">
-          <text class="nav-title shopro-selector-rect">{{ "YSHOP商城" }}</text>
+						<text class="nav-title shopro-selector-rect">{{ item.componentContent.title }}</text>
 					</block>
 				</cu-custom>
 			</view>
-    <view
+			<view class="header header-search acea-row row-center-wrapper" v-if="item.type=='search'" :style="{ background: bgcolor }">
-      class="header header-search acea-row row-center-wrapper"
-      :style="{ background: bgcolor }"
-    >
 				<view @click="goGoodSearch()" class="search acea-row row-middle">
 					<text class="iconfont icon-xiazai5"></text>
 					搜索商品
@@ -37,54 +17,43 @@
 					<image src="@/static/images/qr.png" />
 				</view>
 			</view>
-    <Banner
+			<Banner v-if="item.type=='banner'" :detail="item.componentContent.bannerData" @getbgcolor="getbgcolor"></Banner>
-      :detail="banner"
+			<uni-notice-bar v-if="item.type=='noticeBar'" scrollable="true" @click="goRoll(item.componentContent.roll[0])" single="true" :speed="10"
-      v-if="banner.length > 0"
+			 showIcon="true" :text="item.componentContent.roll[0].info"></uni-notice-bar>
-      @getbgcolor="getbgcolor"
-    ></Banner>
-    <uni-notice-bar
-      scrollable="true"
-      @click="goRoll(singNew)"
-      single="true"
-      :speed="10"
-      showIcon="true"
-      :text="singNew.info"
-    ></uni-notice-bar>
 			<view class="content_box home_content_box">
 				<!-- 菜单 -->
-      <Menu :list="menus"></Menu>
+				<Menu :list="item.componentContent.menus" v-if="item.type=='menu'"></Menu>
 				<!-- 滚动新闻 -->
 				<!-- 广告 -->
-      <Adv />
+				<Adv v-if="item.type=='adv'" />
 				<!-- 热门榜单 -->
-      <HotCommodity :detail="likeInfo"></HotCommodity>
+				<HotCommodity v-if="item.type=='hotCommodity'" :detail="likeInfo"></HotCommodity>
 				<!-- 超值拼团 -->
-      <Groupon :detail="combinationList" />
+				<Groupon v-if="item.type=='groupon'" :detail="combinationList" />
 				<!-- 首发新品->秒杀 -->
-      <!-- <FirstNewProduct :detail="firstList"></FirstNewProduct> -->
+				<FirstNewProduct v-if="item.type=='firstNewProduct'" :detail="firstList"></FirstNewProduct>
 				<!-- 精品推荐 -->
-      <!-- <ProductsRecommended :detail="bastList"></ProductsRecommended> -->
+				<ProductsRecommended v-if="item.type=='productsRecommended'" :detail="bastList"></ProductsRecommended>
-      <!-- 促销单品
+				<!-- 促销单品 -->
-			<PromoteProduct :detail="benefit"></PromoteProduct> -->
+				<PromoteProduct v-if="item.type=='promoteProduct'" :detail="benefit"></PromoteProduct>
 				<!-- 直播 -->
 				<!-- #ifdef MP-WEIXIN -->
-      <Live :detail="live"></Live>
+				<Live v-if="item.type=='live'" :detail="live"></Live>
 				<!-- #endif -->
-
 				<!-- 为您推荐 -->
-      <PromotionGood :benefit="benefit"></PromotionGood>
+				<PromotionGood v-if="item.type=='promotionGood'" :benefit="benefit"></PromotionGood>
 			</view>
-    <Coupon-window
+			<Coupon-window :coupon-list="couponList" v-if="showCoupon" @checked="couponClose" @close="couponClose">
-      :coupon-list="couponList"
-      v-if="showCoupon"
-      @checked="couponClose"
-      @close="couponClose"
-    >
 			</Coupon-window>
 		</view>
+	</view>
 </template>
 <script>
-import { mapState, mapMutations, mapActions } from "vuex";
+	import {
+		mapState,
+		mapMutations,
+		mapActions
+	} from "vuex";
 	import GoodList from "@/components/GoodList";
 	import PromotionGood from "@/components/PromotionGood";
 	import CouponWindow from "@/components/CouponWindow";
@@ -99,9 +68,16 @@ import FirstNewProduct from "./components/FirstNewProduct";
 	import ProductsRecommended from "./components/ProductsRecommended";
 	import Live from "./components/Live";
 
-import { getHomeData, getShare } from "@/api/public";
+	import {
+		getHomeData,
+		getShare,
+		getCanvas
+	} from "@/api/public";
 	import cookie from "@/utils/store/cookie";
-import { isWeixin, handleUrlParam } from "@/utils/index";
+	import {
+		isWeixin,
+		handleUrlParam
+	} from "@/utils/index";
 
 	import {
 		openShareAll,
@@ -130,6 +106,7 @@ export default {
 		props: {},
 		data: function() {
 			return {
+				homeData: [],
 				CustomBar: this.CustomBar,
 				StatusBar: this.StatusBar,
 				formatMenus: [],
@@ -233,15 +210,16 @@ export default {
 		onLoad: function() {
 			this.getLocation();
 			let that = this;
-    uni.showLoading({
+			// uni.showLoading({
-      title: "加载中",
+			//   title: "加载中",
-    });
+			// });
+			getCanvas().then(res => {
+			}).catch(error => {
+				this.homeData = JSON.parse(error.data.json)
+			})
 			getHomeData().then((res) => {
 			  that.logoUrl = res.data.logoUrl;
 			  res.data.banner.map((item) => (item.bgcolor = item.color || ""));
-      that.$set(that, "banner", res.data.banner);
-      that.$set(that, "menus", res.data.menus);
-      that.$set(that, "roll", res.data.roll);
 			  that.$set(that, "info", res.data.info);
 			  that.$set(that, "firstList", res.data.firstList);
 			  that.$set(that, "bastList", res.data.bastList);
@@ -460,8 +438,7 @@ export default {
 		margin-top: -10rpx;
 	}
 
-.head_box {
+	.head_box {}
-}
 
 	.nav-title {
 		margin-left: 20rpx;