Merge branch 'master' of git.minrow.com:reyun/saasio

src/main/websrc/index.html

@@ -97,6 +97,9 @@
                         <div class="userInfoDetail">
                             <div class="itemInfo">
                                 <div class="userflowText"><span class="userIcon"></span>{{loginuserName}}</div>
+                                <div ng-if="!flowRestrict && (isSuper || isManage)" class="userflowType flowType" ng-class="{'flowTypeRed':flowLevel==5,'flowTypeRedLong':flowLevel==6,'userflowTypeLong':flowLevel==6}">
+                                    <p class="small-font smallsize-font">{{flowName}}</p>
+                                </div>
                             </div>
                             <div class="itemInfo" ng-if="flowRestrict">
                                 <span class="userPrizeIcon regPrize"></span>

src/main/websrc/template/manage/app.html

@@ -27,8 +27,8 @@
        <span class="copyBtnIcon copyBtn" data-clipboard-text="{{info.appkey}}" title="点击复制"></span>
      </div>
      <div class="bottom">
-       <span stop-event>自动生成日志<div class="onOffBtn" ng-class="{'on':info.regedbutton == true}" ng-click="onOff(info)"></div></span>
-       <span class="right">创建时间：{{info.createTime | date:'yyyy-MM-dd HH:mm:ss'}}</span>
+       <!-- <span stop-event>自动生成日志<div class="onOffBtn" ng-class="{'on':info.regedbutton == true}" ng-click="onOff(info)"></div></span> -->
+       <span>创建时间：{{info.createTime | date:'yyyy-MM-dd HH:mm:ss'}}</span>
      </div>
    </div>
  </div>
@@ -42,4 +42,5 @@
      <div>无搜索结果</div>
   </div>
 </div>
+<div class="clear"></div>
 <del-tip status="delstatus" delfn="removeInfo()">确定删除该产品？<br><b class="error">此应用的数据将彻底删除，无法恢复！</b></del-tip>