Merge branch 'dev1.0.0' into develop

2 years ago · a95ae1b3ba
parent b9901dbfbe 346f81ee39
commit a95ae1b3ba
5 changed files with 5 additions and 5 deletions
--- a/pages/order/payResult.vue
+++ b/pages/order/payResult.vue
@ -2,7 +2,7 @@
 * @Author: ch
 * @Date: 2022-04-28 15:01:41
 * @LastEditors: ch
- * @LastEditTime: 2022-04-29 23:04:16
+ * @LastEditTime: 2022-05-05 11:02:48
 * @Description: file content
 -->

@ -29,7 +29,7 @@
 				<view class="title">支付失败</view>
 				<view class="desc">请重新试试</view>
 				<view class="btns">
-					<UiButton class="btn">返回商品详情</UiButton>
+					<UiButton class="btn" @click="$Router.back()">返回商品详情</UiButton>
 				</view>
 			</template>
 		</template>
--- 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.5bb1c8e4.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.c52b67c0.js></script></body></html>
--- a/unpackage/dist/build/h5/static/js/index.c52b67c0.js
+++ b/unpackage/dist/build/h5/static/js/index.c52b67c0.js
--- a/unpackage/dist/build/h5/static/js/pages-order-payResult.0f4a82a0.js
+++ b/unpackage/dist/build/h5/static/js/pages-order-payResult.0f4a82a0.js
--- a/unpackage/dist/build/h5/static/js/pages-order-payResult.3a812afe.js
+++ b/unpackage/dist/build/h5/static/js/pages-order-payResult.3a812afe.js