Merge branch 'develop' into educoder

app/views/trainings/pay.html.erb

@@ -45,7 +45,7 @@
       <p class="clearfix" id="billRemark">
         <span class="grey fl">发票内容</span>
         <input type="text" name="invoice_content" class="right_input"
-               value="<%=  @training.training_payinfo.try(:invoice_content).presence || '研讨会' %>"/>
+               value="<%=  @training.training_payinfo.try(:invoice_content).presence || '师资培训费' %>"/>
       </p>
     </div>
     <div class="infoBar mb10">
@@ -60,7 +60,7 @@
           <span class="color-orange" id="percentPay">（3人及以上8折优惠)</span>
         <% end %>
       </p>
-      <p class="break-word justify moneyDetail">含会议注册费、场地费、培训费、教材资料费、餐费、专家差率费等</p>
+      <p class="break-word justify moneyDetail">含会议注册费、场地费、培训费、教材资料费、餐费、专家差旅费等</p>
       <p class="clearfix">
         <input type="hidden" name="enlistNum" value="<%= @training.training_payinfo.num || 1 %>"/>
         <input type="hidden" name="enlistMoney" value="<%= @training.training_payinfo.fee || @training.registration_fee %>"/>
@@ -303,11 +303,11 @@
     }
     //页面加载时，初始化发票类型
     function InitBill(userInfo){
-        var index=2;
-        $("#billDemand").html("不需要").attr("status",2);
-        if(userInfo.invoiceTitle != "" && userInfo.invoiceNo != ""){
-            index=0;
-            $("#billDemand").html("单位").attr("status",0);
+        var index=0;
+        $("#billDemand").html("单位").attr("status",0);
+        if(userInfo.invoiceTitle == "" && userInfo.invoiceNo == ""){
+            index=2;
+            $("#billDemand").html("不需要").attr("status",2);
         }
         if(userInfo.invoiceTitle != "" && userInfo.invoiceNo == ""){
             index=1;