Merge branch 'master' of http://git.shengws.com/csx/Pad_New

src/pages/home/register/register.vue

@@ -97,6 +97,12 @@
         <span type="primary" @click="callPhone()">拨打</span>
       </span>
     </el-dialog>
+
+    <van-overlay :show="show" type="spinner" size="30px">
+      <div class="wrapper">
+        <van-loading size="24px" vertical>正在登录...</van-loading>
+      </div>
+    </van-overlay>
   </div>
 </template>
 
@@ -128,6 +134,7 @@ export default {
       showMessage:false,
       checked: true,
       phone: "",
+      show: false,
       code: "",
       psd: "",
       contact: false,
@@ -238,6 +245,7 @@ export default {
     submitRegister(formName) {
       this.$refs[formName].validate(valid => {
         if (valid) {
+          this.show = true
           let params = {
             mobile: this.registerForm.phone,
             password: hex_md5(this.registerForm.password),
@@ -245,12 +253,17 @@ export default {
           };
           register(params).then(response => {
             if (response.data.state === 1) {
+              this.show = false
               this.$router.push("/setname");
             } else {
+              this.show = false
+
               this.$toast({
                 message: response.data.msg
               });
             }
+          }).catch(error => {
+            this.show = false
           });
         }
       });

src/pages/org/index.vue

@@ -52,7 +52,7 @@
         <van-field v-model="orgForm.telephone" placeholder="请填写" />
       </div>
     </div>
-    <div class="create" @click="createOrg()">创建</div>
+    <div class="create" @click="createOrg()" >创建</div>
     <div class="problem">
       遇到问题？点击
       <span @click="contact = true">联系客服</span>