From af90f1edaf3b8ded9129bce596f483ca0450bfca Mon Sep 17 00:00:00 2001
From: shiyj <1098226878@qq.com>
Date: 星期二, 16 七月 2019 19:15:29 +0800
Subject: [PATCH] Merge branch 'master' of https://github.com/java110/MicroCommunity
---
WebService/src/main/resources/components/view-app-info/viewAppInfo.js | 43 ++++++++-------------
docs/document.html | 0
WebService/src/main/resources/components/service-binding/serviceBinding.html | 7 +--
WebService/src/main/resources/components/view-app-info/viewAppInfo.html | 24 +++++++----
docs/index.html | 9 ++--
WebService/src/main/resources/components/app-manage/appManage.html | 4 +-
6 files changed, 42 insertions(+), 45 deletions(-)
diff --git a/WebService/src/main/resources/components/app-manage/appManage.html b/WebService/src/main/resources/components/app-manage/appManage.html
index 96cd084..24453c5 100644
--- a/WebService/src/main/resources/components/app-manage/appManage.html
+++ b/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>
diff --git a/WebService/src/main/resources/components/service-binding/serviceBinding.html b/WebService/src/main/resources/components/service-binding/serviceBinding.html
index 1d8f3f3..4fc57ce 100644
--- a/WebService/src/main/resources/components/service-binding/serviceBinding.html
+++ b/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>
diff --git a/WebService/src/main/resources/components/view-app-info/viewAppInfo.html b/WebService/src/main/resources/components/view-app-info/viewAppInfo.html
index 2acc21c..3930a45 100644
--- a/WebService/src/main/resources/components/view-app-info/viewAppInfo.html
+++ b/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>
\ No newline at end of file
diff --git a/WebService/src/main/resources/components/view-app-info/viewAppInfo.js b/WebService/src/main/resources/components/view-app-info/viewAppInfo.js
index 14d6abf..b65ebdd 100644
--- a/WebService/src/main/resources/components/view-app-info/viewAppInfo.js
+++ b/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',{});
},
- 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");
+ _openAddAppInfoModel(){
+ vc.emit('addApp','openAddAppModal',{});
+ },
+ _loadAppInfoData:function(){
- if(vc.component.ownerInfo.ownerId != ''){
- vc.emit($props.callBackComponent,'notify',vc.component.ownerInfo);
- }
}
}
});
diff --git a/docs/index20190716.html b/docs/document.html
similarity index 100%
rename from docs/index20190716.html
rename to docs/document.html
diff --git a/docs/index.html b/docs/index.html
index b0264c1..5c008eb 100644
--- a/docs/index.html
+++ b/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 © 2019.Company name All rights reserved.<a target="_blank" href="http://sc.chinaz.com/moban/">网页模板</a></p>
+ <p>Copyright © 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>
--
Gitblit v1.8.0