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="https://taohaoliang.oss-cn-beijing.aliyuncs.com/chaoxi.png" mode="widthFix" style="width: 100vw;"></image>
+		<image src="https://taohaoliang.oss-cn-beijing.aliyuncs.com/chaoxi.png" mode="" style="width: 100vw;height: 100vh;"></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>
@@ -22,7 +22,7 @@
 			</view>
 			<view class="bottom">
 				<view class="title">
-					热门赶海地点推荐
+					热门赶海地点推荐:
 				</view>
 				<view class="text">
 					白沙湾黄金海岸、仙人岛海域、金沙滩、望海寨龟石滩、山海广场
@@ -319,10 +319,12 @@
 <style scoped lang="scss">
 	.content {
 		position: relative;
+		overflow: hidden;
+		height: 100vh;
 
 		.table {
 			position: absolute;
-			top: 170rpx;
+			top: 200rpx;
 			padding: 20rpx 0;
 			width: 90%;
 			right: 0;
@@ -346,14 +348,15 @@
 			}
 			.row:nth-of-type(2n){
 				    background: rgba(255, 255, 255, 0.6);
-				    padding: 6rpx 0;
+				    padding: 8rpx 0;
 			}
 			.row:nth-of-type(2n+1){
 				       background: rgba(214, 214, 214, 0.7);
-				       padding: 6rpx 0;
+				       padding: 8rpx 0;
 			}
 			.row:nth-of-type(1){
-				     padding: 18rpx 0;
+				     padding: 16rpx 0;
+					 font-weight: bold;
 			}
 		}
 		.row-active{
@@ -366,8 +369,7 @@
 			    border: 1px solid #92b8f1;
 			    border-radius: 20rpx;
 			.title{
-				font-size: 36rpx;
-				    font-size: 36rpx;
+				font-size: 38rpx;
 				    margin-bottom: 10rpx;
 				    font-weight: bold;
 				

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/tourism/impl/ProductManagementServiceImpl.java

@@ -59,6 +59,7 @@ public class ProductManagementServiceImpl implements IProductManagementService{
 	@Override
 	public Page<ProductManagement> list(Long commonId,String mainBody,String shopNames,String coverImage,String province,String city,String area,String location,String detailedAddress,String serviceDescription,String nickname,String phone,String realname,String personNo,String personImageFront,String personImageBack,String businessLicense,String status,String userLongitude,String userLatitude,String place,String myFlag,String searchKeyWord,Date gmtCreate,Date gmtUpdate,Long deleteFlag, Integer page, Integer limit)throws ServiceException {
 		Wrapper<ProductManagement> wrapper = new EntityWrapper<ProductManagement>();
+		wrapper.eq("delete_flag", 0);
 														if (!StringUtils.isEmpty(commonId)) {
 					wrapper.eq("common_id", commonId);
 				}
@@ -123,7 +124,6 @@ public class ProductManagementServiceImpl implements IProductManagementService{
 					wrapper.andNew().like("shop_names", searchKeyWord).or()
 							.like("service_description", searchKeyWord);
 				}
-					wrapper.eq("delete_flag", 0);
 		List<ProductManagement> list = productManagementMapper.selectPage(new RowBounds((page - 1) * limit, limit), wrapper);
 		if (!"1".equals(myFlag)) {
 			if (!CollectionUtils.isEmpty(list)) {