diff --git a/api/api.js b/api/api.js index 85c7c18..bc01329 100644 --- a/api/api.js +++ b/api/api.js @@ -33,6 +33,17 @@ const config = { url: '/workorder/template/queryTemplateList', method: 'GET', }, + //公告信息-查询公告列表 + queryNewsList: { + url: '/workorder/news/queryNewsList', + method: 'GET', + }, + // 公告信息-根据id查询公告信息 + queryNewsById: { + url: '/workorder/news/queryNewsById', + method: 'GET', + }, + } diff --git a/pages.json b/pages.json index b7a91bf..fdd1334 100644 --- a/pages.json +++ b/pages.json @@ -1,6 +1,5 @@ { - "pages": [ - { + "pages": [{ "path": "pages/index/index", "style": { "navigationBarTitleText": "", @@ -22,8 +21,7 @@ }, "subPackages": [{ "root": "pages_order", - "pages": [ - { + "pages": [{ "path": "auth/wxLogin" }, { @@ -36,64 +34,99 @@ "path": "mine/help" }, { - "path" : "order/WorkOrders" + "path": "order/WorkOrders" + }, + { + "path": "order/ModifyWorkOrder", + "style": { + "navigationBarTitleText": "" + } + }, + { + "path": "order/FavoriteList", + "style": { + "navigationBarTitleText": "" + } + }, + { + "path": "order/WorkOrderList", + "style": { + "navigationBarTitleText": "" + } }, + { - "path" : "order/ModifyWorkOrder", - "style" : - { - "navigationBarTitleText" : "" + "path": "order/ProcessCardOne", + "style": { + "navigationBarTitleText": "" } + }, { - "path" : "order/FavoriteList", - "style" : - { - "navigationBarTitleText" : "" + "path": "order/ProcessCardTo", + "style": { + "navigationBarTitleText": "" } + }, { - "path" : "order/WorkOrderList", - "style" : - { - "navigationBarTitleText" : "" + "path": "order/ProcessCardThree", + "style": { + "navigationBarTitleText": "" } + }, + { + "path": "order/ProcessCardFour", + "style": { + "navigationBarTitleText": "" + } + + }, + { + "path": "order/memberList", + "style": { + "navigationBarTitleText": "" + } + + }, + { + "path": "order/ModifyMembers", + "style": { + "navigationBarTitleText": "" + } + }, { - "path" : "order/ProcessCardOne", - "style" : - { - "navigationBarTitleText" : "" + "path": "order/Worknotice", + "style": { + "navigationBarTitleText": "" } }, { - "path" : "order/ProcessCardTo", - "style" : - { - "navigationBarTitleText" : "" + "path": "order/ChangePassword", + "style": { + "navigationBarTitleText": "" } }, { - "path" : "order/ProcessCardThree", - "style" : - { - "navigationBarTitleText" : "" + "path": "order/HelpCenter", + "style": { + "navigationBarTitleText": "" } }, { - "path" : "order/ProcessCardFour", - "style" : - { - "navigationBarTitleText" : "" + "path": "order/PrivacyAgreement", + "style": { + "navigationBarTitleText": "" } } - + ] }], "globalStyle": { diff --git a/pages/index/center.vue b/pages/index/center.vue index d40c26a..b913270 100644 --- a/pages/index/center.vue +++ b/pages/index/center.vue @@ -11,7 +11,8 @@ - + @@ -25,12 +26,12 @@
- + - + 修改密码 @@ -54,7 +55,7 @@
- + @@ -68,7 +69,7 @@
- + diff --git a/pages/index/index.vue b/pages/index/index.vue index 9215c35..db83fa3 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -24,7 +24,9 @@ - + @@ -93,13 +95,15 @@ url : '/pages_order/order/WorkOrderList', }, ], - text: ['uv-ui众多组件覆盖开发过程的各个需求','组件功能丰富,多端兼容','让您快速集成,开箱即用'], + NewsList : [],//公告列表 + text : [],//公告列表标题 } }, computed: { }, onLoad() { this.queryBannerList() + this.queryNewsList() }, methods: { queryBannerList(){ @@ -108,7 +112,26 @@ this.bannerList = res.result.records } }) - } + }, + queryNewsList(){ + this.$api('queryNewsList', res =>{ + if(res.code == 200){ + this.NewsList = res.result.records + + res.result.records.forEach(n => { + this.text.push(n.title) + }) + } + }) + }, + toNotice(index){ + console.log(this.NewsList[index]); + // @click="$utils.navigateTo('/pages_order/order/Worknotice')" + uni.navigateTo({ + url: '/pages_order/order/Worknotice?id=' + this.NewsList[index].id + }) + + }, } } diff --git a/pages_order/order/ChangePassword.vue b/pages_order/order/ChangePassword.vue new file mode 100644 index 0000000..728a305 --- /dev/null +++ b/pages_order/order/ChangePassword.vue @@ -0,0 +1,98 @@ + + + + + \ No newline at end of file diff --git a/pages_order/order/FavoriteList.vue b/pages_order/order/FavoriteList.vue index 2574723..c578db3 100644 --- a/pages_order/order/FavoriteList.vue +++ b/pages_order/order/FavoriteList.vue @@ -1,4 +1,5 @@ + + + + diff --git a/pages_order/order/ModifyMembers.vue b/pages_order/order/ModifyMembers.vue new file mode 100644 index 0000000..23bdf38 --- /dev/null +++ b/pages_order/order/ModifyMembers.vue @@ -0,0 +1,122 @@ + + + + + \ No newline at end of file diff --git a/pages_order/order/ModifyWorkOrder.vue b/pages_order/order/ModifyWorkOrder.vue index 3956895..62d77c8 100644 --- a/pages_order/order/ModifyWorkOrder.vue +++ b/pages_order/order/ModifyWorkOrder.vue @@ -1,4 +1,5 @@