Merge branch 'dev_trainings' into develop

app/views/trainings/pay.html.erb

@@ -11,6 +11,7 @@
         <span class="mr5" style="margin-right: 24px;">线下支付</span>
         <i class="iconfont icon-gengduo1 rightArrow" style="color: #323232;right: 4px"></i>
       </p>
+      <p class="payTip" style="margin-top:0px;margin-bottom:9px;">微信支付将于6月18日开通</p>
 <!--      <div class="<%#= @training.training_payinfo.pay_type.to_i == 3 ? "" : "none" %> mt5" id="payInfos">-->
       <div class="mt5" id="payInfos">
         <div class="payInfo df">