From 48cf73dbbf8f15d8e212121a30d3522c18796b22 Mon Sep 17 00:00:00 2001
From: p31729568 <winse.wang@foxmail.com>
Date: Fri, 14 Jun 2019 11:25:20 +0800
Subject: [PATCH] modify training

---
 app/controllers/trainings_controller.rb |  4 ++-
 app/views/trainings/enroll.html.erb     | 35 ++++++++++++++-----------
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/app/controllers/trainings_controller.rb b/app/controllers/trainings_controller.rb
index 0668edde..e3e96f11 100644
--- a/app/controllers/trainings_controller.rb
+++ b/app/controllers/trainings_controller.rb
@@ -112,6 +112,7 @@ class TrainingsController < ApplicationController
     @training.openid = session[:wechat_open_id]
     @training.save!
 
+    flash[:message] = '提交成功'
     redirect_to enroll_training_path(id: @tag_id)
     # redirect_to pay_training_path(id: @tag_id)
   end
@@ -130,6 +131,7 @@ class TrainingsController < ApplicationController
     end
     @training.save!
 
+    flash[:message] = '提交成功'
     redirect_to enroll_training_path(id: @tag_id)
     # redirect_to pay_training_path(id: @tag_id)
   end
@@ -252,7 +254,7 @@ class TrainingsController < ApplicationController
 
   def authenticate
     if Rails.env.development?
-      # session[:wechat_open_id] = "o5fSc0607iR3rp4-h_VnuBTp8CiM"
+      session[:wechat_open_id] = "o5fSc0607iR3rp4-h_VnuBTp8CiM"
     end
 
     unless session[:wechat_open_id].present?
diff --git a/app/views/trainings/enroll.html.erb b/app/views/trainings/enroll.html.erb
index 1362e78f..6b898691 100644
--- a/app/views/trainings/enroll.html.erb
+++ b/app/views/trainings/enroll.html.erb
@@ -205,27 +205,27 @@
       </li>
     <% end %>
 
-    <p class="subtitle">通讯地址</p>
-    <li class="clearfix infoBar">
-      <!--<div class="clearfix" id="userArea" NavShow>-->
-      <!--<span class="left_tag fl">地区</span>-->
-      <!--<input type="text" class="right_input" id="usertitle" placeholder="填写区域"/>-->
-      <!--<i class="iconfont icon-youjiantou rightArrow"></i>-->
-      <!--</div>-->
-      <textarea class="DetailAddress" placeholder="请输入详细地址" name="address" id="DetailAdd" style="margin-top: 15px;"><%= @training.address %></textarea>
-    </li>
+<!--    <p class="subtitle">通讯地址</p>-->
+<!--    <li class="clearfix infoBar">-->
+<!--      <div class="clearfix" id="userArea" NavShow>-->
+<!--      <span class="left_tag fl">地区</span>-->
+<!--      <input type="text" class="right_input" id="usertitle" placeholder="填写区域"/>-->
+<!--      <i class="iconfont icon-youjiantou rightArrow"></i>-->
+<!--      </div>-->
+<!--      <textarea class="DetailAddress" placeholder="请输入详细地址" name="address" id="DetailAdd" style="margin-top: 15px;"><%#= @training.address %></textarea>-->
+<!--    </li>-->
     <li class="clearfix infoBar">
       <span class="left_tag fl">手机号码</span>
       <input type="text" class="right_input" placeholder="请输入手机号" id="userphone"
              name="phone"
              value="<%= @training.phone %>"/>
     </li>
-    <li class="clearfix infoBar">
-      <span class="left_tag fl">Email</span>
-      <input type="text" class="right_input" placeholder="请输入Email" id="userEmail" name="email" value="<%= @training.email %>"/>
-    </li>
+<!--    <li class="clearfix infoBar">-->
+<!--      <span class="left_tag fl">Email</span>-->
+<!--      <input type="text" class="right_input" placeholder="请输入Email" id="userEmail" name="email" value="<%#= @training.email %>"/>-->
+<!--    </li>-->
     <p style="height: 50px;"></p>
-    <a href="javascript:void(0)" class="EnrollNext" onclick="NextStep();">完成</a>
+    <a href="javascript:void(0)" class="EnrollNext" onclick="NextStep();">提交</a>
   <% end %>
 </div>
 
@@ -248,7 +248,12 @@
             } else {
                 $('#sex').val("2");
             }
-        })
+        });
+
+        var message = "<%= flash[:message] %>";
+        if (message && message.length > 0) {
+          alert(message);
+        }
     })
 
     //下一步