From 648c691199f839b7d074a65ccc35e9265170e7eb Mon Sep 17 00:00:00 2001
From: Enzo <1284707383@qq.com>
Date: Thu, 30 Sep 2021 18:18:49 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=80=92=E8=AE=A1=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/uni-countdown/uni-countdown.vue |  20 ++--
 pages/shop/goodsdetail.vue                 | 117 ++++++++-------------
 pages/shop/seckillList.vue                 |  51 +--------
 3 files changed, 55 insertions(+), 133 deletions(-)

diff --git a/components/uni-countdown/uni-countdown.vue b/components/uni-countdown/uni-countdown.vue
index 3597e5c..3d885b3 100644
--- a/components/uni-countdown/uni-countdown.vue
+++ b/components/uni-countdown/uni-countdown.vue
@@ -1,15 +1,15 @@
 <template>
 	<view class="uni-countdown">
-		<text v-if="showDay" :style="{ borderColor: borderColor, color: color, backgroundColor: backgroundColor }"
+		<text v-if="showDay" :style="{ borderColor: borderColor, color: color }"
 			class="uni-countdown__number">{{ d }}</text>
 		<text v-if="showDay" :style="{ color: splitorColor }" class="uni-countdown__splitor">{{dayText}}</text>
-		<text :style="{ borderColor: borderColor, color: color, backgroundColor: backgroundColor }"
+		<text :style="{ borderColor: borderColor, color: color }"
 			class="uni-countdown__number">{{ h }}</text>
-		<text :style="{ color: splitorColor }" class="uni-countdown__splitor">{{ showColon ? ':' : hourText }}</text>
-		<text :style="{ borderColor: borderColor, color: color, backgroundColor: backgroundColor }"
+		<text :style="{ color: splitorColor }" class="uni-countdown__splitor">{{ showColon ? '时' : hourText }}</text>
+		<text :style="{ borderColor: borderColor, color: color }"
 			class="uni-countdown__number">{{ i }}</text>
-		<text :style="{ color: splitorColor }" class="uni-countdown__splitor">{{ showColon ? ':' : minuteText }}</text>
-		<text :style="{ borderColor: borderColor, color: color, backgroundColor: backgroundColor }"
+		<text :style="{ color: splitorColor }" class="uni-countdown__splitor">{{ showColon ? '分' : minuteText }}</text>
+		<text :style="{ borderColor: borderColor, color: color }"
 			class="uni-countdown__number">{{ s }}</text>
 		<text v-if="!showColon" :style="{ color: splitorColor }" class="uni-countdown__splitor">{{secondText}}</text>
 	</view>
@@ -59,15 +59,15 @@
 			},
 			borderColor: {
 				type: String,
-				default: '#000000'
+				default: '#15716E'
 			},
 			color: {
 				type: String,
-				default: '#000000'
+				default: '#15716E'
 			},
 			splitorColor: {
 				type: String,
-				default: '#000000'
+				default: '#15716E'
 			},
 			day: {
 				type: Number,
@@ -250,8 +250,6 @@
 		/* #endif */
 		justify-content: center;
 		align-items: center;
-		width: $countdown-width;
-		height: $countdown-height;
 		line-height: $countdown-height;
 		margin: 5rpx;
 		text-align: center;
diff --git a/pages/shop/goodsdetail.vue b/pages/shop/goodsdetail.vue
index 76a8f86..065a841 100644
--- a/pages/shop/goodsdetail.vue
+++ b/pages/shop/goodsdetail.vue
@@ -9,7 +9,7 @@
 						<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 v-if="$isRight(time)">
+							<view>
 								<countdown-timer :time="time" :autoStart="true" @finish="dateFinish">
 									<template v-slot="{day, hour, minute, second}">
 										<view class="lf-flex">
@@ -177,7 +177,7 @@
 						<button class="btn" style="width: 349rpx;">立即秒杀</button>
 					</view>
 					<view v-else-if="type == 'point'">
-						<button class="btn" style="width: 349rpx;" @click="goExchange()">立即兑换</button>
+						<button class="btn" style="width: 349rpx;">立即兑换</button>
 					</view>
 					<view class="lf-flex" v-else>
 						<button class="btn1" @click="shoot(1)">加入购物车</button>
@@ -268,9 +268,7 @@
 				token: '',
 				coupons: [], // 优惠
 				goods_num: 1,
-				is_date_finish: false,
-				show_share: false,
-				shareImg: ''
+				is_date_finish: false
 			}
 		},
 		computed: {
@@ -319,11 +317,6 @@
 			this.getGoodsStock(); // 获取商品库存、规格信息
 		},
 		methods: {
-			goExchange() {
-				if(this.showSpec == '请选择规格') {
-					this.shoot(3)
-				}
-			},
 			// 切换商品收藏
 			switchCollect(){
 				if(!this.token){
@@ -396,7 +389,7 @@
 					}
 				}
 			},
-			// 跳转至下单页
+			// 跳转至下单页TODO
 			confirm(){
 				if(this.is_date_finish){
 					return this.$msg('活动已结束');
@@ -484,7 +477,7 @@
 					// 直接结算
 					this.$cookieStorage.set('order_confirm', par);
 					uni.hideLoading();
-					this.$url('/pages/order/confirm/confirm?goods_type=1');
+					this.$url('/pages/order/confirm/confirm');
 					// this.$http.post({
 					// 	api: 'api/shopping/order/checkout',
 					// 	data: par,
@@ -499,73 +492,50 @@
 					// 	}
 					// 	uni.hideLoading()
 					// }).catch(err => uni.hideLoading())
-				}else if(this.click_type == 3) {
-					// 直接结算
-					this.$cookieStorage.set('order_confirm', par);
-					uni.hideLoading();
-					this.$url('/pages/order/confirm/confirm?goods_type=0');
 				}
 			},
 			// 点击页面分享按钮
 			shareGraphic(){
-				this.getShearImg();
+				this.getCreateShareImg();
 			},
-			// 获取分享图片
-			getShearImg() {
-			  wx.showLoading({
-			    title: "生成中",
-			    mask: true
-			  });
-			  var token = this.token;
-			  this.$http.get({
-			    api: 'api/distribution/createMiniShareImg',
-			    header: {
-			      Authorization: token
-			    },
-			    data: {
-			      goods_id: this.goods_id
-			    }
-			  }).then(res => {
-			    if (res.statusCode == 200) {
-			      res = res.data;
-			
-			      if (res.status) {
-			        this.setData({
-			          shareImg: res.data.image
-			        });
-			
-			        setTimeout(() => {
-			            this.changeImg();
-					}, 100)
-			      } else {
-			        wx.showModal({
-			          content: res.message || '请求失败',
-			          showCancel: false
-			        });
-			      }
-			    } else {
-			      wx.showModal({
-			        content: '请求失败',
-			        showCancel: false
-			      });
-			    }
+			//请求h5的图片接口
+			getCreateShareImg(){
+				wx.showLoading({
+					title:"生成中",
+					mask:true
+				})
+				    let origin = window.location.origin;
+					let share_url = origin+'/pages/store/detail/detail';
+				this.$http.get({
+					api:'api/distribution/createH5ShareImg',
+					data:{
+						goods_id:this.id,
+						share_url:share_url 
+					}
+				}).then(res=>{
+					res = res.data;
+					if(res.status){
+						this.qr_code_image = res.data.image;
 			
-			    wx.hideLoading();
-			    this.changeShare();
-			  }).catch(rej => {
-			    wx.showModal({
-			      content: '内部错误',
-			      showCancel: false
-			    });
-			    wx.hideLoading();
-			    this.changeShare();
-			  });
-			},
-			// 弹出分享
-			changeShare() {
-			  this.setData({
-			    show_share: !this.show_share
-			  });
+						if(this.qr_code_image){
+							this.share_gaphic =!this.share_gaphic;
+							this.is_toggle_share = false;
+						}
+					} else{
+						wx.showModal({
+							content: res.message || '请求失败，请重试',
+							showCancel: false
+						});
+					}
+					wx.hideLoading()
+				}).catch(rej=>{
+					wx.hideLoading()
+					wx.showModal({
+						content: rej.message || '内部错误，请重试',
+						showCancel: false
+					});
+				})
+				
 			},
 			// 商品详情
 			getNewdetail(){
@@ -590,7 +560,6 @@
 						this.seckill = meta.seckill;
 						let currentDate = this.$shared.recordTime();
 						this.time = new Date(meta.seckill.ends_at).getTime() - new Date(currentDate).getTime()
-						console.log("time", this.time, meta.seckill.ends_at, currentDate)
 					}
 					if(type != 'point'){
 						this.getBrandDetail(goods_detail.brand_id);
diff --git a/pages/shop/seckillList.vue b/pages/shop/seckillList.vue
index d524393..59ad96a 100644
--- a/pages/shop/seckillList.vue
+++ b/pages/shop/seckillList.vue
@@ -54,7 +54,7 @@
 							</view> -->
 							<view class="desc" v-if="item.seckill.end_left_time.length==0">
 								距离开始还剩余
-								<countdown-time :day="item.seckill.end_left_time[0]" :hour="item.seckill.end_left_time[1]" :minute="item.seckill.end_left_time[2]" :second="item.seckill.end_left_time[3]">
+								<countdown-time :day="item.seckill.start_left_time[0]" :hour="item.seckill.start_left_time[1]" :minute="item.seckill.start_left_time[2]" :second="item.seckill.start_left_time[3]">
 									
 								</countdown-time>
 							</view>
@@ -85,7 +85,6 @@
 </template>
 
 <script>
-	import countdownTimer from '@/components/countdown-timer/countdown-timer';
 	import countdownTime from '@/components/uni-countdown/uni-countdown.vue';
 	export default {
 		data() {
@@ -107,7 +106,6 @@
 			}
 		},
 		components: {
-			countdownTimer,
 			countdownTime
 		},
 		computed: {
@@ -174,52 +172,9 @@
 						this.isRefresher = false;
 					}
 					if (this.page == 1) {
-						let list = res.data.data;
-						list.forEach((item,index) => {
-							let now_date = new Date(new Date().toLocaleDateString()).getTime();
-							let start_date = new Date(new Date(item.seckill.starts_at).toLocaleDateString()).getTime();
-							console.log(now_date)
-							console.log(start_date)
-							console.log(item)
-							if(now_date < start_date) {
-								this.$set(item,'ifStart',false)
-								var date = this.getTime()
-								let time = new Date(item.seckill.starts_at).getTime() - new Date(date).getTime()
-								this.$set(item,'countTime',time)
-								console.log("time", time);
-							}else {
-								this.$set(item,'ifStart',true)
-								var date = this.getTime()
-								let time = new Date(item.seckill.ends_at).getTime() - new Date(date).getTime()
-								this.$set(item,'countTime',time)
-								console.log("time", time);
-							}
-							
-						})
-						this.list = list
-						console.log(this.list)
+						this.list = res.data.data;
 					} else {
-						let list = res.data.data;
-						list.forEach((item,index) => {
-							let now_date = new Date(new Date().toLocaleDateString()).getTime();
-							let start_date = new Date(new Date(item.seckill.starts_at).toLocaleDateString()).getTime();
-							console.log(now_date)
-							console.log(start_date)
-							console.log(item)
-							if(now_date < start_date) {
-								this.$set(item,'ifStart',false)
-								var date = this.getTime()
-								let time = new Date(item.seckill.starts_at).getTime() - new Date(date).getTime()
-								this.$set(item,'countTime',time)
-							}else {
-								this.$set(item,'ifStart',true)
-								var date = this.getTime()
-								let time = new Date(item.seckill.ends_at).getTime() - new Date(date).getTime()
-								this.$set(item,'countTime',time)
-							}
-							
-						})
-						this.list.push(...list);
+						this.list.push(...res.data.data);
 					}
 
 				})

From 616817571bbf69604a841f8e74ec4ce27466ffeb Mon Sep 17 00:00:00 2001
From: Enzo <1284707383@qq.com>
Date: Thu, 30 Sep 2021 18:25:48 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=80=92=E8=AE=A1=E6=97=B6=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=9A=90=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/uni-countdown/uni-countdown.vue | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/components/uni-countdown/uni-countdown.vue b/components/uni-countdown/uni-countdown.vue
index 3d885b3..baeca7a 100644
--- a/components/uni-countdown/uni-countdown.vue
+++ b/components/uni-countdown/uni-countdown.vue
@@ -3,9 +3,9 @@
 		<text v-if="showDay" :style="{ borderColor: borderColor, color: color }"
 			class="uni-countdown__number">{{ d }}</text>
 		<text v-if="showDay" :style="{ color: splitorColor }" class="uni-countdown__splitor">{{dayText}}</text>
-		<text :style="{ borderColor: borderColor, color: color }"
+		<text v-if="showHour" :style="{ borderColor: borderColor, color: color }"
 			class="uni-countdown__number">{{ h }}</text>
-		<text :style="{ color: splitorColor }" class="uni-countdown__splitor">{{ showColon ? '时' : hourText }}</text>
+		<text v-if="showHour" :style="{ color: splitorColor }" class="uni-countdown__splitor">{{ showColon ? '时' : hourText }}</text>
 		<text :style="{ borderColor: borderColor, color: color }"
 			class="uni-countdown__number">{{ i }}</text>
 		<text :style="{ color: splitorColor }" class="uni-countdown__splitor">{{ showColon ? '分' : minuteText }}</text>
@@ -45,6 +45,10 @@
 				type: Boolean,
 				default: true
 			},
+			showHour: {
+				type: Boolean,
+				default: true
+			},
 			showColon: {
 				type: Boolean,
 				default: true