调整支付

4 years ago · 5978898682
--- a/addons/unishop/uniapp/uni-shop/pages/money/pay.vue
+++ b/addons/unishop/uniapp/uni-shop/pages/money/pay.vue
@@ -37,7 +37,7 @@
 				</label>
 			</view> -->
 		</view>
 		<uni-popup ref="popup" type="center">
 		<uni-popup ref="popup" type="center" :maskClick="false">
 			<image mode="aspectFit" :src="'http://nwx.zhizhuchuxing.cn/addons/unishop/order/addQRCode?url=' + encodeURIComponent(site)">
 			</image>
 		</uni-popup>
@@ -73,9 +73,15 @@
 			this.total = options.total;
 			this.orderId = options.order_id;
 			this.out_trade_no = options.out_trade_no;
 			console.log(window.location.href)
 			this.getPayType();
 		},
 		onShow() {
 			if (navigator.platform == 'Win32') {
 				this.$nextTick(() => {
 					// this.$refs.popup.open()
 				})
 			}
 		},
 		methods: {
 			// 获取支付方式
 			async getPayType() {
@@ -101,22 +107,17 @@
 			//确认支付
 			async confirm() {
 				console.log(navigator.platform)
 				if(navigator.platform=='Win32'){
 					this.$refs.popup.open()
 				}else{
 				if (this.payType == 1) {
 					// #ifdef H5 || APP-PLUS || MP-WEIXIN
 					this.weixinPay();
 					// #endif
 				} else if (this.payType == 2) {
 					// 支付宝支付
 					this.alipay();
 				} else if (this.payType == 3) {
 					// 	// 货到付款
 					this.offlinePay();
 				}
 				// if (this.payType == 1) {
 				// 	// #ifdef H5 || APP-PLUS || MP-WEIXIN
 				// 	this.weixinPay();
 				// 	// #endif
 				// } else if (this.payType == 2) {
 				// 	// 支付宝支付
 				// 	this.alipay();
 				// }
 				//  else if (this.payType == 3) {
 				// 	// 货到付款
 				// }
 			},
 			async alipay() {

--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/index.html
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/index.html
@@ -1,3 +1,3 @@
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1"><title>宜家自购商城</title><script>document.addEventListener('DOMContentLoaded', function() {
 				document.documentElement.style.fontSize = document.documentElement.clientWidth / 20 + 'px'
 			})</script><link rel=stylesheet href=/h5/static/index.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script>/*BAIDU_STAT*/</script><script src=/h5/static/js/chunk-vendors.445a3e90.js></script><script src=/h5/static/js/index.9367358a.js></script></body></html>
 			})</script><link rel=stylesheet href=/h5/static/index.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script>/*BAIDU_STAT*/</script><script src=/h5/static/js/chunk-vendors.445a3e90.js></script><script src=/h5/static/js/index.c0e8db90.js></script></body></html>
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/index.c0e8db90.js
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/index.c0e8db90.js
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-money-pay.36b8de81.js
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-money-pay.36b8de81.js
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-money-pay.b9fe9f9a.js
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-money-pay.b9fe9f9a.js