From a61cc171d51a6ef77d4d1575bb3c652525f6aadc Mon Sep 17 00:00:00 2001
From: wangxiaowei <1121133807@qq.com>
Date: Fri, 27 Sep 2024 23:06:26 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E5=85=88=E8=AE=BE=E7=BD=AE=E8=A7=86?=
 =?UTF-8?q?=E9=A2=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/index-home/index-home.vue  |  8 ++++----
 pages/confirm_order/confirm_order.vue | 16 +++++++++++++---
 pages/goods_details/goods_details.vue | 22 +++++++++++++---------
 3 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/components/index-home/index-home.vue b/components/index-home/index-home.vue
index f7ce850..dc51948 100644
--- a/components/index-home/index-home.vue
+++ b/components/index-home/index-home.vue
@@ -46,14 +46,14 @@
 			</view>
 			<!-- #endif -->
 			<!-- 秒杀 -->
-			<view class="seckill m-t-20" v-if="seckillGoods.length">
+		<!-- 	<view class="seckill m-t-20" v-if="seckillGoods.length">
 				<home-seckill :list="seckillGoods"></home-seckill>
-			</view>
+			</view> -->
 			
 			<!-- 抢购 -->
-			<view class="m-t-20">
+			<!-- <view class="m-t-20">
 				<panic-buying :list="panicList"></panic-buying>
-			</view>
+			</view> -->
 
 			<view class="seckill m-t-20" v-if="mallNews != ''">
 				<mall-news :list="mallNews"></mall-news>
diff --git a/pages/confirm_order/confirm_order.vue b/pages/confirm_order/confirm_order.vue
index 70e887f..0b958df 100644
--- a/pages/confirm_order/confirm_order.vue
+++ b/pages/confirm_order/confirm_order.vue
@@ -99,11 +99,13 @@
 				p_id: 0,
 				bargainLaunchId: -1,
 				invoiceArr: [],
-				subsidy_type: 1
+				subsidy_type: 1,
+				goods_type: 0 // 当为4（抢购）的时候会改变这个值
 			};
 		},
 
 		onLoad(options) {
+			console.log(' this.$Route.query=',  this.$Route.query)
 			uni.$on("selectaddress", (e) => {
 				this.addressId = e.id;
 				this.orderBuyFun();
@@ -125,10 +127,12 @@
 					carts,
 					teamId,
 					foundId,
-					type
+					type,
+					orderType
 				}
 			} = this.$Route.query
-
+			
+			this.order_type = orderType
 			this.goods = goods
 			this.bargainLaunchId = goods[0].bargain_launch_id || -1
 			this.carts = carts || []
@@ -285,6 +289,12 @@
 				}
 				
 				
+				//抢购
+				submitObj.order_type = 0
+				if (this.order_type == 4) {
+					submitObj.order_type = this.order_type
+				}
+				
 				let {
 					data: orderData,
 					code: orderCode,
diff --git a/pages/goods_details/goods_details.vue b/pages/goods_details/goods_details.vue
index a3e895a..37c399d 100644
--- a/pages/goods_details/goods_details.vue
+++ b/pages/goods_details/goods_details.vue
@@ -69,7 +69,7 @@
 			</view>
 			
 			<!-- 抢购 -->
-			<view class="group" v-show="goodsType == 3">
+			<view class="group" v-show="goodsType == 4">
 				<view class="row info" style="height: 100%">
 					<view class="row-between ml20 white" style="flex: 1;">
 						<view style="align-items: baseline;" class="row">
@@ -81,7 +81,7 @@
 				</view>
 			</view>
 			<view class="goods-info bg-white">
-				<view class="info-header flex" v-if="goodsType != 1 && goodsType != 3">
+				<view class="info-header flex" v-if="goodsType != 1 && goodsType != 4">
 					<view class="price flex flex-1">
 						<view class="primary m-r-10 flex">
 							<view class="xs lighter m-r-10" v-if="p_id > 0">零售价: </view>
@@ -166,7 +166,7 @@
 					<text>浏览量: {{ goodsDetail.clicks }}</text>
 				</view>
 			</view>
-
+			
 			<!-- 拼团的玩法说明 -->
 			<view class="group-play bg-white mt20" v-if="goodsType == 2">
 				<view class="title">拼团玩法</view>
@@ -279,7 +279,7 @@
 						shop_id: shop.id,
 						goods_id: id
 					}}"> -->
-					<view class="btn flex-col col-center row-center" v-if="goodsType != 3">
+					<view class="btn flex-col col-center row-center" v-if="goodsType != 4">
 						<button open-type="contact" class="kefu" hover-class="none">
 							<image class="icon-md" :src="aliOSSDomain + 'uniapp/icon_contact.png'"></image>
 						</button>
@@ -290,13 +290,13 @@
 					</view>
 				<!-- </router-link> -->
 
-				<button class="btn flex-col col-center row-center" hover-class="none" @tap="collectGoodsFun" v-if="goodsType != 3">
+				<button class="btn flex-col col-center row-center" hover-class="none" @tap="collectGoodsFun" v-if="goodsType != 4">
 					<image class="icon-md"
 						:src="goodsDetail.is_collect == 1 ? aliOSSDomain + 'uniapp/icon_collection_s.png' : aliOSSDomain + 'uniapp/icon_collection.png'">
 					</image>
 					<text class="xxs lighter">收藏</text>
 				</button>
-				<router-link nav-type="pushTab" to="/pages/shop_cart/shop_cart" v-if="goodsType != 3">
+				<router-link nav-type="pushTab" to="/pages/shop_cart/shop_cart" v-if="goodsType != 4">
 					<view class="flex-col btn cart col-center row-center">
 						<image class="icon-md" :src="aliOSSDomain + 'uniapp/icon_cart.png'">
 						</image>
@@ -327,7 +327,7 @@
 			<goods-column></goods-column>
 		</view>
 		<!-- 规格 -->
-		<spec-popup :show="showSpec" :is-seckill="goodsType == 1" :goods="goodsDetail" @close="showSpec = false"
+		<spec-popup :show="showSpec" :is-seckill="goodsType == 1" :is-panic="goodsType == 4" :goods="goodsDetail" @close="showSpec = false"
 			:show-add="popupType == 1 || popupType == 0" :show-buy="popupType == 2 || popupType == 0"
 			:show-stock="goodsDetail.is_show_stock == 1" :show-confirm="popupType == 3" @buynow="onBuy"
 			:type="goodsDetail.type" :u-id="userInfo.u_id || 0" :wholesale-state="userInfo.wholesale_state"
@@ -478,7 +478,6 @@ team_min_price
 						this.invite_code = options.invite_code;
 						if (!this.isLogin) {
 							await this.getLoginCode()
-							console.log('code = ', this.code)
 						}
 
 						if (!options.p_id) {
@@ -700,6 +699,11 @@ team_min_price
 				this.showSpec = false
 				this.goodsType == 2 ? (params.teamId = this.team.id) : '';
 				this.foundId ? (params.foundId = this.foundId) : '';
+				
+				if (this.goodsType == 4) {
+					params.orderType = 4
+				}
+				
 				this.$Router.push({
 					path: '/pages/confirm_order/confirm_order',
 					query: {
@@ -830,7 +834,7 @@ team_min_price
 							red: '立即开团',
 								yellow: '单独购买'
 						};
-					case 3:
+					case 4:
 						return {
 							red: '立即抢购',
 							yellow: ''