From f3f9af86f9850bc71b2e82f4f9694e4cee8df36c Mon Sep 17 00:00:00 2001 From: GaoHao <1210693421@qq.com> Date: Fri, 13 Dec 2024 11:40:29 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E6=B5=B7=E6=8A=A5?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/config.js | 12 ++++++------ me/components/wm-poster/wm-posterorders.vue | 7 ++++--- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/common/config.js b/common/config.js index ef54693..4c7923a 100644 --- a/common/config.js +++ b/common/config.js @@ -1,10 +1,10 @@ -const ROOTPATH1 = "https://dj-api.hnsiyao.cn/sqx_fast/"; // -const ROOTPATH = "https://dj-api.hnsiyao.cn/sqx_fast/"; //后台服务域名 -const ROOTPATH2 = "https://dj-h5.hnsiyao.cn"; //后台服务域名 +// const ROOTPATH1 = "https://dj-api.hnsiyao.cn/sqx_fast/"; // +// const ROOTPATH = "https://dj-api.hnsiyao.cn/sqx_fast/"; //后台服务域名 +// const ROOTPATH2 = "https://dj-h5.hnsiyao.cn"; //后台服务域名 -// const ROOTPATH1 = "https://video.hnsiyao.cn/sqx_fast/"; // -// const ROOTPATH = "https://video.hnsiyao.cn/sqx_fast/"; //后台服务域名 -// const ROOTPATH2 = "https://video-h5.hnsiyao.cn"; //后台服务域名 +const ROOTPATH1 = "https://video.hnsiyao.cn/sqx_fast/"; // +const ROOTPATH = "https://video.hnsiyao.cn/sqx_fast/"; //后台服务域名 +const ROOTPATH2 = "https://video-h5.hnsiyao.cn"; //后台服务域名 module.exports = { APIHOST: ROOTPATH, diff --git a/me/components/wm-poster/wm-posterorders.vue b/me/components/wm-poster/wm-posterorders.vue index f9275c8..3c31629 100644 --- a/me/components/wm-poster/wm-posterorders.vue +++ b/me/components/wm-poster/wm-posterorders.vue @@ -236,7 +236,7 @@ // _this.ctx.setFontSize(uni.upx2px(24)); // _this.ctx.fillText(_this.OriginalTxt, _strlineW, _strHeight); //商品原价 // } - // #endif + //// #endif _this.ctx.strokeStyle = _this.OriginalColor; _this.ctx.moveTo(_strlineW, _strHeight - uni.upx2px(10)); //起点 _this.ctx.lineTo(_strlineW + _this.ctx.measureText(_this.OriginalTxt).width, _strHeight - uni.upx2px( @@ -248,7 +248,7 @@ _strHeight += uni.upx2px(20); let toTop = uni.upx2px(103); _this.ctx.drawImage(_QrCode.path, r[0] - q[0] + C_P - uni.upx2px(201), _this.canvasH - q[1] - toTop, - 71, 71); + 69, 69); //添加二维码 end //添加推荐人与描述 @@ -277,7 +277,8 @@ }, fail(err) { errs(err); - _this.$queue.showToast('海报生成失败'); + // _this.$queue.showToast(imgSrc); + _this.$queue.showToast('海报生成失败1'); uni.hideLoading() } }); From 9083c9a454b009b77f8fd9774c9faa74d6ee89c5 Mon Sep 17 00:00:00 2001 From: GaoHao <1210693421@qq.com> Date: Fri, 13 Dec 2024 14:06:56 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=8B=89=E8=B5=B7?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/payPopus/payPopus.vue | 5 ++++- me/detail/detail.vue | 5 ++++- pages/pays/pays.vue | 11 +++++++++-- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/components/payPopus/payPopus.vue b/components/payPopus/payPopus.vue index 858d356..6af7f1f 100644 --- a/components/payPopus/payPopus.vue +++ b/components/payPopus/payPopus.vue @@ -589,7 +589,10 @@ res => { if (res.code === 0) { console.log(res) - that.$emit('paySuccess', res.data) + that.$emit('paySuccess', { + ordersId: this.orderId, + h5Url: res.data.h5Url + }) // const div = document.createElement('div') // div.innerHTML = res.data //此处form就是后台返回接收到的数据 // document.body.appendChild(div) diff --git a/me/detail/detail.vue b/me/detail/detail.vue index b1b233b..669214a 100644 --- a/me/detail/detail.vue +++ b/me/detail/detail.vue @@ -1203,7 +1203,10 @@ this.showMoney = false //显示充值弹窗 // this.payOrder(this.ordersId, this.payMoney) // #ifdef H5 - window.open(data.h5Url) + // window.location.href = data.h5Url + uni.navigateTo({ + url: '/pages/pays/pays?ordersId=' + data.ordersId + '&url=' + data.h5Url + }); // #endif }, //自组件关闭的回调 diff --git a/pages/pays/pays.vue b/pages/pays/pays.vue index 33aabc6..8f42f77 100644 --- a/pages/pays/pays.vue +++ b/pages/pays/pays.vue @@ -1,6 +1,6 @@ @@ -27,6 +27,8 @@ uni.setNavigationBarTitle({ title:'预览' }) + let viewview = uni.createWebviewContext("webview",) + console.log("viewview===",viewview) // #ifdef APP-PLUS // console.log('App plus2') // var currentWebview = this.$mp.page.$getAppWebview() //获取当前页面的webview对象 @@ -40,8 +42,10 @@ }, onShow() { console.log(this.ordersId); + httpsRequest.getT("/app/wuyou/queryOrder/"+this.ordersId, {}).then(res => { - console.log(res); + console.log(res.data); + if(res.data ==1){ uni.hideLoading() uni.showToast({ @@ -53,9 +57,11 @@ uni.navigateBack() },500) }else{ + uni.showLoading({ title:'支付中' }) + } }); }, @@ -67,6 +73,7 @@ this.url = option.url this.ordersId=option.ordersId console.log('this.ordersId'+this.ordersId); + // this.url="https://jiaoyu.xianmxkj.com/file/uploadPath/2023/03/08/b6c0dd4821cc9ce70c897adca3ad22c2.pdf" // h5，使用h5访问的时候记得跨域 // #ifdef H5