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

WebService/src/main/resources/components/app-manage/appManage.html

@@ -16,7 +16,7 @@
                     <table class="footable table table-stripped toggle-arrow-tiny" data-page-size="15">
                         <thead>
                         <tr>
-                                                        <th>应用Id</th>
+                            <th>应用Id</th>
                             <th>应用名称</th>
                             <th>秘钥</th>
                             <th>白名单</th>
@@ -29,7 +29,7 @@
                         </thead>
                         <tbody>
                             <tr v-for="app in appManageInfo.apps">
-                                                            <td>{{app.appId}}</td>
+                            <td>{{app.appId}}</td>
                             <td>{{app.name}}</td>
                             <td>{{app.securityCode}}</td>
                             <td>{{app.whileListIp}}</td>

WebService/src/main/resources/components/service-binding/serviceBinding.html

@@ -5,17 +5,16 @@
     </div>
 
     <!-- 选择 应用信息 -->
-    <vc:create name="sellRoomSelectOwner"
-               callBackComponent = "sellCar"
+    <vc:create name="viewAppInfo"
     ></vc:create>
 
 
 
     <div class="row">
         <div class="col-md-10"></div>
-        <div class="col-md-2">
+        <div class="col-md-2 " style="margin-bottom:10px; text-align:right">
             <button type="button" class="btn btn-secondary" v-on:click="_prevStep()">上一步</button>
-            <button type="button" class="btn btn-primary" style="margin-left:10px" v-on:click="_nextStep()">下一步</button>
+            <button type="button" class="btn btn-primary" style="margin-left:10px;" v-on:click="_nextStep()">下一步</button>
         </div>
     </div>
 

WebService/src/main/resources/components/view-app-info/viewAppInfo.html

@@ -4,8 +4,11 @@
             <div class="ibox-title">
                 <h5>应用信息</h5>
                 <div class="ibox-tools" style="top:10px;">
-                    <button type="button" class="btn btn-primary btn-sm" v-on:click="openSearchOwnerModel()">
+                    <button type="button" class="btn btn-primary btn-sm" v-on:click="_openSelectAppInfoModel()">
                         <i class="glyphicon glyphicon-search"></i> 选择应用</button>
+
+                    <button type="button" class="btn btn-primary btn-sm" style="margin-right:10px;" v-on:click="_openAddAppInfoModel()">
+                        <i class="glyphicon glyphicon-plus"></i> 添加应用</button>
                 </div>
             </div>
             <div class="ibox-content">
@@ -13,19 +16,19 @@
                     <div class="col-sm-4">
                         <div class="form-group">
                             <label class="col-form-label" >应用ID：</label>
-                            <label class="">{{ownerInfo.ownerId}}</label>
+                            <label class="">{{viewAppInfo.appId}}</label>
                         </div>
                     </div>
                     <div class="col-sm-4">
                         <div class="form-group">
                             <label class="col-form-label">应用名称：</label>
-                            <label class="">{{ownerInfo.name}}</label>
+                            <label class="">{{viewAppInfo.name}}</label>
                         </div>
                     </div>
                     <div class="col-sm-4">
                         <div class="form-group">
                             <label class="col-form-label" >秘钥：</label>
-                            <label class="">{{ownerInfo.sex == 0 ? '男' : '女'}}</label>
+                            <label class="">{{viewAppInfo.securityCode}}</label>
                         </div>
                     </div>
 
@@ -36,19 +39,19 @@
                     <div class="col-sm-4">
                         <div class="form-group">
                             <label class="col-form-label" >白名单：</label>
-                            <label class="">{{ownerInfo.age}}</label>
+                            <label class="">{{viewAppInfo.whileListIp}}</label>
                         </div>
                     </div>
                     <div class="col-sm-4">
                         <div class="form-group">
                             <label class="col-form-label" >黑名单：</label>
-                            <label class="">{{ownerInfo.link}}</label>
+                            <label class="">{{viewAppInfo.blackListIp}}</label>
                         </div>
                     </div>
                     <div class="col-sm-4">
                         <div class="form-group">
                             <label class="col-form-label">备注：</label>
-                            <label class="">{{ownerInfo.userName}}</label>
+                            <label class="">{{viewAppInfo.remark}}</label>
                         </div>
                     </div>
 
@@ -56,8 +59,11 @@
             </div>
         </div>
     </div>
-    <vc:create name="searchOwner"
+
+    <vc:create name="addApp"></vc:create>
+
+    <!--<vc:create name="searchOwner"
                emitChooseOwner="sellRoomSelectOwner"
                emitLoadData="sellRoomOther"
-    ></vc:create>
+    ></vc:create>-->
 </div>

WebService/src/main/resources/components/view-app-info/viewAppInfo.js

@@ -4,47 +4,38 @@
 (function(vc){
 
     vc.extends({
-        propTypes: {
-            callBackComponent:vc.propTypes.string
-        },
+
         data:{
-            ownerInfo:{
-                ownerId:"",
+            viewAppInfo:{
+                appId:"",
                 name:"",
-                age:"",
-                sex:"",
-                userName:"",
-                remark:"",
-                link:"",
+                securityCode:"",
+                whileListIp:"",
+                blackListIp:"",
+                remark:""
             }
         },
         _initMethod:function(){
             //根据请求参数查询 查询 业主信息
-            vc.component.loadOwnerData();
+            vc.component._loadAppInfoData();
         },
         _initEvent:function(){
-            vc.on('sellRoomSelectOwner','chooseOwner',function(_owner){
-                vc.component.ownerInfo = _owner;
-                vc.emit($props.callBackComponent,'notify',_owner);
+            vc.on('viewAppInfo','chooseAppInfo',function(_app){
+                vc.component.viewAppInfo = _app;
+                //vc.emit($props.callBackComponent,'notify',_owner);
             });
 
         },
         methods:{
 
-            openSearchOwnerModel(){
-                vc.emit('searchOwner','openSearchOwnerModel',{});
+            _openSelectAppInfoModel(){
+                vc.emit('selectAppInfo','openSelectAppModel',{});
+            },
+            _openAddAppInfoModel(){
+                vc.emit('addApp','openAddAppModal',{});
             },
-            loadOwnerData:function(){
-               vc.component.ownerInfo.ownerId = vc.getParam("ownerId");
-               vc.component.ownerInfo.name = vc.getParam("name");
-               vc.component.ownerInfo.age = vc.getParam("age");
-               vc.component.ownerInfo.sex = vc.getParam("sex");
-               vc.component.ownerInfo.userName = vc.getParam("userName");
-               vc.component.ownerInfo.link = vc.getParam("link");
+            _loadAppInfoData:function(){
 
-               if(vc.component.ownerInfo.ownerId != ''){
-                  vc.emit($props.callBackComponent,'notify',vc.component.ownerInfo);
-               }
             }
         }
     });

docs/index.html

@@ -3,7 +3,9 @@
 <meta charset="utf-8">
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=device-width, initial-scale=1">
-<title>Home</title>
+<meta name="Keywords" Content="HC小区物业管理系统,免费的物业管理系统,开源小区管理系统">
+<meta name="Description" Content="HC小区管理系统是为物业企业打造的智慧物业综合管理平台提供商家入驻、快递代收、房屋租赁等盈利功能，为物业企业提供全新的运营盈利模式。和java110开发者零距离沟通 qq群号 827669685 网站地址 (账号密码为 wuxw/admin)https://demo.java110.com">
+<title>HC小区物业管理平台|免费开源的物业系统</title>
 
 <!--======== All Stylesheet =========-->
 <link href="css/bootstrap.min.css" rel="stylesheet">
@@ -63,7 +65,7 @@
 					<h1>HC 物业管理平台</h1>
 					<p>物业管理系统是现代居住小区不可缺少的一部分。一个好的物业管理系统可以提升小区的管理水平，使小区的日常管理更加方便。将计算机的强大功能与现代的管理思想相结合，建立现代的智能小区是物业管理发展的方向。重视现代化的管理，重视细致周到的服务是小区工作的宗旨。以提高物业管理的经济效益、管理水平，确保取得最大经济效益为目标</p>
 					<a class="btn btn-default" href="https://github.com/java110/MicroCommunity" role="button">源码下载<i class="lnr lnr-arrow-right"></i></a></i></a>
-					<a class="btn btn-primary" href="http://www.java110.com/#/" role="button">相关文档 <i class="lnr lnr-arrow-right"></i></a></i></a>
+					<a class="btn btn-primary" href="/document.html" role="button">相关文档 <i class="lnr lnr-arrow-right"></i></a></i></a>
 					<div><i class="fa fa-caret-down"></i></div>    
 				</div>
 			</div>
@@ -614,7 +616,7 @@
 	<div class="container">
 		<div class="row">
 			<div class="col-md-12 col-sm-12 col-md-12 text-center">
-				<p>Copyright &copy; 2019.Company name All rights reserved.<a target="_blank" href="http://sc.chinaz.com/moban/">&#x7F51;&#x9875;&#x6A21;&#x677F;</a></p>
+				<p>Copyright &copy; 2019.Company name All rights reserved.</p>
 			</div>
 		</div>
 	</div>    
@@ -624,7 +626,6 @@
 <!--======== All Javascript =========-->
 <script src="js/jquery-2.1.1.js"></script>
 <script src="js/bootstrap.min.js"></script>
-<script src="bootstrap/js/bootstrap.min.js"></script>
 <script src="js/owl.carousel.min.js"></script>
 <script src="js/custom.js"></script>
 </body>