diff --git a/jnpf-app/pages.json b/jnpf-app/pages.json
index af39755..c84acf5 100644
--- a/jnpf-app/pages.json
+++ b/jnpf-app/pages.json
@@ -34,6 +34,28 @@
}
},
// #endif
+ {
+ "path": "pages/work/index",
+ "style": {
+ "navigationStyle": "custom",
+ "app-plus": {
+ "titleNView": false,
+ "bounce": "none",
+ "softinputMode": "adjustPan" //adjustResize
+ }
+ }
+ },
+ {
+ "path": "pages/me/index",
+ "style": {
+ "navigationStyle": "custom",
+ "app-plus": {
+ "titleNView": false,
+ "bounce": "none",
+ "softinputMode": "adjustPan" //adjustResize
+ }
+ }
+ },
{
"path": "pages/login/index",
"style": {
@@ -1008,33 +1030,46 @@
"color": "#303133",
"selectedColor": "#2979FF",
"backgroundColor": "#ffffff",
- "list": [{
- "pagePath": "pages/index/portal",
- "text": "首页",
- "iconPath": "static/image/tabbar/home.png",
- "selectedIconPath": "static/image/tabbar/homeHL.png"
- },
- {
- "pagePath": "pages/index/workFlow",
- "text": "协同",
- "iconPath": "static/image/tabbar/workFlow.png",
- "selectedIconPath": "static/image/tabbar/workFlowHL.png"
- },
+ "list": [
{
- "pagePath": "pages/index/apply",
+ "pagePath": "pages/work/index",
"text": "工作台",
- "iconPath": "static/image/tabbar/apply.png",
- "selectedIconPath": "static/image/tabbar/applyHL.png"
+ "iconPath": "static/tabs/home_default.png",
+ "selectedIconPath": "static/tabs/home_selected.png"
},
{
- "pagePath": "pages/index/index",
- "text": "消息",
- "iconPath": "static/image/tabbar/message.png",
- "selectedIconPath": "static/image/tabbar/messageHL.png"
+ "pagePath": "pages/me/index",
+ "text": "我的",
+ "iconPath": "static/tabs/user_default.png",
+ "selectedIconPath": "static/tabs/user_selected.png"
},
+ // {
+ // "pagePath": "pages/index/portal",
+ // "text": "首页",
+ // "iconPath": "static/image/tabbar/home.png",
+ // "selectedIconPath": "static/image/tabbar/homeHL.png"
+ // },
+ // {
+ // "pagePath": "pages/index/workFlow",
+ // "text": "协同",
+ // "iconPath": "static/image/tabbar/workFlow.png",
+ // "selectedIconPath": "static/image/tabbar/workFlowHL.png"
+ // },
+ // {
+ // "pagePath": "pages/index/apply",
+ // "text": "工作台",
+ // "iconPath": "static/image/tabbar/apply.png",
+ // "selectedIconPath": "static/image/tabbar/applyHL.png"
+ // },
+ // {
+ // "pagePath": "pages/index/index",
+ // "text": "消息",
+ // "iconPath": "static/image/tabbar/message.png",
+ // "selectedIconPath": "static/image/tabbar/messageHL.png"
+ // },
{
"pagePath": "pages/index/my",
- "text": "我的",
+ "text": "我",
"iconPath": "static/image/tabbar/my.png",
"selectedIconPath": "static/image/tabbar/myHL.png"
}
diff --git a/jnpf-app/pages/launch/index.vue b/jnpf-app/pages/launch/index.vue
index 9aae2a1..6ae65bd 100644
--- a/jnpf-app/pages/launch/index.vue
+++ b/jnpf-app/pages/launch/index.vue
@@ -1,105 +1,107 @@
-
-
-
- 全新模式 为你而来
- VERSION3.2
-
-
-
- Copyright © 2023 引迈信息技术有限公司出品
-
-
-
+
+
+
+ 全新模式 为你而来
+ VERSION3.2
+
+
+
+ Copyright © 2023 引迈信息技术有限公司出品
+
+
+
diff --git a/jnpf-app/pages/login/index.vue b/jnpf-app/pages/login/index.vue
index 2401037..afd5555 100644
--- a/jnpf-app/pages/login/index.vue
+++ b/jnpf-app/pages/login/index.vue
@@ -268,7 +268,8 @@ export default {
.then((res) => {
uni.hideLoading();
uni.reLaunch({
- url: "/pages/index/portal",
+ // url: "/pages/index/portal",
+ url: "/pages/work/index",
});
})
.catch(() => {
@@ -290,7 +291,8 @@ export default {
.then((res) => {
uni.hideLoading();
uni.reLaunch({
- url: "/pages/index/portal",
+ // url: "/pages/index/portal",
+ url: "/pages/work/index",
});
})
.catch(() => {
@@ -422,7 +424,8 @@ export default {
.then((res) => {
uni.hideLoading();
uni.switchTab({
- url: "/pages/index/portal",
+ // url: "/pages/index/portal",
+ url: "/pages/work/index",
});
this.show = false;
})
@@ -527,7 +530,8 @@ export default {
.then((res) => {
this.loading = false;
uni.switchTab({
- url: "/pages/index/portal",
+ url: "/pages/work/index",
+ // url: "/pages/index/portal",
});
})
.catch(() => {
diff --git a/jnpf-app/pages/me/components/CustomNavbar.vue b/jnpf-app/pages/me/components/CustomNavbar.vue
new file mode 100644
index 0000000..d39606c
--- /dev/null
+++ b/jnpf-app/pages/me/components/CustomNavbar.vue
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
+
diff --git a/jnpf-app/pages/me/index.vue b/jnpf-app/pages/me/index.vue
new file mode 100644
index 0000000..a23a079
--- /dev/null
+++ b/jnpf-app/pages/me/index.vue
@@ -0,0 +1,83 @@
+
+
+
+ 拼命加载中...
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/jnpf-app/pages/work/components/CategoryPanel.vue b/jnpf-app/pages/work/components/CategoryPanel.vue
new file mode 100644
index 0000000..c610600
--- /dev/null
+++ b/jnpf-app/pages/work/components/CategoryPanel.vue
@@ -0,0 +1,102 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/jnpf-app/pages/work/components/CustomNavbar.vue b/jnpf-app/pages/work/components/CustomNavbar.vue
new file mode 100644
index 0000000..d39606c
--- /dev/null
+++ b/jnpf-app/pages/work/components/CustomNavbar.vue
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
+
diff --git a/jnpf-app/pages/work/index.vue b/jnpf-app/pages/work/index.vue
new file mode 100644
index 0000000..5c2d6dc
--- /dev/null
+++ b/jnpf-app/pages/work/index.vue
@@ -0,0 +1,87 @@
+
+
+
+ 拼命加载中...
+
+
+
+
+
+
+
+
+
+
+
+
+
+