fuwei 6 лет назад
Родитель
Сommit
04fd6790e2

+ 15 - 4
mall/src/components/app-area-sel.vue

@@ -1,6 +1,7 @@
 <template>
 	<div class="app-area-sel">
-		<bottom-popup class="popup-wrap" :show="showPopup" @close="hidePopup">
+		<bottom-popup 
+			class="popup-wrap" :show="showPopup" @close="hidePopup">
 			<div class="map-wrap">
 				<div class="map-top-tit-wrap">
 					<div class="map-top-tit">选择收货地址</div>
@@ -175,13 +176,20 @@
 	}
 </script>
 
-<style lang="scss" scoped>
-	// 弹窗
+<style lang="scss">
+	.app-area-sel {
+		
+		// 弹窗
 	/deep/.popup-wrap {
+		position: relative;
 		.tui-popup-class {
 			border-top-left-radius: 20px;
 			border-top-right-radius: 20px;
 		}
+		& .tui-bottom-popup {
+			position: absolute!important;
+			bottom:0;
+		}
 	}
 	.map-wrap {
 		.map-top-tit-wrap {
@@ -206,9 +214,10 @@
 
 		// 列表
 		.near-list {
-			height: 820rpx;
+			height: 1100rpx;
 			// padding-bottom: 110rpx;
 			box-sizing: border-box;
+			overflow: hidden;
 			.near-item {
 				line-height: 40rpx;
 				padding: 18rpx 50rpx 18rpx 0;
@@ -251,4 +260,6 @@
 			}
 		}
 	}
+	}
+	
 </style>

+ 5 - 1
mall/src/pages/home/components/goods-list-small.vue

@@ -7,7 +7,11 @@
 			</div>
 		</div>
 		<div class="goods-wrap">
-			<div class="goods-list" v-for="(item, index) in info.goodsInfoList" :key="index" @click="pageTo(`/pages/goods/detail?id=${item.id}`)">
+			<div 
+				class="goods-list" 
+				v-for="(item, index) in info.goodsInfoList" 
+				:key="index" 
+				@click="pageTo(`/pages/goods/detail?id=${item.id}`)">
 				<div class="goods-img">
 					<app-img :src="item.smallImgList[0]" alt="商品图片" mode="aspectFit" style="width:100%" />
 				</div>

+ 0 - 2
mall/src/pages/pay/index.vue

@@ -353,8 +353,6 @@ export default {
 
 <style lang="scss">
 .app-content {
-  // min-height: 0;
-  // padding-top: 100px;
   min-height: calc(100vh - 20px);
   padding-top: 20px;
 }

+ 2 - 1
mall/src/static/css/base.scss

@@ -4,7 +4,8 @@
 .app-content {
     // line-height: 1;
     background-color: $backColor;
-    min-height: 100vh;
+    height: 100vh;
+    overflow-y: auto;
 }
 /* #ifdef H5 */
 .app-content.app-main {

+ 3 - 1
mall/src/static/css/common.scss

@@ -5,7 +5,9 @@
     margin: 0;
     padding: 0;
 }
-
+body,html{
+    overflow: hidden;
+}
 page,
 body {
     font-family: "microsoft yahei";