From a8573de2da97328d08610f1096aa6d466d5d9f59 Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Tue, 18 Jun 2024 14:40:16 +0800
Subject: [PATCH] =?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/goods/detail.vue        |  3 ---
 pages/goods/seckillDetail.vue | 25 ++++++++++++++++++-------
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/pages/goods/detail.vue b/pages/goods/detail.vue
index 1b61232..3e50a05 100644
--- a/pages/goods/detail.vue
+++ b/pages/goods/detail.vue
@@ -1174,13 +1174,10 @@
 				// 获取推荐商品列表
 				const that = this;
 				// 构建页面参数
-				// const params = that.$getShareUrlParams(that.options)
 				const res = await GoodsApi.goodsShortUrl({
 					page_url: encodeURIComponent('pages/goods/detail?refereeId=' + store.getters.userId + '&goodsId=' + this.goods
 						.goods_id),
 					page_title: that.goods.goods_name,
-					// goodsId:that.goods.goods_id,
-					// refereeId:store.getters.userId
 				})
 				if (res.data.url) {
 					let str =
diff --git a/pages/goods/seckillDetail.vue b/pages/goods/seckillDetail.vue
index 3a64064..d5d7991 100644
--- a/pages/goods/seckillDetail.vue
+++ b/pages/goods/seckillDetail.vue
@@ -120,7 +120,8 @@
 			</view>
 		</view>
 		<view v-if="storeVersion == 1 && goods.merchant_id > 0" class="merchant-info" @click="toShop()">
-			<image :src="goods.merchant.logoImage && goods.merchant.logoImage[0].external_url" mode="aspectFill"></image>
+			<image :src="goods.merchant.logoImage && goods.merchant.logoImage[0].external_url" mode="aspectFill">
+			</image>
 			<view class="info-box">
 				<view class="info-name">
 					<text>{{ goods.merchant.shop_name }}</text>
@@ -191,7 +192,8 @@
 			<view class="chosed" v-if="goods.remark">
 				<view class="title">须知</view>
 				<view class="info">
-					<u-read-more :toggle="true" font-size='24' text-indent='0' show-height="200" open-text='收起' close-text='展开'>
+					<u-read-more :toggle="true" font-size='24' text-indent='0' show-height="200" open-text='收起'
+						close-text='展开'>
 						<rich-text :nodes="goods.remark"></rich-text>
 					</u-read-more>
 				</view>
@@ -412,6 +414,7 @@
 	import * as address from '@/api/address.js'
 	import * as CartApi from '@/api/cart'
 	import * as SharpGoodsApi from '@/api/sharp/goods'
+	import store from '@/store'
 	export default {
 		components: {
 			SkuPopup,
@@ -633,7 +636,7 @@
 					this.$refs.setRange.secondPrice = item.seckill_price
 					this.$refs.setRange.secondQuota = item.is_limit == 1 ? true : false
 					this.$refs.setRange.quotaNum = item.limit_times;
-					this.$refs.setRange.cost_price_min=this.goods.cost_price_min
+					this.$refs.setRange.cost_price_min = this.goods.cost_price_min
 				}
 				this.$refs.setRange.afterSale = true;
 
@@ -1077,10 +1080,11 @@
 				// 获取推荐商品列表
 				const that = this;
 				// 构建页面参数
-				const params = that.$getShareUrlParams(this.options)
 				const res = await GoodsApi.goodsShortUrl({
-					page_url: `pages/goods/detail?${params}`,
-					page_title: that.goods.goods_name
+					page_url: encodeURIComponent('pages/goods/seckillDetail?refereeId=' + store.getters.userId +
+						'&goodsId=' + this.goods
+						.goods_id),
+					page_title: that.goods.goods_name,
 				})
 				if (res.data.url) {
 					let str =
@@ -1572,41 +1576,47 @@
 			}
 		}
 	}
-	
+
 	.merchant-info {
 		margin: 20rpx 18rpx 0 18rpx;
 		padding: 30rpx;
 		background: #fff;
 		display: flex;
+
 		>image {
 			width: 90rpx;
 			height: 90rpx;
 			margin-right: 20rpx;
 			flex-shrink: 0;
 		}
+
 		.info-box {
 			width: calc(100% - 110rpx);
 			display: flex;
 			flex-direction: column;
 			justify-content: space-between;
+
 			>.info-name {
 				font-size: 30rpx;
 				color: #333;
 				font-weight: bold;
 				display: flex;
 				align-items: center;
+
 				>text {
 					overflow: hidden;
 					text-overflow: ellipsis;
 					white-space: nowrap;
 					width: calc(100% - 21rpx);
 				}
+
 				>image {
 					margin-left: 10rpx;
 					width: 13rpx;
 					height: 24rpx;
 				}
 			}
+
 			>.label {
 				text {
 					display: inline-block;
@@ -1622,6 +1632,7 @@
 			}
 		}
 	}
+
 	.orderInfo {
 		// width: 720rpx;
 		background: #FFFFFF;