Merge branch 'master' of http://git.hchyun.com/clay/expressweb

src/api/api.config.js

@@ -1,8 +1,8 @@
 import axios from 'axios'
 // import {getHeaders} from '../utils/token'
 
-// const baseUrl = 'http://localhost:8083/api/'
+const baseUrl = 'http://localhost:8083/api/'
-const baseUrl = 'http://api.tomey.live/api/'
+// const baseUrl = 'http://api.tomey.live/api/'
 class HttpRequest {
   constructor (baseUrl) {
     this.baseUrl = baseUrl

src/api/personInfoAdd.js

@@ -0,0 +1,11 @@
+import axios from './api.config'
+import qs from 'qs'
+
+//完善个人信息
+export const personInfoEdit = (data) => {
+  return axios.request({
+    url: 'editinfo',
+    data: qs.stringify(data, { arrayFormat: 'brackets' })
+  })
+}
+

src/components/personPage/user/AddInfo.vue

@@ -2,35 +2,37 @@
     <div class="addInformation">
         <person-title>当前位置 :: 个人中心 >> <em>完善个人信息</em></person-title>
         <div class="add-infor-cont">
-            <el-form :model="ruleForm" 
+            <el-form :model="personForm"
-            :rules="rules" ref="ruleForm" 
+            :rules="rules" ref="personForm"
             label-position='left'
             @submit.native.prevent
             :status-icon='true'
             label-width="7rem" class="demo-ruleForm">
-                <el-form-item label="姓名 : " prop="userName">
+                <el-form-item label="用户名 : " prop="userName">
-                    <el-input 
+                    <el-input
-                    placeholder="为了安全,不可二次修改!"
+                    placeholder="请输入用户名！"
-                    v-model.trim="ruleForm.userName"></el-input>
+                    v-model.trim="personForm.userName"></el-input>
-                </el-form-item> 
+                </el-form-item>
                 <el-form-item label="性别 : " prop="gender">
-                    <el-radio-group v-model.number="ruleForm.gender">
+                    <el-radio-group v-model.number="personForm.gender">
                     <el-radio :label="1">男</el-radio>
                     <el-radio :label="0">女</el-radio>
                     </el-radio-group>
                 </el-form-item>
-                <el-form-item label="联系电话 : " prop="phoneNum">
+                <el-form-item label="邮箱 : " prop="personEmail">
-                    <el-input v-model="ruleForm.phoneNum"></el-input>
-                </el-form-item> 
-                <el-form-item label="联系地址 : " prop="address">
                     <el-input
-                    placeholder="输入您的联系地址便于配送"
+                      placeholder="请输入邮箱！"
-                     v-model="ruleForm.address"></el-input>
+                      v-model="personForm.personEmail"></el-input>
-                </el-form-item> 
+                </el-form-item>
+                <el-form-item label="生日 : " prop="birthday">
+                    <el-input
+                    placeholder="输入您的生日 格式为 2000-01-01"
+                     v-model="personForm.birthday"></el-input>
+                </el-form-item>
                 <el-form-item class="completed-info-btn">
                     <el-button type="primary"
-                     @click="submitForm('ruleForm')">修改</el-button>
+                     @click="submitForm('personForm')">修改</el-button>
-                    <el-button  @click="resetForm('ruleForm')">重置</el-button>
+                    <el-button  @click="resetForm('personForm')">重置</el-button>
                 </el-form-item>
             </el-form>
         </div>
@@ -38,94 +40,144 @@
 </template>
 
 <script>
-import {gotoNewOrder} from './../../../assets/js/gotoNewOrder'
+// import {gotoNewOrder} from './../../../assets/js/gotoNewOrder'
+import {personInfoEdit} from '../../../api/personInfoAdd'
 import axios from 'axios'
+
 export default {
-    data() {
+  data () {
-        let regexpPhoneNumber=(rule, value, callback) => {
+    let regexpPhoneNumber = (rule, value, callback) => {
-            if (value === '') {
+      if (value === '') {
-                callback(new Error('请输入联系电话!'));
+        callback(new Error('请输入邮箱!'))
-            }else if(!/^1[3-8][0-9]{9}$/.test(value)){
+      }
-                callback(new Error('手机号码格式不正确!'));
+      // else if (!/^1[3-8][0-9]{9}$/.test(value)) {
-            }else{
+      else if (!/^\w+((.\w+)|(-\w+))@[A-Za-z0-9]+((.|-)[A-Za-z0-9]+).[A-Za-z0-9]+$/.test(value)) {
-                callback();
+        callback(new Error('邮箱格式不正确!'))
-            }
+      } else {
-        };
+        callback()
-      return {
-        ruleForm: {
-          userName: '',
-          phoneNum:'',
-          gender:1,
-          address:''
-        },
-        rules: {
-          userName: [
-            { required: true, message: '请输入名字', trigger: 'blur' },
-            { min: 2, max: 6, message: '长度在 3 到 6 个字符', trigger: 'change' },
-            { min: 2, max: 6, message: '长度在 3 到 6 个字符', trigger: 'blur' },
-            { pattern:/\D/, message: '不能为纯数字', trigger: 'change' },
-            { pattern:/\D/, message: '不能为纯数字', trigger: 'blur' }
-          ],
-          phoneNum: [
-            { required: true, message: '请输入您的联系方式'},
-            { validator: regexpPhoneNumber, trigger: 'change'},
-            { validator: regexpPhoneNumber, trigger: 'blur'}
-          ],
-          gender: [
-            { required: true, type:'number', message: '请选择性别', trigger: 'change' }
-          ],
-          address:[
-              { required: true, message: '请输入联系地址', trigger: 'blur' }
-          ]
-        }
-      };
-    },
-    mounted() {
-        this.ruleForm.phoneNum = this.$store.state.user.userInfo.userId;
-    },
-    methods: {
-      submitForm(formName) {
-        this.$refs[formName].validate((valid) => {
-          if (valid) {
-               let addInfo = {
-                   userName:this.ruleForm.userName,
-                   phoneNum:this.ruleForm.phoneNum,
-                   gender:this.ruleForm.gender,
-                   address:this.ruleForm.address
-               }
-                axios.post(`/users/addInformation`,addInfo).then(response=>{
-                    let res = response.data;
-                    if(res.status=='0'){
-                         this.$notify({
-                            title: '修改成功',
-                            message: '恭喜你! 修改成功!',
-                            duration:2000,
-                            type: 'success'
-                        });
-                        gotoNewOrder.$emit('goNewOrder','userInformation');
-                        this.$router.push({path:'userInformation'});
-                    }else{
-                        this.$notify({
-                            title: '修改失败',
-                            message:res.msg,
-                            duration:2000,
-                            type: 'error'
-                        });  
-                    }
-                }).catch(err=>{
-                    console.log(err);
-                    
-                })
-          } else {
-            return false;
-          }
-        });
-      },
-      resetForm(formName) {
-        this.$refs[formName].resetFields();
       }
     }
+   let regexBirthday = (rule, value, callback) => {
+      if (value === '') {
+        callback(new Error('请输入生日!'))
+      }
+      else if (!/^(19|20)\d{2}-(1[0-2]|0?[1-9])-(0?[1-9]|[1-2][0-9]|3[0-1])$/.test(value)) {
+        callback(new Error('生日格式不正确!'))
+      } else {
+        callback()
+      }
+    }
+    return {
+      personForm: {
+        userName: '',
+        personEmail: '',
+        gender: 1,
+        birthday: ''
+      },
+      rules: {
+        userName: [
+          { required: true, message: '请输入名字', trigger: 'blur' },
+          { min: 2, max: 6, message: '长度在 3 到 6 个字符', trigger: 'change' },
+          { min: 2, max: 6, message: '长度在 3 到 6 个字符', trigger: 'blur' },
+          { pattern: /\D/, message: '不能为纯数字', trigger: 'change' },
+          { pattern: /\D/, message: '不能为纯数字', trigger: 'blur' }
+        ],
+        personEmail: [
+          { required: true, message: '请输入您的电子邮件'},
+          { validator: regexpPhoneNumber, trigger: 'change'},
+          { validator: regexpPhoneNumber, trigger: 'blur'}
+        ],
+        gender: [
+          { required: true, type: 'number', message: '请选择性别', trigger: 'change' }
+        ],
+        birthday: [
+          { required: true, message: '请输入生日 格式为 2000-01-01', trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  mounted () {
+    // this.personForm.phoneNum = this.$store.state.user.userInfo.userId
+  },
+  methods: {
+    submitForm (formName) {
+      // this.$refs[formName].validate((valid) => {
+      // this.$refs[formName].validate((valid) => {
+        let tip =this.personForm
+      console.log(tip)
+      let addInfo = {
+        username: this.personForm.userName,
+        email: this.personForm.personEmail,
+        sex: this.personForm.gender,
+        birthday: this.personForm.birthday
+      }
+        if (tip) {
+          console.log("0000000")
+          personInfoEdit(this.addInfo).then((res)=>{
+            console.log(res)
+            console.log("11111")
+            var data = res.data
+            if (data.success){
+              this.$notify({
+                title: '提交成功',
+                duration: 2000,
+                type: 'success'
+              })
+              sessionStorage.clear()
+              // this.$router.push({path: '/login'})
+            }else {
+              this.$notify({
+                title: '提交失败',
+                message:data.msg,
+                duration: 2000,
+                type: 'error'
+              })
+            }
+          })
+        }
+
+        /*if (valid) {
+          let addInfo = {
+            userName: this.ruleForm.userName,
+            phoneNum: this.ruleForm.phoneNum,
+            gender: this.ruleForm.gender,
+            address: this.ruleForm.address
+          }
+          axios.post(`/users/addInformation`, addInfo).then(response => {
+            let res = response.data
+            if (res.status == '0') {
+              this.$notify({
+                title: '修改成功',
+                message: '恭喜你! 修改成功!',
+                duration: 2000,
+                type: 'success'
+              })
+              gotoNewOrder.$emit('goNewOrder', 'userInformation')
+              this.$router.push({path: 'userInformation'})
+            } else {
+              this.$notify({
+                title: '修改失败',
+                message: res.msg,
+                duration: 2000,
+                type: 'error'
+              })
+            }
+          }).catch(err => {
+            console.log(err)
+          })*/
+         else {
+          this.$message({
+            message: tip,
+            type: 'error'
+          });
+        }
+      // })
+    },
+    resetForm (formName) {
+      this.$refs[formName].resetFields()
+    }
   }
+}
 </script>
 
 <style lang='scss'>

src/components/personPage/user/addInformation.vue

@@ -2,17 +2,17 @@
     <div class="addInformation">
         <person-title>当前位置 :: 个人中心 >> <em>完善个人信息</em></person-title>
         <div class="add-infor-cont">
-            <el-form :model="ruleForm" 
+            <el-form :model="ruleForm"
-            :rules="rules" ref="ruleForm" 
+            :rules="rules" ref="ruleForm"
             label-position='left'
             @submit.native.prevent
             :status-icon='true'
             label-width="7rem" class="demo-ruleForm">
                 <el-form-item label="姓名 : " prop="userName">
-                    <el-input 
+                    <el-input
                     placeholder="为了安全,不可二次修改!"
                     v-model.trim="ruleForm.userName"></el-input>
-                </el-form-item> 
+                </el-form-item>
                 <el-form-item label="性别 : " prop="gender">
                     <el-radio-group v-model.number="ruleForm.gender">
                     <el-radio :label="1">男</el-radio>
@@ -21,12 +21,12 @@
                 </el-form-item>
                 <el-form-item label="联系电话 : " prop="phoneNum">
                     <el-input v-model="ruleForm.phoneNum"></el-input>
-                </el-form-item> 
+                </el-form-item>
                 <el-form-item label="联系地址 : " prop="address">
                     <el-input
                     placeholder="输入您的联系地址便于配送"
                      v-model="ruleForm.address"></el-input>
-                </el-form-item> 
+                </el-form-item>
                 <el-form-item class="completed-info-btn">
                     <el-button type="primary"
                      @click="submitForm('ruleForm')">修改</el-button>
@@ -41,91 +41,90 @@
 import {gotoNewOrder} from './../../../assets/js/gotoNewOrder'
 import axios from 'axios'
 export default {
-    data() {
+  data () {
-        let regexpPhoneNumber=(rule, value, callback) => {
+    let regexpPhoneNumber = (rule, value, callback) => {
-            if (value === '') {
+      if (value === '') {
-                callback(new Error('请输入联系电话!'));
+        callback(new Error('请输入联系电话!'))
-            }else if(!/^1[3-8][0-9]{9}$/.test(value)){
+      } else if (!/^1[3-8][0-9]{9}$/.test(value)) {
-                callback(new Error('手机号码格式不正确!'));
+        callback(new Error('手机号码格式不正确!'))
-            }else{
+      } else {
-                callback();
+        callback()
-            }
-        };
-      return {
-        ruleForm: {
-          userName: '',
-          phoneNum:'',
-          gender:1,
-          address:''
-        },
-        rules: {
-          userName: [
-            { required: true, message: '请输入名字', trigger: 'blur' },
-            { min: 2, max: 6, message: '长度在 3 到 6 个字符', trigger: 'change' },
-            { min: 2, max: 6, message: '长度在 3 到 6 个字符', trigger: 'blur' },
-            { pattern:/\D/, message: '不能为纯数字', trigger: 'change' },
-            { pattern:/\D/, message: '不能为纯数字', trigger: 'blur' }
-          ],
-          phoneNum: [
-            { required: true, message: '请输入您的联系方式'},
-            { validator: regexpPhoneNumber, trigger: 'change'},
-            { validator: regexpPhoneNumber, trigger: 'blur'}
-          ],
-          gender: [
-            { required: true, type:'number', message: '请选择性别', trigger: 'change' }
-          ],
-          address:[
-              { required: true, message: '请输入联系地址', trigger: 'blur' }
-          ]
-        }
-      };
-    },
-    mounted() {
-        this.ruleForm.phoneNum = this.$store.state.user.userInfo.userId;
-    },
-    methods: {
-      submitForm(formName) {
-        this.$refs[formName].validate((valid) => {
-          if (valid) {
-               let addInfo = {
-                   userName:this.ruleForm.userName,
-                   phoneNum:this.ruleForm.phoneNum,
-                   gender:this.ruleForm.gender,
-                   address:this.ruleForm.address
-               }
-                axios.post(`/users/addInformation`,addInfo).then(response=>{
-                    let res = response.data;
-                    if(res.status=='0'){
-                         this.$notify({
-                            title: '修改成功',
-                            message: '恭喜你! 修改成功!',
-                            duration:2000,
-                            type: 'success'
-                        });
-                        gotoNewOrder.$emit('goNewOrder','userInformation');
-                        this.$router.push({path:'userInformation'});
-                    }else{
-                        this.$notify({
-                            title: '修改失败',
-                            message:res.msg,
-                            duration:2000,
-                            type: 'error'
-                        });  
-                    }
-                }).catch(err=>{
-                    console.log(err);
-                    
-                })
-          } else {
-            return false;
-          }
-        });
-      },
-      resetForm(formName) {
-        this.$refs[formName].resetFields();
       }
     }
+    return {
+      ruleForm: {
+        userName: '',
+        phoneNum: '',
+        gender: 1,
+        address: ''
+      },
+      rules: {
+        userName: [
+          { required: true, message: '请输入名字', trigger: 'blur' },
+          { min: 2, max: 6, message: '长度在 3 到 6 个字符', trigger: 'change' },
+          { min: 2, max: 6, message: '长度在 3 到 6 个字符', trigger: 'blur' },
+          { pattern: /\D/, message: '不能为纯数字', trigger: 'change' },
+          { pattern: /\D/, message: '不能为纯数字', trigger: 'blur' }
+        ],
+        phoneNum: [
+          { required: true, message: '请输入您的联系方式'},
+          { validator: regexpPhoneNumber, trigger: 'change'},
+          { validator: regexpPhoneNumber, trigger: 'blur'}
+        ],
+        gender: [
+          { required: true, type: 'number', message: '请选择性别', trigger: 'change' }
+        ],
+        address: [
+          { required: true, message: '请输入联系地址', trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  mounted () {
+    this.ruleForm.phoneNum = this.$store.state.user.userInfo.userId
+  },
+  methods: {
+    submitForm (formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          let addInfo = {
+            userName: this.ruleForm.userName,
+            phoneNum: this.ruleForm.phoneNum,
+            gender: this.ruleForm.gender,
+            address: this.ruleForm.address
+          }
+          axios.post(`/users/addInformation`, addInfo).then(response => {
+            let res = response.data
+            if (res.status == '0') {
+              this.$notify({
+                title: '修改成功',
+                message: '恭喜你! 修改成功!',
+                duration: 2000,
+                type: 'success'
+              })
+              gotoNewOrder.$emit('goNewOrder', 'userInformation')
+              this.$router.push({path: 'userInformation'})
+            } else {
+              this.$notify({
+                title: '修改失败',
+                message: res.msg,
+                duration: 2000,
+                type: 'error'
+              })
+            }
+          }).catch(err => {
+            console.log(err)
+          })
+        } else {
+          return false
+        }
+      })
+    },
+    resetForm (formName) {
+      this.$refs[formName].resetFields()
+    }
   }
+}
 </script>
 
 <style lang='scss'>