From e5943b0f4a4debf9d73a0c47130f1450d789cfee 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, 10 Sep 2021 16:30:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=95=86=E5=93=81=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=A1=B5UI=EF=BC=8C=E5=88=A4=E6=96=AD=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E6=99=AE=E9=80=9A=E5=95=86=E5=93=81=EF=BC=8C=E7=A7=92?=
 =?UTF-8?q?=E6=9D=80=E5=95=86=E5=93=81=EF=BC=8C=E5=85=91=E6=8D=A2=E5=95=86?=
 =?UTF-8?q?=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lf-shopGoodsCard/lf-shopGoodsCard.vue     |  2 +-
 .../lf-waterfall-pointgoods/lf-waterfall.vue  |  2 +-
 .../lf-waterfall-shopdetails/lf-waterfall.vue |  2 +-
 pages/index/list/monthlyList.vue              |  2 +-
 pages/index/list/selected.vue                 |  2 +-
 pages/shop/goodsdetail.vue                    | 90 +++++++++++++++++--
 pages/shop/seckillList.vue                    |  2 +-
 7 files changed, 88 insertions(+), 14 deletions(-)

diff --git a/components/lf-shopGoodsCard/lf-shopGoodsCard.vue b/components/lf-shopGoodsCard/lf-shopGoodsCard.vue
index 163662e..3bd28b8 100644
--- a/components/lf-shopGoodsCard/lf-shopGoodsCard.vue
+++ b/components/lf-shopGoodsCard/lf-shopGoodsCard.vue
@@ -5,7 +5,7 @@
 		</view>
 		<scroll-view class="scroll-view" :scroll-x="true">
 			<view class="scroll-content">
-				<view class="goods-item" v-for="(item, index) in 5" :key="index" @click="$url('/pages/shop/goodsdetail')">
+				<view class="goods-item" v-for="(item, index) in 5" :key="index" @click="$url('/pages/shop/goodsdetail?type=mail')">
 					<image class="goods-img"></image>
 					<view class="goods-info">
 						<view class="lf-line-1">猪大肠卖咯 5毛钱一斤咯</view>
diff --git a/components/lf-waterfall-pointgoods/lf-waterfall.vue b/components/lf-waterfall-pointgoods/lf-waterfall.vue
index b54ecbd..1e523b0 100644
--- a/components/lf-waterfall-pointgoods/lf-waterfall.vue
+++ b/components/lf-waterfall-pointgoods/lf-waterfall.vue
@@ -119,7 +119,7 @@
 		},
 		methods: {
 			onClick(id){
-				this.$url('/pages/shop/goodsdetail?goods_id='+id);
+				this.$url('/pages/shop/goodsdetail?type=point&goods_id='+id);
 				this.$emit('click');
 			},
 			goAd(type,url){
diff --git a/components/lf-waterfall-shopdetails/lf-waterfall.vue b/components/lf-waterfall-shopdetails/lf-waterfall.vue
index afe6314..582cd9a 100644
--- a/components/lf-waterfall-shopdetails/lf-waterfall.vue
+++ b/components/lf-waterfall-shopdetails/lf-waterfall.vue
@@ -121,7 +121,7 @@
 		},
 		methods: {
 			onClick(id){
-				this.$url('/pages/shop/goodsdetail?goods_id='+id);
+				this.$url('/pages/shop/goodsdetail?type=mail&goods_id='+id);
 				this.$emit('click');
 			},
 			goAd(type,url){
diff --git a/pages/index/list/monthlyList.vue b/pages/index/list/monthlyList.vue
index f38d16c..4ddc690 100644
--- a/pages/index/list/monthlyList.vue
+++ b/pages/index/list/monthlyList.vue
@@ -6,7 +6,7 @@
 			<view class="title">热销榜单</view>
 		</view>
 		<view class="content">
-			<view class="card" v-for="(item, index) in 7" :key="index" @click="$url('/pages/shop/goodsdetail')">
+			<view class="card" v-for="(item, index) in 7" :key="index" @click="$url('/pages/shop/goodsdetail?type=mail')">
 				<view class="goods-img">
 					<image class="img" src="https://picsum.photos/200/300"></image>
 					<view class="ranking">{{ item+1 }}</view>
diff --git a/pages/index/list/selected.vue b/pages/index/list/selected.vue
index 9f08004..eac7f41 100644
--- a/pages/index/list/selected.vue
+++ b/pages/index/list/selected.vue
@@ -10,7 +10,7 @@
 				<view class="title" @click="$url('/pages/index/list/monthlyList')">灯具榜 ></view>
 				<scroll-view class="scroll-view" :scroll-x="true">
 					<view class="scroll-content">
-						<view class="goods-item" v-for="(item, index) in 5" :key="index" @click="$url('/pages/shop/goodsdetail')">
+						<view class="goods-item" v-for="(item, index) in 5" :key="index" @click="$url('/pages/shop/goodsdetail?type=mail')">
 							<view class="goods-img">
 								<image class="img"></image>
 								<view class="ranking">{{ item+1 }}</view>
diff --git a/pages/shop/goodsdetail.vue b/pages/shop/goodsdetail.vue
index 0bfa627..7569939 100644
--- a/pages/shop/goodsdetail.vue
+++ b/pages/shop/goodsdetail.vue
@@ -7,23 +7,46 @@
 				<swiper :current="current" :indicator-dots="2 > 1 ? false : true" :circular="true" class="swiper-box" indicator-active-color="#1998FE">
 					<swiper-item v-for="(item, index) in pictures" :key="index">
 						<image mode="aspectFill" :src="item" style="width: 100%; height: 100%;" @click="lookImg(index)"></image>
+						<view class="seckill-box" v-if="type == 'seckill'">
+							<view>距离结束还剩余</view>
+							<view>
+								<countdown-timer :time="time" :autoStart="true">
+									<template v-slot="{hour, minute, second}">
+										<view class="lf-flex">
+											<view>{{ hour >= 10 ? hour : "0" + hour }}</view>
+											<view>时</view>
+											<view>{{ minute >= 10 ? minute : "0" + minute }}</view>
+											<view>分</view>
+											<view>{{ second >= 10 ? second : "0" + second }}</view>
+											<view>秒</view>
+										</view>
+									</template>
+								</countdown-timer>
+							</view>
+						</view>
 					</swiper-item>
 				</swiper>
 				<!-- 商品主要信息 -->
 				<view class="head-info">
 					<view class="lf-row-between">
-						<lf-price :iftext="false" :price="111"></lf-price>
+						<view v-if="type == 'point'">
+							<text class="lf-font-48 lf-color-primary lf-font-bold">8493</text>
+							<text class="lf-font-28 lf-color-777 lf-m-l-10">个兑换</text>
+						</view>
+						<lf-price :iftext="false" :price="111" v-else></lf-price>
 						<text class="lf-iconfont icon-fenxiang lf-font-40" @click="shareGraphic()"></text>
 					</view>
 					<view class="lf-row-between lf-font-24 lf-m-t-20 lf-p-b-20">
 						<view class="lf-font-bold lf-font-32 lf-color-222">颐莲喷雾 500ml</view>
 					</view>
 					<view class="lf-row-between lf-font-24 lf-p-b-30">
-						<view class="lf-font-28 lf-color-777">门店自提</view>
+						<view class="lf-font-28 lf-color-777" v-if="type == 'self'">门店自提</view>
+						<view class="lf-font-28 lf-color-777 lf-row-between" v-else>可自提/可邮寄</view>
+						<view v-if="type == 'seckill'">已有38人购买</view>
 					</view>
 				</view>
 				<self-line></self-line>
-				<view class="bg-white">
+				<view class="bg-white" v-if="type == 'self'">
 					<view class="cu-bar padding-lr">
 						<view class="lf-flex">
 							<text class="lf-color-777 lf-font-28">优惠</text>
@@ -40,7 +63,7 @@
 					</view>
 				</view>
 				<self-line></self-line>
-				<view class="bg-white">
+				<view class="bg-white" v-if="type == 'self'">
 					<view class="cu-bar padding-lr">
 						<view class="lf-flex">
 							<text class="lf-color-777 lf-font-28">服务</text>
@@ -56,6 +79,30 @@
 						</view>
 					</view>
 				</view>
+				<block v-else>
+					<view class="bg-white">
+						<view class="cu-bar padding-lr">
+							<view class="lf-flex">
+								<view class="lf-color-777 lf-font-28">送至</view>
+								<view class="lf-color-222 lf-font-26 lf-m-l-30" style="width: 550rpx;">广西壮族自治区-南宁市-青秀区-民族大道180号</view>
+							</view>
+							<view>
+								<text class="lf-font-24 lf-color-777 lf-iconfont icon-xiangyou"></text>
+							</view>
+						</view>
+					</view>
+					<view class="bg-white">
+						<view class="cu-bar padding-lr">
+							<view class="lf-flex">
+								<view class="lf-color-777 lf-font-28">运费</view>
+								<view class="lf-color-222 lf-font-26 lf-m-l-30 lf-line-1" style="width: 550rpx;">在5kg～10kg内，包含5kg；重量在5kg以内按3kg</view>
+							</view>
+							<view>
+								<text class="lf-font-24 lf-color-777 lf-iconfont icon-xiangyou"></text>
+							</view>
+						</view>
+					</view>
+				</block>
 				<view class="bg-white">
 					<view class="cu-bar padding-lr" @click="shoot(2)">
 						<view class="lf-flex">
@@ -90,7 +137,7 @@
 					</view>
 					<scroll-view class="scroll-view" :scroll-x="true">
 						<view class="scroll-content">
-							<view class="goods-item" v-for="(item, index) in 5" :key="index" @click="$url('/pages/shop/goodsdetail')">
+							<view class="goods-item" v-for="(item, index) in 5" :key="index" @click="$url('/pages/shop/goodsdetail?type='+ this.type)">
 								<image class="goods-img"></image>
 								<view class="goods-info">
 									<view class="lf-line-1">猪大肠卖咯 5毛钱一斤咯</view>
@@ -131,7 +178,13 @@
 							<view class="lf-m-t-1">购物车</view>
 						</button>
 					</view>
-					<view class="lf-flex">
+					<view v-if="type == 'seckill'">
+						<button class="btn" style="width: 349rpx;">立即秒杀</button>
+					</view>
+					<view v-else-if="type == 'point'">
+						<button class="btn" style="width: 349rpx;">立即兑换</button>
+					</view>
+					<view class="lf-flex" v-else>
 						<button class="btn1" @click="shoot(1)">加入购物车</button>
 						<button class="btn lf-m-l-15" @click="shoot(2)">立即购买</button>
 					</view>
@@ -190,7 +243,11 @@
 </template>
 
 <script>
+	import countdownTimer from '@/components/countdown-timer/countdown-timer';
 	export default {
+		components: {
+			countdownTimer
+		},
 		data(){
 			return {
 				current: 0, // 轮播下标
@@ -205,12 +262,14 @@
 				],
 				show_popup: false, // 是否显示选规格模态框
 				spec_current: null, // 规格下标
-				click_type: null // 当前点击的是加入购物车[1]还是立即购买[2]
+				click_type: null, // 当前点击的是加入购物车[1]还是立即购买[2]
+				type: 'mail', // 页面显示类型，mail普通可邮寄商品，self自提商品，point积分商品，seckill秒杀商品
+				time: new Date('2021/09/8 14:15:00').getTime() - new Date('2021/09/8 13:10:00').getTime()
 			}
 		},
 		onLoad(options){
 			this.goods_id = options.goods_id;
-			
+			this.type = options.type || 'mail';
 			console.log('商品',this.goods_id)
 			// this.getGoodsDetail();
 		},
@@ -495,6 +554,21 @@
 		width: 750rpx;
 		height: 750rpx;
 		background-color: #FFFFFF;
+		position: relative;
+		.seckill-box{
+			position: absolute;
+			bottom: 0;
+			left: 0;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			padding: 0 32rpx;
+			width: 100%;
+			height: 77rpx;
+			background-color: #15716E;
+			color: #FFFFFF;
+			font-size: 26rpx;
+		}
 	}
 	
 	.head-info{
diff --git a/pages/shop/seckillList.vue b/pages/shop/seckillList.vue
index fed23c4..5dc574d 100644
--- a/pages/shop/seckillList.vue
+++ b/pages/shop/seckillList.vue
@@ -2,7 +2,7 @@
 	<view>
 		<lf-nav title="秒杀专场" :showIcon="true" bgColor="#fff"></lf-nav>
 		<view class="content">
-			<view class="card" v-for="(item, index) in 7" :key="index" @click="$url('/pages/shop/goodsdetail')">
+			<view class="card" v-for="(item, index) in 7" :key="index" @click="$url('/pages/shop/goodsdetail?type=seckill')">
 				<view class="goods-img">
 					<image class="img" src="https://picsum.photos/200/300"></image>
 					<view class="tips">已有0人购买</view>