Merge branch 'master' of http://git.zthymaoyi.com/zyw/tourism

uni_applet/pageA/cxTable.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="content">
-		<image src="../static/image/cxb.png" mode="widthFix" style="width: 100vw;"></image>
+		<image src="https://taohaoliang.oss-cn-beijing.aliyuncs.com/chaoxi.png" mode="widthFix" style="width: 100vw;"></image>
 		<view class="table">
 			<view class="row" v-for="(item,index) in tableList" :class="item.check?'row-active':''">
 				<image src="../static/image/today.png" mode="widthFix" v-if="item.check" style="width: 34rpx;position: absolute;left: 5px;height: auto;"></image>
@@ -20,8 +20,17 @@
 					{{item.val4}}
 				</view>
 			</view>
-
+			<view class="bottom">
+				<view class="title">
+					热门赶海地点推荐
+				</view>
+				<view class="text">
+					白沙湾黄金海岸、仙人岛海域、金沙滩、望海寨龟石滩、山海广场
+				</view>
+				
+			</view>
 		</view>
+		
 	</view>
 </template>
 
@@ -350,5 +359,23 @@
 		.row-active{
 			background: #92b8f1!important;
 		}
+		.bottom{
+			margin-top: 50rpx;
+			background: rgba(255, 255, 255, 0.7);
+			    padding: 20rpx;
+			    border: 1px solid #92b8f1;
+			    border-radius: 20rpx;
+			.title{
+				font-size: 36rpx;
+				    font-size: 36rpx;
+				    margin-bottom: 10rpx;
+				    font-weight: bold;
+				
+			}
+			.text{
+				font-size: 32rpx;
+			}
+		}
+		
 	}
 </style>