diff --git a/pets-fe/pages/ai/ai.js b/pets-fe/pages/ai/ai.js index f00083e..5587fbb 100644 --- a/pets-fe/pages/ai/ai.js +++ b/pets-fe/pages/ai/ai.js @@ -105,6 +105,9 @@ Page({ this.setData({ scrollInto: 'chat-bottom' }); }, + goAIPlan() { + wx.navigateTo({ url: '/pages/plan/plan?tab=aiPlan' }); + }, onShareAppMessage() { return { title: '肉垫计划 · AI 养宠助手', path: '/pages/ai/ai' }; }, diff --git a/pets-fe/pages/ai/ai.wxml b/pets-fe/pages/ai/ai.wxml index e444230..7fc9b17 100644 --- a/pets-fe/pages/ai/ai.wxml +++ b/pets-fe/pages/ai/ai.wxml @@ -15,6 +15,9 @@ + + 生成养护计划 {{item}} diff --git a/pets-fe/pages/ai/ai.wxss b/pets-fe/pages/ai/ai.wxss index c06e288..3fedd50 100644 --- a/pets-fe/pages/ai/ai.wxss +++ b/pets-fe/pages/ai/ai.wxss @@ -41,3 +41,7 @@ background:var(--line);color:#fff;transition:.16s ease; } .send.on{background:var(--cta)} +.preset-go{ + display:inline-flex;align-items:center;gap:6rpx; + background:var(--primary-soft);color:var(--primary-dark);border-color:var(--primary-line); +} diff --git a/pets-fe/pages/home/home.js b/pets-fe/pages/home/home.js index e5c05ac..5df3acc 100644 --- a/pets-fe/pages/home/home.js +++ b/pets-fe/pages/home/home.js @@ -8,6 +8,38 @@ function todayStr() { return d.getFullYear() + '-' + p(d.getMonth() + 1) + '-' + p(d.getDate()); } +function pad2(n) { + return n < 10 ? '0' + n : '' + n; +} + +// 整月网格。周一为一周起点,前面补空格子对齐星期。 +// 与计划页原来的实现同源——计划页的日历 tab 已并到这里,那边删掉了 +function buildCells(year, month, taskedDays, today) { + const first = new Date(year, month - 1, 1); + const lead = (first.getDay() + 6) % 7; + const daysInMonth = new Date(year, month, 0).getDate(); + const set = {}; + (taskedDays || []).forEach((d) => (set[d] = true)); + const cells = []; + for (let i = 0; i < lead; i++) cells.push({ day: 0 }); + for (let d = 1; d <= daysInMonth; d++) { + cells.push({ day: d, date: year + '-' + pad2(month) + '-' + pad2(d), tasked: !!set[d], today: d === today }); + } + return cells; +} + +// 「接下来」用的相对日期,比 7月31日 更好读 +function whenLabel(date, today) { + if (!date) return ''; + const diff = Math.round((new Date(date + 'T00:00:00') - new Date(today + 'T00:00:00')) / 86400000); + if (diff <= 0) return '今天'; + if (diff === 1) return '明天'; + if (diff === 2) return '后天'; + if (diff < 7) return diff + ' 天后'; + const p = date.split('-'); + return +p[1] + '月' + +p[2] + '日'; +} + function mapTask(t) { return { id: t.id, @@ -56,6 +88,13 @@ Page({ selectedDate: '', taskLabel: '今日任务', todayDate: '', + calOpen: false, + calCells: [], + calLabel: '', + dayNodes: [], + dayReminders: [], + upcoming: [], + planPct: -1, sheetShow: false, sheetType: '', }, @@ -84,6 +123,10 @@ Page({ loadAll() { this.loadSummary(); this.loadTasks(); + this.loadDayExtra(); + this.loadUpcoming(); + // 日历只在展开过之后才跟着刷新,没展开就别白拉一次 + if (this.data.calOpen) this.loadCalendar(); if (!this.data.firstArticle) { api .listArticles() @@ -122,6 +165,57 @@ Page({ : undone > 0 ? '还有 ' + undone + ' 件事没做完' : '今天的事都做完啦', }); }, + // 这天挂着的计划节点和到期提醒。任务列表仍走 /tasks(那边会补生成当天任务), + // day-plan 只取 tasks 之外的两类,不拿它的 tasks 覆盖列表 + loadDayExtra() { + const id = store.currentPetId(); + if (!id) return; + const date = this.data.selectedDate || this.data.todayDate; + api + .dayPlan(id, date) + .then((res) => { + this.setData({ + dayNodes: (res.plan_nodes || []).map((n) => ({ title: n.title, done: n.done })), + dayReminders: (res.reminders || []).map((r) => ({ title: r.title })), + }); + }) + .catch(() => this.setData({ dayNodes: [], dayReminders: [] })); + }, + // 30 天计划里最近 3 个还没做的节点 + loadUpcoming() { + const id = store.currentPetId(); + if (!id) return; + const today = this.data.todayDate; + api + .getPlan(id) + .then((plan) => { + const list = ((plan && plan.tasks) || []) + .filter((t) => !t.done && t.date && t.date >= today) + .sort((a, b) => (a.date < b.date ? -1 : 1)) + .slice(0, 3) + .map((t) => ({ id: t.id, title: t.title, description: t.description, whenLabel: whenLabel(t.date, today) })); + this.setData({ upcoming: list, planPct: plan ? plan.completion_pct || 0 : -1 }); + }) + .catch(() => this.setData({ upcoming: [], planPct: -1 })); + }, + loadCalendar() { + const id = store.currentPetId(); + if (!id) return; + api + .planCalendar(id) + .then((res) => { + this.setData({ + calCells: buildCells(res.year, res.month, res.tasked_days, res.today), + calLabel: `${res.year} 年 ${res.month} 月`, + }); + }) + .catch(() => {}); + }, + toggleCal() { + const open = !this.data.calOpen; + this.setData({ calOpen: open }); + if (open && !this.data.calCells.length) this.loadCalendar(); + }, onTapDay(e) { const { date, active } = e.currentTarget.dataset; if (!date) return; @@ -131,10 +225,15 @@ Page({ taskLabel: active ? '今日任务' : +parts[1] + '月' + +parts[2] + '日', }); this.loadTasks(); + this.loadDayExtra(); }, backToToday() { this.setData({ selectedDate: this.data.todayDate, taskLabel: '今日任务' }); this.loadTasks(); + this.loadDayExtra(); + }, + goPlan() { + wx.navigateTo({ url: '/pages/plan/plan' }); }, onTapTask(e) { const i = e.currentTarget.dataset.index; @@ -178,6 +277,8 @@ Page({ onSheetSave() { this.loadTasks(); this.loadSummary(); + this.loadDayExtra(); + if (this.data.calOpen) this.loadCalendar(); // 加了任务,格子上的圆点要跟着变 }, onAddPet() { this.openSheetType('addPet'); diff --git a/pets-fe/pages/home/home.wxml b/pets-fe/pages/home/home.wxml index 9a5e11d..9a86a2d 100644 --- a/pets-fe/pages/home/home.wxml +++ b/pets-fe/pages/home/home.wxml @@ -35,11 +35,27 @@ {{pet.age}}|{{pet.weight}}|{{pet.stage}} - - - {{item.weekday}}{{item.day}} + + + + + {{item.weekday}}{{item.day}} + + + + {{calLabel}} + + + {{item.day || ''}} + + + + {{calOpen ? '收起' : '展开整月'}} @@ -60,6 +76,33 @@ 这天没有任务记录 + + + + + 计划{{item.title}} + + + 提醒{{item.title}} + + + + + + + + 接下来 + 完整计划 + + 30 天计划完成度{{planPct}}% + + + + {{item.whenLabel}} + {{item.title}}{{item.description}} + + diff --git a/pets-fe/pages/home/home.wxss b/pets-fe/pages/home/home.wxss index 5b5102b..eb8e99c 100644 --- a/pets-fe/pages/home/home.wxss +++ b/pets-fe/pages/home/home.wxss @@ -39,3 +39,45 @@ .ai-text{color:var(--text-2);font-size:var(--fs-md);line-height:1.6} .ai-cta{margin-top:var(--sp-4)} + +/* ===== 日期带(原计划页「日历」tab 并过来) ===== */ +.date-band{margin-bottom:var(--sp-4)} +.date-band .date-strip{margin-bottom:0} +.cal-card{margin-bottom:0} +.cal-toggle{ + display:flex;align-items:center;justify-content:center;gap:4rpx; + padding:var(--sp-2) 0;font-size:var(--fs-cap);color:var(--muted); +} +.cal-head{display:flex;justify-content:space-between;align-items:center;margin-bottom:var(--sp-3);font-weight:var(--fw-b);font-size:var(--fs-lg)} +.cal-grid{display:grid;grid-template-columns:repeat(7,1fr);gap:var(--sp-2);text-align:center} +.cal-w{font-size:var(--fs-cap);color:var(--muted);padding:var(--sp-1) 0} +.cal-cell{ + height:76rpx;border-radius:var(--r-sm);display:flex;align-items:center;justify-content:center; + font-weight:var(--fw-b);font-size:var(--fs-sm);background:var(--surface-2);position:relative; +} +.cal-cell.blank{background:transparent} +.cal-cell.today{background:var(--primary-soft);color:var(--primary-dark)} +.cal-cell.tasked::after{content:"";position:absolute;bottom:8rpx;width:8rpx;height:8rpx;border-radius:50%;background:var(--green)} +.cal-cell.sel{background:var(--primary);color:#fff} +.cal-cell.sel.tasked::after{background:#fff} + +/* 某天的安排 */ +.day-detail{margin-top:var(--sp-3);border-top:1rpx solid var(--line);padding-top:var(--sp-4)} +.dd-title{font-weight:var(--fw-b);font-size:var(--fs-md);margin-bottom:var(--sp-3)} +.dd-item{display:flex;align-items:center;gap:var(--sp-3);padding:var(--sp-2) 0} +.dd-tag{flex:none;font-size:var(--fs-cap);font-weight:var(--fw-b);padding:2rpx var(--sp-2);border-radius:var(--r-full)} +.dd-tag.plan{background:var(--primary-soft);color:var(--primary-ink)} +.dd-tag.task{background:var(--green-soft);color:var(--green-ink)} +.dd-tag.rem{background:var(--blue-soft);color:var(--blue-ink)} +.dd-b{font-size:var(--fs-md);color:var(--text)} +.dd-b.done{text-decoration:line-through;color:var(--muted)} + +/* ===== 接下来 ===== */ +.up-list{margin-top:var(--sp-3)} +.up-item{display:flex;gap:var(--sp-3);padding:var(--sp-3) 0;border-top:1rpx solid var(--line)} +.up-item:first-child{border-top:none;padding-top:0} +.up-when{ + flex:none;width:112rpx;font-size:var(--fs-cap);font-weight:var(--fw-b); + color:var(--primary-dark);padding-top:4rpx; +} +.up-body{flex:1;min-width:0} diff --git a/pets-fe/pages/plan/plan.js b/pets-fe/pages/plan/plan.js index 17f33d7..de92fdb 100644 --- a/pets-fe/pages/plan/plan.js +++ b/pets-fe/pages/plan/plan.js @@ -10,51 +10,27 @@ function fmtMD(date) { return +p[1] + '月' + +p[2] + '日'; } -function pad2(n) { - return n < 10 ? '0' + n : '' + n; -} - -function buildCells(year, month, taskedDays, today) { - const first = new Date(year, month - 1, 1); - const lead = (first.getDay() + 6) % 7; // 周一为一周起点 - const daysInMonth = new Date(year, month, 0).getDate(); - const set = {}; - (taskedDays || []).forEach((d) => (set[d] = true)); - const cells = []; - for (let i = 0; i < lead; i++) cells.push({ day: 0 }); - for (let d = 1; d <= daysInMonth; d++) { - cells.push({ day: d, date: year + '-' + pad2(month) + '-' + pad2(d), tasked: !!set[d], today: d === today }); - } - return cells; -} - Page({ data: { pet: {}, planView: 'timeline', planTabs: [ { key: 'timeline', label: '路线图' }, - { key: 'calendar', label: '日历' }, { key: 'aiPlan', label: 'AI 计划' }, ], plan: null, - calCells: [], - calLabel: '', - calLoaded: false, - selectedCalDate: '', - dayDetail: null, aiInput: '', aiPlan: null, aiBusy: false, sheetShow: false, sheetType: '', }, - onLoad() { + onLoad(options) { + if (options && options.tab === 'aiPlan') this.setData({ planView: 'aiPlan' }); this._unsub = store.subscribe((pet) => { - this.setData({ pet, calLoaded: false }); + this.setData({ pet }); if (!this._inited) return; // 首次由 onShow 加载 this.loadTimeline(); - if (this.data.planView === 'calendar') this.loadCalendar(); }); }, onUnload() { @@ -83,48 +59,9 @@ Page({ }) .catch(() => this.setData({ plan: null })); }, - loadCalendar() { - const id = store.currentPetId(); - if (!id) return; - api - .planCalendar(id) - .then((res) => { - this.setData({ - calCells: buildCells(res.year, res.month, res.tasked_days, res.today), - calLabel: `${res.year} 年 ${res.month} 月`, - calLoaded: true, - }); - if (res.today) { - this.selectCalDay(res.year + '-' + pad2(res.month) + '-' + pad2(res.today)); - } - }) - .catch(() => {}); - }, - onTapCalDay(e) { - const date = e.currentTarget.dataset.date; - if (date) this.selectCalDay(date); - }, - selectCalDay(date) { - const id = store.currentPetId(); - if (!id) return; - this.setData({ selectedCalDate: date }); - api - .dayPlan(id, date) - .then((res) => { - const nodes = (res.plan_nodes || []).map((n) => ({ title: n.title, desc: n.description, done: n.done })); - const tasks = (res.tasks || []).map((t) => ({ title: t.title, desc: t.description, done: t.done })); - const reminders = (res.reminders || []).map((r) => ({ title: r.title })); - this.setData({ - dayDetail: { date, nodes, tasks, reminders, empty: !nodes.length && !tasks.length && !reminders.length }, - }); - }) - .catch(() => {}); - }, // 来自 seg-tabs 的 change 事件,key 即 planView switchPlanView(e) { - const view = e.detail.key; - this.setData({ planView: view }); - if (view === 'calendar' && !this.data.calLoaded) this.loadCalendar(); + this.setData({ planView: e.detail.key }); }, // 计划明细勾选 toggleTimelineTask(e) { diff --git a/pets-fe/pages/plan/plan.wxml b/pets-fe/pages/plan/plan.wxml index 9bcaaef..225d1af 100644 --- a/pets-fe/pages/plan/plan.wxml +++ b/pets-fe/pages/plan/plan.wxml @@ -37,36 +37,6 @@ - - - - {{calLabel}}提醒 - - - {{item.day || ''}} - - - - - {{dayDetail.date}} 的安排 - - - 计划{{item.title}} - - - 任务{{item.title}} - - - 提醒{{item.title}} - - - 这天没有安排 - - - - AI 计划模式Plan diff --git a/pets-fe/pages/plan/plan.wxss b/pets-fe/pages/plan/plan.wxss index 179cd70..0f496cc 100644 --- a/pets-fe/pages/plan/plan.wxss +++ b/pets-fe/pages/plan/plan.wxss @@ -24,31 +24,6 @@ .ai-plan-tip{color:var(--muted);font-size:var(--fs-sm);line-height:1.6;margin-bottom:var(--sp-3)} /* 日历 */ -.calendar{background:#fff;border-radius:var(--r-lg);padding:var(--sp-4);box-shadow:var(--sd-1)} -.cal-head{display:flex;justify-content:space-between;align-items:center;margin-bottom:var(--sp-3);font-weight:var(--fw-b);font-size:var(--fs-lg)} -.cal-grid{display:grid;grid-template-columns:repeat(7,1fr);gap:var(--sp-2);text-align:center} -.cal-w{font-size:var(--fs-cap);color:var(--muted);padding:var(--sp-1) 0} -.cal-cell{ - height:76rpx;border-radius:var(--r-sm);display:flex;align-items:center;justify-content:center; - font-weight:var(--fw-b);font-size:var(--fs-sm);background:var(--surface-2);position:relative; -} -.cal-cell.blank{background:transparent} -.cal-cell.today{background:var(--primary-soft);color:var(--primary-dark)} -.cal-cell.tasked::after{content:"";position:absolute;bottom:8rpx;width:8rpx;height:8rpx;border-radius:50%;background:var(--green)} -.cal-cell.sel{background:var(--primary);color:#fff} -.cal-cell.sel.tasked::after{background:#fff} - -/* 某天的安排 */ -.day-detail{margin-top:var(--sp-4);border-top:1rpx solid var(--line);padding-top:var(--sp-4)} -.dd-title{font-weight:var(--fw-b);font-size:var(--fs-md);margin-bottom:var(--sp-3)} -.dd-item{display:flex;align-items:center;gap:var(--sp-3);padding:var(--sp-2) 0} -.dd-tag{flex:none;font-size:var(--fs-cap);font-weight:var(--fw-b);padding:2rpx var(--sp-2);border-radius:var(--r-full)} -.dd-tag.plan{background:var(--primary-soft);color:var(--primary-ink)} -.dd-tag.task{background:var(--green-soft);color:var(--green-ink)} -.dd-tag.rem{background:var(--blue-soft);color:var(--blue-ink)} -.dd-b{font-size:var(--fs-md);color:var(--text)} -.dd-b.done{text-decoration:line-through;color:var(--muted)} - /* AI 提取信息 */ .extracted{display:grid;grid-template-columns:1fr 1fr;gap:var(--sp-3);margin:var(--sp-4) 0} .extract{background:var(--surface-2);border-radius:var(--r-sm);padding:var(--sp-3);font-size:var(--fs-sm)} diff --git a/pets-fe/styles/iconfont.wxss b/pets-fe/styles/iconfont.wxss index 8f6cbcd..100f691 100644 --- a/pets-fe/styles/iconfont.wxss +++ b/pets-fe/styles/iconfont.wxss @@ -40,3 +40,5 @@ .pt-i-dog{--m:url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyNCAyNCIgZmlsbD0ibm9uZSIgc3Ryb2tlPSIjMDAwIiBzdHJva2Utd2lkdGg9IjIiIHN0cm9rZS1saW5lY2FwPSJyb3VuZCIgc3Ryb2tlLWxpbmVqb2luPSJyb3VuZCIgPjxwYXRoIGQ9Ik0xMSA1aDIiIC8+PHBhdGggZD0iTTE5IDEyYy0uNjY3IDUuMzMzIC0yLjMzMyA4IC01IDhoLTRjLTIuNjY3IDAgLTQuMzMzIC0yLjY2NyAtNSAtOCIgLz48cGF0aCBkPSJNMTEgMTZjMCAuNjY3IC4zMzMgMSAxIDFzMSAtLjMzMyAxIC0xaC0yIiAvPjxwYXRoIGQ9Ik0xMiAxOHYyIiAvPjxwYXRoIGQ9Ik0xMCAxMXYuMDEiIC8+PHBhdGggZD0iTTE0IDExdi4wMSIgLz48cGF0aCBkPSJNNSA0bDYgLjk3bC02LjIzOCA2LjY4OGExLjAyMSAxLjAyMSAwIDAgMSAtMS40MSAuMTExYS45NTMgLjk1MyAwIDAgMSAtLjMyNyAtLjk1NGwxLjk3NSAtNi44MTUiIC8+PHBhdGggZD0iTTE5IDRsLTYgLjk3bDYuMjM4IDYuNjg4Yy4zNTggLjQwOCAuOTg5IC40NTggMS40MSAuMTExYS45NTMgLjk1MyAwIDAgMCAuMzI3IC0uOTU0bC0xLjk3NSAtNi44MTUiIC8+PC9zdmc+")} .pt-i-user{--m:url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyNCAyNCIgZmlsbD0ibm9uZSIgc3Ryb2tlPSIjMDAwIiBzdHJva2Utd2lkdGg9IjIiIHN0cm9rZS1saW5lY2FwPSJyb3VuZCIgc3Ryb2tlLWxpbmVqb2luPSJyb3VuZCIgPjxwYXRoIGQ9Ik04IDdhNCA0IDAgMSAwIDggMGE0IDQgMCAwIDAgLTggMCIgLz48cGF0aCBkPSJNNiAyMXYtMmE0IDQgMCAwIDEgNCAtNGg0YTQgNCAwIDAgMSA0IDR2MiIgLz48L3N2Zz4=")} .pt-i-clock{--m:url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyNCAyNCIgZmlsbD0ibm9uZSIgc3Ryb2tlPSIjMDAwIiBzdHJva2Utd2lkdGg9IjIiIHN0cm9rZS1saW5lY2FwPSJyb3VuZCIgc3Ryb2tlLWxpbmVqb2luPSJyb3VuZCIgPjxwYXRoIGQ9Ik0zIDEyYTkgOSAwIDEgMCAxOCAwYTkgOSAwIDAgMCAtMTggMCIgLz48cGF0aCBkPSJNMTIgN3Y1bDMgMyIgLz48L3N2Zz4=")} +.pt-i-up{--m:url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyNCAyNCIgZmlsbD0ibm9uZSIgc3Ryb2tlPSIjMDAwIiBzdHJva2Utd2lkdGg9IjIiIHN0cm9rZS1saW5lY2FwPSJyb3VuZCIgc3Ryb2tlLWxpbmVqb2luPSJyb3VuZCIgPjxwYXRoIGQ9Ik02IDE1bDYgLTZsNiA2IiAvPjwvc3ZnPg==")} +.pt-i-down{--m:url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyNCAyNCIgZmlsbD0ibm9uZSIgc3Ryb2tlPSIjMDAwIiBzdHJva2Utd2lkdGg9IjIiIHN0cm9rZS1saW5lY2FwPSJyb3VuZCIgc3Ryb2tlLWxpbmVqb2luPSJyb3VuZCIgPjxwYXRoIGQ9Ik02IDlsNiA2bDYgLTYiIC8+PC9zdmc+")}