首页和订单页面修改

pages/index/index.vue

@@ -33,8 +33,8 @@
 									</view>
 								</view>
 								<view class="flex-row part-right">
-									<image :src="assetsPath +'/map_icon.png'" mode="heightFix" @tap="onNavToMap"></image>
-									<image :src="assetsPath +'/phone_icon.png'" mode="heightFix" @tap="onOpenTelphone">
+									<image :src="assetsPath +'/map_icon.png'" mode="scaleToFill" @tap="onNavToMap"></image>
+									<image :src="assetsPath +'/phone_icon.png'" mode="scaleToFill" @tap="onOpenTelphone">
 									</image>
 								</view>
 							</view>
@@ -269,18 +269,17 @@
 			},
 			onGetDicts() {
 				let dicts = []
-				if (uni.getStorageSync('dicts')) {
-					dicts = JSON.parse(uni.getStorageSync('dicts'))
-					this.facilitieList = getDictItem(dicts, "indoor_facilities");
-					this.onLoading()
-				} else {
+				// if (uni.getStorageSync('dicts')) {
+				// 	dicts = JSON.parse(uni.getStorageSync('dicts'))
+				// 	this.facilitieList = getDictItem(dicts, "indoor_facilities");
+				// 	this.onLoading()
+				// } else {
 					dictList().then(res => {
 						dicts = res.data.data;
 						uni.setStorageSync('dicts', JSON.stringify(res.data.data))
 						this.facilitieList = getDictItem(dicts, "indoor_facilities");
-						this.onLoading()
 					})
-				}
+				// }
 			},
 			onCheckUserLogin(){
 				wx.login({
@@ -318,7 +317,6 @@
 				uni.getLocation({
 					type: "gcj02",
 					complete: (res) => {
-						console.log(res,909090)
 						if(res.errMsg == 'getLocation:ok' ){
 							this.latitude = res.latitude;
 							this.longitude = res.longitude;
@@ -345,6 +343,7 @@
 					nowLongitude: this.longitude||''
 				}).then(res => {
 					if (res.data.code == 200 && res.data.data.length) {
+						uni.hideLoading()
 						this.storeList = res.data.data;
 						let obj = {}
 						obj = res.data.data[0];
@@ -360,7 +359,6 @@
 								}
 							})
 						}
-						uni.hideLoading()
 					}
 				})
 			},
@@ -617,10 +615,10 @@
 				margin-right: 12upx;
                 height: 100%;
 				image {
-					height: 70%;
-					margin:  0 12upx;	
-					max-width: 100upx;
+					width: 38px;
+					height: 38px;
 					border-radius: 50%;
+					margin: 0 15upx;
 				}
 			}
 		}
@@ -683,18 +681,6 @@
 			border: 2upx solid #DBA556;
 			.part-top {
 				position: relative;
-				width: 620upx;
-				height: 300upx;
-				z-index: 10;
-				background-color: #FFFFFF;
-				border-radius: 36upx 36upx 36upx 36upx;
-				box-shadow: 0 0 4upx rgba(0, 0, 0, 0.3);
-				overflow: hidden;
-				.room-img {
-					height: 100%;
-					border-radius: 36upx 36upx 36upx 36upx;
-					
-				}
 				.part-top-content {
 					.flex-between {
 						padding: 12upx 4upx;
@@ -855,17 +841,17 @@
 		padding: 20upx 0;
 		// 容器
 	   .part-top{
-		   position: initial;
-		   width: 260rpx !important;
-		   height: 220rpx !important;
-		   z-index: 10;
-		   background-color: #FFFFFF;
-		   border-radius: 12rpx !important;
-		   box-shadow: 0 !important;
+		   display: flex;
+		   justify-content: center;
+		   align-items: center;
+		   width: 260rpx;
+		   height: 280upx;
 		   overflow: hidden;
 		   .room-img{
 			   height: 100%;
 			   border-radius: 0 !important;
+			   max-height: 240upx;
+			   border-radius: 12rpx !important;
 			}
 	   }
 	   .part-bottom{
@@ -890,10 +876,11 @@
 		   }
 		   // 标签
 		   .facilitie-box{
-			    padding: 20rpx 0 16rpx 0 !important;
+			    padding: 8rpx 0 ;
 			   .bg-brown{
 					color: #c98d35;
 					background-color: #f8eddd;
+					margin: 8upx;
 			   }
 		   }
 		   // 价格
@@ -972,7 +959,7 @@
 					justify-content: center;
 					align-items: center;
 					height: 100%;
-					padding: 10upx;
+					padding: 8upx;
 					background: #fc3f21;
 					text{
 						color: #ffffff;
@@ -983,7 +970,7 @@
 					justify-content: center;
 					align-items: center;
 					height: 100%;
-					padding: 10upx;
+					padding: 8upx;
 					border-right: 2upx solid #fc3f21;
 				}
 				.part-3{
@@ -991,7 +978,7 @@
 					justify-content: center;
 					align-items: center;
 					height: 100%;
-					padding: 10upx;
+					padding: 8upx;
 				}
 				text {
 					font-size: 25upx;