From e610aae84834b7d4fd23a065976adbd02297077c Mon Sep 17 00:00:00 2001 From: wuxw <928255095@qq.com> Date: Thu, 10 Nov 2022 02:24:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E8=AE=BE=E5=A4=87=E6=89=AB?= =?UTF-8?q?=E7=A0=81=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/machine/machineApi.js | 19 ++- components/service/service-property.vue | 5 + constant/url.js | 3 +- pages.json | 11 +- pages/machine/machine.vue | 207 ++++++++++++++++++++++++ 5 files changed, 242 insertions(+), 3 deletions(-) create mode 100644 pages/machine/machine.vue diff --git a/api/machine/machineApi.js b/api/machine/machineApi.js index ad701e0..dbcae02 100644 --- a/api/machine/machineApi.js +++ b/api/machine/machineApi.js @@ -6,7 +6,7 @@ import { - request + request, requestNoAuth } from '../../lib/java110/java110Request.js' import url @@ -45,4 +45,21 @@ export function getMachineTranslates(_objData) { }); }; +export function getMachines(_objData) { + return new Promise((resolve, reject) => { + requestNoAuth({ + url: url.listEquipmentAccount, + method: "GET", + data:_objData, + success: function(res) { + let _data = res.data; + resolve(_data); + }, + fail: function(res) { + reject(res); + } + }); + }); +}; + diff --git a/components/service/service-property.vue b/components/service/service-property.vue index 6c3855c..74fb89c 100644 --- a/components/service/service-property.vue +++ b/components/service/service-property.vue @@ -139,6 +139,11 @@ name: '球场预约', src: this.imgUrl + '/h5/images/serve/order4.png', href: '/pages/appointment/appointment' + }, + { + name: '设备', + src: this.imgUrl + '/h5/images/serve/order4.png', + href: '/pages/machine/machine?machineId=102022110791780032' }, ]; } diff --git a/constant/url.js b/constant/url.js index 584c347..9e5fefe 100755 --- a/constant/url.js +++ b/constant/url.js @@ -165,7 +165,8 @@ export default { bookingUnifiedPayment: baseUrl + "app/payment.unifiedPayment", // 修改预约订单 - saveCommunitySpacePersonTime: baseUrl + "app/communitySpace.saveCommunitySpacePersonTime", + saveCommunitySpacePersonTime: baseUrl + "app/communitySpace.saveCommunitySpacePersonTime", + listEquipmentAccount:baseUrl +"app/equipmentAccount.listEquipmentAccount", diff --git a/pages.json b/pages.json index 1b9ac97..4c50bd7 100755 --- a/pages.json +++ b/pages.json @@ -610,7 +610,16 @@ "enablePullDownRefresh": false } } - ], + ,{ + "path" : "pages/machine/machine", + "style" : + { + "navigationBarTitleText": "设备说明", + "enablePullDownRefresh": false + } + + } + ], "tabBar": { "color": "#272636", "selectedColor": "#00AA00", diff --git a/pages/machine/machine.vue b/pages/machine/machine.vue new file mode 100644 index 0000000..44cb1c9 --- /dev/null +++ b/pages/machine/machine.vue @@ -0,0 +1,207 @@ + + + +