Merge branch 'dev1.0.0' into develop

2 years ago · f15cf7b135
parent cb87cd9030 8769ead395
commit f15cf7b135
6 changed files with 9 additions and 6 deletions
--- a/h5/index.html
+++ b/h5/index.html
@ -1,2 +1,2 @@
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>马士兵严选</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.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><link rel=stylesheet href=/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.b5602bf5.js></script><script src=/static/js/index.5fd286ec.js></script></body></html>
+            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><link rel=stylesheet href=/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.b5602bf5.js></script><script src=/static/js/index.6659aa56.js></script></body></html>
--- a/h5/static/js/index.6659aa56.js
+++ b/h5/static/js/index.6659aa56.js
--- a/h5/static/js/pages-order-submit.4925ee32.js
+++ b/h5/static/js/pages-order-submit.4925ee32.js
--- a/h5/static/js/pages-order-submit.6c062a30.js
+++ b/h5/static/js/pages-order-submit.6c062a30.js
--- a/main.js
+++ b/main.js
@ -2,7 +2,7 @@
 * @Author: ch
 * @Date: 2021-07-26 23:22:16
 * @LastEditors: ch
- * @LastEditTime: 2022-04-28 17:03:52
+ * @LastEditTime: 2022-04-28 17:15:23
 * @Description: file content
 */
 import Vue from 'vue';
@ -40,6 +40,9 @@ import {ApiGetOpenId, ApiGetAuthUrl} from '@/common/api/wx';


 // 微信打开需要授权
+
+const ua   = navigator.userAgent.toLowerCase();  
+console.log(ua);
 if(ua.includes('micromessenger')) {
    if(!store.state.openId){
        let query = toSearchJson(window.location.search)
--- a/pages/order/submit.vue
+++ b/pages/order/submit.vue
@ -2,7 +2,7 @@
 * @Author: ch
 * @Date: 2022-03-20 14:14:53
 * @LastEditors: ch
- * @LastEditTime: 2022-04-28 16:34:21
+ * @LastEditTime: 2022-04-28 17:15:11
 * @Description: file content
 -->
 <template>
@ -181,7 +181,7 @@ export default {
 			}
 		},
 		async wxpay(orderId){
-			var ua   = navigator.userAgent.toLowerCase();   
+			const ua   = navigator.userAgent.toLowerCase();   

 			if(ua.includes('micromessenger')) {
 				// 微信JSAPI