From 06e026c8b8b418b755f6b6527f8d2f42c363b3d5 Mon Sep 17 00:00:00 2001
From: bobobobo <1055026847@qq.com>
Date: Tue, 13 Jan 2026 01:12:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9C=8B=E5=8F=8B=E5=9C=88?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/my-index.js                    |  43 ++++++
 pages/discover/dynamic/dynamic.vue | 201 +++++++++++++++++++++++------
 pages/discover/dynamic/release.vue |  25 +++-
 pages/discover/styles/dynamic.scss |  28 +++-
 pages/discover/styles/index.scss   |   2 +-
 pages/my-index/wallet/record.vue   |   1 +
 pages/shop-together/index.vue      |   6 +-
 utils/dateUtils.js                 |  57 ++++++++
 8 files changed, 319 insertions(+), 44 deletions(-)

diff --git a/api/my-index.js b/api/my-index.js
index ad2eb85..bcf8916 100644
--- a/api/my-index.js
+++ b/api/my-index.js
@@ -197,3 +197,46 @@ export const getUserTradeRecordList = data => {
     data
   })
 }
+
+/** 发布朋友圈 */
+export const addUserMoments = data => {
+  return http({
+    url: '/api/service/userMoments',
+    method: 'post',
+    data
+  })
+}
+
+/** 获取朋友圈列表 */
+export const getUserMomentsList = data => {
+  return http({
+    url: '/api/service/userMoments/list',
+    method: 'get',
+    data
+  })
+}
+
+/** 点赞 */
+export const likeUserMoments = id => {
+  return http({
+    url: `/api/service/userMoments/like/${id}`,
+    method: 'put'
+  })
+}
+
+/** 发布评论 */
+export const addUserMomentsComment = data => {
+  return http({
+    url: '/api/service/userMoments/comment',
+    method: 'post',
+    data
+  })
+}
+
+/** 删除 */
+export const deleteUserMoments = id => {
+  return http({
+    url: `/api/service/userMoments/${id}`,
+    method: 'delete'
+  })
+}
\ No newline at end of file
diff --git a/pages/discover/dynamic/dynamic.vue b/pages/discover/dynamic/dynamic.vue
index a956841..f33b665 100644
--- a/pages/discover/dynamic/dynamic.vue
+++ b/pages/discover/dynamic/dynamic.vue
@@ -1,72 +1,171 @@
 <script setup>
   import { reactive, ref } from 'vue'
-  import { onPageScroll } from '@dcloudio/uni-app'
   import { navigateTo } from '@/utils/router'
+  import {
+    addUserMomentsComment,
+    deleteUserMoments,
+    likeUserMoments,
+    getUserMomentsList
+  } from '@/api/my-index'
+  import { onLoad, onShow } from '@dcloudio/uni-app'
+  import { useAuthUser } from '@/composables/useAuthUser'
+  import { formatRelativeTime } from '@/utils/dateUtils'
+  import { useUI } from '@/utils/use-ui'
 
+  const { userInfo } = useAuthUser()
+  const { showDialog, showToast } = useUI()
+
+  const placeholderStyle = `font-family: PingFang SC, PingFang SC;
+font-weight: 500;
+font-size: 28rpx;
+color: #999999;
+line-height: 40rpx;
+font-style: normal;
+text-transform: none;`
   const MAX_SCROLL = 446
 
+  const paging = ref(null)
   const cbNavBar = ref({})
+  const dataList = ref([])
   const topIcon = reactive({
     leftColor: '#ffffff',
     rightColor: '#ffffff'
   })
+  const formData = reactive({
+    type: '',
+    pageNum: 1,
+    pageSize: 15
+  })
+  const contentData = ref('')
+  const inputId = ref('')
 
-  onPageScroll(e => {
-    cbNavBar.value?.updateScroll(e.scrollTop)
-    if (e.scrollTop > MAX_SCROLL - 220) {
+  const onScroll = e => {
+    cbNavBar.value?.updateScroll(e.detail.scrollTop)
+    if (e.detail.scrollTop > MAX_SCROLL - 220) {
       topIcon.leftColor = '#000'
       topIcon.rightColor = '#000'
     } else {
       topIcon.leftColor = '#ffffff'
       topIcon.rightColor = '#ffffff'
     }
+  }
+
+  const getData = async (pageNum, pageSize) => {
+    try {
+      const res = await getUserMomentsList({
+        pageNum,
+        pageSize
+      })
+      paging.value.complete(res.rows)
+    } catch (error) {
+      paging.value.complete(false)
+    }
+  }
+
+  const onLike = async item => {
+    await likeUserMoments(item.id)
+    //  item.likeCount += 1
+  }
+
+  /** 点击查看大图 */
+  const onImage = current => {
+    uni.previewImage({
+      urls: [current], // 图片路径数组（本地或网络）
+      current: current // 当前显示的图片（可选，默认为第一张）
+    })
+    closeComment()
+  }
+
+  /** 关闭评论框 */
+  const closeComment = () => {
+    contentData.value = ''
+    inputId.value = ''
+  }
+
+  /** 发布评论 */
+  const onComment = async item => {
+    console.log('发布评论')
+    const data = {
+      content: contentData.value,
+      id: item.id
+    }
+    const res = await addUserMomentsComment(data)
+    closeComment()
+  }
+
+  /** 删除动态 */
+  const onDeleteItem = async id => {
+    const res = await showDialog('提示', '确定要删除吗？')
+    if (!res) return
+    await deleteUserMoments(id)
+    await showToast('删除成功', 'success')
+    dataList.value = dataList.value.filter(item => item.id !== id)
+  }
+
+  onShow(() => {
+    getData(1, formData.pageSize)
   })
+  onLoad(async () => {})
 </script>
 
 <template>
-  <view class="dynamic">
-    <nav-bar
-      ref="cbNavBar"
-      isTopBg
-      target-color="#f9f9f9"
-      :max-scroll="MAX_SCROLL"
-    >
-      <template #back>
-        <uni-icons
-          :color="topIcon.leftColor"
-          type="left"
-          size="24"
-        ></uni-icons>
-      </template>
-      <template #right>
-        <uni-icons
-          :color="topIcon.rightColor"
-          type="camera"
-          size="24"
-          @click="navigateTo('/pages/discover/dynamic/release')"
-        ></uni-icons>
-      </template>
-    </nav-bar>
+  <z-paging
+    ref="paging"
+    v-model="dataList"
+    :default-page-no="formData.pageNum"
+    :default-page-size="formData.pageSize"
+    safe-area-inset-bottom
+    use-safe-area-placeholder
+    :show-loading-more-no-more-view="false"
+    @query="getData"
+    @scroll="onScroll"
+  >
+    <template #top>
+      <nav-bar
+        ref="cbNavBar"
+        isTopBg
+        target-color="#f9f9f9"
+        :max-scroll="MAX_SCROLL"
+      >
+        <template #back>
+          <uni-icons
+            :color="topIcon.leftColor"
+            type="left"
+            size="24"
+          ></uni-icons>
+        </template>
+        <template #right>
+          <uni-icons
+            :color="topIcon.rightColor"
+            type="camera"
+            size="24"
+            @click="navigateTo('/pages/discover/dynamic/release')"
+          ></uni-icons>
+        </template>
+      </nav-bar>
+    </template>
     <view class="top-bg-img">
       <image
-        src="https://wx4.sinaimg.cn/mw690/006i0nC8ly1hqugav3k6yj31o01o0aod.jpg"
+        :src="userInfo.avatar"
         mode="aspectFill"
         class="img"
+        @click="onImage(userInfo.avatar)"
       ></image>
       <!-- 用户信息 -->
       <view class="user-info">
-        <text>名字</text>
+        <text>{{ userInfo.userName }}</text>
         <image
-          src="https://img2.baidu.com/it/u=3408192385,656358498&fm=253&app=138&f=JPEG?w=760&h=760"
+          :src="userInfo.avatar"
           mode="aspectFill"
           class="avatar"
+          @click="onImage(userInfo.avatar)"
         ></image>
       </view>
     </view>
 
     <!-- 动态列表 -->
-    <view class="dynamic-list">
-      <view v-for="item in 4" class="list">
+    <view class="dynamic-list" @click="closeComment">
+      <view v-for="item in dataList" :key="item.id" class="list">
         <image
           src="https://img1.baidu.com/it/u=2645961124,1296922095&fm=253&app=138&f=JPEG?w=800&h=1530"
           mode="aspectFill"
@@ -74,7 +173,7 @@
         ></image>
         <view class="content">
           <text class="name">名字</text>
-          <text class="text">这是一条朋友圈的标题</text>
+          <text class="text">{{ item.content }}</text>
           <view class="img-list">
             <image
               src="https://p4.itc.cn/images01/20220619/46660ed163164c14be90e605a73ee5e8.jpeg"
@@ -84,20 +183,44 @@
           </view>
           <!-- 地址 -->
           <view class="address">
-            <text>19分钟前</text>
-            <text>重庆市渝北xxx寄街道</text>
+            <text>{{ formatRelativeTime(item.createTime) }}</text>
+            <!-- <text>重庆市渝北xxx寄街道</text> -->
           </view>
           <!-- 点赞评论 -->
           <view class="like-box">
-            <view class="like">
+            <view class="like" @click.stop="onLike(item)">
               <uni-icons
                 type="hand-up"
                 size="20"
                 color="#747474"
               ></uni-icons>
-              <text>22</text>
+              <text v-if="item.likeCount > 0">{{ item.likeCount }}</text>
             </view>
-            <uni-icons type="chat" size="20" color="#747474"></uni-icons>
+            <uni-icons
+              type="chat"
+              size="20"
+              color="#747474"
+              @click.stop="inputId = item.id"
+            ></uni-icons>
+
+            <uni-icons
+              type="trash"
+              size="20"
+              color="#d95d5d"
+              style="margin-left: 86rpx"
+              @click.stop="onDeleteItem(item.id)"
+            ></uni-icons>
+          </view>
+          <view v-if="inputId === item.id" class="input-box">
+            <input
+              v-model="contentData"
+              focus
+              confirm-type="done"
+              placeholder="评论"
+              :placeholder-style="placeholderStyle"
+              @confirm.stop="onComment(item)"
+            />
+            <button @click.stop="onComment(item)">发布</button>
           </view>
           <!-- 评论内容 -->
           <view class="comment">
@@ -109,7 +232,7 @@
         </view>
       </view>
     </view>
-  </view>
+  </z-paging>
 </template>
 
 <style lang="scss" scoped>
diff --git a/pages/discover/dynamic/release.vue b/pages/discover/dynamic/release.vue
index a4b16a7..3115e83 100644
--- a/pages/discover/dynamic/release.vue
+++ b/pages/discover/dynamic/release.vue
@@ -1,5 +1,8 @@
 <script setup>
   import { reactive } from 'vue'
+  import { addUserMoments } from '@/api/my-index'
+  import { useUI } from '@/utils/use-ui'
+  import { navigateBack } from '@/utils/router'
 
   const placeholderStyle = `font-family: PingFang SC, PingFang SC;
 font-weight: 500;
@@ -9,13 +12,31 @@ line-height: 40rpx;
 font-style: normal;
 text-transform: none;`
 
+  const { showToast } = useUI()
+
   const formData = reactive({
     txt: '',
     listImg: []
   })
 
-  const onUpData = () => {
-    console.log(formData)
+  const onUpData = async () => {
+    if (!formData.txt) {
+      showToast('请输入内容')
+      return
+    }
+
+    await addUserMoments({
+      content: formData.txt,
+      privacy: 0,
+      images: formData.listImg.map(v => {
+        return {
+          imageUrl: v
+        }
+      })
+    })
+    await showToast('发布成功', 'success')
+
+    navigateBack()
   }
 </script>
 
diff --git a/pages/discover/styles/dynamic.scss b/pages/discover/styles/dynamic.scss
index 4cd29c0..16a8945 100644
--- a/pages/discover/styles/dynamic.scss
+++ b/pages/discover/styles/dynamic.scss
@@ -79,7 +79,7 @@
           font-size: 24rpx;
           color: #999999;
           margin-right: 16rpx;
-          &:last-child {
+          &:nth-child(2) {
             font-size: 24rpx;
             color: #0c587e;
           }
@@ -121,6 +121,32 @@
           }
         }
       }
+      .input-box {
+        margin-top: 16rpx;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        border-radius: 14rpx;
+        border: 2rpx solid #19ac31;
+        padding: 12rpx 18rpx;
+        input {
+          font-size: 28rpx;
+        }
+        button {
+          display: inline-block;
+          margin: 0;
+          width: 120rpx;
+          height: 60rpx;
+          line-height: 60rpx;
+          background: #19ac31;
+          border-radius: 8rpx;
+          font-size: 24rpx;
+          color: #ffffff;
+          &::after {
+            display: none;
+          }
+        }
+      }
     }
   }
 }
diff --git a/pages/discover/styles/index.scss b/pages/discover/styles/index.scss
index 384a3cc..7409a3a 100644
--- a/pages/discover/styles/index.scss
+++ b/pages/discover/styles/index.scss
@@ -9,7 +9,7 @@
     width: 100%;
     height: 38rpx;
     left: 0;
-    bottom: 0;
+    bottom: -2rpx;
     background: #ffffff;
     border-radius: 32rpx 32rpx 0rpx 0rpx;
   }
diff --git a/pages/my-index/wallet/record.vue b/pages/my-index/wallet/record.vue
index eddc76e..5477ae6 100644
--- a/pages/my-index/wallet/record.vue
+++ b/pages/my-index/wallet/record.vue
@@ -89,6 +89,7 @@
     :default-page-size="formData.pageSize"
     safe-area-inset-bottom
     use-safe-area-placeholder
+    :show-loading-more-no-more-view="false"
     @query="getData"
   >
     <template #top>
diff --git a/pages/shop-together/index.vue b/pages/shop-together/index.vue
index 4d4e909..5051481 100644
--- a/pages/shop-together/index.vue
+++ b/pages/shop-together/index.vue
@@ -6,10 +6,13 @@
   import { navigateTo } from '@/utils/router'
 
   const list = ref([])
+  const loading = ref(true)
   const getData = async () => {
+    loading.value = true
     const res = await getMyGroupList()
     list.value = res.data
     console.log(res.data)
+    loading.value = false
   }
 
   const onGo = id => {
@@ -22,7 +25,8 @@
 </script>
 
 <template>
-  <view class="shop-together">
+  <view v-if="!loading" class="shop-together">
+    <cb-empty v-if="!loading && list.length === 0"></cb-empty>
     <view
       v-for="item in list"
       :key="item.id"
diff --git a/utils/dateUtils.js b/utils/dateUtils.js
index f72ad62..0a54cc9 100644
--- a/utils/dateUtils.js
+++ b/utils/dateUtils.js
@@ -23,3 +23,60 @@ export const formatMonthDay = date => {
 
   return `${month}.${day}`
 }
+
+/**
+ * 将时间字符串转换为相对时间描述
+ * @param {string} timeStr - 后端返回的时间字符串，如 '2026-01-12 22:51:54'
+ * @returns {string} 相对时间描述，如 '刚刚'、'3分钟前'、'昨天' 等
+ */
+export function formatRelativeTime(timeStr) {
+  // 兼容 iOS 不支持 '-' 分隔的日期格式，需转为标准 ISO 格式
+  const normalizedTimeStr = timeStr.replace(/-/g, '/')
+
+  const serverTime = new Date(normalizedTimeStr)
+  const now = new Date()
+
+  // 时间差（毫秒）
+  const diffMs = now - serverTime
+
+  // 如果时间在未来，直接返回原始时间或处理异常
+  if (diffMs < 0) {
+    return timeStr // 或者 return '未来时间';
+  }
+
+  const seconds = Math.floor(diffMs / 1000)
+  const minutes = Math.floor(seconds / 60)
+  const hours = Math.floor(minutes / 60)
+  const days = Math.floor(hours / 24)
+
+  // 判断是否是今天
+  const isSameDay = (date1, date2) => {
+    return (
+      date1.getFullYear() === date2.getFullYear() &&
+      date1.getMonth() === date2.getMonth() &&
+      date1.getDate() === date2.getDate()
+    )
+  }
+
+  // 判断是否是昨天
+  const isYesterday = (date1, date2) => {
+    const yesterday = new Date(date2)
+    yesterday.setDate(date2.getDate() - 1)
+    return isSameDay(date1, yesterday)
+  }
+
+  if (seconds < 60) {
+    return '刚刚'
+  } else if (minutes < 60) {
+    return `${minutes}分钟前`
+  } else if (hours < 24 && isSameDay(serverTime, now)) {
+    return `${hours}小时前`
+  } else if (isYesterday(serverTime, now)) {
+    return '昨天'
+  } else if (days < 7) {
+    return `${days}天前`
+  } else {
+    // 超过一周，返回原始日期（可选格式化为 YYYY-MM-DD）
+    return timeStr.split(' ')[0] // 或使用更美观的格式
+  }
+}