新增免责弹窗

app.js

@@ -13,6 +13,8 @@ import {
 var startTime = Date.now(); //启动时间
 App({
   onLaunch: function (options) {
+    // 设置城市列表
+    this.setAreaList();
     this.aldstat.sendEvent('小程序的启动时长', {
       time: Date.now() - startTime
     })
@@ -24,6 +26,12 @@ App({
       .then(res => {
         wx.aldPushSendOpenid(res.data.openId)
       })
+  },
+  onShow(options) {
+    //群聊信息
+    if (options.shareTicket) {
+      this.getShareInfo(options.shareTicket)
+    }
     // 小程序版本更新
     if (wx.getUpdateManager) {
       const updateManager = wx.getUpdateManager()
@@ -61,12 +69,6 @@ App({
         content: '当前微信版本过低，部分功能可能无法使用，请升级到最新微信版本后重试。'
       })
     }
-  },
-  onShow(options) {
-    //群聊信息
-    if (options.shareTicket) {
-      this.getShareInfo(options.shareTicket)
-    }
     // wx.onAppRoute((data) => {
     //   const route = getCurrentPages();
     //   const page = route[route.length - 1];
@@ -135,4 +137,48 @@ App({
       url: '/pages/login/login',
     })
   },
+  setAreaList() {
+    if (!wx.getStorageSync('areaList')) {
+      wx.setStorageSync('areaList', [{
+        "countryCode": "",
+        "countryName": "不限",
+        "firstNameLetter": "X"
+      }, {
+        "countryCode": "320205",
+        "countryName": "锡山区",
+        "firstNameLetter": "X"
+      },
+      {
+        "countryCode": "320206",
+        "countryName": "惠山区",
+        "firstNameLetter": "H"
+      },
+      {
+        "countryCode": "320211",
+        "countryName": "滨湖区",
+        "firstNameLetter": "B"
+      },
+      {
+        "countryCode": "320213",
+        "countryName": "梁溪区",
+        "firstNameLetter": "L"
+      },
+      {
+        "countryCode": "320214",
+        "countryName": "新吴区",
+        "firstNameLetter": "X"
+      },
+      {
+        "countryCode": "320281",
+        "countryName": "江阴市",
+        "firstNameLetter": "J"
+      },
+      {
+        "countryCode": "320282",
+        "countryName": "宜兴市",
+        "firstNameLetter": "Y"
+      }
+      ])
+    }
+  }
 })

components/position/position.wxml

@@ -45,7 +45,7 @@
           </block>
           <view class='commpany' wx:else>{{item.hpCompany.companyName}}</view>
           <view class='area'>
-            <text class='area-name'><text>{{Tools.formatTime(item.updateDate)}}</text></text>
+            <text class='area-name'><text>{{Tools.formatTime(item.createDate || item.updateDate)}}</text></text>
           </view>
         </view>
         <view class="address">

components/position/position.wxs

@@ -17,9 +17,10 @@ function formatTime(date) {
   date = date.replace(getRegExp('-', 'g'), '/');
   var _date = null;
   _date = getDate(date);
+  var year = _date.getFullYear();
   var month = _date.getMonth() + 1;
   var day = _date.getDate();
-  return [month, day].map(formatNumber).join('-')
+  return [year,month, day].map(formatNumber).join('-')
 }
 
 function formatNumber(n) {

components/position/position.wxss

@@ -265,7 +265,7 @@
 }
 
 .box-item .four .area {
-	width: 100rpx;
+	width: 175rpx;
 	text-align: right;
 	color: #444;
 	font-size: 26rpx;

pages/city/index.wxml

@@ -58,7 +58,7 @@
       </block>
 
       <view class="item_letter">{{item.firstNameLetter}}</view>
-      <view class="item_city" wx:for="{{item.cityInfo}}" wx:for-item="ct" wx:key="{{ct.cityCode}}" 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>

pages/index/index.js

@@ -46,52 +46,20 @@ Page({
     showNoMore: "没有更多信息...", //显示已无更多
     broadcastList: [],
     imgServerUrl: imgServerUrl,
-    hasLocation1: false,
+    hasLocation1: true,
+    disclaimer: false, //是否展示防欺诈弹窗 默认不弹出
   },
   onLoad: function () {
-    if (!wx.getStorageSync('areaList')) {
-      wx.setStorageSync('areaList', [{
-        "countryCode": "",
-        "countryName": "不限",
-        "firstNameLetter": "X"
-      }, {
-        "countryCode": "320205",
-        "countryName": "锡山区",
-        "firstNameLetter": "X"
-      },
-      {
-        "countryCode": "320206",
-        "countryName": "惠山区",
-        "firstNameLetter": "H"
-      },
-      {
-        "countryCode": "320211",
-        "countryName": "滨湖区",
-        "firstNameLetter": "B"
-      },
-      {
-        "countryCode": "320213",
-        "countryName": "梁溪区",
-        "firstNameLetter": "L"
-      },
-      {
-        "countryCode": "320214",
-        "countryName": "新吴区",
-        "firstNameLetter": "X"
-      },
-      {
-        "countryCode": "320281",
-        "countryName": "江阴市",
-        "firstNameLetter": "J"
-      },
-      {
-        "countryCode": "320282",
-        "countryName": "宜兴市",
-        "firstNameLetter": "Y"
-      }
-      ])
+    // 如果传进来的值是 '1' 则展示防欺诈弹窗
+    if (!wx.getStorageSync('disclaimer')) {
+      wx.hideTabBar({
+        success: () => {
+          this.setData({
+            disclaimer: true
+          })
+        }
+      })
     }
-    this.start();
   },
   reload() {
     this.onPullDownRefresh();
@@ -101,23 +69,16 @@ Page({
     this.fetchList();
   },
   onShow: function () {
-    var self = this;
-    let cityName = wx.getStorageSync('city') || '无锡';
-    let cityCode = wx.getStorageSync('cityCode') || '320200';
     this.setData({
-      cityName: cityName,
-      cityCode: cityCode
+      cityName: wx.getStorageSync('city') || '无锡',
+      cityCode: wx.getStorageSync('cityCode') || '320200',
+      pageNo: 1, //当前分页
+      isScroll: true, //是否可以滚动
+      filter: -1, //岗位类型
+      list: [],
+    }, _ => {
+      this.start();
     })
-    if (self.data.hasLocation1) {
-      self.setData({
-        pageNo: 1, //当前分页
-        isScroll: true, //是否可以滚动
-        filter: -1, //岗位类型
-        list: [],
-        hasLocation1: false
-      })
-      self.start();
-    }
   },
   //下拉刷新
   onPullDownRefresh: function () {
@@ -126,8 +87,9 @@ Page({
       isScroll: true, //是否可以滚动
       filter: -1, //岗位类型
       list: [],
+    }, _ => {
+      this.start();
     })
-    this.start();
   },
   //上拉加载
   onReachBottom: function () {
@@ -160,19 +122,18 @@ Page({
     if (!this.data.isScroll) {
       return false
     }
+
     let paramsObj = {
       cityCode: this.data.cityCode,
       pageNo: this.data.pageNo
     }
-    Object.assign(paramsObj);
 
-    getIndexList(paramsObj).then(data => {
+    getIndexList(Object.assign(paramsObj)).then(data => {
       var pageNo = data.data.pageNo;
       let setData = {};
       // 是否可以滚动加载数据
       if (data.data.isLast) {
         setData.isScroll = false
-
       }
       if (data.data.hotPosition.length != 0) {
         setData.list = this.data.list.concat(data.data.hotPosition)
@@ -296,4 +257,15 @@ Page({
       url: '../city/index',
     })
   },
+  // 知晓规则
+  knowDisclaimer() {
+    this.setData({
+      disclaimer: false
+    })
+    wx.showTabBar({
+      success: _ => {
+        wx.setStorageSync('disclaimer', true)
+      }
+    })
+  }
 })

pages/index/index.wxml

@@ -20,7 +20,7 @@
 	</view>
 </view>
 <!-- 轮播 -->
-<view class="swiper" wx:if='{{list.length}}'>
+<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'>
@@ -30,7 +30,7 @@
 	</swiper>
 </view>
 <!-- 滚动 -->
-<view class='marquee' wx:if='{{list.length}}'>
+<view class='marquee'>
 	<view class='broadcast'>
 		<image src='/images/happyjob/index_hot.png'></image>
 		<text>开心头条：</text>
@@ -49,7 +49,7 @@
 </view>
 
 <!-- 岗位 -->
-<view class="activity-box" wx:if='{{list.length}}'>
+<view class="activity-box">
 	<view class="activity">
 		<block wx:for="{{activity}}" wx:key="text">
 			<view class="activity-item" bindtap='changeList' data-index="{{index}}" hover-class="none">
@@ -60,7 +60,7 @@
 	</view>
 </view>
 <!-- 岗位2 -->
-<view class="activity-box2" wx:if='{{list.length}}'>
+<view class="activity-box2">
 	<view class="activity2">
 		<block wx:for="{{activity_two}}" wx:key="text">
 			<view class="activity-item2" bindtap='changeList2' data-index="{{index}}" hover-class="none">
@@ -71,7 +71,7 @@
 </view>
 
 <!-- 热门岗位 -->
-<view class='box-body' wx:if='{{list.length}}'>
+<view class='box-body'>
 	<view class='box_title'>为您推荐：</view>
 	<list list='{{list}}' margin='{{20}}' isScroll='{{isScroll}}' showNoMore='{{showNoMore}}' bind:action='toDetail' />
 </view>
@@ -89,4 +89,13 @@
 		<text class="text">请在地球有信号的地方使用</text>
 	</view>
 	<view class="reload" bindtap="reload">刷新试试</view>
+</view>
+
+<view class="disclaimer" wx:if='{{disclaimer}}'>
+	<image class="disclaimer-image" src="{{imgServerUrl}}/images/happyjob/disclaimer.png"></image>
+	<view class="disclaimer-button-content">
+		<view class="disclaimer-button" bindtap="knowDisclaimer">
+			<text>我已知晓，进入开心工作</text>
+		</view>
+	</view>
 </view>

pages/index/index.wxss

@@ -331,4 +331,42 @@ page {
   color: #999;
   font-size: 28rpx;
   margin-top: 16rpx;
+}
+
+/* 反欺诈 */
+.disclaimer {
+  height: 100%;
+  width: 100%;
+  background: rgba(0, 0, 0, 0.6);
+  position: fixed;
+  left: 0;
+  top: 0;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+}
+
+.disclaimer-image {
+  height: 700rpx;
+  width: 680rpx;
+  margin-bottom: 50rpx;
+}
+
+.disclaimer-button-content {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.disclaimer-button {
+  height: 100rpx;
+  width: 560rpx;
+  color: #fff;
+  font-size: 32rpx;
+  background: #0177FF;
+  border-radius: 64rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
 }

pages/interview/index.js

@@ -1,13 +1,8 @@
 import {
-  imgServerUrl,
-  imgServerUrl_new
-} from '../../config/config.js'
+  imgServerUrl} from '../../config/config.js'
 import {
   myInterViewList
 } from '../../services/index.js'
-import {
-  showToast
-} from '../../utils/tips.js'
 var app = getApp();
 
 Page({
@@ -68,7 +63,11 @@ Page({
         setData.isScroll = false
       }
       if (data.data.myInterView.length != 0) {
-        setData.list = this.data.list.concat(data.data.myInterView)
+        setData.list = this.data.list.concat(data.data.myInterView.map(value => {
+          // 获取面试邀请ID
+          value.hpPosition.position.id = value.id;
+          return value.hpPosition.position
+        }))
         setData.pageNo = pageNo;
       } else {
         setData.list = this.data.list;

pages/mine/index.js

@@ -68,6 +68,10 @@ Page({
         app.globalData.userInfo = userInfo;
       }
       this.start();
+    } else {
+      wx.navigateTo({
+        url: '/pages/login/login',
+      })
     }
     this.setData({
       avatar: (app.globalData.userInfo && app.globalData.userInfo.avatarUrl) ? app.globalData.userInfo.avatarUrl : `${imgServerUrl}/images/avatar/man.png`,

utils/http.js

@@ -58,6 +58,11 @@ const http = (params) => {
       dataType: params.dataType, //返回的数据格式,默认为JSON，特殊格式可以在调用的时候传入参数
       responseType: params.responseType, //响应的数据类型
       success: function (res) {
+        wx.hideLoading({
+          success: () => {
+            loading = true
+          }
+        });
         if (res.statusCode == 200) {
           var errorCode = res.data.errcode
           if (errorCode == 0) {
@@ -141,6 +146,11 @@ const http = (params) => {
         }
       },
       fail: function (e) {
+        wx.hideLoading({
+          success: () => {
+            loading = true
+          }
+        });
         wx.showToast({
           icon: "none",
           title: "网络异常",
@@ -165,11 +175,6 @@ const http = (params) => {
         } catch (error) {
           console.log(error);
         }
-        wx.hideLoading({
-          success: () => {
-            loading = true
-          }
-        });
       }
     })
   })