注册界面第二版

src/dashoo.cn/backend/api/controllers/register/oilcorporateinfo.go

@@ -52,6 +52,7 @@ func (this *OilCorporateInfoController) AddEntity() {
 	userentity.Publickey = key
 	userentity.Auditstatus = 1
 	userentity.AccCode = "s5OVE"
+	userentity.Code = "Administrator"
 
 	userSvc := userRole.GetUserService(utils.DBE)
 	err := userSvc.AddUser(&userentity)
@@ -90,7 +91,7 @@ func (this *OilCorporateInfoController) AddEntity() {
 		}
 
 	} else {
-		errinfo.Message = "账户注册失败！" + utils.AlertProcess(err.Error())
+		errinfo.Message = "账户注册失败，账号已存在！"
 		errinfo.Code = -1
 		this.Data["json"] = &errinfo
 		this.ServeJSON()

src/dashoo.cn/frontend_web/src/pages/signup.vue

@@ -38,7 +38,7 @@
                     :options="countryoptions"
                     :props="countryprops"
                     change-on-select
-                    v-model="formData.Address"
+                    v-model="addressOptions"
                     style="width: 100%">
                   </el-cascader>
                 </el-form-item>
@@ -122,8 +122,7 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="成立时间"   style="width: 100%" prop="SetupTime">
-                  <el-date-picker v-model="formData.SetupTime" type="date" format="yyyy 年 MM 月 dd 日"
-                                  value-format="yyyy-MM-dd" placeholder="请选择成立时间">
+                  <el-date-picker v-model="formData.SetupTime" type="datetime" placeholder="请选择成立时间">
                   </el-date-picker>
                 </el-form-item>
               </el-col>
@@ -184,12 +183,12 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">              
-                <el-form-item label="密码"  style="width: 100%" prop="pass" >
+                <el-form-item label="密码"  style="width: 100%" prop="UserPass" >
                   <el-input type="password" v-model="formData.UserPass"  auto-complete="off" placeholder="请输入密码"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="确认密码"  style="width: 100%" prop="checkPass" >
+                <el-form-item label="确认密码"  style="width: 100%" prop="UserPass2" >
                   <el-input type="password" v-model="formData.UserPass2" auto-complete="off" placeholder="请输入确认密码"></el-input>
                 </el-form-item>
               </el-col>
@@ -231,25 +230,6 @@
   import axios from 'axios'
   @Component({
     data () {
-      var checkPass2 = (rule, value, callback) => {
-        if (value != this.formData.UserPass2) {
-          callback(new Error('两次输入密码不一致，请重新输入!'));
-        } else {
-          callback();
-        }
-      };
-      var checkEmail = (rule, value, callback) => {
-        if (!value) {
-          callback(new Error('请输入邮箱地址'))
-        } else {
-          let re = /^([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+.[a-zA-Z]{2,3}$/
-          if (!re.test(value)) {
-            callback(new Error('请输入正确的邮箱地址'))
-          } else {
-            callback()
-          }
-        }
-      };
       return {
         activeIndex: '1',
 
@@ -258,6 +238,7 @@
           label: 'name',
           children: 'districts'
         },
+        addressOptions: [],
 
         formData: {
           Id: '', //int
@@ -370,8 +351,8 @@
           ],
           EMail: [{
             required: true,
-            validator: this.checkEmail,
-            trigger: 'change'
+            message: '请输入邮箱',
+            trigger: 'blur'
           }],
           BankCreditRating: [
             { required: true, message: '请输入银行信用等级', trigger: 'blur' }
@@ -404,7 +385,10 @@
             { required: true, message: '请输入密码', trigger: 'blur' }
           ],
           UserPass2: [
-            { required: true, validator: this.checkPass2, trigger: 'change' }
+            { required: true, 
+              message: '请输入确认密码',
+              trigger: 'blur' 
+            }
           ],
         }
       }
@@ -420,8 +404,37 @@
       //注册
       register () {
         let _this = this
+        
+        //邮箱验证
+        let re = /^([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+.[a-zA-Z]{2,3}$/
+        if (!re.test(_this.formData.EMail)) {
+          this.$alert('请输入正确的邮箱地址!', '提示', {
+            confirmButtonText: '确定',
+          })
+          return
+        }
+        //手机号验证
+        // let re1 = /^[1][3456789]\d{9}$/
+        // if (!re.test(_this.formData.Mobile)) {
+        //   this.$alert('请填写正确的手机号！', '提示', {
+        //     confirmButtonText: '确定',
+        //   })
+        //   return
+        // }
+        //密码验证
+        if (_this.formData.UserPass != _this.formData.UserPass2) {
+          this.$alert('两次输入的密码不一致，请重新输入!', '提示', {
+            confirmButtonText: '确定',
+          })
+          return
+        }
+      
+        let arr = _this.addressOptions
+        _this.formData.Address = arr.join("/") //转化公司地址
+        _this.formData.RegCapital = parseFloat(_this.formData.RegCapital)
+        _this.formData.Currency = '万元' //币种
 
-        console.log("****_this.formData*****",_this.formData)
+        // console.log("****_this.formData*****",_this.formData)
 
         _this.$axios.post('/register/addentity', _this.formData)
           .then(function (response) {
@@ -429,6 +442,7 @@
               _this.$alert(response.data.message, '提示', {
                 confirmButtonText: '确定',
               })
+              _this.$router.push('/login') //跳转到登录页
             } else {
               _this.$alert(response.data.message, '提示', {
                 confirmButtonText: '确定',
@@ -440,6 +454,19 @@
           })
       },
 
+      //格式化页面到数据库的时间格式
+      formatDateTime(date) {
+        var y = date.getFullYear()
+        var m = date.getMonth() + 1
+        m = m < 10 ? ('0' + m) : m
+        var d = date.getDate()
+        d = d < 10 ? ('0' + d) : d
+        var h = date.getHours()
+        var minute = date.getMinutes()
+        minute = minute < 10 ? ('0' + minute) : minute
+        return y + '-' + m + '-' + d + ' ' + h + ':' + minute
+      },
+
       //格式化时间
       jstimehandle(val) {
         if (val === '') {
@@ -453,6 +480,7 @@
           return val.substring(0, 10)
         }
       },
+
       handleSelect (key, keyPath) {
         this.activeIndex = key
       }