Merge branch 'master' of http://git.ycjcjy.com/dianyang/colmo-h5

src/pages/signup.vue

@@ -62,7 +62,7 @@ export default {
       showPicker: false,
       formData: {
         role: '用户',
-        userName: undefined,
+        userName: '请输入您的姓名',
         phone: '请输入手机号',
         intendedProduct: undefined,
         address: undefined
@@ -111,7 +111,7 @@ export default {
         this.formData.address[2].name
     },
     verification() {
-      if (!this.formData.userName) {
+      if (!this.formData.userName || this.formData.userName==='请输入您的姓名') {
         alert('请输入您的姓名')
         return false
       } else if (!this.formData.phone || this.formData.phone==='请输入手机号') {