diff --git a/pages/activity/assist_detail/index.vue b/pages/activity/assist_detail/index.vue index 2129f3c..7d2a436 100644 --- a/pages/activity/assist_detail/index.vue +++ b/pages/activity/assist_detail/index.vue @@ -291,7 +291,7 @@ PromotionCode: '', //二维码图片 canvasStatus: false, //海报绘图标签 posterImage: '', //海报路径 - posterbackgd: '/static/images/posterbackgd.png', + posterbackgd: '', isDown: true, isCopy: false, copyUrl: '', @@ -384,6 +384,8 @@ //#endif }, onReady: function() { + + this.posterbackgd = `${HTTP_REQUEST_URL}/static/images/mer/posterbackgd.png`; // #ifdef H5 this.$nextTick(function() { const clipboard = new ClipboardJS(".copy-data"); @@ -429,11 +431,10 @@ mask: true }); // #ifdef H5 - arr2 = [that.posterbackgd, await that.imgToBase(that.storeImage), await that.imgToBase(that.codeImg), await that.imgToBase(that.share_pic)]; + arr2 = [await that.imgToBase(that.posterbackgd), await that.imgToBase(that.storeImage), await that.imgToBase(that.codeImg), await that.imgToBase(that.share_pic)]; // #endif // #ifdef MP || APP-PLUS - arr2 = [that.posterbackgd, await that.fileStoreImage(that.storeImage), await that.fileStoreImage( - that.codeImg), await that.fileStoreImage(that.share_pic)]; + arr2 = [await that.fileStoreImage(that.posterbackgd), await that.fileStoreImage(that.storeImage), await that.fileStoreImage(that.codeImg), await that.fileStoreImage(that.share_pic)]; // #endif that.$util.goodsPosterCanvas(arr2, that.bargainData.store_name, that.bargainPrice, that.site_name, that.old_price, function(tempFilePath) { that.$set(that, 'posterImage', tempFilePath); @@ -605,7 +606,7 @@ uni.hideLoading(); uni.navigateTo({ url: '/pages/activity/assist_detail/index?id=' + assist_id - }); + }); }).catch((err) => { uni.hideLoading(); that.$util.Tips({ @@ -778,7 +779,7 @@ transform: translateX(-50%); z-index: 1000; top: 50%; - margin-top: -446rpx; + margin-top: -446rpx; } .poster-pop image { width: 100%; diff --git a/pages/activity/combination_details/index.vue b/pages/activity/combination_details/index.vue index d9af22a..7e02e71 100644 --- a/pages/activity/combination_details/index.vue +++ b/pages/activity/combination_details/index.vue @@ -14,7 +14,7 @@ {{item.name}} - + @@ -429,7 +429,7 @@ PromotionCode: '', //二维码图片 canvasStatus: false, //海报绘图标签 posterImage: '', //海报路径 - posterbackgd: '/static/images/posterbackgd.png', + posterbackgd: '', sharePacket: { isState: true, //默认不显示 }, //分销商详细 @@ -588,6 +588,7 @@ } }, onReady() { + this.posterbackgd = `${HTTP_REQUEST_URL}/static/images/mer/posterbackgd.png`; this.isNodes++; this.$nextTick(function() { // #ifdef MP @@ -603,7 +604,7 @@ }); }, onShow() { - + }, /** * 用户点击右上角分享 @@ -911,7 +912,7 @@ that.$set(that, 'guaranteeValue', res.data.product.guarantee ? res.data.product.guarantee.template_name : ''); that.$set(that, 'guarantee', res.data.product.guaranteeTemplate ? res.data.product.guaranteeTemplate : []); that.$set(that, 'shipping', res.data.product.temp ? res.data.product.temp.info : ''); - that.$set(that.specsInfo, 'params', res.data.product.params); + that.$set(that.specsInfo, 'params', res.data.product.params); uni.setNavigationBarTitle({ title: storeInfo.store_name.substring(0, 7) + "..." }) @@ -921,7 +922,7 @@ that.getCartCount(); that.ShareInfo(); that.downloadFilePromotionCode(); - + }; // #endif // #ifdef APP-PLUS || MP @@ -1298,11 +1299,10 @@ mask: true }); // #ifdef MP || APP-PLUS - arr2 = [that.posterbackgd, await this.fileStoreImage(this.storeImage), await this.fileStoreImage( - this.codeImg), await that.fileStoreImage(that.share_pic)]; + arr2 = [await this.fileStoreImage(that.posterbackgd), await this.fileStoreImage(this.storeImage), await this.fileStoreImage(this.codeImg), await that.fileStoreImage(that.share_pic)]; // #endif // #ifdef H5 - arr2 = [that.posterbackgd, await this.imgToBase(that.storeImage), await this.imgToBase(this.codeImg), await that.imgToBase(that.share_pic)]; + arr2 = [await this.imgToBase(that.posterbackgd), await this.imgToBase(that.storeImage), await this.imgToBase(this.codeImg), await that.imgToBase(that.share_pic)]; // #endif //生成推广海报 that.$util.goodsPosterCanvas(arr2, that.storeInfo.store_name, that.storeInfo.price, that.site_name, that.storeInfo.ot_price, function(tempFilePath) { @@ -1823,7 +1823,7 @@ } .product-con .footer .bnt .buy[disabled] { background: #bbb; - } + } button { padding: 0; margin: 0; diff --git a/pages/activity/goods_seckill_details/index.vue b/pages/activity/goods_seckill_details/index.vue index a2feba2..bb153f2 100644 --- a/pages/activity/goods_seckill_details/index.vue +++ b/pages/activity/goods_seckill_details/index.vue @@ -14,7 +14,7 @@ {{item.name}} - + @@ -191,7 +191,7 @@ 客服 - + @@ -355,7 +355,7 @@ PromotionCode: '', //二维码图片 canvasStatus: false, //海报绘图标签 posterImage: '', //海报路径 - posterbackgd: '/static/images/posterbackgd.png', + posterbackgd: '', // uid: 0, //用户uid circular: false, autoplay: false, @@ -507,6 +507,7 @@ } }, onReady() { + this.posterbackgd = `${HTTP_REQUEST_URL}/static/images/mer/posterbackgd.png`; this.isNodes++; this.$nextTick(function() { // #ifdef MP @@ -625,7 +626,7 @@ priceRuleApi(this.storeInfo.cate_id).then(res => { this.priceRule = res.data }).catch(err => { - + }); }, goActivity: function(e) { @@ -812,7 +813,7 @@ // that.$set(that, 'shippingValue', res.data.temp ? res.data.temp.name : ''); that.$set(that, 'guarantee', res.data.guaranteeTemplate ? res.data.guaranteeTemplate : []); // that.$set(that, 'shipping', res.data.temp ? res.data.temp.info : ''); - // that.$set(that.specsInfo, 'params', res.data.params); + // that.$set(that.specsInfo, 'params', res.data.params); uni.setNavigationBarTitle({ title: storeInfo.store_name.substring(0, 7) + "..." }) @@ -830,12 +831,12 @@ ); } that.$set(that, 'shippingValue', res.data.temp ? res.data.temp.name : ''); - that.$set(that.specsInfo, 'params', res.data.params); - that.$set(that.storeInfo, 'merchant', res.data.merchant); - that.$set(that.storeInfo, 'spu_id', res.data.spu_id); - that.$set(that.storeInfo, 'community', res.data.community); - that.$set(that.storeInfo, 'top_name', res.data.top_name); - that.$set(that.storeInfo, 'atmosphere_pic', res.data.atmosphere_pic); + that.$set(that.specsInfo, 'params', res.data.params); + that.$set(that.storeInfo, 'merchant', res.data.merchant); + that.$set(that.storeInfo, 'spu_id', res.data.spu_id); + that.$set(that.storeInfo, 'community', res.data.community); + that.$set(that.storeInfo, 'top_name', res.data.top_name); + that.$set(that.storeInfo, 'atmosphere_pic', res.data.atmosphere_pic); }) // #ifdef H5 if (that.isLogin) { @@ -1199,11 +1200,11 @@ mask: true }); // #ifdef MP || APP-PLUS - arr2 = [that.posterbackgd, await that.fileStoreImage(that.storeImage), await that.fileStoreImage( + arr2 = [await that.fileStoreImage(that.posterbackgd), await that.fileStoreImage(that.storeImage), await that.fileStoreImage( that.codeImg), await that.fileStoreImage(that.share_pic)]; // #endif // #ifdef H5 - arr2 = [that.posterbackgd, await that.imgToBase(that.storeImage), await that.imgToBase(that.codeImg), await that.imgToBase(that.share_pic)]; + arr2 = [await that.imgToBase(that.posterbackgd), await that.imgToBase(that.storeImage), await that.imgToBase(that.codeImg), await that.imgToBase(that.share_pic)]; // #endif that.$util.goodsPosterCanvas(arr2, that.storeInfo.store_name, that.storeInfo.price, that.site_name, that.storeInfo.ot_price, function(tempFilePath) { that.$set(that, 'posterImage', tempFilePath); diff --git a/pages/activity/presell_details/index.vue b/pages/activity/presell_details/index.vue index 6b78844..3e974a2 100644 --- a/pages/activity/presell_details/index.vue +++ b/pages/activity/presell_details/index.vue @@ -14,7 +14,7 @@ {{item.name}} - + @@ -422,7 +422,7 @@ PromotionCode: '', //二维码图片 canvasStatus: false, //海报绘图标签 posterImage: '', //海报路径 - posterbackgd: '/static/images/posterbackgd.png', + posterbackgd: '', sharePacket: { isState: true, //默认不显示 }, //分销商详细 @@ -580,6 +580,7 @@ shareScence(that.currSpid, that.isLogin) }, onReady() { + this.posterbackgd = `${HTTP_REQUEST_URL}/static/images/mer/posterbackgd.png`; this.isNodes++; this.$nextTick(function() { // #ifdef MP @@ -710,7 +711,7 @@ priceRuleApi(this.storeInfo.cate_id).then(res => { this.priceRule = res.data }).catch(err => { - + }); }, goActivity: function(e) { @@ -1003,7 +1004,7 @@ that.$set(that, 'guaranteeValue', res.data.product.guarantee ? res.data.product.guarantee.template_name : ''); that.$set(that, 'guarantee', res.data.product.guaranteeTemplate ? res.data.product.guaranteeTemplate : []); that.$set(that, 'shipping', res.data.product.temp ? res.data.product.temp.info : ''); - that.$set(that.specsInfo, 'params', res.data.product.params); + that.$set(that.specsInfo, 'params', res.data.product.params); uni.setNavigationBarTitle({ title: storeInfo.store_name.substring(0, 7) + "..." }) @@ -1409,11 +1410,10 @@ mask: true }); // #ifdef MP || APP-PLUS - arr2 = [that.posterbackgd, await that.fileStoreImage(that.storeImage), await that.fileStoreImage( - that.codeImg), await that.fileStoreImage(that.share_pic)]; + arr2 = [await that.fileStoreImage(that.posterbackgd), await that.fileStoreImage(that.storeImage), await that.fileStoreImage(that.codeImg), await that.fileStoreImage(that.share_pic)]; // #endif // #ifdef H5 - arr2 = [that.posterbackgd, await this.imgToBase(that.storeImage), await this.imgToBase(this.codeImg), await that.imgToBase(that.share_pic)]; + arr2 = [await that.imgToBase(that.posterbackgd), await this.imgToBase(that.storeImage), await this.imgToBase(this.codeImg), await that.imgToBase(that.share_pic)]; // #endif that.$util.goodsPosterCanvas(arr2, that.storeInfo.store_name, that.storeInfo.price, that.site_name, that.storeInfo.ot_price, function(tempFilePath) { that.$set(that, 'posterImage', tempFilePath); @@ -2407,14 +2407,14 @@ font-weight: 800; font-size: 28rpx; line-height: 100rpx; - color: #FFFFFF; + color: #FFFFFF; .num { font-size: 48rpx; } - } + } &.share { align-items: flex-start; - padding: 20rpx 0 0 !important; + padding: 20rpx 0 0 !important; .introduce { flex: 1; margin-top: 0; diff --git a/pages/admin/goods_details/index.vue b/pages/admin/goods_details/index.vue index a62e51e..250927f 100644 --- a/pages/admin/goods_details/index.vue +++ b/pages/admin/goods_details/index.vue @@ -317,7 +317,7 @@ storeImage: '', //海报产品图 canvasStatus: false, //海报绘图标签 posterImage: '', //海报路径 - posterbackgd: '/static/images/posterbackgd.png', + posterbackgd: '', source: '', domain: HTTP_REQUEST_URL, sharePacket: { @@ -403,7 +403,9 @@ }); this.getPreviewDetails() }, - onReady() {}, + onReady() { + this.posterbackgd = `${HTTP_REQUEST_URL}/static/images/mer/posterbackgd.png`; + }, onShow() { // this.getConfig() }, diff --git a/pages/goods_details/index.vue b/pages/goods_details/index.vue index e79dbe5..5fa0179 100644 --- a/pages/goods_details/index.vue +++ b/pages/goods_details/index.vue @@ -14,7 +14,7 @@ {{item.name}} - + @@ -43,7 +43,7 @@ 分享 - + 积分最高可抵扣{{storeInfo.max_integral}}元 @@ -64,12 +64,12 @@ 分享 - - 开通 SVIP会员 + 开通 SVIP会员 立省{{svipData.save_money}}元 省钱多多,权益多多 @@ -393,7 +393,6 @@