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

shiyj

2019-07-16 af90f1edaf3b8ded9129bce596f483ca0450bfca

 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>