Merge branch 'dev-online' into PrivateReleaseOfXC

src/pages/UserCenter/Mine.vue

@@ -37,7 +37,7 @@
                           style="width: 100%;"
                           :picker-options="pickerOptions"></el-date-picker>
         </el-form-item>
-        <el-form-item label="省市" prop="address" style="width: 160%">
+        <el-form-item label="省市" required style="width: 160%">
           <provincecity v-if="userForm.location!==null"
             ref="addFormProvince"
             @selectChange="locationChange"
@@ -96,24 +96,24 @@
           }
         },
         rules: {
-          photoUrl: [
-            { required: true, message: '请上传头像', trigger: 'blur'},
-          ],
+          // photoUrl: [
+          //   { required: true, message: '请上传头像', trigger: 'blur'},
+          // ],
           userName: [
             { required: true, message: '请设置用户名', trigger: 'change' }
           ],
-          // province: [
-          //   { required: true, message: '请选择省份', trigger: 'blur' }
-          // ],
-          // city: [
-          //   { required: true, message: '请选择城市', trigger: 'blur' }
-          // ],
+          province: [
+            { required: true, message: '请选择省份', trigger: 'blur' }
+          ],
+          city: [
+            { required: true, message: '请选择城市', trigger: 'blur' }
+          ],
           gender: [
-            { required: true, message: '请选择性别', trigger: 'blur' }
+            { required: true, message: '请选择性别', trigger: 'change' }
           ],
-          // address:[
-          //   {required: true, message: '请填写地址', trigger: 'blur' },
-          // ]
+          location:[
+            {required: true, message: '请填写地址', trigger: 'blur' },
+          ]
         }
       }
     },
@@ -123,21 +123,20 @@
     methods: {
       submitUserInfo() {
         this.$refs['userForm'].validate(valid => {
+          if((!this.userForm.province) || (!this.userForm.city)){
+            notify('error', '请填写省市');
+            return ;
+          }
           if (valid) {
             let location = getProvinceNameByProvinceCode(this.userForm.province, this.userForm.city);
-            console.log(location)
-            if(typeof location != "undefined"){
-              this.userForm.province = location.provinceCode;
-              this.userForm.city = location.cityCode;
-            }
-
+            this.userForm.province = location.provinceCode;
+            this.userForm.city = location.cityCode;
             let params = this.userForm;
             delete params.location;
-            console.log(params);
             Http.put(`/api/personal/update/${this.user.id}`, params).then(res => {
               this.isModifyMode = false;
               notify('success', '修改成功 ');
-              location.reload();
+              // location.reload();
             })
           }
         })