Merge branch 'develop' of http://101.37.147.115:3000/mz666/bocai_supplyChain into IOS

components/job-sub/index.js

@@ -45,11 +45,14 @@ Component({
   },
   lifetimes: {
     attached: function () {
-      app.getLoginUserTokenInfo().then(() => {
-        this.setData({
-          corpUserFlag: this.properties.loginUserInfo.corpUserFlag
-        })
-      });
+      console.log('wx.getStorageSync)', wx.getStorageSync('loginUser'));
+      let loginUserInfo = wx.getStorageSync('loginUser')
+      // app.getLoginUserTokenInfo().then(() => {
+      this.setData({
+        corpUserFlag: loginUserInfo.corpUserFlag,
+        agencyStatus: loginUserInfo.agencyStatus,
+      })
+      // });
 
       // 在组件实例进入页面节点树时执行
     },

components/job-sub/index.wxml

@@ -76,7 +76,7 @@
                   <image class="mr4" style="width:20px;height:20px;display:block" src="https://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/fee.svg" mode="aspecFill" lazy-load="false"></image>
                 </view>
                 <view class style="font-size:13px" wx:if="{{!isLogin}}" hover-class="none" hover-stop-propagation="false">登录查看</view>
-                <view class style="font-size:13px" wx:else hover-class="none" hover-stop-propagation="false">{{(agencyStatus == 1 ? (item.fuWuFei ? item.fuWuFei : '详询客服') : '仅代理可见') }}</view>
+                <view class style="font-size:13px" wx:else hover-class="none" hover-stop-propagation="false">{{(agencyStatus == 1 ? (item.fuWuFei || '详询客服') : '仅代理可见') }}</view>
               </view>
             </view>
           </view>

pages/firstBill/index.js

@@ -91,7 +91,6 @@ Page({
     chaShowed: false,
     isTrigger: false,
     // background: ["../../assets/images/banner1.jpg", "../../assets/images/banner2.jpg", "../../assets/images/banner3.jpg", "../../assets/images/banner4.jpg"],
-    pullNum: 0, //下拉次数
     tabs: [],
     activeTab: 0,
     systemInfo: {},
@@ -2917,8 +2916,11 @@ Page({
     console.log("====================================================");
     var that = this;
     if (app.globalData.isLogin) {
-      that.data.storeJobListSearchForm.pageNum =
-        that.data.storeJobListSearchForm.pageNum + 1;
+      that.data.storeJobListSearchForm.pageNum = that.data.storeJobListSearchForm.pageNum + 1;
+      that.setData({
+        recordList: [],
+        // loading:true
+      });
       if (that.data.hasMoreData) {
         that.getJobList();
       }
@@ -2928,13 +2930,7 @@ Page({
         loadMore: "load",
         // loading:true
       });
-    } else {
-      // if (that.data.pullNum == 0) {
-      // 	that.openIOS1();
-      // }
     }
-
-    that.data.pullNum = that.data.pullNum + 1;
   },
 
   handleTabClick (e) {

pages/firstBill/index.wxml

@@ -410,7 +410,7 @@
           </scroll-view>
     </view>-->
   </view>
-  <scroll-view id="listBox" bindscrolltolower="onScrollToLower" refresher-enabled="{{true}}" bindrefresherrefresh="onScrollRefresh" refresher-triggered="{{isTrigger}}" scroll-top="{{topNum}}" enhanced binddragstart="listTouchStart" bindscroll="listTouchMove" style="height:calc(100vh - 180px)" enable-passive scroll-x="false" scroll-y="true" scroll-into-view="{{scrollTo}}" scroll-with-animation="false" enable-back-to-top="true">
+  <scroll-view id="listBox" bindscrolltolower="onScrollToLower" refresher-enabled="{{true}}" bindrefresherrefresh="onScrollRefresh" refresher-triggered="{{isTrigger}}" scroll-top="{{topNum}}" enhanced decelerationDisabled="{{false}}" bounces="{{false}}" binddragstart="listTouchStart" bindscroll="listTouchMove" style="height:calc(100vh - 180px)" 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="navigator" wx:if="{{false}}">
         <!-- <view class="navigatorBar" hover-class="none" style="padding-top:{{statusBarHeight + ((navigationBarHeight - menuButtonHeight) / 2)}}px" hover-stop-propagation="false">
@@ -526,73 +526,6 @@
           <!-- 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 class="banner" style="display: none">
-          <swiper indicator-dots="{{true}}" autoplay="{{true}}" loop="{{true}}" interval="2000" duration="500" class="innerSwiper" circular style="width: calc(100vw - 20px); height: calc(100vw / 3 - 21px / 3)" indicator-color="rgba(255,255,255,0.3)" indicator-active-color="#ffffff">
-            <block wx:for="{{background}}" wx:key="index">
-              <swiper-item>
-                <view class="swiper-item">
-                  <navigator url="/pages/specialArea/index?id=608" hover-class="none">
-                    <image src="{{item}}" style="width: calc(100vw - 20px); height: calc(100vw / 3 - 20px / 3)"></image>
-                  </navigator>
-                </view>
-              </swiper-item>
-            </block>
-          </swiper>
-            </view>-->
-            <!-- <view class="quickapply">
-          <button class="text" size="mini" hover-class="none" catchgetphonenumber="getPhoneNumber" open-type="getPhoneNumber" catchtap="emptyMethod" hover-stop-propagation="false" wx:if="{{!isLogin}}">
-          <view class="" hover-class="none" hover-stop-propagation="false" bindtap="changeRecordBillType" data-type="photo">
-            <view class="info">
-              <view>拍照报名</view>
-              <view>快速报名</view>
-            </view>
-            <view class="t-icon t-icon-paizhao"></view>
-          </view>
-          <view class="" hover-class="none" hover-stop-propagation="false" bindtap="changeRecordBillType" data-type="record">
-            <view class="info">
-              <view>报名录单</view>
-              <view>快速报名</view>
-            </view>
-            <view class="t-icon t-icon-ludan"></view>
-          </view>
-          </button>
-          <button wx:else style="width: calc(100vw - 20px);">
-          <view class="" hover-class="none" hover-stop-propagation="false" catchtap="chooseIdCard">
-            <view class="info">
-              <view>拍照报名</view>
-              <view>快速报名</view>
-            </view>
-            <view class="t-icon t-icon-paizhao" />
-          </view>
-          <view class="" hover-class="none" hover-stop-propagation="false" catchtap="navigatorToRecord">
-            <view class="info">
-              <view>报名录单</view>
-              <view>快速报名</view>
-            </view>
-            <view class="t-icon t-icon-ludan" />
-          </view>
-          </button>
-            </view>-->
-            <!-- <view style="margin: 10px">
-          <view class="p1612 display-flex bgf br8 spef">
-          <view class="flex-1 tc" hover-class="thover" catchtap="toSpecialArea" data-id="608">
-            <i class="t-icon t-icon-jinriretui" style="width: 48px; height: 48px"></i>
-            <view class="stm">今日热推</view>
-          </view>
-          <view class="flex-1 tc" hover-class="thover" catchtap="toSpecialArea" data-id="602">
-            <i class="t-icon t-icon-duanqigong" style="width: 48px; height: 48px"></i>
-            <view class="stm">短期工</view>
-          </view>
-          <view class="flex-1 tc" hover-class="thover" catchtap="toSpecialArea" data-id="610">
-            <i class="t-icon t-icon-hanjiagong" style="width: 48px; height: 48px"></i>
-            <view class="stm">寒假工</view>
-          </view>
-          <view class="flex-1 tc" hover-class="thover" catchtap="toSpecialArea" data-id="603">
-            <i class="t-icon t-icon-dalinggong" style="width: 48px; height: 48px"></i>
-            <view class="stm">大龄工</view>
-          </view>
-          </view>
-            </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">

pages/userDetail/index.wxml

@@ -83,21 +83,20 @@
     </navigator>
   </view>
   <!-- 切换团队 -->
-  <view class="br_8" catchtap="showToggle" hover-class="none" style="background-color:#fff" hover-stop-propagation="false" wx:if="{{ userInfo.agencyStatus == 1 && configInfo.team}}">
-    <view class="setting mt_10" hover-class="thover">
-      <view style="flex: none;">
-        <view class="t-icon t-icon-qiehuantuandui mr6" style="width:24px;height:24px"></view>
-        <view class hover-class="none" style="line-height:16px" hover-stop-propagation="false">
-          <view class="f16 display-flex c3" style="line-height:16px">当前团队</view>
-        </view>
+   <!-- && configInfo.team -->
+  <view class="br_8" catchtap="showToggle" hover-class="none" style="background-color:#fff" hover-stop-propagation="false" wx:if="{{ userInfo.agencyStatus == 1 }}">
+    <view class="setting mt_10 fsa " style="height:56px" hover-class="thover">
+      <view style>
+        <!-- <view class="t-icon t-icon-qiehuantuandui mr6" style="width:24px;height:24px"></view> -->
+        <view class="f16 c3 fw500" style="line-height:16px">当前团队</view>
       </view>
       <view style="flex: 1;" class="g_flex_column_center">
-        <view class="g_flex_row_end" style="width: 100%;position: relative;top: 3px;">
+        <view class="g_flex_row_end" style="width: 100%;position: relative;">
           <view class="g_flex_column_center g_flex_1">
-            <view class="g_flex_1 g_ell_1" style="text-align: right;">{{userInfo.agencyName || '-'}}</view>
+            <view class="g_flex_1 g_ell_1 c6" style="text-align: right;">{{userInfo.agencyName || '-'}}</view>
           </view>
           <view class="g_flex_column_center g_flex_none">
-            <view class="iconfont icon-gengduo11 f16 c9 ml4 mt2"></view>
+            <view class="iconfont icon-gengduo11 c9 ml4 mt2"></view>
           </view>
         </view>
       </view>

pages/userDetail/index.wxss

@@ -1,4 +1,3 @@
-@import '../mine/index.wxss';
 .container {
   padding: 10px;
 }
@@ -79,4 +78,7 @@
 }
 .c0{
   color: #000;
+}
+.setting{
+  padding: 0 9px; 
 }

pages/workBench/index.wxml

@@ -141,7 +141,8 @@
     </view>
   </view>-->
   <!-- 统计 -->
-  <view class="balanceBox bgcf" wx:if="{{(userInfo.user.agencyRole == 1 || userInfo.user.agencyRole == 2 || userInfo.hasBill)  && configInfo.bill}}" style="width:calc(100% - 20px);margin:10px auto 0;overflow:hidden;border-radius:8px !important;">
+   <!-- && configInfo.bill -->
+  <view class="balanceBox bgcf" wx:if="{{(userInfo.user.agencyRole == 1 || userInfo.user.agencyRole == 2 || userInfo.hasBill)  }}" style="width:calc(100% - 20px);margin:10px auto 0;overflow:hidden;border-radius:8px !important;">
     <view class="userbalance br_8" style="display:flex;">
       <navigator url="../wodeBill/index?state=20" style="padding-bottom:12px !important" hover-class="thover" class="br1">
         <view class="balanceinfo f14" style="width:100%;">
@@ -168,7 +169,8 @@
     </navigator>
   </view>
   <!-- 今日数据 -->
-  <view class="bgf br8 container bgcf mt10" style="width:calc(100% - 20px);margin:10px auto 0;padding:0;overflow:hidden;border-radius:8px !important;" wx:if="{{configInfo.record}}">
+    <!-- wx:if="{{configInfo.record}}" -->
+  <view class="bgf br8 container bgcf mt10" style="width:calc(100% - 20px);margin:10px auto 0;padding:0;overflow:hidden;border-radius:8px !important;">
     <view hover-class="thover" class="pl16 pr10 fsa" style="line-height:44px;" bindtap="toTodayData">
       <view class="f16 c3 fwb fl wdgd">今日数据</view>
       <view class="iconfont icon-gengduo11 c9 f12"></view>
@@ -236,14 +238,14 @@
       </view>
     </view>
   </view>
-  <navigator class="mt32 ml12 mr12" hover-class style="margin-bottom: 200px;" target url="{{isLogin? '/pages/merchantManagement/index': '/pages/login/index'}}">
+  <!-- <navigator class="mt32 ml12 mr12" hover-class style="margin-bottom: 200px;" target url="{{isLogin? '/pages/merchantManagement/index': '/pages/login/index'}}">
     <view class="centerSet br_8" hover-class="none" style="background-color:#fff;height:56px;" hover-stop-propagation="false">
       <view class="centerSet" style hover-class="none" hover-stop-propagation="false">
         <view class="iconfont icon-shangjiahoutai mr6" hover-class="none" hover-stop-propagation="false"></view>
         <view class="fw500" hover-class="none" hover-stop-propagation="false">商家管理</view>
       </view>
     </view>
-  </navigator>
+  </navigator> -->
   <view class="p010 mt10 friendBar" wx:if="{{false}}">
     <view class="bgf br8 container">
       <navigator url="../friendHelper/index?status=1" class="sub" hover-class="none">

subPage/todayBill/index.wxml

@@ -25,7 +25,7 @@
         </view>
       </view>
     </view>
-    <view class="tac c9 f14" hover-class="none" hover-stop-propagation="false">
+    <view class="tac c9 f14" wx:else hover-class="none" hover-stop-propagation="false">
       <view class="t-icon t-icon-zanwu" style="width: 80px; height: 80px; margin: 50% auto 10px"></view>
       <view class hover-class="none" hover-stop-propagation="false">暂未发单</view>
     </view>