diff --git a/app.js b/app.js
index a31125e..524e3a5 100644
--- a/app.js
+++ b/app.js
@@ -1,6 +1,5 @@
 import utils from '/utils/utils'
 dd['utils'] = utils
-
 App({
   onLaunch(options) {
     // 第一次打开
diff --git a/components/otherBar/otherBar.acss b/components/otherBar/otherBar.acss
index 43eb05d..c5a0847 100644
--- a/components/otherBar/otherBar.acss
+++ b/components/otherBar/otherBar.acss
@@ -1,9 +1,10 @@
 .nav-tabs {
   width: 100%;
   height: 132rpx;
+  padding: 0 3%;
   display: flex;
   align-items: center;
-  justify-content: space-around;
+  justify-content: space-between;
   position: fixed;
   bottom: 0;
   background: #bec3c7;
diff --git a/components/otherBar/otherBar.axml b/components/otherBar/otherBar.axml
index 1f9e961..a5c860b 100644
--- a/components/otherBar/otherBar.axml
+++ b/components/otherBar/otherBar.axml
@@ -1,17 +1,17 @@
 <import src="/pages/counselor/personal/personal"/>
-<import src="/pages/counselor/free/free"/>
+<!-- <import src="/pages/counselor/free/free"/> -->
 <import src="/pages/examinee/supervisor/supervisor"/>
 <import src="/pages/counselor/account/account"/>
 <view hidden="{{currentTab == 0? false: true}}">
   <personal/>
 </view>
-<view hidden="{{currentTab == 1? false: true}}">
+<!-- <view hidden="{{currentTab == 1? false: true}}">
   <free/>
-</view>
-<view hidden="{{currentTab == 2? false: true}}">
+</view> -->
+<view hidden="{{currentTab == 1? false: true}}">
   <supervisor/>
 </view>
-<view hidden="{{currentTab == 3? false: true}}">
+<view hidden="{{currentTab == 2? false: true}}">
   <account/>
 </view>
 
diff --git a/components/otherBar/otherBar.js b/components/otherBar/otherBar.js
index a136043..f3db4ce 100644
--- a/components/otherBar/otherBar.js
+++ b/components/otherBar/otherBar.js
@@ -16,12 +16,12 @@ Page({
         // "selectedIconPath": "/image/icon_component.png",
         "text": "个人信息"
       },
-      {
-        // "iconPath": "/image/yingyong.png",
-        // "selectedIconPath": "/image/yingyong.png",
-        "text": "公益问答",
-        "news": "6"
-      },
+      // {
+      //   // "iconPath": "/image/yingyong.png",
+      //   // "selectedIconPath": "/image/yingyong.png",
+      //   "text": "公益问答",
+      //   "news": "6"
+      // },
       {
         // "iconPath": "/image/icon_biz.png",
         // "selectedIconPath": "/image/icon_biz.png",
@@ -59,13 +59,7 @@ Page({
         title: '公益问答',
         backgroundColor: '#FFFFFF',
       });
-    }
-    else if(this.data.currentTab === 2){
-      dd.setNavigationBar({
-        title: '收费咨询监理',
-        backgroundColor: '#FFFFFF',
-      });
-    }else if(this.data.currentTab === 3){
+    }else if(this.data.currentTab === 2){
       dd.setNavigationBar({
         title: '登录密码',
         backgroundColor: '#FFFFFF',
diff --git a/components/otherBar/otherBar.json b/components/otherBar/otherBar.json
index 118a3ce..bd2b7fb 100644
--- a/components/otherBar/otherBar.json
+++ b/components/otherBar/otherBar.json
@@ -2,7 +2,6 @@
   "component": true,
   "usingComponents": {
     "personal":"/pages/counselor/personal/personal",
-    "free":"/pages/counselor/free/free",
     "supervisor":"/pages/examinee/supervisor/supervisor",
     "account":"/pages/counselor/account/account"
   }
diff --git a/components/tabBar/tabBar.acss b/components/tabBar/tabBar.acss
index 1d74291..bf485bf 100644
--- a/components/tabBar/tabBar.acss
+++ b/components/tabBar/tabBar.acss
@@ -1,9 +1,10 @@
 .nav-tabs {
   width: 100%;
   height: 132rpx;
+  padding: 0 3%;
   display: flex;
   align-items: center;
-  justify-content: space-around;
+  justify-content: space-between;
   position: fixed;
   bottom: 0;
   background: #bec3c7;
diff --git a/components/tabBar/tabBar.axml b/components/tabBar/tabBar.axml
index 1eee596..bb04596 100644
--- a/components/tabBar/tabBar.axml
+++ b/components/tabBar/tabBar.axml
@@ -1,17 +1,17 @@
 <import src="/pages/examinee/expert/expert"/>
-<import src="/pages/examinee/service/service"/>
+<!-- <import src="/pages/examinee/service/service"/> -->
 <import src="/pages/examinee/supervisor/supervisor"/>
 <import src="/pages/examinee/information/information"/>
 <view hidden="{{currentTab == 0? false: true}}">
   <expert/>
 </view>
-<view hidden="{{currentTab == 1? false: true}}">
+<!-- <view hidden="{{currentTab == 1? false: true}}">
   <service/> 
-</view>
-<view hidden="{{currentTab == 2? false: true}}">
+</view> -->
+<view hidden="{{currentTab == 1? false: true}}">
   <supervisor/>
 </view>
-<view hidden="{{currentTab == 3? false: true}}">
+<view hidden="{{currentTab == 2? false: true}}">
   <information/>
 </view>
 
diff --git a/components/tabBar/tabBar.js b/components/tabBar/tabBar.js
index cd11d7c..1330752 100644
--- a/components/tabBar/tabBar.js
+++ b/components/tabBar/tabBar.js
@@ -17,11 +17,11 @@ Page({
         // "selectedIconPath": "/image/icon_component.png",
         "text": "专家列表"
       },
-      {
-        // "iconPath": "/image/yingyong.png",
-        // "selectedIconPath": "/image/yingyong.png",
-        "text": "免费咨询"
-      },
+      // {
+      //   // "iconPath": "/image/yingyong.png",
+      //   // "selectedIconPath": "/image/yingyong.png",
+      //   "text": "免费咨询"
+      // },
       {
         // "iconPath": "/image/icon_biz.png",
         // "selectedIconPath": "/image/icon_biz.png",
@@ -54,18 +54,13 @@ Page({
         title: '阿里云・有谱志愿咨询(公益)',
         backgroundColor: '#FFFFFF',
       });
-    }else if(this.data.currentTab === 1){
-      dd.setNavigationBar({
-        title: '免费咨询',
-        backgroundColor: '#FFFFFF',
-      });
     }
-    else if(this.data.currentTab === 2){
+    else if(this.data.currentTab === 1){
       dd.setNavigationBar({
         title: '咨询监理',
         backgroundColor: '#FFFFFF',
       });
-    }else if(this.data.currentTab === 3){
+    }else if(this.data.currentTab === 2){
       dd.setNavigationBar({
         title: '考生信息',
         backgroundColor: '#FFFFFF',
diff --git a/components/tabBar/tabBar.json b/components/tabBar/tabBar.json
index f0801ea..2ee8ca3 100644
--- a/components/tabBar/tabBar.json
+++ b/components/tabBar/tabBar.json
@@ -2,7 +2,6 @@
   "component": true,
   "usingComponents": {
     "expert":"/pages/examinee/expert/expert",
-    "service":"/pages/examinee/service/service",
     "supervisor":"/pages/examinee/supervisor/supervisor",
     "information":"/pages/examinee/information/information"
   }
diff --git a/pages/examinee/expert/ask/ask.acss b/pages/examinee/expert/ask/ask.acss
index 8d6a5bb..9b155c9 100644
--- a/pages/examinee/expert/ask/ask.acss
+++ b/pages/examinee/expert/ask/ask.acss
@@ -12,7 +12,7 @@
 .ask-explain{
   display: flex;
   justify-content: space-between;
-  /* align-items: center; */
+  align-items: center;
   background-color: #FFFFFF;
   padding: 20rpx 44rpx;
   overflow: hidden;
@@ -75,9 +75,9 @@
   margin: 30rpx auto 40rpx;
   width: 600rpx;
   min-height: 300rpx;
-  height: auto;
   padding: 10rpx;
   border: 2rpx solid #ccc;
+  word-break: break-all;
 }
 .ask-btns{
   display: block;
diff --git a/pages/examinee/expert/ask/ask.axml b/pages/examinee/expert/ask/ask.axml
index 4fb4039..3210e4f 100644
--- a/pages/examinee/expert/ask/ask.axml
+++ b/pages/examinee/expert/ask/ask.axml
@@ -3,7 +3,7 @@
     <view class="ask">
       <view class="ask-explain">
         <view class="explain-img">
-          <image mode="scaleToFill" src="/static/expert.jpg" />
+          <image mode="scaleToFill" src="http://aspiration.scdxtc.cn{{askList.avatar}}" />
         </view>
         <text>
           请使用以下两种方式加入钉钉专属服务群，我在您的专属服务群里回答您的问题！
@@ -21,19 +21,27 @@
         <view class="ask-list" a:if="{{isShow}}">
           <text>下载二维码并用钉钉扫一扫进入专属群</text>
           <view class="ask-ewm">
-            <image mode="scaleToFill" src="/static/ewm.png" />
+            <image mode="scaleToFill" src="http://aspiration.scdxtc.cn{{askList.im_group_qr}}" />
           </view>
           <button class="ask-btns" type="primary" onTap="downImg">点击下载二维码</button>
         </view>
         <view class="ask-list" a:if="{{!isShow}}">
           <text>
             专属群DingTalk链接
-            （复制此链接，在浏览器地址栏粘贴后打开钉钉，自动进入专属群）
+            （复制此链接，在钉钉会话窗口粘贴，点击进入专属群）
           </text>
           <view class="ask-link">
-            https://m.baidu.com
+            {{askList.im_group_link}}
           </view>
           <button class="ask-btns" type="primary" onTap="copyLink">点击复制此链接</button>
+          <text>
+            专属群DingTalk链接
+            （复制此链接，在浏览器地址栏粘贴打开咨询页面，点击“在线咨询”进入钉钉专属群）
+          </text>
+          <view class="ask-link">
+            {{askList.im_group_link}}
+          </view>
+          <button class="ask-btns" type="primary" onTap="copyLink2">点击复制此链接</button>
         </view>
       </view>
     </view>
diff --git a/pages/examinee/expert/ask/ask.js b/pages/examinee/expert/ask/ask.js
index 380a058..4c47dc4 100644
--- a/pages/examinee/expert/ask/ask.js
+++ b/pages/examinee/expert/ask/ask.js
@@ -1,12 +1,17 @@
 Page({
   data: {
-    isShow: true
+    id:'',
+    isShow: true,
+    askList: []
   },
-  onLoad() {
+  onLoad(options) {
+    this.data.id = options.id;
+    // console.log(options)
     dd.setNavigationBar({
       title: '向TA提问',
       backgroundColor: '#FFFFFF',
     });
+    this.getAsk()
   },
   isOpen(){
     this.setData({
@@ -18,9 +23,45 @@ Page({
         isShow: false
       })
   },
+  getAsk(){
+    let params = {
+      id: this.data.id
+    };
+    let token = '';
+    dd.getStorage({
+      key: 'token',
+      success: (res)=> {
+        // dd.alert({content: '获取成功：' + res.data.authCode});
+        token = res.data.token;
+        dd.utils.$http('/api/consumer/expert-info','GET',params,token).then(
+          (data) => {
+            let list = data.data.data;
+            let newarray = []
+            let array = {
+              im_group_link: list.im_group_link,
+              im_group_qr: list.im_group_qr,
+              avatar:list.avatar
+            }
+            newarray = array;
+            this.setData({
+              askList:newarray
+            })
+            // console.log(array,123);
+          },
+          (err) => { 
+            console.log('错误:'+err);
+          }
+        );
+      },
+      fail: (res)=>{
+        dd.alert({content: res.errorMessage});
+      }
+    });
+  },
+
   downImg(){
     dd.downloadFile({
-      url: 'http://img.alicdn.com/tfs/TB1x669SXXXXXbdaFXXXXXXXXXX-520-280.jpg',
+      url: 'http://aspiration.scdxtc.cn'+this.data.askList.im_group_qr,
       success({ filePath }) {
         dd.previewImage({
           urls: [filePath],
@@ -35,7 +76,7 @@ Page({
   },
   copyLink(){
     dd.setClipboard({
-      text: "www.baidu.com",   //复制内容
+      text: this.data.askList.im_group_link,   //复制内容
       success(res){
         dd.getClipboard({
           success: (res) => {
diff --git a/pages/examinee/expert/detail/detail.axml b/pages/examinee/expert/detail/detail.axml
index a0a700f..72cbd1f 100644
--- a/pages/examinee/expert/detail/detail.axml
+++ b/pages/examinee/expert/detail/detail.axml
@@ -2,8 +2,8 @@
   <view class="content">
     <view class="detail">
       <view class="detail-describe">
-        <view class="describe-img">
-          <image mode="scaleToFill" src="/static/expert.jpg" />
+        <view class="describe-img" hidden="{{expertDetail.avatar == ''}}">
+          <image mode="scaleToFill" src="{{expertDetail.avatar}}" />
         </view>
         <view class="describe-txt">
           <view>
@@ -14,62 +14,31 @@
       </view>
       <view class="detail-txt">
         <view>个人简介</view>
-        <text>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse varius enim in eros elementum tristique. Duis cursus, mi quis viverra ornare, eros dolor interdum nulla, ut commodo diam libero vitae erat. Aenean faucibus nibh et justo cursus id rutrum lorem imperdiet. Nunc ut sem vitae risus tristique posuere.</text>
-        <text>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse varius enim in eros elementum tristique. Duis cursus, mi quis viverra ornare, eros dolor interdum nulla, ut commodo diam libero vitae erat. Aenean faucibus nibh et justo cursus id rutrum lorem imperdiet. Nunc ut sem vitae risus tristique posuere.</text>
-      </view>
+        <text>{{expertDetail.summary}}</text>
+        </view>
       <view class="detail-region">
         <view>
           服务区域
         </view>
         <text>
-          全部省区
-          除内蒙古、西藏、江苏三省外
-          尤其擅长新高考省区的志愿填报
+          {{expertDetail.service_area_text}}
         </text>
       </view>
-      <view class="detail-case">
+      <view class="detail-case" hidden="{{expertDetail.mainCaseList == ''}}">
         <view class="case-title">
           咨询案例
         </view>
-        <view class="case-item">
+        <view class="case-item" a:for="{{expertDetail.mainCaseList}}" a:for-index="index" a:for-item="item">
           <view class="case-img">
-            <image mode="scaleToFill" src="/static/case01.jpg" />
+            <image mode="scaleToFill" src="http://aspiration.scdxtc.cn{{item.cover}}" />
           </view>
           <view class="case-txt">
             <text>
-              案例一：北京，2021，李X生，656分，位次10908，物化生；
-              录取结果：ut commodo diam libero vitae erat. Aenean faucibus nibh et justo cursus id rutrum lorem imperdiet. Nunc ut sem vitae risus tristique posuere.
-              专业定位：Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse varius enim in eros elementum tristique. Duis cursus, mi quis viverra ornare, eros dolor interdum nulla,
-              其它说明：
-              客户反馈：
-            </text>
-          </view>
-        </view>
-        <view class="case-item">
-          <view class="case-img">
-            <image mode="scaleToFill" src="/static/case01.jpg" />
-          </view>
-          <view class="case-txt">
-            <text>
-              案例一：北京，2021，李X生，656分，位次10908，物化生；
-              录取结果：ut commodo diam libero vitae erat. Aenean faucibus nibh et justo cursus id rutrum lorem imperdiet. Nunc ut sem vitae risus tristique posuere.
-              专业定位：Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse varius enim in eros elementum tristique. Duis cursus, mi quis viverra ornare, eros dolor interdum nulla,
-              其它说明：
-              客户反馈：
-            </text>
-          </view>
-        </view>
-        <view class="case-item">
-          <view class="case-img">
-            <image mode="scaleToFill" src="/static/case01.jpg" />
-          </view>
-          <view class="case-txt">
-            <text>
-              案例一：北京，2021，李X生，656分，位次10908，物化生；
-              录取结果：ut commodo diam libero vitae erat. Aenean faucibus nibh et justo cursus id rutrum lorem imperdiet. Nunc ut sem vitae risus tristique posuere.
-              专业定位：Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse varius enim in eros elementum tristique. Duis cursus, mi quis viverra ornare, eros dolor interdum nulla,
-              其它说明：
-              客户反馈：
+              案例{{index+1}}：{{item.title}}；
+              录取结果：{{item.result_remarks}}
+              专业定位：{{item.location_remarks}}
+              其它说明：{{item.other_remarks}}
+              客户反馈：{{item.account_remarks}}
             </text>
           </view>
         </view>
@@ -77,6 +46,6 @@
     </view>
   </view>
   <view class="detail-bottom">
-    <navigator open-type="navigate" url="/pages/examinee/expert/ask/ask">向TA提问</navigator>
+    <navigator open-type="navigate" url="/pages/examinee/expert/ask/ask?id={{expertDetail.id}}">向TA提问</navigator>
   </view>
 </view>
\ No newline at end of file
diff --git a/pages/examinee/expert/detail/detail.js b/pages/examinee/expert/detail/detail.js
index 0f56e2b..ab08a18 100644
--- a/pages/examinee/expert/detail/detail.js
+++ b/pages/examinee/expert/detail/detail.js
@@ -7,10 +7,6 @@ Page({
   onLoad(options) {
     this.data.id=options.id;
     this.getExpertDetail();
-    dd.setNavigationBar({
-      title: options.name+'-'+options.tags_text,
-      backgroundColor: '#FFFFFF',
-    });
   },
   getExpertDetail(){
     let params = {
@@ -27,17 +23,26 @@ Page({
             let list = data.data.data;
             let newarray = []
             let array = {
+              id: list.id,
               name: list.name,
+              avatar: list.avatar,
+              tags_text: list.tags_text,
               slogan: list.slogan,
               summary: list.summary,
               service_area_text: list.service_area_text,
-              mainCaseList: list.mainCaseList
+              mainCaseList: list.mainCaseList,
+              im_group_link: list.im_group_link,
+              im_group_qr: list.im_group_qr
             }
             newarray = array;
             this.setData({
               expertDetail:newarray
             })
-            console.log(array);
+            console.log(newarray,123);
+            dd.setNavigationBar({
+              title: array.name+'-'+array.tags_text,
+              backgroundColor: '#FFFFFF',
+            });
           },
           (err) => { 
             console.log('错误:'+err);
diff --git a/pages/examinee/expert/expert.axml b/pages/examinee/expert/expert.axml
index 1c4af65..7564ac0 100644
--- a/pages/examinee/expert/expert.axml
+++ b/pages/examinee/expert/expert.axml
@@ -5,7 +5,7 @@
   <view class="content">
     <view class="ask">
       <text>您已领取公益咨询机会！</text>
-      <navigator open-type="navigate" url="/pages/examinee/expert/ask/ask">马上提问</navigator>
+      <navigator open-type="navigate" url="/pages/examinee/expert/ask/ask?id=1">马上提问</navigator>
     </view>
     <view class="expert">
       <view class="expert-item" a:for="{{expertList}}" a:for-index="index" a:for-item="item">
@@ -33,9 +33,8 @@
           <view class="text">{{item.slogan}}</view>
         </view>
         <view class="expert-bottom">
-          <navigator open-type="navigate" url="/pages/examinee/expert/ask/ask">向TA提问</navigator>
-          <navigator open-type="navigate" url="/pages/examinee/expert/detail/detail?id={{item.id}}&name={{item.name}}&tags_text={{item.tags_text}}">查看详情</navigator>
-
+          <navigator open-type="navigate" url="/pages/examinee/expert/ask/ask?id={{item.id}}">向TA提问</navigator>
+          <navigator open-type="navigate" url="/pages/examinee/expert/detail/detail?id={{item.id}}">查看详情</navigator>
         </view>
       </view>
       <view class="expert-more">
diff --git a/pages/examinee/expert/expert.js b/pages/examinee/expert/expert.js
index 920281a..ce8b723 100644
--- a/pages/examinee/expert/expert.js
+++ b/pages/examinee/expert/expert.js
@@ -37,7 +37,9 @@ Component({
                   slogan: item.slogan,
                   keywords_list: item.keywords_list,
                   score: item.score,
-                  comment_score: item.comment_score
+                  comment_score: item.comment_score,
+                  im_group_link: item.im_group_link,
+                  im_group_qr: item.im_group_qr
                 }
                 newArray.push(obj);
                 this.setData({
diff --git a/pages/examinee/information/revise/revise.acss b/pages/examinee/information/revise/revise.acss
index 300e001..f4a3ee6 100644
--- a/pages/examinee/information/revise/revise.acss
+++ b/pages/examinee/information/revise/revise.acss
@@ -15,6 +15,10 @@
   line-height: 80rpx;
   font-weight: bold;
 }
+.revise-title>text{
+  color: #bf3a30;
+  margin-left: 6rpx;
+}
 .revise .row{
   display: flex;
   justify-content: space-between;
@@ -54,6 +58,9 @@
   line-height: 80rpx;
   overflow: hidden;
 }
+.revise-box2{
+  justify-content: flex-start;
+}
 .revise-box>label{
   width: 32%;
   display: flex;
diff --git a/pages/examinee/information/revise/revise.axml b/pages/examinee/information/revise/revise.axml
index 522695d..f5c359d 100644
--- a/pages/examinee/information/revise/revise.axml
+++ b/pages/examinee/information/revise/revise.axml
@@ -3,7 +3,15 @@
     <view class="revise">
       <view class="revise-item">
         <view class="revise-title">
-          姓名
+          姓名<text>*</text>
+        </view>
+        <view class="revise-box">
+          <input class="revise-input" placeholder="" />
+        </view>
+      </view>
+      <view class="revise-item">
+        <view class="revise-title">
+          电话<text>*</text>
         </view>
         <view class="revise-box">
           <input class="revise-input" placeholder="" />
@@ -92,7 +100,7 @@
           <view class="revise-title">
             是否提前批
           </view>
-          <view class="revise-box">
+          <view class="revise-box revise-box2">
             <label class="checkbox">
               <checkbox value="艺考生" checked=""/>
               <view class="point"></view>
diff --git a/pages/examinee/information/revise/revise.js b/pages/examinee/information/revise/revise.js
index 01f62d3..efb71b1 100644
--- a/pages/examinee/information/revise/revise.js
+++ b/pages/examinee/information/revise/revise.js
@@ -9,7 +9,7 @@ Page({
   },
   onLoad() {
     dd.setNavigationBar({
-      title: '完善考生信息领取免费咨询',
+      title: '完善考生信息',
       backgroundColor: '#FFFFFF',
     });
   },
diff --git a/pages/index/index.axml b/pages/index/index.axml
index dc2f138..89930d9 100644
--- a/pages/index/index.axml
+++ b/pages/index/index.axml
@@ -32,164 +32,33 @@
           </button>
         </view>
       </view>
-      <view class="expert-item">
+      <view class="expert-item" a:for="{{expertList}}" a:for-index="index" a:for-item="item">
         <view class="expert-top">
           <view class="expert-img">
-            <image mode="scaleToFill" src="/static/expert.jpg" />
+            <image mode="scaleToFill" src="{{item.avatar}}" />
           </view>
           <view class="expert-txt">
             <view class="expert-title">
-              <view class="text">赵晓冬</view>
-              <view class="text">专家咨询师</view>
+              <view class="text">{{item.name}}</view>
+              <view class="text">{{item.tags_text}}</view>
             </view>
             <view class="expert-score">
-              <view class="text">1666</view>
+              <view class="text">{{item.score}}</view>
               <view class="text">公益积分</view>
-              <view class="text">9.3</view>
+              <view class="text">{{item.comment_score}}</view>
               <view class="text">好评度</view>
             </view>
             <view class="expert-tags">
-              <view class="text">中科院心理所</view>
-              <view class="text">12年经验</view>
-              <view class="text">硕士</view>
-              <view class="text">熟悉新高考</view>
+              <view class="text" a:for="{{item.keywords_list}}" a:for-index="index" a:for-item="item">{{item}}</view>
             </view>
           </view>
         </view>
         <view class="expert-synopsis">
-          <view class="text">一所好的大学，是年轻人的家，是他们度过人生最好时光的地方！</view>
+          <view class="text">{{item.slogan}}</view>
         </view>
         <view class="expert-bottom">
-          <navigator open-type="navigate" url="/pages/examinee/expert/questions/questions">向TA提问</navigator>
-          <navigator open-type="navigate" url="/pages/examinee/expert/detail/detail">查看详情</navigator>
-        </view>
-      </view>
-      <view class="expert-item">
-        <view class="expert-top">
-          <view class="expert-img">
-            <image mode="scaleToFill" src="/static/expert.jpg" />
-          </view>
-          <view class="expert-txt">
-            <view class="expert-title">
-              <view class="text">赵晓冬</view>
-              <view class="text">专家咨询师</view>
-            </view>
-            <view class="expert-score">
-              <view class="text">1666</view>
-              <view class="text">公益积分</view>
-              <view class="text">9.3</view>
-              <view class="text">好评度</view>
-            </view>
-            <view class="expert-tags">
-              <view class="text">中科院心理所</view>
-              <view class="text">12年经验</view>
-              <view class="text">硕士</view>
-              <view class="text">熟悉新高考</view>
-            </view>
-          </view>
-        </view>
-        <view class="expert-synopsis">
-          <view class="text">一所好的大学，是年轻人的家，是他们度过人生最好时光的地方！</view>
-        </view>
-        <view class="expert-bottom">
-          <navigator open-type="navigate" url="/pages/examinee/expert/questions/questions">向TA提问</navigator>
-          <navigator open-type="navigate" url="/pages/examinee/expert/detail/detail">查看详情</navigator>
-        </view>
-      </view>
-      <view class="expert-item">
-        <view class="expert-top">
-          <view class="expert-img">
-            <image mode="scaleToFill" src="/static/expert.jpg" />
-          </view>
-          <view class="expert-txt">
-            <view class="expert-title">
-              <view class="text">赵晓冬</view>
-              <view class="text">专家咨询师</view>
-            </view>
-            <view class="expert-score">
-              <view class="text">1666</view>
-              <view class="text">公益积分</view>
-              <view class="text">9.3</view>
-              <view class="text">好评度</view>
-            </view>
-            <view class="expert-tags">
-              <view class="text">中科院心理所</view>
-              <view class="text">12年经验</view>
-              <view class="text">硕士</view>
-              <view class="text">熟悉新高考</view>
-            </view>
-          </view>
-        </view>
-        <view class="expert-synopsis">
-          <view class="text">一所好的大学，是年轻人的家，是他们度过人生最好时光的地方！</view>
-        </view>
-        <view class="expert-bottom">
-          <navigator open-type="navigate" url="/pages/examinee/expert/questions/questions">向TA提问</navigator>
-          <navigator open-type="navigate" url="/pages/examinee/expert/detail/detail">查看详情</navigator>
-        </view>
-      </view>
-      <view class="expert-item">
-        <view class="expert-top">
-          <view class="expert-img">
-            <image mode="scaleToFill" src="/static/expert.jpg" />
-          </view>
-          <view class="expert-txt">
-            <view class="expert-title">
-              <view class="text">赵晓冬</view>
-              <view class="text">专家咨询师</view>
-            </view>
-            <view class="expert-score">
-              <view class="text">1666</view>
-              <view class="text">公益积分</view>
-              <view class="text">9.3</view>
-              <view class="text">好评度</view>
-            </view>
-            <view class="expert-tags">
-              <view class="text">中科院心理所</view>
-              <view class="text">12年经验</view>
-              <view class="text">硕士</view>
-              <view class="text">熟悉新高考</view>
-            </view>
-          </view>
-        </view>
-        <view class="expert-synopsis">
-          <view class="text">一所好的大学，是年轻人的家，是他们度过人生最好时光的地方！</view>
-        </view>
-        <view class="expert-bottom">
-          <navigator open-type="navigate" url="/pages/examinee/expert/questions/questions">向TA提问</navigator>
-          <navigator open-type="navigate" url="/pages/examinee/expert/detail/detail">查看详情</navigator>
-        </view>
-      </view>
-      <view class="expert-item">
-        <view class="expert-top">
-          <view class="expert-img">
-            <image mode="scaleToFill" src="/static/expert.jpg" />
-          </view>
-          <view class="expert-txt">
-            <view class="expert-title">
-              <view class="text">赵晓冬</view>
-              <view class="text">专家咨询师</view>
-            </view>
-            <view class="expert-score">
-              <view class="text">1666</view>
-              <view class="text">公益积分</view>
-              <view class="text">9.3</view>
-              <view class="text">好评度</view>
-            </view>
-            <view class="expert-tags">
-              <view class="text">中科院心理所</view>
-              <view class="text">12年经验</view>
-              <view class="text">硕士</view>
-              <view class="text">熟悉新高考</view>
-            </view>
-          </view>
-        </view>
-        <view class="expert-synopsis">
-          <view class="text">一所好的大学，是年轻人的家，是他们度过人生最好时光的地方！</view>
-        </view>
-        <view class="expert-bottom">
-          <navigator open-type="navigate" url="/pages/examinee/expert/questions/questions">向TA提问</navigator>
-          <navigator open-type="navigate" url="/pages/examinee/expert/detail/detail">查看详情</navigator>
+          <navigator open-type="navigate" url="/pages/examinee/expert/ask/ask?id={{item.id}}">向TA提问</navigator>
+          <navigator open-type="navigate" url="/pages/examinee/expert/detail/detail?id={{item.id}}">查看详情</navigator>
         </view>
       </view>
       <view class="expert-more">
diff --git a/pages/index/index.js b/pages/index/index.js
index efe77bb..6c65c5c 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -1,9 +1,59 @@
 Page({
-  data: {},
+  data: {
+    page: 1,
+    size: 4,
+    expertList:[]
+  },
   onLoad() {
     dd.setNavigationBar({
       title: '阿里云・有谱志愿咨询(公益)',
       backgroundColor: '#FFFFFF',
     });
+    this.getExpertList();
   },
+  getExpertList(){
+      let params = {
+        page: this.data.page,
+        size: this.data.size
+      };
+      let token = '';
+      dd.getStorage({
+        key: 'token',
+        success: (res)=> {
+          // dd.alert({content: '获取成功：' + res.data.authCode});
+          token = res.data.token;
+          dd.utils.$http('/api/consumer/expert-list','GET',params,token).then(
+            (data) => {
+              let list = data.data.data.list;
+              // console.log(list,999);
+              let newArray = [];
+              list.forEach(item=>{
+                let obj = {
+                  id: item.id,
+                  avatar: item.avatar,
+                  name: item.name,
+                  tags_text: item.tags_text,
+                  slogan: item.slogan,
+                  keywords_list: item.keywords_list,
+                  score: item.score,
+                  comment_score: item.comment_score,
+                  im_group_link: item.im_group_link,
+                  im_group_qr: item.im_group_qr
+                }
+                newArray.push(obj);
+                this.setData({
+                  expertList: newArray
+                })
+              })
+            },
+            (err) => { 
+              console.log('错误:'+err);
+            }
+          );
+        },
+        fail: (res)=>{
+          dd.alert({content: res.errorMessage});
+        }
+      });
+    }
 });
\ No newline at end of file
diff --git a/pages/login/login.js b/pages/login/login.js
index 5a42643..2b56bb0 100644
--- a/pages/login/login.js
+++ b/pages/login/login.js
@@ -37,12 +37,12 @@ Page({
               success: (res)=> {
                 // dd.alert({content: '写入成功'});
                 dd.redirectTo({ 
-                  url: '/components/tabBar/tabBar'
+                  url: '/pages/index/index'
                 })
               }
             });
           },
-          (err) => { 
+          (err) => {
             console.log('错误:'+err)
           }
         );