1.去除首页Banner位 2.页面优化

api/api.js

@@ -83,6 +83,7 @@ const url = {
 
   getCompanyStatus: '/f/api/hpinterview/getCompanyStatus',//GET面试登记获取企业状态
   getIntentCompany: '/f/api/qdCheckIns/getIntentCompany', // GET 查询用户是否签到并在用户未签到情况下返回意向企业
+  editUserPhone: '/f/api/login/editUserPhone',// 更改手机号
   /** +++++++++++++++++++++++++++  废弃接口 ++++++++++++++++++++++++++++++++++++++ */
   // userLogin: '/wxAppletsLogin/wxVoteLogin', // post ，根据微信CODE获取微信用户信息
   // userLogin: '/f/api/wxAppletsLogin/decodeUserInfo',

app.js

@@ -50,6 +50,7 @@ App({
 
     if (options.referrerInfo.appId === 'wx5a3a7366fd07e119') {
       const result = options.referrerInfo.extraData;
+      console.log(result)
       if (result.ret === 0) {
         const ticket = result.ticket;
         if (!this.captchaTicketExpire[ticket]) {

app.json

@@ -95,7 +95,9 @@
       "pages": [
         "pages/set/index",
         "pages/suggestions/suggestions",
-        "pages/about/index"
+        "pages/about/index",
+        "pages/security/security",
+        "pages/changePhone/changePhone"
       ]
     }
   ],

components/jianli/jianli.wxml

@@ -20,14 +20,14 @@
 			</view>
 		</view>
 		<!-- 手机  微信 -->
-		<view class="cell">
+		<!-- <view class="cell">
 			<view class="cell-title">手机号码：</view>
 			<view class="cell-content">{{userResume.phone}}</view>
 		</view>
 		<view class="cell">
 			<view class="cell-title">微信账号：</view>
 			<view class="cell-content">{{userResume.wechatNumber || ''}}</view>
-		</view>
+		</view> -->
 
 		<view class="edit-content" wx:if='{{edit}}' bindtap='user'>
 			<text class="edit">编辑</text>
@@ -47,7 +47,8 @@
 			<view class="cell-title">期望岗位：</view>
 			<view class="cell-content">
 				<block wx:for="{{globalTools.splitStr1(userResume.expectationPosition,',')}}" wx:for-item="item" wx:key="index">
-					{{expectationPosition[item]}}
+					{{expectationPosition[item]}}<text
+						wx:if="{{index !== globalTools.splitStr1(userResume.expectationPosition,',').length - 1}}">、</text>
 				</block>
 			</view>
 		</view>

components/jianli/jianli.wxss

@@ -8,7 +8,7 @@
 .header,
 .experience,
 .intention {
-	margin-top: 20rpx;
+	margin-top: 10rpx;
 	background: #fff;
 	position: relative;
 }

components/position/position.js

@@ -26,7 +26,7 @@ Component({
 		},
 		margin: {
 			type: Number,
-			value: 2
+			value: 10
 		}
 	},
 

components/position/position.wxss

@@ -3,7 +3,7 @@
 /* 列表 */
 .box-item {
 	min-height: 276rpx;
-	padding: 30rpx;
+	padding: 20rpx 30rpx;
 	display: flex;
 	font-size: 26rpx;
 	color: #444;
@@ -157,6 +157,7 @@
 	font-size: 20rpx;
 	margin-top: 20rpx;
 }
+
 /* 
 .box-item .three image {
 	width: 16rpx;

components/watermark/watermark.js

@@ -35,7 +35,7 @@ Component({
 			const system = wx.getSystemInfoSync();
 			const _height = system.windowHeight > height ? system.windowHeight : height;
 			// 计算水印行数
-			const row = Math.floor(_height * (750 / system.windowWidth) / 200);
+			const row = Math.floor(_height * (750 / system.windowWidth) / 201);
 			const json = [];
 			for (let i = 0; i < row; i++) {
 				json.push([])
@@ -44,15 +44,15 @@ Component({
 				if (_tmp) {
 					for (let j = 0; j < 2; j++) {
 						json[i].push({
-							top: 30 + 200 * i,
-							left: 160 + 235 * j
+							top: 30 + 201 * i,
+							left: 160 + 245 * j
 						})
 					}
 				} else {
 					for (let j = 0; j < 3; j++) {
 						json[i].push({
-							top: 30 + 200 * i,
-							left: 30 + 250 * j
+							top: 30 + 201 * i,
+							left: 30 + 260 * j
 						})
 					}
 				}

components/watermark/watermark.wxss

@@ -9,8 +9,8 @@
 } */
 
 .watermark-img {
-	height: 134rpx;
-	width: 190rpx;
+	height: 135rpx;
+	width: 200rpx;
 	position: absolute;
 	z-index: 1;
 }

config/config.js

@@ -1,15 +1,15 @@
 // 测试服
-// const apiUrl = "https://kf.hap-job.com/happyjob"
-// const rootUrl = "https://kf.hap-job.com"
-// const imgServerUrl = "https://hpjobtest.oss-cn-shanghai.aliyuncs.com/uploadfiles/mina"//静态资源图片服务器地址
-// const imgServerUrl_new = "https://hpjobtest.oss-cn-shanghai.aliyuncs.com"//图片服务器地址
-// const captcha = '2078399419'
+const apiUrl = "https://kf.hap-job.com/happyjob"
+const rootUrl = "https://kf.hap-job.com"
+const imgServerUrl = "https://hpjobtest.oss-cn-shanghai.aliyuncs.com/uploadfiles/mina"//静态资源图片服务器地址
+const imgServerUrl_new = "https://hpjobtest.oss-cn-shanghai.aliyuncs.com"//图片服务器地址
+const captcha = '2078399419'
 // 正式服
-const apiUrl = "https://web.hap-job.com/happyjob"
-const rootUrl = "https://web.hap-job.com"
-const imgServerUrl = "https://happyjob.oss-cn-shanghai.aliyuncs.com/uploadfiles/mina" //图片服务器地址
-const imgServerUrl_new = "https://happyjob.oss-cn-shanghai.aliyuncs.com" //图片服务器地址
-const captcha = '2019232819'
+// const apiUrl = "https://web.hap-job.com/happyjob"
+// const rootUrl = "https://web.hap-job.com"
+// const imgServerUrl = "https://happyjob.oss-cn-shanghai.aliyuncs.com/uploadfiles/mina" //图片服务器地址
+// const imgServerUrl_new = "https://happyjob.oss-cn-shanghai.aliyuncs.com" //图片服务器地址
+// const captcha = '2019232819'
 
 module.exports = {
   apiUrl,

pages/city/index.js

@@ -27,7 +27,7 @@ Page({
     searchList: [],
     letter: ''
   },
-  onLoad: function(options) {
+  onLoad: function (options) {
     var currcity = wx.getStorageSync('currcity') || '无锡'
     var currcityCode = wx.getStorageSync('currcityCode') || '320200';
     var pcity = wx.getStorageSync('city') || '无锡'
@@ -86,6 +86,12 @@ Page({
       cityCode: cityCode
     })
   },
+  // 返回上级页面
+  back() {
+    wx.navigateBack({
+      delta: 1,
+    })
+  },
   toView(e) {
     var showLetter = e.currentTarget.dataset.letter;
     let letter = showLetter;
@@ -110,7 +116,7 @@ Page({
       })
     }, 1000)
   },
-  searchStart: function(e) {
+  searchStart: function (e) {
     var showLetter = e.currentTarget.dataset.letter;
     // var pageY = e.touches[0].pageY;
     // this.setScrollTop(this, showLetter);
@@ -132,7 +138,7 @@ Page({
     })
   },
 
-  searchMove: function(e) {
+  searchMove: function (e) {
     // var pageY = e.touches[0].pageY;
     // var startPageY = this.data.startPageY;
     // var tHeight = this.data.tHeight;
@@ -163,18 +169,18 @@ Page({
     })
   },
 
-  searchEnd: function(e) {
+  searchEnd: function (e) {
     // console.log(e);
     // var showLetter=e.currentTarget.dataset.letter;
     var that = this;
-    setTimeout(function() {
+    setTimeout(function () {
       that.setData({
         isShowLetter: false
       })
     }, 1000)
 
   },
-  nowLetter: function(pageY, that) { //当前选中的信息
+  nowLetter: function (pageY, that) { //当前选中的信息
     var letterData = this.data.searchLetter;
     var bHeight = 0;
     var tHeight = 0;
@@ -195,10 +201,10 @@ Page({
       startPageY: pageY
     })
   },
-  bindScroll: function(e) {
+  bindScroll: function (e) {
     // console.log(e.detail)
   },
-  setScrollTop: function(that, showLetter) {
+  setScrollTop: function (that, showLetter) {
     var scrollTop = 0;
     var cityList = that.data.cityList;
     var cityCount = 0;
@@ -216,7 +222,7 @@ Page({
       scrollTop: scrollTop - 1558
     })
   },
-  bindCity: function(e) {
+  bindCity: function (e) {
     var city = e.currentTarget.dataset.city;
     this.setData({
       city: city
@@ -271,14 +277,14 @@ Page({
     }
   },
 
-  cxgps: function(e) {
+  cxgps: function (e) {
     var that = this;
     wx.showLoading({
       title: 'loading',
       mask: true
     });
     wx.getSetting({
-      success: function(res) {
+      success: function (res) {
         if (!res.authSetting['scope.userLocation']) {
           wx.hideLoading();
           wx.showModal({
@@ -286,7 +292,7 @@ Page({
             content: '当前服务需要获取您的位置信息，请确认授权',
             confirmText: '去授权',
             cancelText: '暂不授权',
-            success: function(res) {
+            success: function (res) {
               if (res.confirm) {
                 wx.openSetting();
               } else if (res.cancel) {
@@ -305,7 +311,7 @@ Page({
                 cityNmae = cityNmae.substring(0, cityNmae.lastIndexOf('市'));
               }
               let areaList = city.getcityList([cityNmae])[0].areaList;
-           
+
               that.setData({
                 currcity: cityNmae,
                 currcityCode: cityCode,
@@ -343,7 +349,7 @@ Page({
   },
   serach(text) {
 
-    var searchList = this.data.cityNameList.filter(function(name) {
+    var searchList = this.data.cityNameList.filter(function (name) {
       // console.log(name)
       return name.indexOf(text) !== -1
     })
@@ -377,16 +383,16 @@ Page({
 function ajaxGes(lat, lng) {
   //TODO:自己的定位接口
   var url = '';
-  return new Promise(function(resolve, reject) {
+  return new Promise(function (resolve, reject) {
     wx.request({
       url: url,
       header: {
         'content-type': 'application/json'
       },
-      success: function(res) {
+      success: function (res) {
         resolve(res.data);
       },
-      fail: function(err) {
+      fail: function (err) {
         reject(err);
       }
     })

pages/city/index.wxml

@@ -10,22 +10,24 @@
   </view>
 </view> -->
 <view class='app-header'>
-  <view class='map' bindtap='toCity'>
+  <!-- <view class='map' bindtap='toCity'>
     <view class='location'>
       <image src='/images/happyjob/index_position.png'></image>
     </view>
     <text class='cityname'>{{cityName}}</text>
-    <!-- <i-icon class="arrow-down" type="play_fill" /> -->
-  </view>
+    <i-icon class="arrow-down" type="play_fill" />
+  </view> -->
   <view class='search' bindtap='toSearch'>
     <view class="search-content">
       <view class='i_search'>
-        <image src='{{imgServerUrl}}/images/happyjob/search.png'></image>
+        <image src='/images/happyjob/search.png'></image>
       </view>
-      <input class='search-input' confirm-type="search" value="{{inputValue}}" bindblur='bindKeyInput' placeholder="输出城市名快速查找" placeholder-style="color:#cbcdd3;" />
+      <input class='search-input' confirm-type="search" value="{{inputValue}}" bindblur='bindKeyInput'
+        placeholder="输出城市名快速查找" placeholder-class="placeholder" />
     </view>
-    <view class="btn-search">搜索</view>
+    <!-- <view class="btn-search">搜索</view> -->
   </view>
+  <view class="cancel" bindtap="back">取消</view>
 </view>
 <view hidden='{{inputValue}}' class="safe_area">
   <block wx:if="{{isShowLetter}}">
@@ -35,7 +37,8 @@
   </block>
   <!-- catchtouchstart="searchStart" catchtouchmove="searchMove" catchtouchend="searchEnd"  -->
   <view class="searchLetter touchClass">
-    <view wx:for="{{searchLetter}}" style="height:{{itemH}}px" wx:key="index" data-letter="{{item.name}}" bindtap="toView">{{item.name}}</view>
+    <view wx:for="{{searchLetter}}" style="height:{{itemH}}px" wx:key="index" data-letter="{{item.name}}"
+      bindtap="toView">{{item.name}}</view>
   </view>
   <scroll-view scroll-y="true" style="height:{{winHeight}}px" bindscroll="bindScroll" scroll-into-view="{{letter}}">
     <view class="selection" wx:for="{{cityList}}" wx:key="index" id="{{item.firstNameLetter}}">
@@ -53,17 +56,21 @@
         </view>
         <view class='panel' wx:if="{{hotList.length}}">热门城市</view>
         <view class='hot_city' wx:if="{{hotList.length}}">
-          <view class="btn" wx:for="{{hotList}}" wx:key="index" wx:for-index="idx" data-text="{{item.cityName}}" data-code="{{item.cityCode}}" data-index="{{index}}"  bindtap="chooseHotCity">{{item.cityName}}</view>
+          <view class="btn" wx:for="{{hotList}}" wx:key="index" wx:for-index="idx" data-text="{{item.cityName}}"
+            data-code="{{item.cityCode}}" data-index="{{index}}" bindtap="chooseHotCity">{{item.cityName}}</view>
         </view>
       </block>
 
       <view class="item_letter">{{item.firstNameLetter}}</view>
-      <view class="item_city" wx:for="{{item.cityInfo}}" wx:for-item="ct" wx:key="index" wx:for-index="idx" data-text="{{ct.cityName}}" data-code='{{ct.cityCode}}' data-index="{{index}}" data-idx="{{idx}}" bindtap="chooseCity">
+      <view class="item_city" wx:for="{{item.cityInfo}}" wx:for-item="ct" wx:key="index" wx:for-index="idx"
+        data-text="{{ct.cityName}}" data-code='{{ct.cityCode}}' data-index="{{index}}" data-idx="{{idx}}"
+        bindtap="chooseCity">
         {{ct.cityName}}
       </view>
     </view>
   </scroll-view>
 </view>
 <view class='result-list' wx:if="{{inputValue}}" style="margin-top:20px">
-  <view class="item_city" wx:for="{{searchList}}" wx:key="index" data-text="{{item.cityName}}" data-index="{{index}}" data-code="{{item.cityCode}}" bindtap="chooseSearchCity">{{item.cityName}}</view>
+  <view class="item_city" wx:for="{{searchList}}" wx:key="index" data-text="{{item.cityName}}" data-index="{{index}}"
+    data-code="{{item.cityCode}}" bindtap="chooseSearchCity">{{item.cityName}}</view>
 </view>

pages/city/index.wxss

@@ -46,8 +46,9 @@ page {
   display: flex;
   align-items: center;
   justify-content: space-between;
-  height: 114rpx;
-  /* box-shadow: 0 0 10rpx 10rpx #eaeaea; *//* border-top: 1rpx solid #f5f5f5; */
+  height: 104rpx;
+  /* box-shadow: 0 0 10rpx 10rpx #eaeaea; */
+  /* border-top: 1rpx solid #f5f5f5; */
   padding: 0 30rpx;
   box-sizing: border-box;
   background: #fff;
@@ -94,14 +95,16 @@ page {
 }
 
 .search {
-  width: 500rpx;
-  height: 74rpx;
+  flex: 1;
+  height: 64rpx;
+  background: #FFFFFF;
+  border-radius: 10rpx;
+  border: 2rpx solid #0070F2;
   font-size: 28rpx;
-  color: #aaa;
-  padding-left: 20rpx;
+  padding: 18rpx 20rpx;
   box-sizing: border-box;
-  border: 4rpx solid #0177ff;
-  border-radius: 37rpx;
+  /* border: 4rpx solid #0177ff; */
+  /* border-radius: 37rpx; */
   display: flex;
   align-items: center;
   justify-content: space-between;
@@ -127,7 +130,16 @@ page {
 
 .search-input {
   margin-left: 15rpx;
-  color: #aaa;
+  font-size: 26rpx;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+}
+
+.placeholder {
+  font-size: 26rpx;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #CCCCCC;
 }
 
 .btn-search {
@@ -142,6 +154,14 @@ page {
   justify-content: center;
 }
 
+.cancel {
+  font-size: 32rpx;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #444444;
+  margin-left: 30rpx;
+}
+
 .panel {
   color: #333;
   font-size: 28rpx;
@@ -315,7 +335,8 @@ page {
   flex-direction: column;
 }
 
-.item_letter, .item_city {
+.item_letter,
+.item_city {
   height: 96rpx;
   font-size: 34rpx;
   color: #333;
@@ -354,4 +375,4 @@ page {
 .gpsif {
   font-size: 14px;
   color: #ccc;
-}
+}

pages/index/index.json

@@ -4,5 +4,8 @@
     "kefu": "../../components/kefu/kefu",
     "list": "../../components/position/position"
   },
-  "enablePullDownRefresh": true
+  "navigationBarTextStyle": "white",
+  "navigationBarBackgroundColor": "#0177FF",
+  "enablePullDownRefresh": true,
+  "backgroundColor": "#0177FF"
 }

pages/index/index.wxml

@@ -3,24 +3,24 @@
 
 <view class='app-header'>
 	<view class='map' bindtap='toCity'>
+		<text class='cityname'>{{cityName}}</text>
 		<view class='location'>
 			<image src='/images/happyjob/index_position.png'></image>
 		</view>
-		<text class='cityname'>{{cityName}}</text>
 		<!-- <i-icon class="arrow-down" type="play_fill" /> -->
 	</view>
 	<view class='search' bindtap='toSearch'>
 		<view class="search-content">
 			<view class='i_search'>
-				<image src='{{imgServerUrl}}/images/happyjob/search.png'></image>
+				<image src='/images/happyjob/search.png'></image>
 			</view>
 			<text class='search-input'>搜索你想要的好岗位</text>
 		</view>
-		<view class="btn-search"><text>搜索</text></view>
+		<!-- <view class="btn-search"><text>搜索</text></view> -->
 	</view>
 </view>
 <!-- 轮播 -->
-<view class="swiper">
+<!-- <view class="swiper">
 	<swiper indicator-dots="true" autoplay="true" interval="5000" duration="500" circular="true" indicator-active-color="#FE7235" class="banner">
 		<block wx:for="{{imgList}}" wx:key="picUrl">
 			<swiper-item class='banner-item'>
@@ -28,7 +28,7 @@
 			</swiper-item>
 		</block>
 	</swiper>
-</view>
+</view> -->
 <!-- 滚动 -->
 <view class='marquee'>
 	<view class='broadcast'>
@@ -73,7 +73,7 @@
 <!-- 热门岗位 -->
 <view class='box-body safe_area'>
 	<view class='box_title'>为您推荐：</view>
-	<list list='{{list}}' margin='{{20}}' isScroll='{{isScroll}}' showNoMore='{{showNoMore}}' bind:action='toDetail' />
+	<list list='{{list}}' isScroll='{{isScroll}}' showNoMore='{{showNoMore}}' bind:action='toDetail' />
 </view>
 <!-- <view class="loading_no" hidden='{{isScroll}}'>{{showNoMore}}</view> -->
 <!-- 客服 -->

pages/index/index.wxss

@@ -8,12 +8,12 @@ page {
   display: flex;
   align-items: center;
   justify-content: space-between;
-  height: 114rpx;
+  height: 104rpx;
   /* box-shadow: 0 0 10rpx 10rpx #eaeaea; */
   /* border-top: 1rpx solid #f5f5f5; */
   padding: 0 30rpx;
   box-sizing: border-box;
-  background: #fff;
+  background: #0177FF;
 }
 
 .map {
@@ -23,31 +23,34 @@ page {
   font-size: 28rpx;
   /* padding: 0 10rpx 0 20rpx; */
   color: #999;
-  margin-right: 15rpx;
-  padding-left: 26rpx;
+  margin-right: 18rpx;
   box-sizing: border-box;
+  display: flex;
+  align-items: center;
 }
 
 .location {
-  width: 28rpx;
-  height: 34rpx;
-  padding-right: 10rpx;
+  padding-left: 8rpx;
+  display: flex;
+  align-items: center;
 }
 
 .location image {
-  width: 100%;
-  height: 100%;
+  width: 20rpx;
+  height: 10rpx;
 }
 
 .map .cityname {
-  color: #006be7;
-  font-size: 36rpx;
-  max-width: 120rpx;
+  font-size: 32rpx;
+  font-family: PingFangSC-Medium, PingFang SC;
+  font-weight: 500;
+  color: #FFFFFF;
+  /* max-width: 120rpx;
   -webkit-line-clamp: 1;
   overflow: hidden;
   text-overflow: ellipsis;
   -webkit-box-orient: vertical;
-  white-space: nowrap;
+  white-space: nowrap; */
 }
 
 .arrow-down {
@@ -56,14 +59,15 @@ page {
 }
 
 .search {
-  width: 500rpx;
-  height: 74rpx;
+  flex: 1;
+  height: 64rpx;
+  background: #FFFFFF;
+  border-radius: 10rpx;
   font-size: 28rpx;
   color: #aaa;
-  padding-left: 20rpx;
+  padding: 17rpx 20rpx;
   box-sizing: border-box;
   border: 4rpx solid #0177ff;
-  border-radius: 37rpx;
   display: flex;
   align-items: center;
   justify-content: space-between;
@@ -76,8 +80,8 @@ page {
 }
 
 .search .i_search {
-  width: 29rpx;
-  height: 29rpx;
+  width: 30rpx;
+  height: 30rpx;
   display: flex;
   align-items: center;
 }
@@ -182,7 +186,7 @@ page {
 .activity-box {
   height: 186rpx;
   background: #fff;
-  margin-top: 20rpx;
+  margin-top: 10rpx;
   padding: 0 30rpx;
   box-sizing: border-box;
   display: flex;
@@ -268,7 +272,7 @@ page {
   background: #fff;
   border-top: 2rpx solid #eee;
   padding: 0 30rpx;
-  margin-bottom: 20rpx;
+  margin-bottom: 10rpx;
   box-sizing: border-box;
 }
 

pages/jianli/index.js

@@ -22,51 +22,48 @@ Page({
     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以上'
-      }
+      "expectationSalary": -1,
+      "hightNum": '不限'
+    },
+    {
+      "expectationSalary": 0,
+      "hightNum": '1000~2000'
+    },
+    {
+      "expectationSalary": 1,
+      "hightNum": '2000~3000'
+    },
+    {
+      "expectationSalary": 2,
+      "hightNum": '3000~4000'
+    },
+    {
+      "expectationSalary": 3,
+      "hightNum": '4000~5000'
+    },
+    {
+      "expectationSalary": 4,
+      "hightNum": '5000~6000'
+    },
+    {
+      "expectationSalary": 5,
+      "hightNum": '6000~7000'
+    },
+    {
+      "expectationSalary": 6,
+      "hightNum": '7000~8000'
+    },
+    {
+      "expectationSalary": 7,
+      "hightNum": '8000~9000'
+    },
+    {
+      "expectationSalary": 9,
+      "hightNum": '10000以上'
+    }
     ],
   },
-  onLoad: function(options) {
+  onLoad: function (options) {
     var hpUserResumeId = options.hpUserResumeId;
     this.setData({
       hpUserResumeId
@@ -77,7 +74,7 @@ Page({
       })
     }
   },
-  onShow: function(options) {
+  onShow: function (options) {
     this.fetchData();
   },
   //获取用户简历详情
@@ -118,13 +115,16 @@ Page({
         var year1 = date.getFullYear();
         year = year1 - year + 1;
       }
+      wx.setStorageSync('userResume', userResume)
+      userResume.expectationAddress = userResume.expectationAddress ? userResume.expectationAddress.split('-').join(' ') : ''
+      userResume.expectationSalary = userResume.expectationSalary ? userResume.expectationSalary.split('~').join('-') : ''
+
       this.setData({
         userResume,
         eduName: eduName,
         expList: expList,
         year: year
       })
-      wx.setStorageSync('userResume', userResume)
     })
   },
 

pages/jinali-info/index.js

@@ -31,36 +31,33 @@ Page({
     },
     {
       "expectationSalary": 1,
-      "hightNum": '2001~3000'
+      "hightNum": '2000~3000'
     },
     {
       "expectationSalary": 2,
-      "hightNum": '3001~4000'
+      "hightNum": '3000~4000'
     },
     {
       "expectationSalary": 3,
-      "hightNum": '4001~5000'
+      "hightNum": '4000~5000'
     },
     {
       "expectationSalary": 4,
-      "hightNum": '5001~6000'
+      "hightNum": '5000~6000'
     },
     {
       "expectationSalary": 5,
-      "hightNum": '6001~7000'
+      "hightNum": '6000~7000'
     },
     {
       "expectationSalary": 6,
-      "hightNum": '7001~8000'
+      "hightNum": '7000~8000'
     },
     {
       "expectationSalary": 7,
-      "hightNum": '8001~9000'
+      "hightNum": '8000~9000'
     },
     {
-      "expectationSalary": 8,
-      "hightNum": '9001~10000'
-    }, {
       "expectationSalary": 9,
       "hightNum": '10000以上'
     }

pages/mine/index.js

@@ -129,10 +129,10 @@ Page({
     getResume(paramsObj).then(data => {
       if (data.data.userResume) {
         var percent = 0;
-        if (data.data.userResume.phone) {
+        if (data.data.userResume.realName && data.data.userResume.birthYear && data.data.userResume.gender && data.data.userResume.highestQualification) {
           percent = 40 + percent;
         }
-        if (data.data.userResume.expectationPosition) {
+        if (data.data.userResume.expectationPosition && data.data.userResume.expectationAddress && data.data.userResume.expectationSalary) {
           percent = 40 + percent;
         }
         if (data.data.userResume.hpResumeWorkExperienceList.length > 0) {

pages/mine/index.wxml

@@ -170,8 +170,8 @@
 	</view>
 	<view class='query' bindtap='setup'>
 		<view class='querys'>
-			<image class='shezhi-image' src='{{imgServerUrl}}/images/happyjob/gengduo.png'></image>
-			<text class='queryxz'>更多</text>
+			<image class='shezhi-image' src='/images/happyjob/setting.png'></image>
+			<text class='queryxz'>设置</text>
 		</view>
 		<view class="jiantou">
 			<image class='' src='{{imgServerUrl}}/images/happyjob/rightwjt.png'></image>

pages/mine/index.wxss

@@ -208,7 +208,7 @@ page {
 
 .col {
   width: 100%;
-  height: 18rpx;
+  height: 10rpx;
   background: #F5F5F5;
   /* margin-top: 30rpx; */
 }
@@ -303,12 +303,13 @@ page {
 
 .query .querys {
   display: flex;
+  align-items: center;
   flex-direction: row;
   padding: 0 30rpx;
 }
 
 .query .querys .queryxz {
-  font-size: 25rpx;
+  font-size: 30rpx;
   font-family: SourceHanSansCN-Regular;
   font-weight: 400;
   color: rgba(34, 34, 34, 1);

pages/search/index.js

@@ -2,7 +2,8 @@ import {
   showToast
 } from '../../utils/tips.js'
 import {
-  imgServerUrl} from '../../config/config.js'
+  imgServerUrl
+} from '../../config/config.js'
 
 Page({
   data: {
@@ -10,10 +11,10 @@ Page({
     searchVal: '',
     searchKey: [],
     imgServerUrl: imgServerUrl,
-    hotSearch:[
+    hotSearch: [
       {
-        id:0,
-        searchVal:'返费'
+        id: 0,
+        searchVal: '返费'
       },
       {
         id: 1,
@@ -21,10 +22,10 @@ Page({
       }
     ]
   },
-  onLoad: function() {
+  onLoad: function () {
 
   },
-  onShow: function() {
+  onShow: function () {
     let cityName = wx.getStorageSync('city') || '无锡';
     let cityCode = wx.getStorageSync('cityCode') || '320200';
     this.setData({
@@ -33,7 +34,12 @@ Page({
     })
     this.fetchData()
   },
-
+  // 返回上级页面
+  back() {
+    wx.navigateBack({
+      delta: 1,
+    })
+  },
   //获取历史记录
   fetchData() {
     var searchKey = wx.getStorageSync("searchKey");

pages/search/index.wxml

@@ -9,22 +9,24 @@
   <view class='cancel' bindtap='toSearchPage'>搜索</view>
 </view> -->
 <view class='app-header'>
-  <view class='map' bindtap='toCity'>
+  <!-- <view class='map' bindtap='toCity'>
     <view class='location'>
       <image src='/images/happyjob/index_position.png'></image>
     </view>
     <text class='cityname'>{{cityName}}</text>
-    <!-- <i-icon class="arrow-down" type="play_fill" /> -->
-  </view>
+    <i-icon class="arrow-down" type="play_fill" />
+  </view> -->
   <view class='search' bindtap='toSearch'>
     <view class="search-content">
       <view class='i_search'>
-        <image src='{{imgServerUrl}}/images/happyjob/search.png'></image>
+        <image src='/images/happyjob/search.png'></image>
       </view>
-      <input class='search-input' focus="{{true}}" type='text' confirm-type="search" value="{{searchVal}}" bindinput='bindKeyInput' bindconfirm="toSearchPage" placeholder="搜索你想要的好岗位"></input>
+      <input class='search-input' focus="{{true}}" type='text' confirm-type="search" value="{{searchVal}}"
+        bindconfirm="toSearchPage" placeholder="搜索你想要的好岗位" placeholder-class="placeholder"></input>
     </view>
-    <view class="btn-search" bindtap='toSearchPage'>搜索</view>
+    <!-- <view class="btn-search" bindtap='toSearchPage'>搜索</view> -->
   </view>
+  <view class="cancel" bindtap="back">取消</view>
 </view>
 <view class='history topic'>
   <view class='topic-header' wx:if='{{searchKey.length}}'>
@@ -34,7 +36,8 @@
     </view>
   </view>
   <view class='record-list'>
-    <view class='record' wx:for="{{searchKey}}" wx:key="{{item.id}}" data-id="{{item.id}}" data-value="{{item.searchVal}}" bindtap='selectMsg' bindlongpress="delHistory">{{item.searchVal}}</view>
+    <view class='record' wx:for="{{searchKey}}" wx:key="id" data-id="{{item.id}}" data-value="{{item.searchVal}}"
+      bindtap='selectMsg' bindlongpress="delHistory">{{item.searchVal}}</view>
   </view>
 </view>
 
@@ -44,6 +47,7 @@
     <view></view>
   </view>
   <view class='record-list'>
-    <view class='record' wx:for="{{hotSearch}}" wx:key="{{item.id}}" data-id="{{item.id}}" data-value="{{item.searchVal}}" bindtap='selectMsg' bindlongpress="delHistory">{{item.searchVal}}</view>
+    <view class='record' wx:for="{{hotSearch}}" wx:key="id" data-id="{{item.id}}" data-value="{{item.searchVal}}"
+      bindtap='selectMsg' bindlongpress="delHistory">{{item.searchVal}}</view>
   </view>
 </view>

pages/search/index.wxss

@@ -10,8 +10,9 @@ page {
   display: flex;
   align-items: center;
   justify-content: space-between;
-  height: 114rpx;
-  /* box-shadow: 0 0 10rpx 10rpx #eaeaea; *//* border-top: 1rpx solid #f5f5f5; */
+  height: 104rpx;
+  /* box-shadow: 0 0 10rpx 10rpx #eaeaea; */
+  /* border-top: 1rpx solid #f5f5f5; */
   padding: 0 30rpx;
   box-sizing: border-box;
   background: #fff;
@@ -57,14 +58,15 @@ page {
 }
 
 .search {
-  width: 500rpx;
-  height: 74rpx;
+  flex: 1;
+  height: 64rpx;
+  background: #FFFFFF;
+  border-radius: 10rpx;
+  border: 2rpx solid #0070F2;
   font-size: 24rpx;
-  color: #aaa;
-  padding-left: 20rpx;
+  padding: 18rpx 20rpx;
   box-sizing: border-box;
-  border: 4rpx solid #0177ff;
-  border-radius: 37rpx;
+  /* border: 4rpx solid #0177ff; */
   display: flex;
   align-items: center;
   justify-content: space-between;
@@ -90,10 +92,19 @@ page {
   height: 100%;
 }
 
+.placeholder {
+  font-size: 26rpx;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #CCCCCC;
+}
+
 .search-input {
   flex: 1;
   margin-left: 15rpx;
-  color: #aaa;
+  font-size: 26rpx;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
 }
 
 .btn-search {
@@ -108,6 +119,14 @@ page {
   margin-left: 15rpx;
 }
 
+.cancel {
+  font-size: 32rpx;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #444444;
+  margin-left: 30rpx;
+}
+
 /* 搜索历史 */
 
 .topic {
@@ -149,4 +168,4 @@ page {
   color: #666;
   background-color: #ebebeb;
   border-radius: 6rpx;
-}
+}

pages/setting/pages/changePhone/changePhone.js

@@ -0,0 +1,247 @@
+// pages/setting/pages/changePhone/changePhone.js
+import { editUserPhone, sendPhoneCode } from '../../../../services/index'
+import { testPhone } from '../../../../utils/util'
+import {
+	captcha
+} from '../../../../config/config'
+let time = 60
+Page({
+
+	/**
+	 * 页面的初始数据
+	 */
+	data: {
+		phoneNow: '',
+		yanzheng: '获取验证码',
+		time: 60,
+		phone: '',
+		format_phone: '',
+		code: '',
+		cansubmit: false
+	},
+	show() {
+		const captchaResult = getApp().captchaResult;
+		getApp().captchaResult = null; // 验证码的票据为一次性票据，取完需要置空
+		if (captchaResult && captchaResult.ret === 0) {
+			// 将验证码的结果返回至服务端校验
+			const ticket = captchaResult.ticket;
+			const randstr = captchaResult.randstr;
+			this.send({ randstr, ticket })
+		}
+	},
+	submit() {
+		if (this.data.cansubmit) {
+			editUserPhone({
+				new_phone: this.data.phone,
+				code: this.data.code,
+			}).then(data => {
+				wx.showToast({
+					icon: 'none',
+					mask: true,
+					title: '手机号修改已完成',
+					success: res => {
+						setTimeout(() => {
+							wx.navigateBack({
+								delta: 1,
+							})
+						}, 1200)
+					}
+				})
+				wx.setStorageSync('phone', this.data.phone)
+			})
+		} else {
+			wx.showToast({
+				icon: 'none',
+				title: '请填写完整信息',
+			})
+		}
+	},
+	saveCode(e) {
+		const code = e.detail.value
+		this.setData({
+			code
+		})
+		this.check()
+	},
+	savePhone(e) {
+		if (e.detail.keyCode !== 8) {
+			const format_phone = e.detail.value.split('').filter(value => value.trim())
+			if (testPhone(format_phone.join(''))) {
+				this.setData({
+					phone: format_phone.join('')
+				}, () => {
+					this.check()
+				})
+			}
+			if (format_phone.length >= 3) {
+				format_phone.splice(3, 0, ' ')
+			}
+			if (format_phone.length >= 8) {
+				format_phone.splice(8, 0, ' ')
+			}
+			this.setData({
+				format_phone: format_phone.join('')
+			})
+		} else {
+			const format_phone = e.detail.value.trim()
+			this.setData({
+				format_phone,
+				phone: '',
+				cansubmit: false
+			})
+		}
+	},
+	toTCaptcha() {
+		if (testPhone(this.data.phone)) {
+			if (time === 60) {
+				editUserPhone({
+					new_phone: this.data.phone,
+					type: 'check_phone',
+				}).then(data => {
+					wx.navigateToMiniProgram({
+						appId: 'wx5a3a7366fd07e119',
+						path: '/pages/captcha/index',
+						extraData: {
+							appId: captcha//您申请的验证码的 appId
+						}
+					})
+				})
+			} else {
+				wx.showToast({
+					mask: true,
+					icon: 'none',
+					title: '请勿重复点击',
+				})
+			}
+		} else {
+			wx.showToast({
+				icon: 'none',
+				title: '请填写正确手机号',
+			})
+		}
+	},
+	send() {
+		const captchaResult = getApp().captchaResult;
+		getApp().captchaResult = null; // 验证码的票据为一次性票据，取完需要置空
+		if (captchaResult && captchaResult.ret === 0) {
+			// 将验证码的结果返回至服务端校验
+			const ticket = captchaResult.ticket;
+			const randstr = captchaResult.randstr;
+			// this.send({ randstr, ticket })
+			sendPhoneCode({
+				phone: this.data.phone,
+				ticket,
+				randstr
+			}).then(data => {
+				wx.showToast({
+					icon: 'none',
+					title: '验证码发送成功',
+				})
+			})
+			this.countdown()
+		}
+	},
+	countdown() {
+		time--;
+		this.setData({
+			time,
+			yanzheng: time + 's后重试'
+		})
+		let inter = setInterval(() => {
+			if (time > 1) {
+				time--;
+				this.setData({
+					time,
+					yanzheng: time + 's后重试'
+				})
+			} else {
+				clearInterval(inter)
+				time = 60
+				this.setData({
+					time: 60,
+					yanzheng: '获取验证码'
+				}, _ => {
+					inter = null;
+				})
+			}
+		}, 1000)
+	},
+	check() {
+		if (testPhone(this.data.phone) && this.data.code) {
+			this.setData({
+				cansubmit: true
+			})
+			return true
+		} else {
+			this.setData({
+				cansubmit: false
+			})
+			return false
+		}
+	},
+	/**
+	 * 生命周期函数--监听页面加载
+	 */
+	onLoad: function (options) {
+
+	},
+
+	/**
+	 * 生命周期函数--监听页面初次渲染完成
+	 */
+	onReady: function () {
+
+	},
+
+	/**
+	 * 生命周期函数--监听页面显示
+	 */
+	onShow: function () {
+		wx.getStorage({
+			key: 'phone',
+			success: res => {
+				const _data = res.data
+				this.setData({
+					phoneNow: _data.substring(0, 3) + ' **** ' + _data.substring(7, 11)
+				}, () => {
+					this.send()
+				})
+			}
+		})
+	},
+
+	/**
+	 * 生命周期函数--监听页面隐藏
+	 */
+	onHide: function () {
+
+	},
+
+	/**
+	 * 生命周期函数--监听页面卸载
+	 */
+	onUnload: function () {
+
+	},
+
+	/**
+	 * 页面相关事件处理函数--监听用户下拉动作
+	 */
+	onPullDownRefresh: function () {
+
+	},
+
+	/**
+	 * 页面上拉触底事件的处理函数
+	 */
+	onReachBottom: function () {
+
+	},
+
+	/**
+	 * 用户点击右上角分享
+	 */
+	onShareAppMessage: function () {
+
+	}
+})

pages/setting/pages/changePhone/changePhone.json

@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "修改手机号",
+  "usingComponents": {}
+}

pages/setting/pages/changePhone/changePhone.wxml

@@ -0,0 +1,38 @@
+<!--pages/setting/pages/changePhone/changePhone.wxml-->
+
+<view class="container">
+	<view class="phone-now">
+		<text>当前绑定账号</text>
+		<text class="phone-now-number">{{phoneNow}}</text>
+	</view>
+	<view class="content">
+		<view class="input-content">
+			<view class="label">+86</view>
+			<view class="input">
+				<input type="text" maxlength="13" name="phone" value="{{format_phone}}" id="" placeholder="请输入新手机号码" bindinput="savePhone"/>
+			</view>
+		</view>
+		<view class="input-content">
+			<view class="label">
+				<image src="../images/setting-phone.png"></image>
+			</view>
+
+			<view class="input">
+				<input type="text" name="code" id="" placeholder="请输入验证码" bindinput="saveCode"/>
+				<view class="yanzheng" bindtap="toTCaptcha">
+					{{yanzheng}}
+				</view>
+			</view>
+		</view>
+	</view>
+	<view class="tips">
+		长时间收不到验证码，可尝试再次获取验证码
+	</view>
+	<view class="button-content {{cansubmit?'':'opacity'}}" bindtap="submit">
+		<text>确认更改手机号码</text>
+	</view>
+	<view class="result">
+		<view>修改手机号后，可以使用新手机号登录开心工作</view>
+		<view>使用原有手机号则作为新用户登录</view>
+	</view>
+</view>

pages/setting/pages/changePhone/changePhone.wxss

@@ -0,0 +1,115 @@
+/* pages/setting/pages/changePhone/changePhone.wxss */
+page {
+	background: #F5F5F5;
+}
+
+.phone-now {
+	font-size: 28rpx;
+	margin: 90rpx auto;
+	display: flex;
+	align-items: center;
+	flex-direction: column;
+}
+
+.phone-now-number {
+	font-size: 38rpx;
+	font-weight: bolder;
+}
+
+.content {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+}
+
+.input-content {
+	width: 630rpx;
+	height: 100rpx;
+	background: #FFFFFF;
+	border-radius: 10rpx;
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+}
+
+.label {
+	width: 102rpx;
+	height: 42rpx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	border-right: 2rpx solid #CCCCCC;
+}
+
+.input-content+.input-content {
+	margin-top: 40rpx;
+}
+
+.input-content image {
+	height: 36rpx;
+	width: 28rpx;
+}
+
+.input {
+	flex: 1;
+	padding: 26rpx;
+	box-sizing: border-box;
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+}
+
+.input input {
+	flex: 1;
+	height: 100%;
+}
+
+.yanzheng {
+	width: 142rpx;
+	height: 42rpx;
+	text-align: center;
+	line-height: 42rpx;
+	font-size: 24rpx;
+	font-family: PingFangSC-Regular, PingFang SC;
+	font-weight: 400;
+	color: #007AFF;
+	border-radius: 20rpx;
+	border: 2rpx solid #007AFF;
+}
+
+.tips {
+	font-size: 24rpx;
+	font-family: PingFangSC-Regular, PingFang SC;
+	font-weight: 400;
+	color: #888888;
+	text-align: center;
+	margin-top: 30rpx;
+}
+
+.button-content {
+	width: 690rpx;
+	height: 88rpx;
+	line-height: 88rpx;
+	font-size: 34rpx;
+	font-family: PingFangSC-Medium, PingFang SC;
+	font-weight: 500;
+	color: #FFFFFF;
+	text-align: center;
+	background: #0177FF;
+	border-radius: 10rpx;
+	margin: 0 auto;
+	margin-top: 80rpx;
+}
+
+.opacity {
+	opacity: 0.6;
+}
+
+.result {
+	font-size: 24rpx;
+	font-family: PingFangSC-Regular, PingFang SC;
+	font-weight: 400;
+	color: #888888;
+	text-align: center;
+	margin-top: 30rpx;
+}

pages/setting/pages/security/security.js

@@ -0,0 +1,141 @@
+// pages/setting/pages/security/security.js
+import {
+	imgServerUrl
+} from '../../../../config/config.js'
+import {
+	logout_new
+} from '../../../../services/index'
+import {
+	rootUrl
+} from '../../../../config/config'
+var app = getApp()
+Page({
+
+	/**
+	 * 页面的初始数据
+	 */
+	data: {
+		phone: '',
+		rootUrl,
+		imgServerUrl: imgServerUrl,
+		visible: false,
+		actions: [{
+			name: '确定注销',
+			color: '#0177FF',
+			fontWeight: 500
+		},
+		{
+			name: '取消',
+			color: '#0177FF',
+		},
+		],
+	},
+	toPage(e) {
+		const {
+			url
+		} = e.currentTarget.dataset;
+		wx.navigateTo({
+			url,
+		})
+	},
+	cancellation() {
+		this.setData({
+			visible: true
+		})
+	},
+	handel(e) {
+		const {
+			index
+		} = e.detail;
+		this.setData({
+			visible: false
+		})
+		if (index === 0) {
+			logout_new({}).then(data => {
+				wx.removeStorageSync("user_id");
+				wx.removeStorageSync("member_id");
+				wx.removeStorageSync("user_token");
+				wx.removeStorageSync("userInfo");
+				app.globalData.userId = '';
+				app.globalData.userToken = '';
+				app.globalData.memberId = '';
+				app.globalData.userInfo = null;
+				wx.showToast({
+					icon: 'none',
+					mask: true,
+					title: '注销成功',
+					success: res => {
+						setTimeout(function () {
+							wx.switchTab({
+								url: '/pages/index/index',
+							})
+						}, 1500)
+					}
+				})
+			})
+		}
+	},
+	/**
+	 * 生命周期函数--监听页面加载
+	 */
+	onLoad: function (options) {
+
+	},
+
+	/**
+	 * 生命周期函数--监听页面初次渲染完成
+	 */
+	onReady: function () {
+
+	},
+
+	/**
+	 * 生命周期函数--监听页面显示
+	 */
+	onShow: function () {
+		wx.getStorage({
+			key: 'phone',
+			success: res => {
+				const _data = res.data
+				this.setData({
+					phone: _data.substring(0, 3) + ' **** ' + _data.substring(7, 11)
+				})
+			}
+		})
+	},
+
+	/**
+	 * 生命周期函数--监听页面隐藏
+	 */
+	onHide: function () {
+
+	},
+
+	/**
+	 * 生命周期函数--监听页面卸载
+	 */
+	onUnload: function () {
+
+	},
+
+	/**
+	 * 页面相关事件处理函数--监听用户下拉动作
+	 */
+	onPullDownRefresh: function () {
+
+	},
+
+	/**
+	 * 页面上拉触底事件的处理函数
+	 */
+	onReachBottom: function () {
+
+	},
+
+	/**
+	 * 用户点击右上角分享
+	 */
+	onShareAppMessage: function () {
+
+	}
+})

pages/setting/pages/security/security.json

@@ -0,0 +1,6 @@
+{
+  "navigationBarTitleText": "账户与安全",
+  "usingComponents": {
+    "i-modal": "../../../../ui/modal/index"
+  }
+}

pages/setting/pages/security/security.wxml

@@ -0,0 +1,22 @@
+<!--pages/setting/pages/security/security.wxml-->
+
+<view class="container">
+	<view class='cell' hover-class="hover" data-url="../changePhone/changePhone" bindtap='toPage'>
+	<view class='content'>
+		<text>修改手机号</text>
+		<text class="version">{{phone}}</text>
+	</view>
+	<image class='jiantou' src='{{imgServerUrl}}/images/happyjob/rightwjt.png'></image>
+</view>
+<view class='cell' hover-class="hover" bindtap='cancellation'>
+	<view class='content'>
+		<text>注销账户</text>
+	</view>
+	<image class='jiantou' src='{{imgServerUrl}}/images/happyjob/rightwjt.png'></image>
+</view>
+</view>
+
+
+<i-modal visible="{{ visible }}" actions="{{ actions }}" bind:click="handel">
+	<view style="padding:15rpx 30px;color:#000;font-size:34rpx;font-wight:500;">注销后，您在开心工作的所有信息都将会删除。该操作不可逆，请谨慎操作！</view>
+</i-modal>

pages/setting/pages/security/security.wxss

@@ -0,0 +1,37 @@
+/* pages/setting/pages/security/security.wxss */
+.cell {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+  height: 116rpx;
+  width: 100%;
+  border-bottom: 1rpx solid #EEEEEE;
+}
+
+.content {
+  flex: 1;
+  font-size: 30rpx;
+  font-weight: 400;
+  color: #333333;
+  margin-left: 30rpx;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.jiantou {
+  width: 17rpx;
+  height: 29rpx;
+  padding-right: 30rpx;
+}
+
+.version {
+  color: #666666;
+  font-size: 26rpx;
+  margin-right: 30rpx;
+}
+
+.hover {
+  background: #f5f5f5;
+}

pages/setting/pages/set/index.wxml

@@ -25,8 +25,8 @@
 	<view class='content'>隐私政策</view>
 	<image class='jiantou' src='{{imgServerUrl}}/images/happyjob/rightwjt.png'></image>
 </view>
-<view class='cell' hover-class="hover" bindtap="cancellation">
-	<view class='content'>注销账户</view>
+<view class='cell' hover-class="hover" data-url="../security/security" bindtap="toPage">
+	<view class='content'>账号安全</view>
 	<image class='jiantou' src='{{imgServerUrl}}/images/happyjob/rightwjt.png'></image>
 </view>
 <view class='btn-group fixed-footer safe_area'>

pages/user-info/user-info.js

@@ -165,10 +165,10 @@ Page({
       status && showToast('请输入用户名');
       return false;
     }
-    if (this.data.iphone == "" || this.data.iphone.length != 11) {
-      status && showToast('请输入11位手机号');
-      return false;
-    }
+    // if (this.data.iphone == "" || this.data.iphone.length != 11) {
+    //   status && showToast('请输入11位手机号');
+    //   return false;
+    // }
     if (this.data.year == "" || this.data.year == '请选择') {
       status && showToast('请选择出生年月');
       return false;
@@ -177,10 +177,10 @@ Page({
       status && showToast('请选择您的最高学历');
       return false;
     }
-    if (this.data.wechatNumber === '') {
-      status && showToast('请输入微信号');
-      return false;
-    }
+    // if (this.data.wechatNumber === '') {
+    //   status && showToast('请输入微信号');
+    //   return false;
+    // }
     this.setData({
       disabled: true
     })

pages/user-info/user-info.wxml

@@ -26,12 +26,12 @@
 			</picker>
 		</view>
 	</view>
-	<view class='list'>
+	<!-- <view class='list'>
 		<text>手机号码</text>
 		<view class="list-content">
 			<input value="{{ iphone }}" placeholder="请填写" maxlength='11' placeholder-class="tips" bindinput="changeIphone" />
 		</view>
-	</view>
+	</view> -->
 	<view class='list'>
 		<text>出生年份</text>
 		<view class="list-content">
@@ -56,12 +56,12 @@
 			</picker>
 		</view>
 	</view>
-	<view class='list'>
+	<!-- <view class='list'>
 		<text>微信账号</text>
 		<view class="list-content">
 			<input value="{{ wechatNumber }}" placeholder="请填写" placeholder-class="tips" bindinput="changeWechatNumber" />
 		</view>
-	</view>
+	</view> -->
 
 	<form bindsubmit="submit" report-submit='true' class="btn-group fixed-footer">
 		<button class="distance selfBtn {{disabled?'':'opacity_5'}}" form-type="submit">保存</button>

pages/user-job/index.js

@@ -25,35 +25,35 @@ Page({
     },
     {
       "expectationSalary": 1,
-      "hightNum": '2001~3000'
+      "hightNum": '2000~3000'
     },
     {
       "expectationSalary": 2,
-      "hightNum": '3001~4000'
+      "hightNum": '3000~4000'
     },
     {
       "expectationSalary": 3,
-      "hightNum": '4001~5000'
+      "hightNum": '4000~5000'
     },
     {
       "expectationSalary": 4,
-      "hightNum": '5001~6000'
+      "hightNum": '5000~6000'
     },
     {
       "expectationSalary": 5,
-      "hightNum": '6001~7000'
+      "hightNum": '6000~7000'
     },
     {
       "expectationSalary": 6,
-      "hightNum": '7001~8000'
+      "hightNum": '7000~8000'
     },
     {
       "expectationSalary": 7,
-      "hightNum": '8001~9000'
+      "hightNum": '8000~9000'
     },
     {
       "expectationSalary": 8,
-      "hightNum": '9001~10000'
+      "hightNum": '9000~10000'
     }, {
       "expectationSalary": 9,
       "hightNum": '10000以上'

project.config.json

@@ -31,22 +31,25 @@
     "uploadWithSourceMap": true,
     "compileHotReLoad": false,
     "useMultiFrameRuntime": false,
-    "useApiHook": false,
+    "useApiHook": true,
     "babelSetting": {
       "ignore": [],
       "disablePlugins": [],
       "outputPath": ""
     },
-    "bundle": true,
+    "enableEngineNative": false,
+    "bundle": false,
     "useIsolateContext": true,
     "useCompilerModule": true,
     "userConfirmedUseCompilerModuleSwitch": true,
+    "userConfirmedBundleSwitch": false,
     "packNpmManually": false,
-    "packNpmRelationList": []
+    "packNpmRelationList": [],
+    "minifyWXSS": true
   },
   "compileType": "miniprogram",
   "libVersion": "2.8.3",
-  "appid": "wx1e8ed93850777ffb",
+  "appid": "wx5ae6908ae55edcb7",
   "projectname": "kaixin",
   "debugOptions": {
     "hidedInDevtools": []
@@ -56,27 +59,15 @@
   "simulatorPluginLibVersion": {},
   "condition": {
     "plugin": {
-      "current": -1,
       "list": []
     },
     "game": {
-      "currentL": -1,
       "list": []
     },
     "gamePlugin": {
-      "current": -1,
-      "list": []
-    },
-    "search": {
-      "current": -1,
-      "list": []
-    },
-    "conversation": {
-      "current": -1,
       "list": []
     },
     "miniprogram": {
-      "current": -1,
       "list": [
         {
           "id": 0,
@@ -282,10 +273,9 @@
           "scene": null
         },
         {
-          "id": -1,
           "name": "简历信息",
           "pathName": "pages/jinali-info/index",
-          "query": "",
+          "query": "hpUserResumeId=56629",
           "scene": null
         },
         {
@@ -413,6 +403,24 @@
           "pathName": "pages/clock/clock-tongji/index",
           "query": "",
           "scene": null
+        },
+        {
+          "name": "搜索",
+          "pathName": "pages/search/index",
+          "query": "",
+          "scene": null
+        },
+        {
+          "name": "账户与安全",
+          "pathName": "pages/setting/pages/security/security",
+          "query": "hpUserResumeId=56629",
+          "scene": null
+        },
+        {
+          "name": "修改手机号码",
+          "pathName": "pages/setting/pages/changePhone/changePhone",
+          "query": "hpUserResumeId=56629",
+          "scene": null
         }
       ]
     }

services/index.js

@@ -645,6 +645,17 @@ module.exports = {
       header: {}
     })
   },
+
+    
+  // 编辑用户信息
+  editUserPhone(params){
+    return http({
+      url: url.editUserPhone,
+      data: params,
+      method: 'POST',
+      header: {}
+    })
+  },
   /**************************废弃接口**************************** */
   //post 用户简历：用户教育背景编辑、新增
   resumeEdu(params) {

utils/http.js

@@ -215,7 +215,6 @@ const http = async (params) => {
           icon: "none",
           title: "网络异常",
           success: () => {
-            loading = true
             reject()
           }
         })