From 29d2a3ecfad7b2aadc23710f213da207d3d96ee8 Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Thu, 30 May 2024 15:27:46 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/activity/newPeople.vue | 2 +-
 pages/index/index.vue        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pages/activity/newPeople.vue b/pages/activity/newPeople.vue
index 295717d..a197ba1 100644
--- a/pages/activity/newPeople.vue
+++ b/pages/activity/newPeople.vue
@@ -27,7 +27,7 @@
 				<u-tabs :list="menuList" bg-color="#fafafa" inactive-color="#3C3C3C" active-color="#FF3C43"
 					:is-scroll="true" font-size="30" v-model="current" @change="onChosed"></u-tabs>
 			</view>
-			<view scroll-x class="b">
+			<view scroll-x class="b" style="display: flex;flex-wrap: wrap;justify-content:space-between">
 				<!-- <u-waterfall v-model="goodList" ref="uWaterfall1"> -->
 					<!-- <template v-slot:left="{leftList}"> -->
 						<view class="item" v-for="(item, index) in goodList" :key="index"
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 86c9825..e20a9e2 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -898,7 +898,7 @@
 					is_brand: '',
 					is_new: 1,
 					order: '',
-					is_in_store: 0
+					is_in_store: ''
 				}
 				GoodsApi.brandList(param).then(res => {
 					let arr = res.data.data
@@ -928,7 +928,7 @@
 					is_brand: this.current == 0 ? 1 : '',
 					is_new: '',
 					order: '',
-					is_in_store: this.current == 0 ? 0 : 1
+					is_in_store: this.current == 0 ? '' : 1
 				}
 				GoodsApi.brandList(param).then(res => {
 						let arr = res.data.data;

From 141f0ce26284aed0b8cfd7ca8f8f8c306d98d1cd Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Thu, 30 May 2024 17:48:34 +0800
Subject: [PATCH 2/9] =?UTF-8?q?=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 static/login_logo.png | Bin 0 -> 4910 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 static/login_logo.png

diff --git a/static/login_logo.png b/static/login_logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..2514b5bcfa6375877c236008359534caf819bd5c
GIT binary patch
literal 4910
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

literal 0
HcmV?d00001


From 5e9677622248cf3e2721b40da0f68d155eafe898 Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Thu, 30 May 2024 21:15:09 +0800
Subject: [PATCH 3/9] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=94=B9=E9=80=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/login/components/mp-weixin-mobile.vue | 61 +++++++++++++++++----
 pages/login/index.vue                       | 24 ++++----
 2 files changed, 65 insertions(+), 20 deletions(-)

diff --git a/pages/login/components/mp-weixin-mobile.vue b/pages/login/components/mp-weixin-mobile.vue
index 7daaa5c..0c42864 100644
--- a/pages/login/components/mp-weixin-mobile.vue
+++ b/pages/login/components/mp-weixin-mobile.vue
@@ -1,12 +1,17 @@
 <template>
 	<!-- 微信授权手机号一键登录 -->
-	<view class="wechat-auth">
+	<view class="wechat-auth" v-if="isNew==1">
 		<button class="btn-normal" open-type="getPhoneNumber" @getphonenumber="handelMpWeixinMobileLogin($event)">
 			<view class="wechat-auth-container">
 				<text class="title">手机号快捷登录</text>
 			</view>
 		</button>
 	</view>
+	<view class="wechat-new" v-if="isNew==2">
+		<button class="btn-normal" open-type="getPhoneNumber" @getphonenumber="handelMpWeixinMobileLogin($event)">
+			<view class="fd fd-on" @click="login">登录</view>
+		</button>
+	</view>
 </template>
 
 <script>
@@ -18,10 +23,13 @@
 	import * as UserApi from '@/api/user'
 	export default {
 		props: {
-		  // 分享人id
-		  refereeId: {
-		    type: String
-		  },
+			// 分享人id
+			refereeId: {
+				type: String
+			},
+			isNew: {
+				type: String || Number
+			}
 		},
 		data() {
 			return {
@@ -50,7 +58,7 @@
 			async handelMpWeixinMobileLogin({
 				detail
 			}) {
-				console.log("handelMpWeixinMobileLogin",detail)
+				console.log("handelMpWeixinMobileLogin", detail)
 				const app = this
 				app.code = await app.getCode()
 				if (detail.errMsg != 'getPhoneNumber:ok') {
@@ -68,7 +76,7 @@
 							partyData: app.userInfo
 						})
 						.then(result => {
-							console.log("result",result)
+							console.log("result", result)
 							// 显示登录成功
 							app.$toast(result.message);
 							app.getUserInfo()
@@ -78,7 +86,7 @@
 							setTimeout(() => app.onNavigateBack(1), 2000)
 						})
 						.catch(err => {
-							console.log("err",err)
+							console.log("err", err)
 							const resultData = err.result.data
 							// 显示错误信息
 							if (isEmpty(resultData)) {
@@ -95,7 +103,7 @@
 			getUserInfo() {
 				UserApi.info()
 					.then(result => {
-						console.log("getUserInfo",result)
+						console.log("getUserInfo", result)
 						uni.setStorageSync('userInfo', result.data.userInfo)
 					})
 			},
@@ -146,6 +154,39 @@
 </script>
 
 <style lang="scss" scoped>
+	.wechat-new {
+		width: 100%;
+
+		.fd {
+			width: 680rpx;
+			line-height: 88rpx;
+			background: rgba(243, 74, 64, 1);
+			border-radius: 88rpx;
+			text-align: center;
+			margin: 0 auto;
+			margin-top: 20rpx;
+			font-size: 28rpx;
+			font-weight: 600;
+			color: #ffffff;
+
+			.fd-on {
+				background-color: rgba(243, 74, 64, 1);
+			}
+		}
+
+		.wechat-auth-container {
+			display: flex;
+			justify-content: center;
+		}
+
+		.icon {
+			width: 38rpx;
+			height: 38rpx;
+			margin-right: 15rpx;
+		}
+	}
+
+
 	// 微信授权登录
 	.wechat-auth {
 		width: 320rpx;
@@ -167,4 +208,4 @@
 			color: #666666;
 		}
 	}
-</style>
\ No newline at end of file
+</style>
diff --git a/pages/login/index.vue b/pages/login/index.vue
index 593f83f..3cdb300 100644
--- a/pages/login/index.vue
+++ b/pages/login/index.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="login">
+	<!-- 	<view class="login">
 		<view class="refund-navbar">
 			<u-navbar title="" :border-bottom="false" :background="background"></u-navbar>
 		</view>
@@ -21,7 +21,7 @@
 		</view>
 		<view class="login-fd login-fd-on" @click="login">登录</view>
 		<view class="" v-if="isCheckout">
-			<mpWeiXinMobile :refereeId="refereeId"></mpWeiXinMobile>
+			<mpWeiXinMobile :refereeId="refereeId" :isNew='1'></mpWeiXinMobile>
 		</view>
 		<view class="" v-else style="
         font-size: 28rpx;
@@ -31,8 +31,8 @@
       " @click="login">
 			手机号快捷登录
 		</view>
-	</view>
-	<view class="login-box" style="display: none;">
+	</view> -->
+	<view class="login-box">
 		<view class="refund-navbar">
 			<u-navbar title="" :border-bottom="false" background="rgba(255, 233, 240, 1)"></u-navbar>
 		</view>
@@ -46,7 +46,10 @@
 			<u-checkbox active-color="#FF343C" v-model="isCheckout" style="margin-right: -20rpx"></u-checkbox>
 			同意<text @click="toTextPage(1)">《用户服务协议》</text>和<text @click="toTextPage(2)">《隐私政策》</text>
 		</view>
-		<view class="fd fd-on" @click="login">登录</view>
+		<view class="" v-if="isCheckout">
+			<mpWeiXinMobile :isNew='2' :refereeId="refereeId"></mpWeiXinMobile>
+		</view>
+		<view class="fd fd-on" v-else @click="login">登录</view>
 	</view>
 </template>
 
@@ -226,11 +229,12 @@
 <style lang="scss" scoped>
 	.login-box {
 		width: 100%;
-		background: linear-gradient(180deg, rgba(255, 233, 240, 1) 0%, rgba(226, 244, 243, 0) 35%);
+		background: linear-gradient(180deg, rgba(255, 233, 240, 1) 0%, rgba(226, 244, 243, 0) 30%);
 		min-height: 100vh;
+		height: 100%;
 
 		.login-logo {
-			margin: 365rpx auto 0 auto;
+			margin: 38% auto 0 auto;
 			width: 132rpx;
 			height: 132rpx;
 			border-radius: 24rpx;
@@ -247,9 +251,9 @@
 		.login-name {
 			width: 100%;
 			text-align: center;
-
+			margin-bottom: 70rpx;
 			font-weight: bold;
-			font-size: 36rpx;
+			font-size: 38rpx;
 			color: rgba(243, 74, 64, 1);
 			margin-top: 22rpx;
 		}
@@ -281,7 +285,7 @@
 			border-radius: 88rpx;
 			text-align: center;
 			margin: 0 auto;
-			margin-top: 50rpx;
+			margin-top: 20rpx;
 			font-size: 28rpx;
 			font-weight: 600;
 			color: #ffffff;

From 9392de7f5d30bcfa87e701422e7205dcacd48709 Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Thu, 30 May 2024 22:14:46 +0800
Subject: [PATCH 4/9] =?UTF-8?q?=E9=9A=90=E8=97=8F=E5=88=86=E9=94=80?=
 =?UTF-8?q?=E4=BB=B7=E4=BC=9A=E5=91=98=E4=BB=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/user/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pages/user/index.vue b/pages/user/index.vue
index 1be819c..27e9498 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -424,7 +424,7 @@
 							物流查询
 						</view>
 					</view>
-					<view class="serveIcon" @click="goJump('/pages/news3/vipPrice?type=0')"
+				<!-- 	<view class="serveIcon" @click="goJump('/pages/news3/vipPrice?type=0')"
 						v-if="userInfo.user_type == 40">
 						<image :src="$picUrl+'/static/user/member.png'" class="icons"></image>
 						<view class="serveInfo">
@@ -437,7 +437,7 @@
 						<view class="serveInfo">
 							分销价
 						</view>
-					</view>
+					</view> -->
 					<view class="serveIcon" @click="goJump('/pages/news1/MerchantSettlement')">
 						<image :src="$picUrl+'/static/user/checkIn.png'" class="icons"></image>
 						<view class="serveInfo">

From 05e8ef87d1334b0f5a7bc35cebab9ec328b7f367 Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Fri, 31 May 2024 09:56:43 +0800
Subject: [PATCH 5/9] =?UTF-8?q?=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/captcha.js        |  7 ++++++-
 pages/login/index.vue | 32 +++++++++++++++++++++++++-------
 2 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/api/captcha.js b/api/captcha.js
index 6fff247..8f9e806 100644
--- a/api/captcha.js
+++ b/api/captcha.js
@@ -3,7 +3,8 @@ import request from '@/utils/request'
 // api地址
 const api = {
   image: 'captcha/image',
-  sendSmsCaptcha: 'captcha/sendSmsCaptcha'
+  sendSmsCaptcha: 'captcha/sendSmsCaptcha',
+  getStoreInfo:'store/getStoreInfo'
 }
 
 // 图形验证码
@@ -15,3 +16,7 @@ export function image() {
 export function sendSmsCaptcha(data) {
   return request.post(api.sendSmsCaptcha, data, { load: false })
 }
+// 发送短信验证码
+export function getStoreInfo(data) {
+  return request.get(api.getStoreInfo, data, { load: false })
+}
diff --git a/pages/login/index.vue b/pages/login/index.vue
index 3cdb300..0437525 100644
--- a/pages/login/index.vue
+++ b/pages/login/index.vue
@@ -37,10 +37,10 @@
 			<u-navbar title="" :border-bottom="false" background="rgba(255, 233, 240, 1)"></u-navbar>
 		</view>
 		<view class="login-logo">
-			<image src="../../static/login_logo.png" mode=""></image>
+			<image :src="loginInfo.login_img" mode="widthFix"></image>
 		</view>
 		<view class="login-name">
-			京苏云商
+			{{loginInfo.store_name}}
 		</view>
 		<view class="c">
 			<u-checkbox active-color="#FF343C" v-model="isCheckout" style="margin-right: -20rpx"></u-checkbox>
@@ -83,6 +83,7 @@
 				countDownFun: null,
 				code: "",
 				refereeId: "",
+				loginInfo:{}
 			};
 		},
 		onLoad(o) {
@@ -96,8 +97,25 @@
 			console.log(scene.refereeId)
 			console.log("refereeId", refereeId)
 			console.log(this.refereeId)
+			this.getLogoName()
 		},
 		methods: {
+			getLogoName() {
+				let that = this
+				CaptchaApi.getStoreInfo({
+					mobile: that.phoneNum
+				}).then((res) => {
+					if (res.status == 200) {
+						that.loginInfo=res.data
+						console.log(that.loginInfo)
+					} else {
+						uni.showToast({
+							icon: "none",
+							title: res.message,
+						});
+					}
+				});
+			},
 			toTextPage(n) {
 				uni.navigateTo({
 					url: "/pages/news1/text?pageFlag=" + n,
@@ -238,13 +256,13 @@
 			width: 132rpx;
 			height: 132rpx;
 			border-radius: 24rpx;
-			background: rgba(243, 74, 64, 1);
-			box-shadow: -4rpx -8rpx 20rpx rgba(243, 74, 64, 0.16);
+			overflow: hidden;
+			// background: rgba(243, 74, 64, 1);
+			// box-shadow: -4rpx -8rpx 20rpx rgba(243, 74, 64, 0.16);
 
 			image {
-				width: 75rpx;
-				height: 85rpx;
-				margin: 23.5rpx 0 0 28.5rpx;
+				width: 100%;
+				height: 100%;
 			}
 		}
 

From d67628ac16f50d3570fee959209bbc7640e123c0 Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Fri, 31 May 2024 14:34:06 +0800
Subject: [PATCH 6/9] =?UTF-8?q?=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/activity/newPeople.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/activity/newPeople.vue b/pages/activity/newPeople.vue
index a197ba1..9525677 100644
--- a/pages/activity/newPeople.vue
+++ b/pages/activity/newPeople.vue
@@ -60,8 +60,8 @@
 						</view>
 					</template> -->
 				<!-- </u-waterfall> -->
-				<u-empty text="暂无数据显示哦～" v-if="goodList.length==0" mode="list"></u-empty>
 			</view>
+			<u-empty text="暂无数据显示哦～" v-if="goodList.length==0" mode="list"></u-empty>
 		</view>
 		<view class="newpeople-fd" @click="openPage()">
 			<image :src="$picUrl+'/static/toTop.png?=1'"></image>

From ba61e89532cfd9b3c4ffcab167dbf0bc2d9e0d4f Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Fri, 31 May 2024 15:19:20 +0800
Subject: [PATCH 7/9] =?UTF-8?q?=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pages/index/index.vue b/pages/index/index.vue
index e20a9e2..25a38ad 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -162,7 +162,7 @@
 					</view>
 					<view class="goods-list" v-if="seckillList && seckillList.length>0">
 						<view class="list" v-for="(item, index) in seckillList" :key="index"
-							@click="handleTargetGoods(item.goods_id)">
+							@click="handleTargetGoods(item)">
 							<view class="pictrue">
 								<image :src="item.goods_image"></image>
 							</view>
@@ -646,9 +646,9 @@
 				this.timeData = e
 			},
 			// 跳转到秒杀商品详情
-			handleTargetGoods(sharpGoodsId) {
+			handleTargetGoods(item) {
 				uni.navigateTo({
-					url: '/pages/goods/detail?goodsId=' + sharpGoodsId + "&isSeckill=" + true + '&isBuy=' + this
+					url: '/pages/goods/seckillDetail?sharpGoodsId=' + item.sharp_goods_id +'&activeTimeId='+this.tabbar[this.curTabIndex].active_time_id+ "&isSeckill=" + true + '&isBuy=' + this
 						.seckillCutDownTime + '&seckillText=' + (this.tabbar[this.curTabIndex].status == 10 ?
 							'结束' : '开始')
 				})

From 5aad1feb2f0aeca811b8f1b03925922dcdc83623 Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Fri, 31 May 2024 15:30:01 +0800
Subject: [PATCH 8/9] =?UTF-8?q?=E6=B5=8B=E8=AF=95git=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/index/index.vue b/pages/index/index.vue
index 25a38ad..fafd2c6 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -645,7 +645,7 @@
 			onChangeSeckillCutDownTime(e) {
 				this.timeData = e
 			},
-			// 跳转到秒杀商品详情
+			// 跳转到秒杀新的商品详情
 			handleTargetGoods(item) {
 				uni.navigateTo({
 					url: '/pages/goods/seckillDetail?sharpGoodsId=' + item.sharp_goods_id +'&activeTimeId='+this.tabbar[this.curTabIndex].active_time_id+ "&isSeckill=" + true + '&isBuy=' + this

From cf507c446f88ab5482ce5a393fb4428ac298e469 Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Fri, 31 May 2024 17:19:11 +0800
Subject: [PATCH 9/9] =?UTF-8?q?=E5=B1=95=E7=A4=BA=E7=A7=92=E6=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/activity/seckill.vue |  2 +-
 pages/goods/detail.vue     | 43 ++++++++++++++++++++++++++++++--------
 2 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/pages/activity/seckill.vue b/pages/activity/seckill.vue
index 4f25a34..887aa09 100644
--- a/pages/activity/seckill.vue
+++ b/pages/activity/seckill.vue
@@ -250,7 +250,7 @@
 			handleTargetGoods(sharpGoodsId) {
 				let count_down_time = new Date(this.tabbar[this.curTabIndex].count_down_time.replace(/-/g, '/'))
 				.getTime() - new Date().getTime()
-				
+				console.log(count_down_time)
 				uni.navigateTo({
 					url: '/pages/goods/seckillDetail?activeTimeId=' + this.getCurTabbarId() + '&sharpGoodsId=' + sharpGoodsId +
 						"&isSeckill=" + true + '&isBuy=' + count_down_time + '&seckillText=' + (this.tabbar[this
diff --git a/pages/goods/detail.vue b/pages/goods/detail.vue
index 9e67ee9..734e422 100644
--- a/pages/goods/detail.vue
+++ b/pages/goods/detail.vue
@@ -33,7 +33,7 @@
 						<text class="sellLeft"></text>￥{{goods.line_price_min?Number(goods.line_price_min):0}}
 					</view>
 				</view>
-				<view class="right">
+				<view class="right" v-if="seckillCountTime==0">
 					<view class="rightPrice" v-if="goods.is_check==1">
 						<image :src="$picUrl+'/static/detail/shenhe.png'" style="width: 44rpx;height: 42rpx;"></image>
 					</view>
@@ -45,16 +45,18 @@
 						<image :src="$picUrl+'/static/detail/sheng.png'" v-if="userInfo.user_type==20"></image>
 						<text class="span"
 							v-if="userInfo.user_type==40">￥{{goods.cost_price_min?Number(goods.cost_price_min):0}}</text>
-						<text class="span"
-							v-else>￥{{(goods.line_price_min>0&&goods.goods_price_min>0)?Number((Number(goods.line_price_min)-Number(goods.goods_price_min)).toFixed(2)):0}}</text>
+						<text
+							class="span">￥{{(goods.line_price_min>0&&goods.goods_price_min>0)?Number((Number(goods.line_price_min)-Number(goods.goods_price_min)).toFixed(2)):0}}</text>
 					</view>
-					<view class="rightBox" v-if="isSeckill" style="background:unset;padding:unset;">
+				</view>
+				<view class="right2" v-if="userInfo.user_type==40&&seckillCountTime>0">
+					<view class="rightBox" style="background:unset;padding:unset;">
 						<text class="span" style="color: #ffffff;font-size: 45rpx;font-family: STXinwei;">限时抢购</text>
 					</view>
-					<view class="rest" v-if="isSeckill"
+					<view class="rest"
 						style="display: inline-flex;color:#ffffff;font-size: 30rpx;margin-top: 5rpx;float: right;font-family: STXinwei;width: 300rpx;">
-						<text style="margin-right: 20rpx;font-family: STXinwei;">距活动{{seckillText}}</text>
-						<u-count-down :timestamp="isBuy" format="HH:mm:ss" autoStart
+						<text style="margin-right: 20rpx;font-family: STXinwei;">距活动结束</text>
+						<u-count-down :timestamp="seckillCountTime" format="HH:mm:ss" autoStart
 							@change="onChangeSeckillCutDownTime">
 							<view class="date-time" style="font-family: STXinwei;">
 								<text
@@ -526,7 +528,8 @@
 					province: '江苏省',
 					city: '南京市',
 					district: '玄武区'
-				}
+				},
+				seckillCountTime: 0,
 			}
 		},
 		onLoad(options) {
@@ -676,6 +679,7 @@
 				GoodsApi.editGoodsSeckillPrice(params).then(res => {
 						if (res.status == 200) {
 							that.$toast("设置成功");
+							that.getGoodsDetail()
 							this.$refs.setRange.afterSale = false;
 							setTimeout(() => {
 								that.getGoodsDetail(1);
@@ -689,6 +693,7 @@
 			},
 			setPirce() {
 				let item = this.findItemById(this.goods.skuList, this.goods.goods_id)
+				console.log('item', item)
 				if (item) {
 					this.$refs.setRange.startTime = item.sec_start_time;
 					this.$refs.setRange.sec_hour = item.sec_hour
@@ -970,6 +975,19 @@
 					GoodsApi.detail(this.goodsId)
 						.then(result => {
 							let info = result.data.detail;
+							let item = this.findItemById(info.skuList, info.goods_id)
+							if (item) {
+								if (item.sec_start_time) {
+									that.seckillCountTime = new Date(item.sec_start_time
+											.replace(/-/g, '/'))
+										.getTime() - new Date().getTime()
+								} else {
+									that.seckillCountTime = 0
+								}
+							} else {
+								that.seckillCountTime = 0
+							}
+							that.seckillCountTime = that.seckillCountTime > 0 ? that.seckillCountTime : 0
 							that.goods.skuList = [];
 							that.godds = {}
 							info.goods_images1 = []
@@ -1389,11 +1407,18 @@
 				}
 			}
 
-			.right {
+			.right2 {
 				display: flex;
 				align-items: center;
 				margin-right: 40rpx;
 				flex-flow: column;
+			}
+
+			.right {
+				display: flex;
+				align-items: center;
+				margin-right: 40rpx;
+				// flex-flow: column;
 
 				.rightPrice {
 					overflow: hidden;