1

app/service/cloudEditionService.js

@@ -122,20 +122,30 @@ var cloudService={
             //最后使用
             curingCloudList[i].latest_usedName='';            
             for(var ci=0;ci<compilationList.length;ci++){
-//            	console.log(ci);
-//            	console.log(v.latest_used);
-            	//console.log('1212');
-            	//console.log(compilationList[ci]._id);
             	if(compilationList[ci]._id==v.latest_used){
             		curingCloudList[i].latest_usedName=compilationList[ci].name;
             		break;
             	}
             }
-            
             //登录时长
-            if(!hash.isExistence(v.online_times)){
-            	curingCloudList[i].online_times='';
+            if(hash.isExistence(v.online_list)){
+            	curingCloudList[i].online_newest='';
+            }else{
+            	var onlineTimeLength=v.online_list.length-1;
+            	curingCloudList[i].online_newest=v.online_list[onlineTimeLength].online_times+'('+v.online_list[onlineTimeLength].dateString+')';
+            }
+            //已升级专业版
+            curingCloudList[i].upgradeListName='';
+            for(var gi=1;gi<v.upgrade_list.length;gi++){
+            	for(var ci=0;ci<compilationList.length;ci++){
+            		if( compilationList[ci]._id == v.upgrade_list[gi].compilationID) {
+            			curingCloudList[i].upgradeListName+='<span class="badge badge-primary"><%= compilation.name %></span>';
+            			break;
+            		}
+            	}
+            
             }
+            
         });
         
         var parameter='?compilation_id='+compilation_id;

views/cloud/curing.html

@@ -148,18 +148,10 @@
                                             <td>
                                            <%= curing.latest_usedName %>
                                             </td>
-                                            <td><%= curing.online_times %></td>
+                                            <td><%= curing.online_newest %></td>
                                             <td><%= curing.addtime %></td>
                                             <td>
-                                            
-                                            <% compilationList.forEach(function(compilation) { %>
-                                            	<% for(var i=1;i<=curing.upgrade_list.length;i++){ %>
-                                            		<% if( compilation._id == curingList.upgrade_list[i].compilationID) {  %>
-	                                        		<span class="badge badge-primary"><%= compilation.name %></span>
-	                                        		<% }; %>
-                                            	<% }; %>
-                                        	<% }); %>
-                                            
+                                            <%= curing.upgradeListName %>
                                             </td>
                                         </tr>
                                         <% }); %>