Merge branch 'master' of http://114.215.101.231:8099/anyv/xkeasy

@@ -304,22 +304,23 @@
                 $('#img20').attr("src",localIds);
                 $(".log_six_pictyre_img").addClass("log_six_pictyre_imgs");
                 $(".log_six_pictyre_title").addClass("log_six_pictyre_titles");
-                  wx.uploadImage({
-                      localId: localIds.toString(), // 需要上传的图片的ID，由chooseImage接口获得
-                      isShowProgressTips: 1, // 进度提示
-                      success: function (res) {
-                          var mediaId = res.serverId; // 返回图片的服务器端ID，即mediaId
-                          //将获取到的 mediaId 传入后台 方法savePicture
-                          $.post("{:url('Salesmangoods/savePicture')}",{"mediaId":mediaId},function(res){
-                              //填写你自己的业务逻辑
-                              alert(res);
-                          });
+                wx.uploadImage({
+                    localId: localIds.toString(), // 需要上传的图片的ID，由chooseImage接口获得
+                    isShowProgressTips: 1, // 进度提示
+                    success: function (res) {
+                        var mediaId = res.serverId; // 返回图片的服务器端ID，即mediaId
+                        //将获取到的 mediaId 传入后台 方法savePicture
+                        $.post("{:url('Salesmangoods/savePicture')}",{"mediaId":mediaId},function(res){
+                            //填写你自己的业务逻辑
 
-                      },
-                      fail: function (res) {
-                          alertModal('图片上传失败，请重试');
-                      }
-                  });
+                            
+                        });
+
+                    },
+                    fail: function (res) {
+                        alertModal('图片上传失败，请重试');
+                    }
+                });
             }
         });
 
@@ -369,11 +370,11 @@
         }
 
         $.post("{:url('Salesmangoods/Salesman_goods_add')}",{show_img:show_img,thumbnail:thumbnail,book_name:book_name,money:money,price:price,pricing:pricing,instr:instr,book_number:book_number,paper:paper,book_size:book_size,binding:binding,author:author,press:press,press_time:press_time,suit:suit,grade:grade,img0:img0,img1:img1,img2:img2,printing:printing},function(data){
-                if(data){
-                    window.location.href = "{:url('salesmangoods/salesman_goods')}";
-                }else{
-                    alert('添加失败');
-                }
+            if(data){
+                window.location.href = "{:url('salesmangoods/salesman_goods')}";
+            }else{
+                alert('添加失败');
+            }
         });
     }