Merge branch 'milestone-20251031-简版功能开发' of http://39.101.133.168:8807/qimaohong/deepChartVueApp into milestone-20251031-简版功能开发

api/deepExploration/deepExploration.js

@@ -73,3 +73,16 @@ export const getModel4Second = (data) => {
 	data
   })
 }
+
+
+
+//历史记录列表
+export const RecordListApi = (data) => {
+  return http({
+    method: 'POST',
+    url: '/api/coze/mainForceList',
+    data:data
+  })
+}
+
+

components/deepExploration_header.vue

@@ -1,52 +1,81 @@
 <template>
   <view class="titleContent">
     <view class="left">
-			<uni-icons @click="handleBack" type="back" size="23" color="#111"></uni-icons>
+      <uni-icons
+        @click="handleBack"
+        type="back"
+        size="23"
+        color="#111"
+      ></uni-icons>
     </view>
     <view class="title">深度探索</view>
     <view class="right">
-			<image class="notice" src="/static/deepExploration-images/notice.png" mode="aspectFill"></image>
-			<image @click="handleHistory" class="history" src="/static/deepExploration-images/history.png"
-				mode="aspectFill"></image>
+      <image
+        class="notice"
+        src="/static/deepExploration-images/notice.png"
+        mode="aspectFill"
+      ></image>
+      <image
+        @click="openHistoryDrawer"
+        class="history"
+        src="/static/deepExploration-images/history.png"
+        mode="aspectFill"
+      ></image>
     </view>
   </view>
 
-	
-
   <view class="drawer-overlay" v-show="showHistoryDrawer"></view>
 
-	<view class="drawer-panel" v-show="showHistoryDrawer" @click.stop @touchmove.stop.prevent
-		:style="{ transform: 'translateY(' + drawerOffsetY + 'px)' }">
+  <view
+    class="drawer-panel"
+    v-show="showHistoryDrawer"
+    @click.stop
+    @touchmove.stop.prevent
+    :style="{ transform: 'translateY(' + drawerOffsetY + 'px)' }"
+  >
     <view class="drawer-header">
       <text class="drawer-title">历史对话</text>
       <view class="drawer-actions">
         <view class="delete-all-container">
-					<image class="delete-icon" src="/static/deepExploration-images/delete.png"></image>
+          <image
+            class="delete-icon"
+            src="/static/icons/Group_48095481.svg"
+          ></image>
           <text class="delete-all" @click="clearAllHistory">删除全部</text>
         </view>
-				<view class="drawer-close" @click="closeHistoryDrawer">
-					<image src="/static/deepExploration-images/close.png" mode="aspectFill"></image>
-				</view>
+        <view class="drawer-close" @click="onDrawerBackClick"
+          ><text class="drawer-close-icon"></text
+        ></view>
       </view>
     </view>
     <scroll-view scroll-y="true" class="drawer-content">
       <view class="drawer-inner">
-				<view v-if="historyList.length === 0" class="empty-history">
+        <view v-if="groupedHistory.length === 0" class="empty-history">
           <text>暂无历史记录</text>
         </view>
-				<view v-for="(section, sIdx) in historyList" :key="sIdx" class="history-section">
+        <view
+          v-for="(section, sIdx) in groupedHistory"
+          :key="sIdx"
+          class="history-section"
+        >
           <text class="section-title">{{ section.title }}</text>
-					<view v-for="(item, idx) in section.items" :key="idx" class="history-item">
+          <view
+            v-for="(item, idx) in section.items"
+            :key="idx"
+            class="history-item"
+          >
             <view class="history-left">
-							<view class="flag-circle">
-									<image :src="item.icon" mode="aspectFill"></image>
-								</view>
+              <view class="flag-circle"
+                ><text class="flag-emoji">🇺🇸</text></view
+              >
             </view>
             <view class="history-main" @click="itemClick(item)">
               <text class="history-query">{{ item.stockName }}</text>
               <text class="history-query">（{{ item.stockCode }}）</text>
             </view>
-						<text class="history-time">{{ item.createdTime }}</text>
+            <text class="history-time">{{
+              formatTimeForHistory(item.createdTime)
+            }}</text>
           </view>
         </view>
       </view>
@@ -55,54 +84,71 @@
 </template>
 
 <script setup>
-	import {
-		ref,
-		onMounted
-	} from 'vue'
+import { RecordListApi } from "../api/deepExploration/deepExploration";
+import { ref, onMounted, computed } from "vue";
 
-	const props = defineProps({
+const props = defineProps({
   name: {
     type: String,
-			default: ''
-		}
-	})
-	const showHistoryDrawer = ref(false)
-	const drawerOffsetY = ref(0); 
-	const handleHistory = () => {
-		showHistoryDrawer.value = true
+    default: "",
+  },
+});
+const showHistoryDrawer = ref(false);
+const drawerOffsetY = ref(0);
+// const handleHistory = () => {
+//   showHistoryDrawer.value = true;
+// };
+
+// 历史记录
+const openHistoryDrawer = async () => {
+  const res = await RecordListApi({
+    model: 1,
+  });
+
+  if (res.code === 200) {
+    historyList.value = res.data;
   }
 
-	const clearAllHistory = () => {
-		uni.setStorageSync("search_history", []);
-	};
+  console.log("historyList.value", historyList.value);
 
+  const hideDistance = uni.upx2px(900);
+  drawerOffsetY.value = hideDistance;
+  showHistoryDrawer.value = true;
+  setTimeout(() => {
+    drawerOffsetY.value = 0;
+  }, 10);
+};
 
+const clearAllHistory = () => {
+  searchHistory.value = [];
 
-	//返回上一页
-	const handleBack = ()=>{
-		uni.navigateBack()
-	}
+  //   uni.setStorageSync("search_history", []);
+};
 
-	const closeHistoryDrawer = () => {
-		showHistoryDrawer.value = false;
-	};
-	// const onDrawerBackClick = () => {
-	//   const hideDistance = uni.upx2px(900);
-	//   drawerOffsetY.value = hideDistance;
-	//   setTimeout(() => {
-	//     closeHistoryDrawer();
-	//     drawerOffsetY.value = 0;
-	//   }, 180);
-	// };
+//返回上一页
+const handleBack = () => {
+  uni.navigateBack();
+};
 
-	// 历史记录详情
-	async function itemClick(item) {
+const closeHistoryDrawer = () => {
+  showHistoryDrawer.value = false;
+};
+const onDrawerBackClick = () => {
+  const hideDistance = uni.upx2px(900);
+  drawerOffsetY.value = hideDistance;
+  setTimeout(() => {
+    closeHistoryDrawer();
+    drawerOffsetY.value = 0;
+  }, 180);
+};
+
+// 历史记录详情
+async function itemClick(item) {
   //   const res = await postHistoryDetail({
   //     recordId: item.id,
   //     parentId: item.parentId,
   //     model: 5,
   //   });
-
   //   if (res.code == 200) {
   //     const message = res.data.wokeFlowData.One.markdown;
   //     messages.value = [];
@@ -114,46 +160,131 @@
   //     };
   //     messages.value.push(botMsg);
   //   }
-	}
-	const historyList = ref([{
+}
+const historyList = ref([
+  {
     title: "今天", // 分组标题（如“今天”“昨天”“更早”）
-			items: [{
-
-					icon: '/static/deepExploration-images/Americle.png',
+    items: [
+      {
+        icon: "/static/deepExploration-images/Americle.png",
         stockName: "TechCore", // 股票名称
         stockCode: "600001", // 6位数字股票代码
-					createdTime: "14:35" // 时间格式（时:分）
+        createdTime: "14:35", // 时间格式（时:分）
       },
       {
-					icon: '/static/deepExploration-images/Americle.png',
+        icon: "/static/deepExploration-images/Americle.png",
         stockName: "MediaLink",
         stockCode: "600002",
-					createdTime: "10:12"
-				}
-			]
+        createdTime: "10:12",
+      },
+    ],
   },
   {
     title: "昨天",
-			items: [{
-				icon: '/static/deepExploration-images/Americle.png',
+    items: [
+      {
+        icon: "/static/deepExploration-images/Americle.png",
         stockName: "FinServ",
         stockCode: "600003",
-				createdTime: "09:48"
-			}]
-		}
-	]);
-	
-	onMounted(() => {
-
-	})
+        createdTime: "09:48",
+      },
+    ],
+  },
+]);
+
+// 为历史记录格式化时间：YYYY-MM-DD HH:mm
+const formatTimeForHistory = (timeString) => {
+  // 假设 timeString 格式为 "YYYY-MM-DD HH:mm:ss"
+  const parts = timeString.split(" ");
+  if (parts.length >= 2) {
+    const datePart = parts[0];
+    const timePart = parts[1];
+    const timeParts = timePart.split(":");
+    if (timeParts.length >= 2) {
+      return `${datePart} ${timeParts[0]}:${timeParts[1]}`;
+    }
+  }
+  return timeString;
+};
+
+// 历史分组（今天/昨天/近一周/按月）
+const groupedHistory = computed(() => {
+  const sections = [];
+
+  // 从缓存获取今天日期，如果没有则使用当前日期
+  const now = new Date();
+
+  const startOfDay = (d) =>
+    new Date(d.getFullYear(), d.getMonth(), d.getDate());
+  const isSameDay = (a, b) =>
+    startOfDay(a).getTime() === startOfDay(b).getTime();
+  const isYesterday = (d) => {
+    const y = new Date(now.getFullYear(), now.getMonth(), now.getDate() - 1);
+    return isSameDay(d, y);
+  };
+  const isToday = (d) => isSameDay(d, now);
+  const withinLast7Days = (d) => {
+    const seven = new Date(
+      now.getFullYear(),
+      now.getMonth(),
+      now.getDate() - 7
+    );
+    return d >= seven && !isToday(d) && !isYesterday(d);
+  };
+  const monthLabel = (d) => `${d.getMonth() + 1}月`;
+
+  const today = [];
+  const yesterday = [];
+  const last7 = [];
+  const byMonth = new Map();
+
+  // 使用 historyList.value 替代 searchHistory.value
+  historyList.value.forEach((item) => {
+    // 根据你的数据结构，使用 createdTime 字段
+    const dt = new Date(item.createdTime);
+    if (isToday(dt)) {
+      today.push(item);
+    } else if (isYesterday(dt)) {
+      yesterday.push(item);
+    } else if (withinLast7Days(dt)) {
+      last7.push(item);
+    } else {
+      const year = dt.getFullYear();
+      const month = dt.getMonth() + 1;
+      const key = `${year}-${month}`;
+      if (!byMonth.has(key))
+        byMonth.set(key, {
+          title: `${year}年${month}月`,
+          year,
+          month,
+          items: [],
+        });
+      byMonth.get(key).items.push(item);
+    }
+  });
+
+  if (today.length) sections.push({ title: "今天", items: today });
+  if (yesterday.length) sections.push({ title: "昨天", items: yesterday });
+  if (last7.length) sections.push({ title: "近一周", items: last7 });
+
+  const monthSections = Array.from(byMonth.values()).sort((a, b) => {
+    if (a.year !== b.year) return b.year - a.year;
+    return b.month - a.month; // 月份倒序，如 10月 在 9月 之前
+  });
+  sections.push(...monthSections);
+
+  return sections;
+});
+
+onMounted(() => {});
 </script>
 
 <style scoped lang="scss">
-	* {
+* {
   box-sizing: border-box;
-	}
+}
 
-	.titleContent {
+.titleContent {
   display: flex;
   align-items: center;
   justify-content: space-between;
@@ -177,7 +308,6 @@
     font-style: normal;
     font-weight: 400;
     line-height: 25px;
-
   }
 
   .right {
@@ -197,12 +327,10 @@
       align-items: center;
     }
   }
-	}
-
+}
 
-
-	/* 搜索历史侧拉框样式 */
-	.drawer-overlay {
+/* 搜索历史侧拉框样式 */
+.drawer-overlay {
   position: fixed;
   left: 0;
   top: 0;
@@ -210,9 +338,9 @@
   bottom: 0;
   background-color: rgba(0, 0, 0, 0.35);
   z-index: 900;
-	}
+}
 
-	.drawer-panel {
+.drawer-panel {
   position: fixed;
   left: 0;
   right: 0;
@@ -228,9 +356,9 @@
   border-top-left-radius: 20rpx;
   border-top-right-radius: 20rpx;
   transition: transform 0.22s ease;
-	}
+}
 
-	.drawer-back {
+.drawer-back {
   position: absolute;
   left: 50%;
   top: -14px;
@@ -243,35 +371,36 @@
   display: flex;
   align-items: center;
   justify-content: center;
-	}
+}
 
-	.drawer-back-icon {
+.drawer-back-icon {
   font-size: 16px;
   color: #8a8a8a;
-	}
+}
 
-	.drawer-actions {
+.drawer-actions {
   display: flex;
   align-items: center;
   gap: 40rpx;
-	}
+}
 
-	.delete-all-container {
+.delete-all-container {
   display: flex;
   align-items: center;
   gap: 14rpx;
-	}
+}
 
-	.delete-icon {
+.delete-icon {
   width: 28rpx;
   height: 32rpx;
-	}
+}
 
-	.delete-all {
+.delete-all {
   font-size: 28rpx;
-	}
+}
 
-	.drawer-close {
+.drawer-close {
+  background: url("../static/icons/关闭2.svg");
   width: 48rpx;
   height: 48rpx;
   border-radius: 24rpx;
@@ -285,24 +414,23 @@
     width: 100%;
     height: 100%;
   }
-	}
+}
 
-
-	.drawer-header {
+.drawer-header {
   display: flex;
   align-items: center;
   justify-content: space-between;
   padding: 52rpx 28rpx 0rpx 28rpx;
   /* border-bottom: 2rpx solid #f0f0f0; */
-	}
+}
 
-	.drawer-title {
+.drawer-title {
   font-size: 32rpx;
   font-weight: 600;
   color: #333333;
-	}
+}
 
-	.drawer-content {
+.drawer-content {
   flex: 1;
   min-height: 0;
   /* 让 flex 子元素可在容器内收缩以启用滚动 */
@@ -313,39 +441,39 @@
   /* iOS 惯性滚动 */
   touch-action: pan-y;
   /* 优化触控滚动，仅垂直 */
-	}
+}
 
-	.drawer-inner {
+.drawer-inner {
   padding: 20rpx 24rpx 20rpx 24rpx;
-	}
+}
 
-	.history-section {
+.history-section {
   margin-bottom: 20rpx;
   /* margin: 0 24rpx; */
-	}
+}
 
-	.section-title {
+.section-title {
   font-size: 26rpx;
   color: #888;
   margin: 10rpx 6rpx 16rpx;
-	}
+}
 
-	.history-item {
+.history-item {
   display: flex;
   align-items: center;
   padding: 19rpx 18rpx;
   background-color: #f6f7f9;
   border-radius: 12rpx;
   margin-bottom: 12rpx;
-	}
+}
 
-	.history-left {
+.history-left {
   margin-right: 20rpx;
   width: 50rpx;
   height: 50rpx;
-	}
+}
 
-	.flag-circle {
+.flag-circle {
   width: 50rpx;
   height: 50rpx;
   border-radius: 50%;
@@ -354,32 +482,31 @@
   display: flex;
   align-items: center;
   justify-content: center;
-		image{
+  image {
     width: 50rpx;
     height: 50rpx;
     border-radius: 50%;
   }
-	}
-
+}
 
-	.history-main {
+.history-main {
   flex: 1;
-	}
+}
 
-	.history-query {
+.history-query {
   color: #000000;
   text-align: center;
   font-size: 24rpx;
   font-weight: 400;
   line-height: 40rpx;
-	}
+}
 
-	.history-time {
+.history-time {
   font-size: 22rpx;
   color: #999;
-	}
+}
 
-	.history-card {
+.history-card {
   background-color: #fff;
   border: 2rpx solid #f2f2f2;
   border-left: 8rpx solid rgb(220, 31, 29);
@@ -387,23 +514,23 @@
   padding: 18rpx 20rpx;
   margin-bottom: 16rpx;
   box-shadow: 0 4rpx 10rpx rgba(0, 0, 0, 0.03);
-	}
+}
 
-	.history-query {
+.history-query {
   font-size: 28rpx;
   color: #333333;
   font-weight: 500;
-	}
+}
 
-	.history-time {
+.history-time {
   margin-top: 8rpx;
   font-size: 22rpx;
   color: #888888;
-	}
+}
 
-	.empty-history {
+.empty-history {
   padding: 40rpx;
   color: #999999;
   text-align: center;
-	}
+}
 </style>

pages/deepMate/deepMate.vue

@@ -316,7 +316,7 @@ const renderMarkdown = (content) => {
   return marked.parse(content);
 };
 
-const type = ref("member");
+const type = ref("deepMate");
 const inputMessage = ref("");
 const showThinking = ref(true);
 const isSending = ref(false);

pages/setting/account.vue

@@ -71,11 +71,16 @@
 		ref,
 		onMounted
 	} from 'vue'
+
+	import {useUserStore} from "../../stores/modules/userInfo"
 	const iSMT = ref(0)
 	const jwcode = ref('90047681')
 	const showLogout = ref(false)
+	const userStore = useUserStore()
 	
 	const handleConfirmLogout = () => {
+
+		userStore.clearUserInfo()
 		showLogout.value = false
 		uni.showToast({
 			title: '退出登录成功',

pages/start/Registration/Registration.vue

@@ -197,8 +197,9 @@ import {
   SendEmailCodeApi,
   SendPhoneCodeApi,
 } from "../../../api/start/login";
+import { useDeviceStore} from "../../../stores/modules/deviceInfo"
 
-const type = ref("member");
+const type = ref("");
 const email = ref("");
 const password = ref("");
 const phone = ref("");
@@ -271,11 +272,14 @@ async function register() {
   const registerType = changeLoginType();
   isLoading.value = true;
 
+  const deviceStore = useDeviceStore()
+
   const res = await registerApi({
     registerType: registerType,
     account: account,
     verifyCode: verifyCode.value,
     agree: agreed.value,
+    deviceId:deviceStore.deviceInfo.deviceId
   });
 
   isLoading.value = false;

pages/start/login/login.vue

@@ -266,9 +266,10 @@ import {
 } from "../../../api/start/login";
 
 import { useUserStore } from "../../../stores/modules/userInfo";
+import { useDeviceStore } from "../../../stores/modules/deviceInfo";
 
 const deepChartID = ref("");
-const type = ref("member");
+const type = ref("");
 const email = ref("");
 const password = ref("");
 const country = ref("+86");
@@ -347,6 +348,8 @@ async function Login() {
     return;
   }
 
+  const deviceStore = useDeviceStore();
+
   const account = changeAccount();
   const loginType = changeLoginType();
   isLoading.value = true;
@@ -357,6 +360,7 @@ async function Login() {
     password: password.value,
     useCode: verifyCode.value ? true : false,
     idToken: "",
+    deviceId: deviceStore.deviceInfo.deviceId,
   });
   isLoading.value = false;
 
@@ -815,7 +819,6 @@ function validatePhoneNumber(countryCode, phoneNumber) {
   }
 }
 
-
 .back-btn,
 .headphone-btn {
   font-size: 36rpx;

pages/start/recoverPassword/recoverPassword.vue

@@ -237,7 +237,7 @@ import uniPopup from "../../../uni_modules/uni-popup/components/uni-popup/uni-po
 import { verificationPhone, verificationEmail } from "../login/verification";
 import { SendEmailCodeApi, SendPhoneCodeApi } from "../../../api/start/login";
 
-const type = ref("member");
+const type = ref("");
 const email = ref("");
 const password = ref("");
 const newPasswordFirst = ref("");

pages/start/select/select.vue

@@ -26,7 +26,7 @@ import footerBar from "../../../components/footerBar";
 import { ref, reactive, toRefs, watch } from "vue";
 
 
-const type = ref("member");
+const type = ref("");
 
 function toRegistration() {
   uni.redirectTo({

utils/http.js

@@ -39,12 +39,12 @@ const httpInterceptor = {
             'contentType': 'application/json',
             'version': '1',
             'client': client,
-            'deviceId': deviceInfo.deviceId
+            'deviceId': deviceInfo.deviceInfo.deviceId
         }
         //4 添加token，优先用store，没有则回退到body中的token，保持与Apifox一致
         const memberStore = useUserStore()
         const token = memberStore.userInfo?.token || options.data?.token
-        // const token = 'dccec0b65a94f498b8183a17589ab16e'
+        // const token = '1b3a58424c5324e40d4bf4d085e18047'
         if (token) {
             options.header.token = token
         }