diff --git a/.idea/UniappTool.xml b/.idea/UniappTool.xml
index f7328e8..de1b1b9 100644
--- a/.idea/UniappTool.xml
+++ b/.idea/UniappTool.xml
@@ -1,10 +1,13 @@
+
+
+
\ No newline at end of file
diff --git a/pages.json b/pages.json
index aa920dd..5d48ead 100644
--- a/pages.json
+++ b/pages.json
@@ -6,10 +6,23 @@
{
"navigationStyle":"custom"
}
- },{
- "path": "pages/index/index",
+ },
+ {
+ "path": "pages/Workbench/Workbench",
"style": {
- "navigationBarTitleText": "uni-app"
+ "navigationBarTitleText": "工作台"
+ }
+ },
+ {
+ "path": "pages/Me/Me",
+ "style": {
+ "navigationBarTitleText": "我的"
+ }
+ },
+ {
+ "path": "pages/Message/Message",
+ "style": {
+ "navigationBarTitleText": "消息"
}
}
@@ -20,5 +33,31 @@
"navigationBarBackgroundColor": "#F8F8F8",
"backgroundColor": "#F8F8F8"
},
+ "tabBar": {
+ "color": "#ccc",
+ "selectedColor": "#03A8F6",
+ "borderStyle": "black",
+ "backgroundColor": "#FFFFFF",
+ "list": [
+ {
+ "pagePath": "pages/Workbench/Workbench",
+ "iconPath": "static/tabbar/workbench.png",
+ "selectedIconPath": "static/tabbar/workbench._select.png",
+ "text": "工作台"
+ },
+ {
+ "pagePath": "pages/Message/Message",
+ "iconPath": "static/tabbar/message.png",
+ "selectedIconPath": "static/tabbar/message_select.png",
+ "text": "消息"
+ },
+ {
+ "pagePath": "pages/Me/Me",
+ "iconPath": "static/tabbar/me.png",
+ "selectedIconPath": "static/tabbar/me_select.png",
+ "text": "我的"
+ }
+ ]
+ },
"uniIdRouter": {}
}
diff --git a/pages/Me/Me.vue b/pages/Me/Me.vue
new file mode 100644
index 0000000..0cc8e72
--- /dev/null
+++ b/pages/Me/Me.vue
@@ -0,0 +1,125 @@
+
+
+
+
+
+
+
+ 这里是昵称
+ 账号:123456789
+
+
+
+
+
+ 个人资料
+ 我的押金
+ 我的维修
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/Me/informatiuon.vue b/pages/Me/informatiuon.vue
new file mode 100644
index 0000000..2b49cfd
--- /dev/null
+++ b/pages/Me/informatiuon.vue
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/Message/Message.vue b/pages/Message/Message.vue
new file mode 100644
index 0000000..c0e7658
--- /dev/null
+++ b/pages/Message/Message.vue
@@ -0,0 +1,37 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/Workbench/Workbench.vue b/pages/Workbench/Workbench.vue
new file mode 100644
index 0000000..c0e7658
--- /dev/null
+++ b/pages/Workbench/Workbench.vue
@@ -0,0 +1,37 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/login/login.vue b/pages/login/login.vue
index d5f1351..a0c4d89 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -36,8 +36,8 @@
const handleClick = () => {
if (status.value) {
console.log('登录成功')
- uni.navigateTo({
- url:'/pages/index/index'
+ uni.switchTab({
+ url:'/pages/Workbench/Workbench'
})
} else {
console.log('注册成功')
@@ -61,86 +61,86 @@
align-items: center;
- .container-top {
- margin-top: 200rpx;
- width: $globalWidth;
- font-size: 50rpx;
- font-weight: 400;
- }
-
- .container-title {
- width: $globalWidth;
- margin-top: 80rpx;
- display: flex;
- font-size: 35rpx solid $buttonColor;
-
- .container-title-view {
- border-bottom: 6rpx solid $buttonColor;
- width: 70rpx;
- text-align: center;
- border-radius: 15rpx;
- }
- }
-
- .container-bottom {
- width: $globalWidth;
- margin-top: 120rpx;
-
-
- /*
- 文字样式
- */
- .container-text {
- font-size: 40rpx;
- font-weight: bold;
- }
-
- /*
- 输入框样式
- */
- .container-input {
- width: $globalWidth;
- height: 100rpx;
- background-color: #fafafa;
- border-radius: 20rpx;
- margin-top: 25rpx;
- margin-bottom: 25rpx;
- padding-left: 20rpx;
- margin-right: 20rpx;
- margin-left: -10rpx;
-
- }
- }
-
- /*
- 登录按钮
- */
- .container-button {
- margin-top: 30rpx;
- width: $globalWidth;
- color: white;
- margin-top: 120rpx;
- text-align: center;
- height: 100rpx;
- line-height: 100rpx;
- background-color: $buttonColor;
- border: none;
- border-radius: 60rpx;
- -moz-box-shadow: none;
- -webkit-box-shadow: none;
- box-shadow: none;
- }
-
-
- .container-change {
- text-align: right;
- margin-right: 20rpx;
- margin-top: 50rpx;
- width: $globalWidth;
- color: $buttonColor;
- font-size: 35rpx;
- }
-
-
}
+
+ .container-top {
+ margin-top: 200rpx;
+ width: $globalWidth;
+ font-size: 50rpx;
+ font-weight: 400;
+ }
+
+ .container-title {
+ width: $globalWidth;
+ margin-top: 80rpx;
+ display: flex;
+ font-size: 35rpx solid $buttonColor;
+
+ .container-title-view {
+ border-bottom: 6rpx solid $buttonColor;
+ width: 70rpx;
+ text-align: center;
+ border-radius: 15rpx;
+ }
+ }
+
+ .container-bottom {
+ width: $globalWidth;
+ margin-top: 120rpx;
+
+
+ /*
+ 文字样式
+ */
+ .container-text {
+ font-size: 40rpx;
+ font-weight: bold;
+ }
+
+ /*
+ 输入框样式
+ */
+ .container-input {
+ width: $globalWidth;
+ height: 100rpx;
+ background-color: #fafafa;
+ border-radius: 20rpx;
+ margin-top: 25rpx;
+ margin-bottom: 25rpx;
+ padding-left: 20rpx;
+ margin-right: 20rpx;
+ margin-left: -10rpx;
+
+ }
+ }
+
+ /*
+ 登录按钮
+ */
+ .container-button {
+ margin-top: 30rpx;
+ width: $globalWidth;
+ color: white;
+ margin-top: 120rpx;
+ text-align: center;
+ height: 100rpx;
+ line-height: 100rpx;
+ background-color: $buttonColor;
+ border: none;
+ border-radius: 60rpx;
+ -moz-box-shadow: none;
+ -webkit-box-shadow: none;
+ box-shadow: none;
+ }
+
+
+ .container-change {
+ text-align: right;
+ margin-right: 20rpx;
+ margin-top: 50rpx;
+ width: $globalWidth;
+ color: $buttonColor;
+ font-size: 35rpx;
+ }
+
\ No newline at end of file
diff --git a/static/avatar.png b/static/avatar.png
new file mode 100644
index 0000000..76b8e7d
Binary files /dev/null and b/static/avatar.png differ
diff --git a/static/right.png b/static/right.png
new file mode 100644
index 0000000..70e577b
Binary files /dev/null and b/static/right.png differ
diff --git a/static/right.svg b/static/right.svg
new file mode 100644
index 0000000..38e7a79
--- /dev/null
+++ b/static/right.svg
@@ -0,0 +1,12 @@
+
+
\ No newline at end of file
diff --git a/static/tabbar/me.png b/static/tabbar/me.png
new file mode 100644
index 0000000..771d249
Binary files /dev/null and b/static/tabbar/me.png differ
diff --git a/static/tabbar/me_select.png b/static/tabbar/me_select.png
new file mode 100644
index 0000000..0fd4c81
Binary files /dev/null and b/static/tabbar/me_select.png differ
diff --git a/static/tabbar/message.png b/static/tabbar/message.png
new file mode 100644
index 0000000..f053bac
Binary files /dev/null and b/static/tabbar/message.png differ
diff --git a/static/tabbar/message_select.png b/static/tabbar/message_select.png
new file mode 100644
index 0000000..d33c499
Binary files /dev/null and b/static/tabbar/message_select.png differ
diff --git a/static/tabbar/workbench._select.png b/static/tabbar/workbench._select.png
new file mode 100644
index 0000000..a133329
Binary files /dev/null and b/static/tabbar/workbench._select.png differ
diff --git a/static/tabbar/workbench.png b/static/tabbar/workbench.png
new file mode 100644
index 0000000..2c188bf
Binary files /dev/null and b/static/tabbar/workbench.png differ