xx

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;

pages/detail/index.wxss

@@ -424,6 +424,7 @@ button.collectBtn {
   z-index: 999;
   left: 0;
   right: 0;
+  opacity: 0;
 }
 .navigatorBar .tabs {
 	position: relative;

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,
 						}
           );
 				}

pages/index/index.wxml

@@ -6,7 +6,7 @@
   <scroll-view id="listBox" bindscrolltolower="onScrollToLower" scroll-top="{{topNum}}" enhanced binddragstart="listTouchStart" bindscroll="listTouchMove" style="height:calc(100vh)" enable-passive scroll-x="false" scroll-y="true" scroll-into-view="{{scrollTo}}" scroll-with-animation="false" enable-back-to-top="true">
     <view class hover-class="none" hover-stop-propagation="false">
       <view class="pr" bindtap="sendMsg">
-    <image src="https://matripe-cms.oss-cn-beijing.aliyuncs.com/pugongying/yicai.png" mode="aspectFill" style="width: 100vw;height:calc(100vw * 265 / 375);display:block;" class="db"></image>
+    <image src="https://matripe-cms.oss-cn-beijing.aliyuncs.com/pugongying/yicai.png" mode="aspectFill" style="width: 100vw;height:calc(100vw * 265 / 375);display:block;" class="db toppic"></image>
     <view class="cf f18 fwb pa ml10" style="bottom:16px">郑州一才企业管理有限公司</view>
   </view>
   <view class="bgf" style="padding: 8px 10px 16px;">

pages/mine/index.wxml

@@ -23,7 +23,7 @@
       </view>
       <view hover-class="thover">
         <view>
-          <i wx:if="{{userInfo.user.idauth}}" class="iconfont icon-yirenzheng color-f40 f20"></i>
+          <i wx:if="{{userInfo.user.idauth}}" class="t-icon t-icon-yirenzheng color-f40 f20"></i>
           <view wx:else class hover-class="none" hover-stop-propagation="false">去认证</view>
         </view>
         <text class="iconfont icon-gengduo11 c9"></text>
@@ -53,8 +53,8 @@
 <view class="moneyView" hover-class="thover">
   <navigator url="{{'/pages/mine/wxMoney/index'}}" class="display-flex" hover-class="none">
     <view class="moneyText flex-1">账户余额（元）
-      <view class="iconfont icon-zhengyan f14 dib" style="padding: 8px;margin-left: -8px;" wx:if="{{showMoney}}" catchtap="openEyes" hover-stop-propagation></view>
-      <view class="iconfont icon-biyan f14 dib" style="padding: 8px;margin-left: -8px;" wx:if="{{!showMoney}}" catchtap="closeEyes" hover-stop-propagation></view>
+      <view class="iconfont icon-zhengyan f14" style="padding: 8px;margin-left: -8px;display: inline;" wx:if="{{showMoney}}" catchtap="openEyes" hover-stop-propagation></view>
+      <view class="iconfont icon-biyan f14" style="padding: 8px;margin-left: -8px;display: inline;" wx:if="{{!showMoney}}" catchtap="closeEyes" hover-stop-propagation></view>
       <view class="v-center mt8">
       <view class="moneyM" wx:if="{{showMoney}}">{{balance}}</view>
       <view class="moneyM" wx:if="{{!showMoney}}">****</view>

pages/mine/setting/index.wxml

@@ -28,7 +28,7 @@
 
     <navigator class target url="../versionPage/index" hover-class="hcb" open-type="navigate">
       <view class="gender fsa">
-        <view>关于职位云</view>
+        <view>关于一才</view>
         <view class="fsa c9">
           <view class hover-class="none" hover-stop-propagation="false">版本{{version}}</view>
           <view class="iconfont icon-gengduo11 ml8"></view>

pages/mine/versionPage/index.wxml

@@ -1,7 +1,7 @@
 <view class="container display-flex">
   <view class="logoContainer display-flex">
-    <image class="" src="https://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/zhiweiyun.png" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""/>
-    <p class=" mt24 mb8">职位云</p>
+    <image class="" src="https://matripe-cms.oss-cn-beijing.aliyuncs.com/pugongying/yicaiLogoBgf.png" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""/>
+    <p class=" mt24 mb8">一才</p>
     <p class="">Version {{version}}</p>
   </view>
   <view class="copyRight f12">