接口调整，选择用户模块完成

api/api.js

@@ -37,9 +37,10 @@ const url = {
 
   saveAgent: "/f/api/agent/saveAgent", //保存经纪人
   myFavoriteList: "/f/api/favoritePosition/myFavorite",
-  myInterViewList:"/f/api/interView/myInterView",
+  myInterViewList: "/f/api/interView/myInterView",
   myInterViewDetail: "/f/api/interView/interViewDetail",
-  saveFavoritePosition:"/f/api/favoritePosition/saveFavorite",//post，收藏岗位
+  saveFavoritePosition: "/f/api/favoritePosition/saveFavorite", //post，收藏岗位
+  selectInfo: "/f/api/login/selectInfo", //用户信息重复，选择用户
 
 
   /** +++++++++++++++++++++++++++  废弃接口 ++++++++++++++++++++++++++++++++++++++ */

app.json

@@ -55,8 +55,8 @@
     "pages/set/index",
     "pages/address/index",
     "pages/bind-phone/index",
-    "pages/select-info/index"
-   
+    "pages/select-info/index",
+    "pages/jinali-info/index"
   ],
   "window": {
     "backgroundTextStyle": "light",

pages/bind-phone/index.js

@@ -102,6 +102,7 @@ Page({
       wx.setStorageSync("user_id", data.data.hpUser.id);
       wx.setStorageSync("member_id", data.data.hpMember.id);
       wx.setStorageSync("user_token", data.data.hpUser.userToken);
+      wx.setStorageSync("phone", data.data.hpUser.phone);
       showToast("登录成功");
       setTimeout(function() {
         wx.navigateBack();

pages/jinali-info/index.js

@@ -0,0 +1,86 @@
+import {
+  getResume
+} from '../../services/index.js'
+import {
+  imgServerUrl
+} from '../../config/config.js'
+import {
+  showToast
+} from '../../utils/tips.js'
+import {
+  formatTime
+} from '../../utils/util.js'
+const app = getApp();
+
+Page({
+  data: {
+    imgServerUrl: imgServerUrl,
+    hpUserResumeId: '', //是否有简历
+    eduList: ["请选择", "小学", "中学", "高中", "大专", "本科", "研究生", "博士", "博士后"],
+    eduName: '', //学历
+    expYear: "", //工作几年
+    hpUserResumeId: '', //用户简历表id
+    expectationPosition: ["普工", "客服", "销售", "服务员", "物流仓储", "司机", "才艺技能", "文员助理", "快递配送", "促销导购", "展会演出", "家教培训", "模特", "贸易采购", "厨师", "编辑", "线上推广", "设计", "技工", "保洁", "其它"],
+    salaryList: [{
+        "expectationSalary": -1,
+        "hightNum": '不限'
+      },
+      {
+        "expectationSalary": 0,
+        "hightNum": '1000~2000'
+      },
+      {
+        "expectationSalary": 1,
+        "hightNum": '2001~3000'
+      },
+      {
+        "expectationSalary": 2,
+        "hightNum": '3001~4000'
+      },
+      {
+        "expectationSalary": 3,
+        "hightNum": '4001~5000'
+      },
+      {
+        "expectationSalary": 4,
+        "hightNum": '5001~6000'
+      },
+      {
+        "expectationSalary": 5,
+        "hightNum": '6001~7000'
+      },
+      {
+        "expectationSalary": 6,
+        "hightNum": '7001~8000'
+      },
+      {
+        "expectationSalary": 7,
+        "hightNum": '8001~9000'
+      },
+      {
+        "expectationSalary": 8,
+        "hightNum": '9001~10000'
+      }, {
+        "expectationSalary": 9,
+        "hightNum": '10000以上'
+      }
+    ],
+  },
+  onLoad: function(options) {
+    var userResume = wx.getStorageSync('userResume');
+    if (userResume.expectationSalary) {
+      var salaryList = this.data.salaryList;
+      for (var i = 0; i < salaryList.length; i++) {
+        if (salaryList[i].expectationSalary == userResume.expectationSalary) {
+          userResume.expectationSalary = salaryList[i].hightNum
+        }
+      }
+    }
+    this.setData({
+      userResume: userResume
+    })
+  },
+  onShow: function(options) {
+
+  },
+})

pages/jinali-info/index.json

@@ -0,0 +1,7 @@
+{
+  "navigationBarTitleText": "我的简历",
+  "usingComponents": {
+    "i-steps": "../../ui/steps/index",
+    "i-step": "../../ui/step/index"
+  }
+}

pages/jinali-info/index.less

@@ -0,0 +1,150 @@
+.bg{
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    z-index: -1;
+}
+.card.mgT70{
+    margin-top: 70rpx;
+}
+.card{
+    margin: 47rpx 30rpx;
+    border: 1px solid #eaeaea;
+    margin-bottom: 20px;
+    box-shadow: 0px 6px 30px 0px 
+		rgba(0, 0, 0, 0.13);
+    border-radius: 14px;
+    padding-left: 40rpx;
+    box-sizing: border-box;
+    font-size: #323232;
+    background: #fff;
+  }
+  .card-hd{
+    display: flex;
+    justify-content: space-between;
+    width: 100%;
+    font-size: 14px;
+    border-bottom: 1px solid #eaeaea;
+    padding: 30rpx 40rpx 30rpx 0;
+    box-sizing: border-box;
+  }
+  .noBorder{
+      border: none;
+  }
+  .card-hd-title{
+    display: flex;
+    align-items: center;
+  }
+  .card-hd-title .icon{
+    margin-right: 20rpx;
+  }
+  .icon{
+    width: 20px;
+  }
+  .extra{
+    float: right
+  }
+  .card-bd{
+    padding: 20rpx;
+    font-size: 14px;
+    box-sizing: border-box;
+  }
+  .input-padding{
+      padding: 35rpx 35rpx 35rpx 0;
+  }
+  .input{
+      height: 75rpx;
+      line-height: 75rpx;
+      padding: 0 20rpx;
+      border: 1px solid #e2e2e2;
+      color: #909090;
+      font-size: 12px;
+      box-sizing: border-box;
+  }
+  .row{
+    padding: 4px 0;
+  }
+  .qiuzhi{
+      margin-left: 40rpx;
+      border-bottom:1px solid #eaeaea;
+      .row{
+          margin-bottom: 30rpx;
+          &:last-child{
+              margin-bottom: 10rpx;
+          }
+          .label{
+              color: #909090;
+              margin-right: 30rpx;
+          }
+      }
+  }
+  .padLeft{
+      margin-left: -40rpx;
+  }
+  .strong{
+    color: #333;
+  }
+
+  .flex{
+      display: flex;
+  }
+  .justify-between{
+      justify-content: space-between;
+  }
+  .align-center{
+      align-items: center;
+  }
+  .icon-edit{
+    width: 36rpx;
+  }
+  .icon-box{
+    width: 20px;
+    margin-right: 20rpx;
+  }
+  .icon-sex{
+      width: 27rpx;
+      margin-left: 20rpx;
+  }
+  .contact{
+      margin-bottom: 10rpx;
+  }
+  .icon-iphone{
+      width: 18rpx;
+      margin-right: 10rpx;
+  }
+  .icon-email{
+      width:27rpx;
+      margin-right: 10rpx;
+  }
+  .avatar{
+      width: 84rpx;
+      height: 84rpx;
+      margin-right: 40rpx;
+      border-radius: 50%;
+  }
+  .name{
+      font-size: 30rpx;
+      color: #323232;
+      margin-bottom: 10rpx;
+  }
+  .tag{
+      padding: 0 20rpx;
+      background: #f8f8f8;
+      color: #909090;;
+      font-size: 22rpx;
+      margin-right: 20rpx;
+      border-radius: 4rpx;
+  }
+  .person-panel{
+      padding: 30rpx 20rpx 30rpx 0;
+  }
+  .email{
+      margin-right: 30rpx;
+  }
+  .size10{
+      font-size: 20rpx;
+  }
+  .color90{
+      color: #909090;
+  }

pages/jinali-info/index.wxml

@@ -0,0 +1,78 @@
+<wxs src="../tools.wxs" module="globalTools" />
+<view class='card'>
+  <image class="avatar" src="{{userResume.headImg}}" />
+  <view class="flex">
+    <text class="name">{{userResume.realName}}</text>
+    <text class="wz">简历写得好，工作更好找，脱贫没烦恼！</text>
+  </view>
+</view>
+
+
+<view class='basic'>
+  <text class="persondetail">个人资料</text>
+</view>
+
+<view class='basic-info'>
+  <view class='infoma'>
+    <text class="detailinfo">性别：</text>
+    <text class="detail" wx:if='{{userResume.gender==1}}'>男</text>
+    <text class="detail" wx:if='{{userResume.gender==2}}'>女</text>
+  </view>
+  <view class='infoma'>
+    <text class="detailinfo">年龄：</text>
+    <text class="detail">{{userResume.birthYear}}</text>
+  </view>
+  <view class='infoma'>
+    <text class="detailinfo">最高学历：</text>
+    <text class="detail">{{eduList[userResume.highestQualification]}}</text>
+  </view>
+  <view class='infoma'>
+    <text class="detailinfo">联系方式：</text>
+    <text class="detail">{{userResume.phone}}</text>
+  </view>
+</view>
+
+<view class='basic'>
+  <text class="persondetail">求职意向</text>
+</view>
+
+<view class='basic-info1' wx:if="{{userResume.expectationPosition}}">
+  <view class='infoma'>
+    <text class="detailinfo">期望岗位：</text>
+    <view class="detail">
+      <block wx:for="{{globalTools.splitStr1(userResume.expectationPosition,',')}}" wx:for-item="item" wx:key="*this">
+        {{expectationPosition[item]}}
+      </block>
+    </view>
+  </view>
+  <view class='infoma'>
+    <text class="detailinfo">期望地点：</text>
+    <text class="detail">{{userResume.expectationAddress}}</text>
+  </view>
+  <view class='infoma'>
+    <text class="detailinfo">期望薪资：</text>
+    <text class="detail">{{userResume.expectationSalary}}</text>
+  </view>
+</view>
+
+<view class='basic'>
+  <text class="persondetail">工作经验</text>
+</view>
+
+<view class='basic-info2' wx:if="{{expList.length}}" wx:for="{{expList}}" wx:key="hpUserResumeId" bindtap="toUserWorks" data-type="edit" data-index="{{index}}">
+  <view class='infoma'>
+    <text class="detailinfo">企业名称：</text>
+    <view class="dba">
+      <text class="detail">{{item.workCompany}}</text>
+      <image class="edit1" src="{{imgServerUrl}}/images/happyjob/edit1.png" />
+    </view>
+  </view>
+  <view class='infoma'>
+    <text class="detailinfo">工作岗位：</text>
+    <text class="detail">{{item.workPosition}}</text>
+  </view>
+  <view class='infoma'>
+    <text class="detailinfo">工作时间：</text>
+    <text class="detail">{{item.workStartDate}}~{{item.workEndDate}}</text>
+  </view>
+</view>

pages/jinali-info/index.wxss

@@ -0,0 +1,168 @@
+.card {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  height: 172rpx;
+  width: 100%;
+  border-top: 2rpx solid rgba(242, 242, 242, 1);
+  border-bottom: 12rpx solid rgba(242, 242, 242, 1);
+}
+
+.card .avatar {
+  width: 123rpx;
+  height: 123rpx;
+  background: rgba(255, 155, 98, 1);
+  border-radius: 50%;
+  margin-left: 71rpx;
+}
+
+.card .flex {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  margin-left: 45rpx;
+}
+
+.card .flex .name {
+  font-size: 32rpx;
+  font-family: SourceHanSansCN-Regular;
+  font-weight: 400;
+  color: rgba(34, 34, 34, 1);
+}
+
+.card .flex .wz {
+  font-size: 22rpx;
+  font-family: SourceHanSansCN-Regular;
+  font-weight: 400;
+  color: rgba(153, 153, 153, 1);
+}
+
+/* 个人资料开始 */
+
+.basic {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+  height: 78rpx;
+  width: 100%;
+  border-bottom: 1rpx solid rgba(238, 238, 238, 1);
+}
+
+.basic .persondetail {
+  font-size: 32rpx;
+  font-family: SourceHanSansCN-Regular;
+  font-weight: 400;
+  color: rgba(34, 34, 34, 1);
+  padding-left: 60rpx;
+}
+
+.basic .edit {
+  width: 29rpx;
+  height: 29rpx;
+  padding-right: 30rpx;
+}
+
+.basic-info {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  height: 205rpx;
+  width: 100%;
+  border-bottom: 12rpx solid rgba(242, 242, 242, 1);
+  padding-top: 25rpx;
+}
+
+.infoma {
+  display: flex;
+  flex-direction: row;
+  height: 24rpx;
+  width: 100%;
+  margin-bottom: 20rpx;
+}
+
+.infoma .detailinfo {
+  font-size: 26rpx;
+  font-family: SourceHanSansCN-Regular;
+  font-weight: 400;
+  color: rgba(102, 102, 102, 1);
+  margin-left: 60rpx;
+  width: 30%;
+}
+
+.infoma .detail {
+  font-size: 26rpx;
+  font-family: SourceHanSansCN-Regular;
+  font-weight: 400;
+  color: rgba(102, 102, 102, 1);
+  width: 70%;
+}
+
+.basic-info1 {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  height: 168rpx;
+  width: 100%;
+  border-bottom: 12rpx solid rgba(242, 242, 242, 1);
+  padding-top: 25rpx;
+}
+
+.add {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  width: 100%;
+  height: 148rpx;
+  border-bottom: 12rpx solid rgba(242, 242, 242, 1);
+}
+
+.add image {
+  width: 76rpx;
+  height: 77rpx;
+  margin-left: 143rpx;
+}
+
+.add text {
+  font-size: 26rpx;
+  font-family: SourceHanSansCN-Regular;
+  font-weight: 400;
+  color: rgba(153, 153, 153, 1);
+  margin-left: 52rpx;
+}
+
+.basic-info2 {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  height: 163rpx;
+  width: 100%;
+  border-bottom: 1rpx solid rgba(238, 238, 238, 1);
+  padding-top: 25rpx;
+}
+
+.infoma .dba {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+  width: 70%;
+}
+
+.infoma .dba .detail {
+  font-size: 26rpx;
+  font-family: SourceHanSansCN-Regular;
+  font-weight: 400;
+  color: rgba(102, 102, 102, 1);
+}
+
+.infoma .dba .edit1 {
+  width: 29rpx;
+  height: 29rpx;
+  padding-right: 30rpx;
+}
+
+.wx {
+  padding-top: 29rpx;
+  width: 100%;
+}

pages/login/login.js

@@ -65,6 +65,7 @@ Page({
                 wx.setStorageSync("user_id", data.data.hpUser.id);
                 wx.setStorageSync("member_id", data.data.hpMember.id);
                 wx.setStorageSync("user_token", data.data.hpUser.userToken);
+                wx.setStorageSync("phone", data.data.hpUser.phone);
                 // 由于 getUserInfo 是网络请求，可能会在 Page.onLoad 之后才返回
                 // 所以此处加入 callback 以防止这种情况
                 if (app.userInfoReadyCallback) {
@@ -114,6 +115,7 @@ Page({
                 wx.setStorageSync("user_id", data.data.hpUser.id);
                 wx.setStorageSync("member_id", data.data.hpMember.id);
                 wx.setStorageSync("user_token", data.data.hpUser.userToken);
+                wx.setStorageSync("phone", data.data.hpUser.phone);
                 // 由于 getUserInfo 是网络请求，可能会在 Page.onLoad 之后才返回
                 // 所以此处加入 callback 以防止这种情况
                 if (app.userInfoReadyCallback) {

pages/mine/index.js

@@ -31,7 +31,7 @@ Page({
   },
   onLoad: function(options) {
     this.setData({
-      phone: updataStorageData("phone"),
+      phone: wx.getStorageSync("phone"),
     })
   },
   onShow: function() {

pages/select-info/index.js

@@ -1,6 +1,9 @@
 import {
   imgServerUrl
 } from '../../config/config.js'
+import {
+  selectInfo
+} from '../../services/index.js'
 Page({
 
   /**
@@ -8,21 +11,137 @@ Page({
    */
   data: {
     imgServerUrl: imgServerUrl,
-    items: [
-      { name: '0', value: '0' },
-      { name: '1', value: '1' },
-      { name: '2', value: '2' },
+    eduList: ["请选择", "小学", "中学", "高中", "大专", "本科", "研究生", "博士", "博士后"],
+    items: [{
+        name: '0',
+        value: '0'
+      },
+      {
+        name: '1',
+        value: '1'
+      },
+      {
+        name: '2',
+        value: '2'
+      },
     ],
-    realName:'lifei',
-    idCardNumber:1123233221434
+    userList: [],
+    userRealName: [], //用户姓名加*数组
+    userIdCardNumber: [], //用户身份证号加*数组
+    select_index: null, //选择的用户信息索引
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
-  onLoad: function (options) {
+  onLoad: function(options) {
+    var userList = wx.getStorageSync('userList');
+    console.log("dfg", userList)
+    var userRealName = [];
+    var userIdCardNumber = [];
+    for (var i = 0; i < userList.length; i++) {
+      //年龄换算
+      var year = userList[i].hpResume.birthYear;
+      if (year) {
+        var date = new Date;
+        var year1 = date.getFullYear();
+        year = year1 - year + 1;
+      }
+      //真实姓名加*处理
+      var realName = userList[i].hpUser.realName;
+      var realName1 = '';
+      if (realName) {
+        for (var j = 0; j < realName.length; j++) {
+          if (j == 0) {
+            realName1 = '*';
+          } else {
+            realName1 = realName1 + realName[j];
+          }
+        }
+      }
+      userRealName.push(realName1);
+      //身份证号加*处理
+      var idCardNumber = userList[i].hpUser.idCardNumber;
+      var idCardNumber1 = '';
+      if (idCardNumber) {
+        for (var j = 0; j < idCardNumber.length; j++) {
+          if (j > 5 && j < 14) {
+            idCardNumber1 = idCardNumber1 + '*';
+          } else {
+            idCardNumber1 = idCardNumber1 + idCardNumber[j];
+          }
+        }
+      }
+      userIdCardNumber.push(idCardNumber1);
+      //头像为空处理
+      if (!userList[i].hpResume.headImg) {
+        userList[i].hpResume.headImg = `${imgServerUrl}/images/avatar/man.png`;
+      }
+      userList[i].hpResume.birthYear = year;
+    }
+    this.setData({
+      userList: userList,
+      userRealName: userRealName,
+      userIdCardNumber: userIdCardNumber
+    })
+  },
+
+  onShow: function() {
+
+  },
+  goResume(e) {
+    wx.setStorageSync("userResume", e.currentTarget.dataset.resume)
+    wx.navigateTo({
+      url: '../jinali-info/index',
+    })
   },
-   radioChange: function (e) {
+  radioChange: function(e) {
     console.log('radio发生change事件，携带value值为：', e.detail.value)
+    this.setData({
+      select_index: e.detail.value
+    })
+  },
+  submit(e) {
+    var select_index = this.data.select_index;
+    if (!select_index) {
+      return false;
+    }
+    var userId = this.data.userList[select_index].hpUser.id;
+    var userIds = '';
+    var phone = this.data.userList[select_index].hpUser.phone;
+    var userList = [];
+    for (var i = 0; i < this.data.userList.length; i++) {
+      if (i != select_index) {
+        userList.push(this.data.userList[i]);
+      }
+    }
+    console.log("de", userList);
+    for (var i = 0; i < userList.length; i++) {
+      if (i == 0) {
+        userIds = userList[i].hpUser.id;
+      } else {
+        userIds = ',' + userIds;
+      }
+    }
+    console.log("df", userIds)
+    let paramsObj = {
+      user_id: userId,
+      phone: phone,
+      userIds: userIds,
+      login_type: 0, //0:小程序；1：微信授权；2：手机号
+    }
+    Object.assign(paramsObj);
+    selectInfo(paramsObj).then(data => {
+      console.log("selectInfo", data)
+      wx.setStorageSync("hpuser", data.data.hpUser);
+      wx.setStorageSync("hpMember", data.data.hpMember);
+      wx.setStorageSync("user_id", data.data.hpUser.id);
+      wx.setStorageSync("member_id", data.data.hpMember.id);
+      wx.setStorageSync("user_token", data.data.hpUser.userToken);
+      wx.setStorageSync("phone", data.data.hpUser.phone);
+      setTimeout(function () {
+        wx.navigateBack();
+      }, 500)
+    })
   }
 })

pages/select-info/index.json

@@ -1,3 +1,4 @@
 {
-  "usingComponents": {}
+  "usingComponents": {},
+  "navigationBarTitleText": "选择用户"
 }

pages/select-info/index.wxml

@@ -1,63 +1,40 @@
 <radio-group class="radio-group" bindchange="radioChange">
-  <view class='first'>
-    <view class='leftinfo'>
-      <view class='tipleft'>用户信息1</view>
-      <view class='tipright'>（如需保留此信息请点击右侧圆圈）</view>
+  <block wx:for="{{userList}}" wx:key="*this">
+    <view class='first'>
+      <view class='leftinfo'>
+        <view class='tipleft'>{{item.hpUser.realName?item.hpUser.realName:item.hpResume.realName}}</view>
+        <view class='tipright'>（如需保留此信息请点击右侧圆圈）</view>
+      </view>
+      <label class="radio">
+        <radio class='radios' value="{{items[index].name}}" checked="{{items[index].checked}}" color='#4183E1' />
+      </label>
     </view>
-    <label class="radio">
-      <radio class='radios' value="{{items[0].name}}" checked="{{items[0].checked}}" color='#4183E1' />
-    </label>
-  </view>
-  <view class='midden'>
-    <view class='rzinfo'>认证信息：</view>
-    <view class='infodetail' wx:if="{{realName==0}}">{{realName}}（{{idCardNumber}}）</view>
-    <view class='infodetail1' wx:else>用户未认证</view>
-  </view>
-  <view class='midden'>
-    <view class='rzinfo'>简历信息：</view>
-    <image class='jiantou' src='{{imgServerUrl}}/images/happyjob/rightwjt.png'></image>
-  </view>
-  <view class='last'>
-    <image class='touxiang' src='{{imgServerUrl}}/images/happyjob/rightwjt.png'></image>
-    <view class='rightinfo'>
-      <view class='name'>{{realName}}</view>
-      <text class='otherdetail'>{{realName}}，{{realName}}，{{realName}}（投递岗位数量：15）</text>
+    <view class='midden'>
+      <view class='rzinfo'>认证信息：</view>
+      <view class='infodetail' wx:if="{{item.hpUser.authenticationStatus==3}}">{{userRealName[index]}}（{{userIdCardNumber[index]}}）</view>
+      <view class='infodetail1' wx:else>用户未认证</view>
     </view>
-  </view>
-  <!-- 分割灰色模块 -->
-  <view class='fgx'></view>
-
-
-
-  <view class='first'>
-    <view class='leftinfo'>
-      <view class='tipleft'>用户信息1</view>
-      <view class='tipright'>（如需保留此信息请点击右侧圆圈）</view>
+    <view class='midden' bindtap='goResume' data-resume="{{item.hpResume}}">
+      <view class='rzinfo'>简历信息：</view>
+      <image class='jiantou' src='{{imgServerUrl}}/images/happyjob/rightwjt.png'></image>
     </view>
-    <label class="radio">
-      <radio class='radios' value="{{items[0].name}}" checked="{{items[0].checked}}" color='#4183E1' />
-    </label>
-  </view>
-  <view class='midden'>
-    <view class='rzinfo'>认证信息：</view>
-    <view class='infodetail' wx:if="realName==lifei">{{realName}}（{{idCardNumber}}）</view>
-    <view class='infodetail1' wx:else>用户未认证</view>
-  </view>
-  <view class='midden'>
-    <view class='rzinfo'>简历信息：</view>
-    <image class='jiantou' src='{{imgServerUrl}}/images/happyjob/rightwjt.png'></image>
-  </view>
-  <view class='last'>
-    <image class='touxiang' src='{{imgServerUrl}}/images/happyjob/rightwjt.png'></image>
-    <view class='rightinfo'>
-      <view class='name'>{{realName}}</view>
-      <text class='otherdetail'>{{realName}}，{{realName}}，{{realName}}（投递岗位数量：15）</text>
+    <view class='last'>
+      <image class='touxiang' src='{{item.hpResume.headImg}}'></image>
+      <view class='rightinfo'>
+        <view class='name'>{{item.hpResume.realName}}</view>
+        <text class='otherdetail'>{{item.hpResume.gender==1?'男':'女'}}，{{item.hpResume.birthYear}}，{{eduList[item.hpResume.highestQualification]}}（投递岗位数量：{{item.applySize}}）</text>
+      </view>
     </view>
-  </view>
-  <!-- 分割灰色模块 -->
-  <view class='fgx'></view>
+    <!-- 分割灰色模块 -->
+    <view class='fgx'></view>
+  </block>
 
   <form bindsubmit="submit" report-submit='true' class="btn-group fixed-footer">
-    <button class="selfBtn" form-type="submit">确认选择</button>
+    <block wx:if="{{select_index}}">
+      <button class="selfBtn" form-type="submit">确认选择</button>
+    </block>
+    <block wx:else>
+      <button class="selfBtn1" form-type="submit">确认选择</button>
+    </block>
   </form>
 </radio-group>

pages/select-info/index.wxss

@@ -4,6 +4,7 @@
   justify-content: space-between;
   align-items: center;
   height: 96rpx;
+  line-height: 96rpx;
   width: 100%;
   background: rgba(255, 255, 255, 1);
   border-bottom: 2rpx solid rgba(238, 238, 238, 1);
@@ -23,7 +24,7 @@
 }
 
 .tipright {
-  font-size: 28rpx;
+  font-size: 24rpx;
   font-family: SourceHanSansCN-Regular;
   font-weight: 400;
   color: #999;
@@ -149,8 +150,23 @@
   background: linear-gradient(90deg, rgba(50, 122, 225, 1), rgba(90, 191, 225, 1));
   border-radius: 53rpx;
   justify-content: center;
-  font-size: 38rpx;
+  font-size: 36rpx;
   font-family: SourceHanSansCN-Normal;
   font-weight: 400;
-  color: rgba(255, 254, 254, 1);
+  color: rgba(255, 255, 255, 1);
+}
+
+.selfBtn1 {
+  display: flex;
+  height: 106rpx;
+  line-height: 88rpx;
+  align-items: center;
+  box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.1);
+  background: linear-gradient(90deg, rgba(221, 221, 221, 1), rgba(204, 204, 204, 1));
+  border-radius: 53rpx;
+  justify-content: center;
+  font-size: 36rpx;
+  font-family: SourceHanSansCN-Regular;
+  font-weight: 400;
+  color: rgba(255, 255, 255, 1);
 }

services/index.js

@@ -260,7 +260,7 @@ module.exports = {
       header: {},
     })
   },
-  
+
   //收藏岗位
   saveFavoritePosition(params) {
     return http({
@@ -271,6 +271,15 @@ module.exports = {
     })
   },
 
+  selectInfo(params) {
+    return http({
+      url: url.selectInfo,
+      data: params,
+      method: "POST",
+      header: {},
+    })
+  },
+
   /**************************废弃接口**************************** */
   //post 用户简历：用户教育背景编辑、新增
   resumeEdu(params) {

utils/http.js

@@ -33,11 +33,6 @@ const http = (params) => {
           var errorCode = res.data.errcode
           if (errorCode == 0) {
             return resolve(res.data)
-          } else if (errorCode == 1020) {
-            //未获取到用户手机信息
-            wx.navigateTo({
-              url: '/pages/auth/auth',
-            })
           } else if (errorCode == 1014) {
             wx.setStorageSync('openId', res.data.data.openId);
             wx.setStorageSync('sessionKey', res.data.data.sessionKey);
@@ -51,6 +46,12 @@ const http = (params) => {
             wx.navigateTo({
               url: '/pages/login/login',
             })
+          } else if (errorCode == 2009) {
+            //用户信息重复，请选择用户信息
+            wx.setStorageSync('userList', res.data.data.userList);
+            wx.redirectTo({
+              url: '/pages/select-info/index',
+            })
           } else if (errorCode == 2008) {
             //账号不存在，或token无效
           } else if (errorCode == 1007) {
@@ -63,9 +64,6 @@ const http = (params) => {
             if (!targetUrl) {
               targetUrl = '/pages/user-info/user-info'
             }
-            // wx.navigateTo({
-            //   url: targetUrl,
-            // })
           } else if (errorCode == 40007) {
             //账号类型不符
           } else if (errorCode == 2006) {