caipin 5 rokov pred
rodič
commit
0227cc1553

+ 4 - 2
app/service/cloudEditionService.js

@@ -113,9 +113,11 @@ var cloudService={
             curingCloudList[i].addtime=moment(v.create_time).format('YYYY-MM-DD HH:mm');
             curingCloudList[i].latest_login=moment(v.latest_login).format('YYYY-MM-DD HH:mm');
             curingCloudList[i].client_id=hash.hashEncode(v.client_id.toString());
-            curingCloudList[i].sso_id=v.sso_id;
+            //curingCloudList[i].sso_id=v.sso_id;
             //最后使用
-            
+            if(!hash.isExistence(v.online_times)){
+            	curingCloudList[i].online_times='';
+            }
         });
         
         var parameter='?compilation_id='+compilation_id;

+ 12 - 5
views/cloud/curing.html

@@ -102,9 +102,9 @@
                     <div class="col-xl-12">
                         <div id="panel-1" class="panel">
                             <div class="panel-hdr">
-                                <div class="col-auto pr-0">
+                                <!-- 废弃 <div class="col-auto pr-0">
                                     <a href="#search-new" upNewClient class="btn btn-sm btn-outline-primary" data-toggle="modal" data-target="#search-new">升级新用户</a>
-                                </div>
+                                </div>  -->
                                 <div class="col-auto pr-0">
                                     <div class="input-group input-group-sm bg-white shadow-inset-2">
 <input type="number" mobile2Info  value="" class="form-control bg-transparent" placeholder="请输入通行账号(手机)">
@@ -151,12 +151,19 @@
 	                                        		<%= compilation.name %>
 	                                        	<% }; %>
                                         	<% }); %>
-                                            
                                             </td>
-                                            <td></td>
+                                            <td><%= curing.online_times %></td>
                                             <td><%= curing.addtime %></td>
                                             <td>
-                                            <span class="badge badge-primary"><%= curing.clientInfo.isUserActive %></span>
+                                            <span class="badge badge-primary">
+                                            <% compilationList.forEach(function(compilation) { %>
+	                                            <% curingList.upgrade_list.forEach(function(upgrade) { %>
+		                                            <% if( compilation._id == upgrade.compilationID) {  %>
+	                                        		<%= compilation.name %>
+	                                        		<% }; %>
+	                                        	<% }); %>
+                                        	<% }); %>
+                                            </span>
                                             </td>
                                         </tr>
                                         <% }); %>