Merge branch 'master' of https://gitee.com/virus010101/linfeng-community

src/main/resources/static/linfeng-community-vue/src/views/common/components/baseInfo.vue

@@ -54,9 +54,7 @@
             <el-divider></el-divider>
             <div class="acea-row row-between-wrapper">
               <span class="content-time">待审核</span>
-              <span class="content-time"
+              <span class="content-time">{{ viewData.totalPostOfReview }}条</span>
-                >{{ viewData.totalPostOfReview }}条</span
-              >
             </div>
           </div>
         </el-card>
@@ -76,9 +74,7 @@
             <el-divider></el-divider>
             <div class="acea-row row-between-wrapper">
               <span class="content-time">昨日数据</span>
-              <span class="content-time"
+              <span class="content-time">{{ viewData.yesterdayNewUserNum }} 人</span>
-                >{{ viewData.yesterdayNewUserNum }} 人</span
-              >
             </div>
           </div>
         </el-card>
@@ -118,6 +114,7 @@ export default {
 .ivu-mb {
   margin-bottom: 20px;
 }
+
 .up,
 .el-icon-caret-top {
   color: #f5222d;
@@ -130,16 +127,19 @@ export default {
   color: #39c15b;
   font-size: 12px;
 }
+
 .main_tit {
   color: #333;
   font-size: 14px;
   font-weight: 500;
 }
+
 .content-time {
   font-size: 14px;
   color: #333;
   font-weight: 500;
 }
+
 .main_badge {
   width: 30px;
   height: 30px;
@@ -151,12 +151,15 @@ export default {
   justify-content: center;
   align-items: center;
 }
+
 .my15 {
   margin: 15px 0 15px;
 }
+
 .align-center {
   align-items: center;
 }
+
 .baseInfo {
   /deep/ .el-card__header {
     padding: 15px 20px !important;
@@ -170,6 +173,7 @@ export default {
     font-family: PingFangSC-Semibold, PingFang SC;
     color: #333;
   }
+
   &-time {
     font-size: 14px;
     color: #333333;

src/main/resources/static/linfeng-community-vue/src/views/modules/admin/category-add-or-update.vue

@@ -1,32 +1,13 @@
 <template>
-  <el-dialog
+  <el-dialog :title="!dataForm.cateId ? '新增' : '修改'" :close-on-click-modal="false" :visible.sync="visible">
-    :title="!dataForm.cateId ? '新增' : '修改'"
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
-    :close-on-click-modal="false"
-    :visible.sync="visible"
-  >
-    <el-form
-      :model="dataForm"
-      :rules="dataRule"
-      ref="dataForm"
-      @keyup.enter.native="dataFormSubmit()"
-      label-width="80px"
-    >
       <el-form-item label="分类名称" prop="cateName">
         <el-input v-model="dataForm.cateName" placeholder="分类名称"></el-input>
       </el-form-item>
 
       <el-form-item label="分类图片" prop="coverImage">
-        <el-upload
+        <el-upload class="avatar-uploader" :action="url" :show-file-list="false" :on-success="handleIconSuccess">
-          class="avatar-uploader"
+          <img v-if="dataForm.coverImage" :src="dataForm.coverImage" class="avatar" />
-          :action="url"
-          :show-file-list="false"
-          :on-success="handleIconSuccess"
-        >
-          <img
-            v-if="dataForm.coverImage"
-            :src="dataForm.coverImage"
-            class="avatar"
-          />
           <i v-else class="el-icon-plus avatar-uploader-icon" />
         </el-upload>
         <p class="formInfo">建议尺寸：100*100像素，jpg、png图片类型</p>
@@ -133,6 +114,7 @@ export default {
   line-height: 0px;
   color: #999999;
 }
+
 .avatar-uploader .el-upload {
   border: 1px dashed #d9d9d9;
   border-radius: 6px;
@@ -140,9 +122,11 @@ export default {
   position: relative;
   overflow: hidden;
 }
+
 .avatar-uploader .el-upload:hover {
   border-color: #409eff;
 }
+
 .avatar-uploader-icon {
   font-size: 28px;
   color: #8c939d;
@@ -151,6 +135,7 @@ export default {
   line-height: 100px;
   text-align: center;
 }
+
 .avatar {
   width: 100px;
   height: 100px;