wgh/coreshoppro
1
0
Fork 0
mirror of http://git.coreshop.cn/jianweie/coreshoppro.git synced 2025-12-06 19:53:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

【修复】修复拼团分享海报后调整失败的问题，修改拼团带组分享后调整未弹出当前组信息的问题，更换拼团分享海报为新海报。

Browse Source 
【修复】修复多个位置将倒计时【DD天HH时mm分ss秒】错写成【DD天HH时mm秒ss】的问题。
This commit is contained in:
大灰灰
2022-11-15 20:35:56 +08:00
parent 11859d3dcf
commit f27b9b40f2
15 changed files with 57 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CoreCms.Net.Services/Share/CoreCmsShareServices.cs
View File

@@ -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
{

6
CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-groupPurchase.vue
View File

@@ -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">

6
CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-seckill.vue
View File

@@ -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">

8
CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-serviceGood.vue
View File

@@ -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">

36
CoreCms.Net.Uni-App/CoreShop/components/coreshop-share-wx/coreshop-share-wx.vue
View File

@@ -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

2
CoreCms.Net.Uni-App/CoreShop/pages/activity/groupBuying/groupBuyingDetails/groupBuyingDetails.vue
View File

@@ -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">

4
CoreCms.Net.Uni-App/CoreShop/pages/activity/groupBuying/list/list.vue
View File

@@ -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">

2
CoreCms.Net.Uni-App/CoreShop/pages/activity/pinTuan/pinTuanDetails/details.scss
View File

@@ -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; }

20
CoreCms.Net.Uni-App/CoreShop/pages/activity/pinTuan/pinTuanDetails/pinTuanDetails.vue
View File

@@ -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;

4
CoreCms.Net.Uni-App/CoreShop/pages/activity/seckill/list/list.vue
View File

@@ -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">

2
CoreCms.Net.Uni-App/CoreShop/pages/activity/seckill/seckillDetails/seckillDetails.vue
View File

@@ -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">

2
CoreCms.Net.Uni-App/CoreShop/pages/member/order/invitationGroup/invitationGroup.vue
View File

@@ -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">

4
CoreCms.Net.Uni-App/CoreShop/pages/serviceGoods/details/details.vue
View File

@@ -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">

4
CoreCms.Net.Uni-App/CoreShop/pages/serviceGoods/index/index.vue
View File

@@ -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">

2
CoreCms.Net.Uni-App/CoreShop/pages/share/shareNewPoster/shareNewPoster.vue
View File

@@ -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,