Merge branch 'master' of https://github.com/java110/MicroCommunity

shiyj

2019-07-16 6d8a43de07062234a05716fcbb94273709cab21e

 WebService/src/main/resources/components/view-main-fee/viewMainFee.js

@@ -13,6 +13,7 @@
            mainFeeInfo:{
                feeName:$props.feeName,
                feeId:"",
                feeTypeCd:'',
                floorNum:"",
                roomId:"",
                roomNum:"",
@@ -33,6 +34,14 @@
                  vc.component.loadMainFeeInfo(_room);
            });

            vc.on('viewMainFee','reloadFee',function(_room){
                if(vc.component.mainFeeInfo.roomId != ''){
                      vc.component.loadMainFeeInfo({
                            roomId:vc.component.mainFeeInfo.roomId
                      });

                }
            });
        },
        methods:{

@@ -41,7 +50,9 @@
            },
            openPayModel:function(){
                vc.emit($props.payName,'openPayModel',{
                    feeId:vc.component.mainFeeInfo.feeId
                    feeId:vc.component.mainFeeInfo.feeId,
                    feeTypeCd:vc.component.mainFeeInfo.feeTypeCd,
                    builtUpArea:vc.component.mainFeeInfo.builtUpArea
                });
            },
            loadMainFeeInfo:function(_room){