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
54 changes: 42 additions & 12 deletions app.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,46 @@
{
"pages": [
"pages/home/index",
"pages/message/index",
"pages/my/index",
"pages/search/index",
"pages/my/info-edit/index",
"pages/chat/index",
"pages/login/login",
"pages/loginCode/loginCode",
"pages/dataCenter/index",
"pages/setup/index",
"pages/release/index"
"pages": ["pages/home/index", "pages/message/index", "pages/my/index"],
"subpackages": [
{
"root": "pages/search",
"name": "search",
"pages": ["index"]
},
{
"root": "pages/my/info-edit",
"name": "edit",
"pages": ["index"]
},
{
"root": "pages/chat",
"name": "chat",
"pages": ["index"]
},
{
"root": "pages/login",
"name": "login",
"pages": ["login"]
},
{
"root": "pages/loginCode",
"name": "loginCode",
"pages": ["loginCode"]
},
{
"root": "pages/dataCenter",
"name": "dataCenter",
"pages": ["index"]
},
{
"root": "pages/setting",
"name": "setting",
"pages": ["index"]
},
{
"root": "pages/release",
"name": "release",
"pages": ["index"]
}
],
"window": {
"backgroundTextStyle": "light",
Expand Down
11 changes: 10 additions & 1 deletion app.less
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,13 @@
justify-content: space-between;
padding: 200rpx 0;
box-sizing: border-box;
}
}

page {
background-color: #f3f3f3;
}

.page {
height: 100vh;
background-color: #fff;
}
91 changes: 47 additions & 44 deletions components/nav/index.js
Original file line number Diff line number Diff line change
@@ -1,102 +1,105 @@
Component({
options: {
styleIsolation: 'shared'
styleIsolation: 'shared',
},
properties: {
navType: {
type: "string",
value: ""
type: 'string',
value: '',
},
titleText: {
type: "string",
value: ""
}
type: 'string',
value: '',
},
},
data: {
visible: false,
sidebar: [{
sidebar: [
{
title: '首页',
url: "pages/home/index",
isSidebar: true
}, {
url: 'pages/home/index',
isSidebar: true,
},
{
title: '搜索页',
url: "pages/search/index",
isSidebar: false
}, {
url: 'pages/search/index',
isSidebar: false,
},
{
title: '发布页',
url: "pages/release/index",
isSidebar: false
url: 'pages/release/index',
isSidebar: false,
},
{
title: '消息列表页',
url: "pages/message/index",
isSidebar: true
url: 'pages/message/index',
isSidebar: true,
},
{
title: '对话页',
url: "pages/chat/index",
isSidebar: false
url: 'pages/chat/index',
isSidebar: false,
},
{
title: '个人中心页',
url: "pages/my/index",
isSidebar: true
url: 'pages/my/index',
isSidebar: true,
},
{
title: '个人信息表单页',
url: "pages/my/info-edit/index",
isSidebar: false
url: 'pages/my/info-edit/index',
isSidebar: false,
},
{
title: '设置页',
url: "pages/setup/index",
isSidebar: false
url: 'pages/setting/index',
isSidebar: false,
},
{
title: '数据图表页',
url: "pages/dataCenter/index",
isSidebar: false
url: 'pages/dataCenter/index',
isSidebar: false,
},
{
title: '登录注册页',
url: "pages/login/login",
isSidebar: false
url: 'pages/login/login',
isSidebar: false,
},
]
],
},
methods: {
openDrawer() {
this.setData({
visible: true
})
visible: true,
});
},
itemClick(e) {
const that = this;
const { isSidebar , url } = e.detail.item;
if(isSidebar){
const { isSidebar, url } = e.detail.item;
if (isSidebar) {
wx.switchTab({
url: `/${url}`,
}).then(() => {
// 防止点回tab时,sidebar依旧是展开模式
that.setData({
visible: false
})
})
visible: false,
});
});
} else {
wx.navigateTo({
url: `/${url}`,
}).then(() => {
that.setData({
visible: false
})
})
visible: false,
});
});
}
},

searchTurn() {
wx.navigateTo({
url: `/pages/search/index`,
})
}
}
})
});
},
},
});
2 changes: 1 addition & 1 deletion custom-tab-bar/index.wxml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<t-tab-bar value="{{ value }}" theme="tag" split="{{ false }}" bind:change="handleChange">
<t-tab-bar-item icon="home" value="home">首页</t-tab-bar-item>
<t-tab-bar-item icon="chat" value="message" badge-props="{{ { count: unreadNum, offset: [0, '-16rpx'] } }}">消息</t-tab-bar-item>
<t-tab-bar-item icon="chat" value="message" badge-props="{{ { count: unreadNum } }}">消息</t-tab-bar-item>
<t-tab-bar-item icon="user" value="my">我的</t-tab-bar-item>
</t-tab-bar>
23 changes: 10 additions & 13 deletions mock/index.js
Original file line number Diff line number Diff line change
@@ -1,17 +1,14 @@
import Mock from './WxMock'
import Mock from './WxMock';
// 导入包含path和data的对象
import loginMock from './login/index'
import homeMock from './home/index'
import dataCenter from './dataCenter/index'
import loginMock from './login/index';
import homeMock from './home/index';
import dataCenter from './dataCenter/index';
import my from './my/index';

export default () => {
// 在这里添加新的mock数据
const mockData = [
...loginMock,
...homeMock,
...dataCenter
]
mockData.forEach(item => {
Mock.mock(item.path, { code: 200, success: true, data: item.data })
})
}
const mockData = [...loginMock, ...homeMock, ...dataCenter, ...my];
mockData.forEach((item) => {
Mock.mock(item.path, { code: 200, success: true, data: item.data });
});
};
29 changes: 29 additions & 0 deletions mock/my/getPersonalInfo.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
export default {
path: '/api/genPersonalInfo',
data: {
code: 200,
message: 'success',
data: {
image: '/../../images/avatar1.png',
name: '小小轩',
star: '天枰座',
city: '深圳',
gender: '男',
birth: '1994-9-27',
address: ['440000', '440300'],
brief: '这是一条个人简介',
photos: [
{
url: 'https://tdesign.gtimg.com/mobile/demos/example4.png',
name: 'uploaded1.png',
type: 'image',
},
{
url: 'https://tdesign.gtimg.com/mobile/demos/example6.png',
name: 'uploaded2.png',
type: 'image',
},
],
},
},
};
19 changes: 19 additions & 0 deletions mock/my/getServiceList.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
export default {
path: '/api/getServiceList',
data: {
code: 200,
message: 'success',
data: {
service: [
{ image: '/../images/image.png', name: '微信', type: 'weixin', url: '' },
{ image: '/../images/image(1).png', name: 'QQ', type: 'QQ', url: '' },
{ image: '/../images/image(2).png', name: '腾讯文档', type: 'document', url: '' },
{ image: '/../images/image(3).png', name: '腾讯地图', type: 'map', url: '' },
{ image: '/../images/image(4).png', name: '数据中心', type: 'data', url: '/pages/dataCenter/index' },
{ image: '/../images/image(4).png', name: '数据中心', type: 'data', url: '/pages/dataCenter/index' },
{ image: '/../images/image(4).png', name: '数据中心', type: 'data', url: '/pages/dataCenter/index' },
{ image: '/../images/image(4).png', name: '数据中心', type: 'data', url: '/pages/dataCenter/index' },
],
},
},
};
4 changes: 4 additions & 0 deletions mock/my/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
import getServiceList from './getServiceList';
import getPersonalInfo from './getPersonalInfo';

export default [getServiceList, getPersonalInfo];
12 changes: 0 additions & 12 deletions mock/personinfo.js

This file was deleted.

18 changes: 0 additions & 18 deletions mock/service.js

This file was deleted.

22 changes: 0 additions & 22 deletions model/genPersonInfo.js

This file was deleted.

2 changes: 1 addition & 1 deletion model/search.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export function getSearchHistoryMock() {
'版权素材',
'星空',
'illustration',
'AI绘画',
'原创',
],
};
}
Expand Down
Loading