diff --git a/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/common/setting/constVarsHelper.js b/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/common/setting/constVarsHelper.js index 2274fa1b..78036801 100644 --- a/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/common/setting/constVarsHelper.js +++ b/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/common/setting/constVarsHelper.js @@ -75,12 +75,9 @@ export const shareType = { solitaire: 12, }; +export const shareUrl = '/pages/share/jump/jump'; //分享初始化地址 -// #ifdef MP-TOUTIAO -export const ttPlatform = 'toutiao'; //toutiao=今日头条小程序, douyin=抖音小程序, pipixia=皮皮虾小程序, huoshan=火山小视频小程序 -// #endif - //nav页面导航类型 export const navLinkType = { diff --git a/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/components/coreshop-share-app/coreshop-share-app.vue b/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/components/coreshop-share-app/coreshop-share-app.vue index c19e1352..60a1d16b 100644 --- a/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/components/coreshop-share-app/coreshop-share-app.vue +++ b/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/components/coreshop-share-app/coreshop-share-app.vue @@ -145,7 +145,7 @@ //商品 data = { page: 2, //商品 - url: 'pages/share/jump/jump', + url: this.$globalConstVars.shareUrl, params: { goodsId: this.goodsId }, @@ -160,7 +160,7 @@ //拼团 data = { page: 3, //商品 - url: 'pages/share/jump/jump', + url: this.$globalConstVars.shareUrl, params: { goodsId: this.goodsId, groupId: this.groupId, diff --git a/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/components/coreshop-share-h5/coreshop-share-h5.vue b/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/components/coreshop-share-h5/coreshop-share-h5.vue index 7acad298..cdb64a1c 100644 --- a/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/components/coreshop-share-h5/coreshop-share-h5.vue +++ b/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/components/coreshop-share-h5/coreshop-share-h5.vue @@ -86,7 +86,7 @@ //商品 data = { page: 2, //商品 - url: h5Url + 'pages/share/jump/jump', + url: h5Url + this.$globalConstVars.shareUrl, params: { goodsId: this.goodsId }, @@ -101,7 +101,7 @@ //拼团 data = { page: 3, //商品 - url: h5Url + 'pages/share/jump/jump', + url: h5Url + this.$globalConstVars.shareUrl, params: { goodsId: this.goodsId, groupId: this.groupId, @@ -129,7 +129,7 @@ if (this.shareType == 1) { data = { page: 2, //商品 - url: h5Url + 'pages/share/jump/jump', + url: h5Url + this.$globalConstVars.shareUrl, params: { goodsId: this.goodsId }, @@ -143,7 +143,7 @@ } else if (this.shareType == 3) { data = { page: 3, //拼团 - url: h5Url + 'pages/share/jump/jump', + url: h5Url + this.$globalConstVars.shareUrl, params: { goodsId: this.goodsId, groupId: this.groupId, diff --git a/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/components/coreshop-share-wx/coreshop-share-wx.vue b/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/components/coreshop-share-wx/coreshop-share-wx.vue index aef31c9e..a3fa85e1 100644 --- a/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/components/coreshop-share-wx/coreshop-share-wx.vue +++ b/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/components/coreshop-share-wx/coreshop-share-wx.vue @@ -87,7 +87,7 @@ if (this.shareType == this.$globalConstVars.shareType.index) { data = { page: this.shareType, //商品 - url: 'pages/share/jump/jump', + url: this.$globalConstVars.shareUrl, params: { goodsId: this.goodsId }, @@ -101,7 +101,7 @@ } else if (this.shareType == this.$globalConstVars.shareType.pinTuan) { data = { page: this.shareType, //拼团 - url: 'pages/share/jump/jump', + url: this.$globalConstVars.shareUrl, params: { goodsId: this.goodsId, teamId: this.teamId @@ -118,7 +118,7 @@ else if (this.shareType == this.$globalConstVars.shareType.group || this.shareType == this.$globalConstVars.shareType.seckill) { data = { page: this.shareType, //拼团 - url: 'pages/share/jump/jump', + url: this.$globalConstVars.shareUrl, params: { goodsId: this.goodsId, groupId: this.groupId @@ -135,7 +135,7 @@ else if (this.shareType == this.$globalConstVars.shareType.goods) { data = { page: this.shareType, //拼团 - url: 'pages/share/jump/jump', + url: this.$globalConstVars.shareUrl, params: { goodsId: this.goodsId, }, @@ -151,7 +151,7 @@ else if (this.shareType == this.$globalConstVars.shareType.addPinTuan) { data = { page: this.shareType, //拼团 - url: 'pages/share/jump/jump', + url: this.$globalConstVars.shareUrl, params: { goodsId: this.goodsId, groupId: this.groupId, @@ -168,7 +168,7 @@ } else if (this.shareType == this.$globalConstVars.shareType.solitaire) { data = { page: this.shareType, - url: 'pages/share/jump/jump', + url: this.$globalConstVars.shareUrl, params: { id: this.objectId }, diff --git a/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/activity/groupBuying/groupBuyingDetails/groupBuyingDetails.vue b/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/activity/groupBuying/groupBuyingDetails/groupBuyingDetails.vue index c621a275..6c9ef57a 100644 --- a/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/activity/groupBuying/groupBuyingDetails/groupBuyingDetails.vue +++ b/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/activity/groupBuying/groupBuyingDetails/groupBuyingDetails.vue @@ -371,7 +371,7 @@ modalTitle: '', modalType: 'promotion', selectType: '', - shareUrl: '/pages/share/jump/jump', + shareUrl: this.$globalConstVars.shareUrl, shareBox: false, serviceDescription: { commonQuestion: [], @@ -697,7 +697,7 @@ getShareUrl() { let data = { client: 2, - url: "/pages/share/jump/jump", + url: this.$globalConstVars.shareUrl, type: 1, page: 9, params: { diff --git a/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/activity/pinTuan/pinTuanDetails/pinTuanDetails.vue b/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/activity/pinTuan/pinTuanDetails/pinTuanDetails.vue index 1a7b757a..ec681fd5 100644 --- a/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/activity/pinTuan/pinTuanDetails/pinTuanDetails.vue +++ b/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/activity/pinTuan/pinTuanDetails/pinTuanDetails.vue @@ -523,7 +523,7 @@ modalTitle: '', modalType: 'promotion', selectType: '', - shareUrl: '/pages/share/jump/jump', + shareUrl: this.$globalConstVars.shareUrl, shareBox: false, serviceDescription: { commonQuestion: [], @@ -918,7 +918,7 @@ getShareUrl() { let data = { client: 2, - url: "/pages/share/jump/jump", + url: this.$globalConstVars.shareUrl, type: 1, page: 3, params: { diff --git a/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/activity/seckill/seckillDetails/seckillDetails.vue b/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/activity/seckill/seckillDetails/seckillDetails.vue index 369921bb..8fd553e6 100644 --- a/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/activity/seckill/seckillDetails/seckillDetails.vue +++ b/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/activity/seckill/seckillDetails/seckillDetails.vue @@ -380,7 +380,7 @@ modalTitle: '', modalType: 'promotion', selectType: '', - shareUrl: '/pages/share/jump/jump', + shareUrl: this.$globalConstVars.shareUrl, shareBox: false, shareType: 10, serviceDescription: { @@ -701,7 +701,7 @@ getShareUrl() { let data = { client: 2, - url: "/pages/share/jump/jump", + url: this.$globalConstVars.shareUrl, type: 1, page: this.shareType, params: { diff --git a/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/activity/solitaire/solitaireDetails/solitaireDetails.vue b/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/activity/solitaire/solitaireDetails/solitaireDetails.vue index d123e2c8..b3e8d05e 100644 --- a/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/activity/solitaire/solitaireDetails/solitaireDetails.vue +++ b/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/activity/solitaire/solitaireDetails/solitaireDetails.vue @@ -166,7 +166,7 @@ cartType: this.$globalConstVars.paymentType.solitaire, shareBox: false, submitStatus: false, - shareUrl: '/pages/share/jump/jump', + shareUrl: this.$globalConstVars.shareUrl, } }, onLoad(e) { @@ -337,7 +337,7 @@ getShareUrl() { let data = { client: 2, - url: "/pages/share/jump/jump", + url: this.$globalConstVars.shareUrl, type: 1, page: 12, params: { diff --git a/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/article/details/details.vue b/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/article/details/details.vue index 85b96700..7e61e25c 100644 --- a/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/article/details/details.vue +++ b/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/article/details/details.vue @@ -36,7 +36,7 @@ id: 0, info: {}, contentBody: '', - shareUrl: '/pages/share/jump/jump', + shareUrl: this.$globalConstVars.shareUrl, title: '' }; }, @@ -118,7 +118,7 @@ getShareUrl() { let data = { client: 2, - url: "/pages/share/jump/jump", + url: this.$globalConstVars.shareUrl, type: 1, page: 5, params: { diff --git a/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/form/details/details.vue b/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/form/details/details.vue index 1e2332e7..f3ff6c2f 100644 --- a/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/form/details/details.vue +++ b/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/form/details/details.vue @@ -346,7 +346,7 @@ selectId: '', showSpecs: false, submitStatus: false, //按钮状态 - shareUrl: '/pages/share/jump/jump', + shareUrl: this.$globalConstVars.shareUrl, bottomModal: false, buttonName: '', } @@ -839,7 +839,7 @@ getShareUrl() { let data = { client: 2, - url: "/pages/share/jump/jump", + url: this.$globalConstVars.shareUrl, type: 1, page: 8, params: { diff --git a/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/goods/goodDetails/goodDetails.vue b/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/goods/goodDetails/goodDetails.vue index c972565f..1fe5d922 100644 --- a/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/goods/goodDetails/goodDetails.vue +++ b/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/goods/goodDetails/goodDetails.vue @@ -389,7 +389,7 @@ modalTitle: '', modalType: 'promotion', selectType: '', - shareUrl: '/pages/share/jump/jump', + shareUrl: this.$globalConstVars.shareUrl, shareBox: false, serviceDescription: { commonQuestion: [], @@ -821,7 +821,7 @@ getShareUrl() { let data = { client: 2, - url: "/pages/share/jump/jump", + url: this.$globalConstVars.shareUrl, type: 1, page: 2, params: { diff --git a/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/index/custom/custom.vue b/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/index/custom/custom.vue index 5968b1bc..73120632 100644 --- a/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/index/custom/custom.vue +++ b/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/index/custom/custom.vue @@ -50,7 +50,7 @@ //userInfo: {}, // 用户信息 kefupara: '', //客服传递资料 copy: false, - shareUrl: '/pages/share/jump/jump', + shareUrl: this.$globalConstVars.shareUrl, modalShow: true, }; }, @@ -181,7 +181,7 @@ getShareUrl() { let data = { client: 2, - url: "/pages/share/jump/jump", + url: this.$globalConstVars.shareUrl, type: 1, page: 1, }; diff --git a/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/index/default/default.vue b/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/index/default/default.vue index 59db29e7..e5376c7c 100644 --- a/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/index/default/default.vue +++ b/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/index/default/default.vue @@ -44,7 +44,7 @@ //userInfo: {}, // 用户信息 kefupara: '', //客服传递资料 copy: false, - shareUrl: '/pages/share/jump/jump', + shareUrl: this.$globalConstVars.shareUrl, isScorll: false, homeTitle: '', modalShow: true, @@ -142,7 +142,7 @@ getShareUrl() { let data = { client: 2, - url: "/pages/share/jump/jump", + url: this.$globalConstVars.shareUrl, type: 1, page: 1, }; diff --git a/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/index/designDefault/designDefault.vue b/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/index/designDefault/designDefault.vue index f523fee4..18a6f11d 100644 --- a/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/index/designDefault/designDefault.vue +++ b/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/index/designDefault/designDefault.vue @@ -702,7 +702,7 @@ scrollTop: 0, imageUrl: '/static/images/ShareImage.png', //店铺分享图片 kefupara: '', //客服传递资料 - shareUrl: '/pages/share/jump/jump', + shareUrl: this.$globalConstVars.shareUrl, homeTitle: '', }; }, @@ -766,7 +766,7 @@ getShareUrl() { let data = { client: 2, - url: "/pages/share/jump/jump", + url: this.$globalConstVars.shareUrl, type: 1, page: 1, }; diff --git a/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/member/agent/myStore/myStore.vue b/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/member/agent/myStore/myStore.vue index accf7634..427eae4b 100644 --- a/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/member/agent/myStore/myStore.vue +++ b/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/member/agent/myStore/myStore.vue @@ -134,7 +134,7 @@ totalGoods: 0, page: 1, //默认页码 searchKey: '请输入关键字搜索', - shareUrl: '/pages/share/jump/jump', + shareUrl: this.$globalConstVars.shareUrl, lvvpopref: false } }, @@ -257,7 +257,7 @@ }, page: 11, } - let pageUrl = 'pages/share/jump/jump'; + let pageUrl = this.$globalConstVars.shareUrl; // #ifdef H5 data.client = 1; data.url = this.$globalConstVars.apiBaseUrl + 'wap/' + pageUrl; @@ -293,7 +293,7 @@ getShareUrl() { let data = { client: 2, - url: "/pages/share/jump/jump", + url: this.$globalConstVars.shareUrl, type: 1, page: 11, params: { diff --git a/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/member/agent/panel/panel.vue b/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/member/agent/panel/panel.vue index cb6923cc..a8f5fe8b 100644 --- a/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/member/agent/panel/panel.vue +++ b/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/member/agent/panel/panel.vue @@ -117,7 +117,7 @@ }, info: {}, //分销商信息 userInfo: {}, // 用户信息 - shareUrl: '/pages/share/jump/jump' + shareUrl: this.$globalConstVars.shareUrl } }, onShow() { @@ -170,7 +170,7 @@ getShareUrl() { let data = { client: 2, - url: "/pages/share/jump/jump", + url: this.$globalConstVars.shareUrl, type: 1, page: 1, }; @@ -191,7 +191,7 @@ }, page: 11, } - let pageUrl = 'pages/share/jump/jump'; + let pageUrl = this.$globalConstVars.shareUrl; // #ifdef H5 data.client = 1; data.url = this.$globalConstVars.apiBaseUrl + 'wap/' + pageUrl; diff --git a/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/member/distribution/myStore/myStore.vue b/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/member/distribution/myStore/myStore.vue index a29b041f..08862e5b 100644 --- a/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/member/distribution/myStore/myStore.vue +++ b/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/member/distribution/myStore/myStore.vue @@ -133,7 +133,7 @@ totalGoods: 0, page: 1, //默认页码 searchKey: '请输入关键字搜索', - shareUrl: '/pages/share/jump/jump', + shareUrl: this.$globalConstVars.shareUrl, lvvpopref: false } }, @@ -257,7 +257,7 @@ } let pages = getCurrentPages() let page = pages[pages.length - 1] - let pageUrl = 'pages/share/jump/jump'; + let pageUrl = this.$globalConstVars.shareUrl; // #ifdef H5 data.client = 1; data.url = this.$globalConstVars.apiBaseUrl + 'wap/' + pageUrl; @@ -293,7 +293,7 @@ getShareUrl() { let data = { client: 2, - url: "/pages/share/jump/jump", + url: this.$globalConstVars.shareUrl, type: 1, page: 4, params: { diff --git a/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/member/distribution/panel/panel.vue b/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/member/distribution/panel/panel.vue index efc2cb61..b6d6f3e2 100644 --- a/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/member/distribution/panel/panel.vue +++ b/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/member/distribution/panel/panel.vue @@ -116,7 +116,7 @@ }, info: {}, //分销商信息 userInfo: {}, // 用户信息 - shareUrl: '/pages/share/jump/jump' + shareUrl: this.$globalConstVars.shareUrl } }, onShow() { @@ -169,7 +169,7 @@ getShareUrl() { let data = { client: 2, - url: "/pages/share/jump/jump", + url: this.$globalConstVars.shareUrl, type: 1, page: 1, }; @@ -190,7 +190,7 @@ }, page: 4, } - let pageUrl = 'pages/share/jump/jump'; + let pageUrl = this.$globalConstVars.shareUrl; // #ifdef H5 data.client = 1; data.url = this.$globalConstVars.apiBaseUrl + 'wap/' + pageUrl; diff --git a/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/member/invite/index.vue b/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/member/invite/index.vue index c4b94063..cb0a543b 100644 --- a/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/member/invite/index.vue +++ b/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/member/invite/index.vue @@ -61,9 +61,6 @@