From f92e83daed7ae78405c42f56a806b91ac70cdd66 Mon Sep 17 00:00:00 2001
From: 15093570141 <141405260+17521612761@users.noreply.github.com>
Date: Mon, 14 Oct 2024 17:45:29 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91(=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5=E6=A8=A1=E5=9D=97=E5=BF=AB)=EF=BC=9A=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E8=B4=AD=E4=B9=B0=E8=AE=B0=E5=BD=95=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../classify-five/classify-five.vue           | 28 +++++++++++++------
 .../classify-four/classify-four.vue           | 26 ++++++++++++-----
 .../CoreShop/pages/classify/classify.vue      | 24 ++++++++--------
 .../components/home-article/home-article.vue  |  2 +-
 .../components/home-coupon/home-coupon.vue    |  2 +-
 .../home-img-window/home-img-window.vue       |  2 +-
 .../components/home-pinTuan/home-pinTuan.scss |  2 +-
 .../components/home-pinTuan/home-pinTuan.vue  |  2 +-
 .../goods-detail-info/goods-detail-info.vue   | 16 +++++++++--
 .../goods-detail-sku/goods-detail-sku.vue     |  4 +++
 .../pages/components/goods-detail/index.vue   |  9 ++++--
 .../activity/groupBuying/detail/detail.vue    |  9 ++++--
 .../activity/pinTuan/detail/detail.vue        |  9 ++++--
 .../activity/seckill/detail/detail.vue        |  9 ++++--
 .../activity/solitaire/detail/detail.vue      | 15 ++++++----
 .../pages/subpackage/goods/detail.vue         |  2 +-
 16 files changed, 111 insertions(+), 50 deletions(-)

diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify-page/classify-five/classify-five.vue b/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify-page/classify-five/classify-five.vue
index fdf2a36e..a27eaa61 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify-page/classify-five/classify-five.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify-page/classify-five/classify-five.vue
@@ -89,7 +89,7 @@
 					<text class="price">￥{{ state.cartMoney }}</text>
 				</view>
 			</view>
-			<view class="btn-buy" @click="handleRouteSwitchTab(RouteSwitchTabEnum.cart)">
+			<view class="btn-buy" @click="handleGoPay">
 				去结算
 			</view>
 		</view>
@@ -124,6 +124,7 @@
 
 <script setup lang="ts">
 	import { reactive, watch, ref, onMounted, getCurrentInstance, nextTick } from 'vue';
+	import { onShow } from '@dcloudio/uni-app';
 	import { advertPosition, UserToken } from '@/core/consts';
 	import { queryGoodsPageList, queryCartNumAndMoney, queryGoodsDetailByToken, queryGoodsDetail, queryAddCart } from '@/core/api';
 	import type { CategoriesType, Response, GoodsListType, GoodsType } from '@/core/models';
@@ -201,11 +202,7 @@
 			state.rightTabList = state.classifyData[0]?.child[0]?.child;
 
 			state.catId = state.classifyData[0].child[0]?.id;
-			getGoodsPageList();
-
-			if (uni.getStorageSync(UserToken)) {
-				getCartNumAndMoney();
-			}
+			getGoodsPageList(); 
 		}
 	})
 
@@ -218,7 +215,13 @@
 			}, 100)
 		})
 	})
-
+	
+	onShow(()=>{
+		if (uni.getStorageSync(UserToken)) {
+			getCartNumAndMoney();
+		}
+	});
+	
 	// 获取商品列表数据
 	const getGoodsPageList = async () => {
 		uni.showLoading({
@@ -258,7 +261,16 @@
 		state.goodsDetailData = goodsDetail.data;
 		state.showSku = true;
 	}
-
+	
+	/** 底部按钮去结算 */
+	const handleGoPay = () => {
+		if (!uni.getStorageSync(UserToken)) {
+			emits('handleShowLoginPopup');
+			return;
+		}
+		handleRouteSwitchTab(RouteSwitchTabEnum.cart);
+	}
+	
 	/** 添加购物车 */
 	const handleAddCart = async ({ productId, nums } : any) => {
 		if (!uni.getStorageSync(UserToken)) {
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify-page/classify-four/classify-four.vue b/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify-page/classify-four/classify-four.vue
index d6210de8..2dcb4a07 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify-page/classify-four/classify-four.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify-page/classify-four/classify-four.vue
@@ -60,7 +60,7 @@
 					<text class="price">￥{{ state.cartMoney }}</text>
 				</view>
 			</view>
-			<view class="btn-buy" @click="handleRouteSwitchTab(RouteSwitchTabEnum.cart)">
+			<view class="btn-buy" @click="handleGoPay">
 				去结算
 			</view>
 		</view>
@@ -76,6 +76,7 @@
 
 <script setup lang="ts">
 	import { reactive, watch } from 'vue';
+	import { onShow } from '@dcloudio/uni-app';
 	import { advertPosition } from '@/core/consts';
 	import { queryGoodsPageList, queryCartNumAndMoney, queryGoodsDetailByToken, queryGoodsDetail, queryAddCart } from '@/core/api';
 	import type { CategoriesType, Response, GoodsListType, GoodsType } from '@/core/models';
@@ -117,9 +118,9 @@
 		showSku: false,
 		goodsDetailData: {},
 	});
-	
+
 	const emits = defineEmits(['handleShowLoginPopup']);
-	
+
 	watch(() => props.data, (newVal : Array<CategoriesType>) => {
 		if (newVal) {
 			state.classifyData = newVal.map((item : CategoriesType) => {
@@ -135,13 +136,15 @@
 			state.rightTabList = state.classifyData[0]?.child;
 
 			getGoodsPageList();
-
-			if (uni.getStorageSync(UserToken)) {
-				getCartNumAndMoney();
-			}
 		}
 	})
 
+	onShow(() => {
+		if (uni.getStorageSync(UserToken)) {
+			getCartNumAndMoney();
+		}
+	});
+
 	/** 获取商品列表数据 */
 	const getGoodsPageList = async () => {
 		uni.showLoading({
@@ -182,6 +185,15 @@
 		state.showSku = true;
 	}
 
+	/** 底部按钮去结算 */
+	const handleGoPay = () => {
+		if (!uni.getStorageSync(UserToken)) {
+			emits('handleShowLoginPopup');
+			return;
+		}
+		handleRouteSwitchTab(RouteSwitchTabEnum.cart);
+	}
+
 	/** 添加购物车 */
 	const handleAddCart = async ({ productId, nums } : any) => {
 		if (!uni.getStorageSync(UserToken)) {
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify.vue b/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify.vue
index 39d58cc3..e4237d4f 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify.vue
@@ -69,27 +69,25 @@
 		height: 0,
 		keyWord: "",
 		showLoginModal: false,
-	})
-	const getAllCategories = async () => {
-		const allCategories : Response<Array<CategoriesType>> = await queryAllCategories();
-		state.categoriesList = allCategories.data || [];
-	}
-
-	onMounted(async () => {
+	})  
+	
+	onMounted(async () => { 
 		getAllCategories();
 		nextTick(() => {
 			// 屏幕总高度 - 顶部tab栏高度 - 顶部安全高度 - 底部安全高度 -  底部tabBar的默认高度50（如果修改了配置高度这里也要同步修改）
 			state.height = systemInfo.value.screenHeight - systemInfo.value.statusBarHeight - (systemInfo.value.system?.includes('iOS') ? 44 : 48) - systemInfo.value.safeAreaInsets?.bottom - 50;
 		})
 	})
-
+	
+	/** 获取购物车数量价格 */
+	const getAllCategories = async () => {
+		const allCategories : Response<Array<CategoriesType>> = await queryAllCategories();
+		state.categoriesList = allCategories.data || [];
+	}
+	
 	/** 搜索 */
 	const handleSearch = () => {
-		if (state.keyWord) {
-			handleRouteNavigateTo(`/pages/subpackage/category/category?key=${state.keyWord}`);
-		} else {
-			handleShowToast('请输入搜索内容');
-		}
+		handleRouteNavigateTo(`/pages/subpackage/category/category?key=${state.keyWord}`);
 	}
 
 	/** 显示登录弹框 */
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-article/home-article.vue b/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-article/home-article.vue
index d908d805..706e7aa7 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-article/home-article.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-article/home-article.vue
@@ -4,7 +4,7 @@
 			<view class="title-icon">
 				<text class="tit">{{ props.data.list[0].title }}</text>
 			</view>
-			<coreshop-view-more @hanldeClickViewMore="hanldeClickViewMore" />
+			<coreshop-view-more @hanldeClickViewMore="hanldeClickViewMore" title="查看详情" />
 		</view>
 		<view class="m-t-25" v-for="item, index in props.data.list" :key="index">
 			<coreshop-article :data="hanldeCombinationArticleData(item)"
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-coupon/home-coupon.vue b/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-coupon/home-coupon.vue
index a8c9f0b1..218f6b33 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-coupon/home-coupon.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-coupon/home-coupon.vue
@@ -6,7 +6,7 @@
 				<coreshop-view-more @hanldeClickViewMore="hanldeClickViewMore"></coreshop-view-more>
 			</view>
 			<view class="coupon-card-box">
-				<scroll-view :scroll-x="true" enable-flex class="scroll-box">
+				<scroll-view :scroll-x="true" class="scroll-box" :enable-flex="true">
 					<view class="card-box" v-for="item, index in props.data?.list?.slice(0, props.data.limit)"
 						:key="index">
 						<image class="coupon-bg" :src="handleStaticResources('/static/images/coupon-bg.jpg')"></image>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-img-window/home-img-window.vue b/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-img-window/home-img-window.vue
index 4e5677b4..941fa147 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-img-window/home-img-window.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-img-window/home-img-window.vue
@@ -3,7 +3,7 @@
 		<template v-if="props.data?.style != 0">
 			<view :class="['img-box', `img-box-${props.data?.style}`]">
 				<view class="img-item" v-for="item, index in props.data.list" :key="index"
-					:style="{ 'padding': `${props.data.margin / 2}px` }">
+					:style="{ 'padding': `${props.data.margin / 2}px` }" @click="handleAdvertiseDetail(item?.linkType, item?.linkValue)">
 					<image class="img" :src="item.image || handleStaticResources('/static/images/common/empty.png')"
 						mode="widthFix"></image>
 				</view>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-pinTuan/home-pinTuan.scss b/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-pinTuan/home-pinTuan.scss
index 5a37c9b0..7e8d9702 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-pinTuan/home-pinTuan.scss
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-pinTuan/home-pinTuan.scss
@@ -23,7 +23,7 @@
 		}
 	}
 
-	.pintuan-box {
+	.pintuan-list {
 		white-space: nowrap;
 		width: 100%;
 	}
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-pinTuan/home-pinTuan.vue b/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-pinTuan/home-pinTuan.vue
index 0f96603f..b7406c39 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-pinTuan/home-pinTuan.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-pinTuan/home-pinTuan.vue
@@ -7,7 +7,7 @@
 				<coreshop-view-more @hanldeClickViewMore="hanldeClickViewMore" color="#fff"
 					:icon="handleStaticResources('/static/images/icon/icon-rigth-fff.png')" />
 			</view>
-			<scroll-view :scroll-x="true" enable-flex class="m-t-25 pintuan-box">
+			<scroll-view :scroll-x="true" class="m-t-25 pintuan-list" :enable-flex="true">
 				<view v-for="item, index in props.data.list" :key="index" class="card-box">
 					<coreshop-goods-card imgWidth="290rpx" imgHeight="290rpx" type="vertical"
 						:goodsData="hanldeCombinationGoodsData(item)" @hanldeClickGoods="hanldeClickGoods">
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/components/goods-detail/components/goods-detail-info/goods-detail-info.vue b/CoreCms.Net.Uni-App/CoreShop/pages/components/goods-detail/components/goods-detail-info/goods-detail-info.vue
index e6c55d62..36338f8a 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/components/goods-detail/components/goods-detail-info/goods-detail-info.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/components/goods-detail/components/goods-detail-info/goods-detail-info.vue
@@ -81,7 +81,8 @@
 	import Point from '@/pages/components/custom-page/components/home-goods/point.vue';
 	import { handleShowToast } from '@/core/utils';
 	import CoreshopShare from '@/components/coreshop-share/coreshop-share.vue';
-
+	import { UserToken } from '@/core/consts'
+	
 	const props = withDefaults(defineProps<{
 		goodsDetailData : any,
 		isActivityGoods : boolean,
@@ -99,7 +100,9 @@
 		isFav: false,
 		showShare: false,
 	});
-
+	
+	const emits = defineEmits(['handleShowLoginPopup']);
+	
 	watch(() => props.goodsDetailData, (newVla : any) => {
 		if (newVla) {
 			state.isFav = newVla.isFav;
@@ -107,6 +110,11 @@
 	});
 
 	const handleToggleGoodsCollection = async () => {
+		if (!uni.getStorageSync(UserToken)) {
+			 emits('handleShowLoginPopup');
+			 return;
+		}
+		
 		const goodsCollection = await queryGoodsCollection({ id: props.goodsDetailData.id });
 		if (goodsCollection.status) {
 			state.isFav = !state.isFav;
@@ -118,6 +126,10 @@
 
 	/** 分享弹框显示与否 */
 	const handleToggleShowShare = () => {
+		if (!uni.getStorageSync(UserToken)) {
+			 emits('handleShowLoginPopup');
+			 return;
+		}
 		state.showShare = !state.showShare;
 	}
 </script>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/components/goods-detail/components/goods-detail-sku/goods-detail-sku.vue b/CoreCms.Net.Uni-App/CoreShop/pages/components/goods-detail/components/goods-detail-sku/goods-detail-sku.vue
index d3afdf60..5c179d85 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/components/goods-detail/components/goods-detail-sku/goods-detail-sku.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/components/goods-detail/components/goods-detail-sku/goods-detail-sku.vue
@@ -116,10 +116,12 @@
 	const handleChangeNumberVal = (e : any) => {
 		state.numberVal = e.value;
 	}
+	
 	/** sku弹框显示或者隐藏 */
 	const handleChangePopup = (e : any) => {
 		emits('handleChangePopup', e.show)
 	}
+	
 	/** sku选择 */
 	const handleChooseSku = (index : number, sku : GoodsSpecListType) => {
 		let chooseSku : GoodsSkuListType = {}; // 选中的sku
@@ -161,6 +163,7 @@
 		});
 
 	}
+	
 	/** 立即购买 */
 	const handleBuyNow = () => {
 		if (!handleHaveStock()) {
@@ -171,6 +174,7 @@
 			nums: state.numberVal,
 		});
 	}
+	
 	/** 判断库存 */
 	const handleHaveStock = () => {
 		if (state.chooseSku.stock === 0) {
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/components/goods-detail/index.vue b/CoreCms.Net.Uni-App/CoreShop/pages/components/goods-detail/index.vue
index cb7d4bf5..ce7086ee 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/components/goods-detail/index.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/components/goods-detail/index.vue
@@ -8,7 +8,7 @@
 		<slot name="tip"></slot>
 
 		<!-- 商品信息 价格名字之类的 -->
-		<GoodsDetailInfo :goodsDetailData="props.goodsDetailData" :shareType="props.shareType"
+		<GoodsDetailInfo :goodsDetailData="props.goodsDetailData" :shareType="props.shareType" @handleShowLoginPopup="handleShowLoginPopup"
 			:isActivityGoods="props.isActivityGoods" @handleToggleGoodsCollection="handleToggleGoodsCollection">
 			<template #countDown>
 				<slot name="countDown"></slot>
@@ -93,7 +93,7 @@
 		shareType: ShareEnum.index,    /** 分享类型 - 默认分享首页 */
 	});
 
-	const emits = defineEmits(['hanldeShowGoodSku', 'handleToggleGoodsCollection']);
+	const emits = defineEmits(['hanldeShowGoodSku', 'handleToggleGoodsCollection','handleShowLoginPopup']);
 
 	const state = reactive<{
 		commonQuestion : Array<CommonQuestionServiceType>;
@@ -170,6 +170,11 @@
 	const handleToggleGoodsCollection = () => {
 		emits('handleToggleGoodsCollection')
 	}
+	
+	/** 显示登录弹框 */
+	const handleShowLoginPopup = ()=>{
+		emits('handleShowLoginPopup')
+	}
 </script>
 
 <style lang="scss" scoped></style>
\ No newline at end of file
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/groupBuying/detail/detail.vue b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/groupBuying/detail/detail.vue
index 6ad46c9d..f35f90cf 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/groupBuying/detail/detail.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/groupBuying/detail/detail.vue
@@ -5,7 +5,7 @@
 			<GoodsDetail :goodsId="state.goodsDetailData?.id" :goodsDetailData="state.goodsDetailData"
 				:swiperBanner="state.swiperBanner" :spesDesc="state.spesDesc"
 				:goodsDetailContent="state.goodsDetailContent" :isActivityGoods="true" :shareType="ShareEnum.group"
-				@hanldeShowGoodSku="hanldeShowGoodSku">
+				@hanldeShowGoodSku="hanldeShowGoodSku" @handleShowLoginPopup="handleShowLoginPopup">
 				<template #tip>
 					<view class="tip-box" v-if="state.showTip && state.goodsDetailData.groupPromotionResult">
 						<view class="title">当前团购活动规则：</view>
@@ -199,7 +199,12 @@
 			handleShowToast(addCart.msg);
 		}
 	}
-
+	
+	/** 显示登录弹框 */
+	const handleShowLoginPopup = () => {
+		state.showLoginModal = true;
+	}
+	
 	/** 打开获取关闭login弹框 */
 	const handleChangeLoginPopup = (isShow : boolean) => {
 		state.showLoginModal = isShow;
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/pinTuan/detail/detail.vue b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/pinTuan/detail/detail.vue
index ac57033b..487e618f 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/pinTuan/detail/detail.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/pinTuan/detail/detail.vue
@@ -3,7 +3,7 @@
 		<view class="goods-detail">
 			<!-- 商品详情 -->
 			<GoodsDetail :goodsId="state.goodsDetailData?.id" :goodsDetailData="state.goodsDetailData"
-				:swiperBanner="state.swiperBanner" :shareType="ShareEnum.pinTuan"
+				:swiperBanner="state.swiperBanner" :shareType="ShareEnum.pinTuan" @handleShowLoginPopup="handleShowLoginPopup"
 				:goodsDetailContent="state.goodsDetailContent" :isActivityGoods="true">
 				<template #activityGoodsOtheService>
 					<view class="pinTuan-record" v-if="state.goodsDetailData?.pinTuanRecord?.length > 0">
@@ -272,7 +272,12 @@
 			handleShowToast(addCart.msg);
 		}
 	} 
-
+	
+	/** 显示登录弹框 */
+	const handleShowLoginPopup = () => {
+		state.showLoginModal = true;
+	}
+	
 	/** 打开获取关闭login弹框 */
 	const handleChangeLoginPopup = (isShow : boolean) => {
 		state.showLoginModal = isShow;
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/seckill/detail/detail.vue b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/seckill/detail/detail.vue
index 32ea1d0c..fdbd57c2 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/seckill/detail/detail.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/seckill/detail/detail.vue
@@ -3,7 +3,7 @@
 		<view class="goods-detail">
 			<!-- 商品详情 -->
 			<GoodsDetail :goodsId="state.goodsDetailData?.id" :goodsDetailData="state.goodsDetailData"
-				:swiperBanner="state.swiperBanner" :spesDesc="state.spesDesc"
+				:swiperBanner="state.swiperBanner" :spesDesc="state.spesDesc" @handleShowLoginPopup="handleShowLoginPopup"
 				:goodsDetailContent="state.goodsDetailContent" :isActivityGoods="true" :shareType="ShareEnum.seckill"
 				@hanldeShowGoodSku="hanldeShowGoodSku">
 				<template #tip>
@@ -199,7 +199,12 @@
 			handleShowToast(addCart.msg);
 		}
 	} 
-
+	
+	/** 显示登录弹框 */
+	const handleShowLoginPopup = () => {
+		state.showLoginModal = true;
+	}
+	
 	/** 打开获取关闭login弹框 */
 	const handleChangeLoginPopup = (isShow : boolean) => {
 		state.showLoginModal = isShow;
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/solitaire/detail/detail.vue b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/solitaire/detail/detail.vue
index 98e99d33..e662d121 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/solitaire/detail/detail.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/solitaire/detail/detail.vue
@@ -207,6 +207,10 @@
 
 	/**立即购买 */
 	const handleBuyNow = () => {
+		if (!uni.getStorageSync(UserToken)) {
+			state.showLoginModal = true;
+			return;
+		}
 		if (state.totalprice == 0) {
 			handleShowToast('请先选择商品');
 			return;
@@ -235,12 +239,7 @@
 				phoneNumber: shopConfigStore?.config?.shopMobile
 			});
 		}
-	}
-
-	/** 显示登录弹框 */
-	const handleShowLoginPopup = () => {
-		state.showLoginModal = true;
-	}
+	} 
 
 	/** 打开获取关闭login弹框 */
 	const handleChangeLoginPopup = (isShow : boolean) => {
@@ -281,6 +280,10 @@
 
 	/** 分享弹框显示与否 */
 	const handleToggleShowShare = () => {
+		if (!uni.getStorageSync(UserToken)) {
+			state.showLoginModal = true;
+			return;
+		}
 		state.showShare = !state.showShare;
 	}
 
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/goods/detail.vue b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/goods/detail.vue
index 6d353f3b..c28f3869 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/goods/detail.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/goods/detail.vue
@@ -6,7 +6,7 @@
 				:swiperBanner="state.swiperBanner" :goodsDetailContent="state.goodsDetailContent"
 				:userAgentGrade="state.userAgentGrade" :agentProductsList="state.agentProductsList"
 				:goodsPromotionList="state.goodsPromotionList" :spesDesc="state.spesDesc"
-				@hanldeShowGoodSku="hanldeShowGoodSku">
+				@hanldeShowGoodSku="hanldeShowGoodSku" @handleShowLoginPopup="handleShowLoginPopup">
 			</GoodsDetail>
 
 			<!-- 为您推荐 -->