人脉圈

src/views/peoplehomepage/editInfo.vue

@@ -62,6 +62,7 @@
                                     <p>{{item.workName}}</p>
                                     <p>{{item.orgName}}</p>
                                     <p>{{item.address}}</p>
+                                    <p v-if="item.startTime">{{item.startTime}} - {{item.endTime=='now'?'至今':item.endTime}}</p>
                                 </div>
                                 <div>
                                     <i @click="editjobs(item,index)" class="iconfont icon-bianji"></i>
@@ -475,11 +476,11 @@
                 this.workdata.cityId = row.cityId;
                 this.workdata.provinceId = row.provinceId;
                 this.workdata.startTime = row.startTime;
-                this.workdata.startYear = Number(row.startTime.substring(0,4));
-                this.workdata.startMonth = Number(row.startTime.substring(5,6) == 0?row.startTime.substring(6,7):row.startTime.substring(5,8));
+                this.workdata.startYear = row.startTime?Number(row.startTime.substring(0,4)):'';
+                this.workdata.startMonth = row.startTime?(Number(row.startTime.substring(5,6) == 0?row.startTime.substring(6,7):row.startTime.substring(5,8))):'';
                 this.workdata.endTime = row.endTime;
-                this.workdata.endYear = row.endTime == 'now'?'至今':Number(row.endTime.substring(0,4));
-                this.workdata.endMonth = row.endTime != 'now'?Number(row.endTime.substring(5,6) == 0?row.endTime.substring(6,7):row.endTime.substring(5,8)):'';
+                this.workdata.endYear = row.endTime?(row.endTime == 'now'?'至今':Number(row.endTime.substring(0,4))):'';
+                this.workdata.endMonth = row.endTime?(row.endTime != 'now'?Number(row.endTime.substring(5,6) == 0?row.endTime.substring(6,7):row.endTime.substring(5,8)):''):'';
                 if(this.workdata.nationId == 1){
                     this.countryIf = true;
                     this.provinceIf = true;

src/views/peoplehomepage/introductionbar.vue

@@ -128,6 +128,8 @@
                         <span>{{item.orgName}}</span>
                         <i v-if="item.workTime">|</i>
                         <span>{{item.workTime}}</span>
+                        <i v-if="item.address">|</i>
+                        <span>{{item.address}}</span>
                     </p>
                 </div>
             </div>