Merge branch 'dev1.0.0' into develop

3 years ago · 3c12d673c1
parent a95ae1b3ba 459d9a633c
commit 3c12d673c1
5 changed files with 6 additions and 6 deletions
--- a/components/BsPay.vue
+++ b/components/BsPay.vue
@ -2,11 +2,11 @@
 * @Author: ch
 * @Date: 2022-04-19 11:37:50
 * @LastEditors: ch
- * @LastEditTime: 2022-05-03 13:55:57
+ * @LastEditTime: 2022-05-05 11:08:44
 * @Description: file content
 -->
 <template>
-	<UiRadioPicker title="请选择支付dfasdfa方式" :show="show" :options="options" 
+	<UiRadioPicker title="请选择支付方式" :show="show" :options="options" 
 		@close="close" @confirm="confirm" />
 </template>
 <script>
--- a/unpackage/dist/build/h5/index.html
+++ b/unpackage/dist/build/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.c52b67c0.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.54566a90.js></script></body></html>
--- a/unpackage/dist/build/h5/static/js/index.54566a90.js
+++ b/unpackage/dist/build/h5/static/js/index.54566a90.js
--- a/unpackage/dist/build/h5/static/js/pages-order-detail-index.a843fa35.js
+++ b/unpackage/dist/build/h5/static/js/pages-order-detail-index.a843fa35.js
--- a/unpackage/dist/build/h5/static/js/pages-order-list.b98e31a6.js
+++ b/unpackage/dist/build/h5/static/js/pages-order-list.b98e31a6.js