diff --git a/app.js b/app.js index 0ba9148d2..4b4cb0be0 100644 --- a/app.js +++ b/app.js @@ -34,10 +34,10 @@ let opts = { //app.use('/callComponent',proxy('https://app.demo.winqi.cn/',opts)); //app.use('/callComponent',proxy('http://api.demo.winqi.cn:8012/',opts)); //app.use('/callComponent',proxy('http://api.demo.winqi.cn:8012',opts)); -app.use('/callComponent',proxy('http://api.demo.winqi.cn:8012',opts)); -app.use('/app',proxy('http://api.demo.winqi.cn:8012',opts)); -//app.use('/callComponent',proxy('http://192.168.1.16:8012',opts)); -//app.use('/app',proxy('http://192.168.1.16:8012',opts)); +//app.use('/callComponent',proxy('http://api.demo.winqi.cn:8012',opts)); +//app.use('/app',proxy('http://api.demo.winqi.cn:8012',opts)); +app.use('/callComponent',proxy('http://192.168.1.16:8012',opts)); +app.use('/app',proxy('http://192.168.1.16:8012',opts)); //app.listen(3000); app.use(express.json()); diff --git a/public/components/property/deleteOwnerCar/deleteOwnerCar.html b/public/components/property/deleteOwnerCar/deleteOwnerCar.html new file mode 100644 index 000000000..d8863fa6c --- /dev/null +++ b/public/components/property/deleteOwnerCar/deleteOwnerCar.html @@ -0,0 +1,19 @@ + \ No newline at end of file diff --git a/public/components/property/deleteOwnerCar/deleteOwnerCar.js b/public/components/property/deleteOwnerCar/deleteOwnerCar.js new file mode 100644 index 000000000..3d2a5aa76 --- /dev/null +++ b/public/components/property/deleteOwnerCar/deleteOwnerCar.js @@ -0,0 +1,44 @@ +(function(vc){ + vc.extends({ + propTypes: { + notifyLoadDataComponentName:vc.propTypes.string + }, + data:{ + deleteOwnerCarInfo:{} + }, + _initEvent:function(){ + vc.on('deleteOwnerCar','openOwnerCarModel',function(_ownerInfo){ + vc.component.deleteOwnerCarInfo = _ownerInfo; + $('#deleteOwnerCarModel').modal('show'); + }); + }, + methods:{ + closedeleteOwnerCarModel:function(){ + $('#deleteOwnerCarModel').modal('hide'); + }, + deleteOwnerCar:function(){ + vc.component.deleteOwnerCarInfo.communityId = vc.getCurrentCommunity().communityId; + vc.http.apiPost( + 'owner.deleteOwnerCars', + JSON.stringify(vc.component.deleteOwnerCarInfo), + { + emulateJSON:true + }, + function(json,res){ + //vm.menus = vm.refreshMenuActive(JSON.parse(json),0); + if(res.status == 200){ + //关闭model + $('#deleteOwnerCarModel').modal('hide'); + vc.emit($props.notifyLoadDataComponentName,'listOwnerCarData',{}); + return ; + } + vc.component.deleteOwnerCarnfo.errorInfo = json; + }, + function(errInfo,error){ + vc.toast(errInfo); + // vc.component.deleteOwnerCarnfo.errorInfo = errInfo; + }); + } + } + }); +})(window.vc); diff --git a/public/pages/property/listOwnerCar/listOwnerCar.html b/public/pages/property/listOwnerCar/listOwnerCar.html new file mode 100644 index 000000000..29f209b52 --- /dev/null +++ b/public/pages/property/listOwnerCar/listOwnerCar.html @@ -0,0 +1,151 @@ +
+ +
+
+
+
+
查询条件
+
+ +
+
+
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+ +
+
+ +
+
+
+
+ +
+
+
+
+
车辆信息
+
+ +
+
+
+ +
+
+
+ +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
车牌号车辆品牌车辆类型颜色业主车位起租时间截止时间状态操作
+ {{car.carNum}} + + {{car.carBrand}} + + {{car.carType}} + + {{car.carColor}} + + {{car.ownerName}}({{car.link}}) + + {{car.areaNum}}车场{{car.num}}车位 + + 无 + + {{car.startTime}} + + {{car.endTime}} + + {{car.state}} + +
+ +
+
+ +
+
+
    +
    + + +
    +
    +
    +
    + + + + + +
    \ No newline at end of file diff --git a/public/pages/property/listOwnerCar/listOwnerCar.js b/public/pages/property/listOwnerCar/listOwnerCar.js new file mode 100644 index 000000000..5dd30a2e8 --- /dev/null +++ b/public/pages/property/listOwnerCar/listOwnerCar.js @@ -0,0 +1,79 @@ +(function (vc) { + var DEFAULT_PAGE = 1; + var DEFAULT_ROWS = 10; + vc.extends({ + data: { + listOwnerCarInfo: { + ownerCars: [], + total: 0, + records: 1, + num: '', + moreCondition: false, + conditions: { + carNum: '', + num: '', + state:'' + } + } + }, + _initMethod: function () { + $that._listOwnerCar(DEFAULT_PAGE, DEFAULT_ROWS); + }, + _initEvent: function () { + vc.on('lisOwnerCar', 'listOwnerCarData', function () { + $that._listOwnerCar(DEFAULT_PAGE, DEFAULT_ROWS); + }); + vc.on('pagination', 'page_event', function (_currentPage) { + $that._listOwnerCar(_currentPage, DEFAULT_ROWS); + }); + }, + methods: { + _listOwnerCar: function (_page, _row) { + var param = { + params: { + page: _page, + row: _row, + communityId: vc.getCurrentCommunity().communityId, + } + } + + //发送get请求 + vc.http.apiGet('owner.queryOwnerCars', + param, + function (json, res) { + var _json = JSON.parse(json); + + $that.listOwnerCarInfo.total = _json.total; + $that.listOwnerCarInfo.records = _json.records; + $that.listOwnerCarInfo.ownerCars = _json.data; + + vc.emit('pagination', 'init', { + total: $that.listOwnerCarInfo.records, + dataCount: $that.listOwnerCarInfo.total, + currentPage: _page + }); + }, function (errInfo, error) { + console.log('请求失败处理'); + } + ); + + }, + _openToHireParkingSpaceModel:function(_parkingSpace){ //出租 + vc.jumpToPage('/admin.html#/pages/property/hireParkingSpace?'+vc.objToGetParam(_parkingSpace)); + }, + _queryMethod: function () { + $that._listOwnerCar(DEFAULT_PAGE, DEFAULT_ROWS); + }, + _moreCondition: function () { + if ($that.listOwnerCarInfo.moreCondition) { + $that.listOwnerCarInfo.moreCondition = false; + } else { + $that.listOwnerCarInfo.moreCondition = true; + } + }, + _openDelOwnerCarModel:function(_car){ + vc.emit('deleteOwnerCar','openOwnerCarModel',_car); + }, + } + }) +})(window.vc); \ No newline at end of file diff --git a/public/pages/property/listRoomFee/listRoomFee.html b/public/pages/property/listRoomFee/listRoomFee.html index 50ea0f06c..ef13d8bf6 100644 --- a/public/pages/property/listRoomFee/listRoomFee.html +++ b/public/pages/property/listRoomFee/listRoomFee.html @@ -29,7 +29,7 @@ 费用类型 房屋面积 单价 - 附加费 + 附加费/固定费 应收金额 建账时间 计费起始时间