diff --git a/components/ModalComponents.vue b/components/ModalComponents.vue
index f0f7a9f..1d2c6cf 100644
--- a/components/ModalComponents.vue
+++ b/components/ModalComponents.vue
@@ -9,14 +9,14 @@
 </template>
 
 <script setup>
-import { defineProps, defineEmits } from "vue";
+import { defineProps, defineEmits } from 'vue';
 const props = defineProps({
   visible: Boolean,
   default: false,
 });
-const emit = defineEmits(["close"]);
+const emit = defineEmits(['close']);
 function close() {
-  emit("close");
+  emit('close');
 }
 function onScroll(event) {
   const { scrollTop, scrollHeight, clientHeight } = event.target;
diff --git a/components/addDuty.vue b/components/addDuty.vue
index ad620f4..068efc0 100644
--- a/components/addDuty.vue
+++ b/components/addDuty.vue
@@ -1,47 +1,41 @@
 <template>
 	<!-- 背景遮罩 -->
-	<view v-if="visible" class="modalOverlay" @click="closeModal()">
+	<view v-if="props.visible" class="modalOverlay" @click="closeModal">
 		<!-- 添加事项 -->
 		<view class="addContainer" @click.stop>
 			
-			<!-- 事项标题和发生按钮 -->
-			<view class="flex-center-horizontal pd-10">
-
+			<!-- 事项标题和发送按钮 -->
+			<view class="flex-center-horizontal pd-10 inputContainer">
 				<input v-model="dutyTitle" class="ft-24 fw-600 dutyTitle" placeholder="在这里记下你的日程待办~"></input>
-
-				<button class="sendDuty_btn" @click="addOneDuty()">
+				<button class="sendDuty_btn" @click="addOneDuty">
 					<image src="/static/sendDuty.png" mode="scaleToFill"></image>
 				</button>
 			</view>
+			<hr />
 			
-			
-			<!-- --------------纯静态待调整------------------ -->
-			<view class="ml-10">
+			<!-- 更改颜色 -->
+			<view class="ml-10 mt-10">
 				<!-- 样式待更改 -->
-				<button class="changeColor_btn" @click="changeColor()" >
-					<view class="color" :style="{backgroundColor: color}"></view>
+				<button class="changeColor_btn" @click="changeColor" >
+					<view class="color" :style="{backgroundColor: props.color}"></view>
 					背景颜色
 				</button>
 			</view>
 			
 			<!-- 备忘部分 -->
-
 			<view class="flex-x m-5">
 				<image class="moreInfo_icon" src="/static/moreInfo.png"></image>
 				<textarea v-model="dutyDescription" class="addInfo" placeholder="输入备忘"></textarea>
-
 			</view>
+			
 		</view>
 		
 	</view>
 </template>
 
 <script setup>
-
-
-	import { defineProps,defineEmits,ref} from "vue";
-	const dutyTitle = ref("");
-	const dutyDescription = ref("");	
+	import { defineProps, defineEmits, ref } from "vue";
+	
 	const props =defineProps({
 		visible: {
 			type: Boolean,
@@ -49,20 +43,25 @@
 		},
 		color: {
 		  type: String,
-		  default: '#F7DFB4' // 设置默认颜色
+		  default: '#FABAC8' // 设置默认颜色
 		}
 	})
 	
 	
-	const emit = defineEmits(['closeModal','showChangeColor','addDuty'])
+	const emit = defineEmits(['closeModal','showChangeColor','resetColor','addDuty'])
+
+	const dutyTitle = ref('');
+	const dutyDescription = ref('');
 
 	// 点击背景遮罩关闭
-	function closeModal() {
-		emit("closeModal");
-		console.log("关闭添加日程界面");
+	function closeModal () {
+		dutyTitle.value = '';
+		dutyDescription.value = '';
+		emit("closeModal")
+		emit("resetColor")
+		// console.log("关闭添加日程界面")
 	}
 	
-
 	// 增加一个待办事项
 	function addOneDuty() {
 		if (dutyTitle.value.trim() === '') {
@@ -72,18 +71,19 @@
 		
 		const newDuty = {
 			title: dutyTitle.value,
-			description: dutyDescription.value
+			description: dutyDescription.value,
+			color:props.color
 		};
 		
 		emit('addDuty', newDuty);
 		dutyTitle.value = '';
 		dutyDescription.value = '';
-		console.log("增加了一个待办");
+		
+		emit("resetColor")
 	}
-	
-	function changeColor() {
-		console.log("更改颜色");
-
+	function changeColor () {
+		// console.log("更改颜色")
+		emit("showChangeColor")
 	}
 </script>
 
@@ -93,17 +93,21 @@
 	  align-items: flex-end;
 	  justify-content: center;
 	  position: fixed;
+	  top: 0;
 	  width: 100%;
 	  height: 100%;
 	  background-color: rgba(227, 226, 226, 0.5);
 	  z-index: 8000;
 	}
 	.addContainer {
-		height: 50vh;
+		/* height: 55vh; */
 		width: 100vw;
 		border-radius: 15px 15px 0 0;
 		background: linear-gradient(180deg, #E8C8FF 19.64%, #F4E4FF 67.76%, #FFFFFF 100%);
 	}
+	.inputContainer {
+		height: 8vh;
+	}
 	.dutyTitle {
 		width: 85%;
 		margin-left: 10px;
@@ -128,7 +132,6 @@
 		width: 16px;
 		height: 16px;
 		background-color: transparent;
-		border: 1px solid #FFFFFF;
 		
 	}
 	.changeColor_btn {
@@ -137,7 +140,6 @@
 		box-shadow: none;
 		font-size: 16px;
 		font-weight: 600;
-
 		border-radius: 15px;
 		height:30px;
 		margin: 0;
@@ -147,7 +149,6 @@
 		display: flex;
 		justify-content: space-around;
 		align-items: center;
-
 	}
 	.changeColor_btn::after {
 		border: none;
@@ -158,9 +159,10 @@
 	}
 	.addInfo {
 		width: 90%;
+		height: 30vh;
 		margin:0 auto;
 		font-size: 16px;
 		font-weight: 600;
-		border:1px black solid
+		/* border:1px black solid */
 	}
 </style>
\ No newline at end of file
diff --git a/components/aiCom/talk.vue b/components/aiCom/talk.vue
index 9797b5d..007d9e5 100644
--- a/components/aiCom/talk.vue
+++ b/components/aiCom/talk.vue
@@ -3,9 +3,8 @@
 <view>
     <talkMode></talkMode>
     <button @click="requestAllModels()">查看可用模型</button>
-    <button @click="requestChat3_5Per()">普通请求模型</button>
+    <button @click="requestChat3_5Per()">单次请求3.5模型</button>
     <button @click="requestStreamData()">请求流式数据</button>
-    <button @click="requestAi()">封装的两种请求</button>
     <view>{{ data }}</view>
    
 </view>
@@ -18,40 +17,28 @@ import { useStreamData } from '../../request/api'
 import {useUserStone} from '../../store/userStore'
 import api from '../../request/api'
 import talkMode from './talkMode.vue'
-import { useRequestModeStore } from '../../store/requestModeStore'
-import { func } from 'uview-plus/libs/function/test'
 const userStone = useUserStone()
 const {data,startStreaming} = useStreamData(`http://127.0.0.1:8000/LetUsPlan/AI/${userStone.userid}/StreamData`)
-const requestModeStore = useRequestModeStore()
+
 //查看可用模型
 async function requestAllModels(){
 let res = await api.requestAllModels()
 console.log(res)
 }
 
-//发起请求
-function requestAi(){
-if(requestModeStore.stream==false){
-requestChat3_5Per()
-}
-if(requestModeStore.stream==true){
-requestStreamData()
-}
-}
-
-//普通请求
+//单次请求3.5模型
 async function requestChat3_5Per(){
 	//暂时用静态数据测试,详情查阅api文档
 	let data = {
-    model: requestModeStore.model,
+    model: "gpt-3.5-turbo",
     messages: [
         {
             role: "user",
             content: "早上好！"
         },
     ],
-    temperature: requestModeStore.temperature,
-    max_tokens: requestModeStore.max_tokens,
+    temperature: 0.5,
+    max_tokens: 800,
     stream: false,
     
 }
@@ -63,11 +50,11 @@ console.log(res.choices[0].message)
 //请求流式数据
 async function requestStreamData() {
 let data = {  
-	        model:requestModeStore.model,
+	        model:"gpt-3.5-turbo",
             messages:[{"role": "user", "content": "Hello, OpenAI!please give me a long paragraph"}],
             stream:true,
-            temperature: requestModeStore.temperature,
-            max_tokens: requestModeStore.max_tokens,}
+            temperature:0.5,
+            max_tokens:550,}
 	startStreaming(data)
 }
 </script>
diff --git a/components/aiCom/talkMode.vue b/components/aiCom/talkMode.vue
index 3a276ff..d327921 100644
--- a/components/aiCom/talkMode.vue
+++ b/components/aiCom/talkMode.vue
@@ -2,19 +2,16 @@
 <template>
     <view  class="flex-y">
         <button @click="visible=!visible">{{ requestModeStore.model }}</button>
-        <view v-if="visible" class="flex-y ">
+        <view v-if="visible" class="flex-y hover_gray">
       
-       <view class="flex-y ">
-        <view class="m-10"> 模型</view>
-          <view v-for="(item,index) in models" :key="index">
-               <view class="hover_gray m-10" @click="chooseModel(index)">{{ item }}</view>
-          </view>
+       <view>模型:{{ model }}
+
 
        </view>
 
-       <view class="flex-x hover_gray m-10">最大生成token数量 <input type="text" class="ml-20" v-model="max_tokens"  :value=max_tokens> </view>
-       <view class="flex-x hover_gray m-10">生成随机度<input type="text" class="ml-20" v-model="temperature" @input="temperatureInput()" :value=temperature> <u-icon name="question-circle" class="hover-question"></u-icon> </view>
-       <view class="flex-x hover_gray m-10">是否启用流式请求:<switch class="ml-20" @change="streamChange" /></view>
+       <view class="flex-x">最大生成token数量{{ max_tokens }}</view>
+       <view class="flex-x">生成随机度{{ temperature }}</view>
+       <view class="flex-x">是否启用流式请求:{{ stream }}</view>
     </view>
 </view>
     </template>
@@ -22,62 +19,21 @@
     <script setup>
     import {ref} from 'vue'
     import { useRequestModeStore } from '../../store/requestModeStore'
-
     const props = defineProps({
         
     })
 const visible = ref(false)
 const requestModeStore = useRequestModeStore()
-const max_tokens=requestModeStore.max_tokens
-const temperature = requestModeStore.temperature  //介于 0 和 2 之间。较高的值（如 0.8）将使输出更加随机，而较低的值（如 0.2）将使输出更加集中和确定。
-
 
+    const model = ref("gpt-3.5-turbo")
+const max_tokens=ref(1600)
+const temperature = ref(0.5)  //介于 0 和 2 之间。较高的值（如 0.8）将使输出更加随机，而较低的值（如 0.2）将使输出更加集中和确定。
+const stream = ref(false)   
 const models = ref(["gpt-4o","gpt-3.5-turbo"])
-
-
-//确认提交修改温度
-function temperatureInput(){
-    if(temperature.value>2){
-        temperature.value=2
-    }
-   else if(temperature.value<0){
-  temperature.value=0
-    }
-    
-}
-
-//修改是否使用流式请求
-function streamChange(e){
-   requestModeStore.stream = e.detail.value
-}
-
-//修改模型
-function chooseModel(index){
-requestModeStore.model = models.value[index]
-}
-
     </script>
     
     <style scopd>
-    .hover_gray:hover{
-        background-color: rgb(243, 241, 241);
-    }
     .hover_gray{
-        color: black;
+        background-color: ;
     }
-    .hover-question:hover::after {
-            content: "介于 0 和 2 之间。较高的值（如 0.8）将使输出更加随机，而较低的值（如 0.2）将使输出更加集中和确定。";
-            position: absolute;
-           
-            width: 200px;
-            
-            background-color: #333;
-            color: white;
-            padding: 5px;
-            border-radius: 4px;
-            z-index: 9000;
-           
-            pointer-events: none; /* 防止伪元素干扰交互 */
-        }
-       
     </style>
\ No newline at end of file
diff --git a/components/calendar.vue b/components/calendar.vue
index 8a0d634..81d1c89 100644
--- a/components/calendar.vue
+++ b/components/calendar.vue
@@ -1,59 +1,48 @@
 <template>
   <view>
     <!-- 切换日历 -->
-    <reserveCalendar
-      @showMyDuty="showMyDuty()"
-      @update:month-year="handleMonthYearUpdate"
-    ></reserveCalendar>
+    <reserveCalendar 
+		@showMyDuty="showMyDuty"
+		@sendDateToCalendar="handleSelectedDate"
+		:dutyData="duties"
+		></reserveCalendar>
 
     <!-- 我的日程 -->
     <myDuty
-      @close="close()"
-      @showAddDuty="showAddDuty()"
       :visible="isMyDutyVisible"
-      :month="curMonth"
-      :year="curYear"
-      :duties="duties"
+      @close="isMyDutyVisible = false"
+      @showAddDuty="isAddDutyVisible = true"
+			:date="date"
+			:dutyData="duties"
+      @deleteDuty="handleDeleteDuty"
     ></myDuty>
 
     <!-- 添加日程 -->
     <addDuty
-      @closeModal="closeAddDuty()"
       :visible="isAddDutyVisible"
+      @closeModal="isAddDutyVisible = false"
+      @resetColor="resetColor"
+      @showChangeColor="showChangeColor"
+      @addDuty="handleAddDuty"
       :color="dutyColor"
-      @showChangeColor="showChangeColor()"
-      @addOneDuty()="handleAddDuty"
     ></addDuty>
 
     <!-- 更改日程颜色 -->
     <changeColor
-      @chosenColor="chosenColor"
-      @closeChangeColor="closeChangeColor()"
       :visible="isChangeColorVisible"
-      :color="dutyColor"
+      @closeChangeColor="closeChangeColor"
+      @chosenColor="chosenColor"
     ></changeColor>
   </view>
 </template>
 
 <script setup>
-import reserveCalendar from "./reserve-calendar.vue";
-import myDuty from "./myDuty.vue";
-import addDuty from "./addDuty.vue";
-
-import changeColor from "./changeColor.vue";
-
-import { ref } from "vue";
+import reserveCalendar from './reserve-calendar.vue';
+import myDuty from './myDuty.vue';
+import addDuty from './addDuty.vue';
+import changeColor from './changeColor.vue';
 
-const curMonth = ref();
-const curYear = ref();
-
-const handleMonthYearUpdate = (payload) => {
-  curMonth.value = payload.month;
-  curYear.value = payload.year;
-  console.log("接收到日历更新：", payload);
-};
-
-const duties = ref([]);
+import { ref } from 'vue';
 
 // 我的日程
 const isMyDutyVisible = ref(false);
@@ -65,31 +54,38 @@ const isAddDutyVisible = ref(false);
 const isChangeColorVisible = ref(false);
 
 // 日程颜色
-const dutyColor = ref("#F7DFB4");
+const dutyColor = ref('#FABAC8');
+
+// 选中的日期
+let date;
+
+// 添加的日程数组
+const duties = ref([]);
 
 // 显示添加我的日程弹窗
 function showMyDuty() {
   isMyDutyVisible.value = true;
 }
-// 关闭我的日程弹窗
-function close() {
-  isMyDutyVisible.value = false;
-}
 
-// 显示添加日程弹窗
-function showAddDuty() {
-  isAddDutyVisible.value = true;
-}
 // 关闭添加日程弹窗
 function handleAddDuty(newDuty) {
-  myDutyRef.value.addDuty(newDuty);
+	duties.value.push({ ...newDuty, completed: false, date}); // 初始化时未完成)
   isAddDutyVisible.value = false;
+	console.log(duties)
+}
+
+function handleSelectedDate (formatDate) {
+	date = formatDate;
+}
+
+// 删除日程
+function handleDeleteDuty(index) {
+  duties.value.splice(index, 1);
 }
 
 // 获得选择的颜色
 const chosenColor = function (color) {
   dutyColor.value = color;
-  console.log(dutyColor.value, typeof dutyColor.value);
 };
 function closeChangeColor() {
   isChangeColorVisible.value = false;
@@ -98,9 +94,10 @@ function showChangeColor() {
   isChangeColorVisible.value = true;
 }
 
-function handleAddDuty(duty) {
-  duties.value.push(duty);
+// 关闭添加日程弹窗后 重置颜色
+function resetColor() {
+  dutyColor.value = '#FABAC8'; // 重置为第一个颜色
 }
 </script>
 
-<style scoped></style>
+<style scoped></style>
\ No newline at end of file
diff --git a/components/changeColor.vue b/components/changeColor.vue
index fb74733..62264fd 100644
--- a/components/changeColor.vue
+++ b/components/changeColor.vue
@@ -1,126 +1,134 @@
 <template>
-  <view v-if="props.visible" class="changeColorContainer z-9">
-    <!-- 标题：选择颜色 -->
-    <view class="selectTitle fw-400 ft-20">选择颜色</view>
-    <hr />
-
-    <!-- 8个颜色块 -->
-    <view class="colors">
-      <!-- 每一个色块 -->
-      <view class="colorBlock" v-for="(color, index) in colorList">
-        <view
-          class="color-item"
-          @click="selectColor(index)"
-          :style="{
-            backgroundColor: color,
-            border: isSelected(index) ? '2px solid #666' : 'none',
-          }"
-        ></view>
-      </view>
-    </view>
-
-    <!-- 取消/确认btn -->
-    <view class="buttonContainer">
-      <button class="pickerCancel" @click="closeChangeColor()">取消</button>
-      <button class="pickerIdentify" @click="pickOneColor()">确认</button>
-    </view>
-  </view>
+	<view v-if="props.visible" class="modalOverlay">
+		<view class="changeColorContainer z-9">
+			<!-- 标题：选择颜色 -->
+			<view class="selectTitle fw-400 ft-20">选择颜色</view>
+			<hr />
+			
+			<!-- 8个颜色块 -->
+			<view class="colors">
+				<!-- 每一个色块 -->
+				<view class="colorBlock" v-for="(color, index) in colorList"  >
+					<view
+					class="color-item" 
+					@click="selectColor(index)"
+					:style="{ backgroundColor: color ,border: isSelected(index) ? '2px solid #666' : 'none'}"
+					></view>
+				</view>
+			</view>
+			
+			<!-- 取消/确认btn -->
+			 <view class="buttonContainer">
+			      <button class="pickerCancel" @click="closeChangeColor()">取消</button>
+			      <button class="pickerIdentify" @click="pickOneColor()">确认</button>
+			</view>
+		</view>
+	</view>
 </template>
 
 <script setup>
-import { ref, defineEmits, defineProps } from "vue";
-
-const props = defineProps({
-  visible: {
-    type: Boolean,
-    default: false,
-  },
-  color: {},
-});
-
-const emit = defineEmits(["chosenColor", "closeChangeColor"]);
-
-// 颜色
-const colorList = [
-  "#F7DFB4",
-  "#DAB2FF",
-  "#54A2F2",
-  "#F5E877",
-  "#7DE7B4",
-  "#A94DEB",
-  "#22D7E7",
-  "#F8BDE4",
-];
-
-const selectedIndex = ref(0);
-
-function isSelected(index) {
-  // 检查当前索引是否与 selectedIndex 相等
-  return selectedIndex.value == index;
-}
-
-function selectColor(index) {
-  // 更新 selectedIndex 为当前点击的索引
-  selectedIndex.value = index;
-}
-
-// 关闭更改颜色弹窗
-function closeChangeColor(index) {
-  emit("closeChangeColor");
-  selectedIndex.value = 0;
-}
-
-// 把选中的颜色传给calendar组件，显示在addDuty组件的按钮处，关闭弹窗
-function pickOneColor() {
-  emit("chosenColor", colorList[selectedIndex.value]);
-  selectedIndex.value = 0;
-  emit("closeChangeColor");
-}
+	import { ref ,defineEmits ,defineProps} from 'vue';
+	
+	const props =defineProps({
+		visible: {
+			type: Boolean,
+			default: false,
+		}
+	})
+	
+	const emit=defineEmits(["chosenColor","closeChangeColor"])
+	
+	// 颜色
+	const colorList=
+	['#FABAC8', '#D2B9D7', '#B0C5B8', '#82B498',
+	'#F7BD3D', '#CFA26A', '#BCE0EC', '#79ABD2'];
+	
+	
+	const selectedIndex= ref(0);
+	
+	
+	function isSelected(index) {
+		// 检查当前索引是否与 selectedIndex 相等
+		return selectedIndex.value == index;
+	}
+	
+	function selectColor(index) {
+		// 更新 selectedIndex 为当前点击的索引
+		selectedIndex.value = index;
+	}
+	
+	// 关闭更改颜色弹窗
+	function closeChangeColor(index) {
+		emit('closeChangeColor')
+		selectedIndex.value=0;
+	}
+	
+	// 把选中的颜色传给calendar组件，显示在addDuty组件的按钮处，关闭弹窗
+	function pickOneColor () {
+		emit("chosenColor",colorList[selectedIndex.value]);
+		selectedIndex.value=0;
+		emit('closeChangeColor')
+	}
 </script>
 
 <style>
-.changeColorContainer {
-  background: linear-gradient(180deg, #e8c9ff 0%, #fefcff 25%);
-  position: fixed;
-  bottom: 0;
-  width: 100%;
-  border: 1px solid black;
-}
-.selectTitle {
-  text-align: center;
-  padding-top: 20px;
-  padding-bottom: 20px;
-}
-.colors {
-  display: flex;
-  flex-wrap: wrap;
-}
-.colorBlock {
-  width: 25%;
-  text-align: center;
-}
-.color-item {
-  height: 50px;
-  width: 50px;
-  border-radius: 50%;
-  padding: 5px;
-  margin: 10px auto;
-}
-.buttonContainer {
-  display: flex;
-  flex-direction: row;
-  margin: 10px;
-}
-.pickerCancel {
-  border-radius: 16px;
-  background-color: #ededed;
-  width: 40%;
-  border: 1px solid #a4a4a4;
-}
-.pickerIdentify {
-  border-radius: 16px;
-  background-color: #deb0ff;
-  width: 40%;
-  border: 1px solid #a4a4a4;
-}
-</style>
+	.modalOverlay {
+	  display: flex;
+	  align-items: flex-end;
+	  justify-content: center;
+	  position: fixed;
+	  top: 0;
+	  width: 100vw;
+	  height: 100vh;
+	  background-color: rgba(227, 226, 226, 0.5);
+	  z-index: 9000;
+	}
+	.changeColorContainer {
+		background: linear-gradient(180deg, #E8C9FF 0%, #FEFCFF 25%);
+		width: 100%;
+		/* height: 41vh; */
+		box-sizing: border-box;
+		border-radius: 16px 16px 0 0;
+		
+	}
+	.selectTitle {
+		text-align: center;
+		padding-top: 20px;
+		padding-bottom: 20px;
+		
+	}
+	.colors {
+		display: flex;
+		flex-wrap: wrap;
+	}
+	.colorBlock {
+		width: 25%;
+		text-align: center;
+		margin: 10px 0 10px 0 ;
+	}
+	.color-item {
+		height: 50px;
+		width: 50px;
+		border-radius: 50%;
+		padding: 5px;
+		margin: 10px auto;
+	}
+	.buttonContainer {
+	  display: flex;
+	  flex-direction: row;
+	  margin: 10px;
+	}
+	.pickerCancel {
+	  border-radius: 16px;
+	  background-color: #ededed;
+	  width: 40%;
+	  border: 1px solid #A4A4A4
+	}
+	.pickerIdentify {
+	  border-radius: 16px;
+	  background-color: #deb0ff;
+	  width: 40%;
+	  border: 1px solid #A4A4A4
+	}
+
+</style>
\ No newline at end of file
diff --git a/components/loginCom/LoginModal.vue b/components/loginCom/LoginModal.vue
index 8ae57ad..f06ddf0 100644
--- a/components/loginCom/LoginModal.vue
+++ b/components/loginCom/LoginModal.vue
@@ -3,7 +3,17 @@
     <view v-if="props.visible" class="modal">
       <view class="modal-content" @scroll="onScroll">
         <span class="close" @click="close">&times;</span>
-        <p>这是用户协定</p>
+        <p>
+          购买本服务的企业用户，有责任对其最终用户在使用腾讯统一身份期间的行为及发布的内容进行监督和审计，因最终用户行为及发布内容违反相关法律法规而造成的任何后果和损失，由企业用户和最终用户负全部责任。同时，如果企业用户或企业最终用户违反法律法规、本协议和/或腾讯其他协议、规则，腾讯对企业用户或企业最终用户使用的本产品和/或本服务采取任何行为或措施后，导致企业用户或企业最终用户暂时或永久无法使用腾讯统一身份、无法使用腾讯统一身份登录或使用其他产品和/或服务，企业用户应自行承担相应后果，由此造成企业损失的，企业应自行承担。
+          6.4.4
+          您应自行对因使用本服务而产生或存储在本服务中的数据，在本服务之外，采取合理、安全的备份。若腾讯根据本协议对您采取永久封号等措施的，对于您的与本服务相关的全部数据或您存储在本服务中的全部数据、信息等，腾讯有权将该等数据全部予以删除，相应后果您应自行承担。
+          6.4.5
+          您导致任何第三方损害的，您应当独立承担责任；腾讯因此遭受损失的，您也应当一并赔偿。
+          6.5
+          您充分了解并同意，您必须为自己使用本产品和/或本服务的一切行为负责，包括您所发表的任何内容以及由此产生的任何后果。您应对使用本产品和/或本服务时接触到的内容自行加以判断，包括因对内容的正确性、完整性或实用性的依赖而产生的风险，并承担由此引起的相应风险。腾讯在法律允许的范围内不对您因前述风险而导致的任何损失或损害承担责任。
+          如您为企业用户，您应对您指定的管理员账号的行为负责，腾讯根据您设置的管理员账号的行为、操作和指示所做的服务调整亦由您承担后果；如您为不具有完全民事行为能力的自然人，您应理解，您的监护人将对您使用本服务的一切行为负责。
+          6.6 您需确认并同意以下我们对违规内容和用户投诉的处理规则：
+        </p>
       </view>
     </view>
   </view>
diff --git a/components/loginCom/login.vue b/components/loginCom/login.vue
index 5e9c7e1..869d97e 100644
--- a/components/loginCom/login.vue
+++ b/components/loginCom/login.vue
@@ -8,9 +8,7 @@
         class="round-image mbt-15"
       />
       <view class="quickLogin" v-if="!isChangeBtn">
-        <view class="mbt-10 ft-24" style="color: #ffffff">
-          欢迎使用酱紫安排!
-        </view>
+        <view class="mbt-10 ft-24"> 欢迎使用酱紫安排! </view>
         <button class="quick-btn" @click="loginByWx_quick()">
           微信快捷登录
         </button>
@@ -28,10 +26,8 @@
         :class="{ Highlight: shouldHighlight }"
       >
         <checkbox class="checkbox-box" @click="checked()"></checkbox>
-        <text style="color: #ffffff"
-          >若微信账号未注册将自动注册，注册即同意</text
-        >
 
+        若手机号未注册将自动注册，注册即同意
         <Text class="link" @click="openAgreement()">《用户协议》</Text>
       </view>
     </view>
@@ -39,13 +35,13 @@
     <!--下半-->
     <view class="flex-center-both flex-y">
       <view class="flex-x flex-center-both">
-        <view class="line mr-20" style="background-color: #ffffff"></view
-        ><text style="color: #ffffff">其他登录方式</text>
-        <view class="line ml-20" style="background-color: #ffffff"></view>
+        <view class="line mr-20"></view><text>其他登录方式</text>
+        <view class="line ml-20"></view>
       </view>
       <button class="other-btn" @click="loginByPhone_other()">
         <img src="../../static/loginByPhone_other.png" />
-        <br /><text style="color: #ffffff">{{ btnText }}</text>
+        <br />
+        {{ btnText }}
       </button>
     </view>
   </view>
@@ -60,7 +56,7 @@
 
 <script setup>
 import { func } from "uview-plus/libs/function/test";
-import ModalComponent from "./LoginModal.vue";
+import ModalComponent from "./ModalComponents.vue";
 import otherLogin from "./otherLogin.vue";
 import { ref } from "vue";
 import api from "../../request/api";
@@ -149,14 +145,13 @@ function onCloseHighlight() {
 
 <style scopd>
 .custom-color {
-  background-color: #8e1df1;
+  background-color: #deb0ff;
 }
 .quick-btn {
-  margin-top: 3vh;
-  margin-bottom: 3vh;
+  margin-top: 2vh;
+  margin-bottom: 1vh;
   border-radius: 30px;
-  width: 78%;
-  color: #8500ff;
+  width: 100%;
 }
 
 .other-btn {
@@ -183,7 +178,8 @@ function onCloseHighlight() {
   width: 150px;
 }
 .link {
-  color: #d9f8ff;
+  color: #007aff;
+  text-decoration: underline;
 }
 .checkbox-box {
   transform: scale(0.6);
diff --git a/components/loginCom/otherLogin.vue b/components/loginCom/otherLogin.vue
index 1fa5651..85deb9a 100644
--- a/components/loginCom/otherLogin.vue
+++ b/components/loginCom/otherLogin.vue
@@ -10,6 +10,9 @@
         maxlength="11"
         @blur="verifyPhoneNumber()"
       />
+      <view v-if="!phoneNumberIsValid" class="alertText">
+        {{ phoneValidateText }}
+      </view>
     </view>
     <view class="Down">
       <input
@@ -24,23 +27,17 @@
         class="send-code-btn"
         @click="sendVerificationCode()"
         :disabled="isCountTime"
-        style="color: #486afc"
       >
         {{ sendCodeBtnText }}
       </button>
     </view>
-    <view v-if="!phoneNumberIsValid" class="alertText">
-      {{ phoneValidateText }}
-    </view>
-    <button @click="login()" class="loginBtn" style="background-color: #5abdff">
-      <text style="color: #ffffff">登录/注册</text>
-    </button>
+    <button @click="login()" class="loginBtn">登录/注册</button>
   </view>
   <Alert></Alert>
 </template>
 
 <script setup>
-import Alert from "../alert.vue";
+import Alert from "../alert.vue"
 import { ref } from "vue";
 import api from "../../request/api";
 import { useAlertStore } from "../../store/alertStore";
@@ -172,11 +169,11 @@ async function login() {
 <style scoped>
 .Up {
   width: 40vh;
-  height: 7vh;
-  margin-top: 3vh;
-  margin-bottom: 1vh;
+  height: 6vh;
+  margin-top: 5vh;
+  margin-bottom: 2vh;
   background-color: white;
-  border-radius: 10px;
+  border-radius: 18px;
   align-items: center;
   justify-content: space-around;
   flex-direction: column;
@@ -185,8 +182,7 @@ async function login() {
 }
 
 .alertText {
-  color: rgb(217, 219, 80);
-  padding-top: 0.5vh;
+  color: red;
   margin-top: 0.5vh;
   margin-bottom: 0.5vh;
   text-align: center;
@@ -195,11 +191,11 @@ async function login() {
 
 .Down {
   width: 40vh;
-  height: 7vh;
-  margin-top: 3vh;
+  height: 6vh;
+  margin-top: 2vh;
   margin-bottom: 3vh;
   background-color: white;
-  border-radius: 10px;
+  border-radius: 18px;
   display: flex;
   align-items: center;
   justify-content: space-around;
@@ -207,8 +203,7 @@ async function login() {
 }
 
 .phone-input {
-  padding-top: 0.5vh;
-  margin-left: 2vh;
+  margin-left: 3vh;
   margin-right: 3vh;
   width: 100%;
   height: 85%;
@@ -228,16 +223,14 @@ async function login() {
   width: 40%;
   height: 85%;
   margin-right: 1vh;
-  padding-top: 0.3vh;
   border: none;
   outline: none;
   background-color: white;
   color: red;
-  font-size: 2vh;
+  font-size: 1.6vh;
   vertical-align: middle;
   justify-content: center;
   align-items: center;
-  color: #486afc;
 }
 
 .send-code-btn::after {
@@ -245,14 +238,12 @@ async function login() {
 }
 
 .loginBtn {
-  margin-top: 1vh;
   display: flex;
   text-align: center;
   vertical-align: middle;
   align-items: center;
   justify-content: center;
-  border-radius: 20px;
+  border-radius: 25px;
   margin-bottom: 1vh;
-  width: 65%;
 }
-</style>
+</style>
\ No newline at end of file
diff --git a/components/myDuty.vue b/components/myDuty.vue
index 600ab1c..9403f3a 100644
--- a/components/myDuty.vue
+++ b/components/myDuty.vue
@@ -1,105 +1,264 @@
-<template>
-  <view v-if="visible" class="modalOverlay" @click="closeMyDuty()">
-    <view class="z-3">
-      <view class="ft-16 mb-10 ml-10 fw-700">
-        {{ year }}年{{ month }}月{{}}日
-      </view>
-      <!-- 白色盒子 -->
-      <view class="dutyContainer" @click.stop>
-        <!-- 头部：我的日程 -->
-        <view class="myDuty-font">
-          <view class="font fw-600">我的日程</view>
-          <view class="ft-18 fw-600">——my duty——</view>
-        </view>
-
-        <!-- 中部：添加的代办事项 -->
-        <view v-if="duties && duties.length > 0" class="duties">
-          <view v-for="(duty, index) in duties" :key="index">
-            <img src="../static/duty未完成.png" @click="dutyIsDone()" />
-            <p class="" @click="showDescripition()">{{ duty.title }}</p>
-          </view>
-        </view>
-
-        <!-- 尾部：加号按钮 -->
-        <button class="addDuty_btn" @click="showAddDuty()">
-          <image src="/static/addDuty_btn.png"></image>
-        </button>
-      </view>
-    </view>
-  </view>
+<template>	
+	<view v-if="props.visible" class="modalOverlay" @click="closeMyDuty">
+		<view class="z-3">
+			<view class="ft-16 mb-10 ml-10 fw-700">{{Year}}年 {{Month}}月 {{Day}}日</view>
+			<!-- 白色盒子 -->
+			<view class="dutyContainer" @click.stop>
+					
+					<!-- 头部：我的日程 -->
+					<view class="myDuty-font">
+						<view class="font fw-600">我的日程</view>
+						<view class="ft-18 fw-600">——my duty——</view>
+					</view>
+					
+					<!-- 中部：添加的代办事项 -->
+					<view class="duties">
+						<view v-if="filteredDuties.length === 0" class="empty-duties">
+							请您添加日程吧！
+						</view>
+						<view 
+							v-for="(duty, index) in filteredDuties" 
+							:key="index" 
+							class="duty-item"
+							@touchstart="handleTouchStart(index, $event)"
+							@touchmove="handleTouchMove(index, $event)"
+							@touchend="handleTouchEnd(index)"
+							:style="{ transform: `translateX(${duty.offsetX}px)` }"
+						>
+							<!-- 透明圆圈 -->
+							<view class="circle" @click="toggleComplete(index)">
+								<view v-if="filteredDuties[index].completed" class="tick">✓</view>
+							</view>
+							<!-- 日程标题和备注 -->
+							<view class="duty-content">
+								<view 
+									class="duty-title" 
+									:class="{ completed: filteredDuties[index].completed }"
+								>
+									{{ filteredDuties[index].title }}
+								</view>
+								<view 
+									class="duty-description" 
+									:class="{ completed: filteredDuties[index].completed }"
+								>
+									{{ filteredDuties[index].description }}
+								</view>
+							</view>
+							<!-- 删除按钮 -->
+							<view class="delete-btn" @click="handleDelete(index)">
+								删除
+							</view>
+						</view>
+					</view>
+					
+					<!-- 尾部：加号按钮 -->
+					<button class="addDuty_btn" @click="showAddDuty">
+						<image src="/static/addDuty_btn.png"></image>
+					</button>
+			</view>
+		</view>
+	</view>
 </template>
 
 <script setup>
-import { defineProps, defineEmits } from "vue";
-import ModalComponents from "./ModalComponents.vue";
-const props = defineProps({
-  visible: {
-    type: Boolean,
-    default: false,
-  },
-  duties: {
-    type: Array,
-    default: () => [],
-  },
-  year: Number,
-  month: Number,
-});
-
-// 关闭我的日程
-const emit = defineEmits(["close", "showAddDuty"]);
-
-function closeMyDuty() {
-  emit("close");
-  console.log("关闭我的日程页面");
-}
-
-// 显示添加日程界面
-function showAddDuty() {
-  emit("showAddDuty");
-  console.log("显示添加日程页面");
-}
+	import { defineProps, defineEmits, ref, computed } from "vue";
+	
+	const props = defineProps({
+		visible: {
+			type: Boolean,
+			default: false,
+		},
+		date: {
+		  type: String,
+		},
+		dutyData:{
+			type:Array,
+		}
+	})
+	
+	const emit = defineEmits(['close', 'showAddDuty', 'deleteDuty']);
+	
+	const duties = ref([]);
+	
+	const Year = computed(() => props.date.split('-')[0]);
+	const Month = computed(() => props.date.split('-')[1]);
+	const Day = computed(() => props.date.split('-')[2]);
+	
+	const filteredDuties = computed(() => {
+	  return props.dutyData.map(duty => ({
+			...duty,
+			offsetX: 0, // 用于控制左滑偏移量
+			isDragging: false, // 是否正在拖动
+		}));
+	});
+	
+	// 触摸起始位置
+	let startX = 0;
+	
+	// 触摸开始
+	function handleTouchStart(index, event) {
+		startX = event.touches[0].clientX;
+		filteredDuties.value[index].isDragging = true;
+	}
+	
+	// 触摸移动
+	function handleTouchMove(index, event) {
+		if (!filteredDuties.value[index].isDragging) return;
+		const currentX = event.touches[0].clientX;
+		const offsetX = currentX - startX;
+		// 限制左滑最大距离
+		if (offsetX < -100) {
+			filteredDuties.value[index].offsetX = -100;
+		} else if (offsetX > 0) {
+			filteredDuties.value[index].offsetX = 0;
+		} else {
+			filteredDuties.value[index].offsetX = offsetX;
+		}
+	}
+	
+	// 触摸结束
+	function handleTouchEnd(index) {
+		filteredDuties.value[index].isDragging = false;
+		// 如果滑动距离超过阈值，则触发删除
+		if (filteredDuties.value[index].offsetX < -50) {
+			handleDelete(index);
+		} else {
+			// 否则恢复原位
+			filteredDuties.value[index].offsetX = 0;
+		}
+	}
+	
+	// 删除日程
+	function handleDelete(index) {
+		emit("deleteDuty", index);
+	}
+	
+	// 关闭我的日程
+	function closeMyDuty() {
+		emit("close");
+	}
+	
+	// 显示添加日程界面
+	function showAddDuty() {
+		emit("showAddDuty");
+	}
+	
+	// 切换完成状态
+	function toggleComplete(index) {
+		filteredDuties.value[index].completed = !filteredDuties.value[index].completed;
+	}
 </script>
 
 <style scoped>
-.modalOverlay {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  position: fixed;
-  width: 100%;
-  height: 100%;
-  background-color: rgba(227, 226, 226, 0.5);
-  z-index: 2000;
-}
+	.modalOverlay {
+	  display: flex;
+	  justify-content: center;
+	  align-items: center;
+	  position: fixed;
+	  top: 0;
+	  width: 100vw;
+	  height: 100vh;
+	  background-color: rgba(227, 226, 226, 0.5);
+	  z-index: 2000;
+	}
 
-.dutyContainer {
-  background-color: #fff;
-  padding: 20px;
-  border-radius: 5px;
-  position: relative;
-  width: 80vw;
-  height: 60vh;
-  border: 1px solid #deb0ff9c;
-  border-radius: 36px;
-}
-.font {
-  font-size: 36px;
-}
-.addDuty_btn {
-  height: 60px;
-  width: 60px;
-  border-radius: 50%;
-  background-color: transparent;
-  /* border: none; */
-  box-shadow: none;
-  padding: 0;
-  margin: 0;
-  position: absolute;
-  bottom: 20px;
-  right: 20px;
-}
-.addDuty_btn image {
-  height: 60px;
-  width: 60px;
-}
-</style>
+	.dutyContainer {
+	  background-color: #fff;
+	  padding: 20px;
+	  border-radius: 5px;
+	  width: 80vw;
+	  height: 60vh;
+	  border: 1px solid #DEB0FF9C;
+	  border-radius:36px;
+	  display: flex;
+	  flex-direction: column;
+	  justify-content: space-evenly;
+	}
+	.font{
+		font-size: 36px;
+	}
+	.addDuty_btn {
+		height: 60px;
+		width:60px;
+		border-radius: 50%;
+		background-color: transparent;
+		box-shadow: none;
+		padding: 0;
+		margin: 0;
+		align-self: self-end;
+		justify-self: flex-end;
+		flex-shrink: 0;
+	}
+	.addDuty_btn image {
+		height: 60px;
+		width:60px;
+	}
+	.duties {
+		flex-grow: 1;
+		flex-shrink: 1;
+		margin: 10px 5px;
+		overflow: scroll;
+	}
+	.empty-duties {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 100%;
+		font-size: 16px;
+		color: #666;
+	}
+	.duty-item {
+		display: flex;
+		align-items: center;
+		margin-bottom: 10px;
+		transition: transform 0.2s ease;
+		position: relative;
+	}
+	.circle {
+		width: 20px;
+		height: 20px;
+		border: 2px solid #DEB0FF9C;
+		border-radius: 50%;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		margin-right: 10px;
+		cursor: pointer;
+	}
+	.tick {
+		color: #DEB0FF9C;
+		font-size: 14px;
+		font-weight: bold;
+	}
+	.duty-content {
+		flex: 1;
+		display: flex;
+		align-items: center;
+	}
+	.duty-title {
+		font-size: 16px;
+		font-weight: 600;
+		margin-right: 10px;
+	}
+	.duty-description {
+		font-size: 14px;
+		color: #666;
+	}
+	/* 完成状态的样式 */
+	.completed {
+		text-decoration: line-through; /* 添加删除线 */
+		color: #999; /* 文字颜色变浅 */
+	}
+	.delete-btn {
+		position: absolute;
+		right: -100px;
+		width: 100px;
+		height: 100%;
+		background-color: #FF3B30;
+		color: white;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		font-size: 16px;
+	}
+</style>
\ No newline at end of file
diff --git a/components/reserve-calendar.vue b/components/reserve-calendar.vue
index 7e243d3..77dd87b 100644
--- a/components/reserve-calendar.vue
+++ b/components/reserve-calendar.vue
@@ -1,30 +1,30 @@
-<template>
+<template>  
   <view class="main-container">
     <view class="fixed">
       <view class="flex-x justify-end items-center mt-20 relative">
         <view class="flex-x justify-center calendar-select absolute">
           <text class="ft-20">{{ curYear }}年{{ curMonth }}月</text>
-          <img src="../static/倒三角 1.png" @click="showPicker()" />
+          <img src="../static/倒三角 1.png" @click="showPicker" />
         </view>
 
         <!-- 点击头像登录 -->
         <image
           src="/static/user-avatar.png"
           class="user-avatar mr-20"
-          @click="login()"
+          @click="login"
         ></image>
       </view>
 
       <!--日期选择部分-->
       <view
-        class="flex-y mt-5"
+        class="flex-y"
         v-for="(row, index1) in Array.from({ length: weeks })"
         :key="index1"
       >
         <!-- 生成行 -->
         <view class="flex-x">
           <view
-            class="flex-fill shrink"
+            class="flex-fill shrink autoHeight"
             v-for="(week, index2) in Array.from({ length: 7 })"
             :key="index2"
           >
@@ -33,26 +33,38 @@
               weekTitle(index2)
             }}</text>
 
-            <view v-if="isShow(index1, index2)" class="dayContainer">
+            <view v-if="isShow(index1, index2)" class="dayContainer" @click="showMyDuty">
               <!--日期方块组件-->
               <view
                 @click="choose(index1, index2)"
                 :class="['all-btn']"
-                :style="{ border: '1px solid #efecec' }"
-                >{{
+                >
+								
+								<!-- 日期部分 -->
+								<view>{{
                   curMonthArray[
                     index1 * 7 + index2 - curMonthBasicInfo.startIndex
                   ]?.date
-                }}
-              </view>
-              <view @click="showMyDuty()">点击安排日程</view>
+                }}</view>
+								
+								<!-- 日历上的日程单元 -->
+									<view 
+									v-for="(duty, index) in getdutyForDate(curYear,curMonth,curMonthArray[index1 * 7 + index2 - curMonthBasicInfo.startIndex]?.date)" 
+									:key="index" 
+									class="duty-item"
+									:style="{ 'background-color': duty.color }"
+									>{{duty.title}}</view>
             </view>
+						
+						</view>
+						
           </view>
         </view>
       </view>
     </view>
   </view>
-
+  
+  <!-- 年月选择器 -->
   <ModalComponents :visible="IsShowPicker" class="PickerModal">
     <p class="pickTime" style="color: #a4a4a4">
       {{ PickerCurYear }}年{{ PickerCurMonth }}月
@@ -67,6 +79,21 @@
       <button class="pickerIdentify" @click="pickerIdentify">确认</button>
     </view>
   </ModalComponents>
+  
+
+  <!-- AI 图标 -->
+  <movable-area>
+	  <!-- 可拖动图标 -->
+	 <movable-view 
+	  direction="all" 
+	  :x="position.x" 
+	  :y="position.y"
+	  @click="navigateToAI"
+	  >
+	  <image src="/static/ai-icon.png" class="icon-image" />
+	  </movable-view>
+  </movable-area>
+  
 </template>
 
 <script setup>
@@ -79,9 +106,12 @@ import ModalComponents from "./ModalComponents.vue";
 
 const IsShowPicker = ref(false);
 
-const props = defineProps({});
+const props = defineProps({
+	dutyData:Array,
+});
 
 const calendar = ref();
+
 //客观上当前的时间
 const year = new Date().getFullYear();
 const month = new Date().getMonth() + 1; // 月份是从0开始的，所以加1
@@ -89,10 +119,10 @@ const day = new Date().getDate();
 const static_calendar = ref();
 
 //可以使用curMonth，year和month，year的差值来计算index，暂且放一个思路在这里
-const curMonth = ref(0);
-const curYear = ref(0);
-const PickerCurMonth = ref(0);
-const PickerCurYear = ref(0);
+const curMonth = ref();
+const curYear = ref();
+const PickerCurMonth = ref();
+const PickerCurYear = ref();
 
 //当前月数组
 const curMonthArray = ref(monthDate);
@@ -114,7 +144,6 @@ const weeks = computed(() => {
 function showPicker() {
   PickerCurYear.value = curYear.value;
   PickerCurMonth.value = curMonth.value;
-
   IsShowPicker.value = !IsShowPicker.value;
 }
 
@@ -144,7 +173,7 @@ function weekTitle(index) {
 onMounted(() => {
   calendar.value = dateInfo;
 
-  static_calendar.value = getRangeDates(year, month, 99999);
+  static_calendar.value = getRangeDates(year, month, 12);
 
   //用来触发第一次watch，不知道为什么immediate无效
   curMonth.value = new Date().getMonth() + 1;
@@ -152,11 +181,6 @@ onMounted(() => {
 
   PickerCurYear.value = curYear.value;
   PickerCurMonth.value = curMonth.value;
-
-  emit("update:month-year", {
-    month: curMonth.value,
-    year: curYear.value,
-  });
 });
 watch([curYear, curMonth], (newValue, oldValue) => {
   curMonthArray.value = static_calendar.value[curYear.value][curMonth.value];
@@ -186,27 +210,59 @@ function pickerIdentify() {
   IsShowPicker.value = !IsShowPicker.value;
 }
 
+let curDay;
+
 //选择这个按钮
 function choose(index1, index2) {
-  var index = index1 * 7 + index2; //日期
+  var index = index1 * 7 + index2;
   var chooseDate =
     curMonthArray.value[index - curMonthBasicInfo.value.startIndex].date;
-
-  console.log("当前选择日期：", chooseDate);
+	curDay = chooseDate
 }
 
-// 登录/切换账号
+// ------------登录/切换账号---------------
 function login() {
   console.log("切换账号/返回");
 }
 
-// 显示添加日程的组件
-const emit = defineEmits(["showMyDuty", "update:month-year"]);
+// ---------日程部分----------------
+
+// 日历方格显示对应日程
+
+function getdutyForDate (year,month,day) {
+	const date =`${year}-${String(month).padStart(2,'0')}-${String(day).padStart(2,'0')}`;
+	const duty = props.dutyData.filter(duty => duty.date === date)
+	return duty
+}
+
+// 显示添加日程的组件，并将选择的日期YYYYMMDD传给父组件calendar
+const emit = defineEmits(["showMyDuty","sendDateToCalendar"]);
 
 function showMyDuty() {
+	// 将选择的日期以YYYY-MM-DD传给calendar组件 —— eg. '2025-02-25'
+	const formatDate = `${curYear.value}-${String(curMonth.value).padStart(2,"0")}-${String(curDay).padStart(2,"0")}`;
+	emit("sendDateToCalendar",formatDate)
   emit("showMyDuty");
-  console.log("click");
 }
+
+//  ---------------AI图标部分-----------------
+
+// 图标位置状态
+const position = ref({ x: 0, y: 0})
+
+// 初始化图标位置
+const systemInfo = uni.getSystemInfoSync()
+  position.value = {
+    x: systemInfo.windowWidth - 60, 
+    y: systemInfo.windowHeight - 60 
+  }
+
+// 点击跳转
+const navigateToAI = () => {
+	console.log("跳转至AI页面")
+}
+
+
 </script>
 
 <style scoped>
@@ -246,20 +302,34 @@ function showMyDuty() {
   background-color: #007bff;
 }
 
+/* 日程较多时，该行会拉伸height */
+.autoHeight {
+	display: flex;
+	flex-wrap: wrap;
+	
+}
+.dayContainer {
+	border: 1px solid #efecec;
+	width: calc(100vw/7);
+	box-sizing: border-box;
+	padding-bottom: 2px;
+}
 .all-btn {
   display: flex;
-  justify-content: center;
+  /* justify-content: center; */
   align-items: center;
   flex-direction: column;
-  height: 120rpx;
+	min-height: 16vh;
+	align-content: center;
+	flex: 1;
 }
 .fixed {
-  position: fixed;
+  /* position: fixed; */
   /* top: 20vh; */
   /* left: 0px; */
   width: 100%;
   height: 100%;
-  background-color: white;
+  background-color: #;
   z-index: 1000;
 }
 
@@ -274,4 +344,45 @@ function showMyDuty() {
   left: 50%;
   transform: translateX(-50%);
 }
+
+/* 一个个日程 */
+.duty-item {
+	width: 95%;
+	text-align: center;
+	border-radius: 10px;
+	height: 20px;
+	margin-top: 2px;
+	line-height: 20px;
+	font-size: 16px;
+	text-overflow: ellipsis;
+	white-space: nowrap; 
+	overflow: hidden;    
+}
+
+/* ai图标部分 */
+movable-area {
+	position:fixed;
+	top: 0;
+	left: 0;
+	width: 100vw;
+	height: 100vh;
+	z-index: 999; 
+	pointer-events: none; 
+}
+movable-view {
+  width: 60px;
+  height: 60px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  pointer-events: auto;
+}
+
+.icon-image {
+  width: 60px;
+  height: 60px;
+}
+.items-center{
+	background-color: #b973f6;
+}
 </style>
diff --git a/components/scrollPicker.vue b/components/scrollPicker.vue
index 15da14b..7fd325d 100644
--- a/components/scrollPicker.vue
+++ b/components/scrollPicker.vue
@@ -190,4 +190,4 @@ onMounted(() => {
   color: #000;
   font-size: 52px;
 }
-</style>
+</style>
\ No newline at end of file
diff --git a/js/time.js b/js/time.js
new file mode 100644
index 0000000..06b6795
--- /dev/null
+++ b/js/time.js
@@ -0,0 +1,47 @@
+export function getTimeStamp(){
+const now = new Date();
+let year = now.getFullYear().toString()
+let month = (now.getMonth() + 1).toString().padStart(2, '0');
+let day = now.getDate().toString().padStart(2, '0');
+
+let timeStamp = year+month+day
+return Number.parseInt(timeStamp)
+
+
+//加padStart是为了把2 -》02，免得格式不一致
+
+}
+
+//将时间划分为2004/03/02的形式
+export function spiltByLean(timeStamp){
+    let str = String(timeStamp)
+  
+  let year = str.substring(0,4)
+  let month = str.substring(4,6)
+  let day =  str.substring(6,8)
+  let newTimeStamp = year+"/"+month+"/"+day
+  
+    return newTimeStamp
+}
+
+//判断时间是否是今天，昨天，七天内，一个月内
+export function judgeTimeStamp(timeStamp){
+    const now = new Date();
+    const targetDate = new Date(timeStamp.toString().slice(0, 4), timeStamp.toString().slice(4, 6) - 1, timeStamp.toString().slice(6, 8));
+  
+    const diffTime = now - targetDate;
+    const diffDays = diffTime / (1000 * 3600 * 24);
+  
+    if (diffDays < 1) {
+      return 1; // 今天
+    } else if (diffDays < 2) {
+      return 2; // 昨天
+    } else if (diffDays < 7) {
+      return 3; // 七天内
+    } else if (diffDays <30) {
+      return 4; // 30天内
+    }
+  
+    return 0; // 超过30天
+
+}
\ No newline at end of file
diff --git a/pages/AI/newTalk.vue b/pages/AI/newTalk.vue
new file mode 100644
index 0000000..470df73
--- /dev/null
+++ b/pages/AI/newTalk.vue
@@ -0,0 +1,93 @@
+<template>
+<view >
+<view class="flex-y pd-10">
+    
+   
+    <view class="flex-x justify-between ">  <u-icon @click="cancel()"  name="close" size="22"></u-icon> <view class="flex-x"> <u-icon name="map-fill" size="22"></u-icon> <text>AI助手</text></view>   <view></view> </view>
+
+   <view class="flex-y m-10">
+    <view class="flex-x "> <u-icon name="map-fill" size="22"></u-icon><text>角色</text> </view>
+<input class="gray-ellipse" type="text" v-model=role placeholder="输入完成任务的角色"><!--角色-->
+<view class="flex-x"> <u-icon name="map-fill" size="22"></u-icon><text>任务</text> </view>
+
+<input class="gray-ellipse" type="text" v-model=task placeholder="描述你要完成的任务"><!--任务-->
+<view class="flex-x"> <u-icon name="map-fill" size="22"></u-icon><text>时间区间</text> </view>
+<input class="gray-ellipse" type="text" v-model=time placeholder="在哪个时间段完成呢"><!--时间区间-->
+<view class="flex-x"> <u-icon name="map-fill" size="22"></u-icon><text>补充要求</text> </view>
+<textarea class="gray-ellipse" cols="30" rows="10" v-model=additional  placeholder="任何补充的要求都可以哦"></textarea><!--补充要求-->
+<view> <text class="tip">tip:如果不输入直接确认可以以默认形式进入AI界面</text></view>
+</view>
+
+<view class="flex-x btn-bottom"><button class="confirm" @click="confirm()">生成安排</button></view>
+</view>
+</view>
+</template>
+
+<script setup>
+
+import {ref} from 'vue'
+
+
+import api from '../../request/api';
+import { useUserStone } from '../../store/userStore';
+import { getTimeStamp } from '../../js/time';
+const userStone = useUserStone()
+
+const date = new Date(); // 获取当前日期和时间
+const year = date.getFullYear(); // 获取年份
+  const month = (date.getMonth() + 1).toString().padStart(2, "0"); // 获取月份，月份从0开始，所以加1
+  const day = date.getDate().toString().padStart(2, "0"); // 获取日期
+
+const role = ref()
+const task = ref()
+const time = ref()
+const additional = ref()
+
+async function confirm(){
+   
+    
+    var res = await api.createNewChat({
+    role: role.value||"你是一个帮我安排任务的时间助手",
+    task: task.value||"待定任务",
+    time: time.value||`${year}-${month}-${day}`,
+    additional: additional.value||"无额外要求",
+    lastUpdateTime:getTimeStamp()
+    })
+    userStone.nowRequestAIHistoryId = res.chatId
+   
+    role.value =""
+    task.value = ""
+    time.value = ""
+    additional.value = ""
+
+    uni.navigateTo({url:'/pages/AI/index'})
+}
+
+function cancel(){
+    uni.navigateTo({url:'/pages/AI/index'})
+}
+</script>
+
+<style scoped>
+.gray-ellipse{
+    background-color: rgb(243, 240, 240);
+    border-radius: 10px;
+    width: 100%;
+    padding: 3px 0px 3px 8px;
+}
+.close-start{
+    margin-right: auto;
+}
+.confirm{
+    background-color: rgb(231, 217, 231);
+    border: 1px solid rgb(163, 120, 163);
+    color: rgb(163, 120, 163);
+}
+.tip{
+    font-size: 12px;
+}
+.btn-bottom{
+    position: relative;
+  
+}
+</style>
\ No newline at end of file
diff --git a/pages/AI/talkHistory.vue b/pages/AI/talkHistory.vue
new file mode 100644
index 0000000..6f1d2d4
--- /dev/null
+++ b/pages/AI/talkHistory.vue
@@ -0,0 +1,109 @@
+<!--ai对话历史记录侧边栏-->
+<template>
+    <view  class="flex-y m-15">
+     <text class="title mb-20">历史对话</text>
+      <view class="flex-y ">
+      
+       <view v-if="today.length>0"><text>今天</text>
+        <view class="flex-y"  v-for="(item,index) in today" :key="index">
+            <view>{{ spiltByLean(item.lastUpdateTime) }}</view>
+          <view class="history-item" @click="pickup(item.chatId)">
+          {{ item.messages[1].content }}
+      </view>
+        </view>
+      </view>
+
+      <view v-if="yesterday.length>0"><text>昨天</text>
+        <view class="flex-y"  v-for="(item,index) in yesterday" :key="index">
+            <view>{{ spiltByLean(item.lastUpdateTime) }}</view>
+          <view class="history-item" @click="pickup(item.chatId)">
+          {{ item.messages[1].content }}
+      </view>
+        </view>
+      </view>
+
+      <view v-if="inWeek.length>0"><text>近七天</text>
+        <view class="flex-y"  v-for="(item,index) in inWeek" :key="index">
+            <view>{{ spiltByLean(item.lastUpdateTime) }}</view>
+          <view class="history-item" @click="pickup(item.chatId)">
+          {{ item.messages[1].content }}
+      </view>
+        </view>
+      </view>
+
+      <view v-if="inMonth.length>0"><text>近一月</text>
+        <view class="flex-y"  v-for="(item,index) in inMonth" :key="index">
+            <view>{{ spiltByLean(item.lastUpdateTime) }}</view>
+          <view class="history-item" @click="pickup(item.chatId)">
+          {{ item.messages[1].content }}
+      </view>
+        </view>
+      </view>
+
+
+
+
+    </view>
+   </view>
+   
+    
+    </template>
+    
+    <script setup>
+    import {onMounted, ref} from 'vue'
+     import { useRequestHistoryStore } from '../../store/requestHistoryStore';
+   import { judgeTimeStamp,spiltByLean } from '../../js/time';
+   import { useUserStone } from '../../store/userStore';
+   const HistoryStore = ref([])
+  const today = ref([])
+  const yesterday = ref([])
+  const inWeek = ref([])
+  const inMonth = ref([])
+  
+onMounted(async()=>{
+  await useRequestHistoryStore().loadHistory() //从后端拉取后赋值
+  HistoryStore.value = useRequestHistoryStore().contents
+ 
+//这里分成今天，昨天，近七天，近一个月
+for (let i in HistoryStore.value){
+ 
+  let res = judgeTimeStamp(HistoryStore.value[i].lastUpdateTime)
+  
+  if(res==1){today.value.push(HistoryStore.value[i])}
+  else if(res==2){yesterday.value.push(HistoryStore.value[i])}
+  else if(res==3){inWeek.value.push(HistoryStore.value[i])}
+  else if(res==4){inMonth.value.push(HistoryStore.value[i])}
+}
+
+
+})
+
+
+
+//选中某个日期，则改变userStone中的当前历史记录标记，并跳转到对话界面
+function pickup(chatId){
+  
+  let index = HistoryStore.value.findIndex((item)=>{return item.chatId ==chatId})
+
+useUserStone().nowRequestAIHistoryId = index+1
+uni.navigateTo({ url: '/pages/AI/index' })
+}
+    </script>
+    
+    <style scopd>
+    
+   .title{
+font-size: 20px;
+font-weight: 600;
+   }
+.history-item{
+  background-color: rgb(227, 225, 225);
+  margin-top: 8px;
+  margin-bottom: 8px;
+  border-radius: 10px;
+  padding: 5px;
+}
+.history-item:hover{
+  background-color: rgb(246, 243, 243);
+}
+    </style>
\ No newline at end of file
diff --git a/static/ai-icon.png b/static/ai-icon.png
new file mode 100644
index 0000000..4917bed
Binary files /dev/null and b/static/ai-icon.png differ
diff --git a/static/loginByPhone_other.png b/static/loginByPhone_other.png
index 394a5af..c75cbd4 100644
Binary files a/static/loginByPhone_other.png and b/static/loginByPhone_other.png differ
diff --git a/static/logo.png b/static/logo.png
index 3443520..33d3e7b 100644
Binary files a/static/logo.png and b/static/logo.png differ