lilei 4 år sedan
förälder
incheckning
61fa4f63bc
2 ändrade filer med 12 tillägg och 35 borttagningar
  1. 1 1
      pages/index/index.vue
  2. 11 34
      pages/store/StoreList.vue

+ 1 - 1
pages/index/index.vue

@@ -236,7 +236,7 @@
 					latitude: latitude,
 					longitude: longitude,
 					width: 30,
-					height: 30,
+					height: 49,
 					callout: {
 						content: point.name,
 						fontSize: 14,

+ 11 - 34
pages/store/StoreList.vue

@@ -2,7 +2,7 @@
 	<view class="content">
 		<scroll-view scroll-y="true" class="scroll-Y" @scrolltolower="reachBottom" @scroll="scroll">
 			<view class="list" @click="intoDetail" v-for="item in storeList" :key="item.id">
-				<image class="list-img" :src="item.icon?item.icon:'../../static/img/mddef.jpg'"></image>
+				<u-image width="160rpx" height="160rpx" :border-radius="10" :src="item.icon?item.icon:'../../static/img/mddef.jpg'"></u-image>
 				<view class="store-info">
 					<view class="name">
 						{{item.name}}
@@ -22,7 +22,9 @@
 					</view>
 				</view>
 				<view class="list-right">
-					<view :class="item.statusClass">{{getStoreStatus(item)}}</view>
+					<view :class="item.statusClass">
+						<u-image width="100rpx" height="100rpx" :src="getStoreStatus(item)"></u-image>
+					</view>
 				</view>
 			</view>
 		</scroll-view>
@@ -49,7 +51,7 @@
 					{
 						id: 10,
 						icon: '',
-						addrDetail: '陕西省西安市未央区北二环贞观路',
+						addrDetail: '陕西省西安市未央区北二环贞观路二环贞观路',
 						name: '贞观路站',
 						distance: 0.1,
 						time: '8:00-22:00',
@@ -148,15 +150,15 @@
 				switch (item.status) {
 					case 0:
 						item.statusClass = 'store-off'
-						return '暂停营业'
+						return '../../static/img/ygb.png'
 						break;
 					case 1:
 						item.statusClass = 'store-on'
-						return '正常营业'
+						return '../../static/img/yyz.png'
 						break;
 					case 2:
 						item.statusClass = 'store-waite'
-						return '即将开业'
+						return '../../static/img/dky.png'
 						break;
 					default:
 						break;
@@ -188,30 +190,20 @@
 			.list {
 				padding: 20rpx 0;
 				display: flex;
-				width: 100%;
-				height: 200rpx;
 				border-bottom: 1px solid #eee;
-
-				.list-img {
-					width: 20%;
-					height: 100%;
-					margin-right: 10rpx;
-				}
-
 				.store-info {
-					height: 100%;
 					display: flex;
 					flex: 1;
 					flex-direction: column;
 					justify-content: space-between;
-					margin-right: 10rpx;
-
+					padding: 0 20rpx;
 					.name {
 						font-size: 32rpx;
 						color: #000;
 					}
 					.address{
 						font-size: 26rpx;
+						padding: 10rpx 0;
 					}
 					.location {
 						display: flex;
@@ -220,32 +212,17 @@
 						.left {
 							margin-right: 20rpx;
 						}
-
 						.icon {
 							color: #999;
-							margin-right: 10rpx;
+							margin-right: 5rpx;
 						}
 					}
 				}
 
 				.list-right {
-					width: 20%;
-					height: 100%;
 					display: flex;
 					justify-content: center;
 					align-items: center;
-
-					.store-off {
-						color: #999;
-					}
-
-					.store-on {
-						color: #51cc51;
-					}
-
-					.store-waite {
-						color: #ffec19;
-					}
 				}
 			}
 		}