diff --git a/assets/images/job.png b/assets/images/job.png index 6ac9003..1532e22 100644 Binary files a/assets/images/job.png and b/assets/images/job.png differ diff --git a/assets/images/job1.png b/assets/images/job1.png index 30a4d33..640bc2a 100644 Binary files a/assets/images/job1.png and b/assets/images/job1.png differ diff --git a/assets/images/me.png b/assets/images/me.png index d612e55..96fe566 100644 Binary files a/assets/images/me.png and b/assets/images/me.png differ diff --git a/assets/images/me1.png b/assets/images/me1.png index 5552658..34e9602 100644 Binary files a/assets/images/me1.png and b/assets/images/me1.png differ diff --git a/images/job.png b/images/job.png index 6ac9003..1532e22 100644 Binary files a/images/job.png and b/images/job.png differ diff --git a/images/job1.png b/images/job1.png index 30a4d33..640bc2a 100644 Binary files a/images/job1.png and b/images/job1.png differ diff --git a/images/me.png b/images/me.png index d612e55..96fe566 100644 Binary files a/images/me.png and b/images/me.png differ diff --git a/images/me1.png b/images/me1.png index 5552658..34e9602 100644 Binary files a/images/me1.png and b/images/me1.png differ diff --git a/pages/detail/index.js b/pages/detail/index.js index b4fdb30..ede5260 100644 --- a/pages/detail/index.js +++ b/pages/detail/index.js @@ -60,7 +60,8 @@ Page({ shareListImg: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/detail830-1.png", shareDetailImg: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/posterbg1.1.png", posterImg: "", - safeBottom:wx.getWindowInfo().screenHeight - wx.getWindowInfo().safeArea.height+'px' + safeBottom:wx.getWindowInfo().screenHeight - wx.getWindowInfo().safeArea.height+'px', + swiperHeight:0 }, showdialog() { this.setData({ @@ -91,6 +92,18 @@ Page({ } else { this.wxLogin(); } + + var query = wx.createSelectorQuery(); + query.select(".page-section").boundingClientRect(); + query.exec(function (res) { + //res就是 所有标签为v1的元素的信息 的数组 + console.log(res); + //取高度 + console.log(res[0].height); + that.setData({ + swiperHeight: res[0].height, + }); + }); that.searchAnimate(); console.log(that.data.userInfo); @@ -223,7 +236,8 @@ Page({ }, searchAnimate() { - let that = this; + let that = this; + wx.createSelectorQuery() .select("#listBox") .fields( @@ -247,7 +261,7 @@ Page({ scrollSource: "#listBox", timeRange: 1000, startScrollOffset: 0, - endScrollOffset: 120, + endScrollOffset: that.data.swiperHeight - 34, } ); this.animate( @@ -274,7 +288,20 @@ Page({ .exec(); }, - + // onReady() { + // let that = this; + // var query = wx.createSelectorQuery(); + // query.select(".page-section").boundingClientRect(); + // query.exec(function (res) { + // //res就是 所有标签为v1的元素的信息 的数组 + // console.log(res); + // //取高度 + // console.log(res[0].height); + // that.setData({ + // swiperHeight: res[0].height, + // }); + // }); + // }, getAgencyInfo(job) { var that = this; diff --git a/pages/detail/index.wxss b/pages/detail/index.wxss index 7027243..1d6e5e7 100644 --- a/pages/detail/index.wxss +++ b/pages/detail/index.wxss @@ -424,6 +424,7 @@ button.collectBtn { z-index: 999; left: 0; right: 0; + opacity: 0; } .navigatorBar .tabs { position: relative; diff --git a/pages/index/index.js b/pages/index/index.js index e880df4..f14b3f2 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -3,6 +3,7 @@ const app = getApp(); const commonUtil = require("../../utils/commonUtil.js"); Page({ data: { + swiperHeight:0, toped: "1", chaShowed: false, isTrigger: false, @@ -1473,7 +1474,19 @@ Page({ onShow() { let that = this; that.data.storeJobListSearchForm.pageNum = 1; - wx.setStorageSync("BILLFROM", "firstBill"); + wx.setStorageSync("BILLFROM", "firstBill"); + + var query = wx.createSelectorQuery(); + query.select(".toppic").boundingClientRect(); + query.exec(function (res) { + //res就是 所有标签为v1的元素的信息 的数组 + console.log(res); + //取高度 + console.log(res[0].height); + that.setData({ + swiperHeight: res[0].height, + }); + }); // wx.showTabBar({ // success(e) {}, @@ -2974,7 +2987,7 @@ Page({ scrollSource: "#listBox", timeRange: 1000, startScrollOffset: 0, - endScrollOffset: 200, + endScrollOffset: that.data.swiperHeight - 34, } ); } diff --git a/pages/index/index.wxml b/pages/index/index.wxml index f711d72..05fd007 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -6,7 +6,7 @@ - + 郑州一才企业管理有限公司 diff --git a/pages/mine/index.wxml b/pages/mine/index.wxml index 3f78c28..233739a 100644 --- a/pages/mine/index.wxml +++ b/pages/mine/index.wxml @@ -23,7 +23,7 @@ - + 去认证 @@ -53,8 +53,8 @@ 账户余额(元) - - + + {{balance}} **** diff --git a/pages/mine/setting/index.wxml b/pages/mine/setting/index.wxml index 9d57ae1..44b87a8 100644 --- a/pages/mine/setting/index.wxml +++ b/pages/mine/setting/index.wxml @@ -28,7 +28,7 @@ - 关于职位云 + 关于一才 版本{{version}} diff --git a/pages/mine/versionPage/index.wxml b/pages/mine/versionPage/index.wxml index 5ad1150..5649e16 100644 --- a/pages/mine/versionPage/index.wxml +++ b/pages/mine/versionPage/index.wxml @@ -1,7 +1,7 @@ - -

职位云

+ +

一才

Version {{version}}