Parcourir la source

fix:个人信息

wangJJ il y a 5 ans
Parent
commit
6e67d67219

+ 1 - 1
src/components/authen/IndividualAuthentication.vue

@@ -256,7 +256,7 @@ export default {
         notify('error', '单个文件大小不能超过10M')
         return false;
       }
-      let fileName = file.name
+      let fileName = file.namep
       let index = fileName.lastIndexOf('.');
       // 文件不能没有后缀
       if (index <= 0){

+ 1 - 1
src/components/commons/Header2.0.vue

@@ -14,7 +14,7 @@
                 </span>
                 <el-dropdown-menu slot="dropdown">
                   <el-dropdown-item>
-                    <router-link :to="{ name: 'UserCenter',params:{userId:user.userVO.id}}">
+                    <router-link :to="{ path:'/personal/mine'}">
                       <el-link icon="el-icon-user" :underline="false">
                         个人中心
                       </el-link>

+ 15 - 4
src/components/commons/ProvinceCity.vue

@@ -53,8 +53,8 @@ export default {
   data() {
     return {
       loadingCity: false,
-      province: "",
-      city: "",
+      province: this.provinceCode,
+      city: this.cityCode,
       provinces: [],
       cities: []
     };
@@ -96,10 +96,21 @@ export default {
   },
   watch:{
     data(){
+      console.log('city=pCode')
       this.province = this.provinceCode
       this.city = this.cityCode
-    }
-  }
+    },
+    cityCode(val){
+      console.log('cityCode')
+      console.log(val)
+      this.city = val;
+    },
+    provinceCode(val){
+      console.log('proCode')
+      this.provinceChanged(this.provinceCode);
+      this.province = val;
+    },
+  },
 };
 </script>
 

+ 5 - 5
src/js/index.js

@@ -629,7 +629,7 @@ export const defaultValue = {
 //     'cityCode': '南京市'
 //   }
 // }
-// //通过名称获取省、市代码
+//通过名称获取省、市代码
 // export const getProvinceCodeByProvinceName = (provinceName, cityName) => {
 //   for (var i = 0; i < ProvinceJson.provinces.length; i++) {
 //     if (ProvinceJson.provinces[i].name == provinceName) {
@@ -643,10 +643,10 @@ export const defaultValue = {
 //       }
 //     }
 //   }
-//   return {
-//     'provinceCode': '3200',
-//     'cityCode': '3201'
-//   }
+  // return {
+  //   'provinceCode': '3200',
+  //   'cityCode': '3201'
+  // }
 // }
 //
 // //获取批量上传项目模板文件

+ 8 - 3
src/pages/UserCenter/Mine.vue

@@ -58,7 +58,7 @@
   import Http from '@/js/http'
   import Apis from '@/js/api'
   import {notify} from '@/constants/index'
-  import {storageGet,getAllServiceTypes} from '@/js/index'
+  import {storageGet,getAllServiceTypes,getProvinceNameByProvinceCode,getProvinceCodeByProvinceName} from '@/js/index'
   import provincecity from '@/components/commons/ProvinceCity'
   export default {
     name: "Mine",
@@ -89,7 +89,7 @@
           this.isModifyMode = false;
         })
       },
-      //联系地址
+      //联系地址改变
       locationChange (provinceId, cityId) {
         if (provinceId || cityId) {
           this.userForm.province = provinceId
@@ -137,7 +137,12 @@
       loadData() {
         Http.get(`/api/personal/display/${this.user.id}`).then((res) => {
           this.userForm = res.userVO;
-          this.userForm.personalCompetence = ['JKCS']
+          //获取省市code
+          // console.log(getProvinceCodeByProvinceName(this.userForm.province, this.userForm.city));;
+          let location = getProvinceCodeByProvinceName(this.userForm.province, this.userForm.city);
+          console.log(location)
+          this.userForm.province = location.provinceCode;
+          this.userForm.city = location.cityCode;
         })
       },
       setUserInfo(){

+ 5 - 4
src/pages/UserCenter/MyBankCard.vue

@@ -21,13 +21,13 @@
         <el-form-item label="卡号">
           <el-input v-model="bankCardForm.number"></el-input>
         </el-form-item>
-        <el-form-item>
-          <el-select v-model="value" placeholder="请选择银行卡种类">
+        <el-form-item label="银行类型">
+          <el-select v-model="bankCardForm.name" placeholder="请选择银行卡种类">
             <el-option
               v-for="item in bankCardType"
               :key="item.id"
               :label="item.name"
-              :value="item.id">
+              :value="item.name">
             </el-option>
           </el-select>
         </el-form-item>
@@ -70,7 +70,8 @@
         },
         bankCardForm:{
           user:'',
-          number:''
+          number:'',
+          name:''
         },
         user:{},
         bankCardVOList:[],