解决代码冲突

pages/index/index.vue

@@ -39,11 +39,8 @@
 								</text>
 							<img :src="cssUrl+'index_comback.svg'" v-if="item.hospital_pos" @click="toLocation(item)">
 						</view>
-						<view class="date over2 over4" v-if="item.plan==0">
+						<view class="date over2 over4">
-							停诊
+							出诊：{{ item.workdate_desc }}
-						</view>
-						<view class="date over2 over4"  v-else>
-							出诊：{{ item.visit_time }}
 						</view>
 					</view>
 					<view class="right">
@@ -254,6 +251,7 @@
 						let workDateValArr = Object.values(this.workdate);
 						let timeList = [];
 						this.hospital_departs = this.doctorInfo.hospital_departs.map((item,index)=>{
+							item.workdate_desc = this.doctorInfo.workdate_desc[item.depart_id]
 							let indexofNum = workDatKeyArr.indexOf(item.depart_id);
 							if(indexofNum > -1){
 								let departCurItem = workDateValArr[indexofNum];
@@ -272,10 +270,6 @@
 							}
 							return item
 						})
-						console.log(this.hospital_departs,'this.hospital_departs');
-					// }else{
-
-					// }
 				});
 			},
 			enlargePicture(imgUrl) {

pages/visitors/visitors.vue

@@ -172,20 +172,6 @@
 				// param.limit = 10000
 				this.$http.req('user/get_visitors', {}, 'POST').then(data=>{
 					this.visitUsers = data;
-					let arr = 
-					// 仅测试
-					{
-						'id':'32',
-						"name": "暴富喽",
-						"idcard": "6666",
-						"phone": "18816661888",
-						"hospital": "北京LY暴富",
-						"depart": "针灸科",
-						"doctor_status": "停诊",
-						"remain_num": "4",
-						"last_visit": "1970-01-01 00:00:01"
-					}
-					this.visitUsers = [...this.visitUsers,arr]
 					this.popMsgs = []
 					var popmsgIndex = 0
 					for (var i = 0; i < this.visitUsers.length; i++) {