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.html | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
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
--
Gitblit v1.8.0