diff --git a/api/car/carApi.js b/api/car/carApi.js index f2f9e62..7797998 100644 --- a/api/car/carApi.js +++ b/api/car/carApi.js @@ -28,12 +28,12 @@ export function getCars(_objData) { success: function(res) { if (res.statusCode == 200) { //将业主信息和房屋信息一起返回 - let _parkingSpaces = res.data.data; + let _cars = res.data.data; if (_parkingSpaces.length == 0) { - reject("业主没有房屋信息"); + reject("业主没有车辆信息"); return; } - resolve(_parkingSpaces); + resolve(_cars); } else { reject("查询车辆失败"); } @@ -45,6 +45,59 @@ export function getCars(_objData) { }); }; +export function queryAppOwnerCars(_objData) { + return new Promise((resolve, reject) => { + request({ + url: url.queryAppOwnerCars, + method: "GET", + data:_objData, + success: function(res) { + if (res.statusCode == 200) { + //将业主信息和房屋信息一起返回 + let _cars = res.data.data; + if (_cars.length == 0) { + reject("业主没有车辆信息"); + return; + } + resolve(_cars); + } else { + reject("查询车辆失败"); + } + }, + fail: function(res) { + reject(res); + } + }); + }); +}; +export function queryAppCarMonthCard(_objData) { + return new Promise((resolve, reject) => { + request({ + url: url.queryAppCarMonthCard, + method: "GET", + data:_objData, + success: function(res) { + if (res.statusCode == 200) { + //将业主信息和房屋信息一起返回 + let _cars = res.data.data; + if (_cars.length == 0) { + reject("业主没有车辆信息"); + return; + } + resolve(_cars); + } else { + reject("查询车辆失败"); + } + }, + fail: function(res) { + reject(res); + } + }); + }); +}; + + + export function queryWaitPayFeeTempCar(_objData) { return new Promise((resolve, reject) => { diff --git a/components/service/service-property.vue b/components/service/service-property.vue index da3b6bf..afd8290 100644 --- a/components/service/service-property.vue +++ b/components/service/service-property.vue @@ -182,12 +182,12 @@ href: '/pages/itemRelease/itemRelease', ownerAuth:true }, - // { - // name: '智能充电', - // src: this.imgUrl + '/h5/images/serve/my3.png', - // href: '/pages/machine/chargeMachines', - // ownerAuth:false - // }, + { + name: '车辆月卡', + src: this.imgUrl + '/h5/images/serve/my3.png', + href: '/pages/fee/buyeCarMonthCard', + ownerAuth:false + }, { name: '物业打分', src: this.imgUrl + '/h5/images/serve/my9.png', diff --git a/constant/url.js b/constant/url.js index c7f6c7e..e054c91 100644 --- a/constant/url.js +++ b/constant/url.js @@ -241,6 +241,10 @@ export default { listInvoiceEvent: baseUrl+"app/invoice.listInvoiceEvent", saveInvoiceApply: baseUrl+"app/invoice.saveInvoiceApply", getNativeQrcodePayment: baseUrl+"app/payment.getNativeQrcodePayment", + queryAppOwnerCars: baseUrl+"app/owner.queryAppOwnerCars", + queryAppCarMonthCard: baseUrl+"app/carMonth.queryAppCarMonthCard", + + diff --git a/manifest.json b/manifest.json index 2afc398..b451983 100644 --- a/manifest.json +++ b/manifest.json @@ -80,12 +80,12 @@ "disableHostCheck" : true, "proxy" : { "/app" : { - "target" : "http://192.168.100.108:8088/", //目标接口域名 + "target" : "http://127.0.0.1:8008/", //目标接口域名 "changeOrigin" : true, //是否跨域 "secure" : true // 设置支持https协议的代理 }, "/callComponent" : { - "target" : "http://192.168.100.108:8088/", //目标接口域名 + "target" : "http://127.0.0.1:8008/", //目标接口域名 "changeOrigin" : true, //是否跨域 "secure" : true // 设置支持https协议的代理 } diff --git a/pages.json b/pages.json index ee88c08..3160b0b 100644 --- a/pages.json +++ b/pages.json @@ -1029,6 +1029,13 @@ "navigationBarTitleText" : "认证记录", "enablePullDownRefresh" : false } + }, + { + "path" : "pages/fee/buyeCarMonthCard", + "style" : + { + "navigationBarTitleText" : "车辆月卡" + } } ], "tabBar": { diff --git a/pages/fee/buyeCarMonthCard.vue b/pages/fee/buyeCarMonthCard.vue new file mode 100644 index 0000000..86e5789 --- /dev/null +++ b/pages/fee/buyeCarMonthCard.vue @@ -0,0 +1,181 @@ + + + + +