From 0fc751a409f93f8a3c104fb309184418ef8fe4b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=93=E5=B9=B3=E8=89=BA?= <52643018@qq.com>
Date: Fri, 17 Sep 2021 15:07:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E9=A6=96=E9=A1=B5=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=EF=BC=8C=E6=9C=AA=E5=AE=8C=E5=85=A8=E5=AF=B9=E5=AE=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/js/config.js                           |  2 +-
 components/index-coupon/index-coupon.less     | 49 ----------
 components/index-coupon/index-coupon.vue      | 91 -------------------
 components/index-nav/index-nav.vue            |  2 +-
 components/lf-indexFind/lf-indexFind.vue      | 12 ++-
 .../lf-multiColumnAd/lf-multiColumnAd.vue     | 25 ++---
 components/lf-seckill/lf-seckill.vue          | 12 ++-
 pages/index/index/index.vue                   | 66 +++++++-------
 pages/shop/shopdetail.vue                     |  1 -
 9 files changed, 66 insertions(+), 194 deletions(-)
 delete mode 100644 components/index-coupon/index-coupon.less
 delete mode 100644 components/index-coupon/index-coupon.vue

diff --git a/common/js/config.js b/common/js/config.js
index da13764..8c40c53 100644
--- a/common/js/config.js
+++ b/common/js/config.js
@@ -16,7 +16,7 @@ export default  {
 		//https://demo-guojiang-ec-api.guojiang.club/
 		
 		baseUrl: process.env.NODE_ENV === 'development' ? 
-		'http://192.168.43.69/' : 'https://v3-ec-admin-dev.guojiang.club/', // 运行时自动替换变量
+		'http://192.168.3.29/' : 'https://v3-ec-admin-dev.guojiang.club/', // 运行时自动替换变量
     },
 	 PACKAGES: {
         activity: false,
diff --git a/components/index-coupon/index-coupon.less b/components/index-coupon/index-coupon.less
deleted file mode 100644
index 2155308..0000000
--- a/components/index-coupon/index-coupon.less
+++ /dev/null
@@ -1,49 +0,0 @@
-@import '../../common/css/global';
-
-.coupon-warp-box {
-  background: #FFFFFF;
-  overflow:auto;
-  white-space:nowrap;
-  width:100%;
-  padding: 10px 15px;
-  .coupon-item-box {
-    width: 160px;
-    height: 65px;
-    display: inline-block;
-    background: @mainColor;
-    margin-right: 5px;
-    border-radius: 4px;
-    .coupon-item {
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      height: 100%;
-      padding: 5px;
-      color: #FFFFFF;
-      .left {
-        .money {
-          font-size: 10px;
-        }
-        .num {
-          font-size: 30px;
-        }
-      }
-      .right {
-        font-size: 10px;
-        text-align: center;
-        .label {
-
-        }
-        .btn{
-          padding: 2px 10px;
-          border-radius: 3px;
-          background: #FFFFFF;
-          color: @mainColor;
-          margin-top: 5px;
-          box-shadow:0px 2px 4px 0px rgba(0,0,0,0.1);
-        }
-      }
-    }
-  }
-
-}
\ No newline at end of file
diff --git a/components/index-coupon/index-coupon.vue b/components/index-coupon/index-coupon.vue
deleted file mode 100644
index 57a8e60..0000000
--- a/components/index-coupon/index-coupon.vue
+++ /dev/null
@@ -1,91 +0,0 @@
-<template>
-<!--优惠券-->
-<view class="coupon-warp-box" :style="'margin-bottom: ' + meta.margin_bottom + 'px'" v-if="indexCoupon && indexCoupon.length">
-    <view class="coupon-item-box" :style="'background: ' + config.mainColor" v-for="(item, index) in indexCoupon" :key="index">
-        <view class="coupon-item">
-            <view class="left">
-                <block v-if="item.associate.action_type.type == 'cash'">
-                        <span class="money">
-                        ￥
-                    </span>
-                    <span class="num">
-                       {{ item.associate.action_type.value }}
-                    </span>
-                </block>
-
-                <block v-if="item.associate.action_type.type == 'discount'">
-                        <span class="num">
-                        {{ item.associate.action_type.value }}
-                    </span>
-                    <span class="money">
-                        折
-                    </span>
-                </block>
-            </view>
-            <view class="right">
-                <view class="label">
-                    {{item.associate.title}}
-                </view>
-                <view class="btn" :style="'color: ' + config.mainColor" :data-code="item.associate.code" :data-index="index" v-if="!item.associate.has_get" @tap="getCoupon">
-                    点击领取
-                </view>
-                <view class="btn" :data-id="item.associate_id" v-else catchtap="_jumpList">
-                    去使用
-                </view>
-            </view>
-        </view>
-    </view>
-</view>
-</template>
-<script>
-
-export default {
-  data() {
-    return {};
-  },
-
-  props: {
-	  config: {
-	    type: Object,
-	    value: ''
-	  },
-	  indexCoupon: {
-	    type: Array,
-	    value: ''
-	  },
-	  show: {
-	    type: Number,
-	    value: ''
-	  },
-	  meta: {
-	    type: Object,
-	    value: ""
-	  } 
-  },
-    //组件的方法
-    methods: {
-      //分发事件出去
-      getCoupon(e) {
-        var code = e.currentTarget.dataset.code;
-        var index = e.currentTarget.dataset.index;
-        var myEventDetail = {
-          code: code,
-          index: index
-        };
-        this.$emit('myGetCoupon', myEventDetail);
-      },
-
-      _jumpList(e) {
-        var id = e.currentTarget.dataset.id;
-        wx.navigateTo({
-          url: '/pages/coupon/goods/goods?id=' + id
-        });
-      }
-
-    }
-};
-</script>
-
-<style rel="stylesheet/less" lang="less">
-@import "index-coupon";
-</style>
\ No newline at end of file
diff --git a/components/index-nav/index-nav.vue b/components/index-nav/index-nav.vue
index a913f3e..8a46e01 100644
--- a/components/index-nav/index-nav.vue
+++ b/components/index-nav/index-nav.vue
@@ -3,7 +3,7 @@
 <view class="quick-nav" :style="'margin-bottom: ' + meta.margin_bottom + 'px'">
    <scroll-view :scroll-x="true" class="scroll-view" @scroll="scroll">
 	   <view class="nav-content">
-	       <view class="nav-item" v-for="(item, index) in list" :key="index"  @tap="_jumpImg" :data-src="item.link">
+	       <view class="nav-item" v-for="(item, index) in navData" :key="index"  @tap="_jumpImg" :data-src="item.link">
 	           <view class="top-info">
 	               <image :src="item.image"></image>
 	           </view>
diff --git a/components/lf-indexFind/lf-indexFind.vue b/components/lf-indexFind/lf-indexFind.vue
index dbe0f3f..d0bf638 100644
--- a/components/lf-indexFind/lf-indexFind.vue
+++ b/components/lf-indexFind/lf-indexFind.vue
@@ -6,9 +6,9 @@
 				<!-- :class="{'max-item': index == 0}"  -->
 				<view class="find-item" 
 					@click="$url('/pages/discover/discoverdetails')"
-					v-for="(item, index) in 5" :key="index">
-					<image class="img" src="https://picsum.photos/200/300"></image>
-					<view class="lf-line-2 info">南边开，风儿吹，北边放，花儿开，西边来，春归去，东边来，北边跑</view>
+					v-for="(item, index) in list" :key="index">
+					<image class="img" :src="item.image"></image>
+					<view class="lf-line-2 info">{{ item.associate.title }}</view>
 				</view>
 			</view>
 			<view style="height: 10rpx;"></view>
@@ -18,6 +18,12 @@
 
 <script>
 	export default {
+		props: {
+			list: {
+				type: Array,
+				default: []
+			}
+		},
 		data(){
 			return {
 				current: 0
diff --git a/components/lf-multiColumnAd/lf-multiColumnAd.vue b/components/lf-multiColumnAd/lf-multiColumnAd.vue
index 50db0fb..2aa7ee0 100644
--- a/components/lf-multiColumnAd/lf-multiColumnAd.vue
+++ b/components/lf-multiColumnAd/lf-multiColumnAd.vue
@@ -1,14 +1,14 @@
 <template>
 	<view class="content">
-		<view class="left" @click="$url('/pages/index/list/selected')">
-			<image class="left-img"></image>
+		<view class="left" @click="$url(cubeData[0].link)">
+			<image class="left-img" :src="cubeData[0].image"></image>
 		</view>
 		<view class="right">
-			<view class="right-img" @click="$msg('敬请期待')">
-				<image></image>
+			<view class="right-img" @click="$url(cubeData[1].link)">
+				<image :src="cubeData[1].image"></image>
 			</view>
-			<view class="right-img" @click="$msg('敬请期待')">
-				<image></image>
+			<view class="right-img" @click="$url(cubeData[2].link)">
+				<image :src="cubeData[2].image"></image>
 			</view>
 		</view>
 	</view>
@@ -16,16 +16,11 @@
 
 <script>
 	export default {
-		data(){
-			return {
-				
+		props: {
+			cubeData: {
+				type: Array,
+				default: []
 			}
-		},
-		created(){
-			
-		},
-		methods: {
-			
 		}
 	}
 </script>
diff --git a/components/lf-seckill/lf-seckill.vue b/components/lf-seckill/lf-seckill.vue
index e2ad621..def0997 100644
--- a/components/lf-seckill/lf-seckill.vue
+++ b/components/lf-seckill/lf-seckill.vue
@@ -2,7 +2,7 @@
 	<view class="content">
 		<view class="title">剁手不心疼</view>
 		<view class="card" @click="$url('/pages/shop/seckillList')">
-			<view class="title">秒杀购</view>
+			<view class="title">{{ title || '秒杀购' }}</view>
 			<view class="desc">低价不等人，快来秒杀啦～</view>
 			<scroll-view class="scroll-view" :scroll-x="true">
 				<view class="lf-flex">
@@ -22,6 +22,16 @@
 
 <script>
 	export default {
+		props: {
+			list: {
+				type: Array,
+				default: []
+			},
+			title: {
+				type: String,
+				default: ''
+			}
+		},
 		data(){
 			return {
 				
diff --git a/pages/index/index/index.vue b/pages/index/index/index.vue
index 02a6681..30fb105 100644
--- a/pages/index/index/index.vue
+++ b/pages/index/index/index.vue
@@ -22,6 +22,7 @@
 			<!-- #endif -->
 		    <block v-if="microData && microData.pages && microData.pages.length">
 		        <view v-for="(item, index) in microData.pages" :key="index">
+					<!-- 菜单按钮和搜索按钮 -->
 		            <!-- <view v-if="item.name == 'micro_page_componet_search'">
 		                <view class="banner">
 		                    <view class="search">
@@ -38,17 +39,23 @@
 		                <indexBanner :banner-data="item.value" :banner-title="item.title" :screen-width="screenWidth" :show="item.is_show_title" :meta="item.meta"></indexBanner>
 		            </view>
 		            <!--优惠券组件-->
-		           <view v-if="item.name == 'micro_page_componet_coupon' && item.value && item.value.length">
+		           <!-- <view v-if="item.name == 'micro_page_componet_coupon' && item.value && item.value.length">
 		                <indexCoupon :index-coupon="item.value" :config="config" @myGetCoupon="getCoupon" :show="item.is_show_title" :meta="item.meta"></indexCoupon>
-		            </view>
+		            </view> -->
+					<!--快捷导航-->
+					<view v-if="item.name == 'micro_page_componet_nav' && item.value && item.value.length">
+						<indexNav :nav-data="item.value" :meta="item.meta"></indexNav>
+					</view>
+					
+					
 		            <!--套餐-->
 		            <view v-if="item.name == 'micro_page_componet_suit' && item.value && item.value.length">
 		                <indexSuit :suit-data="item.value" :index-data="indexData" :show="item.is_show_title" :meta="item.meta"></indexSuit>
 		            </view>
 		            <!--大咖推荐-->
-		            <view v-if="item.name == 'micro_page_componet_article_-' && item.value && item.value.length">
+		           <!-- <view v-if="item.name == 'micro_page_componet_article_-' && item.value && item.value.length">
 		                <bigCoffee :coffee-data="item.value" :coffee-title="item.title" :show="item.is_show_title" :meta="item.meta"></bigCoffee>
-		            </view>
+		            </view> -->
 		            <!--专属方案-->
 		            <view v-if="item.name == 'micro_page_componet_article_|' && item.value && item.value.length">
 		                <exclusivePlan :plan-data="item.value" :plan-title="item.title" :show="item.is_show_title" :meta="item.meta"></exclusivePlan>
@@ -58,26 +65,23 @@
 		                <healthTips :health-data="item.value" :title="item.title" :show="item.is_show_title" :meta="item.meta"></healthTips>
 		            </view>
 		            <!--猜你喜欢-->
-		            <view v-if="item.name == 'micro_page_componet_guess_like' && item.value && item.value.length">
+		            <!-- <view v-if="item.name == 'micro_page_componet_guess_like' && item.value && item.value.length">
 		                <waterfallsFlow :water-data="item.value" :title="item.title" :show="item.is_show_title" :meta="item.meta"></waterfallsFlow>
-		            </view>
+		            </view> -->
 		            <!--拼团-->
 		            <view v-if="item.name == 'micro_page_componet_groupon' && item.value && item.value.length">
 		                <indexGroupon :index-data="item.value" :config="config" :server="microData.server_time" typename="拼团" :meta="item.meta"></indexGroupon>
 		            </view>
 		            <!--秒杀-->
-		            <view v-if="item.name == 'micro_page_componet_seckill' && item.value && item.value.length">
+		            <!-- <view v-if="item.name == 'micro_page_componet_seckill' && item.value && item.value.length">
 		                <indexSeckill :index-data="item.value" :config="config" :server="microData.server_time" :big-index="index" @:startevent="isStarts" @:endevent="isEnd"
 		                              :meta="item.meta"></indexSeckill>
-		            </view>
+		            </view> -->
 					<!--打call indexCall-->
 					<view v-if="item.name == 'micro_page_componet_free_event' && item.value && item.value.length">
 						<indexCall :call-data="item.value" :config="config" :is-login="isLogin" :server="microData.server_time" :meta="item.meta"></indexCall>
 					</view>
-					 <!--快捷导航-->
-					<view v-if="item.name == 'micro_page_componet_nav' && item.value && item.value.length">
-						<indexNav :nav-data="item.value" :meta="item.meta"></indexNav>
-					</view>
+					
 					<!-- 今日头条 TODO 暂时借用快捷导航字段判断 -->
 					<view class="fuwu-tips" v-if="item.name == 'micro_page_componet_nav' && item.value && item.value.length">
 						<view class="fuwu-tips-title">今日头条</view>
@@ -91,39 +95,39 @@
 					<view class="lf-activity" v-if="item.name == 'micro_page_componet_nav' && item.value && item.value.length" @click="$url('/pages/index/activity/goods')">
 						<image src="https://picsum.photos/200" mode="aspectFill"></image>
 					</view>
-					<!-- TODO 新做秒杀模块 -->
-					<view v-if="item.name == 'micro_page_componet_nav' && item.value && item.value.length">
-						<lf-seckill></lf-seckill>
+					<!-- TODO 新做秒杀模块,根据旧版秒杀修改 -->
+					<view v-if="item.name == 'micro_page_componet_seckill' && item.value && item.value.length">
+						<lf-seckill :list="item.value" :title="item.title"></lf-seckill>
 					</view>
-					<!-- TODO 广告活动模块 -->
-					<view v-if="item.name == 'micro_page_componet_nav' && item.value && item.value.length">
-						<lf-multi-column-ad></lf-multi-column-ad>
+					<!-- TODO 广告活动模块，根据旧版魔方修改 -->
+					<view v-if="item.name == 'micro_page_componet_cube' && item.value && item.value.length">
+						<lf-multi-column-ad :cube-data="item.value"></lf-multi-column-ad>
 					</view>
-					<!-- TODO 首页发现推荐模块 -->
-					<view v-if="item.name == 'micro_page_componet_nav' && item.value && item.value.length">
-						<lf-index-find></lf-index-find>
+					<!-- TODO 首页发现推荐模块，根据大咖推荐文章修改 -->
+					<view v-if="item.name == 'micro_page_componet_article_-' && item.value && item.value.length">
+						<lf-index-find :list="item.value"></lf-index-find>
 					</view>
 					<!-- TODO 大牌不停推模块 - 店铺矩阵 -->
 					<view v-if="item.name == 'micro_page_componet_nav' && item.value && item.value.length">
 						<lf-index-shop-matrix></lf-index-shop-matrix>
 					</view>
-					<!-- TODO 店铺商品展示模块 -->
-					<view v-if="item.name == 'micro_page_componet_nav' && item.value && item.value.length">
+					<!-- TODO 店铺商品展示模块 可根据micro_page_componet_category修改 -->
+					<view v-if="item.name == 'micro_page_componet_category' && item.value && item.value.length">
 						<view class="lf-module-title" @click="$url('/pages/shop/goodsSpecial')">好物种草间</view>
-						<lf-shop-goods-card v-for="(d_item,d_index) in 2" :key="d_index"></lf-shop-goods-card>
+						<lf-shop-goods-card v-for="(d_item,d_index) in item.value" :key="d_index"></lf-shop-goods-card>
 					</view>
 					 <!--图片魔方-->
-					<view v-if="item.name == 'micro_page_componet_cube' && item.value && item.value.length">
+					<!-- <view v-if="item.name == 'micro_page_componet_cube' && item.value && item.value.length">
 					    <indexCube :cube-data="item.value" :show-type="item.type" :cube-title="item.title" :show="item.is_show_title" :meta="item.meta" :is-agent="userInfo.is_agent"></indexCube>
-					</view>
+					</view> -->
 					  <!--分类商品-->
-					<view v-if="item.name == 'micro_page_componet_category' && item.value && item.value.length">
+					<!-- <view v-if="item.name == 'micro_page_componet_category' && item.value && item.value.length">
 						<indexCategory :category-data="item.value" :meta="item.meta"></indexCategory>
-					</view>
+					</view> -->
 					 <!--商品分组-->
-					<view v-if="item.name == 'micro_page_componet_goods_group' && item.value && item.value.length">
+					<!-- <view v-if="item.name == 'micro_page_componet_goods_group' && item.value && item.value.length">
 						<indexGrouping :grouping-data="item.value" :meta="item.meta"></indexGrouping>
-					</view>
+					</view> -->
 					<!-- TODO 为你推荐模块 -->
 					<view v-if="item.name == 'micro_page_componet_nav' && item.value && item.value.length">
 						<view class="lf-module-title">为你推荐</view>
@@ -396,7 +400,6 @@
     import {pageLogin, getUrl,config,isBirthday,autoLogin} from '@/common/js/utils.js';
     import indexBanner from '@/components/index-banner/index-banner';
     import indexCube from '@/components/index-cube/index-cube';
-    import indexCoupon from '@/components/index-coupon/index-coupon';
     import indexSuit from '@/components/index-suit/index-suit';
     import bigCoffee from '@/components/big-coffee/big-coffee';
     import exclusivePlan from "@/components/exclusive-plan/exclusive-plan";
@@ -508,7 +511,6 @@
         components: {
             indexBanner,
             indexCube,
-            indexCoupon,
             indexSuit,
             bigCoffee,
             exclusivePlan,
diff --git a/pages/shop/shopdetail.vue b/pages/shop/shopdetail.vue
index 933754b..dde7137 100644
--- a/pages/shop/shopdetail.vue
+++ b/pages/shop/shopdetail.vue
@@ -209,7 +209,6 @@
 							title: item.name
 						}
 					})
-					// TODO 检查list是否正常
 					if(tab_item.page == 1){
 						tab_item.list = list;
 					}else{