2 tahun lalu · 7d5f6c5927
--- a/application/api/controller/Order.php
+++ b/application/api/controller/Order.php
@@ -167,7 +167,7 @@ class Order extends Base
 
				      * @return  name:pay_price type:string default:-- desc:订单金额
			
 
				      * @return  name:status type:int default:-- desc:类型0：待支付1：已支付
			
 
				      * @return  name:cancel_time type:string default:-- desc:待支付自动取消时间
			
 
				-     * @return  name:pay_type type:string default:-- desc:支付方式wx:微信zfb:支付宝
			
 
				+     * @return  name:pay_type type:string default:-- desc:支付方式wx:微信zfb:支付宝,ll:连连
			
 
				      * @return  name:create_at type:string default:-- desc:创建时间
			
 
				      * @return name:pro_info@name type:string default:-- desc:藏品名称
			
 
				      * @return name:pro_info@cover type:string default:-- desc:藏品图片
			
--- a/public/h5/index.html
+++ b/public/h5/index.html
@@ -2,4 +2,4 @@
 
				 				.supports('top: constant(a)'))
			
 
				 			document.write(
			
 
				 				'<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' +
			
 
				-				(coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><script src=https://mpay-static.oss-cn-hangzhou.aliyuncs.com/html/js/jquery-3.1.1.min.js></script><script src=https://mpay-static.oss-cn-hangzhou.aliyuncs.com/html/lib/microdone/index.js></script><script src=https://mpay-static.oss-cn-hangzhou.aliyuncs.com/html/lib/pass-guard-ctrl/crypto-js.js></script><script src=https://mpay-static.oss-cn-hangzhou.aliyuncs.com/html/lib/pass-guard-ctrl/index.js></script><link rel=stylesheet href=https://mpay-static.oss-cn-hangzhou.aliyuncs.com/html/lib/microdone/microdone.css><script src=/h5/hybrid/html/js/three.min.js charset=utf-8></script><script src=/h5/hybrid/html/js/OrbitControls.js charset=utf-8></script><script src=/h5/hybrid/html/js/GLTFLoader.js charset=utf-8></script><script src=/h5/hybrid/html/js/WebGL.js charset=utf-8></script><script src=/h5/hybrid/html/js/stats.min.js charset=utf-8></script><script src=/h5/hybrid/html/js/gt4.js charset=utf-8></script><script src=/h5/hybrid/html/js/qrcode.min.js charset=utf-8></script><script src=/h5/hybrid/html/js/html2canvas.min.js></script><script src=https://res2.wx.qq.com/open/js/jweixin-1.6.0.js></script><script src=https://cn-shanghai-aliyun-cloudauth.oss-cn-shanghai.aliyuncs.com/web_sdk_js/jsvm_all.js></script><script>window.wx1 = wx</script><link rel=stylesheet href=/h5/static/index.2772579d.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/h5/static/js/chunk-vendors.a696b956.js></script><script src=/h5/static/js/index.ec4bc1ef.js></script></body></html>
			
 
				+				(coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><script src=https://mpay-static.oss-cn-hangzhou.aliyuncs.com/html/js/jquery-3.1.1.min.js></script><script src=https://mpay-static.oss-cn-hangzhou.aliyuncs.com/html/lib/microdone/index.js></script><script src=https://mpay-static.oss-cn-hangzhou.aliyuncs.com/html/lib/pass-guard-ctrl/crypto-js.js></script><script src=https://mpay-static.oss-cn-hangzhou.aliyuncs.com/html/lib/pass-guard-ctrl/index.js></script><link rel=stylesheet href=https://mpay-static.oss-cn-hangzhou.aliyuncs.com/html/lib/microdone/microdone.css><script src=/h5/hybrid/html/js/three.min.js charset=utf-8></script><script src=/h5/hybrid/html/js/OrbitControls.js charset=utf-8></script><script src=/h5/hybrid/html/js/GLTFLoader.js charset=utf-8></script><script src=/h5/hybrid/html/js/WebGL.js charset=utf-8></script><script src=/h5/hybrid/html/js/stats.min.js charset=utf-8></script><script src=/h5/hybrid/html/js/gt4.js charset=utf-8></script><script src=/h5/hybrid/html/js/qrcode.min.js charset=utf-8></script><script src=/h5/hybrid/html/js/html2canvas.min.js></script><script src=https://res2.wx.qq.com/open/js/jweixin-1.6.0.js></script><script src=https://cn-shanghai-aliyun-cloudauth.oss-cn-shanghai.aliyuncs.com/web_sdk_js/jsvm_all.js></script><script>window.wx1 = wx</script><link rel=stylesheet href=/h5/static/index.2772579d.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/h5/static/js/chunk-vendors.a696b956.js></script><script src=/h5/static/js/index.112b3dcf.js></script></body></html>
			
--- a/public/h5/static/js/index.112b3dcf.js
+++ b/public/h5/static/js/index.112b3dcf.js
--- a/public/h5/static/js/pages-mine-order-info.081aba8a.js
+++ b/public/h5/static/js/pages-mine-order-info.081aba8a.js