From 7267cf93c90c19f649fd1bc1ffc803b824a421db Mon Sep 17 00:00:00 2001
From: ctw <example@email.com>
Date: Thu, 27 Nov 2025 18:45:59 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E6=9B=BF=E6=8D=A2=E5=90=84=E4=B8=AA?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=E5=8F=82=E6=95=B0=EF=BC=9B?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=B3=A8=E5=86=8C=E5=90=88=E5=B9=B6=EF=BC=9B?=
 =?UTF-8?q?=E5=8F=91=E5=B8=83=E5=8A=A8=E6=80=81=E6=B7=BB=E5=8A=A0=E8=A7=86?=
 =?UTF-8?q?=E9=A2=91=EF=BC=9B=E5=88=86=E6=AE=B5=E6=8E=A7=E4=BB=B6=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                   |  23 ++--
 src/common/request.js                         |   1 +
 src/components/file-upload/file-upload.vue    |   2 -
 src/components/friend-item/friend-item.vue    |   8 +-
 .../long-press-menu/long-press-menu.vue       |   2 +-
 src/im-var.scss                               |   5 +-
 src/pages/home/city.vue                       |  61 ++++++---
 src/pages/home/home.vue                       |  37 ++++--
 src/pages/login/login.vue                     | 104 +++++++--------
 src/pages/message/chat-box.vue                |   2 +-
 src/pages/message/friend.vue                  |   8 +-
 src/pages/message/message.vue                 |   2 +-
 src/pages/moments/moments.vue                 |  40 +++++-
 src/pages/moments/publish.vue                 | 123 +++++++++++-------
 src/sheep/api/member/auth.js                  |   4 +-
 src/sheep/api/member/recent.ts                |  20 +++
 .../components/scroll-list/scroll-list.vue    |  12 +-
 src/sheep/components/segmented/segmented.vue  |  16 +--
 src/sheep/request/index.js                    |   1 +
 src/sheep/store/app.js                        |   4 +-
 src/static/online_app.png                     | Bin 0 -> 2774 bytes
 src/static/online_web.png                     | Bin 0 -> 3467 bytes
 22 files changed, 288 insertions(+), 187 deletions(-)
 create mode 100644 src/static/online_app.png
 create mode 100644 src/static/online_web.png

diff --git a/src/App.vue b/src/App.vue
index e12c05c4..1126b19a 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -328,7 +328,7 @@
               const groupId = msg.groupId;
               uni.navigateTo({
                 url: `/pages/chat/chat-group-video?groupId=${groupId}&isHost=false
-  									&inviterId=${inviterId}&userInfos=${userInfos}`,
+    									&inviterId=${inviterId}&userInfos=${userInfos}`,
               });
               delayTime = 500;
             }
@@ -388,7 +388,7 @@
         return group;
       },
       exit() {
-        console.log('exit');
+        console.log('1exit');
         this.isExit = true;
         wsApi.close(3099);
         uni.removeStorageSync('loginInfo');
@@ -494,28 +494,25 @@
       ShoproInit();
       // app启动时更新用户位置
       uni.getLocation({
+        geocode: true,
         success: (res) => {
           const params = {
-            issueLat: String(res.latitude),
-            issueLong: String(res.longitude),
+            lat: String(res.latitude),
+            lon: String(res.longitude),
+            province: res.address?.province ?? '',
+            city: res.address?.city ?? '',
+            district: res.address?.district ?? '',
+            address: res.address?.street ?? '',
           };
           RecentApi.updateUserLocation(params);
         },
         fail: (err) => {
-          uni.showToast({ title: '位置信息获取失败', icon: 'none' });
+          uni.showToast({ title: '位置信息获取失败，请打开系统定位', icon: 'none' });
         },
       });
 
       this.$mountStore();
       this.closeSplashscreen(1000); // 延迟1s，避免用户看到页面跳转
-      uni.setStorageSync('loginInfo', {
-        accessToken:
-          'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJhdWQiOiIyIiwiZXhwIjoxNzY0MTQ1MDQyLCJpbmZvIjoie1wibmlja05hbWVcIjpcInd3d1wiLFwidGVybWluYWxcIjoxLFwidXNlcklkXCI6MixcInVzZXJOYW1lXCI6XCJ3d3dcIn0ifQ.yO8o-DM4mied_C5PFzqentfiETV38jmVjFzLVljouz4',
-        accessTokenExpiresIn: 1800,
-        refreshToken:
-          'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJhdWQiOiIyIiwiZXhwIjoxNzY0NzQ4MDQyLCJpbmZvIjoie1wibmlja05hbWVcIjpcInd3d1wiLFwidGVybWluYWxcIjoxLFwidXNlcklkXCI6MixcInVzZXJOYW1lXCI6XCJ3d3dcIn0ifQ.O2Ge2P-n3JSjEqr7P5sH5jaSWZosopHycsuS-vk-WEU',
-        refreshTokenExpiresIn: 604800,
-      });
       // 登录状态校验
       let loginInfo = uni.getStorageSync('loginInfo');
       this.refreshToken(loginInfo)
diff --git a/src/common/request.js b/src/common/request.js
index 38c41d86..390d96b2 100644
--- a/src/common/request.js
+++ b/src/common/request.js
@@ -22,6 +22,7 @@ const request = (options) => {
         if (res.data.code == 200) {
           return resolve(res.data.data);
         } else if (res.data.code == 400) {
+          console.log('code 400');
           getApp().$vm.exit();
         } else if (res.data.code == 401) {
           console.log('token失效，尝试重新获取');
diff --git a/src/components/file-upload/file-upload.vue b/src/components/file-upload/file-upload.vue
index c10852c8..3a5b4205 100644
--- a/src/components/file-upload/file-upload.vue
+++ b/src/components/file-upload/file-upload.vue
@@ -126,5 +126,3 @@
     },
   };
 </script>
-
-<style></style>
diff --git a/src/components/friend-item/friend-item.vue b/src/components/friend-item/friend-item.vue
index 47abad9a..d9583684 100644
--- a/src/components/friend-item/friend-item.vue
+++ b/src/components/friend-item/friend-item.vue
@@ -12,13 +12,13 @@
         <image
           v-show="friend.onlineWeb"
           class="online"
-          src="/static/image/online_web.png"
+          src="/static/online_web.png"
           title="电脑设备在线"
         />
         <image
           v-show="friend.onlineApp"
           class="online"
-          src="/static/image/online_app.png"
+          src="/static/online_app.png"
           title="移动设备在线"
         />
       </view>
@@ -88,8 +88,8 @@
 
         .online {
           padding-right: 4rpx;
-          width: 24rpx;
-          height: 24rpx;
+          width: 48rpx;
+          height: 48rpx;
         }
       }
     }
diff --git a/src/components/long-press-menu/long-press-menu.vue b/src/components/long-press-menu/long-press-menu.vue
index a86eca84..075c1885 100644
--- a/src/components/long-press-menu/long-press-menu.vue
+++ b/src/components/long-press-menu/long-press-menu.vue
@@ -119,7 +119,7 @@
       position: fixed;
       border-radius: 4px;
       overflow: hidden;
-      background-color: $im-bg-active;
+      background-color: $im-bg-active-lighter;
       z-index: 1000;
       box-shadow: $im-box-shadow-dark;
 
diff --git a/src/im-var.scss b/src/im-var.scss
index 7363fb59..6d337aaf 100644
--- a/src/im-var.scss
+++ b/src/im-var.scss
@@ -46,8 +46,8 @@ $im-box-shadow-light: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
 $im-box-shadow-lighter: 0px 0px 6px rgba(0, 0, 0, 0.12);
 $im-box-shadow-dark: 0px 1px 10px 2px
   rgba(
-    $color: #444,
-    $alpha: 0.01,
+    $color: #666,
+    $alpha: 0.05,
   );
 
 // 背景
@@ -55,6 +55,7 @@ $im-bg: #222;
 $im-bg-linear: linear-gradient(135deg, #222 0%, #333 100%);
 $im-bg-active: #333;
 $im-bg-active-light: #444;
+$im-bg-active-lighter: #555;
 $im-bg-input: #333;
 
 // 标题
diff --git a/src/pages/home/city.vue b/src/pages/home/city.vue
index 873fa2ec..dcb5be24 100644
--- a/src/pages/home/city.vue
+++ b/src/pages/home/city.vue
@@ -1,5 +1,5 @@
 <template>
-  <wd-config-provider class="h-full flex flex-col" theme="dark">
+  <wd-config-provider theme="dark">
     <wd-navbar title="城市" safeAreaInsetTop :bordered="false">
       <template #left>
         <uni-icons type="back" size="30" color="#ffcd32" @click="back"></uni-icons>
@@ -7,7 +7,7 @@
     </wd-navbar>
 
     <view class="px-3 text-sm">热门城市</view>
-    <view class="flex flex-wrap gap-3 my-3 mx-4">
+    <view class="flex flex-wrap gap-3 py-3 px-4">
       <text
         v-for="(item, index) in hotCity"
         :key="index"
@@ -18,19 +18,21 @@
       </text>
     </view>
 
-    <wd-index-bar sticky>
-      <view v-for="(item, index) in useCityIndex()" :key="index">
-        <wd-index-anchor :index="item.letter" />
-        <wd-cell
-          border
-          clickable
-          v-for="city in item.data"
-          :key="city.v"
-          :title="city.t"
-          @click="select(city)"
-        />
-      </view>
-    </wd-index-bar>
+    <view style="height: calc(100vh - 150px)">
+      <wd-index-bar sticky>
+        <view v-for="(item, index) in useCityIndex()" :key="index">
+          <wd-index-anchor :index="item.letter" />
+          <wd-cell
+            border
+            clickable
+            v-for="city in item.data"
+            :key="city.v"
+            :title="city.t"
+            @click="select(city)"
+          />
+        </view>
+      </wd-index-bar>
+    </view>
   </wd-config-provider>
 </template>
 
@@ -48,6 +50,7 @@
   import useCityIndex, { type cityItem } from '@/sheep/hooks/use-city-index';
   // @ts-ignore
   import sheep from '@/sheep';
+  import RecentApi from '@/sheep/api/member/recent';
 
   const instance: any = getCurrentInstance()?.proxy;
   const eventChannel = instance.getOpenerEventChannel();
@@ -61,6 +64,28 @@
 
   const select = (v: cityItem) => {
     sheep.$store('user').setUserCity(v);
+    uni.getLocation({
+      geocode: true,
+      success: (res) => {
+        const params = {
+          lat: String(res.latitude),
+          lon: String(res.longitude),
+          province: res.address?.province ?? '',
+          city: v?.t ?? '',
+          district: res.address?.district ?? '',
+          address: res.address?.street ?? '',
+        };
+        RecentApi.updateUserLocation(params);
+      },
+      fail: (err) => {
+        const params = {
+          lat: '0',
+          lon: '0',
+          city: v?.t ?? '',
+        };
+        RecentApi.updateUserLocation(params);
+      },
+    });
     eventChannel.emit('changeCity');
     back();
   };
@@ -69,9 +94,3 @@
     uni.navigateBack();
   }
 </script>
-
-<style>
-  page {
-    height: 100%;
-  }
-</style>
diff --git a/src/pages/home/home.vue b/src/pages/home/home.vue
index 65286876..e261ede1 100644
--- a/src/pages/home/home.vue
+++ b/src/pages/home/home.vue
@@ -2,7 +2,7 @@
   <wd-config-provider theme="dark">
     <wd-navbar title="" safeAreaInsetTop :bordered="false">
       <template #left>
-        <view class="flex items-center w-200rpx" @click="selectAddress">
+        <view class="flex items-center w-200rpx" @click="goSelectAddress">
           <uni-icons type="location" size="22" color="#ffcd32"></uni-icons>
           <text class="truncate text-xs">{{ userCity?.t || '未选择' }}</text>
         </view>
@@ -19,6 +19,8 @@
       :loadMoreStatus="loadMoreStatus"
       @refresh="refreshList"
       @loadMore="listLoadMore"
+      @scroll="(e) => (scrollTop = e.detail.scrollTop)"
+      :scroll-top="scrollTop"
     >
       <user-card
         v-if="listData.length"
@@ -60,27 +62,41 @@
   import useScroll from '@/sheep/hooks/use-scroll';
   // @ts-ignore
   import sheep from '@/sheep';
+  import { onLoad } from '@dcloudio/uni-app';
 
   const current = ref(0);
-  const segmentedItems = ['广场', '最近', '新人'];
+  const segmentedItems = ref([]);
   const userCity = computed(() => sheep.$store('user').userCity);
   const params = reactive({
-    scene: 'DYNAMIC_RECOMMEND',
+    scene: '',
     province: '',
-    city: '',
+    city: userCity.value.t,
     memberId: '',
   });
   const { listData, loadMoreStatus, refreshList, listLoadMore } = useScroll(
     RecentApi.quickPage,
     params,
   );
+  const scrollTop = ref(0);
 
-  const selectAddress = () => {
+  onLoad(async () => {
+    // 获取顶部导航栏tab菜单
+    const { data } = await RecentApi.getSquareTabMenu();
+    if (data && data.length > 0) {
+      segmentedItems.value = data;
+      params.scene = data[0]['search-action'];
+      refreshList();
+    }
+  });
+
+  const goSelectAddress = () => {
     uni.navigateTo({
       url: '/pages/home/city',
       events: {
-        changeCity: () => {
-          refreshList();
+        changeCity: async () => {
+          scrollTop.value = 0;
+          params.city = userCity.value.t;
+          await refreshList();
         },
       },
     });
@@ -95,8 +111,9 @@
     });
   };
 
-  const segmentedChange = ({ currentIndex }: { currentIndex: number }) => {
-    console.log(segmentedItems[currentIndex]);
-    refreshList();
+  const segmentedChange = async (item: any) => {
+    params.scene = item['search-action'];
+    scrollTop.value = 0;
+    await refreshList();
   };
 </script>
diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue
index 39fc45e8..a5bfed04 100644
--- a/src/pages/login/login.vue
+++ b/src/pages/login/login.vue
@@ -7,46 +7,40 @@
         <view class="text-16px tracking-4rpx text-amber/80">• 高端社交圈 •</view>
       </view>
 
-      <template v-if="scene === 'login'">
-        <view class="flex w-full flex-col items-center gap-40rpx">
-          <view class="relative flex w-full items-center">
-            <input
-              class="h-100rpx w-full rounded-50rpx bg-color-light px-40rpx text-32rpx text-white"
-              type="number"
-              placeholder="请输入手机号"
-              placeholder-style="color: rgba(255, 255, 255, 0.6)"
-              v-model="phone"
-            />
-          </view>
-          <view class="relative flex w-full items-center">
-            <input
-              class="h-100rpx w-full rounded-50rpx bg-color-light px-40rpx text-32rpx text-white"
-              type="number"
-              placeholder="验证码"
-              placeholder-style="color: rgba(255, 255, 255, 0.6)"
-              v-model="smsCode"
-            />
-            <view
-              class="absolute right-20rpx rounded-16rpx bg-color-theme-dark px-20rpx py-16rpx text-12px"
-              @click="handleGetCode"
-            >
-              获取验证码
-            </view>
+      <view class="flex w-full flex-col items-center gap-40rpx">
+        <view class="relative flex w-full items-center">
+          <input
+            class="h-100rpx w-full rounded-50rpx bg-color-light px-40rpx text-32rpx text-white"
+            type="number"
+            placeholder="请输入手机号"
+            placeholder-style="color: rgba(255, 255, 255, 0.6)"
+            v-model="phone"
+          />
+        </view>
+        <view class="relative flex w-full items-center">
+          <input
+            class="h-100rpx w-full rounded-50rpx bg-color-light px-40rpx text-32rpx text-white"
+            type="number"
+            placeholder="验证码"
+            placeholder-style="color: rgba(255, 255, 255, 0.6)"
+            v-model="smsCode"
+          />
+          <view
+            class="absolute right-20rpx rounded-16rpx bg-color-theme-dark px-20rpx py-16rpx text-12px"
+            @click="handleGetCode"
+          >
+            获取验证码
           </view>
         </view>
-        <view
-          class="mt-40rpx w-full rounded-full bg-color-theme text-lg text-center py-2"
-          @click="handleLogin"
-        >
-          登 录
-        </view>
-        <button class="mt-40rpx border-none bg-transparent text-white" @click="goRegister">
-          去注册
-        </button>
-      </template>
+      </view>
+      <view
+        class="mt-40rpx w-full rounded-full bg-color-theme text-lg text-center py-2"
+        @click="handleLogin"
+      >
+        登 录 / 注 册
+      </view>
 
-      <template v-else>
-        <view class="flex w-full flex-col items-center gap-40rpx">
+      <!-- <view class="flex w-full flex-col items-center gap-40rpx">
           <view class="relative flex w-full items-center">
             <input
               class="h-100rpx w-full rounded-50rpx bg-color-light px-40rpx text-32rpx text-white"
@@ -80,8 +74,7 @@
         </view>
         <button class="mt-40rpx border-none bg-transparent text-white" @click="goLogin">
           去登录
-        </button>
-      </template>
+        </button> -->
     </view>
 
     <view class="absolute bottom-40rpx w-full text-center text-14px text-white">
@@ -96,7 +89,6 @@
 
   const phone = ref('');
   const smsCode = ref('');
-  const scene = ref('login');
 
   const handleGetCode = async () => {
     if (!phone.value) return uni.showToast({ title: '请填写手机号', icon: 'none' });
@@ -116,30 +108,24 @@
     if (!phone.value) return uni.showToast({ title: '请填写手机号', icon: 'none' });
     if (!smsCode.value) return uni.showToast({ title: '请填写验证码', icon: 'none' });
 
-    const { code } = await AuthUtil.smsLogin({ mobile: phone.value, code: smsCode.value });
-    if (code === 0) {
-      uni.reLaunch({ url: '/pages/home/home' });
-    }
-  };
-
-  // 注册
-  const handleRegister = async () => {
-    if (!phone.value) return uni.showToast({ title: '请填写手机号', icon: 'none' });
-    if (!smsCode.value) return uni.showToast({ title: '请填写验证码', icon: 'none' });
-
     const { code } = await AuthUtil.smsRegister({ mobile: phone.value, code: smsCode.value });
     if (code === 0) {
       uni.reLaunch({ url: '/pages/home/home' });
+      getApp().$vm.init();
+      return;
     }
+    // 清理数据，防止缓存未失效
+    getApp().$vm.unloadStore();
   };
 
-  const goLogin = () => {
-    smsCode.value = '';
-    scene.value = 'login';
-  };
+  // 注册
+  // const handleRegister = async () => {
+  //   if (!phone.value) return uni.showToast({ title: '请填写手机号', icon: 'none' });
+  //   if (!smsCode.value) return uni.showToast({ title: '请填写验证码', icon: 'none' });
 
-  const goRegister = () => {
-    smsCode.value = '';
-    scene.value = 'register';
-  };
+  //   const { code } = await AuthUtil.smsRegister({ mobile: phone.value, code: smsCode.value });
+  //   if (code === 0) {
+  //     uni.reLaunch({ url: '/pages/home/home' });
+  //   }
+  // };
 </script>
diff --git a/src/pages/message/chat-box.vue b/src/pages/message/chat-box.vue
index cda17a93..9e6ac825 100644
--- a/src/pages/message/chat-box.vue
+++ b/src/pages/message/chat-box.vue
@@ -120,7 +120,7 @@
             >
               <view class="tool-icon iconfont icon-folder"></view>
             </file-upload>
-            <view class="tool-name">文件</view>
+            <view class="tool-name" style="margin-top: -10rpx">文件</view>
           </view>
           <view class="chat-tools-item">
             <image-upload
diff --git a/src/pages/message/friend.vue b/src/pages/message/friend.vue
index 61e46ef4..92bc461d 100644
--- a/src/pages/message/friend.vue
+++ b/src/pages/message/friend.vue
@@ -1,5 +1,5 @@
 <template>
-  <view class="tab-page friend">
+  <view class="page friend">
     <wd-config-provider theme="dark">
       <wd-navbar title="友友" fixed safeAreaInsetTop :bordered="false">
         <template #left>
@@ -29,7 +29,7 @@
         </view>
         <view class="tip-title">还没有好友</view>
         <view class="tip-content">添加好友，开始精彩的聊天之旅</view>
-        <!-- <button type="primary" @click="onAddNewFriends">添加好友</button> -->
+        <button type="primary" @click="onAddNewFriends">逛逛首页</button>
       </view>
       <view class="friend-items" v-else>
         <!-- <up-index-list :index-list="friendIdx" :sticky="false" :custom-nav-height="customNavHeight">
@@ -67,9 +67,7 @@
     },
     methods: {
       onAddNewFriends() {
-        uni.navigateTo({
-          url: '/pages/friend/friend-add',
-        });
+        uni.switchTab({ url: '/pages/home/home' });
       },
       firstLetter(strText) {
         // 使用pinyin-pro库将中文转换为拼音
diff --git a/src/pages/message/message.vue b/src/pages/message/message.vue
index 32e64fe6..9b461fed 100644
--- a/src/pages/message/message.vue
+++ b/src/pages/message/message.vue
@@ -134,7 +134,7 @@
           });
         } else {
           uni.removeTabBarBadge({
-            index: 0,
+            index: 2,
             complete: () => {},
           });
         }
diff --git a/src/pages/moments/moments.vue b/src/pages/moments/moments.vue
index c1df0cbf..714a6a45 100644
--- a/src/pages/moments/moments.vue
+++ b/src/pages/moments/moments.vue
@@ -3,7 +3,7 @@
     <wd-navbar title="" safeAreaInsetTop style="z-index: 999999 !important" :bordered="false">
       <template #left>
         <view class="flex items-center h-full">
-          <segmented v-model="current" :items="segmentedItems" />
+          <segmented v-model="current" :items="segmentedItems" @change="segmentedChange" />
         </view>
       </template>
       <template #right>
@@ -18,6 +18,8 @@
       :loadMoreStatus="loadMoreStatus"
       @refresh="refreshList"
       @loadMore="listLoadMore"
+      @scroll="(e) => (scrollTop = e.detail.scrollTop)"
+      :scroll-top="scrollTop"
     >
       <swiper
         class="h-300rpx mx-4"
@@ -61,17 +63,21 @@
 </template>
 
 <script setup lang="ts">
-  import { reactive, ref } from 'vue';
+  import { computed, reactive, ref, watch } from 'vue';
   import segmented from '@/sheep/components/segmented/segmented.vue';
   import MomentCard from '@/sheep/components/moment-card/moment-card.vue';
   import ScrollList from '@/sheep/components/scroll-list/scroll-list.vue';
   import useScroll from '@/sheep/hooks/use-scroll';
   import RecentApi from '@/sheep/api/member/recent';
+  import { onLoad } from '@dcloudio/uni-app';
+  // @ts-ignore
+  import sheep from '@/sheep';
 
+  const userCity = computed(() => sheep.$store('user').userCity);
   const params = reactive({
-    scene: 'DYNAMIC_RECOMMEND',
+    scene: '',
     province: '',
-    city: '',
+    city: userCity.value.t,
     memberId: '',
   });
   const { listData, loadMoreStatus, refreshList, listLoadMore } = useScroll(
@@ -79,7 +85,25 @@
     params,
   );
   const current = ref(0);
-  const segmentedItems = ['动态', '附近'];
+  const segmentedItems = ref([]);
+  const scrollTop = ref(0);
+
+  onLoad(async () => {
+    // 获取顶部导航栏tab菜单
+    const { data } = await RecentApi.getDynamicTabMenu();
+    if (data && data.length > 0) {
+      segmentedItems.value = data;
+      params.scene = data[0]['search-action'];
+      refreshList();
+    }
+  });
+
+  watch(
+    () => userCity.value,
+    (val) => {
+      params.city = val.value.t;
+    },
+  );
 
   // 查看用户详情
   const goDetail = (user: any) => {
@@ -90,4 +114,10 @@
       },
     });
   };
+
+  const segmentedChange = async (item: any) => {
+    params.scene = item['search-action'];
+    scrollTop.value = 0;
+    await refreshList();
+  };
 </script>
diff --git a/src/pages/moments/publish.vue b/src/pages/moments/publish.vue
index 7d2d4826..3c571a33 100644
--- a/src/pages/moments/publish.vue
+++ b/src/pages/moments/publish.vue
@@ -16,50 +16,75 @@
       </template>
     </wd-navbar>
 
-    <wd-textarea v-model="params.description" :maxlength="1000" clearable show-word-limit />
-    <wd-tabs v-model="activeTab">
-      <wd-tab title="发图片">
-        <view class="p-4">
-          <s-uploader v-model:url="params.coverPic" fileMediatype="image" limit="1" mode="grid" />
-        </view>
-      </wd-tab>
-      <wd-tab title="发视频">
-        <view class="p-4">
-          <s-uploader v-model:url="params.videos" fileMediatype="video" limit="1" mode="grid" />
-        </view>
-      </wd-tab>
-    </wd-tabs>
+    <scroll-view scroll-y style="height: calc(100dvh - 44px)">
+      <wd-textarea v-model="params.description" :maxlength="1000" clearable show-word-limit />
+      <wd-tabs v-model="activeTab">
+        <wd-tab title="发图片">
+          <view class="px-4 py-8">
+            <wd-upload
+              v-model:file-list="params.coverPic"
+              :action="baseUrl + apiPath + '/infra/file/upload'"
+              :header="header"
+              image-mode="aspectFill"
+              accept="image"
+              multiple
+              :limit="6"
+              :max-size="500000"
+            />
+          </view>
+        </wd-tab>
+        <wd-tab title="发视频">
+          <view class="px-4 py-8">
+            <wd-upload
+              v-model:file-list="params.coverVideo"
+              :action="baseUrl + apiPath + '/infra/file/upload'"
+              :header="header"
+              image-mode="aspectFill"
+              accept="video"
+              multiple
+              :limit="6"
+              :max-size="2000000"
+            />
+          </view>
+        </wd-tab>
+      </wd-tabs>
 
-    <wd-col-picker
-      label="选择地址"
-      title="选择地址"
-      align-right
-      v-model="addressValue"
-      :columns="area"
-      :column-change="columnChange"
-      @confirm="areaPickerConfirm"
-    />
-    <wd-cell title="详细地址" vertical>
-      <wd-input v-model.trim="params.issueAddress" :maxlength="20" show-word-limit />
-    </wd-cell>
+      <wd-col-picker
+        label="选择地址"
+        title="选择地址"
+        align-right
+        v-model="addressValue"
+        :columns="area"
+        :column-change="columnChange"
+        @confirm="areaPickerConfirm"
+      />
+      <wd-cell title="详细地址" vertical>
+        <wd-input v-model.trim="params.issueAddress" :maxlength="20" show-word-limit />
+      </wd-cell>
+      <view class="h-100" />
+    </scroll-view>
   </wd-config-provider>
 </template>
 
 <script setup lang="ts">
-  import { reactive, ref } from 'vue';
-  import sUploader from '@/sheep/components/s-uploader/s-uploader.vue';
+  import { computed, reactive, ref } from 'vue';
   import RecentApi from '@/sheep/api/member/recent';
   import { useColPickerData } from '@/sheep/hooks/use-col-picker-data';
   import { type ColPickerColumnChange } from '@/uni_modules/wot-design-uni/components/wd-col-picker/types';
+  // @ts-ignore
+  import { baseUrl, apiPath, tenantId } from '@/sheep/config';
+  // @ts-ignore
+  import { getAccessToken } from '@/sheep/request';
+  import { onLoad } from '@dcloudio/uni-app';
 
   const { colPickerData, findChildrenByCode } = useColPickerData();
 
   const activeTab = ref<0 | 1>(0);
   const addressValue = ref<string[]>([]);
   const params = reactive({
-    description: '',
     coverPic: [],
-    videos: [],
+    coverVideo: [],
+    description: '',
     issueLong: '0',
     issueLat: '0',
     issueProvince: '',
@@ -67,6 +92,12 @@
     issueDistrict: '',
     issueAddress: '',
   });
+  const coverPic = computed(() => {
+    return params.coverPic.map((item: any) => JSON.parse(item.response).data);
+  });
+  const coverVideo = computed(() => {
+    return params.coverVideo.map((item: any) => JSON.parse(item.response).data);
+  });
   const area = ref<any[]>([
     colPickerData.map((item) => {
       return {
@@ -113,30 +144,34 @@
         params.issueLong = String(res.longitude);
       },
       fail: (err) => {
-        uni.showToast({ title: '位置信息获取失败', icon: 'none' });
+        uni.showToast({ title: '位置信息获取失败，请打开系统定位', icon: 'none' });
       },
     });
   };
 
+  const header = {
+    Accept: '*/*',
+    'tenant-id': tenantId,
+    Authorization: 'Bearer ' + getAccessToken(),
+  };
+
+  onLoad(() => {
+    getLocation();
+  });
+
   // 发布朋友圈
   const publishMoments = async () => {
-    getLocation();
-
     if (!params.description || !params.issueProvince || !params.issueAddress)
       return uni.showToast({ title: '请填写内容', icon: 'error' });
+    if (!params.coverPic || !params.coverPic.length)
+      return uni.showToast({ title: '请上传图片', icon: 'error' });
+    getLocation();
 
-    if (activeTab.value === 0) {
-      if (!params.coverPic || !params.coverPic.length)
-        return uni.showToast({ title: '请上传图片', icon: 'error' });
-    }
-
-    if (activeTab.value === 1) {
-      if (!params.videos || !params.videos.length)
-        return uni.showToast({ title: '请上传视频', icon: 'error' });
-      params.coverPic = params.videos;
-    }
-
-    await RecentApi.createMoment(params);
+    await RecentApi.createMoment({
+      ...params,
+      coverPic: coverPic.value.join(','),
+      coverVideo: coverVideo.value.join(','),
+    });
     back();
   };
 
diff --git a/src/sheep/api/member/auth.js b/src/sheep/api/member/auth.js
index d4f0b05d..e91f0190 100644
--- a/src/sheep/api/member/auth.js
+++ b/src/sheep/api/member/auth.js
@@ -22,8 +22,8 @@ const AuthUtil = {
       data: { ...data, socialType: 35 },
       custom: {
         showSuccess: true,
-        loadingMsg: '注册中',
-        successMsg: '注册成功',
+        loadingMsg: '登录中',
+        successMsg: '登录成功',
       },
     });
   },
diff --git a/src/sheep/api/member/recent.ts b/src/sheep/api/member/recent.ts
index 715567ff..d3942efb 100644
--- a/src/sheep/api/member/recent.ts
+++ b/src/sheep/api/member/recent.ts
@@ -13,6 +13,26 @@ const RecentApi = {
       },
     });
   },
+  // 获取首页顶部导航栏的tab菜单
+  getSquareTabMenu: () => {
+    return request({
+      url: '/view/get-square-classify',
+      method: 'GET',
+      custom: {
+        showLoading: false,
+      },
+    });
+  },
+  // 获取动态页顶部导航栏的tab菜单
+  getDynamicTabMenu: () => {
+    return request({
+      url: '/view/get-dynamic-classify',
+      method: 'GET',
+      custom: {
+        showLoading: false,
+      },
+    });
+  },
   // 查询附近/广场
   quickPage: (data: any) => {
     return request({
diff --git a/src/sheep/components/scroll-list/scroll-list.vue b/src/sheep/components/scroll-list/scroll-list.vue
index ae7df96a..b3c295b3 100644
--- a/src/sheep/components/scroll-list/scroll-list.vue
+++ b/src/sheep/components/scroll-list/scroll-list.vue
@@ -9,7 +9,7 @@
     @refresherabort="onRefresherAbort"
     @refresherrefresh="onRefresherRefresh"
     @scrolltolower="onScrollToLower"
-    @scroll="(e: any) => emit('scroll', e)"
+    @scroll="scroll"
     v-bind="attrs"
   >
     <slot />
@@ -23,7 +23,7 @@
 </template>
 
 <script setup lang="ts">
-  import { onMounted, reactive, ref, useAttrs } from 'vue';
+  import { reactive, ref, useAttrs } from 'vue';
 
   const attrs = useAttrs();
   const props = withDefaults(
@@ -48,10 +48,6 @@
     contentnomore: '没有更多数据了',
   });
 
-  onMounted(() => {
-    onScrollToLower();
-  });
-
   // 下拉刷新中止
   const onRefresherAbort = () => {
     refresherTriggered.value = false;
@@ -72,4 +68,8 @@
     }
     emit('loadMore');
   };
+
+  const scroll = (e: any) => {
+    emit('scroll', e);
+  };
 </script>
diff --git a/src/sheep/components/segmented/segmented.vue b/src/sheep/components/segmented/segmented.vue
index 8a31fb2f..7e04185a 100644
--- a/src/sheep/components/segmented/segmented.vue
+++ b/src/sheep/components/segmented/segmented.vue
@@ -6,11 +6,11 @@
     <view
       class="relative z-10 flex-1 h-40rpx line-height-40rpx text-center text-xs font-500 active:text-color-theme"
       v-for="(item, index) in items"
-      :key="item"
+      :key="index"
       :class="{ active: modelValue === index }"
-      @click="segmentedItem(index)"
+      @click="segmentedItem(item, index)"
     >
-      <text>{{ item }}</text>
+      <text>{{ item.label }}</text>
     </view>
     <div
       class="absolute h-2/3 bg-color-theme-dark rounded-full transform duration-100"
@@ -24,7 +24,7 @@
 
   const props = withDefaults(
     defineProps<{
-      items?: string[];
+      items?: { label: string }[];
       modelValue?: number | string;
     }>(),
     {
@@ -34,7 +34,7 @@
   );
   const emit = defineEmits<{
     (e: 'update:modelValue', index: number): void;
-    (e: 'change', target: { currentIndex: number }): void;
+    (e: 'change', target: { label: string }): void;
   }>();
 
   const activeStyle = computed(() => {
@@ -49,11 +49,9 @@
     return { width: `${props.items.length * 50}px` };
   });
 
-  function segmentedItem(index: number) {
+  function segmentedItem(item: { label: string }, index: number) {
     if (props.modelValue === index) return;
     emit('update:modelValue', index);
-    emit('change', {
-      currentIndex: index,
-    });
+    emit('change', item);
   }
 </script>
diff --git a/src/sheep/request/index.js b/src/sheep/request/index.js
index 9cd3eafa..dfb12db9 100644
--- a/src/sheep/request/index.js
+++ b/src/sheep/request/index.js
@@ -115,6 +115,7 @@ http.interceptors.response.use(
     // 约定：如果是 /auth/ 下的 URL 地址，并且返回了 accessToken 说明是登录相关的接口，则自动设置登陆令牌
     if (response.config.url.indexOf('/member/auth/') >= 0 && response.data?.data?.accessToken) {
       $store('user').setToken(response.data.data.accessToken, response.data.data.refreshToken);
+      uni.setStorageSync('loginInfo', response.data.data.chatToken); // 聊天相关token
     }
 
     // 自定处理【loading 加载中】：如果需要显示 loading，则关闭 loading
diff --git a/src/sheep/store/app.js b/src/sheep/store/app.js
index fae0336f..f403fa2e 100644
--- a/src/sheep/store/app.js
+++ b/src/sheep/store/app.js
@@ -141,8 +141,8 @@ const adaptTenant = async () => {
 
       // 如果 URL 参数中没有，则通过 host 获取
       if (!newTenantId && window.location.host) {
-        const { data } = await getTenantByWebsite(window.location.host);
-        newTenantId = data?.id;
+        // const { data } = await getTenantByWebsite(window.location.host);
+        // newTenantId = data?.id;
       }
     }
     // #endif
diff --git a/src/static/online_app.png b/src/static/online_app.png
new file mode 100644
index 0000000000000000000000000000000000000000..173d41586671e01f9b25dd9163d03bc899f8e7e2
GIT binary patch
literal 2774
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

literal 0
HcmV?d00001

diff --git a/src/static/online_web.png b/src/static/online_web.png
new file mode 100644
index 0000000000000000000000000000000000000000..6e4707805f724489641beb72a6d17834b1d6eefb
GIT binary patch
literal 3467
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

literal 0
HcmV?d00001