Merge branch 'master' of https://git.dayouqiantu.cn/uniapp/yshop-uniapp into master

components/CitySelect.vue

@@ -195,7 +195,6 @@ export default {
   background-color: #fff;
   z-index: 1502;
   position: relative;
-  height: 800rpx;
   padding-bottom: 0;  
   padding-bottom: constant(safe-area-inset-bottom);  
   padding-bottom: env(safe-area-inset-bottom);  
@@ -203,7 +202,7 @@ export default {
     height: 100%;
   }
   .swiper {
-    height: 100%;
+      height: 800rpx;
   }
 }
 .cityselect-header {

pages/home/index.vue

@@ -214,7 +214,7 @@
 			},
 
 		},
-		onShow: function() {
+		onLoad: function() {
 			this.getLocation()
 			let that = this;
 			uni.showLoading({
@@ -451,7 +451,7 @@
 	}
 
 	.nav-title {
-		margin-left: 20rpx;
+		margin-left: 20rpx;
 		line-height: 40px;
 	}
-</style>
+</style>