同步

pages/firstBill/index.js

@@ -11,6 +11,8 @@ import {
 Page({
   data: {
     appId: app.globalData.appId,
+    innerScroll: true,
+    refreshabel: true,
     isSwiper: true,
     toped: "1",
     jobNum: 0, // 48小时更新职位数
@@ -4942,5 +4944,67 @@ Page({
   catchScrollInfo (e) {
     // console.log(e);
   },
+  handleOuterScroll (e) {
+    // console.log('handleOuterScroll', e);
+    let that = this
+    wx.createSelectorQuery()
+      .select("#sticky")
+      .boundingClientRect((e) => {
+        // console.log('e', e);
+        // if (that.data.innerScroll == true) {
+        if (e.top <= 0) {
+          that.setData({
+            innerScroll: true,
+            refreshabel: false
+          })
+        } else if (e.top >= 223) {
+          that.setData({
+            innerScroll: false,
+            refreshabel: true
+          })
+        }
+        // } else {
+
+        // }
+
+      }).exec()
+    return
+    wx.createSelectorQuery()
+      .select("#sticky")
+      .fields({
+        scrollOffset: true,
+        size: true,
+      }, (e) => {
+        console.log('e', e);
+        // that.setData({
+        //   outerScroll: true
+
+        // })
+      })
+
+    return true
+  },
+  handleInnerScroll (e) {
+    // console.log('handleInnerScroll', e);
+    let that = this
+    wx.createSelectorQuery()
+      .selectViewport("#sticky")
+      .scrollOffset((e) => {
+        console.log('e', e);
+        // if (e.changedTouches[0].pageY < 0) {
+        //   that.setData({
+        //     innerScroll: true
+
+        //   })
+        // } else {
+        //   that.setData({
+        //     innerScroll: false
+        //   })
+        // }
+
+      })
+
+    return false
+  }
 
 });

pages/firstBill/index.wxml

@@ -3,8 +3,7 @@
     <view class="tabs daotian display-flex fw500" style="width:128px;text-align:center;padding-top:{{statusBarHeight + ((navigationBarHeight - menuButtonHeight) / 2) + 4}}px;margin-top:{{}};font-size:34rpx;letter-spacing: 1px;">伯才供应链</view>
   </view>-->
   <!-- bindrefresherrefresh="onScrollRefresh" refresher-triggered="{{isTrigger}}" refresher-enabled="{{true}}" -->
-  <scroll-view type="nested" wx:if="{{appId == 'wxe431e0b3abd9ae0b' }}" reverse="{{true}}" refresher-enabled="{{false}}" bindrefresherrefresh="onScrollRefresh" scroll-top="{{topNum}}" enhanced decelerationDisabled="{{false}}" bounces="{{false}}" 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">
+  <scroll-view wx:if="{{appId == 'wxe431e0b3abd9ae0b' }}" reverse="{{true}}" refresher-enabled="{{false}}" bindrefresherrefresh="onScrollRefresh" scroll-top="{{topNum}}" enhanced decelerationDisabled="{{false}}" bounces="{{false}}" binddragstart="listTouchStart" bindscroll="listTouchMove" style="height:100vh;display:flex;flex-direction:column" enable-passive scroll-x="false" scroll-y="{{true}}" scroll-into-view="{{scrollTo}}" scroll-with-animation="false" enable-back-to-top="true" bindtouchmove="handleOuterScroll">
-    <nested-scroll-header>
     <view class hover-class="none" id="searchInputBox" hover-stop-propagation="false">
       <view class="the_city v-center" style hover-class="thover" bindtap="goCity">
         <view class="f16 fw500 dib oelps" style="width:36px">{{searchCityParamStorage.name == '' ? '全国' : searchCityParamStorage.shortName}}</view>
@@ -30,8 +29,6 @@
       </view>
       <!-- <image class style="width:40px;height:40px;margin-left:12px" bindtap="toEnroll" src="https://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/IOS/ksbm.svg" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror bindload></image> -->
     </view>
-    </nested-scroll-header>
-    <nested-scroll-header>
     <view class hover-class="none" wx:if="{{true}}" hover-stop-propagation="false">
       <view id="navBox" hover-class="none" hover-stop-propagation="false">
         <view class="bannerContainer">
@@ -58,10 +55,8 @@
         </view>
       </view>
     </view>
-    </nested-scroll-header>
 
-    <nested-scroll-header>
+    <view class="sticky" id="sticky" data-test="ceshi" hover-class="none" hover-stop-propagation="false">
-      <view class="sticky" id="sticky" hover-class="none" hover-stop-propagation="false">
       <!-- <view class="fsa " catchtouchmove="modalMove" style> -->
       <view class="fsa searchBar" style hover-class="none" hover-stop-propagation="false">
         <view class="fsa" hover-class="none" hover-stop-propagation="false">
@@ -441,7 +436,217 @@
           </scroll-view>
       </view>-->
     </view>
-    </nested-scroll-header>
+    <scroll-view id="listBox" bindscrolltolower="onScrollToLower" refresher-enabled="{{refreshabel}}" bindrefresherrefresh="onScrollRefresh" refresher-triggered="{{isTrigger}}" scroll-top="{{topNum}}" enhanced decelerationDisabled="{{false}}" bounces="{{false}}" binddragstart="listTouchStart" bindscroll="listTouchMove" style="flex:1;padding-bottom:82px;box-sizing:border-box" enable-passive scroll-x="false" scroll-y="{{innerScroll}}" scroll-into-view="{{scrollTo}}" scroll-with-animation="false" enable-back-to-top="true" >
+      <view class hover-class="none" hover-stop-propagation="false">
+        <!-- 标准列表 -->
+        <view style="display:{{toped == 1 ? 'block' : 'none'}}">
+          <!-- margin-top:{{(selectBrandList.length > 0 || selectJobList.length > 0 || activez != 'all' || sexid != '-1' ? 34 : 0) + statusBarHeight + ((navigationBarHeight - menuButtonHeight) / 2) + 132}}px -->
+          <view class="standardList" style="padding-top: 0;min-height: calc(100vh - {{selectBrandList.length > 0 || selectJobList.length > 0 || activez != 'zuigao' || sexid != '-1' ? '170px':'214px'}})">
+            <view class="tac cccc f12" style="width:100vw;position:absolute;top:-52px" hover-class="none" hover-stop-propagation="false">{{'最近更新' + jobNum + '条信息'}}</view>
+            <!-- bindrefresherrefresh="onScrollRefresh" {{isScrollTop}} -->
+            <!-- scroll-y="true" enable-back-to-top="true" bindscrolltolower="onScrollToLower" refresher-enabled="{{false}}" lower-threshold="30" refresher-triggered="{{isTrigger}}" class="jobCenterActive" scroll-with-animation="true" scroll-into-view="{{siv}}" style="height:calc(100vh - {{selectBrandList.length > 0 || selectJobList.length > 0 || activez != 'zuigao' || sexid != '-1'  ? (navigatorBarHeight + 48) : navigatorBarHeight}}px);" -->
+            <view>
+              <view x:if="{{recordList != null && recordList.length > 0}}" style="padding-top: 0;overflow-x: hidden;">
+                <job-sub storeJobListSearchForm="{{storeJobListSearchForm}}" bindgetPhoneNumber="getPhoneNumber" bindcollectPaste="collectPaste" bindgetUserInfoBtn="getUserInfoBtn" recordList="{{recordList}}" isLogin="{{isLogin}}" agencyStatus="{{agencyStatus}}" hasUserInfo="{{hasUserInfo}}" loginUserInfo="{{userInfo}}"></job-sub>
+                <view wx:if="{{(recordList == null || recordList.length == 0) }}" class="tc">
+                  <block wx:if="{{pageShow}}">
+                    <view class="t-icon t-icon-zanwu" style="width: 80px; height: 80px; margin: 50% auto 20px"></view>
+                    <view class="tc p20 f12 c045">没有符合条件的职位</view>
+                  </block>
+                </view>
+                <block wx:else>
+                  <block wx:if="{{isLogin}}">
+                    <view class="tc p20 f12 c045" wx:if="{{!hasMoreData && recordList.length != 0}}">已经到底啦～</view>
+                    <view class="tc p20 f12 c045" wx:if="{{hasMoreData }}">上滑加载更多</view>
+                  </block>
+                  <block wx:if="{{!isLogin}}">
+                    <view style="padding:0px 12px 10px;margin-top: -6px;">
+                      <text style="font-size: 14px;color: #999999;line-height: 20px;">未登录时只能使用部分功能，申请加入伯才供应链即可使用更多功能。</text>
+                    </view>
+                    <!-- <button class="clickMore mb20" open-type="getPhoneNumber" catchgetphonenumber="getPhoneNumber1" catchtap="emptyMethod">登录查看更多职位</button> -->
+                    <view class="mt12 f14 tc" bindtap="goLogin" style="color: #576b95;padding-bottom: 80px;">登录伯才</view>
+                    <!-- <view class="tc p20 f12 c045">已经到底啦～</view> -->
+                  </block>
+                </block>
+              </view>
+              <!-- <view wx:if="{{(recordList == null || recordList.length == 0) && pageShow}}" class="tc">
+              <view class="t-icon t-icon-zanwu" style="width: 80px; height: 80px; margin: 50% auto 20px"></view>
+              <view class="tc f14 c045">没有符合条件的职位</view>
+              </view>-->
+            </view>
+          </view>
+        </view>
+        <!-- 简版列表 -->
+        <view style="display:{{toped == 2 ? 'block' : 'none'}}">
+          <!-- margin-top:{{(selectBrandList.length > 0 || selectJobList.length > 0 || activez != 'all' || sexid != '-1'  ? 34 : 0) + statusBarHeight + ((navigationBarHeight - menuButtonHeight) / 2) + 132}}px -->
+          <view class="standardList" style="padding-top: 0;overflow-x: hidden;">
+            <!-- scroll-y="{{isScrollTop}}" enable-back-to-top="true" bindscrolltolower="onScrollToLower" bindrefresherrefresh="onScrollRefresh" refresher-enabled="{{!isScrollTop}}" refresher-triggered="{{isTrigger}}" class="jobCenterActive" scroll-with-animation="true" scroll-into-view="{{siv}}" style="height:calc(100vh - {{selectBrandList.length > 0 || selectJobList.length > 0 || activez != 'zuigao' || sexid != '-1'  ? (navigatorBarHeight + 48) : navigatorBarHeight }}px);" -->
+            <view>
+              <view x:if="{{recordList != null && recordList.length > 0}}" class style="padding-top: 0;">
+                <view class="jcenter bgf br8">
+                  <view class="listcontainer" style="border-top: 1px solid #f3f3f3;">
+                    <view class="jobOne" hover-start-time="50" hover-stay-time="0" wx:for="{{recordList}}" data-item="{{item}}" data-id="{{item.id}}" data-index="{{index}}" bindtap="goDrawer" wx:key="index" hover-class="ahoverd" style="background-color:{{item.recruitment == '1' ? '#fff':'#f5f5f5'}};padding: 0;">
+                      <view class="jobIn" style="border-bottom: 1px dashed #cccccc;padding: 12px 0;" hover-class="none">
+                        <image style="width: 80px;height: 80px;position: absolute;right: 100px;" src="http://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/tingzhao.svg" wx:if="{{item.state == 1 && item.recruitment == 2}}"></image>
+                        <image style="width: 72px;height: 72px;position: absolute;right: 100px;" src="http://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/weishangxian.svg" wx:if="{{item.state == 0}}"></image>
+                        <view class="display-flex">
+                          <view class="lNum" style="width: 60px;">{{index < 9?'0'+(index+1):index+1 }}</view>
+                          <view class="flex-1">
+                            <view class="jobTitle2">
+                              {{item.jobName}}
+                              <i class="iconfont icon-dianzan1 ysd-base-color fw400" wx:if="{{item.hotJob == 1}}"></i>
+                              <!-- <span class="f12 tagsLi ysd-basebg-color pl4 pr4" style="width:32px" hover-class="none" wx:if="{{item.hotJob == 1}}" hover-stop-propagation="false">
+                                <span class="cf" hover-class="none" hover-stop-propagation="false">主推</span>
+                              </span>-->
+                            </view>
+                            <view class="jobText fss" wx:if="{{item.salaryClassify != 7}}">
+                              <view class wx:if="{{item.salaryClassify == 0}}">
+                                <span class="f16">{{item.salaryClassifyValue}}</span>
+                                <span class="f14">元/时</span>
+                              </view>
+                              <view class wx:if="{{item.salaryClassify == 1}}">
+                                <span class="f16">{{item.salaryClassifyValue}}</span>
+                                <span class="f14">元/天</span>
+                              </view>
+                              <view class wx:if="{{item.salaryClassify == 2}}">
+                                <span class="f14">补</span>
+                                <span class="f16">{{item.salaryClassifyValue}}</span>
+                                <span class="f14">元</span>
+                              </view>
+                              <view class wx:if="{{item.salaryClassify == 3}}">
+                                <span class="f14">返</span>
+                                <span class="f16">{{item.salaryClassifyValue}}</span>
+                                <span class="f14">元</span>
+                              </view>
+                              <view class wx:if="{{item.salaryClassify == 4}}">计件</view>
+                              <view class wx:if="{{item.salaryClassify == 5}}">
+                                <span class="f14">保底</span>
+                                <span class="f16">{{item.salaryClassifyValue}}</span>
+                                <span class="f14">元</span>
+                              </view>
+                              <!-- <view class="" wx:if="{{item.salaryClassify == 7}}">月薪</view> -->
+                              ，{{item.age}}
+                            </view>
+                            <view class="jobText" wx:else>{{item.minMonthlyPay+'-'+item.maxMonthlyPay+'元/月'}}，{{item.age}}</view>
+                          </view>
+                          <button wx:if="{{!isLogin}}" class="biggerSize v-center {{item.collected - 1 == 0 ? 'collectred':''}}" open-type="getPhoneNumber" style="width:20px;background-color:#fff;padding:0;margin:0;height:24px;margin-right:13px" catchgetphonenumber="getPhoneNumber" catchtap="emptyMethod" data-type="4" data-collected="{{item.collected}}" data-jobid="{{item.id}}" hover-stop-propagation>
+                            <icon class="iconfont icon-shoucang f20 mt4 biggerSize" hover-class="f40" style="color: #888" hover-stop-propagation></icon>
+                            <!-- <icon class="iconfont icon-yishoucang f16 mt4" style="" wx:else></icon> -->
+                            <!-- <text class="f10  {{item.collected - 1 == 0 ? 'ysd-base-color':'c8'}}" style="line-height: 36px; margin-left: 2px">{{item.collected - 2 == 0 ? '收藏' : '已收藏'}}</text> -->
+                          </button>
+                          <view class="mt4" wx:else>
+                            <view class="iconfont icon-yishoucang f20 mt4 biggerSize" wx:if="{{item.collected - 1 == 0}}" catchtap="collectPaste" data-collected="{{item.collected}}" data-item="{{item}}" data-jobid="{{item.id}}" style="margin-right:12px;color: #1890ff;" hover-class="FF6933" hover-stop-propagation></view>
+                            <view class="iconfont icon-shoucang biggerSize f20 mt4" wx:else catchtap="collectPaste" hover-class="f40" data-item="{{item}}" style="margin-right:13px;color:#888" hover-stop-propagation></view>
+                          </view>
+                        </view>
+                        <view class="display-flex">
+                          <view style="width: 60px;margin-right: 12px;">
+                            <view class="daili">费</view>
+                          </view>
+                          <view class="flex-1">
+                            <view class="jobText">{{!isLogin ? '登录查看服务费' : (agencyStatus == 1 ? (item.fuWuFei ? item.fuWuFei : '-') : '服务费仅代理可见')}}</view>
+                          </view>
+                        </view>
+                        <view class="display-flex mt6" hover-class="none" hover-stop-propagation="false">
+                          <view style="width: 60px;margin-right: 12px;"></view>
+                          <view class="flex-1" hover-class="none" hover-stop-propagation="false">项目方: {{item.agencyName}}</view>
+                        </view>
+                      </view>
+                    </view>
+                  </view>
+                </view>
+                <block wx:if="{{(recordList == null || recordList.length == 0) && (storeJobListSearchForm.keys != null && storeJobListSearchForm.keys != '')}}">
+                  <view class="tc p20 f12 c045">没有符合条件的职位</view>
+                </block>
+                <block wx:else>
+                  <block wx:if="{{isLogin}}">
+                    <view class="tc p20 f12 c045" wx:if="{{!hasMoreData && recordList.length != 0}}">已经到底啦～</view>
+                    <view class="tc p20 f12 c045" wx:if="{{hasMoreData }}">上滑加载更多</view>
+                  </block>
+                  <block wx:if="{{!isLogin  && recordList.length != 0}}">
+                    <view style="padding:0px 12px 10px;margin-top: -6px;">
+                      <text style="font-size: 14px;color: #999999;line-height: 20px;">未登录时只能使用部分功能，申请加入伯才供应链即可使用更多功能。</text>
+                    </view>
+                    <!-- <button class="clickMore mb20" open-type="getPhoneNumber" catchgetphonenumber="getPhoneNumber1" catchtap="emptyMethod">登录查看更多职位</button> -->
+                    <view class="mt12 f14 tc" bindtap="goLogin" style="color: #576b95;padding-bottom: 80px;">登录伯才</view>
+                  </block>
+                </block>
+              </view>
+              <view wx:if="{{(recordList == null || recordList.length == 0) && pageShow}}" class="tc">
+                <view class="t-icon t-icon-zanwu" style="width: 80px; height: 80px; margin: 50% auto 20px"></view>
+                <view class="tc f14 c045">暂无记录</view>
+              </view>
+            </view>
+          </view>
+          <!-- <view class="fixedNum" wx:if="{{recordList.length > 0 && isLogin}}"><text class="f20">{{currPage}}</text>/{{totalPage}}</view> -->
+        </view>
+        <scroll-view class="fadeIn" wx:if="{{phoneDialog}}" style="position: relative; z-index: 9999">
+          <view class="weui-mask"></view>
+          <view class="weui-dialog p020" style="box-sizing: border-box">
+            <!-- <view class="weui-dialog__hd"><strong class="weui-dialog__title">{{pmdUserInfo.tel}}</strong></view> -->
+            <!-- <view class="weui-dialog__hd bb1">
+            <view>
+                <image wx:if="pmdUserInfo.imgSrc != ''" src="{{pmdUserInfo.imgSrc}}" style="width:56px;height:56px;border-radius:50%;"></image>
+                <image wx:else src="http://matripe.oss-cn-beijing.aliyuncs.com/defaultAva.png" style="width:56px;height:56px;border-radius:50%;"></image>
+            </view>
+            <view class="f20 c3">{{pmdUserInfo.userName}}</view>
+            <view class="f14 c9">客户经理</view>
+            <view class="mt20 f22 c3">{{pmdUserInfo.tel}}</view>
+            </view>-->
+            <view class="weui-dialog__hd bb1">
+              <!-- <image wx:if="pmdUserInfo.imgSrc != ''" src="{{pmdUserInfo.imgSrc}}" style="width:56px;height:56px;border-radius:50%;"></image> -->
+              <image src="http://matripe.oss-cn-beijing.aliyuncs.com/goodJob/bocaoLogo.png" style="width: 56px; height: 56px; border-radius: 50%"></image>
+              <view class="f20 c3">周耀锋</view>
+              <view class="f14 c9">专属客服</view>
+              <!-- <view class="mt20 f22 c3">{{pmdUserInfo.tel}}</view> -->
+              <view class="mt20 f22 c3">13937184434</view>
+            </view>
+            <view class="display-flex pb20" style="padding-top: 20px">
+              <view class="flex-1 lflex v-center" bindtap="close" hover-class="thover">取消</view>
+              <view class="rflex">
+                <button class type="primary" bindtap="makePhoneCall">呼叫</button>
+              </view>
+            </view>
+          </view>
+        </scroll-view>
+      </view>
+      <view aria-role="dialog" aria-modal="true" catchtouchmove="modalMove" class="fadeIn" wx:if="{{iosDialog}}">
+        <view class="weui-mask"></view>
+        <view class="weui-dialog contact tobe" style="box-sizing:border-box;">
+          <i class="iconfont icon-guanbi guanbi c6 biggerSize" bindtap="closeDialog"></i>
+          <view class="weui-dialog__hd">
+            <view class="f20 bbd1 top" hover-class="none" hover-stop-propagation="false">
+              <view class="fw500" hover-class="none" hover-stop-propagation="false">申请加入伯才</view>
+              <view class="f16 c6" hover-class="none" hover-stop-propagation="false">请联系客户经理</view>
+            </view>
+            <view class="bottom" hover-class="none" hover-stop-propagation="false">
+              <view class hover-class="none" hover-stop-propagation="false">
+                <view class="fw500 f18" hover-class="none" hover-stop-propagation="false">客户经理</view>
+                <view class="c3 f14">
+                  {{serviceInfo.userName }}
+                  <i class="mr4"></i>
+                  <p class>{{serviceInfo.tel || '0371-6611 3723'}}</p>
+                </view>
+                <view wx:if="{{isLoading}}" class style="position:absolute;left:50%;top:50%;transform:translate(-50%,-50%)" hover-class="none" hover-stop-propagation="false">
+                  <view aria-role="img" aria-label="加载中" style class="weui-primary-loading">
+                    <view class="weui-primary-loading__dot"></view>
+                  </view>
+                  <view class hover-class="none" hover-stop-propagation="false">加载中...</view>
+                </view>
+                <image src="{{serviceInfo.qrCode}}" bindload="imageLoad" show-menu-by-longpress="{{true}}" style="width: 161px;height: 161px;"></image>
+                <view class="f14 c9 mt6">长按识别二维码</view>
+              </view>
+            </view>
+          </view>
+        </view>
+      </view>
+
+      <!-- 智能匹配左侧弹出按钮 -->
+      <view class="leftButton dn {{halfHide ? 'halfHide' :''}} {{leftShow ? 'buttonShow':''}}" bindtap="showLeft" style="top:{{(systemInfo.windowHeight * 55) / 100}}px;background-color:{{innerFilter?'rgba(255, 68, 0,.6)':'rbga(0,0,0,.6)'}}">
+        <view class="column" hover-class="none" style="word-wrap: break-word;" hover-stop-propagation="false">智能匹配</view>
+        <i class="iconfont icon-huadong f12 ml4 {{leftShow?'rotate':''}}"></i>
+      </view>
+    </scroll-view>
   </scroll-view>
   <view class wx:else hover-class="none" hover-stop-propagation="false">
     <view class hover-class="none" id="searchInputBox" hover-stop-propagation="false">

pages/listSharePage/index.js

@@ -2171,7 +2171,7 @@ Page({
   getCode () {
     var that = this;
     return new Promise((resolve, reject) => {
-      customRequest('/yishoudan/store/job/batchqrcode?storeJobIds=' + this.data.checkedList.map(item => item.id).join(','), { header: 'headers', method: 'GET', data: {} }).then((res) => {
+      customRequest('/yishoudan/custom/job/batchqrcode?storeJobIds=' + this.data.checkedList.map(item => item.id).join(','), { header: 'headers', method: 'GET', data: {} }).then((res) => {
         that.setData({
           currCode: res.data.data.qrcode
         })

project.private.config.json

@@ -2,7 +2,7 @@
   "setting": {
     "compileHotReLoad": true,
     "urlCheck": false,
-    "skylineRenderEnable": true
+    "skylineRenderEnable": false
   },
   "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
   "projectname": "%E4%BC%AF%E6%89%8D%E4%BE%9B%E5%BA%94%E9%93%BE",