From 4eeb6f1fcc552d414fa570324135197b0f6106ab Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Fri, 12 Apr 2019 11:35:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E7=9A=84=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=8F=8D=E9=A6=88=E5=A2=9E=E5=8A=A0=E2=80=9C=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=BD=91=E5=9D=80=E2=80=9D=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E5=85=A5=E5=8F=A3=EF=BC=8C=E4=B8=94=E5=BF=85=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/account_controller.rb    |   3 +-
 app/views/account/_suggest_show.html.erb | 141 +++++++++++++----------
 app/views/account/help.html.erb          |   2 +-
 app/views/users/_returnTop_btn.html.erb  |   2 +-
 4 files changed, 82 insertions(+), 66 deletions(-)

diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb
index 7258b076..d58b9bdf 100644
--- a/app/controllers/account_controller.rb
+++ b/app/controllers/account_controller.rb
@@ -141,6 +141,7 @@ class AccountController < ApplicationController
     @resubmit = "#{code}"
     @agreement = Help.first
     @cooperation = Cooperation.all
+    @url = params[:url]
 
     @com_coop_img = CooImg.where(:img_type => 'com_coop').order("position asc")
     @edu_coop_img = CooImg.where(:img_type => 'edu_coop').order("position asc")
@@ -208,7 +209,7 @@ class AccountController < ApplicationController
   end
 
   def insert_suggest
-    content = "<p>[#{params[:question_kind]}]</p>" + params[:description]
+    content = "<p>[#{params[:question_kind]}]</p>" + "<p>问题页面网址：#{params[:url]}</p>" + params[:description]
     PrivateMessage.create(:user_id => User.current.id, :target_id => 1, :sender_id => User.current.id, :receiver_id => 1, :content => content, :send_time => Time.now, :status => 1)
     PrivateMessage.create(:user_id => 1, :target_id => User.current.id, :sender_id => User.current.id, :receiver_id => 1, :content => content, :send_time => Time.now, :status => 0)
     redirect_to message_detail_user_path(User.current, :user_id => 1)
diff --git a/app/views/account/_suggest_show.html.erb b/app/views/account/_suggest_show.html.erb
index 9279d45a..e1891d13 100644
--- a/app/views/account/_suggest_show.html.erb
+++ b/app/views/account/_suggest_show.html.erb
@@ -1,6 +1,6 @@
 <%= stylesheet_link_tag 'css/public','css/common'%>
 <%= content_for(:header_tags) do %>
-    <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
+  <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
 <% end %>
 <div xmlns="http://www.w3.org/1999/html">
   <div class="edu-back-white ml15 pt20 pb20 clearfix pl30 pr30 mb30">
@@ -15,79 +15,94 @@
       <div class="color-orange mt15 mb15">
         <span class="mr5">*</span>
         <a href="https://trustie.educoder.net/help?index=5" class="color-orange">看看帮助中心是否有你想要的答案</a></div>
-        <%= form_for('new_form',:url => insert_suggest_path(), :html =>{:id => "insert_suggest"}, :method => :post) do |f| %>
-            <div class="mt10">
-              <span class="mr5 color-orange font-16">*</span><span class="font-16">问题分类</span>
-              <div class="font-14 mt10 mb10 ml20 color-dark-grey">
-                <label class="mr40">
-                  <input  type="radio" value="登录注册" class="mr5 magic-radio" name="question_kind" id ="type_1" checked>
-                  <label for="type_1" style="display: inline-block">登录注册</label>
-                </label>
-                <label class="mr40">
-                  <input  type="radio" value="信息认证" class="mr5 magic-radio" name="question_kind" id ="type_2">
-                  <label for="type_2" style="display: inline-block">信息认证</label>
-                </label>
-                <label class="mr40">
-                  <input  type="radio" value="实训编程" class="mr5 magic-radio" name="question_kind" id ="type_3">
-                  <label for="type_3" style="display: inline-block">实训编程</label>
-                </label>
-                <label class="mr40">
-                  <input  type="radio" value="实训课程" class="mr5 magic-radio" name="question_kind" id ="type_4">
-                  <label for="type_4" style="display: inline-block">实训课程</label>
-                </label>
-                <label class="mr40">
-                  <input  type="radio" value="课堂" class="mr5 magic-radio" name="question_kind" id ="type_5">
-                  <label for="type_5" style="display: inline-block">课堂</label>
-                </label>
-                <label class="mr40">
-                  <input  type="radio" value="其他" class="mr5 magic-radio" name="question_kind" id ="type_6">
-                  <label for="type_6" style="display: inline-block">其他</label>
-                </label>
-              </div>
-            </div>
-            <div class="clearfix mt10">
-              <span class="mr5 color-orange font-16">*</span><span class="font-16">问题描述</span>
-              <div class="font-14 mt10 ml20 clearfix">
-                <!--<div id="hidden_div_block_1">
+      <%= form_for('new_form',:url => insert_suggest_path(), :html =>{:id => "insert_suggest"}, :method => :post) do |f| %>
+        <div class="mt10">
+          <span class="mr5 color-orange font-16">*</span><span class="font-16">问题分类</span>
+          <div class="font-14 mt10 mb10 ml20 color-dark-grey">
+            <label class="mr40">
+              <input  type="radio" value="登录注册" class="mr5 magic-radio" name="question_kind" id ="type_1" checked>
+              <label for="type_1" style="display: inline-block">登录注册</label>
+            </label>
+            <label class="mr40">
+              <input  type="radio" value="信息认证" class="mr5 magic-radio" name="question_kind" id ="type_2">
+              <label for="type_2" style="display: inline-block">信息认证</label>
+            </label>
+            <label class="mr40">
+              <input  type="radio" value="实训编程" class="mr5 magic-radio" name="question_kind" id ="type_3">
+              <label for="type_3" style="display: inline-block">实训编程</label>
+            </label>
+            <label class="mr40">
+              <input  type="radio" value="实训课程" class="mr5 magic-radio" name="question_kind" id ="type_4">
+              <label for="type_4" style="display: inline-block">实训课程</label>
+            </label>
+            <label class="mr40">
+              <input  type="radio" value="课堂" class="mr5 magic-radio" name="question_kind" id ="type_5">
+              <label for="type_5" style="display: inline-block">课堂</label>
+            </label>
+            <label class="mr40">
+              <input  type="radio" value="其他" class="mr5 magic-radio" name="question_kind" id ="type_6">
+              <label for="type_6" style="display: inline-block">其他</label>
+            </label>
+          </div>
+        </div>
+        <div class="clearfix mt10">
+          <span class="mr5 color-orange font-16">*</span><span class="font-16">问题页面网址</span>
+          <div class="font-14 mt10 ml20 clearfix">
+            <input type="text" class="width100 radius4" id="url_content" name ="url" value="<%= @url %>" style="height: 40px;" placeholder="反馈平台问题，请同时填写对应的问题页面链接，以便平台能够及时跟踪解决，谢谢">
+          </div>
+          <p class="color-orange ml20 mt5 undis" id="new_memo_url_notice"><i class="fa fa-exclamation-circle mr5"></i>网址不能为空</p>
+        </div>
+        <div class="clearfix mt10">
+          <span class="mr5 color-orange font-16">*</span><span class="font-16">问题描述</span>
+          <div class="font-14 mt10 ml20 clearfix">
+            <!--<div id="hidden_div_block_1">
                   <textarea style="display: none" id="hidden_textarea_1" name ="description"></textarea>
                 </div>
                 <%#= hidden_field_tag :asset_id, params[:asset_id],:required => false,:style => 'display:none' %>-->
-                <textarea class="width100 radius4" id="description" name ="description" style="height: 150px;" placeholder="反馈平台问题，请同时填写对应的问题页面链接，以便平台能够及时跟踪解决，谢谢"></textarea>
-              </div>
-              <p class="color-orange ml20 mt5 undis" id="new_memo_content_notice"><i class="fa fa-exclamation-circle mr5"></i>内容不能为空</p>
-              <!--<div class="mt10">-->
-                <!--<span class="font-16 ml20">联系方式</span>-->
-                <!--<div class="font-14 mt10 mb10 ml20 color-dark-grey">-->
-                  <!--<input type="phone" class="font-14 pl10" style="width:89%;height: 40px" placeholder="请留下您的联系方式"  name = 'phone'/>-->
-                <!--</div>-->
-              <!--</div>-->
-              <a href="javascript:void(0);" class="defalutSubmitbtn fl ml20 mt10" onclick="insert_suggest()">提交</a>
-        <% end %>
+            <textarea class="width100 radius4" id="description" name ="description" style="height: 150px;" placeholder="反馈平台问题，请同时填写对应的问题页面链接，以便平台能够及时跟踪解决，谢谢"></textarea>
+          </div>
+          <p class="color-orange ml20 mt5 undis" id="new_memo_content_notice"><i class="fa fa-exclamation-circle mr5"></i>内容不能为空</p>
+          <!--<div class="mt10">-->
+          <!--<span class="font-16 ml20">联系方式</span>-->
+          <!--<div class="font-14 mt10 mb10 ml20 color-dark-grey">-->
+          <!--<input type="phone" class="font-14 pl10" style="width:89%;height: 40px" placeholder="请留下您的联系方式"  name = 'phone'/>-->
+          <!--</div>-->
+          <!--</div>-->
+          <a href="javascript:void(0);" class="defalutSubmitbtn fl ml20 mt10" onclick="insert_suggest()">提交</a>
         </div>
+      <% end %>
     </div>
   </div>
 </div>
 <script>
     /*sd_create_editor_from_data(1,null,"100%", "Issue");*/
     //var suggest_ke;
-   /*KindEditor.ready(function(K){
-       $("#hidden_div_block_1").each(function(){
-           var params = {};
-           params.kindutil = K;
-           params.div_form = $(this);
-           params.placeholder = "请填写具体内容，帮助我们了解您的建议与意见";
-           params.textarea = $("textarea[name='description']",params.div_form);
-           params.height = 300;
-           if(params.textarea.data('init') == undefined) {
-               memo_content_editor = init_exercise_quetison_editor(params);
-               //suggest_ke = memo_content_editor;
-               //new_quetion_editor = params.editor;
-               params.textarea.data('init', 1);
-               //params.editor.
-           }
-       });
-   });*/
+    /*KindEditor.ready(function(K){
+        $("#hidden_div_block_1").each(function(){
+            var params = {};
+            params.kindutil = K;
+            params.div_form = $(this);
+            params.placeholder = "请填写具体内容，帮助我们了解您的建议与意见";
+            params.textarea = $("textarea[name='description']",params.div_form);
+            params.height = 300;
+            if(params.textarea.data('init') == undefined) {
+                memo_content_editor = init_exercise_quetison_editor(params);
+                //suggest_ke = memo_content_editor;
+                //new_quetion_editor = params.editor;
+                params.textarea.data('init', 1);
+                //params.editor.
+            }
+        });
+    });*/
     function regexContent() {
+        if($("#url_content").val()==""){
+            $("#new_memo_url_notice").show();
+            return false;
+        }
+        else {
+            $("#new_memo_url_notice").hide();
+        }
+
         // KE输入框类被添加了元素，导致isEmpty方法失效
         if($("#description").val()==""){
             $("#new_memo_content_notice").show();
diff --git a/app/views/account/help.html.erb b/app/views/account/help.html.erb
index 5c780273..8052dd18 100644
--- a/app/views/account/help.html.erb
+++ b/app/views/account/help.html.erb
@@ -27,7 +27,7 @@
 <script>
     $.ajax({
         url:'<%= help_path() %>',
-        data: {index: '<%= @index %>'},
+        data: {index: '<%= @index %>', url: '<%= @url %>'},
         type: 'post',
         dataType: 'script'
     })
diff --git a/app/views/users/_returnTop_btn.html.erb b/app/views/users/_returnTop_btn.html.erb
index 032a5359..2fa54020 100644
--- a/app/views/users/_returnTop_btn.html.erb
+++ b/app/views/users/_returnTop_btn.html.erb
@@ -6,7 +6,7 @@
   </div>
 
   <div class="feedback" tooltips="意见反馈">
-    <a target="_blank" class="color_white inline" href="<%= help_path(:index => 6) %>">
+    <a target="_blank" class="color_white inline" href="<%= help_path(:index => 6, :url => request.url) %>">
       <i class="iconfont icon-yijianfankui color-white font-22 fl"></i>
     </a>
   </div>