Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app.js
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
10 changes: 0 additions & 10 deletions app.less
Original file line number Diff line number Diff line change
@@ -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;
}
Expand Down
7 changes: 6 additions & 1 deletion services/chat.js → mock/chat.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
import delay from './delay';
/** 模拟网络请求的延迟 */
function delay(ms = 500) {
return new Promise((resolve) => {
setTimeout(resolve, ms);
});
}

// 模拟聊天数据
const mockData = [
Expand Down
3 changes: 2 additions & 1 deletion mock/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 });
});
Expand Down
19 changes: 9 additions & 10 deletions mock/mock.js
Original file line number Diff line number Diff line change
Expand Up @@ -1165,8 +1165,8 @@
return typeof patternLetters[flag] === 'function'
? patternLetters[flag](date)
: patternLetters[flag] in patternLetters
? creatNewSubString($0, patternLetters[flag])
: date[patternLetters[flag]]();
? creatNewSubString($0, patternLetters[flag])
: date[patternLetters[flag]]();
});
},
// 生成一个随机的 Date 对象。
Expand Down Expand Up @@ -1967,8 +1967,8 @@
return min === undefined
? Basic.natural(defaultMin, defaultMax) // ()
: max === undefined
? min // ( len )
: Basic.natural(parseInt(min, 10), parseInt(max, 10)); // ( min, max )
? min // ( len )
: Basic.natural(parseInt(min, 10), parseInt(max, 10)); // ( min, max )
}

module.exports = {
Expand Down Expand Up @@ -6566,8 +6566,8 @@
id.slice(2, 6) === '0000'
? undefined
: id.slice(4, 6) == '00'
? id.slice(0, 2) + '0000'
: id.slice(0, 4) + '00';
? id.slice(0, 2) + '0000'
: id.slice(0, 4) + '00';
fixed.push({
id: id,
pid: pid,
Expand Down Expand Up @@ -6848,8 +6848,8 @@
'\n' === e
? (l.seenCR || l.line++, (l.column = 1), (l.seenCR = !1))
: '\r' === e || '\u2028' === e || '\u2029' === e
? (l.line++, (l.column = 1), (l.seenCR = !0))
: (l.column++, (l.seenCR = !1));
? (l.line++, (l.column = 1), (l.seenCR = !0))
: (l.column++, (l.seenCR = !1));
}
return (
Mt !== l &&
Expand Down Expand Up @@ -9020,8 +9020,7 @@
// loadstart The fetch initiates.
this.dispatchEvent(new Event('loadstart' /*, false, false, this*/));

if (this.custom.async)
setTimeout(done, this.custom.timeout); // 异步
if (this.custom.async) setTimeout(done, this.custom.timeout); // 异步
else done(); // 同步

function done() {
Expand Down
8 changes: 8 additions & 0 deletions mock/search/getSearchHistory.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
export default {
path: '/api/searchHistory',
code: 200,
message: '请求成功',
data: {
historyWords: ['AI绘画', 'Stable Diffusion', '版权素材', '星空', 'illustration', '原创'],
},
};
15 changes: 15 additions & 0 deletions mock/search/getSearchPopular.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
export default {
path: '/api/searchPopular',
code: 200,
message: '请求成功',
data: {
popularWords: [
'考研和靠边同时上岸应该怎么选?有哪些参考建议',
'日常饮食中,如何选择优质蛋白',
'你有没有网购维权成功的经历?求分享经验',
'夏季带孩子旅游,你的必备物品有哪些',
'在海外越卖越贵,中国汽车做对了什么',
'当HR问你离职原因,怎么回答最能被接受',
],
},
};
4 changes: 4 additions & 0 deletions mock/search/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
import getSearchHistory from './getSearchHistory';
import getSearchPopular from './getSearchPopular';

export default [getSearchHistory, getSearchPopular];
33 changes: 0 additions & 33 deletions model/search.js

This file was deleted.

3 changes: 2 additions & 1 deletion pages/chat/index.less
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
39 changes: 21 additions & 18 deletions pages/chat/index.wxml
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
<wxs src="./index.wxs" module="utils" />

<t-navbar class="nav-bar" title="{{ name }}" left-arrow />
<scroll-view class="content" scroll-y scroll-into-view="{{ anchor }}">
<view class="messages">
<block wx:for="{{ messages }}" wx:key="index">
<view wx:if="{{ index === 0 || item.time - messages[index - 1].time > 120000 }}" class="time"
>{{ utils.formatTime(item.time) }}</view
>

<view wx:if="{{ item.from === 0 }}" class="message-area">
<view class="message self">
<view class="chat-container">
<scroll-view class="content" scroll-y scroll-into-view="{{ anchor }}">
<view class="messages">
<block wx:for="{{ messages }}" wx:key="index">
<view wx:if="{{ index === 0 || item.time - messages[index - 1].time > 120000 }}" class="time" >
{{ utils.formatTime(item.time) }}
</view>

<view wx:if="{{ item.from === 0 }}" class="message-area">
<view class="message self">
<text space="nbsp">{{ item.content }}</text>
<t-loading
wx:if="{{ item.messageId === null }}"
Expand All @@ -18,20 +20,21 @@
size="32rpx"
class="wrapper"
/>
</view>
<t-avatar image="{{ myAvatar }}" size="small" />
</view>
<t-avatar image="{{ myAvatar }}" size="small" />
</view>

<view wx:else class="message-area">
<t-avatar image="{{ avatar }}" size="small" />
<view class="message other">
<view wx:else class="message-area">
<t-avatar image="{{ avatar }}" size="small" />
<view class="message other">
<text space="nbsp">{{ item.content }}</text>
</view>
</view>
</view>
</block>
<view id="bottom" />
</view>
</scroll-view>
</block>
<view id="bottom" />
</view>
</scroll-view>
</view>

<view class="block" style="margin-bottom: {{ keyboardHeight }}px" />
<view class="bottom" style="margin-bottom: {{ keyboardHeight }}px">
Expand Down
2 changes: 1 addition & 1 deletion pages/home/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ Page({
showOperMsg(content) {
Message.success({
context: this,
offset: [20, 32],
offset: [120, 32],
duration: 4000,
content,
});
Expand Down
50 changes: 4 additions & 46 deletions pages/home/index.less
Original file line number Diff line number Diff line change
Expand Up @@ -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;

.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;
.home-container {
height: calc(100vh - @tab-bar-height);

&__content {
.home-content {
height: calc(100% - @nav-bar-height);
overflow: hidden;
}

.t-tabs {
Expand All @@ -56,7 +22,7 @@ page {
}
}

&__card-list {
.home-card-list {
display: flex;
justify-content: space-between;
flex-wrap: wrap;
Expand All @@ -66,16 +32,8 @@ page {
}
}

.usermotto {
margin-top: 200px;
}

.home-release {
position: fixed;
bottom: 208rpx;
right: 32rpx;

.relese-button {
width: 200rpx;
}
}
33 changes: 19 additions & 14 deletions pages/home/index.wxml
Original file line number Diff line number Diff line change
@@ -1,26 +1,32 @@
<view class="home">
<nav nav-type="search" />
<view class="home__content">
<nav nav-type="search" />
<view class="home-container">
<view class="home-content">
<t-tabs defaultValue="recommend">
<t-tab-panel label="推荐" value="recommend">
<t-pull-down-refresh
value="{{enable}}"
bind:refresh="onRefresh"
loadingTexts="{{['下拉刷新', '松手刷新', '正在刷新', '刷新完成']}}"
>
<view class="home__card-list">
<view class="home-card-list">
<t-swiper
list="{{swiperList}}"
navigation="{{ { type: 'dots-bar' } }}"
height="488rpx"
style="width: 340rpx"
/>
<card wx:for="{{cardInfo}}" wx:key="index" desc="{{item.desc}}" url="{{item.url}}" tags="{{item.tags}}" />
<card
wx:for="{{cardInfo}}"
wx:key="index"
desc="{{item.desc}}"
url="{{item.url}}"
tags="{{item.tags}}"
/>
</view>
</t-pull-down-refresh>
</t-tab-panel>
<t-tab-panel label="我的关注" value="follow">
<view class="home__card-list">
<view class="home-card-list">
<card
wx:for="{{focusCardInfo}}"
wx:key="index"
Expand All @@ -32,12 +38,11 @@
</t-tab-panel>
</t-tabs>
</view>
<block>
<view class="home-release">
<t-button t-class="relese-button" theme="primary" size="large" icon="add" shape="round" bindtap="goRelease">
发布
</t-button>
</view>
<t-message id="t-message" />
</block>
</view>

<view class="home-release">
<t-button theme="primary" size="large" icon="add" shape="round" bindtap="goRelease">
发布
</t-button>
</view>
<t-message id="t-message" />
2 changes: 1 addition & 1 deletion pages/message/index.js
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Loading