fix(app): 调整类型

packages/app/env/.env.development

@@ -5,7 +5,7 @@ VITE_DELETE_CONSOLE = false
 # 是否开启sourcemap
 VITE_SHOW_SOURCEMAP = true
 
-# VITE_SERVER_BASEURL = 'https://www.zhuchaohui.com'
+VITE_SERVER_BASEURL = 'https://www.zhuchaohui.com'
 # VITE_SERVER_BASEURL = 'http://39.106.91.179:48080'
 # VITE_SERVER_BASEURL = 'http://192.168.2.34:48080'
 # 王超
@@ -14,7 +14,7 @@ VITE_SHOW_SOURCEMAP = true
 # 刘岁成
 # VITE_SERVER_BASEURL = 'http://192.168.2.38:48080'
 # 赵要军
-VITE_SERVER_BASEURL = 'http://192.168.2.41:48080'
+# VITE_SERVER_BASEURL = 'http://192.168.2.41:48080'
 # 姚逊涛
 # VITE_SERVER_BASEURL = 'http://192.168.2.42:48080'
 

packages/app/src/core/models/moment.ts → packages/app/src/core/libs/models.ts

@@ -1,32 +1,3 @@
-export interface Moment {
-  // {
-  //     author: {
-  //       avatar: 'https://via.placeholder.com/35x35',
-  //       nickname: '苏小萌',
-  //       level: '0',
-  //     },
-  //     content: '用心做好设计，为客户创造美好家居环境',
-  //     images: ['https://via.placeholder.com/165x220'],
-  //     tags: ['意大利游学设计班'],
-  //     shares: 0,
-  //     comments: 0,
-  //     likes: 0,
-  //     createdAt: dayjs('2024-07-15').toDate(),
-  //   },
-  author: {
-    avatar: string
-    nickname: string
-    level: string
-  }
-  content: string
-  images: string[]
-  tags: string[]
-  shares: number
-  comments: number
-  likes: number
-  createdAt: Date
-  commentList?: Comment[]
-}
 export interface Comment {
   id: number
   circleId: number
@@ -466,6 +437,52 @@ export interface UserAuthInfo {
   remark: string
   auditTime: number
 }
+export interface ResPageData<T> {
+  list: T[]
+  total: number
+}
+export interface Message {
+  id: number
+  title: string
+  /**
+   * 消息类型
+   */
+  messageType: string
+  /**
+   * 消息子类型
+   */
+  messageSubType: string
+  /**
+   * 发送会员等级(多个枚举值逗号拼接,选项值包括全部会员等级、普通会员等级、白银会员等级、黄金会员等级、白金会员等级)
+   */
+  sendMemberGrade: any
+  /**
+   * 服务号推送状态(0-不推送，1-推送,选项值为推送、不推送选择推送，则该条消息同时会通过公众号推送展示选择不推送，则该条消息不会通过公众号推送),示例值(1)
+   */
+  serviceNumberStatus: any
+  /**
+   * 消息内容类型,选项值为创建详情、添加链接,示例值(2)
+   */
+  messageContentType: any
+  /**
+   * 添加详情链接,如果消息内容类型为添加链接则该值不为空,示例值(https://www.iocoder.cn)
+   */
+  linkUrl: string
+  /**
+   * 封面连接
+   */
+  coverUrl: string
+  /**
+   * 图文详情(富文本)
+   */
+  detailBody: string
+  isRead: string
+  triggerPort: string
+  triggerRole: string
+  designerId: number
+  businessId: any
+  createTime: number
+}
 export enum DictType {
   /**
    *  擅长空间类型

packages/app/src/core/libs/requests.ts

@@ -8,7 +8,6 @@ import {
   MaterialDealerDetail,
   MaterialDealerHomePage,
   MaterialDealerRes,
-  Moment,
   Comment,
   Activity,
   BannerMode,
@@ -16,7 +15,9 @@ import {
   StudyTour,
   PointsOrder,
   UserAuthInfo,
-} from '../models/moment'
+  ResPageData,
+  Message,
+} from './models'
 import dayjs from 'dayjs'
 
 export const getUserInfo = () =>
@@ -47,26 +48,6 @@ export const getSchedule = () =>
       },
     ],
   })
-export const getMoment = () =>
-  httpGetMock<Moment>({
-    author: {
-      avatar: 'https://via.placeholder.com/35x35',
-      nickname: '苏小萌',
-      level: '0',
-    },
-    content: '用心做好设计，为客户创造美好家居环境',
-    images: [
-      'https://via.placeholder.com/165x220',
-      'https://via.placeholder.com/220x220',
-      'https://via.placeholder.com/165x220',
-    ],
-    tags: ['意大利游学设计班'],
-    shares: 0,
-    comments: 0,
-    likes: 0,
-    createdAt: dayjs('2024-07-15').toDate(),
-    commentList: [],
-  })
 export const getClassmates = () =>
   httpGetMock<any[]>([
     {
@@ -563,7 +544,8 @@ export const getBanners = (query: { mode: BannerMode }) =>
 /**
  * 获取消息列表
  */
-export const getMessages = (query) => httpGet('/app-api/member/message-manage/page', query)
+export const getMessages = (query) =>
+  httpGet<ResPageData<Message>>('/app-api/member/message-manage/page', query)
 /**
  * 获取Banner
  */

packages/app/src/layouts/tabbar.vue

@@ -68,7 +68,7 @@ const toPublishCase = () => {
 
 <template>
   <wd-config-provider :themeVars="defaultThemeVars">
-    <view class="bg-[#f6f6f6] pb-12 flex-grow">
+    <view class="bg-[#f6f6f6] pb-12 flex-grow flex flex-col">
       <slot />
     </view>
 

packages/app/src/pages/home/activity/detail/index.vue

@@ -32,7 +32,7 @@ import signupListDialogBg from '@designer-hub/assets/src/libs/assets/signupListD
 import { getActivityStatusText, getCountsArr } from '../../../../core/utils/common'
 import { extractColorsFromImageData } from 'extract-colors/lib/extract-colors.mjs'
 import { group, sort } from 'radash'
-import { Activity, StudyTour } from '../../../../core/models/moment'
+import { Activity, StudyTour } from '../../../../core/libs/models'
 
 const themeVars = ref<ConfigProviderThemeVars>({
   tableBorderColor: 'white',

packages/app/src/pages/home/components/banner.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { getBanners } from '../../../core/libs/requests'
-import { BannerMode } from '../../../core/models/moment'
+import { BannerMode } from '../../../core/libs/models'
 import { useRouter } from '../../../core/utils/router'
 
 const props = defineProps<{ mode: BannerMode; aspect?: string }>()

packages/app/src/pages/home/components/class-item.vue

@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import { PropType } from 'vue'
 import { frame, peoples, polygon16 } from '../../../core/libs/svgs'
-import { Content } from '../../../core/models/moment'
+import { Content } from '../../../core/libs/models'
 import dayjs from 'dayjs'
 import { useRouter } from '../../../core/utils/router'
 

packages/app/src/pages/home/components/comment-item.vue

@@ -7,7 +7,7 @@ import {
   getReviewReplay,
 } from '../../../core/libs/requests'
 import { thumbsUp, thumbsUpActive } from '../../../core/libs/svgs'
-import { Comment } from '../../../core/models/moment'
+import { Comment } from '../../../core/libs/models'
 import { dayjs } from 'wot-design-uni'
 import { storeToRefs } from 'pinia'
 

packages/app/src/pages/home/components/elegant-info-card.vue

@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import { PropType } from 'vue'
-import { Content } from '../../../core/models/moment'
+import { Content } from '../../../core/libs/models'
 import dayjs from 'dayjs'
 import Tag from '@/components/tag.vue'
 import { useRouter } from '../../../core/utils/router'

packages/app/src/pages/home/components/offline-activity-item.vue

@@ -2,7 +2,7 @@
 import Card from '@/components/card.vue'
 import { frame, polygon16 } from '../../../core/libs/svgs'
 import { PropType } from 'vue'
-import { Content } from '../../../core/models/moment'
+import { Content } from '../../../core/libs/models'
 import dayjs from 'dayjs'
 import { useRouter } from '../../../core/utils/router'
 

packages/app/src/pages/home/components/register-card.vue

@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import Card from '@/components/card.vue'
-import { Activity, DictType } from '../../../core/models/moment'
+import { Activity, DictType } from '../../../core/libs/models'
 import dayjs from 'dayjs'
 import TiltedButton from '@/components/tilted-button.vue'
 import { getActivitySignups, getByDictType } from '../../../core/libs/requests'

packages/app/src/pages/home/content/index.vue

@@ -10,7 +10,7 @@
 import { logo } from '../../../core/libs/svgs'
 import { getBanner, getContent } from '../../../core/libs/requests'
 import Article from '../components/article.vue'
-import { Content } from '../../../core/models/moment'
+import { Content } from '../../../core/libs/models'
 
 const id = ref()
 const type = ref()

packages/app/src/pages/home/mall/index.vue

@@ -19,7 +19,7 @@ import {
   getProducts,
 } from '../../../core/libs/requests'
 import PageHelper from '@/components/page-helper.vue'
-import { BannerMode } from '../../../core/models/moment'
+import { BannerMode } from '../../../core/libs/models'
 import Banner from '../components/banner.vue'
 import BottomAppBar from '@/components/bottom-app-bar.vue'
 import { useUserStore } from '@/store'

packages/app/src/pages/home/offline-activity/list/index.vue

@@ -10,7 +10,7 @@ import { useRouter } from '../../../../core/utils/router'
 import dayjs from 'dayjs'
 import ActivityCountDown from '../../components/activity-count-down.vue'
 import { getActivityStatus, getActivityStatusButtonText } from '../../../../core/utils/common'
-import { DictType } from '../../../../core/models/moment'
+import { DictType } from '../../../../core/libs/models'
 
 const tab = ref<number>(0)
 const router = useRouter()

packages/app/src/pages/home/spread/design-awards/index.vue

@@ -12,7 +12,7 @@ import SectionHeading from '@/components/section-heading.vue'
 import ElegantInfoCard from '../../components/elegant-info-card.vue'
 import { getBanners, getContents } from '../../../../core/libs/requests'
 import { NetImages } from '../../../../core/libs/net-images'
-import { BannerMode } from '../../../../core/models/moment'
+import { BannerMode } from '../../../../core/libs/models'
 import Banner from '../../components/banner.vue'
 
 const { data, run: setData } = useRequest(

packages/app/src/pages/home/spread/index.vue

@@ -11,7 +11,7 @@ import ElegantInfoCard from '../components/elegant-info-card.vue'
 import { useRouter } from '../../../core/utils/router'
 import { getBanners, getContents } from '../../../core/libs/requests'
 import { NetImages } from '../../../core/libs/net-images'
-import { BannerMode } from '../../../core/models/moment'
+import { BannerMode } from '../../../core/libs/models'
 import Banner from '../components/banner.vue'
 
 const router = useRouter()

packages/app/src/pages/home/study-tour/components/study-tour-card.vue

@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import TiltedButton from '@/components/tilted-button.vue'
-import { StudyTour } from '../../../../core/models/moment'
+import { StudyTour } from '../../../../core/libs/models'
 import dayjs from 'dayjs'
 import { useRouter } from '../../../../core/utils/router'
 import { map } from '@designer-hub/assets/src/assets/svgs'

packages/app/src/pages/home/study-tour/index.vue

@@ -14,7 +14,7 @@ import ClassItem from '../components/class-item.vue'
 import TimeLine from './components/time-line.vue'
 import { getBanners, getCircles, getContents } from '../../../core/libs/requests'
 import { NetImages } from '../../../core/libs/net-images'
-import { BannerMode } from '../../../core/models/moment'
+import { BannerMode } from '../../../core/libs/models'
 import { useRouter } from '../../../core/utils/router'
 import PageHelper from '@/components/page-helper.vue'
 

packages/app/src/pages/material/detail/index.vue

@@ -6,7 +6,7 @@ import Card from '@/components/card.vue'
 import SectionHeading from '@/components/section-heading.vue'
 import { getMaterialDetail, getByDictType, getMaterialHomePage } from '../../../core/libs/requests'
 import NavbarEvo from '@/components/navbar-evo.vue'
-import { DictType } from '../../../core/models/moment'
+import { DictType } from '../../../core/libs/models'
 import { phone } from '../../../core/libs/svgs'
 import { handleCall } from '../../../core/utils/common'
 import router from '@designer-hub/assets/src/assets/svgs/router'

packages/app/src/pages/material/index.vue

@@ -8,7 +8,7 @@ import SectionHeading from '@/components/section-heading.vue'
 import { abc, calculator } from '../../core/libs/pngs'
 import { getAppMaterials, getBanners, getByDictType } from '../../core/libs/requests'
 import { close, phone } from '../../core/libs/svgs'
-import { BannerMode, DictType, MaterialDealer, MaterialsList } from '../../core/models/moment'
+import { BannerMode, DictType, MaterialDealer, MaterialsList } from '../../core/libs/models'
 import router from '@designer-hub/assets/src/assets/svgs/router'
 import Banner from '../home/components/banner.vue'
 import materialDealers from '@designer-hub/assets/src/libs/assets/materialDealers'

packages/app/src/pages/messages/index.vue

@@ -11,9 +11,9 @@
 <script setup lang="ts">
 import Card from '@/components/card.vue'
 import PageHelper from '@/components/page-helper.vue'
-import { getMessages } from '@/core/libs/requests'
-import { integral, interact, system } from '@/core/libs/svgs'
-import { beforeNow } from '@/utils/date-util'
+import { getMessages } from '../../core/libs/requests'
+import { integral, interact, system } from '../../core/libs/svgs'
+import { beforeNow } from '../../utils/date-util'
 import dayjs from 'dayjs'
 
 const tab = ref('integral')
@@ -49,19 +49,24 @@ const msgs = ref({
     },
   ],
 })
+const messageTypes = ref([{}])
 </script>
 
 <template>
-  <view class="flex-grow">
+  <view class="flex-grow flex flex-col">
     <wd-tabs v-model="tab">
       <block v-for="({ label, value }, i) in tabs" :key="i">
         <wd-tab :title="`${label}`" :name="value"></wd-tab>
       </block>
     </wd-tabs>
-    <PageHelper :request="getMessages" :query="{}">
+    <PageHelper
+      :request="() => ({ list: [] })"
+      :query="{ messageType: '1' }"
+      class="flex-grow flex flex-col"
+    >
       <template #default="{ source }">
         <div class="p-3.5 gap-3.5 flex flex-col">
-          <template v-for="({ title, createdAt, content, img }, i) in source.list" :key="i">
+          <template v-for="(it, i) in source.list" :key="i">
             <Card>
               <div class="grid items-center grid-cols-[38px_auto_100px]">
                 <div class="row-start-1 col-start-1">
@@ -79,28 +84,28 @@ const msgs = ref({
                   <div
                     class="text-black/90 text-base font-normal font-['PingFang_SC'] leading-[30px]"
                   >
-                    {{ title }}
+                    {{ it.title }}
                   </div>
                 </div>
                 <div class="row-start-1 col-start-3 text-end">
                   <div
                     class="text-black/30 text-sm font-normal font-['PingFang_SC'] leading-[10.18px]"
                   >
-                    {{ beforeNow(dayjs(createdAt).toDate()) }}
+                    {{ beforeNow(dayjs(it.createdAt).toDate()) }}
                   </div>
                 </div>
                 <div class="row-start-2 col-start-2 col-end-4">
                   <div
                     class="my-3 text-black/40 text-sm font-normal font-['PingFang_SC'] leading-[25px]"
                   >
-                    {{ content }}
+                    {{ it.content }}
                   </div>
                 </div>
-                <div v-if="img" class="row-start-3 col-start-2 col-end-4">
-                  <img class="w-[279px] h-[164px] rounded-md" :src="img" />
+                <div v-if="it.img" class="row-start-3 col-start-2 col-end-4">
+                  <img class="w-[279px] h-[164px] rounded-md" :src="it.img" />
                 </div>
                 <div class="row-start-4 col-start-1 col-end-4 my-2">
-                  <div v-if="!img" class="bg-[#dadada] w-full h-[1px]"></div>
+                  <div v-if="!it.img" class="bg-[#dadada] w-full h-[1px]"></div>
                 </div>
                 <div class="row-start-5 col-start-2 col-end-4">
                   <div

packages/app/src/pages/mine/authentication/index.vue

@@ -18,7 +18,7 @@ import {
   updateUserAuthInfo,
   validateReferrerCode,
 } from '../../../core/libs/requests'
-import { DictType } from '../../../core/models/moment'
+import { DictType } from '../../../core/libs/models'
 import { useUserStore } from '../../../store'
 import pageHeaderBg from '@designer-hub/assets/src/assets/svgs/pageHeaderBg'
 import pageHeaderFilter from '@designer-hub/assets/src/assets/svgs/pageHeaderFilter'

packages/app/src/pages/mine/components/tasks-card.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { Task } from '../../../core/models/moment'
+import { Task } from '../../../core/libs/models'
 import { taskCenterBg } from '../../../core/libs/pngs'
 import { useRouter } from '../../../core/utils/router'
 

packages/app/src/pages/mine/levels/index.vue

@@ -2,6 +2,7 @@
 { "style": { "navigationStyle": "custom" } }
 </route>
 <script setup lang="ts">
+import NavbarEvo from '@/components/navbar-evo.vue'
 import { levels } from '../../../core/libs/levels'
 import { useRouter } from '../../../core/utils/router'
 import { notify } from '@designer-hub/assets/src/assets/svgs'
@@ -33,14 +34,15 @@ const items = ref([
 </script>
 <template>
   <div class="flex-grow flex flex-col gap-4 bg-gradient-to-b from-[#312c38] to-[#171322] px-3.5">
-    <wd-navbar
+    <!-- <wd-navbar
       left-arrow
       safe-area-inset-top
       custom-class="mx--3.5 bg-transparent!"
       title="会员等级"
       :bordered="false"
       @left-click="router.back()"
-    ></wd-navbar>
+    ></wd-navbar> -->
+    <NavbarEvo fixed transparent title="会员等级" dark></NavbarEvo>
     <div class="flex gap-2 bg-gradient-to-r from-[#292331] to-[#35303b] rounded-md px-5 py-1">
       <wd-img width="22" height="22" :src="notify"></wd-img>
       <div class="text-[#f1d2c5] text-sm font-normal font-['PingFang_SC'] leading-normal">

packages/app/src/pages/mine/orders/detail/index.vue

@@ -55,8 +55,13 @@ onLoad((query: { id: string }) => {
         </div>
       </div>
     </div>
-    <SectionHeading title="订单金额" size="sm" :end-text="`¥ ${data.orderMoney}`"></SectionHeading>
-    <SectionHeading title="总积分" size="sm" end-text="¥ 200"></SectionHeading>
+    <SectionHeading
+      v-if="data.orderMoney"
+      title="订单金额"
+      size="sm"
+      :end-text="`¥ ${data.orderMoney}`"
+    ></SectionHeading>
+    <SectionHeading title="总积分" size="sm" :end-text="`¥ ${data.points}`"></SectionHeading>
     <SectionHeading
       title="实际支付积分"
       size="sm"

packages/app/src/pages/mine/orders/index.vue

@@ -7,7 +7,7 @@ import PageHelper from '@/components/page-helper.vue'
 import { getPointsOrders } from '../../../core/libs/requests'
 import { useUserStore } from '../../../store'
 import { storeToRefs } from 'pinia'
-import { PointsOrder } from '../../../core/models/moment'
+import { PointsOrder } from '../../../core/libs/models'
 import { useRouter } from '../../../core/utils/router'
 
 const userStore = useUserStore()

packages/app/src/pages/publish/moment/index.vue

@@ -12,7 +12,7 @@ import { createCircle, getByDictType } from '../../../core/libs/requests'
 import { useUserStore } from '../../../store'
 import { storeToRefs } from 'pinia'
 import { useToast } from 'wot-design-uni'
-import { CircleType, DictType } from '../../../core/models/moment'
+import { CircleType, DictType } from '../../../core/libs/models'
 import DataForm from '@/components/data-form.vue'
 import { zipToObject } from 'radash'
 import { useRouter } from '../../../core/utils/router'

packages/app/src/pages/publish/tags/index.vue

@@ -6,7 +6,7 @@ style:
 <script setup lang="ts">
 import SectionHeading from '@/components/section-heading.vue'
 import { getByDictType, getCircleTags } from '../../../core/libs/requests'
-import { DictType } from '../../../core/models/moment'
+import { DictType } from '../../../core/libs/models'
 import { ref } from 'vue'
 
 const { data: tagTypes, run: setTagTypes } = useRequest(() => getByDictType(DictType.circleTag), {

packages/merchant/src/layouts/tabbar.vue

@@ -11,7 +11,7 @@ import {
   channelTabbarHomeActive,
   channelTabbarMine,
   channelTabbarMineActive,
-} from '@designer-hub/assets/src'
+} from '@designer-hub/assets/src/assets/svgs'
 
 const userStore = useUserStore()
 const { userInfo, isChannel, isMerchant } = storeToRefs(userStore)

packages/merchant/src/pages.json

@@ -87,8 +87,8 @@
       "type": "page",
       "layout": "tabbar",
       "style": {
-        "navigationStyle": "custom",
-        "navigationBarTitleText": "首页"
+        "navigationBarTitleText": "首页",
+        "navigationBarBackgroundColor": "#fff"
       }
     },
     {

packages/merchant/src/pages/home/index.vue

@@ -2,8 +2,8 @@
 {
   layout: 'tabbar',
   style: {
-    navigationStyle: 'custom',
     navigationBarTitleText: '首页',
+    navigationBarBackgroundColor: '#fff',
   },
 }
 </route>