From f20341088b447b7aedf4cfad31d8a802d67b58ca Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Fri, 2 Aug 2019 14:28:09 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=AE=9E=E8=AE=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/games/picture_display.json.jbuilder | 24 +++++++++----------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/app/views/games/picture_display.json.jbuilder b/app/views/games/picture_display.json.jbuilder
index 34a22ef12..838cfeda0 100644
--- a/app/views/games/picture_display.json.jbuilder
+++ b/app/views/games/picture_display.json.jbuilder
@@ -39,19 +39,19 @@ elsif @type == "mp3" || @type == "mp4"
json.file_url attachment_show_users_path(:file_name => file, :path => @original_path)
end
end
- json.user_file do
- json.array! @user_picture do |file|
- json.file_url attachment_show_users_path(:file_name => file, :path => @user_path, :time => Time.now.to_i)
- end
- end
+ # json.user_file do
+ # json.array! @user_picture do |file|
+ # json.file_url attachment_show_users_path(:file_name => file, :path => @user_path, :time => Time.now.to_i)
+ # end
+ # end
if @type == "mp4"
- json.answer_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378173/789.mp4"}]
+ json.user_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378172/456.mp4"}]
else
- json.answer_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378175/654058514.mp3"}]
+ json.user_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378175/654058514.mp3"}]
+ end
+ json.answer_file do
+ json.array! @answer_picture do |file|
+ json.file_url attachment_show_users_path(:file_name => file, :path => @answer_path)
+ end
end
- # json.answer_file do
- # json.array! @answer_picture do |file|
- # json.file_url attachment_show_users_path(:file_name => file, :path => @answer_path)
- # end
- # end
end
\ No newline at end of file