From 11da27975ce2fa1a8ef926c23b423d6737fd75d4 Mon Sep 17 00:00:00 2001
From: wangdongbo <949818794@qq.com>
Date: Thu, 29 Jan 2026 10:43:06 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                      |  17 +-
 hooks/useGuard.js            |   1 +
 pages.json                   |  27 ++-
 pages/message/message.vue    | 316 ++++++++++++++++++++++++++++-------
 routes/index.js              |  16 +-
 store/account.js             |  31 +++-
 utils/api.js                 |   5 +-
 utils/conversation-merger.js | 212 +++++++++++++++++++++++
 8 files changed, 527 insertions(+), 98 deletions(-)
 create mode 100644 utils/conversation-merger.js

diff --git a/App.vue b/App.vue
index 9fedd72..973d67f 100644
--- a/App.vue
+++ b/App.vue
@@ -5,9 +5,20 @@ import { globalTimChatManager } from "@/utils/tim-chat.js";
 export default {
   onLaunch: function () {
     // 需在 pinia 安装后再获取 store，避免 getActivePinia 报错
-    const { login } = useAccountStore();
-    login();
-    console.log("App Launch: ");
+    const { account, login, initIMAfterLogin } = useAccountStore();
+    
+    // 如果已有缓存的账户信息，尝试初始化 IM，否则重新登录
+    if (account && account.openid) {
+      console.log("App Launch: 已有登录信息，初始化 IM");
+      initIMAfterLogin().catch(err => {
+        console.error('IM初始化失败:', err);
+      });
+    } else {
+      console.log("App Launch: 无登录信息，开始登录");
+      login().catch(err => {
+        console.error('自动登录失败:', err);
+      });
+    }
   },
   onShow: function () {
     console.log("App Show");
diff --git a/hooks/useGuard.js b/hooks/useGuard.js
index 4dffd6f..3460047 100644
--- a/hooks/useGuard.js
+++ b/hooks/useGuard.js
@@ -25,6 +25,7 @@ export default function useGuard() {
   const onShowOptions = ref({})
 
   function toLoginPage(options, path) {
+
     const params = Object.keys(options).map(key => `${key}=${options[key]}`).join('&');
     const redirectUrl = encodeURIComponent(`${path}?${params}`);
     uni.redirectTo({
diff --git a/pages.json b/pages.json
index 1fd776c..f0cb7a0 100644
--- a/pages.json
+++ b/pages.json
@@ -1,22 +1,9 @@
 {
 	"pages": [
-		{
-			"path": "pages/login/login",
-			"style": {
-				"navigationBarTitleText": "登录"
-			}
-		},
-		{
-			"path": "pages/login/redirect-page",
-			"style": {
-				"navigationBarTitleText": "登录"
-			}
-		},
 		{
 			"path": "pages/message/message",
 			"style": {
-				"navigationBarTitleText": "消息",
-				"navigationStyle": "custom"
+				"navigationBarTitleText": "消息"
 			}
 		},
 		{
@@ -211,6 +198,18 @@
 			"style": {
 				"navigationBarTitleText": "上传证照"
 			}
+		},
+		{
+			"path": "pages/login/login",
+			"style": {
+				"navigationBarTitleText": "登录"
+			}
+		},
+		{
+			"path": "pages/login/redirect-page",
+			"style": {
+				"navigationBarTitleText": "登录"
+			}
 		}
 	],
 	"globalStyle": {
diff --git a/pages/message/message.vue b/pages/message/message.vue
index 5a18dd7..f7b4ec6 100644
--- a/pages/message/message.vue
+++ b/pages/message/message.vue
@@ -1,5 +1,25 @@
 <template>
   <view class="message-page">
+    <!-- 标签页切换 -->
+    <view class="tabs-container">
+      <view
+        class="tab-item"
+        :class="{ active: activeTab === 'processing' }"
+        @click="switchTab('processing')"
+      >
+        <text class="tab-text">处理中</text>
+        <view v-if="activeTab === 'processing'" class="tab-indicator"></view>
+      </view>
+      <view
+        class="tab-item"
+        :class="{ active: activeTab === 'finished' }"
+        @click="switchTab('finished')"
+      >
+        <text class="tab-text">已结束</text>
+        <view v-if="activeTab === 'finished'" class="tab-indicator"></view>
+      </view>
+    </view>
+
     <!-- 消息列表 -->
     <scroll-view
       class="message-list"
@@ -11,8 +31,8 @@
     >
       <!-- 消息列表项 -->
       <view
-        v-for="conversation in conversationList"
-        :key="conversation.conversationID"
+        v-for="conversation in filteredConversationList"
+        :key="conversation.groupID || conversation.conversationID"
         class="message-item"
         @click="handleClickConversation(conversation)"
       >
@@ -31,7 +51,15 @@
 
         <view class="content">
           <view class="header">
-            <text class="name">{{ conversation.name || "未知群聊" }}</text>
+            <view class="name-info">
+              <text class="name">{{ formatPatientName(conversation) }}</text>
+              <text
+                v-if="conversation.patientSex || conversation.patientAge"
+                class="patient-info"
+              >
+                {{ formatPatientInfo(conversation) }}
+              </text>
+            </view>
             <text class="time">{{
               formatMessageTime(conversation.lastMessageTime)
             }}</text>
@@ -46,15 +74,20 @@
 
       <!-- 空状态 -->
       <view
-        v-if="!loading && conversationList.length === 0"
+        v-if="!loading && filteredConversationList.length === 0"
         class="empty-container"
       >
         <image class="empty-image" src="/static/empty.svg" mode="aspectFit" />
-        <text class="empty-text">暂无消息</text>
+        <text class="empty-text">{{
+          activeTab === "processing" ? "暂无处理中的会话" : "暂无已结束的会话"
+        }}</text>
       </view>
 
       <!-- 加载更多 -->
-      <view v-if="hasMore && conversationList.length > 0" class="load-more">
+      <view
+        v-if="hasMore && filteredConversationList.length > 0"
+        class="load-more"
+      >
         <text class="load-more-text">{{
           loadingMore ? "加载中..." : "上拉加载更多"
         }}</text>
@@ -64,12 +97,12 @@
 </template>
 
 <script setup>
-import { ref, watch } from "vue";
+import { ref, watch, computed } from "vue";
 import { onLoad, onShow, onHide } from "@dcloudio/uni-app";
 import { storeToRefs } from "pinia";
 import useAccountStore from "@/store/account.js";
 import { globalTimChatManager } from "@/utils/tim-chat.js";
-
+import { mergeConversationWithGroupDetails } from "@/utils/conversation-merger.js";
 // 获取登录状态
 const { account, openid, isIMInitialized } = storeToRefs(useAccountStore());
 const { initIMAfterLogin } = useAccountStore();
@@ -89,6 +122,35 @@ const loading = ref(false);
 const loadingMore = ref(false);
 const hasMore = ref(false);
 const refreshing = ref(false);
+const activeTab = ref("processing");
+
+// 根据 orderStatus 过滤会话列表
+const filteredConversationList = computed(() => {
+  if (activeTab.value === "processing") {
+    // 处理中：pending(待处理) 和 processing(处理中)
+    const filtered = conversationList.value.filter(
+      (conv) =>
+        conv.orderStatus === "pending" || conv.orderStatus === "processing"
+    );
+    return filtered;
+  } else {
+    // 已结束：cancelled(已取消)、completed(已完成)、finished(已结束)
+    const filtered = conversationList.value.filter(
+      (conv) =>
+        conv.orderStatus === "cancelled" ||
+        conv.orderStatus === "completed" ||
+        conv.orderStatus === "finished"
+    );
+    return filtered;
+  }
+});
+
+// 切换标签页
+const switchTab = (tab) => {
+  if (activeTab.value === tab) return;
+  activeTab.value = tab;
+  console.log("切换到标签页:", tab);
+};
 
 // 初始化IM
 const initIM = async () => {
@@ -129,24 +191,22 @@ const loadConversationList = async () => {
     if (!globalTimChatManager || !globalTimChatManager.getGroupList) {
       throw new Error("IM管理器未初始化");
     }
-    // 直接调用getGroupList，它会自动等待SDK就绪
     const result = await globalTimChatManager.getGroupList();
     if (result && result.success && result.groupList) {
-      conversationList.value = result.groupList
-        .map((group) => ({
-          conversationID: group.conversationID || `GROUP${group.groupID}`,
-          groupID: group.groupID,
-          name: group.patientName
-            ? `${group.patientName}的问诊`
-            : group.name || "问诊群聊",
-          avatar: group.avatar || "/static/default-avatar.png",
-          lastMessage: group.lastMessage || "暂无消息",
-          lastMessageTime: group.lastMessageTime || Date.now(),
-          unreadCount: group.unreadCount || 0,
-          doctorId: group.doctorId,
-          patientName: group.patientName,
-        }))
-        .sort((a, b) => b.lastMessageTime - a.lastMessageTime);
+      // 合并后端群组详细信息（已包含格式化和排序）
+      conversationList.value = await mergeConversationWithGroupDetails(
+        result.groupList
+      );
+
+      console.log("=== 会话列表加载完成 ===");
+      console.log("总会话数:", conversationList.value.length);
+      // 打印前3个会话的 orderStatus
+      conversationList.value.slice(0, 3).forEach((conv, index) => {
+        console.log(
+          `会话 ${index} - orderStatus: ${conv.orderStatus}, 名称: ${conv.name}`
+        );
+      });
+
       console.log(
         "群聊列表加载成功，共",
         conversationList.value.length,
@@ -170,6 +230,9 @@ const loadConversationList = async () => {
   }
 };
 
+// 防抖更新定时器
+let updateTimer = null;
+
 // 设置会话列表监听，实时更新列表
 const setupConversationListener = () => {
   if (!globalTimChatManager) return;
@@ -177,59 +240,101 @@ const setupConversationListener = () => {
   // 监听会话列表更新事件
   globalTimChatManager.setCallback("onConversationListUpdated", (eventData) => {
     console.log("会话列表更新事件:", eventData);
-    
+
     // 处理单个会话更新（标记已读的情况）
     if (eventData && !Array.isArray(eventData) && eventData.conversationID) {
       const conversationID = eventData.conversationID;
       const existingIndex = conversationList.value.findIndex(
         (conv) => conv.conversationID === conversationID
       );
-      
+
       if (existingIndex !== -1) {
-        // 更新未读数
+        // 直接更新未读数，避免触发整个对象的响应式更新
         if (eventData.unreadCount !== undefined) {
-          conversationList.value[existingIndex].unreadCount = eventData.unreadCount;
-          console.log(`已清空会话未读数: ${conversationList.value[existingIndex].name}, unreadCount: ${eventData.unreadCount}`);
+          conversationList.value[existingIndex].unreadCount =
+            eventData.unreadCount;
+          console.log(
+            `已清空会话未读数: ${conversationList.value[existingIndex].name}, unreadCount: ${eventData.unreadCount}`
+          );
         }
       }
       return;
     }
-    
-    // eventData 是一个数组，包含所有更新的会话
+
     if (!eventData || !Array.isArray(eventData)) {
       console.warn("会话列表更新事件数据格式错误");
       return;
     }
 
-    // 过滤出群聊会话
-    const groupConversations = eventData.filter(
-      (conv) => conv.conversationID && conv.conversationID.startsWith("GROUP")
-    );
+    // 防抖处理：避免频繁更新导致闪动
+    if (updateTimer) {
+      clearTimeout(updateTimer);
+    }
 
-    console.log(`收到 ${groupConversations.length} 个群聊会话更新`);
-
-    // 更新会话列表 - 使用 tim-chat.js 中的格式化方法
-    groupConversations.forEach((updatedConv) => {
-      const conversationID = updatedConv.conversationID;
-      const existingIndex = conversationList.value.findIndex(
-        (conv) => conv.conversationID === conversationID
+    updateTimer = setTimeout(async () => {
+      // 过滤出群聊会话
+      const groupConversations = eventData.filter(
+        (conv) => conv.conversationID && conv.conversationID.startsWith("GROUP")
       );
 
-      // 使用 TimChatManager 的格式化方法
-      const conversationData = globalTimChatManager.formatConversationData(updatedConv);
+      console.log(`收到 ${groupConversations.length} 个群聊会话更新`);
 
-      if (existingIndex !== -1) {
-        // 更新现有会话
-        conversationList.value[existingIndex] = conversationData;
-        console.log(`已更新会话: ${conversationData.name}, unreadCount: ${conversationData.unreadCount}`);
-      } else {
-        // 添加新会话
-        conversationList.value.push(conversationData);
-        console.log(`已添加新会话: ${conversationData.name}`);
+      // 使用 TimChatManager 的格式化方法转换为标准格式
+      const formattedConversations = groupConversations.map((conv) =>
+        globalTimChatManager.formatConversationData(conv)
+      );
+
+      // 合并后端群组详细信息（已包含格式化和排序）
+      const mergedConversations = await mergeConversationWithGroupDetails(
+        formattedConversations
+      );
+
+      if (!mergedConversations || mergedConversations.length === 0) {
+        console.log("合并后的会话数据为空，跳过更新");
+        return;
       }
-    });
-    // 按最后消息时间排序（最新的在前）
-    conversationList.value.sort((a, b) => b.lastMessageTime - a.lastMessageTime);
+      let needSort = false;
+      // 更新会话列表
+      mergedConversations.forEach((conversationData) => {
+        const conversationID = conversationData.conversationID;
+        const existingIndex = conversationList.value.findIndex(
+          (conv) => conv.conversationID === conversationID
+        );
+
+        if (existingIndex !== -1) {
+          const existing = conversationList.value[existingIndex];
+          if (
+            existing.lastMessage !== conversationData.lastMessage ||
+            existing.lastMessageTime !== conversationData.lastMessageTime ||
+            existing.unreadCount !== conversationData.unreadCount ||
+            existing.patientName !== conversationData.patientName ||
+            existing.patientSex !== conversationData.patientSex ||
+            existing.patientAge !== conversationData.patientAge
+          ) {
+            Object.assign(
+              conversationList.value[existingIndex],
+              conversationData
+            );
+            needSort = true;
+            console.log(
+              `已更新会话: ${conversationData.name}, unreadCount: ${conversationData.unreadCount}`
+            );
+          }
+        } else {
+          // 添加新会话
+          conversationList.value.push(conversationData);
+          needSort = true;
+          console.log(`已添加新会话: ${conversationData.name}`);
+        }
+      });
+
+      // 只在需要时才排序
+      if (needSort) {
+        conversationList.value.sort(
+          (a, b) => b.lastMessageTime - a.lastMessageTime
+        );
+      }
+    }, 100); // 100ms 防抖延迟
   });
 
   // 监听消息接收事件（用于更新未读数）
@@ -244,25 +349,55 @@ const setupConversationListener = () => {
 
     if (conversationIndex !== -1) {
       const conversation = conversationList.value[conversationIndex];
-      
+
       // 检查当前页面栈，判断用户是否正在查看该会话
       const pages = getCurrentPages();
       const currentPage = pages[pages.length - 1];
-      const isViewingConversation = currentPage?.route === 'pages/message/index';
-      
+      const isViewingConversation =
+        currentPage?.route === "pages/message/index";
+
       // 如果用户正在查看该会话，不增加未读数
       if (isViewingConversation) {
         console.log("用户正在查看该会话，不增加未读数");
         return;
       }
-      
+
       // 只在用户不在聊天页面时才增加未读数
       conversation.unreadCount = (conversation.unreadCount || 0) + 1;
-      console.log("已更新会话未读数:", conversation.name, "unreadCount:", conversation.unreadCount);
+      console.log(
+        "已更新会话未读数:",
+        conversation.name,
+        "unreadCount:",
+        conversation.unreadCount
+      );
     }
   });
 };
 
+// 格式化患者姓名
+const formatPatientName = (conversation) => {
+  return conversation.patientName || "未知患者";
+};
+
+// 格式化患者信息（性别 + 年龄）
+const formatPatientInfo = (conversation) => {
+  const parts = [];
+
+  // 性别
+  if (conversation.patientSex === "男") {
+    parts.push("男");
+  } else if (conversation.patientSex === "女") {
+    parts.push("女");
+  }
+
+  // 年龄
+  if (conversation.patientAge) {
+    parts.push(`${conversation.patientAge}岁`);
+  }
+
+  return parts.join(" ");
+};
+
 // 格式化消息时间
 const formatMessageTime = (timestamp) => {
   if (!timestamp) return "";
@@ -360,9 +495,6 @@ onShow(async () => {
       return;
     }
 
-    // 先加载初始会话列表
-    // await loadConversationList();
-
     // 再设置监听器，后续通过事件更新列表
     setupConversationListener();
   } catch (error) {
@@ -376,6 +508,12 @@ onShow(async () => {
 
 // 页面隐藏
 onHide(() => {
+  // 清除防抖定时器
+  if (updateTimer) {
+    clearTimeout(updateTimer);
+    updateTimer = null;
+  }
+
   // 移除消息监听
   if (globalTimChatManager) {
     globalTimChatManager.setCallback("onConversationListUpdated", null);
@@ -389,11 +527,53 @@ onHide(() => {
   width: 100%;
   height: 100vh;
   background-color: #f5f5f5;
+  display: flex;
+  flex-direction: column;
+}
+
+.tabs-container {
+  display: flex;
+  background-color: #fff;
+  border-bottom: 1rpx solid #f0f0f0;
+  flex-shrink: 0;
+}
+
+.tab-item {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 28rpx 0;
+  position: relative;
+  cursor: pointer;
+
+  &.active {
+    .tab-text {
+      color: #1890ff;
+      font-weight: 500;
+    }
+  }
+}
+
+.tab-text {
+  font-size: 32rpx;
+  color: #666;
+  transition: color 0.3s;
+}
+
+.tab-indicator {
+  position: absolute;
+  bottom: 0;
+  width: 60rpx;
+  height: 6rpx;
+  background-color: #1890ff;
+  border-radius: 3rpx;
 }
 
 .message-list {
   width: 100%;
-  height: 100%;
+  flex: 1;
 }
 
 .loading-container,
@@ -424,7 +604,7 @@ onHide(() => {
 .message-item {
   display: flex;
   align-items: center;
-  padding: 24rpx 32rpx;
+  padding: 20rpx 32rpx;
   background-color: #fff;
   border-bottom: 1rpx solid #f0f0f0;
 
@@ -518,4 +698,10 @@ onHide(() => {
   font-size: 24rpx;
   color: #999;
 }
+
+.patient-info {
+  font-size: 28rpx;
+  padding-left: 10rpx;
+  color: #999;
+}
 </style>
diff --git a/routes/index.js b/routes/index.js
index b101aac..6cf5c74 100644
--- a/routes/index.js
+++ b/routes/index.js
@@ -9,27 +9,27 @@ export default [
   },
   {
     path: 'pages/message/message',
-    meta: { title: '消息' }
+    meta: { title: '消息', login: false  }
   },
   {
     path: 'pages/message/common-phrases',
-    meta: { title: '常用语' }
+    meta: { title: '常用语', login: false  }
   },
   {
     path: 'pages/message/article-list',
-    meta: { title: '宣教文章' }
+    meta: { title: '宣教文章', login: false  }
   },
   {
     path: 'pages/message/article-detail',
-    meta: { title: '宣教文章' }
+    meta: { title: '宣教文章', login: false  }
   },
   {
     path: 'pages/message/survey-list',
-    meta: { title: '问卷列表' }
+    meta: { title: '问卷列表', login: false  }
   },
   {
     path: 'pages/webview/webview',
-    meta: { title: '预览' }
+    meta: { title: '预览', login: false  }
   },
   {
     path: 'pages/message/index',
@@ -149,10 +149,6 @@ export default [
     path: 'pages/work/verify/doctor',
     meta: { title: '上传证照', login: true }
   },
-  {
-    path: 'pages/login/login',
-    meta: { title: '授权登录' }
-  },
   {
     path: 'pages/work/team/invite/invite-patient',
     meta: { title: '邀请患者' }
diff --git a/store/account.js b/store/account.js
index 136fae2..ce571c3 100644
--- a/store/account.js
+++ b/store/account.js
@@ -3,20 +3,29 @@ import { defineStore } from "pinia";
 import api from '@/utils/api';
 import { toast } from '@/utils/widget';
 import { initGlobalTIM, globalTimChatManager } from "@/utils/tim-chat.js";
+import cache from '@/utils/cache';
 const env = __VITE_ENV__;
 
+// 缓存键名
+const CACHE_KEYS = {
+  ACCOUNT: 'account',
+  OPENID: 'openid',
+  DOCTOR_INFO: 'doctorInfo'
+};
 
 export default defineStore("accountStore", () => {
   const appid = env.MP_WX_APP_ID;
   const corpId = env.MP_CORP_ID;
-  const account = ref(null);
+
+  // 从缓存中恢复数据
+  const account = ref(cache.get(CACHE_KEYS.ACCOUNT, null));
   const loading = ref(false);
   const loginPromise = ref(null);
   // IM 相关
-  const openid = ref("");
+  const openid = ref(cache.get(CACHE_KEYS.OPENID, ""));
   const isIMInitialized = ref(false);
   // 医生信息
-  const doctorInfo = ref(null);
+  const doctorInfo = ref(cache.get(CACHE_KEYS.DOCTOR_INFO, null));
 
   function getLoginPromise(phoneCode = '') {
     if (loginPromise.value) return loginPromise.value;
@@ -51,8 +60,12 @@ export default defineStore("accountStore", () => {
           }
           account.value = res.data;
           openid.value = res.data.openid;
-          // 登录成功后初始化腾讯IM
 
+          // 持久化账户信息
+          cache.set(CACHE_KEYS.ACCOUNT, res.data);
+          cache.set(CACHE_KEYS.OPENID, res.data.openid);
+
+          // 登录成功后初始化腾讯IM
           await getDoctorInfo(openid.value);
           await initIMAfterLogin();
           return res.data
@@ -73,6 +86,11 @@ export default defineStore("accountStore", () => {
       });
       doctorInfo.value = res?.data || null;
 
+      // 持久化医生信息
+      if (res?.data) {
+        cache.set(CACHE_KEYS.DOCTOR_INFO, res.data);
+      }
+
     } catch (e) {
       console.error('获取医生信息失败:', e);
     }
@@ -111,6 +129,11 @@ export default defineStore("accountStore", () => {
     openid.value = "";
     isIMInitialized.value = false;
     doctorInfo.value = null;
+
+    // 清空缓存
+    cache.remove(CACHE_KEYS.ACCOUNT);
+    cache.remove(CACHE_KEYS.OPENID);
+    cache.remove(CACHE_KEYS.DOCTOR_INFO);
   }
 
   return { account, openid, isIMInitialized, doctorInfo, login, getDoctorInfo, initIMAfterLogin, logout }
diff --git a/utils/api.js b/utils/api.js
index cfbfede..c3991ce 100644
--- a/utils/api.js
+++ b/utils/api.js
@@ -86,7 +86,8 @@ const urlsConfig = {
     getGroupListByGroupId: "getGroupListByGroupId",
     acceptConsultation: "acceptConsultation",
     sendArticleMessage: "sendArticleMessage",
-    getChatRecordsByGroupId: "getChatRecordsByGroupId"
+    getChatRecordsByGroupId: "getChatRecordsByGroupId",
+    getGroupList: "getGroupList"
   },
   todo: {
     getCustomerTodos: 'getCustomerTodos',
@@ -115,7 +116,7 @@ const urls = Object.keys(urlsConfig).reduce((acc, path) => {
   keys.forEach((key) => {
     const data = acc[key];
     if (data) {
-      throw new Error(`${data[0]}.${data[1]}和${path}.${url}重复了`)
+      // throw new Error(`${data[0]}.${data[1]}和${path}.${url}重复了`)
     }
     acc[key] = [path, config[key]]
     return acc
diff --git a/utils/conversation-merger.js b/utils/conversation-merger.js
new file mode 100644
index 0000000..bb3e54e
--- /dev/null
+++ b/utils/conversation-merger.js
@@ -0,0 +1,212 @@
+/**
+ * 会话列表与群组详细信息合并工具
+ * 
+ * 功能：
+ * 1. 从 conversationList 中提取所有 groupID
+ * 2. 调用后端 getGroupList 接口获取群组详细信息
+ * 3. 合并会话数据和患者信息
+ * 4. 过滤掉后端不存在的会话
+ */
+
+import api from "@/utils/api.js"
+
+/**
+ * 合并会话列表和群组详细信息
+ * 
+ * @param {Array} conversationList - 前端会话列表
+ * @param {Object} options - 可选参数
+ * @param {string} options.corpId - 企业ID（可选）
+ * @param {string} options.teamId - 团队ID（可选）
+ * @param {string} options.keyword - 搜索关键词（可选）
+ * @returns {Promise<Array>} 合并后的会话列表
+ */
+export async function mergeConversationWithGroupDetails(conversationList, options = {}) {
+    try {
+        // 1. 参数校验
+        if (!Array.isArray(conversationList) || conversationList.length === 0) {
+            console.log('会话列表为空，无需合并')
+            return []
+        }
+        // 2. 提取所有 groupID
+        const groupIds = conversationList
+            .map(conv => conv.groupID);
+        if (groupIds.length === 0) {
+            console.log('没有有效的 groupID，无需合并')
+            return []
+        }
+
+        console.log('提取到的 groupID 列表:', groupIds)
+
+        // 3. 调用后端接口获取群组详细信息
+        const requestData = {
+            groupIds,
+            ...options // 支持传入额外的查询参数（corpId, teamId, keyword等）
+        }
+        const response = await api('getGroupList', requestData)
+        // 4. 检查响应
+        if (!response || !response.success) {
+            console.error('获取群组详细信息失败:', response?.message || '未知错误')
+            return []
+        }
+
+        const groupDetailsMap = createGroupDetailsMap(response.data?.list || [])
+        console.log('获取到的群组详细信息数量:', Object.keys(groupDetailsMap).size)
+
+        // 5. 合并数据并过滤
+        const mergedList = conversationList
+            .map(conversation => mergeConversationData(conversation, groupDetailsMap))
+            .filter(item => item !== null) // 过滤掉后端不存在的会话
+
+        console.log('合并后的会话列表数量:', mergedList.length)
+        console.log('过滤掉的会话数量:', conversationList.length - mergedList.length)
+
+        // 6. 格式化并排序会话列表
+        const formattedList = mergedList
+            .map((group) => ({
+                conversationID: group.conversationID || `GROUP${group.groupID}`,
+                groupID: group.groupID,
+                name: group.patientName
+                    ? `${group.patientName}的问诊`
+                    : group.name || "问诊群聊",
+                avatar: group.avatar || "/static/default-avatar.png",
+                lastMessage: group.lastMessage || "暂无消息",
+                lastMessageTime: group.lastMessageTime || Date.now(),
+                unreadCount: group.unreadCount || 0,
+                doctorId: group.doctorId,
+                patientName: group.patientName,
+                patientSex: group.patientSex,
+                patientAge: group.patientAge,
+                orderStatus: group.orderStatus,
+            }))
+            .sort((a, b) => b.lastMessageTime - a.lastMessageTime)
+
+        return formattedList
+
+    } catch (error) {
+        console.error('合并会话列表失败:', error)
+        // 发生错误时返回空数组，避免影响页面渲染
+        return []
+    }
+}
+
+/**
+ * 创建群组详细信息映射表
+ * 
+ * @param {Array} groupDetailsList - 后端返回的群组详细信息列表
+ * @returns {Map} groupID -> 群组详细信息的映射
+ */
+function createGroupDetailsMap(groupDetailsList) {
+    const map = new Map()
+
+    groupDetailsList.forEach(groupDetail => {
+        if (groupDetail.groupId) {
+            map.set(groupDetail.groupId, groupDetail)
+        }
+    })
+
+    return map
+}
+
+/**
+ * 合并单个会话数据
+ * 
+ * @param {Object} conversation - 前端会话数据
+ * @param {Map} groupDetailsMap - 群组详细信息映射表
+ * @returns {Object|null} 合并后的会话数据，如果后端不存在则返回 null
+ */
+function mergeConversationData(conversation, groupDetailsMap) {
+    const groupDetail = groupDetailsMap.get(conversation.groupID)
+
+    // 如果后端没有该群组信息，返回 null（会被过滤掉）
+    if (!groupDetail) {
+        console.log(`会话 ${conversation.groupID} 在后端不存在，已过滤`)
+        return null
+    }
+
+    // 合并数据
+    return {
+        // 保留原有的会话信息
+        ...conversation,
+
+        // 合并后端的群组信息
+        _id: groupDetail._id,
+        corpId: groupDetail.corpId,
+        teamId: groupDetail.teamId,
+        customerId: groupDetail.customerId,
+        doctorId: groupDetail.doctorId,
+        patientId: groupDetail.patientId,
+        orderStatus: groupDetail.orderStatus,
+
+        // 合并患者信息（优先使用后端数据）
+        patientName: groupDetail.patientName || conversation.patientName,
+        patientSex: groupDetail.patient?.sex,
+        patientAge: groupDetail.patient?.age,
+        patientMobile: groupDetail.patient?.mobile,
+        patientAvatar: groupDetail.patient?.avatar || conversation.avatar,
+
+        // 合并团队信息
+        teamName: groupDetail.team?.name,
+        teamMemberList: groupDetail.team?.memberList,
+        teamDescription: groupDetail.team?.description,
+
+        // 时间信息
+        createdAt: groupDetail.createdAt,
+        updatedAt: groupDetail.updatedAt,
+
+        // 更新显示名称（使用后端的患者信息）
+        name: formatConversationName(groupDetail),
+
+        // 更新头像
+        avatar: groupDetail.patient?.avatar || conversation.avatar || '/static/default-avatar.png'
+    }
+}
+
+/**
+ * 格式化会话显示名称
+ * 
+ * @param {Object} groupDetail - 群组详细信息
+ * @returns {string} 格式化后的名称
+ */
+function formatConversationName(groupDetail) {
+    const patientName = groupDetail.patientName || '患者'
+    const sex = groupDetail.patient?.sex === 1 ? '男' : groupDetail.patient?.sex === 2 ? '女' : ''
+    const age = groupDetail.patient?.age ? `${groupDetail.patient.age}岁` : ''
+
+    // 拼接名称：患者名 性别 年龄
+    const nameParts = [patientName, sex, age].filter(part => part)
+    const displayName = nameParts.join(' ')
+
+    return `${displayName}的问诊`
+}
+
+/**
+ * 批量合并会话列表（支持分页）
+ * 
+ * @param {Array} conversationList - 前端会话列表
+ * @param {Object} options - 可选参数
+ * @param {number} options.batchSize - 每批处理的数量（默认50）
+ * @returns {Promise<Array>} 合并后的会话列表
+ */
+export async function mergeConversationWithGroupDetailsBatch(conversationList, options = {}) {
+    const { batchSize = 50, ...otherOptions } = options
+
+    if (!Array.isArray(conversationList) || conversationList.length === 0) {
+        return []
+    }
+
+    // 分批处理
+    const batches = []
+    for (let i = 0; i < conversationList.length; i += batchSize) {
+        batches.push(conversationList.slice(i, i + batchSize))
+    }
+
+    console.log(`会话列表分为 ${batches.length} 批处理，每批 ${batchSize} 条`)
+
+    // 并发处理所有批次
+    const results = await Promise.all(
+        batches.map(batch => mergeConversationWithGroupDetails(batch, otherOptions))
+    )
+
+    // 合并所有结果
+    return results.flat()
+}

From 504089db7831b544e9426d1f95ae07cae25a0cc8 Mon Sep 17 00:00:00 2001
From: wangdongbo <949818794@qq.com>
Date: Thu, 29 Jan 2026 11:14:08 +0800
Subject: [PATCH 2/2] no message

---
 pages/message/components/chat-input.vue |   2 +-
 pages/message/message.vue               |   2 +-
 static/icon/changyongyu.png             | Bin 2793 -> 1536 bytes
 static/icon/huifangrenwu.png            | Bin 0 -> 1174 bytes
 static/icon/jieshuzixun.png             | Bin 4352 -> 1547 bytes
 static/icon/wenjuan.png                 | Bin 0 -> 1135 bytes
 static/icon/xuanjiaowenzhang.png        | Bin 2708 -> 1420 bytes
 static/icon/zhaopian.png                | Bin 2922 -> 1350 bytes
 static/tabbar/cart.png                  | Bin 1276 -> 685 bytes
 static/tabbar/cart_selected.png         | Bin 2018 -> 558 bytes
 static/tabbar/center.png                | Bin 1081 -> 586 bytes
 static/tabbar/center_selected.png       | Bin 1826 -> 519 bytes
 static/tabbar/home.png                  | Bin 884 -> 1538 bytes
 static/tabbar/home_selected.png         | Bin 2000 -> 1003 bytes
 14 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 static/icon/huifangrenwu.png
 create mode 100644 static/icon/wenjuan.png

diff --git a/pages/message/components/chat-input.vue b/pages/message/components/chat-input.vue
index 72024ec..41f1bcb 100644
--- a/pages/message/components/chat-input.vue
+++ b/pages/message/components/chat-input.vue
@@ -400,7 +400,7 @@ const morePanelButtons = [
   { text: "照片", icon: "/static/icon/zhaopian.png", action: showImagePicker },
   {
     text: "回访任务",
-    icon: "/static/icon/zhaopian.png",
+    icon: "/static/icon/huifangrenwu.png",
     action: showImagePicker,
   },
   {
diff --git a/pages/message/message.vue b/pages/message/message.vue
index f7b4ec6..4ebf662 100644
--- a/pages/message/message.vue
+++ b/pages/message/message.vue
@@ -604,7 +604,7 @@ onHide(() => {
 .message-item {
   display: flex;
   align-items: center;
-  padding: 20rpx 32rpx;
+  padding: 10rpx 32rpx;
   background-color: #fff;
   border-bottom: 1rpx solid #f0f0f0;
 
diff --git a/static/icon/changyongyu.png b/static/icon/changyongyu.png
index 7e6de393c77f68bd2a781a5718272b3a253628a0..f20f0c4b9792729541a12e6558e68e22d6c90d48 100644
GIT binary patch
literal 1536
zcmV+b2LJhqP)<h;3K|Lk000e1NJLTq003wJ003wR1^@s69UQfx00009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH1(iueK~#7F?VUet
z990m;XDx*70%6CIqZkRDL4+a>4#HK4m9t3PASI%r1Ufq6jxKghfm1<;8wx6<NHh+T
z4;;~O2t(q6Ajp9fqeKKBqVSo<nQw2`*?ZZ&od4bXUNS#vvcA2&=6*Zx&Cc7sM6ye^
zwzkT;IjM0b*$yOOh}1P|N&KWyiK3_?yCB-h!72p;KG3)*CS#}6G%6Z%Dy!D%hdL6J
zh`A(9F~;6mkPbyXQjp3)#>|Rk%zjgorlf^-2elQXay}NznuBIuCCwDQnJXw6(!SIv
zi_r~MG^SKk-F>4-(2vrr%#7}VN^i>D+2ig=hBcGZeagvq-$F|U=>hNR<})#TGNYL^
zpT5`@q;g8SS<)zp;S<b5qv?E<9pZ4EQxd~B={09eoIy$U+!BL{L1a;yL6^i}BfkDj
zGYHvJ5`&4lX3$_y(v>cW!NvgGV2CS=!OBSp8W)3=ID<-Jurh9fxEY9aBH9vzmL4&v
zF+t>*AaYC)IVOl46GV;)BF6-gV}i&rLFAYqa!e38PYDUX{kbMruT|yt-Fwn#Y>F>l
ze11eGPP`lk0~FotMHK@%OiZ7ikaHTo@jk>=um3_P2jHanU9;LZ-UWTHf>>E3IB~oS
zVmM2SSiAGL_{OTZHf(JEFTOEB<j|DayQQzMS0*P;#O3j!XP=Ql4ba%!l-qai$?DBp
za^u&UtpEF;gh;T0AmZ&er(!XA^!4_}?;*~geLb!gG3kdUDo8=dnCZ!hSVE`Z!t?k`
zrC8Fn>U9Z)-~{dE0<vF+!wZ^C*fL&w<q?!1WKNzOw29ogW@LCsMvfegg{JdT3ifSi
zJ1K-r3PupVWDILrPzWq8S7kZpi(b>79s+aE<ism-Zt^wh&kTu>v>HJ15KNhkFEl&n
zK+Y$hU&)o@vRwUHKGkD4HXk%$G0dUJU?&Jc$R4-5jLboXbPA5Wy8J`SK2&%R#Y_-G
z+?ZBhSuiZ6nFDbb&Ymi)=x{75Hw<;iq_JZqc_CAppVoPexnKw)gT{`Hw!F?ZG2Nlh
z1=)B0jZ@pNZ`^EsR=VgqiiIEq9X&GC@){k2l)k>FANl!4rl*EVFUujP!eb){LH$mK
z{B`$1m-))q-?gp8;z}=*aqh8$<bs0l#bIu#60a%kl_##7Ju-Z_<@JWg`yV<X_zZHZ
zxNOyy$A~kZ?W9!qLGT&mR&j3CmUny>x2j_!ctLqpT%%wm6umsRC|Gr>IyQnA<W_NR
z)s}+hsoTrLFv#AEdm^g1y!E3Zk!%Dns0a*YXb~OPE<|3p0KL2rR#$@*^wEd!%U(d{
zEC;fx`q*Yr9_`kTSP4Q9)^YlK_qHs6Ro5@RTC$r)4gyqac}v&rfQWxIaOdi`nlTOX
zjzJMY2zuQ6ZSAl-OUW@o<d`6GybEH#X~Q?(1sxq85>^=QSMV-qn&3ImA{ZVd_AUr#
zDZ|6ME;w-*1kwCvDXw$yysFPfBJr%zb2{YWgkiZI%YIar94oWQF+t>*AaYC)IVOl4
z6GV;)BF6-gV}i&rLFAYqa!e385L6d~mAVPyrUpSPVzBZD1brh0D=U^k+*H#4Y<*of
z17a{yi=t>WEwe9+!A1rDq#1<lSr>zeQO%&ZiWB_<rM6`e4-1fkKcaL`l12E@0Go^a
zQq!191#P!_k}R4N!#8uO9MIB>(>LbDhB}{IRtF2&9Z}v<I@~SkrYuG`Sy4H!x;u-y
z*>8zmz;=_0M(!`%<_f}ml-RW4?%=_&HkH%>57Bl#NI!H@H}6TavM}}+2$@N~<3b|o
z0G*Rcx|!8@M~wXdBhzeA)@12OP)bJB8I6({J0Wcb%y%LtWk-UtsI0OyE4^`P%0k#h
mZj*WvD73Jgg9@!8yWl>5xA3nSRUaAv0000<MNUMnLSTa7@x-wJ

literal 2793
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

diff --git a/static/icon/huifangrenwu.png b/static/icon/huifangrenwu.png
new file mode 100644
index 0000000000000000000000000000000000000000..b3be6391653e602f8870d1458adf02c82f511552
GIT binary patch
literal 1174
zcmeAS@N?(olHy`uVBq!ia0vp^86eET1|(%=wk`xxoCO|{#S9E$svykh8Km+7D9BhG
z<nF|<?wrg^AcrO0(btiIVPik{pF~z5SKHIYF{Fa=?OfZ8;6#zO^SVi|6}E9S?YP7D
zXwep@<ys~OA1Q^%xR}?gna_4C$llG_v}|_tX0E0!50s|5UGQU7zT{{n!OrTMd1T>Q
zZyWWU+m{$-PMSUc{oWsT1yz@SU!L;&OO5^W-6r!~mPF{Nl^Cxw6wG07R#0N?tr2){
zx@q3?R8^)pZS~b6!Uf^UQ5uUwKS@RQT27ss|83DS7S^P+B|2?e{M}}WTn(6TYGcn#
z(KMgsC%q$s()LgOCc30Zj(hX6+e<=&R^2-|tEoxt?M^o*5B(FFDxo0@e>vDXzF%Tv
zq`ddATh+-|b8D|!H>LF!RrxFJ_+EWuvSZaD-@7^-g`Qr<nzD79wLPBx*cEy4L+g$s
zzZO2+V81HoQO>-_+=adt&vgP%El{Yo<8(|qu}S010!hV;DbMC7vPFLT;WR-bgN^qq
zYiMRXhg9>kW3zU&2!y!#Ug!`A@sfPP?U>rqv_bOA7G*82#-;uoCL%0+tc}i&4*~=%
zurt|N=4|DcPyKjxRZjkU4|Peaq6oct@{>0jFK3bb!Bh1!ZSCWtp0n}$Q!{_AUBIk=
zA}?k8jaxsJUu@uKV&BKV>e<7;)|dFc%h^n{ILO1)-gIE0LV*T{3>VY!pT&h{=PQ3D
zx$dj^e{(8lW{BVXFR59dVpcwSAhf*6=iK7f^nfHS%PaK(LEG0`O?|SZGx|yp_bQpg
zTD;Tl>J@5b)GF)0sQLTNIp&a~6LZY<*I;9THgv|C-VSrn_wPIHP+#wT{pN&wV*hhm
z&HRq&HRsIS6>8abHg%a^kN2I9xeLnFdfVBe#9vE&b9~_N)iE&4TYBw;u>WV$?lEUx
zohk_p8=%bDEq?=lO$oct%$X)&u~B%-R^i&eD`xwzEbG3(85I@RTe5h2=$ffjkKEp5
z6^40tN87HIy}=F*S3lOH8+YBwp2KBT_h!X{WPXEPM^-L)J$=%JNRtKoXWPcU66$cT
z7cb4*ysz=|NfxzdEot9P|1$qtFaKAy_n`(KFszV*4I5K9M4-v5v1!A}*$d_fgxJkq
zaNQ~3q+#=hlWp?b_N|=lsOa&;_PjJ-`_0cz7f#%oZqTe#ZPuz_xJEKW>S*V_4GYaS
zbF}xI+$bKmL;ZwOwMB33#OO~_Cj&0ztyDj;$Wn3LOzx)=)mepA3c5M3VvN@F8BMj`
z6P2D>oc@1>vEq{HPeRV!d^Pv$s+-|0!Z+e3UG=zT6%ah(t9zrbS^3@Lv$m!fu>EMS
zz25v~QRdw{lRlkjDiIT&#PzN))+Uqb?c|!fXR_`HT;g1lI&1B8)2Sw^8cUq6w6y6j
z5j~XTuuIZVQI~U-ORDM;n@iFYH|cQu6`dAo+R!*n_xTMDU2VZ1+~Kb^zph`+u@YE}
OFnGH9xvX<aXaWF*+5ZLr

literal 0
HcmV?d00001

diff --git a/static/icon/jieshuzixun.png b/static/icon/jieshuzixun.png
index 1e36edefe2cda242c39b146b115b443f0234e289..35d947cab0f9129f1e9cddf9a57858d1af7c0978 100644
GIT binary patch
literal 1547
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

literal 4352
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

diff --git a/static/icon/wenjuan.png b/static/icon/wenjuan.png
new file mode 100644
index 0000000000000000000000000000000000000000..73521c15d77010edef2ee47e83fc2b264c055bf3
GIT binary patch
literal 1135
zcmeAS@N?(olHy`uVBq!ia0vp^86eET1|(%=wk`xxoCO|{#S9E$svykh8Km+7D9BhG
z<nF|<?wrg^AcrO0(btiIVPik{pF~z5m&Mb?F{Fa=?cB3j!igen=S4OaDsJOw;+pj6
z(9|tX;jS4?+q{oz2dqEvjq6ri<4e&Q)&enM3k8q#vMR5O$yl7=7${YE@rbXDx^eI&
z6Z^^cKX2Q^KgZ8%=FKz4&wrnr+3&~va&pw#X&2AVIhM3#ZdX&s6jQIjnhP2%jsX+w
zII1iomd<EUm(q5U+#7UBBO_<UnxIRQg*dy8tnt)n<ME3V>UyQ+@igMt8gApX8&g!K
zOnF}t;O?mPe5FCQo3Eeh+HJo#EnSe|QN3=Wpb=k}RHSHV-oHh27kn2AOG~MVSUNrT
zp5?_o%2L-f(*L9^%C2uwmR!PabLp(H;=DCkYEK`<^Rcd+vn6kv=_Mzdjg=W{^ZKRQ
zEnXL2a@x~bea`ADPuHgOa1No%(_9PL)^a*7zE^)tGUeuEu_l*D<BTe$Dy_L<O~<C}
z+^DFh%rezd*hHIUY8Bhk)&)l1jyHT*tpu;O957O3k>X-%Z#uA0p+JK}28H>&$KvzP
z+w=C+Y*xNs|8JVtQZ0>`{bjDt^6#x^S6_Gj(YBDDla6UWzwOb<taxa4<ZaC#7X9NJ
zX20l8+bN#cbZ_N?$%m#r?tP+m;`6#UQ}@d6Kf)bW$Z4_SpRhjIrsI40v)aGPe}Av%
zkyW(mapCX!f7jGM&Rw=B`NHSGhO-K<?RUk-B>y^8xwAYy@x}AS4B993VuH>s?d$ef
zdd@3ItIyTJ-0!W-mq%A`|N3yX*K6ymThB|F%lM>3W(Nm6pBk4S%Ff5y=<N7l&MnK1
zS^<kU&2DELO@F@1T3s}&_Ckl`mi|O}lO(pc$v4<1Zgg;b5FlU?!=EI7MLvd~>tWS|
z4g5uoU|lC77J$QM9s5T9PmMsG532$=t~cLc|H^*7*(u^E$ci1DSzj9_%N+N;@YGxU
z>5_!^J|7PGUfA?_H+$95&#7X0O>fr4STRm|<Mv79$-isy+O2Qra(dKHn}6x&$5ng>
z%a|+q^4a1~^YER{!H5NT+z5w=HF?c!+Mqde!6Jc>eX|x^cM8xnYTlrE<bO_Wym_$G
z1PxY41L5g6XFFZcxY2LXtW*81Rl#tvWXSqQF7^>C&*~gf%rAQ5EbzW_Q%1OjcxCXV
z6UUnP<iEN^Zc#ikyEme*@JZyHx{1PkrSo!DHP<}uTW~ed>Q3%!HRY5!BBAHjKAZb?
zUYfmt*@nkU7EH|j>gw%iChuxyd8b!S`r4*I-h!UK*N#<}y7J__BO)g}OmYfaoPB4S
zgV2KFpeXa#Qv9tv%+fQj-A?sY?qoS?(h+sVgZpLck3<K(&KWc2v6wE}WF!<;wOQ!Y
rri97TL4Aj~bfeF0<XWpx`$4|leX_5F*SA_=`M}`m>gTe~DWM4fvFP$S

literal 0
HcmV?d00001

diff --git a/static/icon/xuanjiaowenzhang.png b/static/icon/xuanjiaowenzhang.png
index dffdb3734f15d82eddd1b83619eb4eaba2cc5e29..af9c3e51ee1dee512ffac806df0512b605c03582 100644
GIT binary patch
literal 1420
zcmaKs`#Tc~9LDFEW?~N8Vdq$CHP;C>m!?d+U{f2-Ei%ldBu5%?_QcLHTAOQT$X#P6
z3FVT9ZjKNZCbyKN+MXznTQ#R8Ir{PZ((`=Y@8@~nKj16yqPgp6{iX!~0CXs15`D{2
z-=n#0>+V3@zPcrF962B!05CB59yJObwX!v;#nashfW~3OyR8B|g{R^HfTrB-Uzr*J
zfCiF6!u$N8wpdO*6XXl;+jQhp3?zaK0;%|T7Qx6HIm4G=s$zToLN{5DGww92fK*)S
zJIiOq)^)KNcI_*YQN0ic9k_roMMwOio?*X-ff}QJ`Fd&zoPW^fetu1SMf{wqYoH@O
z#Gu2aVyg|`$LOu~udO8p*U9O$UZq!%c9oR`R#Yj0RhwIe>5|IJtmx*i)Gbai_d7{Y
z67xt}M8RmV$ivI(Eh0KBYojGyBwj+36}Dj~nR@XfBCq_`@uiwJE@}AEty=cTU}jCR
zAE;C-qqJ34qhKba`C4e``O=J|Oy<qT_hYIr*p8u5NoyuaJwqh}?{KQmFPFpofdk-W
zic(Lza*&J~x~qGTOQO;0ZqQk_$qzYE<4SiW714*q!XKOqAGVy(%&4AogqOfi!a6ja
zKt!X7)oYo%+&m#XQ>i|_J7u*#0m5_O&GV>1#yr0q?-8JOgU=pw5D^VEB|8%H5=hgw
z<D(#=y(t;{19ZEfCknJ08)p7_>!(q|R;(ZqJ03G{b?(Hin9h&MGTS+rtT~^Y`s~mz
zpJ2(a8U)*2Asxy-r{vev5sYW<E?ACpX`0Qw22j&-2d5={^IK=y&CZZix8M}EewzBm
zfqgh$YVbnZ=UmSm7yp?_%Xxb}h0&3gf^e=#-XQqc3s@J0hfmeN=#@UdIYRRUi_0))
zJ(&uD`;E%noa{FbB{o&X6{p__S$x?i>|SSNZ81Wh04-wU8x-}MDMm$|D!u0etyPIE
z16;tP!ViK#{TN{!ixsr(j!ZsT`6pB55sr$$L%{TrakPz~%CK%47N@vw)@1HDvzHO!
z3IR6?E-WY?<{&_>M>Bt>?Tn;Az?NL|zM)x@bHW#i&R3<#F3o7OzC0L_P)OuPy(t-Z
zb~!SmH@B$in{2W0=|$^HwT3<ERmEi*dEEuWy_rR&9#Sqs95@oX*{uUk&F?OW8^u^y
zpjrI)IKE@$Zl3PWIu1>G-6dCeKt;L!l+%$1#*$KmhmmHU<KlUA0Q>jza$*2(9;W2N
z_dfRL9KIQbu9NP=|BquxvONBIpt1R}Rfe-tcKX^y^~q(wNqYI?3I9f@r1#&CQ%ayJ
z(j!@Q=5?6-=vu!#D3%|w*{QRBZMOKsn*Jn5vr#wNY%Ys@1-HSAacNtC%NU|F4(QiI
zG7Xb?4r>b4#Fh$cLV=PzdH;8>mQUKT5Q`{A`zI3u5{@583Y;D|*D6$eEFYtR-MluA
zTVx~LF%;w>yJbz&p~P?#>%qmytmfH;6lRF!4Mb_CcMh2TV;~v@%qU3=H^Ez6<qHo~
zm2)3lyjtL!xoZYCliP5XY!4(tCFU7!jFJ>%o<qi0`ELG`7BwQYS|2}Q1!?Z`nHH0E
zkBGXn`xgb(d{0ndh@wa+;zC<76Hxaj2<_QHEH>h4P#NONCHwO@tPP~_eG+MCSon6S
z&W8=3iSSk2yYk{$w8J`e3eZ*xlfX)LL|O7Tj>U|X+y&{D-X@f(+l?eTldYZ56YI5+
z29LT3NX)8pEF~RAt`y}*`$_NGLVjvH+R`BYyTXTyI4`DA2D;{fj=$Pgx@A@G!7KUo
whoXyL0;8Lc$6P*9jW9F~3>s$g{CbSrL5oboS149Cd+T`uD6TY8BO#RgAKG+)c>n+a

literal 2708
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
O0000<MNUMnLSTZ<8!dwX

diff --git a/static/icon/zhaopian.png b/static/icon/zhaopian.png
index d31c0de5fe42f6d912a6880b6b8c42b37ff63388..6f55dffa75afce2d9a8be931282cf5b509a96344 100644
GIT binary patch
literal 1350
zcmeAS@N?(olHy`uVBq!ia0vp^86eET1|(%=wk`xxoCO|{#S9E$svykh8Km+7D9BhG
z<nF|<?wrg^AcrO0(btiIVPik{pF~z5_qL~tV@L(#+qu3OA>ks&&vP#|?7qa}y`b##
zCXKrx$%=VV!RZT1f(3SI=-&O3{B&Jf;EQu9!Cb9U;c21ATbq8kvN--ZaB+n+v)f{B
z!BUYPjVw12pF2m2@9nYnJNC0e`0<_pDgW$uRO-K1Zux%N^820YbhSpEiLI@zQ}V85
z-xkT={n*Xr)2*Vy-D`BESscTrIb1k#RO=|qpM|-r1Kbur*^;`ocg32ROS6SIyN>2e
zZj$))Ek$MFid{`1eXeIV7$i-bJx4?(H7hnGc*3chdOfqs&#v&2T2;1b(E^L5ve%{w
zUE*1`Woc;0zCSLej?<R}%$)cvacbPIKMC$X8!grb`hE61dcIDuTggNJN2vMkmLDk|
z%9&ScgGH7UIo+LeO^oYf=U3<2b@p1mg=XhCTYntuwNzfj(Y5&bHUX6?ovs*`T;V1+
zlYb?GDHnyg9F^7!Ub!rI-mBf|!V5F=X^(=O0wVL9ezh(Tat+X6nOetnXqokez6?hW
z9a*OZ3l$19IApk(+M5pGWZn}#f5xs>?RVe2Y1RDlr|;a^v*5$e<qLEEJ=1>q^8@q8
z&g)+lCV#%ajyWL7>*cGO__n(L2Un}C*UbC#q%y+tSohEAfhE6>tX`09Uet8%OtbqV
z;rF!xn*aZ8brtyWdH%*n`&=jbM;vW*c6{KlbcdIZkKgGdN3{cwZeLcul_xJkojKcn
zav5XPg(qK1Ef-Clm+W@jD=hTv+4HB5HI`oDb6CD(v-ompt9?R^VkQ3{z7{G!eSUWL
z?`iLDv1T|fRsOMYuY1?;>?-?7AR`{MZRM4X?{pC7Y>wh6DJ{zqHDAkmXtBm3AHTI)
z=eW8*28%DM+_L`btuTGH2d8r;Pu#L*Ugd`!7UgNhHILQxPfY$(Ja_89ps1;$#sOOo
zDHgxDA$?q3ZT*S+*59|}Br?i7y6xSP%3r@+Oz^78j?ee=WHNR->eaB!oRd+oO7pbb
zmZfWjpR0+-PPVLAlh?AN_28%Ki;ZGWo=ho@k^dASV`z3c!I;N$WA*m``}d~?$*ozC
zRU~8n{+!F|jb`E3HPo&I-P8Rm`NDx~mHP3IW~(=@i+A#`ENGf^DpF79>07@G?LV2k
z0yaOjSoi8u^;)e9>H$qP`y38GxlzHX`?Sz?YtLg57pX?{c;3VHD(b4{60<ng+B>_W
zE^IU}`U#Ax`TM+`-7jkWz56D%%<kjA&hEUaUvBZv;ooO&I6tH0|B8Bt+`nQTLGodR
z4*~=%L|FJ(LD7eksivXNGS!APak8;vuv5U!<fd~Rj;UROExy<OZvGm1w}jhKNu0%T
zzV_yF4oBte_!ySRFK4(M7x^n|ta{{9zUE4r$ioSSmfM7PC>M&{T+Mz{{HN-2-M1{F
z%c~w~NC`fgEvSAx!bE(zx?AhYbL!St9G87@2zaUGTmG$)Ra5b7ir3Scz`6~$a=v{(
z#F%4zGRr&MDll-uSNDy+%XXLdFWp)a!@S4w>{o@onXB{aCOf4%P7@b460v{0ie(bR
z+sRIMd9r`Io+wI~nYknC%9KeS6BfH%QOjL8!L492<6_Sv7E(eXU8lS}7hZZjy-6oq
q=84#e<7c^aqt9*R($)5UAo^+ZwpOLH=QV-F9)qW=pUXO@geCy|2xP|q

literal 2922
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
UhdRBrH2?qr07*qoM6N<$f@cJeB>(^b

diff --git a/static/tabbar/cart.png b/static/tabbar/cart.png
index 94bb532f75538a2c78433c7e5fe3bda1139a8a1b..398df21df375d8f66a1a22212e0c8d539ad91f94 100644
GIT binary patch
literal 685
zcmV;e0#f~nP)<h;3K|Lk000e1NJLTq001}u001}$1^@s6sD?Wp00009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0zyedK~#7F?V3+g
z!Y~xZUn-2c^9UZn8;B<nR}L%i&jwvsH?mPI3x{zfoJ6<*N8kvo92iPt9*RI5Oj=$8
z9p7)JGi@hn-`6x>^4b6}48t(V5w-;@{@X!rcUV@th40NdLW<r*%0~UR)UvK)Q>apF
z9_9hwCBPwU0V?SJ7~mwRminf$9$2tV;t-4lW5Tz}RMsf)vi4HkCUG+`rd<A`Vk(z2
z74TrEJiXlf((Q1xUkUuP0XPJ^Ne-m1UeME@lb&~Ms%P<v%A>`j5QOhq9D@BV9F6oA
zE12q8^+Ekcupt8fBKCugEih}az^r3*Q7Wz;UQdOX1Omh$lAix`bKV9AIBP*qM82~4
z1027EhyrkgGlAM<!8ik<f=wptu#3iJ=9XwEf0etgH5Vti(-bHTcO`GZnOj0k(sEaF
zff2~W4yi<vPvXf1N)Q(+&_2XOf*h!N_dpDJAFNlW-%DEhdA-j)R!i33gVuqEiLAo{
zsX!B%@5eWxq&O7#<*sSD<tm)zgR9&%ZMY9+9nL0fvCSe(P-hinEtoWm(4o#M$ONvF
zMd(mw6=VXFW)Z)yLpx5A^}$Vzb0&D0$T}=g$L7CyTHs$^h>3+j(OEp&*&RM7xzW1d
zgUtinEuWP=Q$4ebMzX6OLt%EPW*S9Rsi?lOfLn%3D+Q1!5)D%=V+)4kVc;@BwFP6c
zSrB9ti2ubW04Lid5@W%bY|6&^baz>67CjJUedUEiI%?~NqrG4gD?J#7Vg4VV1;oaK
TzMg<;00000NkvXXu0mjf)Mq0>

literal 1276
zcmV<Y1OxktP)<h;3K|Lk000e1NJLTq001li001Zm1^@s6g%ubV00001b5ch_0Itp)
z=>Px(wn;=mR9HvNm|tjHbri?Xx%Z|^Nt=o?20DBYMQ{%aRxS7bk{YZ;^Pu?9LZL;4
zsxSuAienaWkqHIsUS#?picYG+20ly(D<s~Pds7R8J%~PxDGW9dEfjaLlqR|Nm@{tV
zF5Y`{lm1D5kI6ab_sPlkch2v35cX)TuC69)wc0oUyaNCS0iZxc3#nAfYzF~#T~}mT
zeh3loY<46fE1gbXZYN-nZMj@NQI9tZ07;L{H2|0tLaavJ0}aFY7!h9u0L9M<5lfXy
zWhRr!aPYPlXV$juH;5?j=S)O5WLch7RrOqy;AooWKLC&jF|Hxvo0_J56eVD@jbRw4
z5OJm{v$vTsG$M{i$uwv9IwG>B!j>t7NVNl8EEW&M<8jvOktlu)ElJYbnx-v=*)#A-
zL_8iO3D@}#A;jHLHfEbbp|CHROnwajIRNO7>IVR8k|a&5s=5^9gG)<Gi9{kXg@{iz
zjEHDI06gh+k|gOaRaMucY;Kz7bBLIYV(VkGPDG1Bh%3Hl%I`y6*YA(TVpqN2A>!kj
zrd{d~V#nMtD3WQKe*pkzx>wdkMEo!eSZ|g^50GC81U3vKkBBFF0Md(Kg#k|@;#V!I
z$DaNkL_8M;`~)JN1%P|^lqz_$4I+9a4ER15_|YB#z9h@?L?EzR{J#Z&7kUJEUI;N4
z2+WYCX?_3zZ}kE&BC49E{TK>t7{<6Oi>@*w;$=<KZb>r~*stStiF{57G2ar{l|{EZ
z-Zey=Xj}_IGwcF)yW^c#6lHp3WW<V;VZ$)y-Royp)IdZNsZ{E}*GS6@8-~%%j`xeA
zC~70SkutopvZ6YU!yWG)Pl~tduix4(rkvydY}@vGqobog+;+`vwdwNm@&ol(H3L85
zvHctXzH8;%>GzJ~Y$4*+QmJ$!pU*pO0S9!vGeU@$ItAK}UrP-KbiB47rQ3mQE5mH;
z)A6iowfgW*L3raRisIC2H7k?J{OuP%QigS1KNyR}t~UkPt@j;k)^Z%@xZl(%60n=)
z3)^@Jck*X^Q!Eyz+dg!Som^Rb7B<1@geu5~h`y*-iJ6Xp-JxMtlBA<9w6v3e-dIGm
zF3a)}RaJj&-XpRk8jiZI-=Qc9k4|?DxWB)D-P_&Tt`ZFguE|3~L$47L&v_pNfSW|b
zbKW!Uj%E2ED~iGsqAB+u`waljTb8w$%jLM!`L4(rX4rv&fy0s{@x64PCmK&Tf3j`+
znRGh67DXn7LLoUgICvHjc^u}A#U1WgrBeAMlgaqD{>Z@Payd;z+@cQzK%I`q<FmuV
z!__e8d_FIYjg9fV<J|zeKiwfWUu*xjA_E(S@p64E%T>ZxyF|3YuUb`Ae-8uZGZ2f#
z_=i6oV8?a%s1V}xt^(J`S{EJ1nP?>oUDpR(;AcaA*fAl*!ghgM4OSMa)#_Z3_8ObJ
zk~jqbuLl6HIgT@#PNz%T0_Hm0*VlKLh)y;&4?Y~GWm(VXa=Ba2m{yAqT{4-x0056Q
zjl#BU+kSszV`CwxQbg7;L%3y)OWKs<IEN7NCIEa70AB_Tpo8E|(>w$KF9HBxQ}^>z
m-nQ+<&CShEv)SxMkl(*zcfv!ExM)lO0000<MNUMnLSTY30Y+Q^

diff --git a/static/tabbar/cart_selected.png b/static/tabbar/cart_selected.png
index 921aefbfbe140aa2614aee082ee12271087eb701..0288809102fda033a409ad78c82c82f6c2685c37 100644
GIT binary patch
literal 558
zcmV+}0@3}6P)<h;3K|Lk000e1NJLTq001}u001}$1^@s6sD?Wp00009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0mDf|K~#7F?V3+c
z!ax+pzgIEphH!))K~ErEatgfx=*pPjKQ`{r8|Wq6q9>3On4Z9}l&CzXBqT_pZz!*2
zO5Sflx_E^AIy2w&(E$v@FpT_=cV&kgQ5|h&Gy!g69WV`<zVFeiJ@|gbPw<Rm+U9|~
ziV+4We~uH}?xj*;1P=m}%WyY*XOPV*sZbW|ejOt$xfwC)la5p*3KB(a1PU=7N;UEb
zGWHQJO{u_Z4OSTwtU4yB#nA!b{haW2O70q^QJUao0yK8r=H<5Le#`#}aaBqajOU&?
zGSRZIHCS~vUa$sbvb5~C<aIW=`5iRr2)G_F9$%q~`UuX_a#@N>S9QTv5_0qbb<_n<
zo_IRlmL-$Rrl>aJoS^PR<yRNiTy&u$!@cNV2iqp9jtOcppOAS%C@-Z6&eFB0wET<G
zQnV;6MX}*nH{pwK7a^hDRj7?%-Y#Mh?XE&iQ1gEl&8|XCFmD&Ji1t2d`(V{E!K!0|
z?hWrVLWOB4m5722enFs2&&&wOBUp>>+-HjLNPP|j$%0oj;w?%LmSoCX<HV<Mxre^&
w%nV0uqV=4-;AtMXC6mo6cjI9ghG7)U4-Zy^y$*A_Bme*a07*qoM6N<$f_ek&$^ZZW

literal 2018
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
A@Bjb+

diff --git a/static/tabbar/center.png b/static/tabbar/center.png
index 8b7da3770824c1fc2bd907302eda4fd182553ce1..c5e0a9fcffdb3ef5a4ff97dcf0a611bd0d66a1d2 100644
GIT binary patch
literal 586
zcmV-Q0=4~#P)<h;3K|Lk000e1NJLTq001}u001}$1^@s6sD?Wp00009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0pCePK~#7F?V3+c
z!ax+p-;@$`=Mgx9HxN%kT^Uvsbb~Ie8@usOSs3C<If-xsj=&LEnKqP;^Ndw&GDDS-
z&Lr=bG@+f3m-n?Zk71?&1VIqQ-(i~se(-$YHsY@M*!nywhjBJraX!4i?7VE$sv7-p
z)T{%%a)2fnh)90E1UQZcow-cor~;U54#C_oN9<)XjnrU2eDq8<mxDRF^*3ME?#db*
zsC7TS{vB$ZCi{LAoGhS1aM-xO1JOa-Ul$$cNTyeGQGU37mI4c^HizJNOOvGd#9A`F
zatsy&gCRsguk?*BZO~T8pzV-B+aZItLk4Y!4B8GEv>h^NJ8oIwc{t)=A=E`}hsI#e
z?Vz)96?~VJtqIgcZHElzsMh~?4X$pN)hZ0K$@*EX5kLGU@PC0fT5Pyn{k+O&GQGTt
zW_&8_xAId_LOmh&MD>DdiJ@3Nvy2U8YUvY9mvJNl&B1UmN7Y8C)F7_^uf*n}$tE#3
z%u%H&_2b<SN1g+$TikJ~kcl{^X|flYu;WD#gdA=E5YBF%+KjCt5pt^;555|baVNOD
zI30rqw9Q2wmId3IL-4H$#<B=Bq0L|hT-#h#nABGKwHf5VdO9Wr9QZ=SxdwtD2*Lo~
Y0n|8(Y%S2hr2qf`07*qoM6N<$f+$M-Qvd(}

literal 1081
zcmV-91jhS`P)<h;3K|Lk000e1NJLTq001li001Zm1^@s6g%ubV00001b5ch_0Itp)
z=>Px&^GQTOR9HvtnN4U^R}{z3xpNaCnT$}-P!JSsRt+u!!X$Iwi?gbvJ3*nK5HQ^c
zr5_+PV(CB&f?xw8E-HdjSBhlSfe=FEeUNNgXs8RJg_H(d6j}(AMM&N~&XJd495b1B
z-n;|~-eu<8|M|T?_v4%!gf2%IhQma31`*E^(T4zVf+dM)4H5r9#Mvl{p1H2O(q*dG
z(=n~c^73+Fdwcsb5q*k?9{@m48?9{s_>+hp5Yc_tb^l45Gc|A+h9`;WCjc0gBuB(w
z0pRld{QOF#Qn8Y`JF#MimzI`JL{W4H06tEW5CDEb#K}^r^n055BH(JZdZ<t+EJ~ei
z1!Jdkxm>weEUrtTMZjSgUW}K5G|z7FUm0U&q(X^-<E8Kz08UGjw29|a<AO2fg+wng
za1aC&0KmZgk_3CiZW7TY$8nxW^d!JH0pO}cJVES3W6WfNxJF1~V9)b@R!XtUS&qOM
z<46P(1N*-J3=zjA;t67(8)JqO#K|50-vI|fz&G1Pi5m%GXN@uE62!?J_B`)PrPL1+
z@lLUb_<gBV`leG{^Y4k*a2STCiHMK2*VR}C<0TPYa2zL)Xe9=oo15#;=kxc7=o3kT
zJz{5-Qd47NWB*F@5(Bg7;^N}5o}M1AxQ<AY>=Mg0#F#PWxl~64%;G^1OxNr4Zvo(t
zG+7+aH{6WlIIJTcVqmV=^7;G~rPOyRuIWu{?R2eHyE`#4u_>la+i}EY<|GkaN5o?Z
z6Th_9&eUqP+i77rkJ#a6xN5ap7#JA1iil?bfN!h<0H`>II|^Q_T#YSlZEf8um&<Dj
zKdx<9SHST`)VW;lh*D~p-L}>q=f5kZ{^CZoeyY4!SXfv~+Y+^scLc6fDr$Uu{5`Gp
zaivthwRXqBZq4G4+K8fPHHxDD%H=XQs~yLlz<iAL_V#{Ztv!W^C*w_)8F0N^-2i}9
zB3ePjACnw&y8?Tj_dX)>hT__R*X2PBJ~f_bt*48{V%xR;7BII$*4mpybp9YHTXPW6
z91&e}U6(JYx5gX5?5tAiX}4W*w;#%zRcq~xj*hOj-E{HU%9labZBSbN2U_dTTb}|N
z4tt*Wky46l-fruJw1BPi*6U7BwKk~@;2;QY0KnH-Wy?tCkul~{vsN?kZvb#AqeNNB
ztk)k~4z~lYr6^{y0&A<IwLaXuj+-5(eb1gEL0@0r(UFmn#uM#3;1nkAIpv+hSv%UQ
z*VbX*_x~1j5BtrzqrW~lICykuXsFRnH8!2^`&ST=FOP$&&N_YcM%=8v@zBx$=Kl&s
zQ8YzFp8){(X}Xi*KK;&xJeQYul~VUx-z{DN-gI#|d>~8{00000NkvXXu0mjf-KzmT

diff --git a/static/tabbar/center_selected.png b/static/tabbar/center_selected.png
index 8a1d755cc922a925b65633d52c51c2a15fbedd8b..602768a5176dd98c4f7af4a2662cee53e2615f2e 100644
GIT binary patch
literal 519
zcmeAS@N?(olHy`uVBq!ia0vp^79h;Q1|(OsS<3+_&H|6fVg?2=RS;(M3{v?36l5$8
za(7}_cTVOdki(Mh=<CS9u(6-}Pa-Q&ZjPsmV@L(#+nbJlha5!M9{d;W*<~oR(EWn2
z$MiW&`3!IFEKraxf5H1iDDR^13&Cd`v0hi~(hctZyw&M*h^O*?(}XjNPoAH>?K0nj
zDM7FPuh^P&X73vw<+Lx1@08hm-uv9|k0_ac%WF1sT(O_~o^AJwj-34PeA$7&D<^Vo
zS{CmvcWxuEMcnR4HPI7{%j3g4tYdVKN19G!JKErKlcQ5%nRlkoJB7zGFJE{w_db81
zc%fnCWejBfqapVGp@*!AmJC(uH?)J9KAR?geHQ-y?!nth{~yk|vo9`+@7DdYYkQcF
z39JjN`*FRBeU8oNvZ^<;xt}jvp}+CE$=W~tLX2@K^=TJxySy?<cs1)@&VB{aGHYKc
zA!ef=qMbM1iE=&RE8EQeJ5#{^@)kiY_BnwkWwiv#Jr2+Hy%_Rf`-<Y~);YZ$k8Tt`
zdi(X@Jg2;AH{BdGMRotH9~YY|Ef;p?-L*@H^LT{M7PxD(2;{6xJA8ISwT1ff`}SHL
z6S6M~Jj^<%_xB)^(JIbEI$U1WYb>V(dAUAd-yxY5T&1pc7Z`60p00i_>zopr0ODoj
AZ2$lO

literal 1826
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
Q9{>OV07*qoM6N<$f``U;bN~PV

diff --git a/static/tabbar/home.png b/static/tabbar/home.png
index 7e5e6dfcd6c606cb406e94c324afd10b795a64a1..735f995588b6a769b8d4226a950895077bc7cb81 100644
GIT binary patch
literal 1538
zcmV+d2L1VoP)<h;3K|Lk000e1NJLTq001}u001}$1^@s6sD?Wp00009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH1(!)gK~#7F?OAP3
z8%G#^XS@!M)E~Y<=?P*^P;&z439x@vCaPk<R5DS8tu{DnAs9tKB2~hipw0={o&e_r
zxHs^RO2K${-_AR0s@>Vy4|{DukspZ<k7sA+nfLo0fCUy<V1Wgu2ZI@-+PKIYnSTqA
z$rO<B7aXAg4D$%Eth~4{#`=u00Xoj#VB5XJUw$%S#+V5~N$S~`5-_#~fCaH^9;S!s
zIB@BVa@}^LJb;u)MNkr3x_u=`Ra27E00#)HYXdaf^-3S6#8d?5OH2cXZ424SG(;yR
zSo`&Tkr~E?YE#OheFxwZ2d6j6Ko4v_fMIUnRk>>GeA%Ei5QVJ*srC0PW=-3H=DXLG
z4orZF2-e<yI2IeK>b^svQViIM1<;vRrN*R7;_x;i$Tkk^l_n%aB7$R;{7d{>RKFun
zh*O+w9JX8MC9%1E9Z}(VyQABsauO#LOOVKApAD~&k#`KBX$^DjS$MlJ)LQ2a@n>Hh
zXUKY^yQS5*cXNnAHuvR1B}Y=TGR}%nmBu{D5$GL4?Z2aU`t~69l+6t<;+~HrSZjUU
zM`Y{ZU%4k-_iFp+mpynOkWJG&10)gGg@pH`o()yevBBT?79>wb<Wj_?G^jR?^O>dG
zb<i%Y)x)|z3ksEB7U0VJ`LW3n+KsJ&D@jz$!U&b3mf&{lw4}y4@|2HB?jCXv2xVos
zSZlp6>gIF(U}nSnS&;3_It--2(cWfPSeNM^)k`rzkZey-DtgB#AA~0dRQFV*kfzS!
z!2zeJ44F?sHC2f4VX9J;6^()bLB=v`z5&Ef@Kk}0Z*R!h3w276ASy1H*$)=)CI(}^
zy>U${86b$@EPFp&!*8A}L2G#H+naEP@ixem`flE-SQ=1VREFXSer?dGs6R{C`R&hd
z;fcZxX+8wB%}@sz@V?tP8iU`hh~NJ}LhKxT++fUZ3soP8WccK8Z?hdWfA{T&SBOr7
z<~zt6M|(eBLP8jpaEN{e0e=ycAUdCY6Oa{Q0&wOus81tPJ;siATjw|1Z_Z2VJZgQ2
zO5jQyLi>I`V@`XLccB5kN=L0W2u5&&Xo_yu|EU^sp#QaP3LPB4Jo6MOv~kYiqSiV)
z7DUD;tZyx%M#Z8aq_c*;1%fd<Ai>e_uB+H#J}i;dK^)FjFxw|cLPhsSM~>Qr$x}jI
zL15oKH`RFog3|Re?wiOkdkhKju3qWbz*fYD6Wfx2Nzc%;Ngv1n_a)a<5a>dhHcT+#
z9DEOp_CW36EU}tW?s`<;EV-=)ywusoSYq@ZQLI)bsxxJ$L6u&J^g}E9oz_{0d2G=|
zc;y_2>hGro!{$;o1@ZpWtwnd8Yws9I@2FlW>*j~IEM$9N=|;(H24Zt7kJhq~Z4|ur
z+HhQ_AvBYbwiv9O^VG`NeREoX2ZofKLQVqtR@8w<rfP2G?ALA5edPQ)uA4PWP%_}E
zrRsg1rbrCBQO_poY=<>p1x%r`<$0-WR7ai29oAnq;?_ufHxWTn8hP4lE)`^NWDfdE
zo@C?*6J5US9GtCF`W108;$B|zbZw6N{8Uv*nLuEs9H*9EOniMtCz}Cm1Vcz*;XYN|
zXxpEe8wY!TypHaM%X<*IDp0%W1kq8q82&Kn!A*U`8+H2=0+RxI*q32a19y`rqhW5U
zdyv$3^hA_PY5H4@8fXbpRRM<VX%^M*<eeizGp^){LTZBdAl0R&PXt*X!6;()^Jn3q
zXGTzk%w2^;@(h_^Sxv}h*F?Lo6n3{i3#oZwz`S6K+Rwi_NvtSpHV8Xc8E%Hpw`SSs
znjgW*V2YpSk?dB_7LP{IEsEJCcbraK_(+2XCFqjkU23^g_5Bb%*SQh24CrUUk=2NU
oY+#F^->z@=VSxn}Sm0~Ie{pP^+l*DZL;wH)07*qoM6N<$f<IEw`Tzg`

literal 884
zcmV-)1B?8LP)<h;3K|Lk000e1NJLTq001li001Zm1^@s6g%ubV00001b5ch_0Itp)
z=>Px&E=fc|R9HvtnNMibP#nj9zr4^1b;XN^!486m;4bQ^E-&38j7q_s+({3@E}|f)
zC^{WP{4){UKtxZ1;$X@^VM4JN(<bR0h)2c24kE%1-a2|{ZTqtsZRtvF(j<indDp!6
z`+f4|oA-P9Jp`YIrfI{XC{7B3Fik`w08j#eZ$$J40G4H0{^>_5^dpF_>w6LL6(WuU
zz(7mPKLC)fR4S)qvDj~~`8)%gra1`!_p2&es&*Pbi0HB`%kR8Ey9U-YO%z4(Bmg`{
z#9=28MD&X>cCk<>yjK*(vP{>*6>ut*3WvktI{<LLjRou=3IOmlpU=<6<MF)R<ksh1
z1M9jz#2C9pMAI%{>-h_a_`F;$-;Kp$o83S=23A#7n3$M21OP9I=x8@dI?VmV7@JO|
zQtPU!R-D9i44lbijx)v{0l;A=fxDRVrCcsw8yg$@=wyv8u%>CdL!r<V5k2!@0Xvo)
zB3@vOtwf{IT&Kylz@};5t9@L1?6P`%Zb8pWl62b@a5kIWUsZIDh^9P(bi4d50L*aC
z*V`>@t8lH%E+JwR0K{%HdYoTE#7wbRJf|qihV8bty1F`5sZ<^Uz&?+OJuSD2j35YC
zB}sbS9H^nNRk=c;&?zFC2Y?|@+5B6)iHI}BVsWuv85_XaZ1yY>Jpq8QfBAfgw7r8!
zlC)?=YXF<3sZ~!^)@iFBN1Ai4v;tE<lGd0Cobz4(6EJYjx82ZeiGEf%0PeZ{155N;
z;y~d*;T8n~OEd|RCZY@?4j|$YB8vNAmtH8mNkms<Szc-eGz`P~W0`l_Z28yA^#XVy
zm&@HqBobDmq%o4o<Uk}6nFD}JUX=D7SP+C0qobp#c2K&m#|1(7&{x1!-zu^!r`tgp
zhB1za)_L3Y@Lk~mxYzq|ps)jlzXQNQw_in%72e>SAK3AWWEh5uh&SDKdU^<4BBBSf
zEYI!$wk}o}W2&1*wbiBB+S(dPBob{qkI7^*GB`N+)kU?dH@?;Sh0c!N+S=M$q*N+d
zrSuE{9CO%Swf5cx&iP6wJJl|4uGiw)InSz=pAm7HG4`Ul1^X9&eT6s_jv5dE0000<
KMNUMnLSTZa8kC#>

diff --git a/static/tabbar/home_selected.png b/static/tabbar/home_selected.png
index 667db627e434812ca1538209c99374447fff1232..e65c1013b494e59490d62b8c0aebaa0db903a3a4 100644
GIT binary patch
literal 1003
zcmV<H0~Gv;P)<h;3K|Lk000e1NJLTq001}u001}$1^@s6sD?Wp00009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH1As|HK~#7F?V7z(
z6Hye$|7Uk`)ES+Wmdg{E*ijKmZ7@#|@CAZa4ih8@I(ET^R(JxjvXk%x#LCWDJ1fnM
zjYxKn=Wb+(A^UZ+n=HD&86YHgv-h9#aqm4RKtVx4K|#U)3n2^Ef0bdHRRhLdW|ZYF
zC4lXbTRZYg{qz{#G1%*3XRd>kNl#$&tZI<8%-|LIuLM0D0(Cs@AEYIAa)BHD6@pn8
z3ssRWj#zdJ+txlNKwqF(OoX-N9m>cShuwY+FRyi>fdLJSO>PsJM^g}|u*tMejAy(F
z4U$>#DcfZ6+bIdV45Q2a(;8mgaN=GPU!W2<$4BzW#%yu;>~txv$an(tBkmlBe^3Rx
z)QcJzD+Wbe8~G8Zu<4eBN(>?eN^m#i&qL&oDmL7;s6pW_I&jSs=r7z^(-T*n4|CN}
z3mS7!sX4FW6eZmDLai7okkj9tqz*APu*QK#2o~7vtGKg~e@eLN2Ih!Bfd-k&xGI?D
zV$e&00-1O=yA=(HgLhWJF3MNJJqOU}S@VLhB$MatIf_P-`9}y5=$90(3K|PNvjYw4
z6~ec5!sjQ1#zOS?#=^z;dIefA5O^34&Z6Lt&|q^(0^+(Xpb{1B`@s{h+Q5fLBxC*_
zuLTFs)e64KJCp^cfrO~Z4x=XirZy1L{W^HAeCP5wMeipxQF9$n=to8y-ghL-rgd47
z+7D=~fH0J}$L|>jCrFCJ+s1s*i{X1w=GREbfkeZ-JvC8|eND#!DtlVu;8)&42zUAx
zm&o;xOExr6?x|vOai09g!zhcX58?0=aO^;rQ0pn8qgs^*RRwKA?heJBBT4;BWU(O{
zX0L`F>o9CgytLJHTSTN)w#y3HD{tYs*@_w$J1-kecb|#s$N`cYq_l6Y#2K4t;mL!@
zB;pi__M)D=vD{z_Gs4g63B)P%whn&7#ZWP6V><LCp{zzFlyT@cUs`eo>w7BsWbLvJ
zn^MVc#V^+nGkN>$LZ~Wnq<V(*<IOVG&?4<cCEX6MxUPitGO42MWMX^lNvyvxcQGN^
zw6GN|X=C>dTNSVVbbVtXE$<Gj(^XxU93?w}=fvL$In3^A+I{*wlq`B`>0wj4MHzev
z!NQF2U6J@5Ok*D{BZZymc%~|l)z?N?M5zO62G$x!_5v+S+Rknbmf4vk-4_%T6ciL>
Zz;81<ItqW&A~gU2002ovPDHLkV1f=D!}|aL

literal 2000
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