From f27b9b40f23844c32539d8a618d20e670d282305 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A7=E7=81=B0=E7=81=B0?= <jianweie@163.com>
Date: Tue, 15 Nov 2022 20:35:56 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E6=8B=BC=E5=9B=A2=E5=88=86=E4=BA=AB=E6=B5=B7=E6=8A=A5?=
 =?UTF-8?q?=E5=90=8E=E8=B0=83=E6=95=B4=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=8B=BC=E5=9B=A2=E5=B8=A6?=
 =?UTF-8?q?=E7=BB=84=E5=88=86=E4=BA=AB=E5=90=8E=E8=B0=83=E6=95=B4=E6=9C=AA?=
 =?UTF-8?q?=E5=BC=B9=E5=87=BA=E5=BD=93=E5=89=8D=E7=BB=84=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8C=E6=9B=B4=E6=8D=A2=E6=8B=BC?=
 =?UTF-8?q?=E5=9B=A2=E5=88=86=E4=BA=AB=E6=B5=B7=E6=8A=A5=E4=B8=BA=E6=96=B0?=
 =?UTF-8?q?=E6=B5=B7=E6=8A=A5=E3=80=82=20=E3=80=90=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E3=80=91=E4=BF=AE=E5=A4=8D=E5=A4=9A=E4=B8=AA=E4=BD=8D=E7=BD=AE?=
 =?UTF-8?q?=E5=B0=86=E5=80=92=E8=AE=A1=E6=97=B6=E3=80=90DD=E5=A4=A9HH?=
 =?UTF-8?q?=E6=97=B6mm=E5=88=86ss=E7=A7=92=E3=80=91=E9=94=99=E5=86=99?=
 =?UTF-8?q?=E6=88=90=E3=80=90DD=E5=A4=A9HH=E6=97=B6mm=E7=A7=92ss=E3=80=91?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Share/CoreCmsShareServices.cs             |  4 +--
 .../coreshop-page/coreshop-groupPurchase.vue  |  6 ++--
 .../coreshop-page/coreshop-seckill.vue        |  6 ++--
 .../coreshop-page/coreshop-serviceGood.vue    |  8 ++---
 .../coreshop-share-wx/coreshop-share-wx.vue   | 36 ++++++++++---------
 .../groupBuyingDetails/groupBuyingDetails.vue |  2 +-
 .../pages/activity/groupBuying/list/list.vue  |  4 +--
 .../pinTuan/pinTuanDetails/details.scss       |  2 +-
 .../pinTuan/pinTuanDetails/pinTuanDetails.vue | 20 +++++++----
 .../pages/activity/seckill/list/list.vue      |  4 +--
 .../seckill/seckillDetails/seckillDetails.vue |  2 +-
 .../order/invitationGroup/invitationGroup.vue |  2 +-
 .../pages/serviceGoods/details/details.vue    |  4 +--
 .../pages/serviceGoods/index/index.vue        |  4 +--
 .../share/shareNewPoster/shareNewPoster.vue   |  2 +-
 15 files changed, 57 insertions(+), 49 deletions(-)

diff --git a/CoreCms.Net.Services/Share/CoreCmsShareServices.cs b/CoreCms.Net.Services/Share/CoreCmsShareServices.cs
index f8562efe..718ad394 100644
--- a/CoreCms.Net.Services/Share/CoreCmsShareServices.cs
+++ b/CoreCms.Net.Services/Share/CoreCmsShareServices.cs
@@ -646,7 +646,7 @@ namespace CoreCms.Net.Services
                     }
                     break;
                 case (int)GlobalEnumVars.UrlSharePageType.PinTuan:
-                    if (arr.Length == 3)
+                    if (arr.Length == 2)
                     {
                         jm.data = new
                         {
@@ -675,7 +675,7 @@ namespace CoreCms.Net.Services
                     }
                     break;
                 case (int)GlobalEnumVars.UrlSharePageType.AddPinTuan:
-                    if (arr.Length == 3)
+                    if (arr.Length == 2)
                     {
                         jm.data = new
                         {
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-groupPurchase.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-groupPurchase.vue
index d3e661a6..d2a602c0 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-groupPurchase.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-groupPurchase.vue
@@ -16,13 +16,13 @@
                     <view class="coreshop-font-15 u-line-2 coreshop-text-black">{{ item.name }}</view>
                     <view class="coreshop-font-11 coreshop-padding-top-5 coreshop-padding-bottom-3 u-line-2 coreshop-text-brown">{{ item.goodName }}</view>
                     <view class="coreshop-flex coreshop-align-center coreshop-flex-direction-row coreshop-justify-start coreshop-min-height-30" v-if="(item.startStatus == 1) && item.timestamp">
-                        <view class="coreshop-font-12">仅剩：</view><u-count-down :time="item.timestamp*1000" format="DD天HH时mm秒ss" autoStart></u-count-down>
+                        <view class="coreshop-font-12">仅剩：</view><u-count-down :time="item.timestamp*1000" format="DD天HH时mm分ss秒" autoStart></u-count-down>
                     </view>
                     <view class="coreshop-flex coreshop-align-center coreshop-flex-direction-row coreshop-justify-start coreshop-min-height-30" v-if="(item.startStatus == 0) && item.timestamp">
-                        <view class="coreshop-font-12">即将开始：</view><u-count-down :time="item.timestamp*1000" format="DD天HH时mm秒ss" autoStart></u-count-down>
+                        <view class="coreshop-font-12">即将开始：</view><u-count-down :time="item.timestamp*1000" format="DD天HH时mm分ss秒" autoStart></u-count-down>
                     </view>
                     <view class="coreshop-flex coreshop-align-center coreshop-flex-direction-row coreshop-justify-start coreshop-min-height-30" v-if="(item.startStatus == 2) && item.timestamp">
-                        <view class="coreshop-font-12">已结束：</view><u-count-down :time="item.timestamp*1000" format="DD天HH时mm秒ss" autoStart></u-count-down>
+                        <view class="coreshop-font-12">已结束：</view><u-count-down :time="item.timestamp*1000" format="DD天HH时mm分ss秒" autoStart></u-count-down>
                     </view>
                     <view class="coreshop-flex coreshop-justify-between coreshop-flex-direction-row coreshop-align-center">
                         <view class="coreshop-flex coreshop-align-center">
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-seckill.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-seckill.vue
index 32f15a9f..6005a103 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-seckill.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-seckill.vue
@@ -16,13 +16,13 @@
                     <view class="coreshop-font-15 u-line-2 coreshop-text-black">{{ item.name }}</view>
                     <view class="coreshop-font-11 coreshop-padding-top-5 coreshop-padding-bottom-3 u-line-2 coreshop-text-brown">{{ item.goodName }}</view>
                     <view class="coreshop-flex coreshop-align-center coreshop-flex-direction-row coreshop-justify-start coreshop-min-height-30" v-if="(item.startStatus == 1) && item.timestamp">
-                        <view class="coreshop-font-12">仅剩：</view><u-count-down :time="item.timestamp*1000" format="DD天HH时mm秒ss" autoStart></u-count-down>
+                        <view class="coreshop-font-12">仅剩：</view><u-count-down :time="item.timestamp*1000" format="DD天HH时mm分ss秒" autoStart></u-count-down>
                     </view>
                     <view class="coreshop-flex coreshop-align-center coreshop-flex-direction-row coreshop-justify-start coreshop-min-height-30" v-if="(item.startStatus == 0) && item.timestamp">
-                        <view class="coreshop-font-12">即将开始：</view><u-count-down :time="item.timestamp*1000" format="DD天HH时mm秒ss" autoStart></u-count-down>
+                        <view class="coreshop-font-12">即将开始：</view><u-count-down :time="item.timestamp*1000" format="DD天HH时mm分ss秒" autoStart></u-count-down>
                     </view>
                     <view class="coreshop-flex coreshop-align-center coreshop-flex-direction-row coreshop-justify-start coreshop-min-height-30" v-if="(item.startStatus == 2) && item.timestamp">
-                        <view class="coreshop-font-12">已结束：</view><u-count-down :time="item.timestamp*1000" format="DD天HH时mm秒ss" autoStart></u-count-down>
+                        <view class="coreshop-font-12">已结束：</view><u-count-down :time="item.timestamp*1000" format="DD天HH时mm分ss秒" autoStart></u-count-down>
                     </view>
                     <view class="coreshop-flex coreshop-justify-between coreshop-flex-direction-row coreshop-align-center">
                         <view class="coreshop-flex coreshop-align-center">
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-serviceGood.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-serviceGood.vue
index 59b6fd46..07e2be23 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-serviceGood.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-serviceGood.vue
@@ -22,9 +22,9 @@
                     </view>
 
                     <view class="coreshop-flex coreshop-align-center coreshop-flex-direction-row coreshop-justify-start" v-if="item.openStatus == 1 && item.lastTime > 0">
-                        <view class="coreshop-font-12">仅剩：</view><u-count-down :time="item.lastTime*1000" format="DD天HH时mm秒ss" autoStart></u-count-down>
+                        <view class="coreshop-font-12">仅剩：</view><u-count-down :time="item.lastTime*1000" format="DD天HH时mm分ss秒" autoStart></u-count-down>
 
-                        <!--<u-count-down :time="item.lastTime*1000" :autoStart="true" format="DD天HH时mm秒ss" @change="onChange($event,key)">
+                        <!--<u-count-down :time="item.lastTime*1000" :autoStart="true" format="DD天HH时mm分ss秒" @change="onChange($event,key)">
                             <view class="time coreshop-font-11">
                                 <view class="coreshop-font-12">仅剩：</view>
                                 <view class="time__custom" v-if="item.timeData.days>0">
@@ -46,8 +46,8 @@
                         </u-count-down>-->
                     </view>
                     <view class="coreshop-flex coreshop-align-center coreshop-flex-direction-row coreshop-justify-start" v-if="item.openStatus == 2 && item.lastTime > 0">
-                        <view class="coreshop-font-12">即将开始：</view><u-count-down :time="item.lastTime*1000" format="DD天HH时mm秒ss" autoStart></u-count-down>
-                        <!--<u-count-down :time="item.lastTime*1000" :autoStart="true" format="DD天HH时mm秒ss" @change="onChange($event,key)">
+                        <view class="coreshop-font-12">即将开始：</view><u-count-down :time="item.lastTime*1000" format="DD天HH时mm分ss秒" autoStart></u-count-down>
+                        <!--<u-count-down :time="item.lastTime*1000" :autoStart="true" format="DD天HH时mm分ss秒" @change="onChange($event,key)">
                             <view class="time">
                                 <view class="coreshop-font-12">即将开始：</view>
                                 <view class="time__custom" v-if="item.timeData.days>0">
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-share-wx/coreshop-share-wx.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-share-wx/coreshop-share-wx.vue
index 5297ea64..a547b8be 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-share-wx/coreshop-share-wx.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-share-wx/coreshop-share-wx.vue
@@ -120,6 +120,23 @@
                         data.token = userToken
                     }
                 }
+                else if (this.shareType == this.$globalConstVars.shareType.addPinTuan) {
+                    data = {
+                        page: this.shareType, //拼团
+                        url: this.$globalConstVars.shareUrl,
+                        params: {
+                            goodsId: this.goodsId,
+                            groupId: this.groupId,
+                            teamId: this.teamId
+                        },
+                        type: this.$globalConstVars.shareModel.poster,
+                        client: this.$globalConstVars.shareClient.wxMiNiProgram
+                    }
+                    let userToken = this.$db.get('userToken')
+                    if (userToken) {
+                        data.token = userToken
+                    }
+                }
                 else if (this.shareType == this.$globalConstVars.shareType.group) {
                     data = {
                         page: this.shareType,
@@ -165,23 +182,7 @@
                         data.token = userToken
                     }
                 }
-                else if (this.shareType == this.$globalConstVars.shareType.addPinTuan) {
-                    data = {
-                        page: this.shareType, //拼团
-                        url: this.$globalConstVars.shareUrl,
-                        params: {
-                            goodsId: this.goodsId,
-                            groupId: this.groupId,
-                            teamId: this.teamId
-                        },
-                        type: this.$globalConstVars.shareModel.poster,
-                        client: this.$globalConstVars.shareClient.wxMiNiProgram
-                    }
-                    let userToken = this.$db.get('userToken')
-                    if (userToken) {
-                        data.token = userToken
-                    }
-                } else if (this.shareType == this.$globalConstVars.shareType.solitaire) {
+                else if (this.shareType == this.$globalConstVars.shareType.solitaire) {
                     data = {
                         page: this.shareType,
                         url: this.$globalConstVars.shareUrl,
@@ -216,6 +217,7 @@
                         if (
                             this.shareType == this.$globalConstVars.shareType.goods ||
                             this.shareType == this.$globalConstVars.shareType.pinTuan ||
+                            this.shareType == this.$globalConstVars.shareType.addPinTuan ||
                             this.shareType == this.$globalConstVars.shareType.seckill ||
                             this.shareType == this.$globalConstVars.shareType.group ||
                             this.shareType == this.$globalConstVars.shareType.serviceGoods
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/activity/groupBuying/groupBuyingDetails/groupBuyingDetails.vue b/CoreCms.Net.Uni-App/CoreShop/pages/activity/groupBuying/groupBuyingDetails/groupBuyingDetails.vue
index 68927e35..fa6d3b81 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/activity/groupBuying/groupBuyingDetails/groupBuyingDetails.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/activity/groupBuying/groupBuyingDetails/groupBuyingDetails.vue
@@ -24,7 +24,7 @@
                 </view>
                 <view class="coreshop-flex coreshop-text-left coreshop-justify-center coreshop-align-center">
                     <view class="coreshop-text-right coreshop-time-right">
-                        <u-count-down :time="goodsInfo.groupTimestamp*1000" :autoStart="true" :millisecond="true" format="DD天HH时mm秒ss" @change="onChange">
+                        <u-count-down :time="goodsInfo.groupTimestamp*1000" :autoStart="true" :millisecond="true" format="DD天HH时mm分ss秒" @change="onChange">
                             <view class="time">
                                 <view class="coreshop-font-12">仅剩：</view>
                                 <view class="time__custom">
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/activity/groupBuying/list/list.vue b/CoreCms.Net.Uni-App/CoreShop/pages/activity/groupBuying/list/list.vue
index 00c90674..5998d92a 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/activity/groupBuying/list/list.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/activity/groupBuying/list/list.vue
@@ -28,7 +28,7 @@
                     </view>
                     <view class="coreshop-flex coreshop-justify-between coreshop-flex-direction-row coreshop-align-center" v-if="item.timestamp">
                         <view class="coreshop-text-right coreshop-time-right coreshop-margin-top-10" v-if="(item.startStatus == 1) && item.timestamp">
-                            <u-count-down :time="item.timestamp*1000" :autoStart="true" format="DD天HH时mm秒ss" @change="onChange($event,key)">
+                            <u-count-down :time="item.timestamp*1000" :autoStart="true" format="DD天HH时mm分ss秒" @change="onChange($event,key)">
                                 <view class="time coreshop-font-11">
                                     <view class="coreshop-font-12">仅剩：</view>
                                     <view class="time__custom">
@@ -50,7 +50,7 @@
                             </u-count-down>
                         </view>
                         <view class="coreshop-text-right coreshop-time-right coreshop-margin-top-10" v-if="(item.startStatus == 0) && item.timestamp">
-                            <u-count-down :time="item.timestamp*1000" :autoStart="true" format="DD天HH时mm秒ss" @change="onChange($event,key)">
+                            <u-count-down :time="item.timestamp*1000" :autoStart="true" format="DD天HH时mm分ss秒" @change="onChange($event,key)">
                                 <view class="time">
                                     <view class="coreshop-font-12">即将开始：</view>
                                     <view class="time__custom">
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/activity/pinTuan/pinTuanDetails/details.scss b/CoreCms.Net.Uni-App/CoreShop/pages/activity/pinTuan/pinTuanDetails/details.scss
index c8636c30..cfae15ea 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/activity/pinTuan/pinTuanDetails/details.scss
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/activity/pinTuan/pinTuanDetails/details.scss
@@ -11,7 +11,7 @@
     .group-swiper-c .swiper-item .coreshop-cell-item .coreshop-cell-item-ft .btn { font-size: 13px; color: #fff; background-color: #ff7159; text-align: center; }
 
 
-.ig-top { text-align: center; background-color: #fff; padding: 10px 13px; width: 100%; height: 125px; background: #FFFFFF; }
+.ig-top { text-align: center; background-color: #fff; padding: 10px 13px; width: 100%; background: #FFFFFF; }
 .ig-top-t,
 .ig-top-m { margin-bottom: 10px; }
     .ig-top-t > view { display: inline-block; padding: 0 5px; color: #999; }
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/activity/pinTuan/pinTuanDetails/pinTuanDetails.vue b/CoreCms.Net.Uni-App/CoreShop/pages/activity/pinTuan/pinTuanDetails/pinTuanDetails.vue
index 8d401599..eb7aa360 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/activity/pinTuan/pinTuanDetails/pinTuanDetails.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/activity/pinTuan/pinTuanDetails/pinTuanDetails.vue
@@ -24,7 +24,7 @@
                 </view>
                 <view class="coreshop-flex coreshop-text-left coreshop-justify-center coreshop-align-center">
                     <view class="coreshop-text-right coreshop-time-right" v-if="goodsInfo.pinTuanRule && goodsInfo.pinTuanRule.pinTuanStartStatus == 1">
-                        <u-count-down :time="goodsInfo.pinTuanRule.lastTime*1000" :autoStart="true" :millisecond="true" format="DD天HH时mm秒ss" @change="onChange">
+                        <u-count-down :time="goodsInfo.pinTuanRule.lastTime*1000" :autoStart="true" :millisecond="true" format="DD天HH时mm分ss秒" @change="onChange">
                             <view class="time">
                                 <view class="coreshop-font-12">仅剩：</view>
                                 <view class="time__custom">
@@ -46,7 +46,7 @@
                         </u-count-down>
                     </view>
                     <view class="coreshop-text-right coreshop-time-right" v-if="goodsInfo.pinTuanRule && goodsInfo.pinTuanRule.pinTuanStartStatus == 2">
-                        <u-count-down :time="goodsInfo.pinTuanRule.lastTime*1000" :autoStart="true" :millisecond="true" format="DD天HH时mm秒ss" @change="onChange">
+                        <u-count-down :time="goodsInfo.pinTuanRule.lastTime*1000" :autoStart="true" :millisecond="true" format="DD天HH时mm分ss秒" @change="onChange">
                             <view class="time">
                                 <view class="coreshop-font-12">即将开团：</view>
                                 <view class="time__custom">
@@ -274,22 +274,22 @@
         </view>
 
         <!--单个拼团数据展示-->
-        <u-popup mode="bottom" v-model="pinTuanpop">
+        <u-popup mode="bottom" :show="pinTuanpop" closeable="true" @close="pinTuanHiiden()">
             <view class="ig-top" v-if="teamInfo.teams.length > 0">
-                <view class="ig-top-t">
+                <view class="coreshop-flex coreshop-align-center coreshop-justify-center coreshop-margin-bottom-10">
                     <view class="">
                         剩余时间：
-                        <u-count-down :timestamp="teamInfo.lastTime" separator="zh" :show-days="true" :show-hours="true" :show-minutes="true" :show-seconds="true" font-size="24" separator-size="24" color="#666"></u-count-down>
+                        <u-count-down :time="teamInfo.lastTime * 1000"  :autoStart="true" :millisecond="true" format="DD天HH时mm分ss秒"></u-count-down>
                     </view>
                 </view>
-                <view class="ig-top-m">
+                <view class="ig-top-m coreshop-flex coreshop-align-center coreshop-justify-center coreshop-margin-bottom-10">
                     <view class="user-head-img-c" v-for="(item, index) in teamInfo.teams" :key="index">
                         <view class="user-head-img-tip" v-if="item.recordId == item.teamId">拼主</view>
                         <image class="user-head-img coreshop-head-icon " :src="item.userAvatar" mode=""></image>
                     </view>
                     <view class="user-head-img-c uhihn" v-if="teamInfo.teamNums" v-for="n in teamInfo.teamNums" :key="n"><text>?</text></view>
                 </view>
-                <view class="ig-top-b">
+                <view class="ig-top-b coreshop-flex coreshop-align-center coreshop-justify-center coreshop-margin-bottom-10 coreshop-flex-direction-column">
                     <view class="igtb-top">
                         还差
                         <text class="coreshop-text-red">{{ teamInfo.teamNums || '' }}</text>
@@ -963,6 +963,9 @@
             pinTuanShow() {
                 this.pinTuanpop = true;
             },
+            pinTuanHiiden() {
+                this.pinTuanpop = false;
+            },
             // 图片点击放大
             clickImg(index) {
                 if (this.goodsInfo.album[index].type == 'image') {
@@ -1006,6 +1009,9 @@
             },
             // 显示modal弹出框
             selectTap(type, teamId) {
+                if (this.pinTuanpop) {
+                    this.pinTuanpop = false;
+                }
                 this.pinTuanType = type;
                 if (teamId) {
                     this.teamId = teamId;
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/activity/seckill/list/list.vue b/CoreCms.Net.Uni-App/CoreShop/pages/activity/seckill/list/list.vue
index 662ca752..fdb7eeae 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/activity/seckill/list/list.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/activity/seckill/list/list.vue
@@ -35,7 +35,7 @@
                             </view>
                             <view class="coreshop-flex coreshop-justify-between coreshop-flex-direction-row coreshop-align-center" v-if="item.timestamp">
                                 <view class="coreshop-text-right coreshop-time-right coreshop-margin-top-10" v-if="(item.startStatus == 1) && item.timestamp">
-                                    <u-count-down :time="item.timestamp*1000" :autoStart="true" format="DD天HH时mm秒ss" @change="onChange($event,key)">
+                                    <u-count-down :time="item.timestamp*1000" :autoStart="true" format="DD天HH时mm分ss秒" @change="onChange($event,key)">
                                         <view class="time coreshop-font-11">
                                             <view class="coreshop-font-12">仅剩：</view>
                                             <view class="time__custom">
@@ -57,7 +57,7 @@
                                     </u-count-down>
                                 </view>
                                 <view class="coreshop-text-right coreshop-time-right coreshop-margin-top-10" v-if="(item.startStatus == 0) && item.timestamp">
-                                    <u-count-down :time="item.timestamp*1000" :autoStart="true" format="DD天HH时mm秒ss" @change="onChange($event,key)">
+                                    <u-count-down :time="item.timestamp*1000" :autoStart="true" format="DD天HH时mm分ss秒" @change="onChange($event,key)">
                                         <view class="time">
                                             <view class="coreshop-font-12">即将开始：</view>
                                             <view class="time__custom">
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/activity/seckill/seckillDetails/seckillDetails.vue b/CoreCms.Net.Uni-App/CoreShop/pages/activity/seckill/seckillDetails/seckillDetails.vue
index a45ab705..473f94a9 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/activity/seckill/seckillDetails/seckillDetails.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/activity/seckill/seckillDetails/seckillDetails.vue
@@ -24,7 +24,7 @@
                 </view>
                 <view class="coreshop-flex coreshop-text-left coreshop-justify-center coreshop-align-center">
                     <view class="coreshop-text-right coreshop-time-right">
-                        <u-count-down :time="goodsInfo.groupTimestamp*1000" :autoStart="true" :millisecond="true" format="DD天HH时mm秒ss" @change="onChange">
+                        <u-count-down :time="goodsInfo.groupTimestamp*1000" :autoStart="true" :millisecond="true" format="DD天HH时mm分ss秒" @change="onChange">
                             <view class="time">
                                 <view class="coreshop-font-12">仅剩：</view>
                                 <view class="time__custom">
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/order/invitationGroup/invitationGroup.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/order/invitationGroup/invitationGroup.vue
index 698cd96b..0c7ff5fe 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/order/invitationGroup/invitationGroup.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/order/invitationGroup/invitationGroup.vue
@@ -13,7 +13,7 @@
         <view class="content">
             <view class="coreshop-text-center coreshop-bg-white coreshop-padding-10 coreshop-flex coreshop-flex-wrap">
                 <view class="ig-top-t coreshop-margin-bottom-10 coreshop-percent-100 coreshop-text-center coreshop-flex coreshop-flex-nowrap coreshop-justify-center coreshop-align-center">
-                    剩余： <u-count-down :time="teamInfo.lastTime * 1000" format="HH:mm:ss"></u-count-down>
+                    剩余： <u-count-down :time="teamInfo.lastTime * 1000" :autoStart="true" :millisecond="true" format="DD天HH时mm分ss秒"></u-count-down>
                 </view>
                 <view class="coreshop-margin-bottom-10 coreshop-percent-100 coreshop-text-center coreshop-flex coreshop-flex-nowrap coreshop-justify-center">
                     <view class="user-head-img-c" v-for="(item, index) in teamInfo.list" :key="index">
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/serviceGoods/details/details.vue b/CoreCms.Net.Uni-App/CoreShop/pages/serviceGoods/details/details.vue
index 0903c36e..8ea2b7e5 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/serviceGoods/details/details.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/serviceGoods/details/details.vue
@@ -26,7 +26,7 @@
                 </view>
                 <view class="coreshop-flex-sub coreshop-flex coreshop-text-left coreshop-justify-end coreshop-align-center">
                     <view class="coreshop-text-right coreshop-time-right" v-if="info.openStatus == 1 && info.timestamp > 0">
-                        <u-count-down :time="info.timestamp * 1000" :autoStart="true" :millisecond="true" format="DD天HH时mm秒ss" @change="onChange" @finish="onFinish">
+                        <u-count-down :time="info.timestamp * 1000" :autoStart="true" :millisecond="true" format="DD天HH时mm分ss秒" @change="onChange" @finish="onFinish">
                             <view class="time">
                                 <view class="coreshop-font-12">仅剩：</view>
                                 <view class="time__custom">
@@ -48,7 +48,7 @@
                         </u-count-down>
                     </view>
                     <view class="coreshop-text-right coreshop-time-right" v-if="info.openStatus == 2 && info.timestamp > 0">
-                        <u-count-down :time="info.timestamp * 1000" :autoStart="true" :millisecond="true" format="DD天HH时mm秒ss" @change="onChange" @finish="onFinish">
+                        <u-count-down :time="info.timestamp * 1000" :autoStart="true" :millisecond="true" format="DD天HH时mm分ss秒" @change="onChange" @finish="onFinish">
                             <view class="time">
                                 <view class="coreshop-font-12">即将开始：</view>
                                 <view class="time__custom">
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/serviceGoods/index/index.vue b/CoreCms.Net.Uni-App/CoreShop/pages/serviceGoods/index/index.vue
index e7fa9b27..f02937e6 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/serviceGoods/index/index.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/serviceGoods/index/index.vue
@@ -40,7 +40,7 @@
                     </view>
                     <view class="coreshop-flex coreshop-align-center coreshop-flex-direction-row coreshop-justify-between coreshop-padding-10">
                         <view class="coreshop-text-right coreshop-time-right" v-if="item.openStatus == 1 && item.timestamp > 0">
-                            <u-count-down :time="item.timestamp * 1000" :autoStart="true" :millisecond="true" format="DD天HH时mm秒ss" @change="onChange($event,index)">
+                            <u-count-down :time="item.timestamp * 1000" :autoStart="true" :millisecond="true" format="DD天HH时mm分ss秒" @change="onChange($event,index)">
                                 <view class="time coreshop-font-11 coreshop-text-gray">
                                     <view class="">仅剩时间：</view>
                                     <view class="time__custom">
@@ -62,7 +62,7 @@
                             </u-count-down>
                         </view>
                         <view class="coreshop-text-right coreshop-time-right" v-if="item.openStatus == 2 && item.timestamp > 0">
-                            <u-count-down :time="item.timestamp * 1000" :autoStart="true" :millisecond="true" format="DD天HH时mm秒ss" @change="onChange($event,index)">
+                            <u-count-down :time="item.timestamp * 1000" :autoStart="true" :millisecond="true" format="DD天HH时mm分ss秒" @change="onChange($event,index)">
                                 <view class="time coreshop-font-11 coreshop-text-gray">
                                     <view class="">距离开始：</view>
                                     <view class="time__custom">
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/share/shareNewPoster/shareNewPoster.vue b/CoreCms.Net.Uni-App/CoreShop/pages/share/shareNewPoster/shareNewPoster.vue
index 5d46fff8..e4372067 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/share/shareNewPoster/shareNewPoster.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/share/shareNewPoster/shareNewPoster.vue
@@ -139,7 +139,7 @@
                     }
                 })
             }
-            else if (options.shareType == _this.$globalConstVars.shareType.pinTuan) {
+            else if (options.shareType == _this.$globalConstVars.shareType.pinTuan || options.shareType == _this.$globalConstVars.shareType.addPinTuan) {
                 let data = {
                     id: parseInt(options.groupId),
                     data: false,