diff --git a/App.vue b/App.vue index f40fb27..760453e 100644 --- a/App.vue +++ b/App.vue @@ -15,14 +15,14 @@ @import "uview-ui/index.scss"; /*每个页面公共css */ - // page { - // background-color: #F4F5F7; - // } + page { + background-color: #F4F5F7; + } - // .app { - // width: 100%; - // height: 100%; - // text-align: justify; - // color: #000000; - // } - + .app { + width: 100%; + height: 100%; + text-align: justify; + color: #000000; + } + \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 46cc286..72d5d66 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,8 +10,7 @@ "license": "ISC", "dependencies": { "uview-ui": "^1.8.8" - }, - "devDependencies": {} + } }, "node_modules/uview-ui": { "version": "1.8.8", diff --git a/pages.json b/pages.json index 48983eb..43c0c9b 100644 --- a/pages.json +++ b/pages.json @@ -3,52 +3,73 @@ "^u-(.*)": "uview-ui/components/u-$1/u-$1.vue" }, "pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages - { - "path": "pages/index/index", - "style": { - "navigationBarTitleText": "", - "enablePullDownRefresh": false, - "navigationStyle": "custom" - } - }, + { + "path": "pages/login/login", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": false, + "navigationStyle": "custom" + } + }, + { + "path": "pages/myinformation/myinformation", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": false, + "navigationStyle": "custom" + } + }, + { + "path": "pages/myinformation/myinformation", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": false, + "navigationStyle": "custom" + // "navigationBarBackgroundColor": "#4ac4ab" + + // "navigationStyle": "custom" + } + }, { "path": "pages/homepage/homepage", "style": { "enablePullDownRefresh": false, - "navigationStyle": "custom" + "navigationBarTitleText": "工单" } - }, + } // { - // "path": "pages/login/login", + // "path": "pages/index/index", // "style": { - // "navigationBarTitleText": "", // "enablePullDownRefresh": false, // "navigationStyle": "custom" // } - // }, - { - "path": "pages/myinformation/myinformation", - "style": { - "navigationBarTitleText": "我的", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#4ac4ab" + // } - // "navigationStyle": "custom" - } - } - ], + + + ,{ + "path" : "pages/Personalinfo/Personalinfo", + "style" : + { + "navigationBarTitleText": "个人信息", + "enablePullDownRefresh": false + } + + } + ], "globalStyle": { - "navigationBarTextStyle": "black", + "navigationBarTextStyle": "white", "navigationBarTitleText": "", - "navigationBarBackgroundColor": "#F8F8F8", + "navigationBarBackgroundColor": "#18CBB3", "backgroundColor": "#F8F8F8" + }, "uniIdRouter": {}, "tabBar": { "color": "#7A7E83", "selectedColor": "#435950", - "borderStyle": "black", + "borderStyle": "white", "backgroundColor": "#ffffff", "list": [{ "pagePath": "pages/homepage/homepage", @@ -56,11 +77,10 @@ "selectedIconPath": "static/homepage.png", "text": "首页" }, - { "pagePath": "pages/myinformation/myinformation", - "iconPath": "static/myinformation.png", - "selectedIconPath": "static/myinformations.png", + "iconPath": "static/myinformations.png", + "selectedIconPath": "static/myinformation.png", "text": "我的" } ] diff --git a/pages/Personalinfo/Personalinfo.vue b/pages/Personalinfo/Personalinfo.vue new file mode 100644 index 0000000..b224ce9 --- /dev/null +++ b/pages/Personalinfo/Personalinfo.vue @@ -0,0 +1,72 @@ + + + + + \ No newline at end of file diff --git a/pages/homepage/homepage.vue b/pages/homepage/homepage.vue index 7cadeb5..5ae8826 100644 --- a/pages/homepage/homepage.vue +++ b/pages/homepage/homepage.vue @@ -1,7 +1,16 @@ @@ -10,16 +19,130 @@ export default { data() { return { + tabslist: [{ + name: '全部工单' + }, { + name: '我的工单' + }, { + name: '已完成工单', + }], + tabscurrent: 0, + optionindex: 1, + optionname: '待处理', + options: [{ + label: '待处理', + value: 1, + }, { + label: '已完成', + value: 2, + }], + query: { + label: '', + } } }, onLoad() { - + }, methods: { - + tabschange(index) { + this.tabscurrent = index; + }, + dropitemchange(e) { + this.optionname = this.options.find(m => m.value === e).label + console.log(e) + }, } } \ No newline at end of file diff --git a/pages/login/login.vue b/pages/login/login.vue new file mode 100644 index 0000000..6490908 --- /dev/null +++ b/pages/login/login.vue @@ -0,0 +1,171 @@ + + + + + \ No newline at end of file diff --git a/pages/myinformation/myinformation.vue b/pages/myinformation/myinformation.vue index 277cc3e..30ce16c 100644 --- a/pages/myinformation/myinformation.vue +++ b/pages/myinformation/myinformation.vue @@ -1,9 +1,100 @@