From d4aa7399663a4f815c7e277a2449ed23f4cacceb Mon Sep 17 00:00:00 2001 From: scorpio Date: Fri, 17 Oct 2025 21:29:19 +0800 Subject: [PATCH 1/3] 0.0.1 --- pages/add/info.js | 12 +++++++++--- pages/login/index.wxss | 3 +++ project.private.config.json | 4 ++-- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/pages/add/info.js b/pages/add/info.js index 1049aa2..a8dc716 100644 --- a/pages/add/info.js +++ b/pages/add/info.js @@ -77,9 +77,15 @@ Page({ } api('/plant/plantByLibrary', 'GET', data).then(res => { if (res.code === 200) { - wx.navigateTo({ - url: '../about/index?type=1', - }) + if (user.mpOpenId.length > 0){ + wx.switchTab({ + url: '../index/index', + }) + } else { + wx.navigateTo({ + url: '../about/index?type=1', + }) + } } }) }, diff --git a/pages/login/index.wxss b/pages/login/index.wxss index 5301e22..75929d2 100644 --- a/pages/login/index.wxss +++ b/pages/login/index.wxss @@ -1,4 +1,7 @@ /* pages/login/index.wxss */ +page { + background-color: white; +} .bg { height: 60vh; width: 90vw; diff --git a/project.private.config.json b/project.private.config.json index db9afdb..7350aec 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -27,8 +27,8 @@ "name": "pages/about/index", "pathName": "pages/about/index", "query": "", - "scene": null, - "launchMode": "default" + "launchMode": "default", + "scene": null }, { "name": "pages/index/info", From ea5a23259abf590f0edbec4ee2b51ea6e234538d Mon Sep 17 00:00:00 2001 From: scorpio Date: Fri, 17 Oct 2025 21:43:58 +0800 Subject: [PATCH 2/3] 0.0.1 --- app.json | 3 +- pages/add/info.js | 6 ++++ pages/add/info.wxml | 2 +- pages/preview/index.js | 66 ++++++++++++++++++++++++++++++++++++++++ pages/preview/index.json | 5 +++ pages/preview/index.wxml | 6 ++++ pages/preview/index.wxss | 4 +++ 7 files changed, 90 insertions(+), 2 deletions(-) create mode 100644 pages/preview/index.js create mode 100644 pages/preview/index.json create mode 100644 pages/preview/index.wxml create mode 100644 pages/preview/index.wxss diff --git a/app.json b/app.json index 9d49623..85efc4b 100644 --- a/app.json +++ b/app.json @@ -8,7 +8,8 @@ "pages/index/info", "pages/index/edit", "pages/about/index", - "pages/today/index" + "pages/today/index", + "pages/preview/index" ], "window": { "navigationBarTextStyle": "black", diff --git a/pages/add/info.js b/pages/add/info.js index a8dc716..6d47a38 100644 --- a/pages/add/info.js +++ b/pages/add/info.js @@ -58,6 +58,12 @@ Page({ } }) }, + goPreview(e){ + const url = e.currentTarget.dataset.url + wx.navigateTo({ + url: '../preview/index?url=' + url, + }) + }, add() { const user = wx.getStorageSync('user') console.log(user); diff --git a/pages/add/info.wxml b/pages/add/info.wxml index edd4875..22f87dc 100644 --- a/pages/add/info.wxml +++ b/pages/add/info.wxml @@ -3,7 +3,7 @@ - + diff --git a/pages/preview/index.js b/pages/preview/index.js new file mode 100644 index 0000000..333884b --- /dev/null +++ b/pages/preview/index.js @@ -0,0 +1,66 @@ +// pages/preview/index.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + url:'' + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + this.setData({url:options.url}) + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/pages/preview/index.json b/pages/preview/index.json new file mode 100644 index 0000000..c20e30e --- /dev/null +++ b/pages/preview/index.json @@ -0,0 +1,5 @@ +{ + "navigationBarBackgroundColor": "#000", + "navigationBarTextStyle":"white", + "usingComponents": {} +} \ No newline at end of file diff --git a/pages/preview/index.wxml b/pages/preview/index.wxml new file mode 100644 index 0000000..68845a2 --- /dev/null +++ b/pages/preview/index.wxml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/pages/preview/index.wxss b/pages/preview/index.wxss new file mode 100644 index 0000000..e565a5d --- /dev/null +++ b/pages/preview/index.wxss @@ -0,0 +1,4 @@ +/* pages/preview/index.wxss */ +page { + background-color: black; +} \ No newline at end of file From 79b1af6bb6953ca3f3001c51e08e8b42220a57bb Mon Sep 17 00:00:00 2001 From: scorpio Date: Sat, 18 Oct 2025 21:01:17 +0800 Subject: [PATCH 3/3] 0.0.1 --- pages/index/info.js | 7 +++++++ pages/index/info.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/pages/index/info.js b/pages/index/info.js index 7362270..c991678 100644 --- a/pages/index/info.js +++ b/pages/index/info.js @@ -39,6 +39,13 @@ Page({ }) }, + goPreview(e){ + const url = e.currentTarget.dataset.url + wx.navigateTo({ + url: '../preview/index?url=' + url, + }) + }, + addFarmLog(e){ const item = e.currentTarget.dataset.item const data = {id:item.id,plantId:item.plantId, name:item.name,remark:'测试',status:2} diff --git a/pages/index/info.json b/pages/index/info.json index 4d27e19..a89b33f 100644 --- a/pages/index/info.json +++ b/pages/index/info.json @@ -2,6 +2,6 @@ "navigationStyle": "custom", "usingComponents": { "t-swiper": "tdesign-miniprogram/swiper/swiper", - "t-swiper-nav": "tdesign-miniprogram/swiper-nav/swiper-nav" + "t-swiper-nav": "tdesign-miniprogram/swiper-nav/swiper-nav" } } \ No newline at end of file