# 2022-03-22

### 1.4.1 开源社区版：无 ### 0.3.1 专业版：【新增】前端全局配置增加不同海报类型的全局配置，方便调用。【修复】修复拼团订单详情分享他人参团的异常问题。【修复】修复个人服务码列表，点击不弹出弹窗的问题。【修复】商家中心核销服务码界面显示异常的问题。#I4YR6N 【修复】修复自定义交易组件维护商品选择品牌数据未关联的问题。
2025-12-06 19:53:27 +08:00 · 2022-03-22 01:08:27 +08:00
parent 37c3ff7bf3
commit c5a5d808b7
17 changed files with 307 additions and 87 deletions
--- a/CoreCms.Net.Uni-App/CoreShop/common/setting/constVarsHelper.js
+++ b/CoreCms.Net.Uni-App/CoreShop/common/setting/constVarsHelper.js
@@ -45,6 +45,36 @@ export const paymentType = {
    formOrder: 302,
 };

+
+//分享链接及海报类型
+export const shareType = {
+    // 首页
+    index: 1,
+    // 2商品详情页
+    goods: 2,
+    // 3拼团详情页
+    pinTuan: 3,
+    // 4店铺邀请
+    inv: 4,
+    // 5文章页面
+    article: 5,
+    // 6参团页面
+    addPinTuan: 6,
+    // 7自定义页面
+    page: 7,
+    // 8智能表单
+    form: 8,
+    // 9团购
+    group: 9,
+    // 10秒杀
+    seckill: 10,
+    // 11代理
+    agent: 11,
+    // 12接龙
+    solitaire: 12,
+};
+
+
 // #ifdef MP-TOUTIAO
 export const ttPlatform = 'toutiao'; //toutiao=今日头条小程序, douyin=抖音小程序, pipixia=皮皮虾小程序, huoshan=火山小视频小程序
 // #endif
--- 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
@@ -55,7 +55,7 @@
            //分享类型
            shareType: {
                type: Number,
-                default: 2
+                default: 1
            },
            //拼团id
            groupId: {
@@ -74,7 +74,7 @@
            }
        },
        mounted() {
-
+        //    console.log("类型：" + this.shareType);
        },
        methods: {
            // 关闭弹出层
@@ -84,7 +84,7 @@
            // 生成海报
            createPoster() {
                let data = {};
-                if (this.shareType == 2) {
+                if (this.shareType == this.$globalConstVars.shareType.index) {
                    data = {
                        page: this.shareType, //商品
                        url: 'pages/share/jump/jump',
@@ -98,7 +98,24 @@
                    if (userToken) {
                        data.token = userToken
                    }
-                } else if (this.shareType == 3) {
+                } else if (this.shareType == this.$globalConstVars.shareType.pinTuan) {
+                    data = {
+                        page: this.shareType, //拼团
+                        url: 'pages/share/jump/jump',
+                        params: {
+                            goodsId: this.goodsId,
+                            teamId: this.teamId
+                        },
+                        type: 3,//参团
+                        client: 2
+                    }
+                    let userToken = this.$db.get('userToken')
+                    if (userToken) {
+                        data.token = userToken
+                    }
+                    console.log(data);
+                }
+                else if (this.shareType == this.$globalConstVars.shareType.addPinTuan) {
                    data = {
                        page: this.shareType, //拼团
                        url: 'pages/share/jump/jump',
@@ -107,16 +124,17 @@
                            groupId: this.groupId,
                            teamId: this.teamId
                        },
-                        type: 3,//海报
+                        type: 3,//参团
                        client: 2
                    }
                    let userToken = this.$db.get('userToken')
                    if (userToken) {
                        data.token = userToken
                    }
-                } else if (this.shareType == 12) {
+                    console.log(data);
+                } else if (this.shareType == this.$globalConstVars.shareType.solitaire) {
                    data = {
-                        page: this.shareType, //拼团
+                        page: this.shareType,
                        url: 'pages/share/jump/jump',
                        params: {
                            id: this.objectId
--- a/CoreCms.Net.Uni-App/CoreShop/pages/activity/pinTuan/pinTuanDetails/pinTuanDetails.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/activity/pinTuan/pinTuanDetails/pinTuanDetails.vue
@@ -294,19 +294,19 @@
        <view class="coreshop-padding-0">
            <u-popup mode="bottom" :show="shareBox" ref="share">
                <!-- #ifdef H5 -->
-                <coreshop-share-h5 :goodsId="goodsInfo.id" :shareImg="goodsInfo.image" :shareTitle="goodsInfo.name" :shareContent="goodsInfo.brief" :shareHref="shareHref" @close="closeShare()"></coreshop-share-h5>
+                <coreshop-share-h5 :shareType='$globalConstVars.shareType.pinTuan' :goodsId="goodsInfo.id" :shareImg="goodsInfo.image" :shareTitle="goodsInfo.name" :shareContent="goodsInfo.brief" :shareHref="shareHref" @close="closeShare()"></coreshop-share-h5>
                <!-- #endif -->
                <!-- #ifdef MP-WEIXIN -->
-                <coreshop-share-wx :goodsId="goodsInfo.id" :shareImg="goodsInfo.image" :shareTitle="goodsInfo.name" :shareContent="goodsInfo.brief" :shareHref="shareHref" @close="closeShare()"></coreshop-share-wx>
+                <coreshop-share-wx :shareType='$globalConstVars.shareType.pinTuan' :goodsId="goodsInfo.id" :shareImg="goodsInfo.image" :shareTitle="goodsInfo.name" :shareContent="goodsInfo.brief" :shareHref="shareHref" @close="closeShare()"></coreshop-share-wx>
                <!-- #endif -->
                <!-- #ifdef MP-ALIPAY -->
-                <coreshop-share-alipay :goodsId="goodsInfo.id" :shareImg="goodsInfo.image" :shareTitle="goodsInfo.name" :shareContent="goodsInfo.brief" :shareHref="shareHref" @close="closeShare()"></coreshop-share-alipay>
+                <coreshop-share-alipay :shareType='$globalConstVars.shareType.pinTuan' :goodsId="goodsInfo.id" :shareImg="goodsInfo.image" :shareTitle="goodsInfo.name" :shareContent="goodsInfo.brief" :shareHref="shareHref" @close="closeShare()"></coreshop-share-alipay>
                <!-- #endif -->
                <!-- #ifdef MP-TOUTIAO -->
-                <coreshop-share-tt :goodsId="goodsInfo.id" :shareImg="goodsInfo.image" :shareTitle="goodsInfo.name" :shareContent="goodsInfo.brief" :shareHref="shareHref" @close="closeShare()"></coreshop-share-tt>
+                <coreshop-share-tt :shareType='$globalConstVars.shareType.pinTuan' :goodsId="goodsInfo.id" :shareImg="goodsInfo.image" :shareTitle="goodsInfo.name" :shareContent="goodsInfo.brief" :shareHref="shareHref" @close="closeShare()"></coreshop-share-tt>
                <!-- #endif -->
                <!-- #ifdef APP-PLUS || APP-PLUS-NVUE -->
-                <coreshop-share-app :goodsId="goodsInfo.id" :shareImg="goodsInfo.image" :shareTitle="goodsInfo.name" :shareContent="goodsInfo.brief" :shareHref="shareHref" @close="closeShare()"></coreshop-share-app>
+                <coreshop-share-app :shareType='$globalConstVars.shareType.pinTuan' :goodsId="goodsInfo.id" :shareImg="goodsInfo.image" :shareTitle="goodsInfo.name" :shareContent="goodsInfo.brief" :shareHref="shareHref" @close="closeShare()"></coreshop-share-app>
                <!-- #endif -->
            </u-popup>
            <div id="qrCode" ref="qrCodeDiv"></div>
@@ -566,7 +566,7 @@
            console.log(e);
            this.goodsId = e.id;
            this.pinTuanId = e.pinTuanId;
-            if (e.teamId) {
+            if (e.teamId && e.teamId > 0) {
                this.teamId = e.teamId;
                this.getTeam(this.teamId);
            }
--- a/CoreCms.Net.Uni-App/CoreShop/pages/goods/goodDetails/goodDetails.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/goods/goodDetails/goodDetails.vue
@@ -11,9 +11,7 @@
            </view>
        </u-navbar>
        <!--幻灯片-->
-        <view class="coreshop-full-screen-banner-swiper-box">
-            <u-swiper height="calc(750rpx * 6 / 6)" radius="0" :list="goodsInfo.album" :autoplay="autoplay" indicator indicatorMode="line" circular @click="clickImg"></u-swiper>
-        </view>
+        <u-swiper height="calc(750rpx * 6 / 6)" radius="0" :list="bannerList" :autoplay="autoplay" indicator indicatorMode="line" circular @click="clickImg"></u-swiper>
        <!--限时秒杀-->
        <view class="coreshop-limited-seckill-box coreshop-bg-red">
            <text class="coreshop-text-price coreshop-font-20">{{ product.price || '0.00' }}</text>
@@ -427,6 +425,7 @@
                goodsId: 0, // 商品id
                goodsInfo: {}, // 商品详情
                cartNums: 0, // 购物车数量
+                bannerList: [], // 幻灯片
                product: {}, // 货品详情
                shopRecommendData: [], // 本店推荐数据
                otherRecommendData: [], // 其他数据
@@ -610,11 +609,20 @@
                            _this.goodsInfo = info;

                            if (_this.goodsInfo.album && _this.goodsInfo.video) {
+                                var sw = [];
                                var videoObj = {
                                    url: _this.goodsInfo.video,
                                    poster: _this.goodsInfo.image
                                };
-                                _this.goodsInfo.album.unshift(videoObj);
+                                sw.push(videoObj);
+                                for (var i = 0; i < _this.goodsInfo.album.length; i++) {
+                                    let img = {
+                                        url: _this.goodsInfo.album[i]
+                                    };
+                                    sw.push(img);
+                                }
+                                _this.bannerList = sw;
+                                console.log(_this.bannerList);
                                _this.autoplay = false;
                            }

--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/serviceVerification/index.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/serviceVerification/index.vue
@@ -28,14 +28,16 @@
                                <view class="store">服务单号：{{ticket.serviceOrderId}}</view>
                            </view>
                            <view>
-                                <u-button :text="ticket.statusStr" size="mini" type="success" v-if="ticket.status==0" /> <!--正常-->
-                                <u-button :text="ticket.statusStr" size="mini" type="error" v-if="ticket.status==1" /> <!--过期-->
-                                <u-button :text="ticket.statusStr" size="mini" type="primary" v-if="ticket.status==2" /> <!--作废-->
-                                <u-button :text="ticket.statusStr" size="mini" type="info" v-if="ticket.status==3" /> <!--已核销-->
+                                <u-button text="正常" size="mini" type="success" v-if="ticket.status==0" /> <!--正常-->
+                                <u-button text="过期" size="mini" type="error" v-if="ticket.status==1" /> <!--过期-->
+                                <u-button text="作废" size="mini" type="primary" v-if="ticket.status==2" /> <!--作废-->
+                                <u-button text="已核销" size="mini" type="info" v-if="ticket.status==3" /> <!--已核销-->
                            </view>
                        </view>
                        <view class="item">
-                            <view class="left"><image :src="service.thumbnail && service.thumbnail!='null' ?  service.thumbnail : '/static/images/common/empty-banner.png'" mode="aspectFill"></image></view>
+                            <view class="left">
+                                <u--image :showLoading="true" :src="service.thumbnail && service.thumbnail!='null' ?  service.thumbnail : '/static/images/common/empty-banner.png'" width="80px" height="80px" mode="aspectFill"></u--image>
+                            </view>
                            <view class="content">
                                <view class="title u-line-2">{{service.title}}</view>
                                <view class="type">是否核销：{{ticket.isVerification?'是':'否'}}</view>
@@ -43,12 +45,12 @@
                                <view class="delivery-time">服务券状态：{{ ticket.statusStr }}</view>
                            </view>
                        </view>
-                        <view class="bottom coreshop-margin-0" v-if="ticket.validityStartTime && ticket.validityEndTime">
+                        <view class="bottom coreshop-margin-10" v-if="ticket.validityStartTime && ticket.validityEndTime">
                            <view class="coreshop-font-xs">
                                可核销时间：{{ticket.validityStartTime}} 至 {{ticket.validityEndTime}}
                            </view>
                        </view>
-                        <view class="bottom coreshop-margin-0">
+                        <view class="bottom coreshop-margin-10">
                            <view class="more coreshop-font-xs" v-if="ticket.createTime && ticket.status>0">
                                下单时间：{{ $u.timeFormat(ticket.createTime, 'mm-dd hh:MM:ss') }}
                            </view>
--- 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" format="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">
@@ -41,29 +41,19 @@
            <view class="coreshop-padding-10">
                <u-popup mode="bottom" :show="shareBox" ref="share">
                    <!-- #ifdef H5 -->
-                    <coreshop-share-h5 :shareType='3' :goodsId="goodsInfo.goodsId" :teamId="teamInfo.teamId" :groupId="teamInfo.ruleId"
-                                       :shareImg="goodsInfo.image_url" :shareTitle="goodsInfo.name" :shareContent="goodsInfo.brief" :shareHref="shareHref"
-                                       @close="closeShare()"></coreshop-share-h5>
+                    <coreshop-share-h5 :shareType='$globalConstVars.shareType.addPinTuan' :goodsId="goodsInfo.goodsId" :teamId="teamInfo.teamId" :groupId="teamInfo.ruleId" :shareImg="goodsInfo.imageUrl" :shareTitle="goodsInfo.name" :shareContent="goodsInfo.addon" :shareHref="shareHref" @close="closeShare()"></coreshop-share-h5>
                    <!-- #endif -->
                    <!-- #ifdef MP-WEIXIN -->
-                    <coreshop-share-wx :shareType='3' :goodsId="goodsInfo.goodsId" :teamId="teamInfo.teamId" :groupId="teamInfo.ruleId"
-                                       :shareImg="goodsInfo.image_url" :shareTitle="goodsInfo.name" :shareContent="goodsInfo.brief" :shareHref="shareHref"
-                                       @close="closeShare()"></coreshop-share-wx>
+                    <coreshop-share-wx :shareType='$globalConstVars.shareType.addPinTuan' :goodsId="goodsInfo.goodsId" :teamId="teamInfo.teamId" :groupId="teamInfo.ruleId" :shareImg="goodsInfo.imageUrl" :shareTitle="goodsInfo.name" :shareContent="goodsInfo.addon" :shareHref="shareHref" @close="closeShare()"></coreshop-share-wx>
                    <!-- #endif -->
                    <!-- #ifdef MP-ALIPAY -->
-                    <coreshop-share-alipay :shareType='3' :goodsId="goodsInfo.goodsId" :teamId="teamInfo.teamId" :groupId="teamInfo.ruleId"
-                                           :shareImg="goodsInfo.image_url" :shareTitle="goodsInfo.name" :shareContent="goodsInfo.brief" :shareHref="shareHref"
-                                           @close="closeShare()"></coreshop-share-alipay>
+                    <coreshop-share-alipay :shareType='$globalConstVars.shareType.addPinTuan' :goodsId="goodsInfo.goodsId" :teamId="teamInfo.teamId" :groupId="teamInfo.ruleId" :shareImg="goodsInfo.imageUrl" :shareTitle="goodsInfo.name" :shareContent="goodsInfo.addon" :shareHref="shareHref" @close="closeShare()"></coreshop-share-alipay>
                    <!-- #endif -->
                    <!-- #ifdef MP-TOUTIAO -->
-                    <coreshop-share-tt :shareType='3' :goodsId="goodsInfo.goodsId" :teamId="teamInfo.teamId" :groupId="teamInfo.ruleId"
-                                       :shareImg="goodsInfo.image_url" :shareTitle="goodsInfo.name" :shareContent="goodsInfo.brief" :shareHref="shareHref"
-                                       @close="closeShare()"></coreshop-share-tt>
+                    <coreshop-share-tt :shareType='$globalConstVars.shareType.addPinTuan' :goodsId="goodsInfo.goodsId" :teamId="teamInfo.teamId" :groupId="teamInfo.ruleId" :shareImg="goodsInfo.imageUrl" :shareTitle="goodsInfo.name" :shareContent="goodsInfo.addon" :shareHref="shareHref" @close="closeShare()"></coreshop-share-tt>
                    <!-- #endif -->
                    <!-- #ifdef APP-PLUS || APP-PLUS-NVUE -->
-                    <coreshop-share-app :shareType='3' :goodsId="goodsInfo.goodsId" :teamId="teamInfo.teamId" :groupId="teamInfo.ruleId"
-                                        :shareImg="goodsInfo.image_url" :shareTitle="goodsInfo.name" :shareContent="goodsInfo.brief" :shareHref="shareHref"
-                                        @close="closeShare()"></coreshop-share-app>
+                    <coreshop-share-app :shareType='$globalConstVars.shareType.addPinTuan' :goodsId="goodsInfo.goodsId" :teamId="teamInfo.teamId" :groupId="teamInfo.ruleId" :shareImg="goodsInfo.imageUrl" :shareTitle="goodsInfo.name" :shareContent="goodsInfo.addon" :shareHref="shareHref" @close="closeShare()"></coreshop-share-app>
                    <!-- #endif -->
                </u-popup>
            </view>
@@ -219,10 +209,11 @@
                    client: 2,
                    url: "/pages/share/jump/jump",
                    type: 1,
-                    page: 3,
+                    page: this.$globalConstVars.shareType.addPinTuan,
                    params: {
                        goodsId: this.goodsInfo.goodsId,
-                        teamId: this.teamInfo.list[0].teamId
+                        teamId: this.teamInfo.teamId,
+                        groupId: this.teamInfo.ruleId
                    }
                };
                let userToken = this.$db.get('userToken');
@@ -234,32 +225,33 @@
                });
            }
        },
-        //watch: {
-        //    goodsInfo: {
-        //        handler() {
-        //            this.getShareUrl();
-        //        },
-        //        deep: true
-        //    },
-        //    teamInfo: {
-        //        handler() {
-        //            this.getShareUrl();
-        //        },
-        //        deep: true
-        //    }
-        //},
+        watch: {
+            goodsInfo: {
+                handler() {
+                    this.getShareUrl();
+                },
+                deep: true
+            },
+            teamInfo: {
+                handler() {
+                    this.getShareUrl();
+                },
+                deep: true
+            }
+        },
        //分享
        onShareAppMessage(res) {
+            console.log(this.shareUrl);
            return {
-                title: this.$store.state.config.shareTitle,
-                imageUrl: this.$store.state.config.shareImage,
+                title: this.goodsInfo.name,
+                imageUrl: this.goodsInfo.imageUrl,
                path: this.shareUrl
            }
        },
        onShareTimeline(res) {
            return {
-                title: this.$store.state.config.shareTitle,
-                imageUrl: this.$store.state.config.shareImage,
+                title: this.goodsInfo.name,
+                imageUrl: this.goodsInfo.imageUrl,
                path: this.shareUrl
            }
        },
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/serviceOrder/details/details.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/serviceOrder/details/details.vue
@@ -64,7 +64,7 @@
            </view>
            <u-loadmore :status="status" :icon-type="iconType" :load-text="loadText" margin-top="20" margin-bottom="20" />
        </view>
-        <u-popup v-model="show" mode="center" width="180px" height="180px" :closeable="true">
+        <u-popup :show="show" mode="center" width="180px" height="180px" @close="close">
            <canvas canvas-id="qrcode" style="width: 180px; height: 180px; " />
        </u-popup>
    </view>
@@ -132,6 +132,9 @@
                    }
                })
            },
+            close() {
+                this.show = false
+            },
            showQrcodeBox(index) {
                let _this = this;
                var item = _this.list[index];
@@ -141,6 +144,8 @@
                }
            },
            make(textStr) {
+                console.log(textStr);
+                console.log(uQRCode);
                uQRCode.make({
                    canvasId: 'qrcode',
                    componentInstance: this,
--- a/CoreCms.Net.Uni-App/CoreShop/pages/share/jump/jump.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/share/jump/jump.vue
@@ -128,15 +128,14 @@
                }
            },
            //跳转到参团
-            //todo:: 功能暂无后续开发
-            // gotoInvitationGroup(id, groupId, teamId) {
-            // 	if(id && id != '' && groupId && groupId != '' && teamId && teamId != ''){
-            // 		let url = '/pages/member/order/invitationGroup/invitationGroup?id=' + id + '&groupId=' + groupId + '&teamId=' + teamId;
-            // 		this.$u.route({ type: 'redirectTo', url: url });
-            // 	}else{
-            // 		this.gotoIndex();
-            // 	}
-            // },
+            gotoInvitationGroup(goodsId, groupId, teamId) {
+                if (goodsId && groupId && teamId) {
+                    let url = '/pages/activity/pinTuan/pinTuanDetails/pinTuanDetails?id=' + goodsId + '&pinTuanId=' + groupId + '&teamId=' + teamId;
+                    this.$u.route({ type: 'redirectTo', url: url });
+                } else {
+                    this.gotoIndex();
+                }
+            },
            //跳转到自定义页
            gotoCustom(pageCode) {
                if (pageCode && pageCode != '') {