Merge pull request '调整站点返回值' (#107) from KingChan/forgeplus:chenjing into standalone_develop

app/views/admins/site_pages/shared/_info_list.html.erb

@@ -33,7 +33,7 @@
                 <%= overflow_hidden_span site_page.project.name, width: 100 %>
             <% end %>
           </td>
-          <td><%= display_text(site_page.state == true ? "已正常" : "关闭") %></td>
+          <td><%= display_text(site_page.state == true ? "正常" : "已关闭") %></td>
           <td><%= display_text(site_page.site_name) %></td>
           <td><%= display_text(site_page.identifier) %></td>
           <td><%= link_to "#{site_page.url}", site_page.url, target: '_blank'%></td>

app/views/site_pages/_info.json.jbuilder

@@ -6,6 +6,7 @@ json.user_id page.user_id
 json.project_id page.project_id
 json.site_name page.site_name
 json.theme page.theme
+json.state page.state
 json.language_frame page.language_frame
 json.url page.url
 json.created_at page.created_at.strftime("%Y-%m-%d %H:%M:%S")

app/views/site_pages/show.jbuilder

@@ -1 +0,0 @@
-json.partial! 'info', locals: {page: @page}

app/views/site_pages/show.json.jbuilder

@@ -0,0 +1,6 @@
+json.status 0
+json.message "success"
+json.data {
+    json.partial! 'info', locals: {page: @page}
+}
+