1.3.9

api/api.js

@@ -28,7 +28,7 @@ const url = {
   approve: "/f/api/user/realApprove", //post 用户认证信息提交,图片先上传获取连接
   positionList: "/f/api/applyPosition/myApply", //get 我的岗位申请列表,
   /** +++++++++++++++++++++++++++  frontPayRoll  ++++++++++++++++++++++++++++++++++++++ */
-  phoneCode: "/f/api/login/getAuthCode", // 薪资查询：发送手机验证码
+  phoneCode: "/f/api/login/getCaptchaCode", // 薪资查询：发送手机验证码
   payrollId: "/f/api/payroll/phoneValidate", // 薪资查询：根据手机号码，短信验证码获取身份信息
   payroll: "/f/api/payroll/myPayRoll", // 薪资查询：根据手机号码，短信验证码获取身份信息
   /** +++++++++++++++++++++++++++  pt  ++++++++++++++++++++++++++++++++++++++ */

app.js

@@ -46,6 +46,18 @@ App({
     if (options.shareTicket) {
       this.getShareInfo(options.shareTicket)
     }
+    if (!this.captchaTicketExpire) this.captchaTicketExpire = {};
+
+    if (options.referrerInfo.appId === 'wx5a3a7366fd07e119') {
+      const result = options.referrerInfo.extraData;
+      if (result.ret === 0) {
+        const ticket = result.ticket;
+        if (!this.captchaTicketExpire[ticket]) {
+          this.captchaResult = result;
+          this.captchaTicketExpire[ticket] = true;
+        }
+      }
+    }
     // 小程序版本更新
     if (wx.getUpdateManager) {
       const updateManager = wx.getUpdateManager()
@@ -118,7 +130,7 @@ App({
     memberId: "",
     sessionKey: '',
     city: updataStorageData('city') || '无锡',
-    version: '3.3.6'
+    version: '1.3.9'
   },
   //页面分享
   onShareAppMessage: function () {

app.json

@@ -129,5 +129,6 @@
       }
     ]
   },
-  "sitemapLocation": "sitemap.json"
+  "sitemapLocation": "sitemap.json",
+  "navigateToMiniProgramAppIdList": ["wx5a3a7366fd07e119"]
 }

app.wxss

@@ -28,3 +28,7 @@ i-count-down {
   text-overflow: ellipsis;
 }
 
+.safe_area {
+  padding-bottom: constant(safe-area-inset-bottom);
+  padding-bottom: env(safe-area-inset-bottom);
+}

components/kefu/kefu.js

@@ -7,7 +7,10 @@ Component({
 	 * 组件的属性列表
 	 */
 	properties: {
-
+		top: {
+			type: Number,
+			value: 345
+		}
 	},
 
 	/**
@@ -32,7 +35,7 @@ Component({
 				width = res.windowWidth * per;
 				this.setData({
 					x: width - 188,
-					y: height - 165,
+					y: height - this.data.top,
 					show: true,
 					per,
 					SDKVersion: res.SDKVersion.split('.').join('') - 0

components/send-code/send-code.js

@@ -1,7 +1,8 @@
 // components/send-code/send-code.js
 let setInter = null;
 import {
-  imgServerUrl
+  imgServerUrl,
+  captcha
 } from '../../config/config.js'
 Component({
   /**
@@ -42,7 +43,7 @@ Component({
       value: false,
       observer(data) {
         if (data === true) {
-          this.send()
+          // this.toTCaptcha()
         }
       }
     }
@@ -61,6 +62,18 @@ Component({
     time: 60, // 倒计时时长
     format_phone: '' //整理格式后的电话号码
   },
+  pageLifetimes: {
+    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 })
+      }
+    },
+  },
   ready() {
     // 初始化界面
     this.init();
@@ -72,6 +85,15 @@ Component({
    * 组件的方法列表
    */
   methods: {
+    toTCaptcha: function () {
+      wx.navigateToMiniProgram({
+        appId: 'wx5a3a7366fd07e119',
+        path: '/pages/captcha/index',
+        extraData: {
+          appId: captcha//您申请的验证码的 appId
+        }
+      })
+    },
     // 初始化方法  生成键盘布局数组
     init(status) {
       //  原始数组
@@ -124,14 +146,14 @@ Component({
       })
     },
     // 发送验证码
-    send() {
+    send(data) {
       const time = this.data.time;
       if (time === 60) {
         this.countdown();
         this.setData({
           hidden: false
         })
-        this.triggerEvent('send')
+        this.triggerEvent('send', data)
       }
     },
     // 取消按键   点击键盘收起

components/send-code/send-code.wxml

@@ -16,7 +16,7 @@
 			<view class="bar-view" wx:for='{{6}}' wx:key='index'></view>
 		</view>
 	</view>
-	<view class="count" bindtap="send">{{countdown}}</view>
+	<view class="count" bindtap="toTCaptcha">{{countdown}}</view>
 	<view class="keyboard {{hidden||'show'}}">
 		<block wx:for='{{keybord}}' wx:key='index' wx:for-index='key'>
 			<view class="board" wx:for='{{item}}' wx:key='index' wx:if='{{key<3}}' data-value='{{item}}' bindtap='keyboard'>{{item}}</view>

config/config.js

@@ -1,17 +1,20 @@
 // 测试服
-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 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 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,
   imgServerUrl,
   imgServerUrl_new,
-  rootUrl
+  rootUrl, 
+  captcha
 }

pages/apply-list/index.wxml

@@ -1,6 +1,6 @@
 <!--pages/search-result/search-result.wxml-->
 <block wx:if="{{list.length != 0}}">
- <view class='box-body'>
+ <view class='box-body safe_area'>
     <list list='{{list}}' margin='{{20}}' isScroll='{{isScroll}}' showNoMore='{{showNoMore}}' bind:action='toDetail' />
   </view>
 </block>

pages/bind-phone/bind.js

@@ -16,9 +16,10 @@ Page({
 		auto_send: false
 	},
 	// 发送验证码
-	send() {
+	send(data) {
 		sendPhoneCode({
-			phone: this.data.phone
+			phone: this.data.phone,
+			...data.detail
 		}).then(data => {
 			wx.showToast({
 				icon: 'none',

pages/check-iphone/index.js

@@ -135,9 +135,10 @@ Page({
     })
     this.vcode()
   },
-  send() {
+  send(data) {
     sendPhoneCode({
-      phone: this.data.phone
+      phone: this.data.phone,
+      ...data.detail
     })
   },
   toList(e) {

pages/city/index.wxml

@@ -27,7 +27,7 @@
     <view class="btn-search">搜索</view>
   </view>
 </view>
-<view hidden='{{inputValue}}'>
+<view hidden='{{inputValue}}' class="safe_area">
   <block wx:if="{{isShowLetter}}">
     <view class="showSlectedLetter">
       {{showLetter}}

pages/collection-list/index.wxml

@@ -1,6 +1,6 @@
 <!--pages/search-result/search-result.wxml-->
 <block wx:if="{{list.length != 0}}">
-  <view class='box-body'>
+  <view class='box-body safe_area'>
     <list list='{{list}}' margin='{{20}}' isScroll='{{isScroll}}' showNoMore='{{showNoMore}}' bind:action='toDetail' />
   </view>
   <!-- <view class="loading_no" hidden='{{isScroll}}'>{{showNoMore}}</view> -->

pages/detail/index.js

@@ -50,7 +50,7 @@ Page({
     minReward: 0, //入职最低奖励
     isLogin: false,
     showShare: false,
-    shareImg: ''
+    shareImg: '',
   },
   onLoad: function (options) {
     if (options.scene) {

pages/detail/index.wxml

@@ -610,7 +610,7 @@
 
 
 <!-- btn -->
-<view class="btn-group fixed-footer">
+<view class="btn-group fixed-footer safe_area">
 	<form bindsubmit="applyJob" report-submit='true' wx:if="{{positionCategory!=4 && !isApply}}">
 		<view class="button">
 			<view class="call-kefu" bindtap='callPhone'>电话咨询</view>
@@ -731,4 +731,4 @@
 		</view>
 	</view>
 </view>
-<kefu />
+<kefu top='515'/>

pages/detail/index.wxss

@@ -1391,4 +1391,4 @@ page {
   height: 22rpx;
   background: rgba(30, 98, 167, 1);
   border-radius: 3rpx;
-}
+}

pages/expense/pages/return-fee/detail.wxml

@@ -1,5 +1,5 @@
 <!--pages/return-fee/pages/return-fee/detail.wxml-->
-<view class="container">
+<view class="container safe_area">
 	<view class="header">
 		<view class="cell">
 			<text>入职企业：</text>

pages/expense/pages/return-fee/index.wxml

@@ -1,7 +1,7 @@
 <!--pages/return-fee/index.wxml-->
 
 
-<view class="container">
+<view class="container safe_area">
 
 	<view class="header">
 		<view class="cell">

pages/expense/pages/wages/detail.wxml

@@ -1,6 +1,6 @@
 <!--pages/wages/detail.wxml-->
 <wxs src="./index.wxs" module="Tools" />
-<view class="container">
+<view class="container safe_area">
   <view class="title" wx:if='{{close}}'>
     <text>工资条仅作参考，实际以企业发放为准</text>
     <image src="../../images/wages-close.png" bindtap="close"></image>

pages/expense/pages/wages/index.wxml

@@ -105,7 +105,7 @@
 </view> -->
 
 <wxs src="./index.wxs" module="Tools"></wxs>
-<view class="container">
+<view class="container safe_area">
 
 	<view class="header">
 		<view class="cell">

pages/fulltime/index.wxml

@@ -2,7 +2,7 @@
 <!-- 顶部筛选 -->
 <condition-screening show_settlement='{{false}}' cityName='{{cityName}}' areaList='{{areaList}}' bind:area='chooseArea' bind:salay='doSalay' bind:distince='doDistince' />
 <!-- 列表 -->
-<view wx:if="{{list.length !=0 }}" class="fulltime">
+<view wx:if="{{list.length !=0 }}" class="fulltime safe_area">
 	<fulltime list='{{list}}' isScroll='{{isScroll}}' showNoMore='{{showNoMore}}' bind:action='toDetail' />
 </view>
 <block wx:else>

pages/identification/index.wxml

@@ -60,6 +60,6 @@
 </view>
 
 
-<form bindsubmit="submit" report-submit='true' class="btn-group fixed-footer">
+<form bindsubmit="submit" report-submit='true' class="btn-group fixed-footer safe_area">
   <button class="distance selfBtn" form-type="submit">提交</button>
 </form>

pages/identification/index.wxss

@@ -129,23 +129,27 @@
 
 /* btn */
 
+
 .fixed-footer {
   position: fixed;
-  bottom: 0;
   left: 0;
+  bottom: 0;
   width: 100%;
+
 }
 
 .btn-group {
-  width: 100%;
-  padding: 20rpx;
-  box-sizing: border-box;
+  height: 124rpx;
+  background: #fff;
+  display: flex;
+  align-items: center;
+  justify-content: center;
 }
 
 .selfBtn {
   display: flex;
   height: 88rpx;
-  line-height: 88rpx;
+  width: 690rpx;
   align-items: center;
   /* box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.1); */
   background: #0177FF;

pages/index/index.wxml

@@ -71,7 +71,7 @@
 </view>
 
 <!-- 热门岗位 -->
-<view class='box-body'>
+<view class='box-body safe_area'>
 	<view class='box_title'>为您推荐：</view>
 	<list list='{{list}}' margin='{{20}}' isScroll='{{isScroll}}' showNoMore='{{showNoMore}}' bind:action='toDetail' />
 </view>

pages/integral/pages/gift/gift.wxml

@@ -7,7 +7,7 @@
   </view>
   <navigator hover-class="none" class="detail" data-url="/pages/integral/pages/exchange-record/exchange-record?type={{type}}" url="/pages/integral/pages/exchange-record/exchange-record?type={{type}}">查看兑换记录 ></navigator>
 </view>
-<view class="container">
+<view class="container safe_area">
   <view class="content">
     <navigator class="cell" wx:for='{{list}}' wx:key='index' hover-class="none" url="/pages/integral/pages/gift-detail/gift-detail?id={{item.id}}&&type={{type}}">
       <image src="{{item.rewardPic || item.activityPic}}" class="images"></image>

pages/integral/pages/task/task.wxml

@@ -1,6 +1,6 @@
 <!--pages/task/task.wxml-->
 <wxs src="../../../tools.wxs" module="globalTools" />
-<view class="container">
+<view class="container safe_area">
   <view class="title">- 每日任务 -</view>
   <view class="integral-content">
 

pages/interview/index.wxml

@@ -1,6 +1,6 @@
 <!--pages/search-result/search-result.wxml-->
 <block wx:if="{{list.length != 0}}">
- <view class='box-body'>
+ <view class='box-body safe_area'>
     <list list='{{list}}' margin='{{20}}' isScroll='{{isScroll}}' showNoMore='{{showNoMore}}' bind:action='toDetail' />
   </view>
 </block>

pages/jianli/index.wxml

@@ -1,5 +1,5 @@
 <wxs src="../tools.wxs" module="globalTools" />
-<jianli userResume='{{userResume}}' expList='{{expList}}' edit='{{true}}' bind:user='toUserInfo' bind:job='toUserJob' bind:edit='toUserWorks'  bind:creat='toUserWorks'/>
+<jianli userResume='{{userResume}}' expList='{{expList}}' edit='{{true}}' bind:user='toUserInfo' bind:job='toUserJob' bind:edit='toUserWorks'  bind:creat='toUserWorks' class='safe_area'/>
 <!-- <view class="container">
   <view class='card'>
     <image class="avatar" src="{{userResume.headImg}}" />

pages/jipin/index.wxml

@@ -3,7 +3,7 @@
 <condition-screening show_settlement='{{false}}' cityName='{{cityName}}' areaList='{{areaList}}' bind:area='chooseArea' bind:salay='doSalay' bind:distince='doDistince'/>
 
 <!-- 列表 -->
-<view wx:if="{{list.length !=0 }}" class="jipin">
+<view wx:if="{{list.length !=0 }}" class="jipin safe_area">
 	<jipin list='{{list}}' isScroll='{{isScroll}}' showNoMore='{{showNoMore}}' bind:action='toDetail' show_img='{{false}}' />
 </view>
 <block wx:else>

pages/mine/index.wxml

@@ -177,6 +177,7 @@
 			<image class='' src='{{imgServerUrl}}/images/happyjob/rightwjt.png'></image>
 		</view>
 	</view>
+	<view class="safe_area"></view>
 	<!-- <view class="bottom"></view> -->
 	<i-modal visible="{{ visible }}" actions="{{ actions }}" bind:click="handel">
 		<view style="padding:15rpx 30px;color:#000;font-size:34rpx;font-wight:500;">{{message_title}}前需要通过实名认证，是否现在认证</view>

pages/parttime/index.wxml

@@ -2,7 +2,7 @@
 <!-- 顶部筛选 -->
 <condition-screening show_salay='{{false}}' cityName='{{cityName}}' areaList='{{areaList}}' bind:area='chooseArea' bind:settlemethod='doSettlemethod' bind:distince='doDistince' />
 <!-- 列表 -->
-<view wx:if="{{list.length !=0 }}" class="parttime">
+<view wx:if="{{list.length !=0 }}" class="parttime safe_area">
 	<parttime list='{{list}}' isScroll='{{isScroll}}' showNoMore='{{showNoMore}}' bind:action='toDetail' />
 </view>
 <block wx:else>

pages/payment-details/payment-details.wxml

@@ -1,6 +1,6 @@
 <!--pages/payment-details/payment-details.wxml-->
 <wxs src="payment-details.wxs" module="Tools"></wxs>
-<view class="container">
+<view class="container safe_area">
 
 	<view class="cell" wx:for='{{list}}' wx:key='index'>
 		<view class="info">

pages/reward/index.wxml

@@ -3,7 +3,7 @@
 <!-- 顶部筛选 -->
 <condition-screening show_settlement='{{false}}' cityName='{{cityName}}' areaList='{{areaList}}' bind:area='chooseArea' bind:salay='doSalay' bind:distince='doDistince' />
 <!-- 列表 -->
-<view wx:if="{{list.length !=0 }}" class="reward">
+<view wx:if="{{list.length !=0 }}" class="reward safe_area">
 	<reward list='{{list}}' isScroll='{{isScroll}}' showNoMore='{{showNoMore}}' bind:action='toDetail' />
 </view>
 <block wx:else>

pages/setting/pages/set/index.wxml

@@ -29,7 +29,7 @@
 	<view class='content'>注销账户</view>
 	<image class='jiantou' src='{{imgServerUrl}}/images/happyjob/rightwjt.png'></image>
 </view>
-<view class='btn-group fixed-footer'>
+<view class='btn-group fixed-footer safe_area'>
 	<button class='selfBtn' bindtap='login_out'>退出登录</button>
 </view>
 

pages/setting/pages/set/index.wxss

@@ -37,17 +37,21 @@
   left: 0;
   bottom: 0;
   width: 100%;
+
 }
 
 .btn-group {
+  height: 124rpx;
   background: #fff;
-  padding: 20rpx;
-  box-sizing: border-box;
+  display: flex;
+  align-items: center;
+  justify-content: center;
 }
 
 .selfBtn {
   display: flex;
   height: 88rpx;
+  width: 690rpx;
   line-height: 88rpx;
   align-items: center;
   justify-content: center;

project.config.json

@@ -13,7 +13,7 @@
 		]
 	},
 	"setting": {
-		"urlCheck": false,
+		"urlCheck": true,
 		"es6": true,
 		"enhance": true,
 		"postcss": true,
@@ -37,11 +37,13 @@
 		"bundle": true,
 		"useIsolateContext": true,
 		"useCompilerModule": true,
-		"userConfirmedUseCompilerModuleSwitch": true
+		"userConfirmedUseCompilerModuleSwitch": true,
+		"packNpmManually": false,
+		"packNpmRelationList": []
 	},
 	"compileType": "miniprogram",
 	"libVersion": "2.8.3",
-	"appid": "wx5ae6908ae55edcb7",
+	"appid": "wx1e8ed93850777ffb",
 	"projectname": "kaixin",
 	"debugOptions": {
 		"hidedInDevtools": []
@@ -357,7 +359,7 @@
 					"id": 40,
 					"name": "面试登记",
 					"pathName": "pages/interview-registration/index",
-					"query": "url=http://192.168.1.122:8082/interview/xiapu&&registerCompanyId=1",
+					"query": "url=http://192.168.19.118:8082/interview/xiapu&&registerCompanyId=1",
 					"scene": null
 				},
 				{