Merge branch 'master' into release-20170915

# Conflicts:
#	components/register-saler/register/StepThird.vue

assets/scss/common.scss

@@ -19,6 +19,11 @@
   }
 }
 
+// ie等滚动条遮住元素
+html, body {
+  -ms-overflow-style: scrollbar;
+}
+
 #cnzz_stat_icon_1267002346 {
   display: none;
 }

components/register-saler/register/StepThird.vue

@@ -265,7 +265,7 @@
       <span @click="sectionChange(2)">上一步</span>
       <span @click="btnDisabled?'':selectFlag == 'open'?submitApply():goProduct()" :class="btnDisabled?'btn-disabled':''">提交申请</span>
     </div>
-    <div class="loading" v-if="showLoading">
+    <div class="loading" v-show="showLoading">
       <img src="/images/all/loading.gif" alt="">
     </div>
   </div>
@@ -413,6 +413,7 @@
         }
       },
       registerSelf: function () {
+        this.showLoading = true
         this.$http.post('/basic/enterprise/register?filePath=' + this.registerData.url, this.registerData.enterprise)
           .then(response => {
             if (response.data.success) {
@@ -426,17 +427,20 @@
                     this.loginData.enterprise.uu = response.data.data.enuu
                     this.storeApply(response.data.data.enuu)
 //                    window.location.reload()
+                    this.showLoading = false
                   })
                 }
               )
             } else {
               this.isSelfRegisterSuccess = false
-              this.$message.error('企业注册失败，请重新填写信息')
+              this.showLoading = false
+              this.$message.error('个人注册失败，请重新填写信息')
             }
           }, err => {
             console.log(err)
             this.isSelfRegisterSuccess = false
-            this.$message.error('企业注册失败，请重新填写信息')
+            this.showLoading = false
+            this.$message.error('个人注册失败，请重新填写信息')
           })
       },
       storeApply: function (enuu) {
@@ -558,6 +562,7 @@
           } else if (!this.checkData.checked) {
             this.$message.error('您还没有勾选相关条款')
           } else {
+            this.showLoading = true
             this.$http.post('/basic/enterprise/register?filePath=' + this.registerData.url, this.registerData.enterprise)
               .then(response => {
                 if (response.data.success) {
@@ -566,12 +571,14 @@
                   this.reflashEnterprise(response.data.data.enuu, baseUrl || '/vendor#/vendor_upload')
                 } else {
                   this.isSelfRegisterSuccess = false
-                  this.$message.error('企业注册失败，请重新填写信息')
+                  this.$message.error('个人注册失败，请重新填写信息')
                 }
+                this.showLoading = false
               }, err => {
                 console.log(err)
                 this.isSelfRegisterSuccess = false
-                this.$message.error('企业注册失败，请重新填写信息')
+                this.showLoading = false
+                this.$message.error('个人注册失败，请重新填写信息')
               })
           }
         } else {