Merge branch 'test' of https://e.coding.net/g-cphe0354/duanju/video_app into ymf

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)

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()
 						}
 					});

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
 			},
 			//自组件关闭的回调

pages/pays/pays.vue

@@ -1,6 +1,6 @@
 <template>
 	<view style="width: 100%;">
-		<web-view :src="url" style="width: 100%;"></web-view>
+		<web-view id="webview" :src="url" style="width: 100%;"></web-view>
 
 	</view>
 </template>
@@ -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