Skip to content

Commit

Permalink
Merge pull request #150 from eleliauk/main
Browse files Browse the repository at this point in the history
fix:跳转bug
  • Loading branch information
eleliauk authored Sep 26, 2024
2 parents b775043 + ad8bd8d commit 6baebc5
Show file tree
Hide file tree
Showing 6 changed files with 139 additions and 48 deletions.
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,7 @@ $ yarn dev:weapp
上述文件皆以 ??? 许可授权

> 详细之授权请参考 [LICENSE](LICENSE) 文件
### 📄 内部文档

项目进度和未来计划请参考 [飞书文档](https://muxi.feishu.cn/docx/Q1PwdIMH0opWwRxG8WccgeClnck?from=from_copylink)
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,9 @@
"@types/react": "^18.3.8",
"@types/sass": "1.45.0",
"@types/webpack-env": "^1.18.5",
"@typescript-eslint/eslint-plugin": "^8.6.0",
"@typescript-eslint/eslint-plugin": "^7.17.0",
"@typescript-eslint/parser": "^8.6.0",
"autoprefixer": "^10.4.20",
"autoprefixer": "^10.4.19",
"babel-plugin-import": "^1.13.8",
"babel-preset-taro": "3.6.35",
"cache-loader": "^4.1.0",
Expand Down
74 changes: 56 additions & 18 deletions src/common/components/FloatingWindow/FloatingWindow.tsx
Original file line number Diff line number Diff line change
@@ -1,47 +1,85 @@
/* eslint-disable react/jsx-key */
import { Swiper, SwiperItem, View } from '@tarojs/components';
import { ScrollView, View } from '@tarojs/components';
import React from 'react';

import './index.scss';

type FloatingWindowProps = object;

const FloatingWindow: React.FC<FloatingWindowProps> = () => {
const pages = [<Page1 />, <Page2 />, <Page3 />, <Page4 />];

return (
<View className="floating_window_background">
<Swiper
<ScrollView
className="floating_window_content"
indicatorColor="#999"
indicatorActiveColor="#333"
circular
indicatorDots
scrollY
style={{ height: '70vh' }} // 确保内容可以滚动
>
{pages.map((page, index) => (
<SwiperItem key={index} className="floating_window_slide">
{page}
</SwiperItem>
))}
</Swiper>
<Page1 />
<Page2 />
<Page3 />
<Page4 />
</ScrollView>
</View>
);
};

const Page1 = () => {
return <View>1</View>;
return (
<View className="page">
<View>木犀课栈隐私条例</View>
作为华中师范大学学生自主运营的互联网技术团队,木犀一直高度重
视隐私保护、郑重对待相应责任,并已将隐私保护的要求融入日常业务活动流程。
希望您仔细阅读本条例,详细了解我们对信息的收集、使用方式,以便您更好地
了解我们的服务并作出适当的选择。若您使用木犀课栈的服务,即表示您认同我
们在本条例中所述内容。
</View>
);
};

const Page2 = () => {
return <View>2</View>;
return (
<View className="page">
我们收集的信息
我们根据合法、正当、必要的原则,仅收集实现产品功能所必要的信息,并将竭力通过有效的信息安全技术及管理流程,防止您的信息泄露、损毁、丢失。
1、您在使用我们服务时主动提供的信息
(1)您在登录时填写的信息。木犀课栈将采用华中师范大学一站式门户的账号密码进行登录,以此获取您的课程信息。
(2)您在使用服务时填写的信息。例如您上传的头像。
(3)我们的部分服务可能需要您提供特定的个人敏感信息来实现特定功能。若您选择不提供该类信息,则可能无法正常使用服务中的特定功能,但不影响您使用服务中的其他功能。若您主动提供您的个人敏感信息,即表示您同意我们按本条例所述目的和方式来处理您的个人敏感信息。
2、我们在您使用服务时获取的信息
当您使用我们的服务时,我们可能会存储服务日志信息。例如搜索、查看的信息、服务故障信息等。
</View>
);
};

const Page3 = () => {
return <View>3</View>;
return (
<View className="page">
3、其他相关信息
(1)其他用户分享的信息中含有您的信息。例如,其他用户分享的截图中可能包含您的信息。
(2)从第三方合作伙伴获取的信息。例如,您使用QQ授权登录时,我们会获得您登录的名称、登录时间,方便您进行授权管理。请您仔细阅读第三方合作伙伴服务的用户协议或隐私政策。
我们如何使用收集的信息
我们严格遵守法律法规的规定及与用户的约定,将收集的信息用于以下用途。若我们超出以下用途使用您的信息,我们将再次向您进行说明,并征得您的同意。
1、向您提供服务
2、产品开发和服务优化。例如,当我们的系统发生故障时,我们会记录和分析系统故障时产生的信息,优化我们的服务。
3、为了确保服务的安全,帮助我们更好地了解我们应用程序的运行情况,我们可能记录相关信息,例如,您使用应用程序的频率、故障信息、总体使用情况、性能数据以及应用程序的来源。我们不会将我们存储在分析软件中的信息与您在应用程序中提供的个人身份信息相结合。
您分享的信息
您可以通过我们的服务与好友分享相关课程或评价信息。例如,在空间中公开分享课程评价和课表。
请注意,这其中可能包含您的个人身份信息、个人课程信息等敏感信息,请您谨慎考虑披露您的相关个人敏感信息,这些信息可能由其他用户或不受我们控制的非关联第三方独立保存。
我们可能向您发送的信息
</View>
);
};

const Page4 = () => {
return <View>4</View>;
return (
<View className="page">
1、信息推送:您在使用我们的服务时,我们会向您发送通知信息。
2、与服务有关的公告:我们可能在必要时(例如,因系统维护而暂停某一项服务时)向您发出与服务有关的公告。
联系我们 如您对本条例或其他相关事宜有疑问, 请通过QQ群:799651462与我们联系。
您也可以将问题发送至邮箱:[email protected]
我们将在验证您的用户身份后,尽快审核所涉问题并予以回复。
</View>
);
};

export default FloatingWindow;
1 change: 1 addition & 0 deletions src/common/components/chart/index.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/* eslint-disable @typescript-eslint/no-unsafe-member-access */
// eslint-disable-next-line simple-import-sort/imports
import { Canvas } from '@tarojs/components';
import Taro, { CanvasContext, Canvas as CanvasInterface } from '@tarojs/taro';
import React, { CSSProperties, useEffect, useState } from 'react';
Expand Down
2 changes: 1 addition & 1 deletion src/pages/editUser/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ const EditUser: React.FC = () => {
success: (res) => console.log(res),
fail: (err) => console.log(err),
});
void Taro.redirectTo({ url: '/pages/login/index' });
void Taro.reLaunch({ url: '/pages/login/index' });
};
return (
<View>
Expand Down
102 changes: 75 additions & 27 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3992,26 +3992,26 @@ __metadata:
languageName: node
linkType: hard

"@typescript-eslint/eslint-plugin@npm:^8.6.0":
version: 8.6.0
resolution: "@typescript-eslint/eslint-plugin@npm:8.6.0"
"@typescript-eslint/eslint-plugin@npm:^7.17.0":
version: 7.18.0
resolution: "@typescript-eslint/eslint-plugin@npm:7.18.0"
dependencies:
"@eslint-community/regexpp": "npm:^4.10.0"
"@typescript-eslint/scope-manager": "npm:8.6.0"
"@typescript-eslint/type-utils": "npm:8.6.0"
"@typescript-eslint/utils": "npm:8.6.0"
"@typescript-eslint/visitor-keys": "npm:8.6.0"
"@typescript-eslint/scope-manager": "npm:7.18.0"
"@typescript-eslint/type-utils": "npm:7.18.0"
"@typescript-eslint/utils": "npm:7.18.0"
"@typescript-eslint/visitor-keys": "npm:7.18.0"
graphemer: "npm:^1.4.0"
ignore: "npm:^5.3.1"
natural-compare: "npm:^1.4.0"
ts-api-utils: "npm:^1.3.0"
peerDependencies:
"@typescript-eslint/parser": ^8.0.0 || ^8.0.0-alpha.0
eslint: ^8.57.0 || ^9.0.0
"@typescript-eslint/parser": ^7.0.0
eslint: ^8.56.0
peerDependenciesMeta:
typescript:
optional: true
checksum: 10c0/c777f01535b896d3092f9886a67ccf9e50bf9e0f581ffab607c5e95dbf3092299b0d9f3e6041b134d69059a6fa5691785940b81015f73bb9a0e9d1605f6442ea
checksum: 10c0/2b37948fa1b0dab77138909dabef242a4d49ab93e4019d4ef930626f0a7d96b03e696cd027fa0087881c20e73be7be77c942606b4a76fa599e6b37f6985304c3
languageName: node
linkType: hard

Expand Down Expand Up @@ -4061,6 +4061,16 @@ __metadata:
languageName: node
linkType: hard

"@typescript-eslint/scope-manager@npm:7.18.0":
version: 7.18.0
resolution: "@typescript-eslint/scope-manager@npm:7.18.0"
dependencies:
"@typescript-eslint/types": "npm:7.18.0"
"@typescript-eslint/visitor-keys": "npm:7.18.0"
checksum: 10c0/038cd58c2271de146b3a594afe2c99290034033326d57ff1f902976022c8b0138ffd3cb893ae439ae41003b5e4bcc00cabf6b244ce40e8668f9412cc96d97b8e
languageName: node
linkType: hard

"@typescript-eslint/scope-manager@npm:8.6.0":
version: 8.6.0
resolution: "@typescript-eslint/scope-manager@npm:8.6.0"
Expand Down Expand Up @@ -4088,18 +4098,20 @@ __metadata:
languageName: node
linkType: hard

"@typescript-eslint/type-utils@npm:8.6.0":
version: 8.6.0
resolution: "@typescript-eslint/type-utils@npm:8.6.0"
"@typescript-eslint/type-utils@npm:7.18.0":
version: 7.18.0
resolution: "@typescript-eslint/type-utils@npm:7.18.0"
dependencies:
"@typescript-eslint/typescript-estree": "npm:8.6.0"
"@typescript-eslint/utils": "npm:8.6.0"
"@typescript-eslint/typescript-estree": "npm:7.18.0"
"@typescript-eslint/utils": "npm:7.18.0"
debug: "npm:^4.3.4"
ts-api-utils: "npm:^1.3.0"
peerDependencies:
eslint: ^8.56.0
peerDependenciesMeta:
typescript:
optional: true
checksum: 10c0/914b4637caa40c102117655a9b4451e0db611a61309ed39d6c57522655463c059f4dfd4e2d7ffdefcc9ab7533be21fb877b740c58f5be11f3530aa29f3d2cb62
checksum: 10c0/ad92a38007be620f3f7036f10e234abdc2fdc518787b5a7227e55fd12896dacf56e8b34578723fbf9bea8128df2510ba8eb6739439a3879eda9519476d5783fd
languageName: node
linkType: hard

Expand All @@ -4110,6 +4122,13 @@ __metadata:
languageName: node
linkType: hard

"@typescript-eslint/types@npm:7.18.0":
version: 7.18.0
resolution: "@typescript-eslint/types@npm:7.18.0"
checksum: 10c0/eb7371ac55ca77db8e59ba0310b41a74523f17e06f485a0ef819491bc3dd8909bb930120ff7d30aaf54e888167e0005aa1337011f3663dc90fb19203ce478054
languageName: node
linkType: hard

"@typescript-eslint/types@npm:8.6.0":
version: 8.6.0
resolution: "@typescript-eslint/types@npm:8.6.0"
Expand All @@ -4136,6 +4155,25 @@ __metadata:
languageName: node
linkType: hard

"@typescript-eslint/typescript-estree@npm:7.18.0":
version: 7.18.0
resolution: "@typescript-eslint/typescript-estree@npm:7.18.0"
dependencies:
"@typescript-eslint/types": "npm:7.18.0"
"@typescript-eslint/visitor-keys": "npm:7.18.0"
debug: "npm:^4.3.4"
globby: "npm:^11.1.0"
is-glob: "npm:^4.0.3"
minimatch: "npm:^9.0.4"
semver: "npm:^7.6.0"
ts-api-utils: "npm:^1.3.0"
peerDependenciesMeta:
typescript:
optional: true
checksum: 10c0/0c7f109a2e460ec8a1524339479cf78ff17814d23c83aa5112c77fb345e87b3642616291908dcddea1e671da63686403dfb712e4a4435104f92abdfddf9aba81
languageName: node
linkType: hard

"@typescript-eslint/typescript-estree@npm:8.6.0":
version: 8.6.0
resolution: "@typescript-eslint/typescript-estree@npm:8.6.0"
Expand Down Expand Up @@ -4172,17 +4210,17 @@ __metadata:
languageName: node
linkType: hard

"@typescript-eslint/utils@npm:8.6.0":
version: 8.6.0
resolution: "@typescript-eslint/utils@npm:8.6.0"
"@typescript-eslint/utils@npm:7.18.0":
version: 7.18.0
resolution: "@typescript-eslint/utils@npm:7.18.0"
dependencies:
"@eslint-community/eslint-utils": "npm:^4.4.0"
"@typescript-eslint/scope-manager": "npm:8.6.0"
"@typescript-eslint/types": "npm:8.6.0"
"@typescript-eslint/typescript-estree": "npm:8.6.0"
"@typescript-eslint/scope-manager": "npm:7.18.0"
"@typescript-eslint/types": "npm:7.18.0"
"@typescript-eslint/typescript-estree": "npm:7.18.0"
peerDependencies:
eslint: ^8.57.0 || ^9.0.0
checksum: 10c0/5b615106342dfdf09f5a73e2554cc0c4d979c262a9a4548eb76ec7045768e0ff0bf0316cf8a5eb5404689cd476fcd335fc84f90eb985557559e42aeee33d687e
eslint: ^8.56.0
checksum: 10c0/a25a6d50eb45c514469a01ff01f215115a4725fb18401055a847ddf20d1b681409c4027f349033a95c4ff7138d28c3b0a70253dfe8262eb732df4b87c547bd1e
languageName: node
linkType: hard

Expand All @@ -4196,6 +4234,16 @@ __metadata:
languageName: node
linkType: hard

"@typescript-eslint/visitor-keys@npm:7.18.0":
version: 7.18.0
resolution: "@typescript-eslint/visitor-keys@npm:7.18.0"
dependencies:
"@typescript-eslint/types": "npm:7.18.0"
eslint-visitor-keys: "npm:^3.4.3"
checksum: 10c0/538b645f8ff1d9debf264865c69a317074eaff0255e63d7407046176b0f6a6beba34a6c51d511f12444bae12a98c69891eb6f403c9f54c6c2e2849d1c1cb73c0
languageName: node
linkType: hard

"@typescript-eslint/visitor-keys@npm:8.6.0":
version: 8.6.0
resolution: "@typescript-eslint/visitor-keys@npm:8.6.0"
Expand Down Expand Up @@ -4829,7 +4877,7 @@ __metadata:
languageName: node
linkType: hard

"autoprefixer@npm:^10.4.19, autoprefixer@npm:^10.4.20":
"autoprefixer@npm:^10.4.19":
version: 10.4.20
resolution: "autoprefixer@npm:10.4.20"
dependencies:
Expand Down Expand Up @@ -11175,9 +11223,9 @@ __metadata:
"@types/react": "npm:^18.3.8"
"@types/sass": "npm:1.45.0"
"@types/webpack-env": "npm:^1.18.5"
"@typescript-eslint/eslint-plugin": "npm:^8.6.0"
"@typescript-eslint/eslint-plugin": "npm:^7.17.0"
"@typescript-eslint/parser": "npm:^8.6.0"
autoprefixer: "npm:^10.4.20"
autoprefixer: "npm:^10.4.19"
babel-plugin-import: "npm:^1.13.8"
babel-preset-taro: "npm:3.6.35"
cache-loader: "npm:^4.1.0"
Expand Down

0 comments on commit 6baebc5

Please sign in to comment.