Merge branch 'dev1.0.0' into develop

3 years ago · cbda07fdd6
parent 1ba5a49242 579330930d
commit cbda07fdd6
6 changed files with 9 additions and 8 deletions
--- a/common/api/wx.js
+++ b/common/api/wx.js
@ -2,14 +2,14 @@
 * @Author: ch
 * @Date: 2022-04-28 16:30:54
 * @LastEditors: ch
- * @LastEditTime: 2022-04-28 18:11:12
+ * @LastEditTime: 2022-04-28 18:57:06
 * @Description: file content
 */
 import {ToAsyncAwait, MsbRequest, MsbRequestTk} from '@/common/utils';
 const BASE_URL = '/mall/trade';
-const APPID = 'wx0643970a8e86d028'
+const APPID = 'wx0643970a8e86d028';
 /**
 * 获取授权页面地址
 * @param {*} data 
--- 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.98fde116.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.238d1abc.js></script></body></html>
--- a/h5/static/js/index.238d1abc.js
+++ b/h5/static/js/index.238d1abc.js
--- a/h5/static/js/pages-order-submit.06f61e05.js
+++ b/h5/static/js/pages-order-submit.06f61e05.js
--- a/h5/static/js/pages-order-submit.49e49eff.js
+++ b/h5/static/js/pages-order-submit.49e49eff.js
--- 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 18:49:36
+ * @LastEditTime: 2022-04-28 19:07:16
 * @Description: file content
 -->
 <template>
@ -199,8 +199,9 @@ export default {
 					*/
 				const par = result.dataInfo;
 				console.log(result);
-            	WeixinJSBridge.invoke('getBrandWCPayRequest', {
+            	WeixinJSBridge.invoke(
-					appId : par.appId,
+					'getBrandWCPayRequest', {
 					 "appId":"wx2421b1c4370ec43b", 
 					timeStamp : par.timeStamp,
 					nonceStr : par.nonceStr,
 					package : par.packageValue,
`@ -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)'))`	`<!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.98fde116.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.238d1abc.js></script></body></html>`