Merge branch 'develop' of gitlab.icaremgt.com:tanxinyu/h5_activity into develop

showPhotos/signup.html

@@ -133,6 +133,9 @@
                 processData:false,
                 success:function(data) {
                     $("#act31419345204861").removeClass('global-none')
+                },
+                error: function() {
+                    showMessage('上传失败！',3000,true);
                 }
             })
         })
@@ -143,7 +146,7 @@
             var phonenum = $('#act11739141518360')
             var introDuce = $('#act11739381874636')
             var signInput = $('.sign-form .form-input-group input[c_validate="idcard"]')
-            var uploadImg = $('#act31419345204861')
+            var uploadImg = $('#act31419345204861 img')
             // 验证用户名
             if(userName.attr('c_validateempty') == 'yes') {
                 var userNameVal = userName.val()
@@ -202,7 +205,7 @@
                 }
             }
             // 验证上传图片
-            if(uploadImg.html() == '') {
+            if(uploadImg.attr('src') == '') {
                 showMessage('请上传一张照片',3000,true);
                 return false
             }
@@ -297,7 +300,7 @@
         }  
     }  
   
-    //对图片旋转处理 added by lzk  
+    //对图片旋转处理 
     function rotateImg(img, direction,canvas) {    
         //最小与最大旋转方向，图片旋转4次后回到原方向    
         var min_step = 0;