diff --git a/src/core/apis.js b/src/core/apis.js index ccaa462..01fa593 100644 --- a/src/core/apis.js +++ b/src/core/apis.js @@ -12,6 +12,19 @@ const apis = { carefree: { url: "/user/workerinfo/carefree", auth: true, + }, + notify: { + cate: { + url: "/wxapp/index/newcate", + showLoading: true, + }, + list: { + url: "/wxapp/index/newlistbycateid", + showLoading: true, + }, + detail: { + url: "" + } } }, user: { diff --git a/src/core/models/system.js b/src/core/models/system.js index 03706a8..8e9467e 100644 --- a/src/core/models/system.js +++ b/src/core/models/system.js @@ -83,4 +83,53 @@ export default { }); }); }, -} \ No newline at end of file + /** + * 服务数据 + */ + serviceData() { + return new Promise((resolve, reject) => { + prototype.$request({ + api: "system.serviceData", + }).then(response => { + if (response.code == 1) { + return resolve(response.data); + } + return reject(response.msg); + }).catch(e => { }); + }); + }, + /** + * 公告分类 + */ + notifyCate() { + return new Promise((resolve, reject) => { + prototype.$request({ + api: "system.notify.cate" + }).then((response) => { + if (response.code == 1) { + return resolve(response.data); + } + return reject(response.msg); + }); + }); + }, + /** + * 公告列表 + */ + notifyList(cateId, page) { + return new Promise((resolve, reject) => { + prototype.$request({ + api: "system.notify.list", + data: { + cateid: cateId, + page: page, + } + }).then((response) => { + if (response.code == 1) { + return resolve(response.data); + } + return reject(response.msg); + }); + }); + } +} diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index 556af1f..c175f7e 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -36,9 +36,21 @@ - - - {{ item.name }} + + + 接单大厅 + + + + 平台规则 + + + + 平台客服 + + + + 帮助中心 @@ -74,54 +86,7 @@ export default { utils: this.$utils, safePt: 0, backgroundImage: require("@/static/temp/1.png"), - notifyList: [ - { - id: 1, - title: "恭喜成都市王先生订购xxxxxx服务一套", - }, - { - id: 2, - title: "恭喜成都市王先生订购xxxxxx服务一套", - }, - { - id: 3, - title: "恭喜成都市王先生订购xxxxxx服务一套", - }, - { - id: 4, - title: "恭喜成都市王先生订购xxxxxx服务一套", - }, - { - id: 5, - title: "恭喜成都市王先生订购xxxxxx服务一套", - }, - ], - navList: [ - { - id: 1, - icon: require("@/static/temp/index/1.png"), - name: "接单大厅", - page: "/pages/get/index", - }, - { - id: 1, - icon: require("@/static/temp/index/2.png"), - name: "平台规则", - page: "", - }, - { - id: 1, - icon: require("@/static/temp/index/3.png"), - name: "平台客服", - page: "", - }, - { - id: 1, - icon: require("@/static/temp/index/4.png"), - name: "帮助中心", - page: "", - }, - ], + notifyList: [], action: { item1: 0, item2: 0, @@ -133,25 +98,28 @@ export default { components: { AppLayout, }, - onLoad() {}, + onLoad() { + this.$models.system.notifyList(1, 1).then((list) => { + this.notifyList = list; + }); + }, onShow() { - this.$request({ - api: "system.serviceData", - }) - .then((response) => { - if (response.code == 1) { - this.action.item1 = response.data.order1; - this.action.item2 = response.data.order2; - this.action.item3 = response.data.order3; - this.action.item4 = response.data.order4; - } - }) - .catch((e) => {}); + this.$models.system.serviceData().then((data) => { + this.action.item1 = data.order1; + this.action.item2 = data.order2; + this.action.item3 = data.order3; + this.action.item4 = data.order4; + }); }, onReady() {}, onReachBottom() {}, onPullDownRefresh() {}, - methods: {}, + methods: { + toMessage(id) { + this.$store.commit("system/messageTabIndex", id); + this.$utils.toPage("/pages/message/message", {}, "switch"); + }, + }, }; diff --git a/src/pages/message/message.vue b/src/pages/message/message.vue index 2bef65c..cde5b91 100644 --- a/src/pages/message/message.vue +++ b/src/pages/message/message.vue @@ -12,16 +12,15 @@ - + - - {{ v.title }} + + {{ v.title }} {{ v.date }} @@ -33,92 +32,52 @@ diff --git a/src/store/modules/system.js b/src/store/modules/system.js index 1c098f1..746136a 100644 --- a/src/store/modules/system.js +++ b/src/store/modules/system.js @@ -1,7 +1,13 @@ export default { namespaced: true, - state: {}, + state: { + messageTabIndex: 0, + }, getters: {}, - mutations: {}, + mutations: { + messageTabIndex(state, data) { + state.messageTabIndex = data; + } + }, actions: {} }