Merge branch 'develop' into educoder

app/views/trainings/pay.html.erb

@@ -271,7 +271,7 @@
             $("#enlistM").html(money);
             $("#enlistNum").val(num);
             $("#enlistMoney").val(money);
-
+            $("input[name='enlistNum']").val(num);
         }
     }
     function plusNum(item){
@@ -317,12 +317,12 @@
     function billTypeShowFun(index, userInfo){
         if (parseInt(index) == 0) {
             $(".needWrite").removeClass("none");
-            $(".billUnit").attr("placeholder", "请填写公司单位名称").val(userInfo.school);
+            $(".billUnit").attr("placeholder", "请填写公司单位名称").val(userInfo.invoiceTitle || userInfo.school);
-            $(".taxNumber").removeClass("none");
+            $(".taxNumber").removeClass("none").val(userInfo.invoiceNo);
         } else if (parseInt(index) == 1) {
             $(".needWrite").removeClass("none");
             $(".billUnit").attr("placeholder", "请填写姓名").val(userInfo.name);
-            $(".taxNumber").addClass("none");
+            $(".taxNumber").val('').addClass("none");
         } else {
             $(".needWrite").addClass("none");
             $(".billInput").val('');

app/views/trainings/result.html.erb

@@ -196,6 +196,7 @@
 
                 var data = new FormData();
                 data.append('image', files[0]);
+                data.append('tag_id', '<%= @tag_id %>');
 
                 $.ajax({
                     url: '<%= update_picture_trainings_path %>',