Browse Source

错误修改

lijj 2 năm trước cách đây
mục cha
commit
d87ba253a6
18 tập tin đã thay đổi với 161 bổ sung102 xóa
  1. 1 1
      admin/src/main/java/org/springblade/modules/ycwh/controller/wx/WXFamousDishController.java
  2. 2 1
      admin/src/main/java/org/springblade/modules/ycwh/controller/wx/WXFamousSnacksController.java
  3. 2 1
      admin/src/main/java/org/springblade/modules/ycwh/controller/wx/WXFamousStoreController.java
  4. 2 1
      admin/src/main/java/org/springblade/modules/ycwh/controller/wx/WXInformationController.java
  5. 2 1
      admin/src/main/java/org/springblade/modules/ycwh/controller/wx/WXProfessionalStyleController.java
  6. 4 0
      admin/src/main/java/org/springblade/modules/ycwh/entity/FamousDishEntity.java
  7. 4 0
      admin/src/main/java/org/springblade/modules/ycwh/entity/FamousSnacksEntity.java
  8. 4 0
      admin/src/main/java/org/springblade/modules/ycwh/entity/FamousStoreEntity.java
  9. 4 0
      admin/src/main/java/org/springblade/modules/ycwh/entity/InformationInfoEntity.java
  10. 4 0
      admin/src/main/java/org/springblade/modules/ycwh/entity/MemberInfoEntity.java
  11. 4 0
      admin/src/main/java/org/springblade/modules/ycwh/entity/ProfessionalStyleEntity.java
  12. 1 1
      miniapp/pages/yuecai/home/index.vue
  13. 38 1
      miniapp/pages/yuecai/information/detail/index.vue
  14. 1 1
      miniapp/pages/yuecai/professional_style/index.vue
  15. 3 3
      miniapp/pages/yuecai/search/index2.vue
  16. 84 84
      miniapp/pages/yuecai/usercenter/aboutus/index.vue
  17. 1 1
      miniapp/pages/yuecai/usercenter/index.vue
  18. 0 6
      miniapp/pages/yuecai/usercenter/privacy/index.vue

+ 1 - 1
admin/src/main/java/org/springblade/modules/ycwh/controller/wx/WXFamousDishController.java

@@ -65,7 +65,7 @@ public class WXFamousDishController extends BladeController {
 	public R<FamousDishVO> detail(FamousDishEntity famousDish) {
 		FamousDishEntity detail = famousDishService.getOne(Condition.getQueryWrapper(famousDish));
 		/** 更新浏览量 */
-		detail.setLikeNum(Func.toInt(detail.getLikeNum(), 0) + 1);
+		detail.setViews(Func.toInt(detail.getViews(), 0) + 1);
 		famousDishService.updateById(detail);
 		return R.data(FamousDishWrapper.build().entityVO(detail));
 	}

+ 2 - 1
admin/src/main/java/org/springblade/modules/ycwh/controller/wx/WXFamousSnacksController.java

@@ -58,7 +58,8 @@ public class WXFamousSnacksController extends BladeController {
 	public R<FamousSnacksVO> detail(FamousSnacksEntity famousSnacks) {
 		FamousSnacksEntity detail = famousSnacksService.getOne(Condition.getQueryWrapper(famousSnacks));
 		/** 更新浏览量 */
-		detail.setLikeNum(Func.toInt(detail.getLikeNum(), 0) + 1);
+		detail.setViews(Func.toInt(detail.getViews(), 0) + 1);
+		famousSnacksService.updateById(detail);
 		return R.data(FamousSnacksWrapper.build().entityVO(detail));
 	}
 

+ 2 - 1
admin/src/main/java/org/springblade/modules/ycwh/controller/wx/WXFamousStoreController.java

@@ -68,7 +68,8 @@ public class WXFamousStoreController extends BladeController {
 	public R<FamousStoreVO> detail(FamousStoreEntity famousStore) {
 		FamousStoreEntity detail = famousStoreService.getOne(Condition.getQueryWrapper(famousStore));
 		/** 更新浏览量 */
-		detail.setLikeNum(Func.toInt(detail.getLikeNum(), 0) + 1);
+		detail.setViews(Func.toInt(detail.getViews(), 0) + 1);
+		famousStoreService.updateById(detail);
 		return R.data(FamousStoreWrapper.build().entityVO(detail));
 	}
 	/**

+ 2 - 1
admin/src/main/java/org/springblade/modules/ycwh/controller/wx/WXInformationController.java

@@ -69,7 +69,8 @@ public class WXInformationController extends BladeController {
 	public R<InformationInfoVO> detail(InformationInfoEntity informationInfo) {
 		InformationInfoEntity detail = informationInfoService.getOne(Condition.getQueryWrapper(informationInfo));
 		/** 更新浏览量 */
-		detail.setLikeNum(Func.toInt(detail.getLikeNum(), 0) + 1);
+		detail.setViews(Func.toInt(detail.getViews(), 0) + 1);
+		informationInfoService.updateById(detail);
 		return R.data(InformationInfoWrapper.build().entityVO(detail));
 	}
 

+ 2 - 1
admin/src/main/java/org/springblade/modules/ycwh/controller/wx/WXProfessionalStyleController.java

@@ -68,7 +68,8 @@ public class WXProfessionalStyleController extends BladeController {
 	public R<ProfessionalStyleVO> detail(ProfessionalStyleEntity professionalStyle) {
 		ProfessionalStyleEntity detail = professionalStyleService.getOne(Condition.getQueryWrapper(professionalStyle));
 		/** 更新浏览量 */
-		detail.setLikeNum(Func.toInt(detail.getLikeNum(), 0) + 1);
+		detail.setViews(Func.toInt(detail.getViews(), 0) + 1);
+		professionalStyleService.updateById(detail);
 		return R.data(ProfessionalStyleWrapper.build().entityVO(detail));
 	}
 

+ 4 - 0
admin/src/main/java/org/springblade/modules/ycwh/entity/FamousDishEntity.java

@@ -17,6 +17,8 @@
 package org.springblade.modules.ycwh.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.NullSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -103,11 +105,13 @@ public class FamousDishEntity extends BaseEntity {
 	private Boolean top;
 
 	@ApiModelProperty(value = "点赞")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Integer likeNum;
 	/**
 	 * 浏览量
 	 */
 	@ApiModelProperty(value = "浏览量")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Integer views;
 
 }

+ 4 - 0
admin/src/main/java/org/springblade/modules/ycwh/entity/FamousSnacksEntity.java

@@ -17,6 +17,8 @@
 package org.springblade.modules.ycwh.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.NullSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -101,11 +103,13 @@ public class FamousSnacksEntity extends BaseEntity {
 	@ApiModelProperty(value = "置顶")
 	private Boolean top;
 	@ApiModelProperty(value = "点赞")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Integer likeNum;
 	/**
 	 * 浏览量
 	 */
 	@ApiModelProperty(value = "浏览量")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Integer views;
 
 }

+ 4 - 0
admin/src/main/java/org/springblade/modules/ycwh/entity/FamousStoreEntity.java

@@ -17,6 +17,8 @@
 package org.springblade.modules.ycwh.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.NullSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -103,11 +105,13 @@ public class FamousStoreEntity extends BaseEntity {
 	private Boolean top;
 
 	@ApiModelProperty(value = "点赞")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Integer likeNum;
 	/**
 	 * 浏览量
 	 */
 	@ApiModelProperty(value = "浏览量")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Integer views;
 
 }

+ 4 - 0
admin/src/main/java/org/springblade/modules/ycwh/entity/InformationInfoEntity.java

@@ -17,6 +17,8 @@
 package org.springblade.modules.ycwh.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.NullSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -80,11 +82,13 @@ public class InformationInfoEntity extends BaseEntity {
 	private Integer likeNum;
 
 	@ApiModelProperty(value = "浏览量")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Integer views;
 	/**
 	 * 置顶
 	 */
 	@ApiModelProperty(value = "置顶")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Boolean top;
 
 }

+ 4 - 0
admin/src/main/java/org/springblade/modules/ycwh/entity/MemberInfoEntity.java

@@ -17,6 +17,8 @@
 package org.springblade.modules.ycwh.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.NullSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -111,11 +113,13 @@ public class MemberInfoEntity extends BaseEntity {
 	 * 被举报次数(达到3次就进黑名单)
 	 */
 	@ApiModelProperty(value = "被举报次数(达到3次就进黑名单)")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Integer bnum;
 	/**
 	 * 黑名单总次数
 	 */
 	@ApiModelProperty(value = "黑名单总次数")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Integer ballnum;
 
 }

+ 4 - 0
admin/src/main/java/org/springblade/modules/ycwh/entity/ProfessionalStyleEntity.java

@@ -17,6 +17,8 @@
 package org.springblade.modules.ycwh.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.NullSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -98,11 +100,13 @@ public class ProfessionalStyleEntity extends BaseEntity {
 	@ApiModelProperty(value = "置顶")
 	private Boolean top;
 	@ApiModelProperty(value = "点赞")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Integer likeNum;
 	/**
 	 * 浏览量
 	 */
 	@ApiModelProperty(value = "浏览量")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Integer views;
 
 }

+ 1 - 1
miniapp/pages/yuecai/home/index.vue

@@ -244,7 +244,7 @@
       }
 
       .info-view {
-        width: calc(100% - 195rpx);
+        width: calc(100% - 205rpx);
 
         .info-title {
           height: 75px;

+ 38 - 1
miniapp/pages/yuecai/information/detail/index.vue

@@ -1,9 +1,24 @@
 <template>
   <view class="page-view f-30 p-40 flex-dir-column flex-x-center">
     <view class="title">{{detailVO.title}}</view>
+    <view class="time">发布时间:{{detailVO.createTime?detailVO.createTime.substring(0,10) : ''}}</view>
     <view class="col-info-d t-c m-b-30">
       <u-parse :content="detailVO.content"></u-parse>
     </view>
+    <view class="dis-flex flex-x-between bottom-btns">
+      <view class="dis-flex flex-y-center">
+        <u-icon name="eye" color="#7f7f7f" size="18"></u-icon>
+        <view class="btn-title">{{detailVO.views || 0}}人阅读</view>
+      </view>
+      <view class="dis-flex flex-y-center">
+        <u-icon name="thumb-up" color="#7f7f7f" size="18"></u-icon>
+        <view class="btn-title">{{detailVO.likeNum || 0}}点赞</view>
+      </view>
+      <view class="dis-flex flex-y-center" @click="addCollection">
+        <u-icon name="star" color="#7f7f7f" size="18"></u-icon>
+        <view class="btn-title">{{detailVO.collectNum || 0}}收藏数</view>
+      </view>
+    </view>
   </view>
 </template>
 
@@ -22,9 +37,14 @@
           if (res.data.content) {
             res.data.content = decodeURIComponent(res.data.content);
           }
-
           this.detailVO = res.data || {}
         })
+      },
+      addCollection() {
+        this.detailVO.id
+      },
+      addLike() {
+        this.detailVO.id
       }
     },
     onLoad(options) {
@@ -41,4 +61,21 @@
     color: #65371b;
     margin-bottom: 20px;
   }
+
+  .time {
+    font-size: 14px;
+    color: #787878;
+    font-weight: 300;
+    padding-bottom: 10px;
+  }
+
+  .bottom-btns {
+    width: 100%;
+    
+
+    .btn-title {
+      margin-left: 10rpx;
+      color: #7f7f7f;
+    }
+  }
 </style>

+ 1 - 1
miniapp/pages/yuecai/professional_style/index.vue

@@ -127,7 +127,7 @@
       }
 
       .info-view {
-        width: calc(100% - 195rpx);
+        width: calc(100% - 205rpx);
 
         .info-title {
           height: 75px;

+ 3 - 3
miniapp/pages/yuecai/search/index2.vue

@@ -45,10 +45,10 @@
       return {
         tabList: [{
           name: '专业风采'
-        }, {
-          name: '名菜'
         }, {
           name: '名店',
+        }, {
+          name: '名菜'
         }, {
           name: '名点',
         }],
@@ -229,7 +229,7 @@
       }
 
       .info-view {
-        width: calc(100% - 195rpx);
+        width: calc(100% - 205rpx);
 
         .info-title {
           height: 75px;

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 84 - 84
miniapp/pages/yuecai/usercenter/aboutus/index.vue


+ 1 - 1
miniapp/pages/yuecai/usercenter/index.vue

@@ -1,7 +1,7 @@
 <template>
   <page-theme :theme="theme">
     <template>
-      <view class="p-30" style="background-color: white;padding-top: 60px;padding-bottom: 30px;">
+      <view class="p-40" style="background-color: white;padding-top: 60px;padding-bottom: 30px;">
         <view class="flex-dir-row flex-y-center flex-x-between">
           <view class="m-l-30">
             <view class="f-34 t-bold m-b-20">{{nickName}}</view>

+ 0 - 6
miniapp/pages/yuecai/usercenter/privacy/index.vue

@@ -139,12 +139,6 @@ export default {
 				'<p class="content">本软件可能包含链接或与其他第三方服务交互的功能。这些第三方服务可能会收集您的个人信息。我们建议您在使用这些服务之前查看其隐私政策。我们不对任何第三方服务的隐私政策和做法承担责任。</p>',
 				'<br/><h3>6. 修改和更新</h3><br/>',
 				'<p class="content">我们保留随时修改或更新本隐私协议的权利。如本隐私协议发生任何变更,我们将在本软件上发布更新版本,并提醒用户注意。用户继续使用本软件即视为接受本隐私协议的变更。</p>',
-				'<br/><h3>7. 联系我们</h3><br/>',
-				'<p class="content">如果您有任何问题或疑虑,或者需要更改或删除您的个人信息,请联系我们。我们会尽快回复您并解决问题。</p>',
-				'<p>官方反馈渠道:</p>',
-				'<p class="content">微信小程序:</p>',
-				'<p class="content">微信公众号:</p>',
-				'<p class="content">邮箱:<a name="clipboard" value="@farwalker.cn" style="text-decoration:none"><strong><span style="color: black;">@farwalker.cn</span></strong></a></p>',
 			],
 		}
 	},