Merge branch 'dev1.0.0' into develop

3 years ago · e7f7063eff
parent d00101a464 df8bf7fcec
commit e7f7063eff
10 changed files with 12 additions and 10 deletions
--- a/common/utils/requset.js
+++ b/common/utils/requset.js
@ -2,7 +2,7 @@
 * @Author: ch
 * @Date: 2022-03-17 17:42:32
 * @LastEditors: ch
- * @LastEditTime: 2022-04-29 22:34:28
+ * @LastEditTime: 2022-05-05 16:22:30
 * @Description: 项目接口请求统一处理器，返回一个需要token和不需要token的请求封装方法
 */

--- a/pages/goods/detail/index.vue
+++ b/pages/goods/detail/index.vue
@ -2,7 +2,7 @@
 * @Author: ch
 * @Date: 2022-03-23 17:27:21
 * @LastEditors: ch
- * @LastEditTime: 2022-05-03 13:28:18
+ * @LastEditTime: 2022-05-05 16:14:29
 * @Description: file content
 -->
 <template>
@ -214,6 +214,8 @@ page {
 	bottom: 0;
 	left: 0;
 	right: 0;
+	padding-bottom: constant(safe-area-inset-bottom);
+	padding-bottom: env(safe-area-inset-bottom);
 	border-top-left-radius: 24rpx;
 	border-top-right-radius: 24rpx;
 	background: $color-grey0;
--- a/pages/goods/list/index.vue
+++ b/pages/goods/list/index.vue
@ -2,7 +2,7 @@
 * @Author: ch
 * @Date: 2022-03-21 10:31:54
 * @LastEditors: ch
- * @LastEditTime: 2022-05-05 13:58:10
+ * @LastEditTime: 2022-05-05 16:06:41
 * @Description: file content
 -->
 <template>
@ -118,9 +118,9 @@ export default {
 		},
 		goSearch(){
 			if(this.$Route.query.search){
-				this.$Router.replace('/search')
+				this.$Router.replace('/search');
 			}else{
-				this.$Router.push('/search')
+				this.$Router.push('/search');
 			}
 		}
 	}
--- 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.a36182e5.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.bc92b924.js></script></body></html>
--- a/unpackage/dist/build/h5/static/js/index.bc92b924.js
+++ b/unpackage/dist/build/h5/static/js/index.bc92b924.js
--- a/unpackage/dist/build/h5/static/js/pages-goods-detail-index.4cd17cda.js
+++ b/unpackage/dist/build/h5/static/js/pages-goods-detail-index.4cd17cda.js
--- a/unpackage/dist/build/h5/static/js/pages-goods-detail-index.6ad00af4.js
+++ b/unpackage/dist/build/h5/static/js/pages-goods-detail-index.6ad00af4.js
--- a/unpackage/dist/build/h5/static/js/pages-goods-list-index.5861bab1.js
+++ b/unpackage/dist/build/h5/static/js/pages-goods-list-index.5861bab1.js
--- a/unpackage/dist/build/h5/static/js/pages-goods-list-index.a3d62af2.js
+++ b/unpackage/dist/build/h5/static/js/pages-goods-list-index.a3d62af2.js
--- a/unpackage/dist/build/h5/static/js/pages-order-logisitcsInfo.d399ef1e.js
+++ b/unpackage/dist/build/h5/static/js/pages-order-logisitcsInfo.d399ef1e.js