Hjqreturn
/
pgfqe6ch8
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' into educoder

Browse Source
dev_library
p31729568 6 years ago
parent 4693078463 8fddd8959e
commit 7127f56d72
4 changed files with 95 additions and 61 deletions
Show Stats Download Patch File Download Diff File

4
app/controllers/trainings_controller.rb
Unescape View File

@ -112,6 +112,7 @@ class TrainingsController < ApplicationController
@training.openid = session[:wechat_open_id] @training.openid = session[:wechat_open_id]
@training.save! @training.save!
flash[:message] = '提交成功'
redirect_to enroll_training_path(id: @tag_id) redirect_to enroll_training_path(id: @tag_id)
# redirect_to pay_training_path(id: @tag_id) # redirect_to pay_training_path(id: @tag_id)
end end
@ -130,6 +131,7 @@ class TrainingsController < ApplicationController
end end
@training.save! @training.save!
flash[:message] = '提交成功'
redirect_to enroll_training_path(id: @tag_id) redirect_to enroll_training_path(id: @tag_id)
# redirect_to pay_training_path(id: @tag_id) # redirect_to pay_training_path(id: @tag_id)
end end
@ -252,7 +254,7 @@ class TrainingsController < ApplicationController
def authenticate def authenticate
if Rails.env.development? if Rails.env.development?
# session[:wechat_open_id] = "o5fSc0607iR3rp4-h_VnuBTp8CiM" session[:wechat_open_id] = "o5fSc0607iR3rp4-h_VnuBTp8CiM"
end end
unless session[:wechat_open_id].present? unless session[:wechat_open_id].present?

35
app/views/trainings/enroll.html.erb
Unescape View File

@ -205,27 +205,27 @@
</li> </li>
<% end %> <% end %>
<p class="subtitle">通讯地址</p> <!-- <p class="subtitle">通讯地址</p>-->
<li class="clearfix infoBar"> <!-- <li class="clearfix infoBar">-->
<!--<div class="clearfix" id="userArea" NavShow>--> <!-- <div class="clearfix" id="userArea" NavShow>-->
<!--<span class="left_tag fl">地区</span>--> <!-- <span class="left_tag fl">地区</span>-->
<!--<input type="text" class="right_input" id="usertitle" placeholder="填写区域"/>--> <!-- <input type="text" class="right_input" id="usertitle" placeholder="填写区域"/>-->
<!--<i class="iconfont icon-youjiantou rightArrow"></i>--> <!-- <i class="iconfont icon-youjiantou rightArrow"></i>-->
<!--</div>--> <!-- </div>-->
<textarea class="DetailAddress" placeholder="请输入详细地址" name="address" id="DetailAdd" style="margin-top: 15px;"><%= @training.address %></textarea> <!-- <textarea class="DetailAddress" placeholder="请输入详细地址" name="address" id="DetailAdd" style="margin-top: 15px;"><%#= @training.address %></textarea>-->
</li> <!-- </li>-->
<li class="clearfix infoBar"> <li class="clearfix infoBar">
<span class="left_tag fl">手机号码</span> <span class="left_tag fl">手机号码</span>
<input type="text" class="right_input" placeholder="请输入手机号" id="userphone" <input type="text" class="right_input" placeholder="请输入手机号" id="userphone"
name="phone" name="phone"
value="<%= @training.phone %>"/> value="<%= @training.phone %>"/>
</li> </li>
<li class="clearfix infoBar"> <!-- <li class="clearfix infoBar">-->
<span class="left_tag fl">Email</span> <!-- <span class="left_tag fl">Email</span>-->
<input type="text" class="right_input" placeholder="请输入Email" id="userEmail" name="email" value="<%= @training.email %>"/> <!-- <input type="text" class="right_input" placeholder="请输入Email" id="userEmail" name="email" value="<%#= @training.email %>"/>-->
</li> <!-- </li>-->
<p style="height: 50px;"></p> <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 %> <% end %>
</div> </div>
@ -248,7 +248,12 @@
} else { } else {
$('#sex').val("2"); $('#sex').val("2");
} }
}) });
var message = "<%= flash[:message] %>";
if (message && message.length > 0) {
alert(message);
}
}) })
//下一步 //下一步

111
app/views/trainings/pay.html.erb
Unescape View File

@ -49,19 +49,23 @@
<%= render :partial => 'upload_img', :locals => {:training => @training} %> <%= render :partial => 'upload_img', :locals => {:training => @training} %>
</div> </div>
<div class="infoBar mb10"> <div class="infoBar mb10">
<p>费用明细</p> <p>费用明细<span class="color-orange" id="percentPay">（3人及以上8折优惠)</span></p>
<p class="break-word justify moneyDetail">大数据培训缴费</p> <p class="break-word justify moneyDetail">含会议注册费、场地费、培训费、教材资料费、餐费、专家差率费等</p>
<div style="text-align: right"> <p class="clearfix">
<p class="inline"> <input type="hidden" name="enlistNum" value="1"/>
<input type="hidden" name="enlistN" value="<%= @training.training_payinfo.num %>"/> <input type="hidden" name="enlistMoney" value="3000"/>
<span class="fl mr10 font-12"><span id="enlistNum"><%= @training.training_payinfo.num %></span>人</span> <span class="fl red mr5 font-16">￥<span id="enlistM">3000</span></span>
<span class="fl font-16"> <span class="lastPrice"></span>
<a href="javascript:void(0)" class="minusNum"><i class="iconfont icon-default sky_blue font-18"></i></a> <span class="fr font-16">
<span class="red mr5">￥<span id="enlistMoney"><%= @pay_fee * @training.training_payinfo.num %></span></span> <a href="javascript:void(0)" class="minusNum" onclick="minusNum(this)">
<a href="javascript:void(0)" class="plusNum"><i class="iconfont icon-roundaddfill blue font-18"></i></a> <i class="iconfont icon-default sky_blue font-18"></i>
</a>
<span class="mr5 ml5 font-14"><span id="enlistN">1</span>人</span>
<a href="javascript:void(0)" class="plusNum" onclick="plusNum(this)">
<i class="iconfont icon-roundaddfill blue font-18"></i>
</a>
</span> </span>
</p> </p>
</div>
</div> </div>
<p style="height: 44px;"></p> <p style="height: 44px;"></p>
<div class="bottomBtn <%= @training.training_payinfo.pay_type.to_i ==3 ? "" : "none" %>" id="offlinePaySubmitBtn"> <div class="bottomBtn <%= @training.training_payinfo.pay_type.to_i ==3 ? "" : "none" %>" id="offlinePaySubmitBtn">
@ -76,7 +80,7 @@
</div> </div>
<!--发票<div class="billDownNav downNav"> <div class="billDownNav downNav">
<div class="pr billPanel"> <div class="pr billPanel">
<p class="clearfix mb10"> <p class="clearfix mb10">
<span class="fl billBigTitle">发票抬头</span> <span class="fl billBigTitle">发票抬头</span>
@ -97,7 +101,7 @@
<p style="height:48px;"></p> <p style="height:48px;"></p>
<a href="javascript:void(0)" class="submitBillInfo" id="commonSubmit" onclick="submitBillInfo();">确定</a> <a href="javascript:void(0)" class="submitBillInfo" id="commonSubmit" onclick="submitBillInfo();">确定</a>
</div> </div>
</div>--> </div>
<div class="payTypeDownNav downNav"> <div class="payTypeDownNav downNav">
<div class="pr billPanel"> <div class="pr billPanel">
@ -143,13 +147,13 @@
aboutPayType(); aboutPayType();
//初始化发票类型 //初始化发票类型
InitBill(userInfo); //InitBill(userInfo);
//切换发票类型 //切换发票类型
$(".billType li").on("click", function () { $(".billType li").on("click", function () {
$(".billType li").removeClass("active"); $(".billType li").removeClass("active");
$(this).addClass("active"); $(this).addClass("active");
billTypeShowFun(parseInt($(this).index()),userInfo); billTypeShowFun(parseInt($(this).index()));
}) })
//关闭弹窗 //关闭弹窗
$(".billClose").on("click", function () { $(".billClose").on("click", function () {
@ -227,35 +231,56 @@
//上传头像 //上传头像
InitPhoto(); InitPhoto();
//加减报名人数 })
$(".minusNum").click(function(){
var num=parseInt($("#enlistNum").html()); //加减报名人数
var money=parseFloat($("#enlistMoney").html()).toFixed(2); function minusNum(item){
if(num>1){ var num=parseInt($("#enlistN").html());
money=parseFloat(parseFloat(money)-parseFloat(money)/parseFloat(num)).toFixed(2); var money=parseFloat(3000).toFixed(2);
num=num-1; var percent=$("#percentPay");
$("#enlistNum").html(num); if(num>1){
$("#enlistMoney").html(money); num=num-1;
if(num==1){ if(num == 1){
$(".icon-default").removeClass("blue").addClass("sky_blue"); $(".icon-default").removeClass("blue").addClass("sky_blue");
}
$("input[name='enlistN']").val(num);
} }
}) money=parseFloat(parseFloat(money) *num).toFixed(2);
$(".plusNum").click(function(){ if($(percent).length>0 && num>2){
var num=parseInt($("#enlistNum").html()); $(".lastPrice").html("￥"+ money);
if(num==1){ money = parseFloat(parseFloat(money) *0.8);
$(".icon-default").removeClass("sky_blue").addClass("blue"); }else{
$(".lastPrice").html("");
} }
var money=parseFloat($("#enlistMoney").html()).toFixed(2); $("#enlistN").html(num);
money=parseFloat(parseFloat(money)+parseFloat(money)/parseFloat(num)).toFixed(2); $("#enlistM").html(money);
num=num+1; $("#enlistNum").val(num);
$("#enlistMoney").val(money);
$("#enlistNum").html(num); }
$("#enlistMoney").html(money); }
$("input[name='enlistN']").val(num); function plusNum(item){
}) var num=parseInt($("#enlistN").html());
}) var money=parseFloat(3000).toFixed(2);
var percent=$("#percentPay");
num=num+1;
if(num > 1){
$(".icon-default").removeClass("sky_blue").addClass("blue");
}
money=parseFloat(parseFloat(money) *num).toFixed(2);
if($(percent).length>0 && num>2){
$(".lastPrice").html("￥"+ money);
money = parseFloat(parseFloat(money) * 0.8).toFixed(2);
}else{
$(".lastPrice").html("");
}
$("#enlistN").html(num);
$("#enlistM").html(money);
$("#enlistNum").val(num);
$("#enlistMoney").val(money);
$("input[name='enlistNum']").val(num);
}
//页面加载时，初始化发票类型 //页面加载时，初始化发票类型
function InitBill(userInfo){ function InitBill(userInfo){
var index=2; var index=2;
@ -272,7 +297,7 @@
$(".billType li").eq(index).addClass("active"); $(".billType li").eq(index).addClass("active");
billTypeShowFun(index,userInfo); billTypeShowFun(index,userInfo);
} }
function billTypeShowFun(index,userInfo){ function billTypeShowFun(index){
if (parseInt(index) == 0) { if (parseInt(index) == 0) {
$(".needWrite").removeClass("none"); $(".needWrite").removeClass("none");
$(".billUnit").attr("placeholder", "请填写公司单位名称").val(userInfo.school); $(".billUnit").attr("placeholder", "请填写公司单位名称").val(userInfo.school);

6
public/stylesheets/educoder/trainings.css
Unescape View File

@ -20,12 +20,13 @@ a{text-decoration: none}
.flex1{flex: 1} .flex1{flex: 1}
li{list-style-type: none;} li{list-style-type: none;}
.color-orange{color: #FC682D!important;}
.mb5{margin-bottom: 5px}.mb10{margin-bottom: 10px!important;} .mb5{margin-bottom: 5px}.mb10{margin-bottom: 10px!important;}
.mt5{margin-top: 5px} .mt5{margin-top: 5px}
.mr5{margin-right: 5px} .mr5{margin-right: 5px}
.ml10{margin-left: 10px;} .ml5{margin-left: 5px;}.ml10{margin-left: 10px;}
.mr10{margin-right: 10px;} .mr10{margin-right: 10px;}
.line20{line-height: 20px;} .line20{line-height: 20px;}
@ -240,6 +241,7 @@ input[type='text'].right_input{
.billInput.nullVal{border:1px solid #DD1717;} .billInput.nullVal{border:1px solid #DD1717;}
.meetInfo{color: #4CACFF;} .meetInfo{color: #4CACFF;}
.enrollNum{margin:10px 15px;font-size: 1.4rem;} .enrollNum{margin:10px 15px;font-size: 1.4rem;}
.lastPrice{color: #bfbfbf;font-size: 0.8em;text-decoration: line-through;margin-left: 5px;margin-top: 2px;}
/*上传图片*/ /*上传图片*/
.weui-uploader__bd {position: relative;width: 100px;height: 100px;} .weui-uploader__bd {position: relative;width: 100px;height: 100px;}
.weui-uploader__files {list-style: none;} .weui-uploader__files {list-style: none;}

Write Preview
Loading…
Cancel
Save