From 1ba0a323dbdc1bd6ee90b884354450949735374b Mon Sep 17 00:00:00 2001 From: jin0209 <270246430@qq.com> Date: Mon, 3 Mar 2025 11:13:18 +0800 Subject: [PATCH 1/7] =?UTF-8?q?feat(release):=20=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E9=A1=B5=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.less | 10 ----- pages/release/index.less | 33 ++++++++-------- pages/release/index.wxml | 82 ++++++++++++---------------------------- 3 files changed, 41 insertions(+), 84 deletions(-) diff --git a/app.less b/app.less index 77cdbf6..d5d4f06 100644 --- a/app.less +++ b/app.less @@ -1,14 +1,4 @@ /**app.wxss**/ -.container { - height: 100%; - display: flex; - flex-direction: column; - align-items: center; - justify-content: space-between; - padding: 200rpx 0; - box-sizing: border-box; -} - page { background-color: #f3f3f3; } diff --git a/pages/release/index.less b/pages/release/index.less index 686bed6..c8ae869 100644 --- a/pages/release/index.less +++ b/pages/release/index.less @@ -1,19 +1,20 @@ /* pages/release/index.wxss */ -@import url('../../app.less'); -@zero: 0; -@multi: 2; -@pad32: 32rpx; .release-container { - .container; - padding: @zero; + display: flex; + flex-direction: column; + align-items: center; + justify-content: space-between; + padding: 0; + box-sizing: border-box; + .box { width: 100%; } .upload { - height: 112rpx * @multi; + height: 112rpx * 2; position: relative; &-class { - width: 344rpx * @multi; + width: 344rpx * 2; position: absolute; top: 50%; left: 50%; @@ -21,21 +22,21 @@ } } .desc { - height: 132rpx * @multi; + height: 132rpx * 2; display: flex; - padding: @pad32; + padding: 32rpx; align-items: flex-start; justify-content: space-between; box-sizing: border-box; .desc-class { - width: 246rpx * @multi; + width: 246rpx * 2; height: 100%; - padding: @zero; + padding: 0; } } .taggroup { .cell-title-class { - width: 81rpx * @multi; + width: 81rpx * 2; } .cell-note-class { overflow-x: auto; @@ -48,12 +49,12 @@ .btngroup { display: flex; justify-content: space-evenly; - padding: @pad32; + padding: 32rpx; position: fixed; bottom: 64rpx; .btn-class { - width: 163.5rpx * @multi; - margin: @zero; + width: 163.5rpx * 2; + margin: 0; } } } diff --git a/pages/release/index.wxml b/pages/release/index.wxml index 3643b51..9d61c77 100644 --- a/pages/release/index.wxml +++ b/pages/release/index.wxml @@ -1,60 +1,26 @@ - - - + + + + + + + 添加描述 + + + + + + + + + + + + + + + + - - 添加描述 - - - - - - - - - - - - - - - - - + \ No newline at end of file From 59509437d6a993592f8ae63ea04594b97d3d1db5 Mon Sep 17 00:00:00 2001 From: jin0209 <270246430@qq.com> Date: Mon, 3 Mar 2025 15:40:26 +0800 Subject: [PATCH 2/7] =?UTF-8?q?feat(chat):=20=E7=BB=9F=E4=B8=80page?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/chat/index.less | 3 ++- pages/chat/index.wxml | 57 +++++++++++++++++++++++-------------------- 2 files changed, 32 insertions(+), 28 deletions(-) diff --git a/pages/chat/index.less b/pages/chat/index.less index 6ad7732..dc8246d 100644 --- a/pages/chat/index.less +++ b/pages/chat/index.less @@ -1,10 +1,11 @@ /* pages/chat/index.wxss */ -page { +.chat-container { display: flex; flex-direction: column; box-sizing: border-box; height: 100vh; font-size: 32rpx; + background-color: #fff; } .nav-bar { diff --git a/pages/chat/index.wxml b/pages/chat/index.wxml index 38ec8c8..0230c4a 100644 --- a/pages/chat/index.wxml +++ b/pages/chat/index.wxml @@ -1,37 +1,40 @@ - - - - {{ utils.formatTime(item.time) }} - - - {{ item.content }} - + + + + + {{ utils.formatTime(item.time) }} + + + + {{ item.content }} + + + - - - - - - {{ item.content }} + + + + {{ item.content }} + - - - - - + + + + + From 88d674b3e1bd824d5538931cffa134e21545339e Mon Sep 17 00:00:00 2001 From: jin0209 <270246430@qq.com> Date: Mon, 3 Mar 2025 15:40:45 +0800 Subject: [PATCH 3/7] =?UTF-8?q?feat(search):=20=E7=BB=9F=E4=B8=80page?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/search/index.wxml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/search/index.wxml b/pages/search/index.wxml index 4dc2407..b52924a 100644 --- a/pages/search/index.wxml +++ b/pages/search/index.wxml @@ -1,5 +1,5 @@ - + Date: Mon, 3 Mar 2025 17:33:25 +0800 Subject: [PATCH 4/7] =?UTF-8?q?feat(mock):=20=E8=BF=81=E7=A7=BBservice?= =?UTF-8?q?=E5=88=B0mock?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.js | 2 +- {services => mock}/chat.js | 7 ++++++- mock/index.js | 3 ++- mock/search/getSearchHistory.js | 8 ++++++++ mock/search/getSearchPopular.js | 15 +++++++++++++++ mock/search/index.js | 4 ++++ model/search.js | 33 --------------------------------- pages/message/index.js | 2 +- pages/search/index.js | 26 +++++++++++--------------- services/delay.js | 6 ------ services/fetchSearchHistory.js | 33 --------------------------------- 11 files changed, 48 insertions(+), 91 deletions(-) rename {services => mock}/chat.js (96%) create mode 100644 mock/search/getSearchHistory.js create mode 100644 mock/search/getSearchPopular.js create mode 100644 mock/search/index.js delete mode 100644 model/search.js delete mode 100644 services/delay.js delete mode 100644 services/fetchSearchHistory.js diff --git a/app.js b/app.js index f4a3300..d40e174 100644 --- a/app.js +++ b/app.js @@ -2,7 +2,7 @@ import config from './config'; import Mock from './mock/index'; import createBus from './utils/eventBus'; -import { connectSocket, fetchUnreadNum } from './services/chat'; +import { connectSocket, fetchUnreadNum } from './mock/chat'; if (config.isMock) { Mock(); diff --git a/services/chat.js b/mock/chat.js similarity index 96% rename from services/chat.js rename to mock/chat.js index 10d89aa..10f7930 100644 --- a/services/chat.js +++ b/mock/chat.js @@ -1,4 +1,9 @@ -import delay from './delay'; +/** 模拟网络请求的延迟 */ +function delay(ms = 500) { + return new Promise((resolve) => { + setTimeout(resolve, ms); + }); +} // 模拟聊天数据 const mockData = [ diff --git a/mock/index.js b/mock/index.js index 3fe6963..ec4fdea 100644 --- a/mock/index.js +++ b/mock/index.js @@ -2,12 +2,13 @@ import Mock from './WxMock'; // 导入包含path和data的对象 import loginMock from './login/index'; import homeMock from './home/index'; +import searchMock from './search/index'; import dataCenter from './dataCenter/index'; import my from './my/index'; export default () => { // 在这里添加新的mock数据 - const mockData = [...loginMock, ...homeMock, ...dataCenter, ...my]; + const mockData = [...loginMock, ...homeMock, ...searchMock, ...dataCenter, ...my]; mockData.forEach((item) => { Mock.mock(item.path, { code: 200, success: true, data: item.data }); }); diff --git a/mock/search/getSearchHistory.js b/mock/search/getSearchHistory.js new file mode 100644 index 0000000..4e7f033 --- /dev/null +++ b/mock/search/getSearchHistory.js @@ -0,0 +1,8 @@ +export default { + path: '/api/searchHistory', + code: 200, + message: '请求成功', + data: { + historyWords: ['AI绘画', 'Stable Diffusion', '版权素材', '星空', 'illustration', '原创'] + }, +}; diff --git a/mock/search/getSearchPopular.js b/mock/search/getSearchPopular.js new file mode 100644 index 0000000..7618001 --- /dev/null +++ b/mock/search/getSearchPopular.js @@ -0,0 +1,15 @@ +export default { + path: '/api/searchPopular', + code: 200, + message: '请求成功', + data: { + popularWords: [ + '考研和靠边同时上岸应该怎么选？有哪些参考建议', + '日常饮食中，如何选择优质蛋白', + '你有没有网购维权成功的经历？求分享经验', + '夏季带孩子旅游，你的必备物品有哪些', + '在海外越卖越贵，中国汽车做对了什么', + '当HR问你离职原因，怎么回答最能被接受', + ], + }, +}; diff --git a/mock/search/index.js b/mock/search/index.js new file mode 100644 index 0000000..22dc2ef --- /dev/null +++ b/mock/search/index.js @@ -0,0 +1,4 @@ +import getSearchHistory from './getSearchHistory'; +import getSearchPopular from './getSearchPopular'; + +export default [getSearchHistory, getSearchPopular]; diff --git a/model/search.js b/model/search.js deleted file mode 100644 index dd0eeeb..0000000 --- a/model/search.js +++ /dev/null @@ -1,33 +0,0 @@ -/** - * @param {number} sort - * @param {number} pageNum - * @param {number} pageSize - * @param {number} minPrice - * @param {number} maxPrice - * @param {string} keyword - */ - -/** - * 获取搜索历史 - */ -export function getSearchHistoryMock() { - return { - historyWords: ['AI绘画', 'Stable Diffusion', '版权素材', '星空', 'illustration', '原创'], - }; -} - -/** - *获取搜索热词 - */ -export function getSearchPopularMock() { - return { - popularWords: [ - '考研和靠边同时上岸应该怎么选？有哪些参考建议', - '日常饮食中，如何选择优质蛋白', - '你有没有网购维权成功的经历？求分享经验', - '夏季带孩子旅游，你的必备物品有哪些', - '在海外越卖越贵，中国汽车做对了什么', - '当HR问你离职原因，怎么回答最能被接受', - ], - }; -} diff --git a/pages/message/index.js b/pages/message/index.js index ea0cf0d..2cf9bfd 100644 --- a/pages/message/index.js +++ b/pages/message/index.js @@ -1,5 +1,5 @@ // pages/message/message.js -import { fetchMessageList, markMessagesRead } from '~/services/chat'; +import { fetchMessageList, markMessagesRead } from '~/mock/chat'; const app = getApp(); const { socket } = app.globalData; // 获取已连接的 socketTask diff --git a/pages/search/index.js b/pages/search/index.js index a5a720d..afb155a 100644 --- a/pages/search/index.js +++ b/pages/search/index.js @@ -1,4 +1,4 @@ -import { getSearchHistory, getSearchPopular } from '~/services/fetchSearchHistory'; +import request from '~/api/request'; Page({ data: { @@ -26,18 +26,16 @@ Page({ * @returns {Promise} */ async queryHistory() { - try { - const data = await getSearchHistory(); - const code = 'Success'; - if (String(code).toUpperCase() === 'SUCCESS') { + request('/api/searchHistory').then((res) => { + const {code, data} = res; + + if (code === 200) { const { historyWords = [] } = data; this.setData({ historyWords, }); } - } catch (error) { - console.error(error); - } + }); }, /** @@ -45,18 +43,16 @@ Page({ * @returns {Promise} */ async queryPopular() { - try { - const data = await getSearchPopular(); - const code = 'Success'; - if (String(code).toUpperCase() === 'SUCCESS') { + request('/api/searchPopular').then((res) => { + const {code, data} = res; + + if (code === 200) { const { popularWords = [] } = data; this.setData({ popularWords, }); } - } catch (error) { - console.error(error); - } + }); }, setHistoryWords(searchValue) { diff --git a/services/delay.js b/services/delay.js deleted file mode 100644 index 0a92b62..0000000 --- a/services/delay.js +++ /dev/null @@ -1,6 +0,0 @@ -/** 模拟网络请求的延迟 */ -export default function delay(ms = 500) { - return new Promise((resolve) => { - setTimeout(resolve, ms); - }); -} diff --git a/services/fetchSearchHistory.js b/services/fetchSearchHistory.js deleted file mode 100644 index 6b39db4..0000000 --- a/services/fetchSearchHistory.js +++ /dev/null @@ -1,33 +0,0 @@ -import { config } from '~/config/index'; -import delay from './delay'; -import { getSearchHistoryMock, getSearchPopularMock } from '~/model/search'; - -/** 获取搜索历史 */ -function mockSearchHistory() { - return delay().then(() => getSearchHistoryMock()); -} - -/** 获取搜索历史 */ -export function getSearchHistory() { - if (config.useMock) { - return mockSearchHistory(); - } - return new Promise((resolve) => { - resolve('real api'); - }); -} - -/** 获取搜索热点 */ -function mockSearchPopular() { - return delay().then(() => getSearchPopularMock()); -} - -/** 获取搜索热点 */ -export function getSearchPopular() { - if (config.useMock) { - return mockSearchPopular(); - } - return new Promise((resolve) => { - resolve('real api'); - }); -} From 34db01c93b62ac846c77fd28d3eb3ac2f8890a7d Mon Sep 17 00:00:00 2001 From: jin0209 <270246430@qq.com> Date: Mon, 3 Mar 2025 22:43:52 +0800 Subject: [PATCH 5/7] =?UTF-8?q?feat(home):=20=E9=A6=96=E9=A1=B5=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/home/index.js | 2 +- pages/home/index.less | 49 ++++--------------------------------------- pages/home/index.wxml | 25 +++++++++++----------- 3 files changed, 17 insertions(+), 59 deletions(-) diff --git a/pages/home/index.js b/pages/home/index.js index c483d84..c4fb696 100644 --- a/pages/home/index.js +++ b/pages/home/index.js @@ -69,7 +69,7 @@ Page({ showOperMsg(content) { Message.success({ context: this, - offset: [20, 32], + offset: [120, 32], duration: 4000, content, }); diff --git a/pages/home/index.less b/pages/home/index.less index b96eb98..69f161c 100644 --- a/pages/home/index.less +++ b/pages/home/index.less @@ -2,45 +2,11 @@ @home-tab-item-height: 96rpx; -page { - height: 100vh; - box-sizing: border-box; - font-family: 'PingFang SC', 'Helvetica Neue', sans-serif; -} - -.t-navbar { - --td-navbar-padding-top: @navbar-padding-top; - --td-navbar-height: calc(@nav-bar-height - @navbar-padding-top) !important; - - &__left { - margin: 0; - } -} - -&__left { - display: flex; - align-items: center; - padding: 0 16rpx; +.home-container { + height: calc(100vh - @tab-bar-height); - .t-search { - --td-search-height: 64rpx; - --td-search-font-size: @font-size-mini; - width: 375rpx; - - .t-icon { - font-size: @font-size-default !important; - } - } -} - -.home { - background-color: @bg-color; - height: calc(100% - @tab-bar-height); - overflow: auto; - - &__content { + .home-content { height: calc(100% - @nav-bar-height); - overflow: hidden; } .t-tabs { @@ -56,7 +22,7 @@ page { } } - &__card-list { + .home-card-list { display: flex; justify-content: space-between; flex-wrap: wrap; @@ -66,16 +32,9 @@ page { } } -.usermotto { - margin-top: 200px; -} .home-release { position: fixed; bottom: 208rpx; right: 32rpx; - - .relese-button { - width: 200rpx; - } } diff --git a/pages/home/index.wxml b/pages/home/index.wxml index 620f06a..3dcdc60 100644 --- a/pages/home/index.wxml +++ b/pages/home/index.wxml @@ -1,6 +1,6 @@ - -