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

线上优化/线上优化第四版

See merge request !13

src/api/article/types.ts

@@ -206,6 +206,7 @@ export interface ArticleItemDto {
   articleVideoUrl: string
   region: string
   recommendSort: number
+  isOfficialAccount: BooleanFlag
 }
 
 /**

src/api/auction/index.ts

 import service from '@/utils/request/index'
-import { getBackendAuctionList } from '@/api/backend'
+import { getBackendAuctionList, type BackendAuctionListSearchParams } from '@/api/backend'
 import type { AuctionItemDetailDto } from './types'
+import { BooleanFlag } from '@/constants'
 // 前台限时竞拍相关接口
 
 /**
  * 限时竞拍前台列表
  */
-export const getAuctionList = getBackendAuctionList
+export const getAuctionList = (data: BackendAuctionListSearchParams) =>
+  getBackendAuctionList({ isDisplay: BooleanFlag.YES, ...data })
 
 /**
  * 获取用户某个商品的拍卖次数是否超过限制

src/api/backend/activity/types.ts

@@ -4,6 +4,7 @@ import { BooleanFlag, AuctionStatusEnum } from '@/constants'
 export interface BackendAuctionListSearchParams extends PageSearchParams {
   name?: string
   status?: AuctionStatusEnum
+  isDisplay?: BooleanFlag
 }
 
 export interface BackendAuctionListItemDto extends PageSearchParams {

src/components/common/ArticleContent/index.vue

@@ -115,7 +115,10 @@
               </div>
               <p class="text-sm text-gray-500 mt-1">
                 {{ dayjs((articleDetail?.createTime || 0) * 1000).format('YYYY-MM-DD HH:mm:ss') }}
-                · {{ articleDetail?.viewCount || 0 }} 阅读 · {{ articleDetail?.region || 0 }}
+                · {{ articleDetail?.viewCount || 0 }} 阅读
+                <span v-if="!articleDetail?.isOfficialAccount"
+                  >· {{ articleDetail?.region || 0 }}</span
+                >
               </p>
             </div>
             <!-- 再次编辑按钮 -->

src/views/questionDetail/index.vue

@@ -122,9 +122,14 @@
                 </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
+                    class="text-sm text-slate-500 flex items-center gap-1"
+                    v-if="!questionDetail?.isOfficialAccount"
+                  >
+                    {{ questionDetail.region }}
+                    ·
+                  </span>
+                  {{ questionDetail.viewCount }}阅读
                 </span>
               </div>
             </div>

src/views/videoDetail/index.vue

@@ -82,9 +82,8 @@
               <span class="flex items-center">
                 {{ formatNumber(videoDetail?.playCount) }}播放
               </span>
-              ·
-              <span class="flex items-center">
-                {{ videoDetail?.region }}
+              <span v-if="!videoDetail?.isOfficialAccount" class="flex items-center">
+                ·{{ videoDetail?.region }}
               </span>
             </div>
           </div>