Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix:解决merge后的一系列神奇的问题 #40

Closed
wants to merge 25 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
25663ff
📃 docs:新增测试和进度文档
eleliauk Aug 15, 2024
481f3c0
Merge branch 'MuxiKeStack:main' into main
eleliauk Aug 15, 2024
42f365b
✨ feat:写了一点修改个人信息的静态
eleliauk Aug 16, 2024
87e26bb
✨ feat:写了一点修改个人信息的静态
eleliauk Aug 16, 2024
72f8f28
🔨 refactor:代码重构
eleliauk Aug 18, 2024
24a8660
🔨 refactor:代码复活 api
eleliauk Aug 18, 2024
64e56f9
🐞 fix: resolve conflicts and update src/App.scss
eleliauk Aug 18, 2024
998b0a6
🐞 fix: resolve conflicts and update src/App.scss
eleliauk Aug 18, 2024
ccf5298
Delete src/App.scss
eleliauk Aug 18, 2024
398abc8
🐞 fix:git-bug
eleliauk Aug 18, 2024
48a5c5f
🐞 fix: resolve merge conflicts
eleliauk Aug 18, 2024
cbd2dc6
fix:merge question
eleliauk Aug 18, 2024
c062ed1
🐞 fix:回退bug
eleliauk Aug 18, 2024
1b55038
feat:新增修改个人信息界面
eleliauk Aug 20, 2024
8d41609
📃 docs:修改进度文档
eleliauk Aug 22, 2024
cb2f922
✨ feat:修改信息和更改头像部分完成 修改一下路由
eleliauk Aug 22, 2024
9ecc975
✨ feat:修改信息和更改头像部分完成 修改一下路由
eleliauk Aug 22, 2024
d9cc449
✨ feat(新增回复):
MaggieMii Aug 22, 2024
5a3246f
Merge branch 'main' of https://github.com/MuxiKeStack/muxiK-StackFron…
MaggieMii Aug 22, 2024
84237c6
🔨 refactor:合并代码
eleliauk Aug 23, 2024
ad4949a
🐞 fix:新增checktoken函数
eleliauk Aug 23, 2024
ba6439a
🐞 fix:修复eslint的error
eleliauk Aug 23, 2024
e33a629
🐞 fix:再修复eslint的error
eleliauk Aug 23, 2024
c340634
🐞 fix:再修复eslint的error
eleliauk Aug 23, 2024
987a1cd
🐞 fix:修复.yarn的文件
eleliauk Aug 23, 2024
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
Prev Previous commit
Next Next commit
✨ feat:写了一点修改个人信息的静态
eleliauk committed Aug 16, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 42f365b53d6538146841613db84186228e1f91f7
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -7,3 +7,4 @@ node_modules/
.swc
.idea/
.vscode/
.cloudbase/
6 changes: 5 additions & 1 deletion docs/测试文档.md
Original file line number Diff line number Diff line change
@@ -5,12 +5,16 @@

</div>

# 第一次测试
# 第一次测试

## 2024.8.14

## 存在问题 :question:

1. 主页获取不到token 无法正常显示
2. navbar 多点几下会超限制

## 改进方案

1. 看一下token的命名
2. 要是难改就先改成redirect吧/改成taro的navbar
6 changes: 4 additions & 2 deletions docs/进度文档.md
Original file line number Diff line number Diff line change
@@ -6,6 +6,7 @@
</div>

## 需要完成页面

- 登陆
- 隐私条例
- 选择头像
@@ -31,10 +32,12 @@
- 我要提问
- 官方消息


## 2024.8.15 :computer:

### 目前进度

### 未完成:

- 隐私条例
- 选择头像
- 课程主页
@@ -50,4 +53,3 @@
- 点赞
- 我要提问
- 官方消息

1 change: 1 addition & 0 deletions src/app.config.ts
Original file line number Diff line number Diff line change
@@ -14,6 +14,7 @@ export default defineAppConfig({
'pages/myclass/myclass',
'pages/research/research',
'pages/index/index',
'pages/editPersonal/index',
],
window: {
backgroundTextStyle: 'light',
Binary file added src/img/editPersonal/edit.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/img/editPersonal/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { default as editIcon } from './edit.png';
3 changes: 3 additions & 0 deletions src/pages/editPersonal/editPersonl.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export default definePageConfig({
navigationBarTitleText: '修改个人信息',
});
4 changes: 4 additions & 0 deletions src/pages/editPersonal/index.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
.cancel-button {
width: 230.07rpx;
height: 70.65rpx;
}
51 changes: 51 additions & 0 deletions src/pages/editPersonal/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
import { Button, Image, View } from '@tarojs/components';
import Taro from '@tarojs/taro';
import React, { useEffect } from 'react';

import { editIcon } from '@/img/editPersonal';
import './index.scss';

const editInformationPage: React.FC = () => {
let avatarUrl: string;

useEffect(() => {
void Taro.chooseImage({
count: 1,
sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图,默认二者都有
sourceType: ['album', 'camera'],
success: function (res) {
avatarUrl = res.tempFilePaths[0];
},
});
}, []);
return (
<>
<View>
<View>
<View>修改头像</View>
<View>
<Image src={avatarUrl}></Image>
</View>
</View>
<View>
<View>修改昵称</View>
<View>nicheng</View>
<View>{editIcon}</View>
</View>
<View>
<View>称号</View>
<View>
<></>
<></>
<></>
</View>
</View>
<View>
<Button className="cancel-button">取消</Button>
<Button className="save-button">保存</Button>
</View>
</View>
</>
);
};
export default editInformationPage;
8 changes: 6 additions & 2 deletions src/pages/personalPage/index.scss
Original file line number Diff line number Diff line change
@@ -37,7 +37,7 @@
.PersonalPage .personalPage_user_details {
width: 40vw;
height: 20vw;
position: flex;
display: flex;
align-items: end;
position: relative;
}
@@ -46,7 +46,11 @@
width: 100%;
font-size: 6vw;
}

.PersonalPage .personalPage_icon {
width: 100%;
font-size: 6vw;
color: white;
}
.PersonalPage .personalPage_exp_value {
width: 100%;
color: orange;
1 change: 1 addition & 0 deletions src/pages/personalPage/index.tsx
Original file line number Diff line number Diff line change
@@ -78,6 +78,7 @@ const Head = () => {
</View>
<View className="personalPage_user_details">
<View className="personalPage_username">昵称</View>
<View className="personalPage_icon">&gt;</View>
{/* 经验 */}
<View className="personalPage_exp_value">
{points}/{nextLevel}