From 66e483f53f47186d1670975d80852bb228672bfc Mon Sep 17 00:00:00 2001
From: 15093570141 <141405260+17521612761@users.noreply.github.com>
Date: Tue, 12 Nov 2024 20:49:47 +0800
Subject: [PATCH] =?UTF-8?q?uniapp=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91?=
 =?UTF-8?q?=EF=BC=9A=20=E6=8B=BC=E5=9B=A2=E8=AE=A2=E5=8D=95=E5=88=86?=
 =?UTF-8?q?=E4=BA=AB=E6=8C=89=E9=92=AE=E5=90=8E=E7=BB=AD=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E4=B8=8D=E9=80=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CoreShop/core/api/order.ts                |   78 +-
 .../goods-detail-info/goods-detail-info.vue   |    2 +-
 .../pages/share/sharePoster/sharePoster.vue   |    6 +-
 .../activity/pinTuan/detail/detail.scss       |   77 +
 .../activity/pinTuan/detail/detail.vue        |  610 ++++----
 .../activity/solitaire/detail/detail.vue      |    4 +-
 .../subpackage/member/order/detail/detail.vue | 1301 +++++++++--------
 7 files changed, 1126 insertions(+), 952 deletions(-)

diff --git a/CoreCms.Net.Uni-App/CoreShop/core/api/order.ts b/CoreCms.Net.Uni-App/CoreShop/core/api/order.ts
index 7a4338b9..898c5b49 100644
--- a/CoreCms.Net.Uni-App/CoreShop/core/api/order.ts
+++ b/CoreCms.Net.Uni-App/CoreShop/core/api/order.ts
@@ -3,91 +3,91 @@ import type { Response } from '@/core/models';
 
 /**  获取不同类型营销下单支持的配送方式 */
 export const queryOrderDistributionModel = (data : any) : Promise<Response<any>> => {
-	return post('Api/Order/GetOrderDistributionModel', {
-		data,
-	}, true);
+    return post('Api/Order/GetOrderDistributionModel', {
+        data,
+    }, true);
 }
 
 /**  获取全部订单列表 */
 export const queryOrderList = (data : any) : Promise<Response<any>> => {
-	return post('Api/Order/GetOrderList', {
-		data,
-	}, true);
+    return post('Api/Order/GetOrderList', {
+        data,
+    }, true);
 }
 
 /**  根据订单编号获取当前订单的支付信息 */
 export const queryOrderPayInfo = (data : any) : Promise<Response<any>> => {
-	return post('Api/Order/GetOrderPayInfo', {
-		data,
-	}, true);
+    return post('Api/Order/GetOrderPayInfo', {
+        data,
+    }, true);
 }
 
 /**  确认收货 */
 export const queryOrderConfirm = (data : any) : Promise<Response<any>> => {
-	return post('Api/Order/OrderConfirm', {
-		data,
-	}, true);
+    return post('Api/Order/OrderConfirm', {
+        data,
+    }, true);
 }
 
 /** 查询当前订单是否接入微信发货信息管理 */
 export const queryOrderShippingList = (data : any) : Promise<Response<any>> => {
-	return post('Api/Order/OrderShippingList', {
-		data,
-	}, true);
+    return post('Api/Order/OrderShippingList', {
+        data,
+    }, true);
 }
 
 /** 获取订单详情 */
 export const queryOrderDetails = (data : any) : Promise<Response<any>> => {
-	return post('Api/Order/OrderDetails', {
-		data,
-	}, true);
+    return post('Api/Order/OrderDetails', {
+        data,
+    }, true);
 }
 
 /** 取消订单 */
 export const queryCancelOrder = (data : any) : Promise<Response<any>> => {
-	return post('Api/Order/CancelOrder', {
-		data,
-	}, true);
+    return post('Api/Order/CancelOrder', {
+        data,
+    }, true);
 }
 
 /** 订单评价接口 */
 export const submitOrderEvaluate = (data : any) : Promise<Response<any>> => {
-	return post('Api/User/OrderEvaluate', {
-		data,
-	}, true);
+    return post('Api/User/OrderEvaluate', {
+        data,
+    }, true);
 }
 
 /** 判断用户下单可以使用多少积分 */
 export const queryUserPoint = (data : any) : Promise<Response<any>> => {
-	return post('Api/User/GetUserPoint', {
-		data,
-	}, true);
+    return post('Api/User/GetUserPoint', {
+        data,
+    }, true);
 }
 
 /** 根据订单id取拼团信息，用在订单详情页 */
 export const queryOrderPinTuanTeamInfo = (data : any) : Promise<Response<any>> => {
-	return post('Api/PinTuan/GetPinTuanTeam', {
-		data,
-	}, true);
+    return post('Api/PinTuan/GetPinTuanTeam', {
+        data,
+    }, true);
 }
 
 /** 获取发票是否开具 */
 export const queryCheckInvoice = (data : any) : Promise<Response<any>> => {
-	return post('Api/Order/CheckInvoice', {
-		data,
-	}, true);
+    return post('Api/Order/CheckInvoice', {
+        data,
+    }, true);
 }
 
 /** 提交发票申请 */
 export const querySubmitInvoiceApply = (data : any) : Promise<Response<any>> => {
-	return post('Api/Order/SubmitInvoiceApply', {
-		data,
-	}, true);
+    return post('Api/Order/SubmitInvoiceApply', {
+        data,
+    }, true);
 }
 
 /** 物流信息接口 */
 export const queryLogisticsByApi = (data : any) : Promise<Response<any>> => {
-	return post('Api/Order/LogisticsByApi', {
-		data,
-	}, true);
+    return post('Api/Order/LogisticsByApi', {
+        data,
+    }, true);
 }
\ No newline at end of file
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 cf449ca7..94c9beeb 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
@@ -26,7 +26,7 @@
 		</view>
 
 		<!-- 积分兑换价格 -->
-		<Point :flex="true" :data="props.goodsDetailData?.product" fontSize="24rpx"></Point>
+		<Point v-if="!props.isActivityGoods" :flex="true" :data="props.goodsDetailData?.product" fontSize="24rpx"></Point>
 
 		<view class="name-box" v-if="props.goodsDetailData?.name || props.goodsDetailData?.brief">
 			<view class="name">{{ props.goodsDetailData?.name }}</view>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/share/sharePoster/sharePoster.vue b/CoreCms.Net.Uni-App/CoreShop/pages/share/sharePoster/sharePoster.vue
index 530db1e7..27aa6856 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/share/sharePoster/sharePoster.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/share/sharePoster/sharePoster.vue
@@ -41,7 +41,7 @@
 						<lpainterText :text="'截止：' + state.shareData.endTime"
 							css="color: #212121; background: #ffb400; padding:8rpx 20rpx;border-radius:12rpx" />
 					</lpainterView>
-					<lpainterView css="margin-top: 30rpx; font-size: 26rpx; color: #8c5400">
+					<lpainterView css="width: 570rpx;margin-top: 30rpx; font-size: 26rpx; color: #8c5400">
 						<lpainterText :text="state.shareData.brief"
 							css=" background: #fff4d9; padding:8rpx 20rpx; border-radius:12rpx" />
 					</lpainterView>
@@ -130,7 +130,7 @@
 		if (state.shareType == ShareEnum.goods) {
 			/** 获取商品详情 */
 			getGoodsDetail(query)
-		} else if (state.shareType == ShareEnum.pinTuan || state.shareType === ShareEnum.addPinTuan) {
+		} else if (state.shareType == ShareEnum.pinTuan || state.shareType == ShareEnum.addPinTuan) {
 			/** 获取活动拼团详情 */
 			getActivityPinTuan(query);
 		} else if (state.shareType == ShareEnum.serviceGoods) {
@@ -196,7 +196,7 @@
 			state.shareData.mktprice = goodsDetail.data?.mktprice;
 
 			state.shareData.showPinTuanArguments = true;
-			state.shareData.endTime = goodsDetail.data?.groupEndTime;
+			state.shareData.endTime = goodsDetail.data?.pinTuanRule?.endTime;
 			state.shareData.peopleNumber = goodsDetail.data?.pinTuanRule?.peopleNumber;
 		} else {
 			handleShowToast(goodsDetail.msg, 'none', () => {
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/pinTuan/detail/detail.scss b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/pinTuan/detail/detail.scss
index f757d6d1..2d92ed81 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/pinTuan/detail/detail.scss
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/pinTuan/detail/detail.scss
@@ -86,3 +86,80 @@
 		background-color: #d33123;
 	}
 }
+.pinTuan-popup-box{
+    padding: 40rpx;
+    .time-title{
+        font-size: 27rpx;
+        text-align: center;
+        margin-bottom: 5rpx;
+    }
+    .time{
+        text-align: center;
+    }
+    .teams-box{
+        margin-top: 40rpx;
+        display: flex;
+        flex-wrap: wrap;
+        justify-content: center;
+        .img-box{
+            position: relative;
+            width: 80rpx;
+            height: 80rpx;
+            border-radius: 50%;
+            margin-right: 30rpx;
+            margin-bottom: 20rpx;
+            .tit{
+                position: absolute;
+                top: -5rpx;
+                left: -10rpx;
+                display: inline-block;
+                background-color: #d33123;
+                color: #fff;
+                font-size: 22rpx;
+                z-index: 98;
+                padding: 0 10rpx;
+                border-radius: 10rpx;
+                -webkit-transform: scale(0.8);
+                transform: scale(0.8);
+            }
+            .img{
+                display: block;
+                width: 80rpx;
+                height: 80rpx;
+                border: 1px solid #d33123;
+                border-radius: 50%;
+            }
+        }
+        .need-peo{
+            width: 80rpx;
+            height: 80rpx;
+            border-radius: 50%;
+            display: flex;
+            border: 1px dashed #e1e1e1;
+            margin-right: 30rpx;
+            margin-bottom: 20rpx;
+            .tit{
+                margin: auto;
+                color: #d1d1d1;
+                font-size: 27rpx;
+            }
+        } 
+    }
+    .peo-box{
+        margin-top: 20rpx;
+        text-align: center;
+        .peo{
+            color: #d33123;
+        }
+    }
+    .btn-box{
+        margin: 40rpx auto 0;
+        background-color: #d33123;
+        font-size: 27rpx;
+        padding: 20rpx 0;
+        justify-content: center;
+        width: 400rpx;
+        color: #fff;
+        border-radius: 20px;
+    }
+}
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 d7e9edc0..0e21152d 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
@@ -1,310 +1,350 @@
 <template>
-	<coreshop-page bgColor="rgba(0,0,0,0)" :isShowStatusBarHeight="false" :placeholder="false" showLoginModalDom
-		needLoadingPage :loadingPage="loadingPage">
-		<view class="goods-detail">
-			<!-- 商品详情 -->
-			<GoodsDetail :goodsId="state.goodsDetailData?.id" :goodsDetailData="state.goodsDetailData"
-				:swiperBanner="state.swiperBanner" :shareType="ShareEnum.pinTuan"
-				:goodsDetailContent="state.goodsDetailContent" :isActivityGoods="true">
-				<template #activityGoodsOtheService>
-					<view class="pinTuan-record" v-if="state.goodsDetailData?.pinTuanRecord?.length > 0">
-						<view class="title">
-							<view class="tit">开团信息</view>
-							<view class="desc">{{ state.goodsDetailData?.pinTuanRecordNums || '0' }}人在拼单，可直接参与</view>
-						</view>
-						<view class="pinTuan-box">
-							<view class="item-box" v-for="item, index in state.goodsDetailData?.pinTuanRecord"
-								:key="index">
-								<view class="msg-box">
-									<view class="msg">还差 <text class="red">{{ item.teamNums || '' }}人</text> 拼成</view>
-									<view class="time">
-										剩余：
-										<uv-count-down :time="item.lastTime * 1000" format="HH:mm:ss"></uv-count-down>
-									</view>
-								</view>
-								<view class="peo-box">
-									<image class="peo" v-for="cell, cellIndex in item.teams" :key="cellIndex"
-										:src="cell.userAvatar"></image>
-								</view>
-								<view class="peo-share">
-									<uv-button v-if="item.isOverdue" type="success" :disabled="true" size="mini"
-										text="已结束"></uv-button>
-									<uv-button v-else type="success" size="mini" text="去拼单"
-										@click="handleSplicingOrders(item.teamId)"></uv-button>
-								</view>
-							</view>
-						</view>
-					</view>
-				</template>
-			</GoodsDetail>
+    <coreshop-page bgColor="rgba(0,0,0,0)" :isShowStatusBarHeight="false" :placeholder="false" showLoginModalDom
+        needLoadingPage :loadingPage="loadingPage">
+        <view class="goods-detail">
+            <!-- 商品详情 -->
+            <GoodsDetail :goodsId="state.goodsDetailData?.id" :goodsDetailData="state.goodsDetailData"
+                :swiperBanner="state.swiperBanner" :shareType="ShareEnum.pinTuan"
+                :goodsDetailContent="state.goodsDetailContent" :isActivityGoods="true">
+                <template #activityGoodsOtheService>
+                    <view class="pinTuan-record" v-if="state.goodsDetailData?.pinTuanRecord?.length > 0">
+                        <view class="title">
+                            <view class="tit">开团信息</view>
+                            <view class="desc">{{ state.goodsDetailData?.pinTuanRecordNums || '0' }}人在拼单，可直接参与</view>
+                        </view>
+                        <view class="pinTuan-box">
+                            <view class="item-box" v-for="item, index in state.goodsDetailData?.pinTuanRecord"
+                                :key="index">
+                                <view class="msg-box">
+                                    <view class="msg">还差 <text class="red">{{ item.teamNums || '' }}人</text> 拼成</view>
+                                    <view class="time">
+                                        剩余：
+                                        <uv-count-down :time="item.lastTime * 1000" format="HH:mm:ss"></uv-count-down>
+                                    </view>
+                                </view>
+                                <view class="peo-box">
+                                    <image class="peo" v-for="cell, cellIndex in item.teams" :key="cellIndex"
+                                        :src="cell.userAvatar"></image>
+                                </view>
+                                <view class="peo-share">
+                                    <uv-button v-if="item.isOverdue" type="success" :disabled="true" size="mini"
+                                        text="已结束"></uv-button>
+                                    <uv-button v-else type="success" size="mini" text="去拼单"
+                                        @click="handleSplicingOrders(item.teamId)"></uv-button>
+                                </view>
+                            </view>
+                        </view>
+                    </view>
+                </template>
+            </GoodsDetail>
 
-			<!-- 为您推荐 -->
-			<GoodsDetailRecommend></GoodsDetailRecommend>
+            <!-- 为您推荐 -->
+            <GoodsDetailRecommend></GoodsDetailRecommend>
 
-			<!-- 底部 购买 -->
-			<GoodsDetailBottomTabbar>
-				<template #bottomTabbar>
-					<view class="btn-box">
-						<view class="btn" @click="handleSingleBuy">
-							<view class="box">
-								<view class="num">￥{{ state.goodsDetailData.price }}</view>
-								<view class="tit">单独购买</view>
-							</view>
-						</view>
-						<view class="btn buy" @click="handleMultipleBuy">
-							<view class="box">
-								<view class="num">￥{{ state.goodsDetailData.pinTuanPrice }}</view>
-								<view class="tit">发起拼团</view>
-							</view>
-						</view>
-					</view>
-				</template>
-			</GoodsDetailBottomTabbar>
+            <!-- 底部 购买 -->
+            <GoodsDetailBottomTabbar>
+                <template #bottomTabbar>
+                    <view class="btn-box">
+                        <view class="btn" @click="handleSingleBuy">
+                            <view class="box">
+                                <view class="num">￥{{ state.goodsDetailData.price }}</view>
+                                <view class="tit">单独购买</view>
+                            </view>
+                        </view>
+                        <view class="btn buy" @click="handleMultipleBuy()">
+                            <view class="box">
+                                <view class="num">￥{{ state.goodsDetailData.pinTuanPrice }}</view>
+                                <view class="tit">发起拼团</view>
+                            </view>
+                        </view>
+                    </view>
+                </template>
+            </GoodsDetailBottomTabbar>
 
-			<!-- 商品sku弹框 -->
-			<GoodsDetailSkuPopup :showSku="state.showSku" :goodsDetailData="state.goodsDetailData"
-				:isShowAddCartBtn="false" :buyNowNowloading="loading" @handleChangePopup="handleChangePopup"
-				@handleBuyNow="handleBuyNow" :btnBuyTitlt="state.btnBuyTitlt">
-			</GoodsDetailSkuPopup>
-		</view>
-	</coreshop-page>
+            <!-- 商品sku弹框 -->
+            <GoodsDetailSkuPopup :showSku="state.showSku" :goodsDetailData="state.goodsDetailData"
+                :isShowAddCartBtn="false" :buyNowNowloading="loading" @handleChangePopup="handleChangePopup"
+                @handleBuyNow="handleBuyNow" :btnBuyTitlt="state.btnBuyTitlt">
+            </GoodsDetailSkuPopup>
+            
+            <!-- 分享进来的参与拼团弹框 -->
+            <uv-popup ref="pinTuanPopup" mode="bottom" :closeable="true">
+                <view class="pinTuan-popup-box">
+                    <view class="time-title">剩余时间：</view>
+                    <view class="time">
+                        <uv-count-down :time="state.teamInfo.lastTime * 1000" :autoStart="true" :millisecond="true" format="DD天HH时mm分ss秒"></uv-count-down>
+                    </view>
+                    <view class="teams-box">
+                        <view class="img-box" v-for="item,index in state.teamInfo.teams" :key="index">
+                            <text class="tit" v-if="item.recordId == item.teamId">拼主</text>
+                            <image class="img" :src="item.userAvatar"></image>
+                        </view>
+                        <view class="need-peo" v-if="state.teamInfo?.teamNums" v-for="item in state.teamInfo?.teamNums" :key="item">
+                            <text class="tit">?</text>
+                        </view>
+                    </view>
+                    <view class="peo-box">
+                        还差 <text class="peo">{{ state.teamInfo?.teamNums || '' }}</text> 人，赶快拼单吧
+                    </view>
+                    <view class="btn-box" @click="handleJoinGroupBuy">
+                        参与拼团
+                    </view>
+                </view>
+            </uv-popup>
+        </view>
+    </coreshop-page>
 </template>
 <script setup lang="ts">
-	import { reactive, ref } from 'vue';
-	import { onLoad, onShareAppMessage, onShareTimeline, onPullDownRefresh } from '@dcloudio/uni-app';
-	import { queryPinTuanGoodsDetail, queryCartNum, queryAddCart, queryOrderPinTuanTeamInfo } from '@/core/api';
-	import type { Response } from '@/core/models';
-	import { UserToken, shareUrl } from '@/core/consts'
-	import { useCartStore, useLoginStore } from '@/core/store';
-	import { PaymentTypeEnum, ShareEnum, ShareClientEnum, ShareModelEnum } from '@/core/enum';
-	import { handleRouteNavigateTo, handleShowToast, getShareUrl } from '@/core/utils';
-	import { deepClone } from '@/uni_modules/uv-ui-tools/libs/function/index.js';
+    import { reactive, ref } from 'vue';
+    import { onLoad, onShareAppMessage, onShareTimeline, onPullDownRefresh } from '@dcloudio/uni-app';
+    import { queryPinTuanGoodsDetail, queryCartNum, queryAddCart, queryOrderPinTuanTeamInfo } from '@/core/api';
+    import type { Response } from '@/core/models';
+    import { UserToken, shareUrl } from '@/core/consts'
+    import { useCartStore, useLoginStore } from '@/core/store';
+    import { PaymentTypeEnum, ShareEnum, ShareClientEnum, ShareModelEnum } from '@/core/enum';
+    import { handleRouteNavigateTo, handleShowToast, getShareUrl } from '@/core/utils';
+    import { deepClone } from '@/uni_modules/uv-ui-tools/libs/function/index.js';
 
-	import GoodsDetail from '@/pages/components/goods-detail/index.vue';
-	import GoodsDetailRecommend from '@/pages/components/goods-detail/components/goods-detail-recommend/goods-detail-recommend.vue';
-	import GoodsDetailSkuPopup from '@/pages/components/goods-detail/components/goods-detail-sku/goods-detail-sku.vue';
-	import GoodsDetailBottomTabbar from '@/pages/components/goods-detail/components/goods-detail-bottom-tabbar/goods-detail-bottom-tabbar.vue';
-	import { useLoadingFn } from '@/core/hooks';
+    import GoodsDetail from '@/pages/components/goods-detail/index.vue';
+    import GoodsDetailRecommend from '@/pages/components/goods-detail/components/goods-detail-recommend/goods-detail-recommend.vue';
+    import GoodsDetailSkuPopup from '@/pages/components/goods-detail/components/goods-detail-sku/goods-detail-sku.vue';
+    import GoodsDetailBottomTabbar from '@/pages/components/goods-detail/components/goods-detail-bottom-tabbar/goods-detail-bottom-tabbar.vue';
+    import { useLoadingFn } from '@/core/hooks';
 
-	interface QueryParams {
-		id : number;
-		teamId ?: number;
-	}
+    interface QueryParams {
+        id : number;
+        teamId ?: number;
+    }
 
-	/** 登录store */
-	const _useLoginStore = useLoginStore();
+    /** 登录store */
+    const _useLoginStore = useLoginStore();
 
-	/** 获取购物车数据 */
-	const cartStore = useCartStore();
+    /** 获取购物车数据 */
+    const cartStore = useCartStore();
+    
+    /** 分享进来的参与拼团弹框 */
+    const pinTuanPopup = ref();
+    
+    const state = reactive<{
+        id : number;
+        goodsDetailData : any,
+        swiperBanner : Array<string>;
+        goodsDetailContent : string;
+        skuPrice : Number;
+        defaultSkuList : Array<any>;
+        activitySkuList : Array<any>;
+        showSku : boolean;
+        teamId : number;
+        isSingleBuy : boolean;
+        btnBuyTitlt : string;
+        teamInfo : any;
+        shareUrl : string;
+    }>({
+        id: 0,
+        goodsDetailData: {},
+        swiperBanner: [],
+        goodsDetailContent: "",
+        skuPrice: 0,
+        defaultSkuList: [],
+        activitySkuList: [],
+        showSku: false,
+        teamId: 0,
+        isSingleBuy: true,
+        btnBuyTitlt: "发起拼团",
+        teamInfo: {},
+        shareUrl: "",
+    });
 
-	const state = reactive<{
-		id : number;
-		goodsDetailData : any,
-		swiperBanner : Array<string>;
-		goodsDetailContent : string;
-		skuPrice : Number;
-		defaultSkuList : Array<any>;
-		activitySkuList : Array<any>;
-		showSku : boolean;
-		teamId : number;
-		isSingleBuy : boolean;
-		btnBuyTitlt : string;
-		teamInfo : any;
-		shareUrl : string;
-	}>({
-		id: 0,
-		goodsDetailData: {},
-		swiperBanner: [],
-		goodsDetailContent: "",
-		skuPrice: 0,
-		defaultSkuList: [],
-		activitySkuList: [],
-		showSku: false,
-		teamId: 0,
-		isSingleBuy: true,
-		btnBuyTitlt: "发起拼团",
-		teamInfo: {},
-		shareUrl: "",
-	});
+    const loading = ref(false);
+    const loadingPage = ref(true);
+    const handleBuyNow = useLoadingFn(onBuyNow, loading);
+    const handleGetGoodsDetail = useLoadingFn(getGoodsDetail, loadingPage);
 
-	const loading = ref(false);
-	const loadingPage = ref(true);
-	const handleBuyNow = useLoadingFn(onBuyNow, loading);
-	const handleGetGoodsDetail = useLoadingFn(getGoodsDetail, loadingPage);
+    onLoad((query : QueryParams) => {
+        if (query?.teamId) {
+            state.teamId = query?.teamId;
+            state.goodsDetailData = {
+                teamId: query?.teamId
+            };
+            getOrderPinTuanTeamInfo(query?.teamId);
+        }
+        /** 获取商品详情 */
+        state.id = Number(query.id);
+        handleGetGoodsDetail();
+    });
 
-	onLoad((query : QueryParams) => {
-		if (query?.teamId) {
-			state.teamId = query?.teamId;
-			state.goodsDetailData = {
-				teamId: query?.teamId
-			};
-			getOrderPinTuanTeamInfo(query?.teamId);
-		}
-		/** 获取商品详情 */
-		state.id = Number(query.id);
-		handleGetGoodsDetail();
-	});
+    onPullDownRefresh(async () => {
+        await handleGetGoodsDetail();
+        uni.stopPullDownRefresh();
+    });
 
-	onPullDownRefresh(async () => {
-		await handleGetGoodsDetail();
-		uni.stopPullDownRefresh();
-	});
+    async function getGoodsDetail() {
+        let data = {
+            id: state.id,
+            data: true,
+        }
+        if (uni.getStorageSync(UserToken)) {
+            data['token'] = uni.getStorageSync(UserToken)
+        }
+        const goodsDetail : Response<any> = await queryPinTuanGoodsDetail(data);
 
-	async function getGoodsDetail() {
-		let data = {
-			id: state.id,
-			data: true,
-		}
-		if (uni.getStorageSync(UserToken)) {
-			data['token'] = uni.getStorageSync(UserToken)
-		}
-		const goodsDetail : Response<any> = await queryPinTuanGoodsDetail(data);
+        /** 增加活动价格，并合并对象，可能会存在 teamId */
+        Object.assign(state.goodsDetailData, {
+            ...goodsDetail.data,
+            activityPrice: goodsDetail.data.pinTuanPrice,
+        });
 
-		/** 增加活动价格，并合并对象，可能会存在 teamId */
-		Object.assign(state.goodsDetailData, {
-			...goodsDetail.data,
-			activityPrice: goodsDetail.data.pinTuanPrice,
-		});
+        /** 默认价格 */
+        state.skuPrice = goodsDetail?.data?.price;
+        /** 商品轮播图 */
+        state.swiperBanner = goodsDetail?.data?.images?.split(',');
+        /** 商品详情内容 */
+        state.goodsDetailContent = goodsDetail?.data?.intro;
+        /** 默认sku */
+        state.defaultSkuList = deepClone(goodsDetail?.data?.skuList?.sku_list);
+        /** 活动商品价格sku */
+        state.activitySkuList = deepClone(state.goodsDetailData?.skuList?.sku_list?.map((item : any) => {
+            item.price = (Number(item.price) - Number(state.goodsDetailData.pinTuanRule.discountAmount));
+            return item;
+        }));
+        /** 如果用户登录，获取购物车数量 */
+        if (uni.getStorageSync(UserToken)) {
+            getCartNum();
+        }
+        state.shareUrl = await getShareUrl({
+            client: ShareClientEnum.wxMiNiProgram,
+            url: shareUrl,
+            type: ShareModelEnum.url,
+            page: ShareEnum.pinTuan,
+            params: {
+                groupId: state.id,
+                goodsId: state.goodsDetailData.id,
+                teamId: state.teamId
+            }
+        })
+    }
 
-		/** 默认价格 */
-		state.skuPrice = goodsDetail?.data?.price;
-		/** 商品轮播图 */
-		state.swiperBanner = goodsDetail?.data?.images?.split(',');
-		/** 商品详情内容 */
-		state.goodsDetailContent = goodsDetail?.data?.intro;
-		/** 默认sku */
-		state.defaultSkuList = deepClone(goodsDetail?.data?.skuList?.sku_list);
-		/** 活动商品价格sku */
-		state.activitySkuList = deepClone(state.goodsDetailData?.skuList?.sku_list?.map((item : any) => {
-			item.price = (Number(item.price) - Number(state.goodsDetailData.pinTuanRule.discountAmount));
-			return item;
-		}));
-		/** 如果用户登录，获取购物车数量 */
-		if (uni.getStorageSync(UserToken)) {
-			getCartNum();
-		}
-		state.shareUrl = await getShareUrl({
-			client: ShareClientEnum.wxMiNiProgram,
-			url: shareUrl,
-			type: ShareModelEnum.url,
-			page: ShareEnum.pinTuan,
-			params: {
-				groupId: state.id,
-				goodsId: state.goodsDetailData.id,
-				teamId: state.teamId
-			}
-		})
-	}
+    /** 获取通过分享进来的拼团数据 */
+    const getOrderPinTuanTeamInfo = async (teamId : number) => {
+        const teamInfo : Response<any> = await queryOrderPinTuanTeamInfo({ teamId, });
+        if (teamInfo.status) {
+            state.teamInfo = teamInfo?.data;
+            pinTuanPopup.value.open();
+        } else {
+            handleShowToast(teamInfo.msg)
+        }
+    }
+    /** 获取购物车数量 */
+    const getCartNum = async () => {
+        const num : Response<number> = await queryCartNum();
+        cartStore.setCartNum(num?.data || 0);
+    }
+    
+    /** 单独购买 */
+    const handleSingleBuy = () => {
+        _useLoginStore.checkLogin(() => {
+            state.teamId = 0;
+            state.showSku = true;
+            state.isSingleBuy = true;
+            state.btnBuyTitlt = '单独购买';
+            state.goodsDetailData.skuList.sku_list = state.defaultSkuList;
+        });
+    }
+    
+    /** 拼团购买统一调用 */
+    const handlePinTuan = (title?:string)=>{
+        _useLoginStore.checkLogin(() => { 
+            state.showSku = true;
+            state.isSingleBuy = false;
+            state.btnBuyTitlt = title || '发起拼团';
+            state.goodsDetailData.skuList.sku_list = state.activitySkuList;
+        });
+    }
+    
+    /** 弹框中的按钮参与拼团购买 */
+    const handleJoinGroupBuy = ()=>{
+        pinTuanPopup.value.close();
+        handlePinTuan('参与拼团');
+    } 
+    
+    /** 拼团购买 */
+    const handleMultipleBuy = () => {
+        state.teamId = 0;
+        handlePinTuan()
+    }
 
-	/** 获取通过分享进来的拼团数据 */
-	const getOrderPinTuanTeamInfo = async (teamId : number) => {
-		const teamInfo : Response<any> = await queryOrderPinTuanTeamInfo({ teamId, });
-		if (teamInfo.status) {
-			state.teamInfo = teamInfo?.data;
-		} else {
-			handleShowToast(teamInfo.msg)
-		}
-	}
-	/** 获取购物车数量 */
-	const getCartNum = async () => {
-		const num : Response<number> = await queryCartNum();
-		cartStore.setCartNum(num?.data || 0);
-	}
+    /** 去拼单购买 */
+    const handleSplicingOrders = (teamId : number) => {
+        state.teamId = teamId;
+        handlePinTuan('去拼单');
+    } 
+    
+    /** 关闭sku弹框 */
+    const handleChangePopup = (show : boolean) => {
+        state.showSku = show;
+    }
 
-	/** 单独购买 */
-	const handleSingleBuy = () => {
-		_useLoginStore.checkLogin(() => {
-			state.teamId = 0;
-			state.showSku = true;
-			state.isSingleBuy = true;
-			state.btnBuyTitlt = '单独购买';
-			state.goodsDetailData.skuList.sku_list = state.defaultSkuList;
-		});
-	}
+    /** 立即购买购买 */
+    async function onBuyNow({ productId, nums } : any) {
+        if (state.isSingleBuy) {
+            await handleSingleQuery(productId, nums)
+        } else {
+            await handleMultipleQuery(productId, nums)
+        }
+    }
 
-	/** 拼团购买 */
-	const handleMultipleBuy = () => {
-		_useLoginStore.checkLogin(() => {
-			state.teamId = 0;
-			state.showSku = true;
-			state.isSingleBuy = false;
-			state.btnBuyTitlt = '发起拼团';
-			state.goodsDetailData.skuList.sku_list = state.activitySkuList;
-		});
-	}
+    /** 处理单个购买请求 */
+    const handleSingleQuery = async (productId : number, nums : number) => {
+        const addCart : Response<number> = await queryAddCart({
+            ProductId: productId,
+            Nums: nums,
+            type: PaymentTypeEnum.pinTuan,
+            cartType: PaymentTypeEnum.common,
+        });
+        if (addCart.status) {
+            handleRouteNavigateTo(`/pages/order/submit/submit?cartIds=${addCart.data}`)
+            /** 关闭sku弹框 */
+            handleChangePopup(false);
+        } else {
+            handleShowToast(addCart.msg);
+        }
+    }
 
-	/** 去拼单 */
-	const handleSplicingOrders = (teamId : number) => {
-		state.teamId = teamId;
-		handleMultipleBuy();
-	}
+    /** 处理拼团购买请求 */
+    const handleMultipleQuery = async (productId : number, nums : number) => {
+        const addCart : Response<number> = await queryAddCart({
+            ProductId: productId,
+            Nums: nums,
+            type: PaymentTypeEnum.pinTuan,
+            cartType: PaymentTypeEnum.pinTuan,
+            objectId: state.id,
+            teamId: state.teamId
+        });
+        if (addCart.status) {
+            handleRouteNavigateTo(`/pages/order/submit/submit?cartIds=${addCart.data}&orderType=${PaymentTypeEnum.pinTuan}&objectId=${state.id}${state.teamId != 0 ? `&teamId=${state.teamId}` : ''}`)
+            /** 关闭sku弹框 */
+            handleChangePopup(false);
+        } else {
+            handleShowToast(addCart.msg);
+        }
+    }
 
-	/** 关闭sku弹框 */
-	const handleChangePopup = (show : boolean) => {
-		state.showSku = show;
-	}
-
-	/** 立即购买购买 */
-	async function onBuyNow({ productId, nums } : any) {
-		if (state.isSingleBuy) {
-			await handleSingleQuery(productId, nums)
-		} else {
-			await handleMultipleQuery(productId, nums)
-		}
-	}
-
-	/** 处理单个购买请求 */
-	const handleSingleQuery = async (productId : number, nums : number) => {
-		const addCart : Response<number> = await queryAddCart({
-			ProductId: productId,
-			Nums: nums,
-			type: PaymentTypeEnum.pinTuan,
-			cartType: PaymentTypeEnum.common,
-		});
-		if (addCart.status) {
-			handleRouteNavigateTo(`/pages/order/submit/submit?cartIds=${addCart.data}`)
-			/** 关闭sku弹框 */
-			handleChangePopup(false);
-		} else {
-			handleShowToast(addCart.msg);
-		}
-	}
-
-	/** 处理拼团购买请求 */
-	const handleMultipleQuery = async (productId : number, nums : number) => {
-		const addCart : Response<number> = await queryAddCart({
-			ProductId: productId,
-			Nums: nums,
-			type: PaymentTypeEnum.pinTuan,
-			cartType: PaymentTypeEnum.pinTuan,
-			objectId: state.id,
-			teamId: state.teamId
-		});
-		if (addCart.status) {
-			handleRouteNavigateTo(`/pages/order/submit/submit?cartIds=${addCart.data}&orderType=${PaymentTypeEnum.pinTuan}&objectId=${state.id}${state.teamId != 0 ? `&teamId=${state.teamId}` : ''}`)
-			/** 关闭sku弹框 */
-			handleChangePopup(false);
-		} else {
-			handleShowToast(addCart.msg);
-		}
-	}
-	
-	/** 分享 */
-	onShareAppMessage(() => {
-		return {
-			title: state.goodsDetailData.name,
-			imageUrl: state.goodsDetailData.image,
-			path: state.shareUrl
-		}
-	});
-	onShareTimeline(() => {
-		return {
-			title: state.goodsDetailData.name,
-			imageUrl: state.goodsDetailData.image,
-			path: state.shareUrl
-		}
-	});
+    /** 分享 */
+    onShareAppMessage(() => {
+        return {
+            title: state.goodsDetailData.name,
+            imageUrl: state.goodsDetailData.image,
+            path: state.shareUrl
+        }
+    });
+    onShareTimeline(() => {
+        return {
+            title: state.goodsDetailData.name,
+            imageUrl: state.goodsDetailData.image,
+            path: state.shareUrl
+        }
+    });
 </script>
 <style lang="scss" scoped>
-	@import './detail.scss';
+    @import './detail.scss';
 </style>
\ No newline at end of file
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 c0343cfa..6010b928 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
@@ -99,10 +99,10 @@
 <script setup lang="ts">
 	import { reactive, ref } from 'vue';
 	import { onLoad, onShareAppMessage, onShareTimeline, onPullDownRefresh } from '@dcloudio/uni-app';
-	import { querySolitaireDetail, queryShare, queryAddCart, queryRemoveCart } from '@/core/api';
+	import { querySolitaireDetail, queryAddCart, queryRemoveCart } from '@/core/api';
 	import { ShareClientEnum, ShareModelEnum, ShareEnum, EmptyEnum, PaymentTypeEnum, AddCartEnum } from '@/core/enum';
 	import type { Response } from '@/core/models';
-	import { UserToken, shareUrl } from '@/core/consts'
+	import { shareUrl } from '@/core/consts'
 	import { useShopConfigStore, useLoginStore } from '@/core/store';
 	import { handleShowToast, handleRouteNavigateTo, getShareUrl } from '@/core/utils';
 	import { timeFormat } from '@/uni_modules/uv-ui-tools/libs/function/index.js';
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/member/order/detail/detail.vue b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/member/order/detail/detail.vue
index f6bc3b76..d628cfee 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/member/order/detail/detail.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/member/order/detail/detail.vue
@@ -1,669 +1,726 @@
 <template>
-	<coreshop-page title="订单详情" mode="left">
-		<view class="layout-order-box">
+    <coreshop-page title="订单详情" mode="left">
+        <view class="layout-order-box">
 
-			<!-- 步骤条区域 -->
-			<view class="order-steps-box" v-if="state.orderStatus <= OrderAllStatusTypeEnum.aLL_PARTIAL_DELIVERY">
-				<view class="steps-status" v-if="state.orderStatus == 0">
-					<view class="status-box">
-						<view class="tit">拍下成功</view>
-						<view class="desc">待买家支付</view>
-					</view>
-					<view class="explain">
-						<view class="tit">拍下{{ shopConfigStore?.config?.orderCancelTime || 60 }}分后</view>
-						<view class="desc">未支付，自动取消订单。</view>
-					</view>
-				</view>
-				<view class="steps-status" v-if="state.orderStatus == OrderAllStatusTypeEnum.aLL_PENDING_PAYMENT">
-					<view class="status-box">
-						<view class="tit">支付成功</view>
-						<view class="desc">待卖家发货</view>
-					</view>
-				</view>
-				<view class="steps-status" v-if="state.orderStatus == OrderAllStatusTypeEnum.aLL_PENDING_DELIVERY">
-					<view class="status-box">
-						<view class="tit">已发货</view>
-						<view class="desc">快递正在路上</view>
-					</view>
-					<view class="explain">
-						<view class="tit">务必在收到商品后再确认收货。</view>
-						<view class="desc">发货20天后将自动确认收货</view>
-					</view>
-				</view>
-				<view class="steps-status" v-if="state.orderStatus == OrderAllStatusTypeEnum.aLL_PENDING_RECEIPT">
-					<view class="status-box">
-						<view class="tit">已收货</view>
-						<view class="desc">请您对此次购物体检进行评价</view>
-					</view>
-					<view class="explain">
-						<view class="tit">收货30天后将自动评价</view>
-					</view>
-				</view>
-				<view class="steps-status" v-if="state.orderStatus == OrderAllStatusTypeEnum.aLL_PENDING_EVALUATE">
-					<view class="status-box">
-						<view class="tit">交易成功</view>
-						<view class="desc">感谢您的评价</view>
-					</view>
-				</view>
-				<view class="steps-status" v-if="state.orderStatus == OrderAllStatusTypeEnum.aLL_COMPLETED">
-					<view class="status-box">
-						<view class="tit">交易成功</view>
-						<view class="desc">期待下次服务</view>
-					</view>
-				</view>
-				<view class="steps-status" v-if="state.orderStatus == OrderAllStatusTypeEnum.aLL_CANCEL">
-					<view class="status-box">
-						<view class="tit">订单已取消</view>
-					</view>
-				</view>
-				<view class="steps-box" v-if="state.orderStatus < OrderAllStatusTypeEnum.aLL_COMPLETED_EVALUATE">
-					<uv-steps activeColor="#D33123" inactiveColor="#999" :current="state.orderStatus">
-						<uv-steps-item title="下单"></uv-steps-item>
-						<uv-steps-item title="付款"></uv-steps-item>
-						<uv-steps-item title="发货"></uv-steps-item>
-						<uv-steps-item title="收货"></uv-steps-item>
-						<uv-steps-item title="评价"></uv-steps-item>
-					</uv-steps>
-				</view>
-			</view>
+            <!-- 步骤条区域 -->
+            <view class="order-steps-box" v-if="state.orderStatus <= OrderAllStatusTypeEnum.aLL_PARTIAL_DELIVERY">
+                <view class="steps-status" v-if="state.orderStatus == 0">
+                    <view class="status-box">
+                        <view class="tit">拍下成功</view>
+                        <view class="desc">待买家支付</view>
+                    </view>
+                    <view class="explain">
+                        <view class="tit">拍下{{ shopConfigStore?.config?.orderCancelTime || 60 }}分后</view>
+                        <view class="desc">未支付，自动取消订单。</view>
+                    </view>
+                </view>
+                <view class="steps-status" v-if="state.orderStatus == OrderAllStatusTypeEnum.aLL_PENDING_PAYMENT">
+                    <view class="status-box">
+                        <view class="tit">支付成功</view>
+                        <view class="desc">待卖家发货</view>
+                    </view>
+                </view>
+                <view class="steps-status" v-if="state.orderStatus == OrderAllStatusTypeEnum.aLL_PENDING_DELIVERY">
+                    <view class="status-box">
+                        <view class="tit">已发货</view>
+                        <view class="desc">快递正在路上</view>
+                    </view>
+                    <view class="explain">
+                        <view class="tit">务必在收到商品后再确认收货。</view>
+                        <view class="desc">发货20天后将自动确认收货</view>
+                    </view>
+                </view>
+                <view class="steps-status" v-if="state.orderStatus == OrderAllStatusTypeEnum.aLL_PENDING_RECEIPT">
+                    <view class="status-box">
+                        <view class="tit">已收货</view>
+                        <view class="desc">请您对此次购物体检进行评价</view>
+                    </view>
+                    <view class="explain">
+                        <view class="tit">收货30天后将自动评价</view>
+                    </view>
+                </view>
+                <view class="steps-status" v-if="state.orderStatus == OrderAllStatusTypeEnum.aLL_PENDING_EVALUATE">
+                    <view class="status-box">
+                        <view class="tit">交易成功</view>
+                        <view class="desc">感谢您的评价</view>
+                    </view>
+                </view>
+                <view class="steps-status" v-if="state.orderStatus == OrderAllStatusTypeEnum.aLL_COMPLETED">
+                    <view class="status-box">
+                        <view class="tit">交易成功</view>
+                        <view class="desc">期待下次服务</view>
+                    </view>
+                </view>
+                <view class="steps-status" v-if="state.orderStatus == OrderAllStatusTypeEnum.aLL_CANCEL">
+                    <view class="status-box">
+                        <view class="tit">订单已取消</view>
+                    </view>
+                </view>
+                <view class="steps-box" v-if="state.orderStatus < OrderAllStatusTypeEnum.aLL_COMPLETED_EVALUATE">
+                    <uv-steps activeColor="#D33123" inactiveColor="#999" :current="state.orderStatus">
+                        <uv-steps-item title="下单"></uv-steps-item>
+                        <uv-steps-item title="付款"></uv-steps-item>
+                        <uv-steps-item title="发货"></uv-steps-item>
+                        <uv-steps-item title="收货"></uv-steps-item>
+                        <uv-steps-item title="评价"></uv-steps-item>
+                    </uv-steps>
+                </view>
+            </view>
 
-			<!-- 拼团信息 -->
-			<view class="order-msg"
-				v-if="state.orderDetail?.orderType == 2 && state.orderDetail?.status != OrderStatusEnum.cancel && state.orderDetail?.payStatus != OrderPayStatusEnum.no">
-				<view class="title">
-					<text v-if="state.teamInfo?.status == PinTuanStatusEnum.pending">待拼团，还差{{ state.teamInfo?.teamNums
+            <!-- 拼团信息 -->
+            <view class="order-msg"
+                v-if="state.orderDetail?.orderType == 2 && state.orderDetail?.status != OrderStatusEnum.cancel && state.orderDetail?.payStatus != OrderPayStatusEnum.no">
+                <view class="title">
+                    <text v-if="state.teamInfo?.status == PinTuanStatusEnum.pending">待拼团，还差{{ state.teamInfo?.teamNums
                         || '' }}人</text>
-					<text v-if="state.teamInfo?.status == PinTuanStatusEnum.complete">拼团成功，待发货</text>
-					<text v-if="state.teamInfo?.status == PinTuanStatusEnum.cancel">拼团失败</text>
-				</view>
-				<view class="pinTuan-box">
-					<view class="pinTuan-peo" v-if="state.teamInfo?.teams?.length > 0">
-						<view class="img-box" v-for="item, index in state.teamInfo?.teams" :key="index">
-							<image class="img" :src="item.userAvatar"></image>
-							<text class="tag" v-if="item.recordId == state.teamInfo?.teamId">拼主</text>
-						</view>
-						<view class="img-box" v-if="state.teamInfo?.teamNums > 3">
-							<view class="avatar" v-for="n in 3" :key="n">?</view>
-							<view class="avatar">···</view>
-						</view>
-						<view class="img-box" v-else>
-							<view class="avatar">?</view>
-						</view>
-					</view>
-					<view class="share-box">
-						<uv-button type="success" size="small">
-							<uv-icon name="share" color="#fff" labelColor="#fff" label="立即邀请好友拼单" labelSize="14px"
-								labelPos="right" size="18"></uv-icon>
-						</uv-button>
-					</view>
-				</view>
-			</view>
+                    <text v-if="state.teamInfo?.status == PinTuanStatusEnum.complete">拼团成功，待发货</text>
+                    <text v-if="state.teamInfo?.status == PinTuanStatusEnum.cancel">拼团失败</text>
+                </view>
+                <view class="pinTuan-box">
+                    <view class="pinTuan-peo" v-if="state.teamInfo?.teams?.length > 0">
+                        <view class="img-box" v-for="item, index in state.teamInfo?.teams" :key="index">
+                            <image class="img" :src="item.userAvatar"></image>
+                            <text class="tag" v-if="item.recordId == state.teamInfo?.teamId">拼主</text>
+                        </view>
+                        <view class="img-box" v-if="state.teamInfo?.teamNums > 3">
+                            <view class="avatar" v-for="n in 3" :key="n">?</view>
+                            <view class="avatar">···</view>
+                        </view>
+                        <view class="img-box" v-else>
+                            <view class="avatar">?</view>
+                        </view>
+                    </view>
+                    <view class="share-box">
+                        <uv-button type="success" size="small" @click="handleInviteFriends">
+                            <uv-icon name="share" color="#fff" labelColor="#fff" label="立即邀请好友拼单" labelSize="14px"
+                                labelPos="right" size="18"></uv-icon>
+                        </uv-button>
+                    </view>
+                </view>
+            </view>
 
-			<!-- 物流信息 -->
-			<view class="order-msg" v-if="state.orderStatus != 0 && !state.orderDetail?.store">
-				<view class="title">
-					<view class="tit">物流信息</view>
-					<view class="desc" v-if="state.orderStatus == 2">已发货，请注意查收</view>
-				</view>
-				<view class="logistics-box">
-					<view class="name-box">
-						<view class="name">收货人：{{ state.orderDetail?.shipName || '' }}</view>
-						<view class="phone">{{ state.orderDetail?.shipMobile || '' }}</view>
-					</view>
-					<view class="address">收货人地址：{{ state.orderDetail?.shipAreaName || '' }}
-						{{ state.orderDetail?.shipAddress || '' }}
-					</view>
-				</view>
-				<view class="logistics-num" v-if="state.orderDetail?.delivery?.length > 0">
-					<view class="logistics" v-for="item, index in state.orderDetail?.delivery" :key="index">
-						<view class="item">
-							<view class="lab">物流名称：</view>
-							<view class="val">{{ item.logiName }}</view>
-							<view class="view" @click="handleViewLogistics(item)">查看物流信息</view>
-						</view>
-						<view class="item">
-							<view class="lab">物流单号：</view>
-							<view class="val">{{ item.logiNo }}</view>
-							<view class="copy" @click="handleCopyLogiNo(item.logiNo)">复制单号</view>
-						</view>
-						<view class="item">
-							<view class="lab">发货时间：</view>
-							<view class="val">{{ item.createTime }}</view>
-						</view>
-					</view>
-				</view>
-			</view>
+            <!-- 物流信息 -->
+            <view class="order-msg" v-if="state.orderStatus != 0 && !state.orderDetail?.store">
+                <view class="title">
+                    <view class="tit">物流信息</view>
+                    <view class="desc" v-if="state.orderStatus == 2">已发货，请注意查收</view>
+                </view>
+                <view class="logistics-box">
+                    <view class="name-box">
+                        <view class="name">收货人：{{ state.orderDetail?.shipName || '' }}</view>
+                        <view class="phone">{{ state.orderDetail?.shipMobile || '' }}</view>
+                    </view>
+                    <view class="address">收货人地址：{{ state.orderDetail?.shipAreaName || '' }}
+                        {{ state.orderDetail?.shipAddress || '' }}
+                    </view>
+                </view>
+                <view class="logistics-num" v-if="state.orderDetail?.delivery?.length > 0">
+                    <view class="logistics" v-for="item, index in state.orderDetail?.delivery" :key="index">
+                        <view class="item">
+                            <view class="lab">物流名称：</view>
+                            <view class="val">{{ item.logiName }}</view>
+                            <view class="view" @click="handleViewLogistics(item)">查看物流信息</view>
+                        </view>
+                        <view class="item">
+                            <view class="lab">物流单号：</view>
+                            <view class="val">{{ item.logiNo }}</view>
+                            <view class="copy" @click="handleCopyLogiNo(item.logiNo)">复制单号</view>
+                        </view>
+                        <view class="item">
+                            <view class="lab">发货时间：</view>
+                            <view class="val">{{ item.createTime }}</view>
+                        </view>
+                    </view>
+                </view>
+            </view>
 
-			<!-- 提货信息 -->
-			<view class="order-msg" v-if="state.orderDetail?.store">
-				<view class="title">提货信息</view>
-				<view class="order-box">
-					<view class="msg-box">
-						<view class="lab">提货门店</view>
-						<view class="val">{{ state.orderDetail?.store?.storeName || '无' }}</view>
-					</view>
-					<view class="msg-box">
-						<view class="lab">门店电话</view>
-						<view class="val">{{ state.orderDetail?.store?.mobile || '无' }}</view>
-					</view>
-					<view class="msg-box">
-						<view class="lab">门店地址</view>
-						<view class="val">{{ state.orderDetail?.store?.address || '无' }}</view>
-					</view>
-					<view class="msg-box">
-						<view class="lab">提货人信息</view>
-						<view class="val">{{ state.orderDetail?.shipName || '' }} - {{ state.orderDetail?.shipMobile ||
+            <!-- 提货信息 -->
+            <view class="order-msg" v-if="state.orderDetail?.store">
+                <view class="title">提货信息</view>
+                <view class="order-box">
+                    <view class="msg-box">
+                        <view class="lab">提货门店</view>
+                        <view class="val">{{ state.orderDetail?.store?.storeName || '无' }}</view>
+                    </view>
+                    <view class="msg-box">
+                        <view class="lab">门店电话</view>
+                        <view class="val">{{ state.orderDetail?.store?.mobile || '无' }}</view>
+                    </view>
+                    <view class="msg-box">
+                        <view class="lab">门店地址</view>
+                        <view class="val">{{ state.orderDetail?.store?.address || '无' }}</view>
+                    </view>
+                    <view class="msg-box">
+                        <view class="lab">提货人信息</view>
+                        <view class="val">{{ state.orderDetail?.shipName || '' }} - {{ state.orderDetail?.shipMobile ||
                             '' }}</view>
-					</view>
-					<view class="msg-box" v-if="state.pickupCode">
-						<view class="lab">提货码</view>
-						<view class="val red" @click="handleViewCode">{{ state.pickupCode }}</view>
-					</view>
-				</view>
-			</view>
-			<!-- 提货码弹框 -->
-			<uv-popup ref="codePopup" mode="center" :safeAreaInsetBottom="false"
-				:customStyle="{'border-radius':'15rpx'}">
-				<view class="code-box">
-					<canvas canvas-id="qrcode" style="width: 200px; height: 200px;" />
-					<image v-if="state.codeSrc" class="img" :src="state.codeSrc"></image>
-				</view>
-			</uv-popup>
+                    </view>
+                    <view class="msg-box" v-if="state.pickupCode">
+                        <view class="lab">提货码</view>
+                        <view class="val red" @click="handleViewCode">{{ state.pickupCode }}</view>
+                    </view>
+                </view>
+            </view>
+            <!-- 提货码弹框 -->
+            <uv-popup ref="codePopup" mode="center" :safeAreaInsetBottom="false"
+                :customStyle="{'border-radius':'15rpx'}">
+                <view class="code-box">
+                    <canvas canvas-id="qrcode" style="width: 200px; height: 200px;" />
+                    <image v-if="state.codeSrc" class="img" :src="state.codeSrc"></image>
+                </view>
+            </uv-popup>
 
-			<!-- 商品信息 -->
-			<view class="order-msg">
-				<view class="title">商品信息</view>
-				<view class="goods-box">
-					<view class="item-box" v-for="item in state.orderDetail?.items" :key="item.id">
-						<coreshop-goods-card type="horizontal" imgHeight="140rpx" imgWidth="140rpx"
-							:goodsData="hanldeCombinationGoodsData(item)">
-							<template #goodPrice>
-								<view class="goods-price">
-									<view class="price">￥{{ item.price }}</view>
-									<view class="num">x{{ item.nums }}</view>
-								</view>
-							</template>
-						</coreshop-goods-card>
-					</view>
-				</view>
-			</view>
+            <!-- 商品信息 -->
+            <view class="order-msg">
+                <view class="title">商品信息</view>
+                <view class="goods-box">
+                    <view class="item-box" v-for="item in state.orderDetail?.items" :key="item.id">
+                        <coreshop-goods-card type="horizontal" imgHeight="140rpx" imgWidth="140rpx"
+                            :goodsData="hanldeCombinationGoodsData(item)">
+                            <template #goodPrice>
+                                <view class="goods-price">
+                                    <view class="price">￥{{ item.price }}</view>
+                                    <view class="num">x{{ item.nums }}</view>
+                                </view>
+                            </template>
+                        </coreshop-goods-card>
+                    </view>
+                </view>
+            </view>
 
-			<!-- 发票信息 -->
-			<view class="order-msg" v-if="state.orderDetail?.invoice && state.orderDetail?.invoice?.type != 1">
-				<view class="title">发票信息</view>
-				<view class="order-box">
-					<view class="msg-box">
-						<view class="lab">发票抬头</view>
-						<view class="val">{{ state.orderDetail?.invoice?.title || '无' }}</view>
-					</view>
-					<view class="msg-box">
-						<view class="lab">发票税号</view>
-						<view class="val">{{ state.orderDetail?.invoice?.taxNumber || '无' }}</view>
-					</view>
-					<view class="msg-box" v-if="state.orderDetail?.invoice?.fileUrl">
-						<view class="lab">下载发票</view>
-						<view class="val">
-							<uv-tags @click="handleSaveInvoice" text="保存到本地" size="mini" type="success"></uv-tags>
-						</view>
-					</view>
-				</view>
-			</view>
+            <!-- 发票信息 -->
+            <view class="order-msg" v-if="state.orderDetail?.invoice && state.orderDetail?.invoice?.type != 1">
+                <view class="title">发票信息</view>
+                <view class="order-box">
+                    <view class="msg-box">
+                        <view class="lab">发票抬头</view>
+                        <view class="val">{{ state.orderDetail?.invoice?.title || '无' }}</view>
+                    </view>
+                    <view class="msg-box">
+                        <view class="lab">发票税号</view>
+                        <view class="val">{{ state.orderDetail?.invoice?.taxNumber || '无' }}</view>
+                    </view>
+                    <view class="msg-box" v-if="state.orderDetail?.invoice?.fileUrl">
+                        <view class="lab">下载发票</view>
+                        <view class="val">
+                            <uv-tags @click="handleSaveInvoice" text="保存到本地" size="mini" type="success"></uv-tags>
+                        </view>
+                    </view>
+                </view>
+            </view>
 
-			<!--费用信息-->
-			<view class="order-msg">
-				<view class="title">费用信息</view>
-				<view class="order-box">
-					<view class="msg-box">
-						<view class="lab">商品总额</view>
-						<view class="val">￥{{ state.orderDetail?.goodsAmount }}</view>
-					</view>
-					<view class="msg-box">
-						<view class="lab">商品优惠</view>
-						<view class="val">-￥{{ state.orderDetail?.goodsDiscountAmount }}</view>
-					</view>
-					<view class="msg-box">
-						<view class="lab">{{ shopConfigStore?.config?.pointShowName }}优惠</view>
-						<view class="val">-￥{{ state.orderDetail?.pointMoney }}</view>
-					</view>
-					<view class="msg-box" v-if="state.orderDetail?.orderDiscountAmount > 0">
-						<view class="lab">订单优惠</view>
-						<view class="val">-￥{{ state.orderDetail?.orderDiscountAmount }}</view>
-					</view>
-					<view class="msg-box" v-if="state.orderDetail?.couponDiscountAmount > 0">
-						<view class="lab">优惠券优惠</view>
-						<view class="val">-￥{{ state.orderDetail?.couponDiscountAmount }}</view>
-					</view>
-					<view class="msg-box">
-						<view class="lab">运费</view>
-						<view class="val">+￥{{ state.orderDetail?.costFreight }}</view>
-					</view>
-					<view class="msg-box" v-if="state.orderDetail?.payStatus > OrderPayStatusEnum.no">
-						<view class="lab">支付方式</view>
-						<view class="val">{{ state.orderDetail?.paymentName }}</view>
-					</view>
-					<view class="msg-box" v-if="state.orderDetail?.payStatus > OrderPayStatusEnum.no">
-						<view class="lab">支付时间</view>
-						<view class="val">{{ state.orderDetail?.paymentTime }}</view>
-					</view>
-					<view class="msg-box">
-						<view class="lab">应付款</view>
-						<view class="val payable">￥{{ state.orderDetail?.orderAmount }}</view>
-					</view>
-				</view>
-			</view>
+            <!--费用信息-->
+            <view class="order-msg">
+                <view class="title">费用信息</view>
+                <view class="order-box">
+                    <view class="msg-box">
+                        <view class="lab">商品总额</view>
+                        <view class="val">￥{{ state.orderDetail?.goodsAmount }}</view>
+                    </view>
+                    <view class="msg-box">
+                        <view class="lab">商品优惠</view>
+                        <view class="val">-￥{{ state.orderDetail?.goodsDiscountAmount }}</view>
+                    </view>
+                    <view class="msg-box">
+                        <view class="lab">{{ shopConfigStore?.config?.pointShowName }}优惠</view>
+                        <view class="val">-￥{{ state.orderDetail?.pointMoney }}</view>
+                    </view>
+                    <view class="msg-box" v-if="state.orderDetail?.orderDiscountAmount > 0">
+                        <view class="lab">订单优惠</view>
+                        <view class="val">-￥{{ state.orderDetail?.orderDiscountAmount }}</view>
+                    </view>
+                    <view class="msg-box" v-if="state.orderDetail?.couponDiscountAmount > 0">
+                        <view class="lab">优惠券优惠</view>
+                        <view class="val">-￥{{ state.orderDetail?.couponDiscountAmount }}</view>
+                    </view>
+                    <view class="msg-box">
+                        <view class="lab">运费</view>
+                        <view class="val">+￥{{ state.orderDetail?.costFreight }}</view>
+                    </view>
+                    <view class="msg-box" v-if="state.orderDetail?.payStatus > OrderPayStatusEnum.no">
+                        <view class="lab">支付方式</view>
+                        <view class="val">{{ state.orderDetail?.paymentName }}</view>
+                    </view>
+                    <view class="msg-box" v-if="state.orderDetail?.payStatus > OrderPayStatusEnum.no">
+                        <view class="lab">支付时间</view>
+                        <view class="val">{{ state.orderDetail?.paymentTime }}</view>
+                    </view>
+                    <view class="msg-box">
+                        <view class="lab">应付款</view>
+                        <view class="val payable">￥{{ state.orderDetail?.orderAmount }}</view>
+                    </view>
+                </view>
+            </view>
 
-			<!-- 订单信息 -->
-			<view class="order-msg">
-				<view class="title">订单信息</view>
-				<view class="order-box">
-					<view class="msg-box">
-						<view class="lab">订单编号</view>
-						<view class="val">{{ state.orderDetail?.orderId }}</view>
-					</view>
-					<view class="msg-box">
-						<view class="lab">订单类型</view>
-						<view class="val">{{ state.orderDetail?.typeText }}</view>
-					</view>
-					<view class="msg-box"
-						v-if="state.orderDetail?.paymentName && state.orderDetail?.payStatus > OrderPayStatusEnum.no">
-						<view class="lab">支付方式</view>
-						<view class="val">{{ state.orderDetail?.paymentName }}</view>
-					</view>
-					<view class="msg-box" v-if="state.orderDetail?.createTime">
-						<view class="lab">下单时间</view>
-						<view class="val">{{ state.orderDetail?.createTime }}</view>
-					</view>
-					<view class="msg-box" v-if="state.orderDetail?.paymentTime && state.orderStatus > 0">
-						<view class="lab">支付时间</view>
-						<view class="val">{{ state.orderDetail?.paymentTime }}</view>
-					</view>
-					<view class="msg-box"
-						v-if="Object.keys(state.deliveryInfo).length > 0 && state.deliveryInfo?.createTime">
-						<view class="lab">发货时间</view>
-						<view class="val">{{ state.deliveryInfo?.createTime }}</view>
-					</view>
-					<view class="msg-box"
-						v-if="state.orderDetail?.confirmTime && state.orderStatus > OrderShipStatusEnum.partialYes">
-						<view class="lab">确认时间</view>
-						<view class="val">{{ state.orderDetail?.confirmTime }}</view>
-					</view>
-					<view class="msg-box"
-						v-if="state.orderDetail?.updateTime && state.orderStatus > OrderAllStatusTypeEnum.aLL_PENDING_RECEIPT">
-						<view class="lab">
-							<text v-if="state.orderStatus >= OrderAllStatusTypeEnum.aLL_CANCEL">取消时间</text>
-							<text v-else>完成时间</text>
-						</view>
-						<view class="val">{{ state.orderDetail?.updateTime }}</view>
-					</view>
-				</view>
-			</view>
+            <!-- 订单信息 -->
+            <view class="order-msg">
+                <view class="title">订单信息</view>
+                <view class="order-box">
+                    <view class="msg-box">
+                        <view class="lab">订单编号</view>
+                        <view class="val">{{ state.orderDetail?.orderId }}</view>
+                    </view>
+                    <view class="msg-box">
+                        <view class="lab">订单类型</view>
+                        <view class="val">{{ state.orderDetail?.typeText }}</view>
+                    </view>
+                    <view class="msg-box"
+                        v-if="state.orderDetail?.paymentName && state.orderDetail?.payStatus > OrderPayStatusEnum.no">
+                        <view class="lab">支付方式</view>
+                        <view class="val">{{ state.orderDetail?.paymentName }}</view>
+                    </view>
+                    <view class="msg-box" v-if="state.orderDetail?.createTime">
+                        <view class="lab">下单时间</view>
+                        <view class="val">{{ state.orderDetail?.createTime }}</view>
+                    </view>
+                    <view class="msg-box" v-if="state.orderDetail?.paymentTime && state.orderStatus > 0">
+                        <view class="lab">支付时间</view>
+                        <view class="val">{{ state.orderDetail?.paymentTime }}</view>
+                    </view>
+                    <view class="msg-box"
+                        v-if="Object.keys(state.deliveryInfo).length > 0 && state.deliveryInfo?.createTime">
+                        <view class="lab">发货时间</view>
+                        <view class="val">{{ state.deliveryInfo?.createTime }}</view>
+                    </view>
+                    <view class="msg-box"
+                        v-if="state.orderDetail?.confirmTime && state.orderStatus > OrderShipStatusEnum.partialYes">
+                        <view class="lab">确认时间</view>
+                        <view class="val">{{ state.orderDetail?.confirmTime }}</view>
+                    </view>
+                    <view class="msg-box"
+                        v-if="state.orderDetail?.updateTime && state.orderStatus > OrderAllStatusTypeEnum.aLL_PENDING_RECEIPT">
+                        <view class="lab">
+                            <text v-if="state.orderStatus >= OrderAllStatusTypeEnum.aLL_CANCEL">取消时间</text>
+                            <text v-else>完成时间</text>
+                        </view>
+                        <view class="val">{{ state.orderDetail?.updateTime }}</view>
+                    </view>
+                </view>
+            </view>
 
-			<!-- 为您推荐 -->
-			<GoodsDetailRecommend></GoodsDetailRecommend>
+            <!-- 为您推荐 -->
+            <GoodsDetailRecommend></GoodsDetailRecommend>
 
-			<!-- 底部按钮信息 -->
-			<view class="layout-btn-box" v-if="!state.data">
-				<view class="btn-box">
-					<view class="bottom-btn-box"
-						v-if="state.orderDetail?.status == OrderStatusEnum.pending || state.orderDetail?.status == OrderStatusEnum.complete">
-						<view class="m-r-20" v-if="state.orderDetail?.status == OrderStatusEnum.pending &&
+            <!-- 底部按钮信息 -->
+            <view class="layout-btn-box" v-if="!state.data">
+                <view class="btn-box">
+                    <view class="bottom-btn-box"
+                        v-if="state.orderDetail?.status == OrderStatusEnum.pending || state.orderDetail?.status == OrderStatusEnum.complete">
+                        <view class="m-r-20" v-if="state.orderDetail?.status == OrderStatusEnum.pending &&
                         state.orderDetail?.payStatus == OrderPayStatusEnum.no &&
                         state.orderDetail?.shipStatus == OrderShipStatusEnum.no">
-							<uv-button type="error" size="small" text="取消订单" @click="handleCancelOrder"></uv-button>
-						</view>
-						<view class="m-r-20" v-if="state.orderDetail?.status == OrderStatusEnum.pending &&
+                            <uv-button type="error" size="small" text="取消订单" @click="handleCancelOrder"></uv-button>
+                        </view>
+                        <view class="m-r-20" v-if="state.orderDetail?.status == OrderStatusEnum.pending &&
                         state.orderDetail?.payStatus == OrderPayStatusEnum.no">
-							<uv-button type="primary" size="small" text="立即支付"
-								@click="handleRouteNavigateTo(`/pages/order/pay/pay?orderId=${state.orderId}&orderType=${state.orderDetail?.orderType}`)"></uv-button>
-						</view>
-						<view class="m-r-20" v-if="state.orderDetail?.status == OrderStatusEnum.pending &&
+                            <uv-button type="primary" size="small" text="立即支付"
+                                @click="handleRouteNavigateTo(`/pages/order/pay/pay?orderId=${state.orderId}&orderType=${state.orderDetail?.orderType}`)"></uv-button>
+                        </view>
+                        <view class="m-r-20" v-if="state.orderDetail?.status == OrderStatusEnum.pending &&
                         state.orderDetail?.payStatus >= OrderPayStatusEnum.yes &&
                         state.orderDetail?.shipStatus >= OrderShipStatusEnum.yes &&
                         state.orderDetail?.confirmStatus == OrderConfirmStatusEnum.receiptNotConfirmed">
-							<uv-button type="success" size="small" text="确认收货"
-								@click="handleConfirmReceiptGoods"></uv-button>
-						</view>
-						<view class="m-r-20"
-							v-if="state.orderDetail?.status == OrderStatusEnum.pending &&
+                            <uv-button type="success" size="small" text="确认收货"
+                                @click="handleConfirmReceiptGoods"></uv-button>
+                        </view>
+                        <view class="m-r-20"
+                            v-if="state.orderDetail?.status == OrderStatusEnum.pending &&
                             state.orderDetail?.payStatus >= OrderPayStatusEnum.yes &&
                             state.orderDetail?.shipStatus >= OrderShipStatusEnum.yes &&
                             state.orderDetail?.confirmStatus >= OrderConfirmStatusEnum.confirmReceipt && state.orderDetail?.isComment == false">
-							<uv-button type="primary" size="small" text="立即评价"
-								@click="handleRouteNavigateTo(`/pages/subpackage/member/order/evaluate/evaluate?orderId=${state.orderId}`)"></uv-button>
-						</view>
-						<view class="m-r-20" v-if="state.orderDetail?.addAftersalesStatus">
-							<uv-button type="warning" size="small" text="申请售后"
-								@click="handleRouteNavigateTo(`/pages/subpackage/member/afterSales/apply/apply?orderId=${state.orderId}`)"></uv-button>
-						</view>
-						<view class="m-r-20" v-if="state.orderDetail?.billAftersalesId">
-							<uv-button type="warning" size="small" text="查看售后"
-								@click="handleRouteNavigateTo(`/pages/subpackage/member/afterSales/detail/detail?id=${state.orderDetail?.billAftersalesId}`)"></uv-button>
-						</view>
-						<view class="m-r-20"
-							v-if="state.orderDetail?.status == OrderStatusEnum.pending &&
+                            <uv-button type="primary" size="small" text="立即评价"
+                                @click="handleRouteNavigateTo(`/pages/subpackage/member/order/evaluate/evaluate?orderId=${state.orderId}`)"></uv-button>
+                        </view>
+                        <view class="m-r-20" v-if="state.orderDetail?.addAftersalesStatus">
+                            <uv-button type="warning" size="small" text="申请售后"
+                                @click="handleRouteNavigateTo(`/pages/subpackage/member/afterSales/apply/apply?orderId=${state.orderId}`)"></uv-button>
+                        </view>
+                        <view class="m-r-20" v-if="state.orderDetail?.billAftersalesId">
+                            <uv-button type="warning" size="small" text="查看售后"
+                                @click="handleRouteNavigateTo(`/pages/subpackage/member/afterSales/detail/detail?id=${state.orderDetail?.billAftersalesId}`)"></uv-button>
+                        </view>
+                        <view class="m-r-20"
+                            v-if="state.orderDetail?.status == OrderStatusEnum.pending &&
                             state.orderDetail?.payStatus > OrderPayStatusEnum.no &&
                             state.orderDetail?.invoice &&
                             state.orderDetail?.invoice?.type == 1 && shopConfigStore?.config?.invoiceSwitch == ShowInvoiceEnum.yes">
-							<uv-button type="primary" size="small" text="申请发票" @click="handleApplyInvoice"></uv-button>
-						</view>
-					</view>
-					<uv-button type="primary" size="small" open-type="contact" bindcontact="showChat"
-						text="联系客服"></uv-button>
-				</view>
-			</view>
-		</view>
-	</coreshop-page>
+                            <uv-button type="primary" size="small" text="申请发票" @click="handleApplyInvoice"></uv-button>
+                        </view>
+                    </view>
+                    <uv-button type="primary" size="small" open-type="contact" bindcontact="showChat"
+                        text="联系客服"></uv-button>
+                </view>
+            </view>
+
+            <!-- 分享弹框 -->
+            <CoreshopShare :show="state.showShare" :shareType="ShareEnum.addPinTuan"
+                :goodsDetailData="state.shareDetailData" @handleClosePopup="handleToggleShowShare"></CoreshopShare>
+
+        </view>
+    </coreshop-page>
 </template>
 <script setup lang="ts">
-	import { reactive, ref } from "vue";
-	import { onLoad } from '@dcloudio/uni-app';
-	import { queryOrderDetails, queryOrderPinTuanTeamInfo, queryCheckInvoice, queryOrderConfirm, queryOrderShippingList, queryCancelOrder } from '@/core/api';
-	import type { Response } from '@/core/models';
-	import { handleShowToast, handleRouteNavigateTo } from '@/core/utils';
-	import { OrderStatusEnum, OrderPayStatusEnum, PayMethodCodeEnum, OrderShipStatusEnum, ShowInvoiceEnum, OrderConfirmStatusEnum, PinTuanStatusEnum, OrderAllStatusTypeEnum } from '@/core/enum';
-	import { useShopConfigStore } from '@/core/store';
-	import GoodsDetailRecommend from '@/pages/components/goods-detail/components/goods-detail-recommend/goods-detail-recommend.vue';
-	import uQRCode from '@/core/utils/uqrcode.js';
+    import { reactive, ref } from "vue";
+    import { onLoad ,onShareAppMessage,onShareTimeline} from '@dcloudio/uni-app';
+    import { queryOrderDetails, queryOrderPinTuanTeamInfo, queryCheckInvoice, queryOrderConfirm, queryOrderShippingList, queryCancelOrder } from '@/core/api';
+    import type { Response } from '@/core/models';
+    import { handleShowToast, handleRouteNavigateTo, getShareUrl } from '@/core/utils';
+    import { OrderStatusEnum, OrderPayStatusEnum, ShareEnum, ShareClientEnum, ShareModelEnum, PayMethodCodeEnum, OrderShipStatusEnum, ShowInvoiceEnum, OrderConfirmStatusEnum, PinTuanStatusEnum, OrderAllStatusTypeEnum } from '@/core/enum';
+    import { useShopConfigStore } from '@/core/store';
+    import { shareUrl } from '@/core/consts';
+    import GoodsDetailRecommend from '@/pages/components/goods-detail/components/goods-detail-recommend/goods-detail-recommend.vue';
+    import uQRCode from '@/core/utils/uqrcode.js';
+    import CoreshopShare from '@/components/coreshop-share/coreshop-share.vue';
+    
+    interface QueryParams {
+        orderId : string;
+        data ?: string;
+    }
 
-	interface QueryParams {
-		orderId : string;
-		data ?: string;
-	}
+    // 获取项目配置
+    const shopConfigStore = useShopConfigStore();
 
-	// 获取项目配置
-	const shopConfigStore = useShopConfigStore();
+    const codePopup = ref();
 
-	const codePopup = ref();
+    const state = reactive<{
+        orderDetail : any;
+        orderId : string;
+        data : string;
+        orderStatus : number;
+        teamInfo : any;
+        deliveryInfo : any;
+        pickupCode : string;
+        codeSrc : string;
+        showShare : boolean;
+        shareUrl:string;
+        shareDetailData:any;
+    }>({
+        orderDetail: {},
+        orderId: '',
+        data: "",
+        orderStatus: 0,
+        teamInfo: {},
+        deliveryInfo: {},
+        pickupCode: "",
+        codeSrc: "",
+        showShare: false,
+        shareUrl:"",
+        shareDetailData:{},
+    })
 
-	const state = reactive<{
-		orderDetail : any;
-		orderId : string;
-		data : string;
-		orderStatus : number;
-		teamInfo : any;
-		deliveryInfo : any;
-		pickupCode : string;
-		codeSrc : string;
-	}>({
-		orderDetail: {},
-		orderId: '',
-		data: "",
-		orderStatus: 0,
-		teamInfo: {},
-		deliveryInfo: {},
-		pickupCode: "",
-		codeSrc: "",
-	})
+    onLoad((query : QueryParams) => {
+        state.orderId = query?.orderId;
+        state.data = query?.data;
+        getOrderDetails();
+    })
 
-	onLoad((query : QueryParams) => {
-		state.orderId = query?.orderId;
-		state.data = query?.data;
-		getOrderDetails();
-	})
+    const getOrderDetails = async () => {
+        const orderDetail : Response<any> = await queryOrderDetails({
+            id: state.orderId,
+            data: state.data || '',
+        });
+        if (orderDetail.status) {
+            state.orderDetail = orderDetail.data;
+            /** 物流 */
+            if (orderDetail.data?.delivery?.length > 0) {
+                state.deliveryInfo = orderDetail.data?.delivery[0];
+            }
+            /** 是否拼团 */
+            if (state.orderDetail.orderType == 2) {
+                getOrderPinTuanTeamInfo(orderDetail.data.orderId)
+            }
+            /** 自提码 */
+            if (state.orderDetail.ladingItem[0]) {
+                state.pickupCode = state.orderDetail.ladingItem[0].id;
+            }
+            switch (orderDetail.data?.status) {
+                case OrderStatusEnum.pending:
+                    if (orderDetail.data?.payStatus == OrderPayStatusEnum.no) {
+                        /** 待付款 */
+                        state.orderStatus = 0;
+                    } else if (orderDetail.data?.payStatus >= OrderPayStatusEnum.yes &&
+                        orderDetail.data?.shipStatus == OrderShipStatusEnum.no) {
+                        /** 待发货 */
+                        state.orderStatus = 1;
+                    } else if (orderDetail.data?.payStatus >= OrderPayStatusEnum.yes &&
+                        orderDetail.data?.shipStatus == OrderShipStatusEnum.partialYes) {
+                        /** 部分发货 */
+                        state.orderStatus = 2;
+                    } else if (orderDetail.data?.payStatus >= OrderPayStatusEnum.yes &&
+                        orderDetail.data?.shipStatus >= OrderShipStatusEnum.yes &&
+                        orderDetail.data?.confirmStatus == OrderConfirmStatusEnum.receiptNotConfirmed) {
+                        /** 已发货 */
+                        state.orderStatus = 2;
+                    } else if (orderDetail.data?.payStatus >= OrderPayStatusEnum.yes &&
+                        orderDetail.data?.shipStatus >= OrderShipStatusEnum.yes &&
+                        orderDetail.data?.confirmStatus == OrderConfirmStatusEnum.confirmReceipt &&
+                        !orderDetail.data?.isComment) {
+                        /** 待评价 */
+                        state.orderStatus = 3;
+                    } else if (orderDetail.data?.payStatus >= OrderPayStatusEnum.yes &&
+                        orderDetail.data?.shipStatus >= OrderShipStatusEnum.yes &&
+                        orderDetail.data?.confirmStatus == OrderConfirmStatusEnum.confirmReceipt &&
+                        orderDetail.data?.isComment) {
+                        /** 已评价 */
+                        state.orderStatus = 4;
+                    }
+                    break;
+                case OrderStatusEnum.complete:
+                    /** 已完成 */
+                    state.orderStatus = orderDetail.data?.globalStatus;
+                    break;
+                case OrderStatusEnum.cancel:
+                    /** 已取消 */
+                    state.orderStatus = orderDetail.data?.globalStatus;
+                    break;
+            }
+        } else {
+            handleShowToast(orderDetail.msg)
+        }
+    } 
+    
+    /** 组合商品数据传入组件 */
+    const hanldeCombinationGoodsData = (item : any) => {
+        return {
+            id: item.id,
+            image: item.imageUrl,
+            name: item.name,
+            brief: item.addon,
+        }
+    }
 
-	const getOrderDetails = async () => {
-		const orderDetail : Response<any> = await queryOrderDetails({
-			id: state.orderId,
-			data: state.data || '',
-		});
-		if (orderDetail.status) {
-			state.orderDetail = orderDetail.data;
-			/** 物流 */
-			if (orderDetail.data?.delivery?.length > 0) {
-				state.deliveryInfo = orderDetail.data?.delivery[0];
-			}
-			/** 是否拼团 */
-			if (state.orderDetail.orderType == 2) {
-				getOrderPinTuanTeamInfo(orderDetail.data.orderId)
-			}
-			/** 自提码 */
-			if (state.orderDetail.ladingItem[0]) {
-				state.pickupCode = state.orderDetail.ladingItem[0].id;
-			}
-			switch (orderDetail.data?.status) {
-				case OrderStatusEnum.pending:
-					if (orderDetail.data?.payStatus == OrderPayStatusEnum.no) {
-						/** 待付款 */
-						state.orderStatus = 0;
-					} else if (orderDetail.data?.payStatus >= OrderPayStatusEnum.yes &&
-						orderDetail.data?.shipStatus == OrderShipStatusEnum.no) {
-						/** 待发货 */
-						state.orderStatus = 1;
-					} else if (orderDetail.data?.payStatus >= OrderPayStatusEnum.yes &&
-						orderDetail.data?.shipStatus == OrderShipStatusEnum.partialYes) {
-						/** 部分发货 */
-						state.orderStatus = 2;
-					} else if (orderDetail.data?.payStatus >= OrderPayStatusEnum.yes &&
-						orderDetail.data?.shipStatus >= OrderShipStatusEnum.yes &&
-						orderDetail.data?.confirmStatus == OrderConfirmStatusEnum.receiptNotConfirmed) {
-						/** 已发货 */
-						state.orderStatus = 2;
-					} else if (orderDetail.data?.payStatus >= OrderPayStatusEnum.yes &&
-						orderDetail.data?.shipStatus >= OrderShipStatusEnum.yes &&
-						orderDetail.data?.confirmStatus == OrderConfirmStatusEnum.confirmReceipt &&
-						!orderDetail.data?.isComment) {
-						/** 待评价 */
-						state.orderStatus = 3;
-					} else if (orderDetail.data?.payStatus >= OrderPayStatusEnum.yes &&
-						orderDetail.data?.shipStatus >= OrderShipStatusEnum.yes &&
-						orderDetail.data?.confirmStatus == OrderConfirmStatusEnum.confirmReceipt &&
-						orderDetail.data?.isComment) {
-						/** 已评价 */
-						state.orderStatus = 4;
-					}
-					break;
-				case OrderStatusEnum.complete:
-					/** 已完成 */
-					state.orderStatus = orderDetail.data?.globalStatus;
-					break;
-				case OrderStatusEnum.cancel:
-					/** 已取消 */
-					state.orderStatus = orderDetail.data?.globalStatus;
-					break;
-			}
-		} else {
-			handleShowToast(orderDetail.msg)
-		}
-	}
+    /** 获取拼团的数据 */
+    const getOrderPinTuanTeamInfo = async (orderId : string) => {
+        const teamInfo : Response<any> = await queryOrderPinTuanTeamInfo({ orderId, });
+        if (teamInfo.status) {
+            state.teamInfo = teamInfo?.data;
+            state.shareDetailData = {
+                pinTuanRule:{id:teamInfo?.data?.ruleId},
+                id:state.orderDetail?.items[0]?.goodsId,  
+                teamId:teamInfo?.data?.teamId,
+                groupId:teamInfo?.data?.ruleId
+            }
+        } else {
+            handleShowToast(teamInfo.msg)
+        }
+    }
+    
+    /** 取消订单 */
+    const handleCancelOrder = () => {
+        uni.showModal({
+            title: '提示',
+            content: '确认要取消订单吗？',
+            async success(res : any) {
+                if (res.confirm) {
+                    const order : Response<any> = await queryCancelOrder({ id: state.orderId });
+                    if (order.status) {
+                        handleShowToast(order.msg, 'success', () => {
+                            getOrderDetails();
+                        })
+                    } else {
+                        handleShowToast(order.msg)
+                    }
+                }
+            }
+        });
+    }
 
-	/** 组合商品数据传入组件 */
-	const hanldeCombinationGoodsData = (item : any) => {
-		return {
-			id: item.id,
-			image: item.imageUrl,
-			name: item.name,
-			brief: item.addon,
-		}
-	}
+    /** 确认收货提示 */
+    const handleConfirmReceiptGoods = (item : any) => {
+        uni.showModal({
+            title: "温馨提示",
+            content: "您确认收货吗?",
+            async success(res : any) {
+                if (res.confirm) {
+                    // #ifdef MP-WEIXIN
+                    if (state.orderDetail.paymentCode === PayMethodCodeEnum.wechatpay && state.orderDetail?.paymentItem[0]?.status == OrderPayStatusEnum.yes) {
+                        getOrderShippingList(state.orderDetail?.paymentItem[0]?.tradeNo)
+                        return;
+                    } else {
+                        handleConfirmOrder();
+                    }
+                    // #endif 
 
-	/** 获取拼团的数据 */
-	const getOrderPinTuanTeamInfo = async (orderId : string) => {
-		const teamInfo : Response<any> = await queryOrderPinTuanTeamInfo({ orderId, });
-		if (teamInfo.status) {
-			state.teamInfo = teamInfo?.data;
-		} else {
-			handleShowToast(teamInfo.msg)
-		}
-	}
+                    // #ifndef MP-WEIXIN
+                    handleConfirmOrder();
+                    // #endif
+                }
+            }
+        })
+    }
 
-	/** 取消订单 */
-	const handleCancelOrder = () => {
-		uni.showModal({
-			title: '提示',
-			content: '确认要取消订单吗？',
-			async success(res : any) {
-				if (res.confirm) {
-					const order : Response<any> = await queryCancelOrder({ id: state.orderId });
-					if (order.status) {
-						handleShowToast(order.msg, 'success', () => {
-							getOrderDetails();
-						})
-					} else {
-						handleShowToast(order.msg)
-					}
-				}
-			}
-		});
-	}
+    /** 查询当前订单是否接入微信发货信息管理 */
+    const getOrderShippingList = async (id : string | number) => {
+        const orderShippingList = await queryOrderShippingList({ id, });
+        if (orderShippingList.status && orderShippingList.data) {
+            if (wx.openBusinessView) {
+                wx.openBusinessView({
+                    businessType: 'weappOrderConfirm',
+                    extraData: {
+                        transaction_id: id,
+                    },
+                    success() {
+                        handleConfirmOrder();
+                    }
+                });
+            } else {
+                handleShowToast('您的微信版本过低，请升级微信');
+            }
+        } else {
+            handleConfirmOrder();
+        }
+    }
 
-	/** 确认收货提示 */
-	const handleConfirmReceiptGoods = (item : any) => {
-		uni.showModal({
-			title: "温馨提示",
-			content: "您确认收货吗?",
-			async success(res : any) {
-				if (res.confirm) {
-					// #ifdef MP-WEIXIN
-					if (state.orderDetail.paymentCode === PayMethodCodeEnum.wechatpay && state.orderDetail?.paymentItem[0]?.status == OrderPayStatusEnum.yes) {
-						getOrderShippingList(state.orderDetail?.paymentItem[0]?.tradeNo)
-						return;
-					} else {
-						handleConfirmOrder();
-					}
-					// #endif 
+    /** 确认收货，确认订单 */
+    const handleConfirmOrder = async () => {
+        const orderConfirm = await queryOrderConfirm({ id: state.orderId });
+        if (orderConfirm?.status) {
+            handleShowToast('确认收货成功', 'success', () => {
+                setTimeout(() => {
+                    getOrderDetails();
+                }, 2000)
+            });
+        } else {
+            handleShowToast(orderConfirm?.msg);
+        }
+    }
 
-					// #ifndef MP-WEIXIN
-					handleConfirmOrder();
-					// #endif
-				}
-			}
-		})
-	}
+    /** 发票下载到本地 */
+    const handleSaveInvoice = () => {
+        // #ifdef APP-PLUS || APP-PLUS-NVUE
+        uni.downloadFile({
+            url: state.orderDetail?.invoice?.fileUrl,
+            success(res : any) {
+                uni.saveImageToPhotosAlbum({
+                    filePath: res.tempFilePath,
+                    success() {
+                        handleShowToast('操作成功', 'success')
+                    },
+                    fail() {
+                        handleShowToast('发票保存失败')
+                    }
+                });
+            },
+            fail() {
+                handleShowToast('下载失败')
+            }
+        })
+        // #endif
 
-	/** 查询当前订单是否接入微信发货信息管理 */
-	const getOrderShippingList = async (id : string | number) => {
-		const orderShippingList = await queryOrderShippingList({ id, });
-		if (orderShippingList.status && orderShippingList.data) {
-			if (wx.openBusinessView) {
-				wx.openBusinessView({
-					businessType: 'weappOrderConfirm',
-					extraData: {
-						transaction_id: id,
-					},
-					success() {
-						handleConfirmOrder();
-					}
-				});
-			} else {
-				handleShowToast('您的微信版本过低，请升级微信');
-			}
-		} else {
-			handleConfirmOrder();
-		}
-	}
+        // #ifdef MP
+        uni.authorize({
+            scope: 'scope.writePhotosAlbum',
+            success() {
+                uni.downloadFile({
+                    url: state.orderDetail?.invoice?.fileUrl,
+                    success(res : any) {
+                        uni.saveImageToPhotosAlbum({
+                            filePath: res.tempFilePath,
+                            success() {
+                                handleShowToast('操作成功', 'success')
+                            },
+                            fail() {
+                                handleShowToast('发票保存失败')
+                            }
+                        });
+                    },
+                    fail() {
+                        handleShowToast('下载失败')
+                    }
+                })
+            }
+        })
+        // #endif
+    }
 
-	/** 确认收货，确认订单 */
-	const handleConfirmOrder = async () => {
-		const orderConfirm = await queryOrderConfirm({ id: state.orderId });
-		if (orderConfirm?.status) {
-			handleShowToast('确认收货成功', 'success', () => {
-				setTimeout(() => {
-					getOrderDetails();
-				}, 2000)
-			});
-		} else {
-			handleShowToast(orderConfirm?.msg);
-		}
-	}
+    /** 查看物流信息 */
+    const handleViewLogistics = (item : any) => {
+        let address1 = state.orderDetail?.shipAreaName ? state.orderDetail?.shipAreaName : ''
+        let address2 = state.orderDetail?.shipAddress ? state.orderDetail?.shipAddress : ''
+        let address = address1 + address2;
+        let params = encodeURIComponent(`code=${item.logiCode}&no=${item.logiNo}&add=${address}&mobile=${state.orderDetail?.shipMobile}`);
+        handleRouteNavigateTo(`/pages/subpackage/member/order/expressDelivery/expressDelivery?params=${params}`)
+    }
 
-	/** 发票下载到本地 */
-	const handleSaveInvoice = () => {
-		// #ifdef APP-PLUS || APP-PLUS-NVUE
-		uni.downloadFile({
-			url: state.orderDetail?.invoice?.fileUrl,
-			success(res : any) {
-				uni.saveImageToPhotosAlbum({
-					filePath: res.tempFilePath,
-					success() {
-						handleShowToast('操作成功', 'success')
-					},
-					fail() {
-						handleShowToast('发票保存失败')
-					}
-				});
-			},
-			fail() {
-				handleShowToast('下载失败')
-			}
-		})
-		// #endif
+    /** 复制物流单号 */
+    const handleCopyLogiNo = (num : number) => {
+        uni.setClipboardData({
+            data: num,
+            success: function () {
+                handleShowToast('复制成功')
+            }
+        });
+    }
 
-		// #ifdef MP
-		uni.authorize({
-			scope: 'scope.writePhotosAlbum',
-			success() {
-				uni.downloadFile({
-					url: state.orderDetail?.invoice?.fileUrl,
-					success(res : any) {
-						uni.saveImageToPhotosAlbum({
-							filePath: res.tempFilePath,
-							success() {
-								handleShowToast('操作成功', 'success')
-							},
-							fail() {
-								handleShowToast('发票保存失败')
-							}
-						});
-					},
-					fail() {
-						handleShowToast('下载失败')
-					}
-				})
-			}
-		})
-		// #endif
-	}
+    /** 查看提货码 */
+    const handleViewCode = () => {
+        uQRCode.make({
+            canvasId: 'qrcode',
+            text: state.pickupCode,
+            size: 200,
+            backgroundColor: '#ffffff',
+            foregroundColor: '#000000',
+            fileType: 'jpg',
+            correctLevel: uQRCode.errorCorrectLevel.H,
+            success: (res : any) => {
+                state.codeSrc = res;
+            }
+        })
+        codePopup.value.open();
+    }
 
-	/** 查看物流信息 */
-	const handleViewLogistics = (item : any) => {
-		let address1 = state.orderDetail?.shipAreaName ? state.orderDetail?.shipAreaName : ''
-		let address2 = state.orderDetail?.shipAddress ? state.orderDetail?.shipAddress : ''
-		let address = address1 + address2;
-		let params = encodeURIComponent(`code=${item.logiCode}&no=${item.logiNo}&add=${address}&mobile=${state.orderDetail?.shipMobile}`);
-		handleRouteNavigateTo(`/pages/subpackage/member/order/expressDelivery/expressDelivery?params=${params}`)
-	}
+    /** 申请发票 */
+    const handleApplyInvoice = async () => {
+        const checkInvoice : Response<any> = await queryCheckInvoice({ id: state.orderId });
+        if (checkInvoice.status) {
+            if (checkInvoice.data) {
+                handleShowToast('此订单已经提交发票申请')
+            } else {
+                handleRouteNavigateTo(`/pages/subpackage/member/order/invoice/invoice?orderId=${state.orderId}`)
+            }
+        } else {
+            handleShowToast(checkInvoice.msg)
+        }
+    }
+    
+    /** 邀请好友拼单 */
+    const handleInviteFriends = async () => {
+        /** 获取分享url */
+        state.shareUrl = await getShareUrl({
+            client: ShareClientEnum.wxMiNiProgram,
+            url: shareUrl,
+            type: ShareModelEnum.url,
+            page: ShareEnum.addPinTuan,
+            params: { 
+                goodsId: state.orderDetail?.items[0]?.goodsId,  
+                teamId:state.teamInfo.teamId,
+                groupId:state.teamInfo.ruleId,
+            }
+        })
+        state.showShare = true;
+    }
 
-	/** 复制物流单号 */
-	const handleCopyLogiNo = (num : number) => {
-		uni.setClipboardData({
-			data: num,
-			success: function () {
-				handleShowToast('复制成功')
-			}
-		});
-	}
-
-	/** 查看提货码 */
-	const handleViewCode = () => {
-		uQRCode.make({
-			canvasId: 'qrcode',
-			text: state.pickupCode,
-			size: 200,
-			backgroundColor: '#ffffff',
-			foregroundColor: '#000000',
-			fileType: 'jpg',
-			correctLevel: uQRCode.errorCorrectLevel.H,
-			success: (res : any) => {
-				state.codeSrc = res;
-			}
-		})
-		codePopup.value.open();
-	}
-
-	/** 申请发票 */
-	const handleApplyInvoice = async () => {
-		const checkInvoice : Response<any> = await queryCheckInvoice({ id: state.orderId });
-		if (checkInvoice.status) {
-			if (checkInvoice.data) {
-				handleShowToast('此订单已经提交发票申请')
-			} else {
-				handleRouteNavigateTo(`/pages/subpackage/member/order/invoice/invoice?orderId=${state.orderId}`)
-			}
-		} else {
-			handleShowToast(checkInvoice.msg)
-		}
-	}
+    /** 分享弹框显示与否 */
+    const handleToggleShowShare = () => {
+        state.showShare = !state.showShare;
+    }
+    
+    /** 分享 */
+    onShareAppMessage(() => {
+    	return {
+    		title: state.orderDetail?.items[0]?.name,
+    		imageUrl: state.orderDetail?.items[0]?.imageUrl,
+    		path: state.shareUrl
+    	}
+    });
+    onShareTimeline(() => {
+    	return {
+    		title: state.orderDetail?.items[0]?.name,
+    		imageUrl: state.orderDetail?.items[0]?.imageUrl,
+    		path: state.shareUrl
+    	}
+    });
 </script>
 <style lang="scss" scoped>
-	@import './detail.scss';
+    @import './detail.scss';
 </style>
\ No newline at end of file