Merge branch '线上优化/优化第二版' into 'master'

线上优化/优化第二版

See merge request !7

src/api/article/types.ts

@@ -97,6 +97,7 @@ interface PushSettingBase {
   pushType: SendTypeEnum
   pushTime: string
   pushList: { valueId: string; valueName: string | number }[]
+  summary: string
 }
 // 推送设置相关的字段
 /**
@@ -200,6 +201,7 @@ export interface ArticleItemDto {
   sendTime: string
   tagIdList: number[]
   pushList: { valueId: string; valueType: number; valueName: string }[]
+  summary: string
   videoLocation: VideoPositionEnum
   articleVideoUrl: string
   region: string

src/views/homePage/askTab/index.vue

@@ -77,7 +77,12 @@
                 <span class="text-xs text-gray-400 hidden sm:inline">{{
                   dayjs(item.createTime * 1000).format('YYYY-MM-DD HH:mm')
                 }}</span>
-                <div class="hidden sm:block w-1 h-1 bg-gray-300 rounded-full"></div>
+                <div class="hidden sm:block w-1 h-1 bg-gray-300 rounded-full mx--1"></div>
+                <!-- 地区 -->
+                <span class="text-xs text-gray-400 hidden sm:inline">{{ item.region }}</span>
+                <div class="hidden sm:block w-1 h-1 bg-gray-300 rounded-full mx--1"></div>
+                <!-- 阅读量 -->
+                <span class="text-xs text-gray-400 hidden sm:inline">{{ item.viewCount }}阅读</span>
 
                 <div class="flex items-center gap-1">
                   <el-button

src/views/publishLongArticle/index.vue

@@ -207,6 +207,15 @@
                   value-format="X"
                 />
               </el-form-item>
+              <el-form-item label="推送摘要" prop="summary">
+                <el-input
+                  v-model="form.summary"
+                  type="textarea"
+                  :maxlength="50"
+                  show-word-limit
+                  placeholder="简单描述推送的信息"
+                />
+              </el-form-item>
 
               <!-- 插入视频 顶部或者底部 radio -->
               <el-form-item label="插入视频" prop="videoLocation">
@@ -253,6 +262,15 @@
               value-format="X"
             />
           </el-form-item>
+          <el-form-item label="推送摘要" prop="summary">
+            <el-input
+              v-model="form.summary"
+              type="textarea"
+              :maxlength="50"
+              show-word-limit
+              placeholder="简单描述推送的信息"
+            />
+          </el-form-item>
         </template>
         <!-- 发布设置 -->
         <div>
@@ -365,7 +383,7 @@ const [form, resetForm] = useResetData({
   pushType: SendTypeEnum.IMMEDIATE,
   pushTime: '',
   pushList: [],
-
+  summary: '',
   // 视频
   videoLocation: VideoPositionEnum.TOP,
   articleVideoUrl: '',
@@ -585,6 +603,7 @@ onActivated(async () => {
       form.value.articleVideoUrl = articleVideoUrl
     }
     // 4回显推送人员设置
+    form.value.summary = data.summary
     if (
       (type === ArticleTypeEnum.COLUMN ||
         type === ArticleTypeEnum.INTERVIEW ||

src/views/publishVideo/index.vue

@@ -189,6 +189,18 @@
                     </div>
                   </el-form-item>
                 </div>
+                <div class="mb-8">
+                  <el-form-item prop="summary">
+                    <label class="block text-sm font-semibold text-gray-700 mb-3"> 推送摘要 </label>
+                    <el-input
+                      v-model="form.summary"
+                      type="textarea"
+                      :maxlength="50"
+                      show-word-limit
+                      placeholder="简单描述推送的信息"
+                    />
+                  </el-form-item>
+                </div>
               </template>
               <div class="mb-8">
                 <el-form-item prop="relateColumnId">
@@ -398,6 +410,7 @@ const [form, resetData] = useResetData({
   pushType: SendTypeEnum.IMMEDIATE,
   pushTime: '',
   pushList: [] as { valueId: string; valueType: number; valueName: string }[],
+  summary: '',
 })
 
 const selectedDepts = ref<{ id: string; name: string }[]>([])

src/views/questionDetail/index.vue

@@ -117,14 +117,14 @@
                 {{ questionDetail.createUserName }}
               </el-avatar>
               <div class="flex flex-col">
-                <span class="text-sm font-medium text-slate-900">
+                <span class="text-sm text-slate-900">
                   {{ questionDetail.createUserName }}
                 </span>
-                <span class="text-xs text-slate-500 flex items-center gap-1">
-                  发布于 {{ dayjs(questionDetail.createTime * 1000).format('YYYY-MM-DD HH:mm') }} ·
-                  <span class="text-xs text-slate-500 flex items-center gap-1">
-                    {{ questionDetail.region }}
-                  </span>
+                <span class="text-sm text-slate-500 flex items-center gap-1">
+                  {{ dayjs(questionDetail.createTime * 1000).format('YYYY-MM-DD HH:mm') }} ·
+                  <span class="text-sm text-slate-500 flex items-center gap-1">
+                    {{ questionDetail.region }} </span
+                  >· {{ questionDetail.viewCount }}阅读
                 </span>
               </div>
             </div>