diff --git a/src/views/consultant/edit.vue b/src/views/consultant/edit.vue
index 680b5a5..aa0187e 100644
--- a/src/views/consultant/edit.vue
+++ b/src/views/consultant/edit.vue
@@ -169,7 +169,7 @@
               <div>北京、上海</div>
               <input
                 type="text"
-                v-model="priceDataLst[0]"
+                v-model="priceDataLstARR[0]"
                 readonly="readonly"
                 @click="openPrice1()"
               />
@@ -178,7 +178,7 @@
               <div>天津、重庆、江苏、浙江、广东、福建</div>
               <input
                 type="text"
-                v-model="priceDataLst[1]"
+                v-model="priceDataLstARR[1]"
                 readonly="readonly"
                 @click="openPrice2()"
               />
@@ -187,7 +187,7 @@
               <div>辽宁、河北、山东、海南、湖北、湖南</div>
               <input
                 type="text"
-                v-model="priceDataLst[2]"
+                v-model="priceDataLstARR[2]"
                 readonly="readonly"
                 @click="openPrice3()"
               />
@@ -196,7 +196,7 @@
               <div>其他省域(老高考)</div>
               <input
                 type="text"
-                v-model="priceDataLst[3]"
+                v-model="priceDataLstARR[3]"
                 readonly="readonly"
                 @click="openPrice4()"
               />
@@ -223,15 +223,14 @@
       </div>
       <ul>
         <li
-          :class="{ checked: index == cityIndex1 }"
+          :class="{ checked: addRess[0].name == item.name }"
           @click="getCityValue1(index, item)"
-		  
           v-for="(item, index) in provinceData"
           :key="index"
         >
           {{ item.name
           }}<img
-            v-show="index == cityIndex1"
+            v-show=" addRess[0].name == item.name "
             src="../../assets/images/home/expert/yes.png"
           />
         </li>
@@ -251,14 +250,14 @@
       </div>
       <ul>
         <li
-          :class="{ checked: index == cityIndex2 }"
+          :class="{ checked: addRess[1].name == item.name }"
           @click="getCityValue2(index, item)"
           v-for="(item, index) in provinceData"
           :key="index"
         >
           {{ item.name
           }}<img
-            v-show="index == cityIndex2"
+            v-show="addRess[1].name == item.name"
             src="../../assets/images/home/expert/yes.png"
           />
         </li>
@@ -277,14 +276,14 @@
       </div>
       <ul>
         <li
-          :class="{ checked: index == cityIndex3 }"
+          :class="{ checked: addRess[2].name == item.name  }"
           @click="getCityValue3(index, item)"
           v-for="(item, index) in provinceData"
           :key="index"
         >
           {{ item.name
           }}<img
-            v-show="index == cityIndex3"
+            v-show=" addRess[2].name == item.name "
             src="../../assets/images/home/expert/yes.png"
           />
         </li>
@@ -304,14 +303,14 @@
       </div>
       <ul>
         <li
-          :class="{ checked: index == priceIndex1 }"
+          :class="{ checked: priceDataLstARR[0] == item }"
           @click="getPriceValue1(index, item)"
           v-for="(item, index) in priceDataLst"
           :key="index"
         >
           {{ item
           }}<img
-            v-show="index == priceIndex1"
+            v-show="priceDataLstARR[0] == item"
             src="../../assets/images/home/expert/yes.png"
           />
         </li>
@@ -330,14 +329,14 @@
       </div>
       <ul>
         <li
-          :class="{ checked: index == priceIndex2 }"
+          :class="{ checked:priceDataLstARR[1] == item  }"
           @click="getPriceValue2(index, item)"
           v-for="(item, index) in priceDataLst"
           :key="index"
         >
           {{ item
           }}<img
-            v-show="index == priceIndex2"
+            v-show="priceDataLstARR[1] == item"
             src="../../assets/images/home/expert/yes.png"
           />
         </li>
@@ -356,14 +355,14 @@
       </div>
       <ul>
         <li
-          :class="{ checked: index == priceIndex3 }"
+          :class="{ checked: priceDataLstARR[2] == item  }"
           @click="getPriceValue3(index, item)"
           v-for="(item, index) in priceDataLst"
           :key="index"
         >
           {{ item
           }}<img
-            v-show="index == priceIndex3"
+            v-show=" priceDataLstARR[2] == item"
             src="../../assets/images/home/expert/yes.png"
           />
         </li>
@@ -382,14 +381,14 @@
       </div>
       <ul>
         <li
-          :class="{ checked: index == priceIndex4 }"
+          :class="{ checked: priceDataLstARR[3] == item  }"
           @click="getPriceValue4(index, item)"
           v-for="(item, index) in priceDataLst"
           :key="index"
         >
           {{ item
           }}<img
-            v-show="index == priceIndex4"
+            v-show=" priceDataLstARR[3] == item"
             src="../../assets/images/home/expert/yes.png"
           />
         </li>
@@ -410,6 +409,7 @@ export default {
       Characteristics: [],
       bodyData: "",
       explainData: "",
+      priceDataLstARR:[],
       editData: {
         avatar: "",
         keywords: "",
@@ -439,26 +439,26 @@ export default {
       cityValue3: "", //选择城市编号
       addRess: [],
       // 价格区间
-	  priceDataLst:[],
+      priceDataLst: [],
       priceData: [
         { title: "3980" },
-		{ title: "4980" },
-		{ title: "5980" },
-		{ title: "6980" },
-		{ title: "8980" },
-		{ title: "8980" },
-		{ title: "9980" },
-		{ title: "10980" },
-		{ title: "11980" },
-		{ title: "12980" },
-		{ title: "13980" },
-      	{ title: "14980" },
-		{ title: "15980" },
-		{ title: "16980" },
-		{ title: "17980" },
-		{ title: "18980" },
-		{ title: "19980" },
-		{ title: "20980" },
+        { title: "4980" },
+        { title: "5980" },
+        { title: "6980" },
+        { title: "8980" },
+        { title: "8980" },
+        { title: "9980" },
+        { title: "10980" },
+        { title: "11980" },
+        { title: "12980" },
+        { title: "13980" },
+        { title: "14980" },
+        { title: "15980" },
+        { title: "16980" },
+        { title: "17980" },
+        { title: "18980" },
+        { title: "19980" },
+        { title: "20980" },
       ],
       isPrice1: false, //价格列表是否显示
       priceIndex1: 0,
@@ -487,64 +487,61 @@ export default {
   mounted() {
     this.checkExperInfo();
     this.getAddrData();
-	this.getPricerData()
+    this.getPricerData();
   },
   methods: {
-	  navdetail(){
-		  		this.$router.push({
-							path: "/edit/detail",
-							query: {
-								id: this.id,
-							},
-						});
-	  },
-	    navdetailLst(){
-		  		this.$router.push({
-							path: "/edit/list",
-							query: {
-								id: this.id,
-							},
-						});
-	  },
-	  priceDataLstFun(){
-		   	this.editData.service_area_main=""
-		for (let index = 0; index < this.addRess.length; index++) {
-			
-			if (this.addRess[index].code) {
-				this.editData.service_area_main+=this.addRess[index].code+","
-			}
-			
-		}
-		
-			this.editData.price_area_a=this.priceDataLst[0]
-			this.editData.price_area_b=this.priceDataLst[1]
-			this.editData.price_area_c=this.priceDataLst[2]
-			this.editData.price_area_other=this.priceDataLst[3]
-		   	  this.editExpertInfo()  
-	  },
-	  explainDataFun(){
-			this.editData.service_area_text=this.explainData
-				  this.editExpertInfo()  
-	  },
-	  bodyDataFun(){
-		  	this.editData.summary=this.bodyData
-				  this.editExpertInfo()
-	  },
-	  sloganDataFun(){
-		    
-				this.editData.slogan=this.sloganData
-				  this.editExpertInfo()
-	  },
-	  CharacteristicsFun(){
-              console.log(this.Characteristics);
-			  this.editData.keywords=""
-			for (let index = 0; index < this.Characteristics.length; index++) {
-			this.editData.keywords+=this.Characteristics[index]+","
-				
-			}
-				  this.editExpertInfo()
-			console.log(this.editData.keywords,"123")
-	  },
+    navdetail() {
+      this.$router.push({
+        path: "/edit/detail",
+        query: {
+          id: this.id,
+        },
+      });
+    },
+    navdetailLst() {
+      this.$router.push({
+        path: "/edit/list",
+        query: {
+          id: this.id,
+        },
+      });
+    },
+    priceDataLstFun() {
+      this.editData.service_area_main = "";
+      for (let index = 0; index < this.addRess.length; index++) {
+        if (this.addRess[index].code) {
+          this.editData.service_area_main += this.addRess[index].code + ",";
+        }
+      }
+    
+   console.log(  this.editData.service_area_main )
+      this.editData.price_area_a = this.priceDataLstARR[0];
+      this.editData.price_area_b = this.priceDataLstARR[1];
+      this.editData.price_area_c = this.priceDataLstARR[2];
+      this.editData.price_area_other = this.priceDataLstARR[3];
+      this.editExpertInfo();
+    },
+    explainDataFun() {
+      this.editData.service_area_text = this.explainData;
+      this.editExpertInfo();
+    },
+    bodyDataFun() {
+      this.editData.summary = this.bodyData;
+      this.editExpertInfo();
+    },
+    sloganDataFun() {
+      this.editData.slogan = this.sloganData;
+      this.editExpertInfo();
+    },
+    CharacteristicsFun() {
+      console.log(this.Characteristics);
+      this.editData.keywords = "";
+      for (let index = 0; index < this.Characteristics.length; index++) {
+        this.editData.keywords += this.Characteristics[index] + ",";
+      }
+      this.editExpertInfo();
+      console.log(this.editData.keywords, "123");
+    },
     ModifyData() {
       this.axios
         .post(this.HOME + "/api/expert/edit-expert-info")
@@ -553,15 +550,15 @@ export default {
           console.log(error);
         });
     },
-	 getPricerData() {
+    getPricerData() {
       let that = this;
       this.axios
         .post(this.HOME + "/api/expert/service-price-list", {
           pcode: 86,
         })
         .then(function (res) {
-          console.log(res.data.data,"------");
-         that.priceDataLst=res.data.data
+          console.log(res.data.data, "------");
+          that.priceDataLst = res.data.data;
         });
     },
     getAddrData() {
@@ -607,7 +604,7 @@ export default {
         .then(function (res) {
           that.editData.avatar = res.data.data.src;
           that.myAvatar = res.data.data.src;
-		  that.editExpertInfo()
+          that.editExpertInfo();
         })
         .catch(function (error) {
           console.log(error);
@@ -618,9 +615,9 @@ export default {
       this.isCity1 = !this.isCity1;
     },
     getCityValue1(index, item) {
-		console.log(item)
-		this.addRess[0].code=item.code
-			this.addRess[0].name=item.name
+      console.log(item);
+      this.addRess[0].code = item.code;
+      this.addRess[0].name = item.name;
       this.cityValue1 = item.title;
       this.cityIndex1 = index;
       this.isCity1 = false;
@@ -630,8 +627,8 @@ export default {
       this.isCity2 = !this.isCity2;
     },
     getCityValue2(index, item) {
-			this.addRess[1].code=item.code
-				this.addRess[1].name=item.name
+      this.addRess[1].code = item.code;
+      this.addRess[1].name = item.name;
       this.cityValue2 = item.title;
       this.cityIndex2 = index;
       this.isCity2 = false;
@@ -640,8 +637,8 @@ export default {
       this.isCity3 = !this.isCity3;
     },
     getCityValue3(index, item) {
-			this.addRess[2].code=item.code
-				this.addRess[2].name=item.name
+      this.addRess[2].code = item.code;
+      this.addRess[2].name = item.name;
       this.cityValue3 = item.title;
       this.cityIndex3 = index;
       this.isCity3 = false;
@@ -651,8 +648,8 @@ export default {
       this.isPrice1 = !this.isPrice1;
     },
     getPriceValue1(index, item) {
-		console.log(this.priceDataLst)
-            this.priceDataLst[0]=item
+      console.log(this.priceDataLst);
+      this.priceDataLstARR[0] = item;
       this.priceValue1 = item.title;
       this.priceIndex1 = index;
       this.isPrice1 = false;
@@ -661,7 +658,7 @@ export default {
       this.isPrice2 = !this.isPrice2;
     },
     getPriceValue2(index, item) {
-		    this.priceDataLst[1]=item
+      this.priceDataLstARR[1] = item;
       this.priceValue2 = item.title;
       this.priceIndex2 = index;
       this.isPrice2 = false;
@@ -670,7 +667,7 @@ export default {
       this.isPrice3 = !this.isPrice3;
     },
     getPriceValue3(index, item) {
-		   this.priceDataLst[2]=item
+      this.priceDataLstARR[2] = item;
       this.priceValue3 = item.title;
       this.priceIndex3 = index;
       this.isPrice3 = false;
@@ -679,8 +676,8 @@ export default {
       this.isPrice4 = !this.isPrice4;
     },
     getPriceValue4(index, item) {
-		  this.priceDataLst[3]=item
-		  console.log( this.priceDataLst)
+      this.priceDataLstARR[3] = item;
+      console.log(this.priceDataLst);
       this.priceValue4 = item.title;
       this.priceIndex4 = index;
       this.isPrice4 = false;
@@ -694,25 +691,23 @@ export default {
         .then(function (res) {
           console.log(res.data.data.expert);
           let newArray = res.data.data.expert;
-                that.id=newArray.id
+          that.id = newArray.id;
 
-that.editData= {
-        avatar: newArray.avatar,
-        keywords: newArray.keywords,
-        slogan: newArray.slogan,
-        summary: newArray.summary,
-        service_area_text: newArray.service_area_text,
-        service_area_main: newArray.service_area_main,
-        tel:newArray.tel ,
-        ding_code:newArray.ding_code,
-        price_area_a:newArray.price_area_a,
-        price_area_b:newArray.price_area_b,
-        price_area_c:newArray.price_area_c,
-        price_area_other:newArray.price_area_other,
-      },
-console.log(that.editData)
-
-          that.handImg = newArray.avatar;
+          (that.editData = {
+            avatar: newArray.avatar,
+            keywords: newArray.keywords,
+            slogan: newArray.slogan,
+            summary: newArray.summary,
+            service_area_text: newArray.service_area_text,
+            service_area_main: newArray.service_area_main,
+            tel: newArray.tel,
+            ding_code: newArray.ding_code,
+            price_area_a: newArray.price_area_a,
+            price_area_b: newArray.price_area_b,
+            price_area_c: newArray.price_area_c,
+            price_area_other: newArray.price_area_other,
+          }),
+            (that.handImg = newArray.avatar);
           that.name = newArray.name;
           that.tags_text = newArray.tags_text;
           that.sloganData = newArray.slogan;
@@ -720,9 +715,14 @@ console.log(that.editData)
           that.explainData = newArray.service_area_text;
           that.Characteristics = res.data.data.expert.keywords.split(",");
           that.addressData = res.data.data.expert.service_area_main.split(",");
-
-          that.addRess = res.data.data.expert.service_area_main_list;
        
+
+          that.priceDataLstARR[0]=newArray.price_area_a,
+          that.priceDataLstARR[1]=newArray.price_area_b,
+          that.priceDataLstARR[2]=newArray.price_area_c,
+                  that.priceDataLstARR[3]=newArray.price_area_other,
+          that.addRess = res.data.data.expert.service_area_main_list;
+
           if (that.addRess.length < 3) {
             for (let index = 0; index < 3; index++) {
               that.addRess.push({
@@ -731,7 +731,7 @@ console.log(that.editData)
               });
             }
           }
-		     console.log(that.addRess);
+          console.log(that.addRess);
         });
     },
 
@@ -739,20 +739,19 @@ console.log(that.editData)
     goPage(path) {
       this.$router.push(path);
     },
- 
 
-	editExpertInfo(){
-		let that=this
+    editExpertInfo() {
+      let that = this;
       this.axios
-        .post(this.HOME + "/api/expert/edit-expert-info", this.editData )
+        .post(this.HOME + "/api/expert/edit-expert-info", this.editData)
         .then(function (res) {
-    console.log(res)
-	that.checkExperInfo()
+          console.log(res);
+          that.checkExperInfo();
         })
         .catch(function (error) {
           console.log(error);
         });
-	},
+    },
     // 滚动改变样式
     eventScrollTop() {
       let scrollTop =
diff --git a/src/views/consultant/list.vue b/src/views/consultant/list.vue
index b4dc58d..2fe740f 100644
--- a/src/views/consultant/list.vue
+++ b/src/views/consultant/list.vue
@@ -1,5 +1,4 @@
 <template>
-<<<<<<< HEAD
   <div class="content my-content">
     <!-- 头部 -->
     <div :class="{ header: true, 'scroll white': isScrollTop, white: true }">
@@ -7,42 +6,6 @@
         <img src="../../assets/images/home/expert/back.png" alt="" />
       </div>
       <div class="header-title">列表预览</div>
-=======
-    <div class="content">
-		<!-- 头部 -->
-		<div :class="{'header':true,'scroll white':isScrollTop,'white':true}">
-			<div class="back" @click="$router.go(-1)"><img src="../../assets/images/home/expert/back.png" alt=""></div>
-			<div class="header-title">列表预览</div>
-		</div>
-		<!-- 咨询师列表 -->
-		<div class="expert-list-all section">
-			<ul class="expert-list">
-				<li v-for="(item,index) in expertData" :key="index">
-					<div class="expert-list-con" @click="goPage('/expert/detail')">
-						<div class="expert-list-img"><img src="../../assets/images/home/index/expert.png" alt=""></div>
-						<div class="expert-list-txt">
-							<div class="title">
-								<h2>{{item.name}}</h2>
-								<span v-if="item.title">{{item.title}}</span>
-							</div>
-							<div class="integral">
-								<span>公益积分：{{item.integral}}</span>
-								<span>好评度：{{item.score}}</span>
-							</div>
-							<div class="honor">
-								<span v-for="(itemk,indexk) in item.honor" :key="indexk">{{itemk.title}}</span>
-							</div>
-							<div class="slogan">{{item.slogan}}</div>
-						</div>
-					</div>
-					<div class="expert-list-btns">
-						<div :class="{'btn':true}">向TA提问</div>
-						<div class="btn">查看详情</div>
-					</div>
-				</li>
-			</ul>
-		</div>
->>>>>>> 31ac1df69ae7462dac9a9171cb8e6856291e7c2a
     </div>
     <!-- 咨询师列表 -->
     <div class="expert-list-all section">
@@ -245,15 +208,9 @@ userData:{},
 </script>
 
 <style scoped>
-<<<<<<< HEAD
 .expert-list>li{
 }
 .my-content{
 	padding-top: 1rem;
 }
-=======
-	.expert-list{
-		margin-top: 1.2rem;
-	}
->>>>>>> 31ac1df69ae7462dac9a9171cb8e6856291e7c2a
 </style>
\ No newline at end of file