diff --git a/.idea/oa-base.iml b/.idea/moce-base.iml similarity index 100% rename from .idea/oa-base.iml rename to .idea/moce-base.iml diff --git a/.idea/modules.xml b/.idea/modules.xml index 8067a1b..fb53228 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/App.vue b/App.vue index 3081549..0c69871 100644 --- a/App.vue +++ b/App.vue @@ -1,12 +1,26 @@ diff --git a/manifest.json b/manifest.json index 70f4eab..6d0de8d 100644 --- a/manifest.json +++ b/manifest.json @@ -1,9 +1,9 @@ { - "name" : "墨册", + "name" : "oa考勤系统", "appid" : "__UNI__4796942", "description" : "", - "versionName" : "1.0.1", - "versionCode" : 101, + "versionName" : "2.0.1", + "versionCode" : 201, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/pages.json b/pages.json index aaf60c2..0f688a0 100644 --- a/pages.json +++ b/pages.json @@ -1,14 +1,24 @@ { "pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages - { + + { "path": "pages/index/index", "style": { "navigationBarTitleText": "uni-app", "navigationStyle": "custom" } + }, + { + "path" : "pages/networko/index", + "style" : + { + "navigationBarTitleText": "uni-app", + "navigationStyle": "custom" + } } + ], - "globalStyle": { + "globalStyle": { "navigationBarTextStyle": "black", "navigationBarTitleText": "uni-app", "navigationBarBackgroundColor": "#F8F8F8", diff --git a/pages/index/index.vue b/pages/index/index.vue index 438d47b..fecedb1 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -1,5 +1,7 @@