新增0124

app.acss

@@ -129,3 +129,7 @@ radio+.point{
   top: 50%;
   transform: translate(-50%,-50%);
 }
+.on-click,
+.on-click:hover{
+  background-color: #bcbcbc !important;
+}

pages/examinee/expert/ask/ask.axml

@@ -34,8 +34,7 @@
             {{askList.im_group_link}}
           </view>
           <button class="ask-btns" type="primary" onTap="copyLink">点击复制此链接</button>
-          <text>
+          <text style="margin-top:40rpx">
-            专属群DingTalk链接
             （复制此链接，在浏览器地址栏粘贴打开咨询页面，点击“在线咨询”进入钉钉专属群）
           </text>
           <view class="ask-link">

pages/examinee/expert/detail/detail.acss

@@ -79,7 +79,8 @@
   bottom: 0;
   z-index: 99;
 }
-.detail-bottom>navigator{
+.detail-bottom>navigator,
+.detail-bottom>button{
   display: inline-block;
   width: auto;
   height: 76rpx;
@@ -90,5 +91,6 @@
   background-color: #3898EC;
   padding: 0 30rpx;
   color: #FFFFFF;
+  border: 0;
 }
 

pages/examinee/expert/detail/detail.axml

@@ -45,7 +45,12 @@
       </view>
     </view>
   </view>
-  <view class="detail-bottom">
+  <view class="detail-bottom" a:if="{{consult_amount == 0}}">
+    <button type="primary" class="on-click" onTap="noClick">
+      <navigator open-type="navigate">向TA提问</navigator>
+    </button>
+  </view>
+  <view class="detail-bottom" a:if="{{consult_amount == 1}}">
     <navigator open-type="navigate" url="/pages/examinee/expert/ask/ask?id={{expertDetail.id}}">向TA提问</navigator>
   </view>
 </view>

pages/examinee/expert/detail/detail.js

@@ -2,12 +2,31 @@ Page({
   data: {
     title: '',
     id:1,
-    expertDetail: []
+    expertDetail: [],
+    consult_amount: ''
   },
   onLoad(options) {
     this.data.id=options.id;
     this.getExpertDetail();
   },
+  getConsultAmount(){
+    dd.getStorage({
+      key: 'consult_amount',
+      success: (res)=> {
+        // dd.alert({content: '获取成功：' + res.data.authCode});
+        this.data.consult_amount = res.data.consult_amount;
+        console.log(this.data.consult_amount,123)
+      },
+      fail: (res)=>{
+        dd.alert({content: res.errorMessage});
+      }
+    })
+  },
+  noClick(){
+    dd.alert({
+      content: "您还未领取咨询机会哟！"
+    });
+  },
   getExpertDetail(){
     let params = {
       id: this.data.id
@@ -34,7 +53,7 @@ Page({
               im_group_link: list.im_group_link,
               im_group_qr: list.im_group_qr
             }
-            newarray = array;
+            newarray = `array`;
             this.setData({
               expertDetail:newarray
             })

pages/examinee/expert/expert.acss

@@ -101,13 +101,18 @@
   display: flex;
   justify-content: center;
 }
-.expert-bottom navigator{
+.expert-bottom navigator,
-  padding: 10rpx 20rpx;
+.expert-bottom button{
+  display: inline-block;
+  width: auto;
+  height: 64rpx;
+  padding: 0 20rpx;
   border-radius: 12rpx;
   background-color: #2e9dff;
   margin: 0 20rpx;
   font-size: 28rpx;
-  line-height: 44rpx;
+  line-height: 64rpx;
+  border: 0;
   color: #FFFFFF;
 }
 .expert-more{

pages/examinee/expert/expert.axml

@@ -32,7 +32,11 @@
         <view class="expert-synopsis">
           <view class="text">{{item.slogan}}</view>
         </view>
-        <view class="expert-bottom">
+        <view class="expert-bottom" a:if="{{consult_amount == 0}}">
+          <button type="primary" class="on-click" onTap="noClick">向TA提问</button>
+          <navigator open-type="navigate" url="/pages/examinee/expert/detail/detail?id={{item.id}}">查看详情</navigator>
+        </view>
+        <view class="expert-bottom" a:if="{{consult_amount == 1}}">
           <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>

pages/examinee/expert/expert.js

@@ -3,15 +3,37 @@ Component({
   data: {
     page: 1,
     size: 10,
-    expertList:[]
+    expertList:[],
+    consult_amount: ''
   },
   props: {},
   didMount() {
+    this.getConsultAmount();
     this.getExpertList();
+    this.getExamineeInfo();
+    
   },
   didUpdate() {},
   didUnmount() {},
   methods: {
+    getConsultAmount(){
+      dd.getStorage({
+        key: 'consult_amount',
+        success: (res)=> {
+          // dd.alert({content: '获取成功：' + res.data.authCode});
+          this.data.consult_amount = res.data.consult_amount;
+          console.log(this.data.consult_amount,123)
+        },
+        fail: (res)=>{
+          dd.alert({content: res.errorMessage});
+        }
+      })
+    },
+    noClick(){
+      dd.alert({
+        content: "您还未领取咨询机会哟！"
+      });
+    },
     getExpertList(){
       let params = {
         page: this.data.page,

pages/examinee/information/revise/revise.axml

@@ -6,7 +6,7 @@
           姓名<text>*</text>
         </view>
         <view class="revise-box">
-          <input class="revise-input" placeholder="" />
+          <input class="revise-input" onInput="bindStudentName" placeholder=""/>
         </view>
       </view>
       <view class="revise-item">
@@ -14,7 +14,7 @@
           电话<text>*</text>
         </view>
         <view class="revise-box">
-          <input class="revise-input" placeholder="" />
+          <input class="revise-input" onInput="bindMobile" placeholder=""/>
         </view>
       </view>
       <view class="revise-item">
@@ -133,6 +133,6 @@
         </view>
       </view>
     </view>
-    <button class="revise-btn" type="primary">确认</button>
+    <button class="revise-btn" type="primary" onTap="getStudentInfo">确认</button>
   </view>
 </view>

pages/examinee/information/revise/revise.js

@@ -1,18 +1,122 @@
 Page({
   data: {
-    addrArray: ['北京', '上海', '广州'],
+    // 地区
+    addrArray: [],
+    addrObj: [],
     addrIndex: 0,
+    // 学科
+    subjectArray: [],
+    subjectObj: [],
+    subjectIndex: 0,
+    // 毕业时间
     yearArray: ['2022', '2021', '2020','2019'],
     yearIndex: 0,
-    sexArray: ['男', '女'],
+    sexArray: ['未知','男', '女'],
-    sexIndex: 0
+    sexIndex: 0,
+    mobile:	'',//电话
+    studentName:	'',//姓名
+    student_gender:	'',//性别
+    student_native: '', //考籍（省级）编号
+    student_native_str:	'',//考籍（省级）名称
+    student_subject: '',//选科组合（选科ID，多个用英文逗号分割）
+    student_exam_year: '',//高考年份
+    achievement_arts: '',//艺考成绩，-1表示未考（用户留空时默认传值为-1）
+    achievement_PE:'',//体考成绩，-1表示未考（用户留空时默认传值为-1）
+    achievement_expect:'',//预估或模考成绩
+    province_ranking: '',//预估/省内排名
+    achievement_high: '',//高考成绩，-1表示未考（用户留空时默认传值为-1）
+    studentInfo: []
   },
   onLoad() {
+    this.getAddrArray();
+    this.getSubjectArray();
     dd.setNavigationBar({
       title: '完善考生信息',
       backgroundColor: '#FFFFFF',
     });
   },
+  bindStudentName(e) {
+      this.data.studentName = e.detail.value
+  },
+  bindMobile(e) {
+      this.data.mobile = e.detail.value
+  },
+  // 获取地区
+  getAddrArray(){
+    let params = {
+      pcode: 86
+    };
+    let token = '';
+    dd.getStorage({
+      key: 'token',
+      success: (res)=> {
+        // dd.alert({content: '获取成功：' + res.data.authCode});
+        token = res.data.token;
+        dd.utils.$http('/api/area/index','GET',params,token).then(
+          (data) => {
+            let list = data.data.data;
+            let newArray = [];
+            list.forEach(item=>{
+              let obj = {
+                code: item.code,
+                name: item.name
+              }
+              newArray.push(obj.name);
+              this.data.addrObj.push(obj);
+            })
+            this.setData({
+              addrArray: newArray
+            })
+          },
+          (err) => { 
+            console.log('错误:'+err);
+          }
+        );
+      },
+      fail: (res)=>{
+        dd.alert({content: res.errorMessage});
+      }
+    });
+  },
+  // 获取选科
+  getSubjectArray(){
+    let params = {
+      type: 0
+    };
+    let token = '';
+    dd.getStorage({
+      key: 'token',
+      success: (res)=> {
+        // dd.alert({content: '获取成功：' + res.data.authCode});
+        token = res.data.token;
+        dd.utils.$http('/api/dictionary/subjects','GET',params,token).then(
+          (data) => {
+            console.log(data,22)
+            // let list = data.data.data;
+            // let newArray = [];
+            // list.forEach(item=>{
+            //   let obj = {
+            //     code: item.code,
+            //     name: item.name
+            //   }
+            //   newArray.push(obj.name);
+            //   this.data.addrObj.push(obj);
+            // })
+            // this.setData({
+            //   subjectArrayy: newArray
+            // })
+          },
+          (err) => { 
+            console.log('错误:'+err);
+          }
+        );
+      },
+      fail: (res)=>{
+        dd.alert({content: res.errorMessage});
+      }
+    });
+  },
+
   bindAddrChange(e) {
     // console.log('picker发送选择改变，携带值为', e.detail.value);
     this.setData({
@@ -30,5 +134,52 @@ Page({
     this.setData({
       sexIndex: e.detail.value,
     });
+  },
+
+  // 完善考生信息
+  getStudentInfo(){
+    let params = {
+      mobile:	this.data.mobile,//电话
+      student_name:	this.data.studentName,//姓名
+      student_gender:	this.data.sexIndex,//性别
+      student_native: this.data.addrObj[this.data.addrIndex].code, //考籍（省级）编号
+      student_native_str:	this.data.addrObj[this.data.addrIndex].name,//考籍（省级）名称
+      student_subject: '',//选科组合（选科ID，多个用英文逗号分割）
+      student_exam_year: '',//高考年份
+      achievement_arts: '',//艺考成绩，-1表示未考（用户留空时默认传值为-1）
+      achievement_PE:'',//体考成绩，-1表示未考（用户留空时默认传值为-1）
+      achievement_expect:'',//预估或模考成绩
+      province_ranking: '',//预估/省内排名
+      achievement_high: '',//高考成绩，-1表示未考（用户留空时默认传值为-1）
+    };
+    console.log(params,2255)
+    let token = '';
+    dd.getStorage({
+      key: 'token',
+      success: (res)=> {
+        // dd.alert({content: '获取成功：' + res.data.authCode});
+        token = res.data.token;
+        dd.utils.$http('/api/user/edit-student-info','POST',params,token).then(
+          (data) => {
+            let list = data.data.data;
+            console.log(list,999);
+            let newArray = [];
+            let array = {
+                
+              }
+            newArray = array;
+            this.setData({
+              studentInfo: newArray
+            })
+          },
+          (err) => { 
+            console.log('错误:'+err);
+          }
+        );
+      },
+      fail: (res)=>{
+        dd.alert({content: res.errorMessage});
+      }
+    });
   }
 });

pages/index/index.acss

@@ -181,13 +181,18 @@
   display: flex;
   justify-content: center;
 }
-.expert-bottom navigator{
+.expert-bottom navigator,
-  padding: 10rpx 20rpx;
+.expert-bottom button{
+  display: inline-block;
+  width: auto;
+  height: 64rpx;
+  padding: 0 20rpx;
   border-radius: 12rpx;
   background-color: #2e9dff;
   margin: 0 20rpx;
   font-size: 28rpx;
-  line-height: 44rpx;
+  line-height: 64rpx;
+  border: 0;
   color: #FFFFFF;
 }
 .expert-more{

pages/index/index.axml

@@ -2,7 +2,7 @@
   <view class="banner">
     <image mode="scaleToFill" src="/static/banner.png" />
   </view>
-  <view class="perfect">
+  <view class="perfect" a:if="{{consult_amount == 0}}">
     <text>完善考生信息，马上领取公益咨询机会！</text>
     <navigator open-type="navigate" url="/pages/examinee/information/revise/revise">
       <text>
@@ -11,6 +11,10 @@
       </text>
     </navigator>
   </view>
+  <view class="ask" a:if="{{consult_amount == 1}}">
+    <text>您已领取公益咨询机会！</text>
+    <navigator open-type="navigate" url="/pages/examinee/expert/ask/ask?id=1">马上提问</navigator>
+  </view>
   <view class="content">
     <view class="expert">
       <view class="expert-first">
@@ -27,7 +31,10 @@
           <view class="first-abstract">
             <text>面向学校提供高考政策、学生发展等的公益讲座及科研课题合作</text>
           </view>
-          <button class="first-btn" type="primary">
+          <button class="first-btn on-click" type="primary" onTap="noClick" a:if="{{consult_amount == 0}}">
+            <navigator open-type="navigate">联系</navigator>
+          </button>
+          <button class="first-btn" type="primary" a:if="{{consult_amount == 1}}">
             <navigator open-type="navigate" url="/pages/examinee/information/revise/revise">联系</navigator>
           </button>
         </view>
@@ -56,7 +63,11 @@
         <view class="expert-synopsis">
           <view class="text">{{item.slogan}}</view>
         </view>
-        <view class="expert-bottom">
+        <view class="expert-bottom" a:if="{{consult_amount == 0}}">
+          <button type="primary" class="on-click" onTap="noClick">向TA提问</button>
+          <navigator open-type="navigate" url="/pages/examinee/expert/detail/detail?id={{item.id}}">查看详情</navigator>
+        </view>
+        <view class="expert-bottom" a:if="{{consult_amount == 1}}">
           <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>

pages/index/index.js

@@ -2,7 +2,8 @@ Page({
   data: {
     page: 1,
     size: 4,
-    expertList:[]
+    expertList:[],
+    consult_amount: ''
   },
   onLoad() {
     dd.setNavigationBar({
@@ -12,48 +13,75 @@ Page({
     this.getExpertList();
   },
   getExpertList(){
-      let params = {
+    let params = {
-        page: this.data.page,
+      page: this.data.page,
-        size: this.data.size
+      size: this.data.size
-      };
+    };
-      let token = '';
+    let token = '';
-      dd.getStorage({
+    dd.getStorage({
-        key: 'token',
+      key: 'token',
-        success: (res)=> {
+      success: (res)=> {
-          // dd.alert({content: '获取成功：' + res.data.authCode});
+        // dd.alert({content: '获取成功：' + res.data.authCode});
-          token = res.data.token;
+        token = res.data.token;
-          dd.utils.$http('/api/consumer/expert-list','GET',params,token).then(
+        dd.utils.$http('/api/consumer/expert-list','GET',params,token).then(
-            (data) => {
+          (data) => {
-              let list = data.data.data.list;
+            let list = data.data.data.list;
-              // console.log(list,999);
+            // console.log(list,999);
-              let newArray = [];
+            let newArray = [];
-              list.forEach(item=>{
+            list.forEach(item=>{
-                let obj = {
+              let obj = {
-                  id: item.id,
+                id: item.id,
-                  avatar: item.avatar,
+                avatar: item.avatar,
-                  name: item.name,
+                name: item.name,
-                  tags_text: item.tags_text,
+                tags_text: item.tags_text,
-                  slogan: item.slogan,
+                slogan: item.slogan,
-                  keywords_list: item.keywords_list,
+                keywords_list: item.keywords_list,
-                  score: item.score,
+                score: item.score,
-                  comment_score: item.comment_score,
+                comment_score: item.comment_score,
-                  im_group_link: item.im_group_link,
+                im_group_link: item.im_group_link,
-                  im_group_qr: item.im_group_qr
+                im_group_qr: item.im_group_qr
-                }
+              }
-                newArray.push(obj);
+              newArray.push(obj);
-                this.setData({
+              this.setData({
-                  expertList: newArray
+                expertList: newArray
-                })
               })
-            },
+            })
-            (err) => { 
+          },
-              console.log('错误:'+err);
+          (err) => { 
-            }
+            console.log('错误:'+err);
-          );
+          }
-        },
+        );
-        fail: (res)=>{
+        // 获取用户信息
-          dd.alert({content: res.errorMessage});
+        dd.utils.$http('/api/user/center-info','GET','',token).then(
-        }
+          (data) => {
-      });
+            let newNumber = '';
-    }
+            newNumber = data.data.data.consult_amount;
+            this.setData({
+                consult_amount: newNumber
+              })
+            dd.setStorage({
+              key: 'consult_amount',
+              data: {
+                consult_amount: data.data.data.consult_amount
+              },
+              success: (res)=> {
+                // dd.alert({content: '写入成功'});
+              }
+            });
+          },
+          (err) => { 
+            console.log('错误:'+err);
+          }
+        );
+      },
+      fail: (res)=>{
+        dd.alert({content: res.errorMessage});
+      }
+    });
+  },
+  noClick(){
+    dd.alert({
+      content: "您还未领取咨询机会哟！"
+    });
+  }
 });

pages/login/login.js

@@ -27,7 +27,7 @@ Page({
         }  
         dd.utils.$http('/api/user/login','POST',params).then(
           (data) => {
-            // console.log(data.data.data.token,123)
+            // console.log(data.data.data,123)
             // 缓存token
             dd.setStorage({
               key: 'token',