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

components/job-sub/index.js

@@ -113,5 +113,21 @@ Component({
       }
 
     },
+    tobeAgencyToast () {
+      wx.showModal({
+        title: '',
+        content: '抱歉，您需先成为伯才代理以获得使用权限。',
+        confirmColor: '#1890ff',
+        confirmText: '成为代理',
+        cancelText: '知道了',
+        success (res) {
+          if (res.confirm) {
+            wx.navigateTo({
+              url: '/pages/tobeAgency/index'
+            })
+          }
+        }
+      })
+    }
   }
 })

components/job-sub/index.wxml

@@ -9,7 +9,7 @@
             <view class="fsa">
               <view class="fss">
                 <image wx:if="{{item.picked}}" class="mr4" style="height:16px;width:32px" src="../../assets/images/zhen.svg"></image>
-                <view class="storeName ">{{item.jobName || item.aliasName}}</view>
+                <view class="storeName">{{item.jobName || item.aliasName}}</view>
               </view>
               <view class="f14s c045">{{item.update}}</view>
             </view>
@@ -25,7 +25,7 @@
                   <!-- <view class="t-icon t-icon-ziying1 " wx:if="{{item.signType == 1}}" style="background-repeat:no-repeat"></view> -->
                   <view class="pr10 pt4 fsa cusFlexStart" style="max-width:80%;flex-wrap:wrap;height:22px;overflow:hidden">
                     <view class="br2 fss mb4" style="background: #f1faff;height:20px" wx:for="{{item.labelGroup}}" wx:key="itm" wx:for-item="itm">
-                      <view class="f12 pl4 pr4" style="color:#646572;padding:4px;" hover-class="none" hover-stop-propagation="false">{{itm || '-'}}</view>
+                      <view class="f12 pl4 pr4" style="color:#646572;padding:4px;">{{itm || '-'}}</view>
                     </view>
                     <view class="f12 pl4 pr4" style="background: #f1faff;padding:4px;" wx:if="{{item.labelGroup.length <= 0}}">暂无特色</view>
                   </view>
@@ -75,8 +75,9 @@
                 <view class>
                   <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 || '详询客服') : '仅代理可见') }}</view>
+                <view class wx:if="{{!isLogin}}" style="font-size:13px">登录查看</view>
+                <view class style="font-size:13px" wx:elif="{{agencyStatus == 1}}">{{(item.fuWuFei || '详询客服')}}</view>
+                <view class="biggerSize2" wx:else catchtap="tobeAgencyToast" style="font-size:13px">{{ '仅代理可见' }}</view>
               </view>
             </view>
           </view>
@@ -87,15 +88,15 @@
           <view class="tac" style="width:33px;height:22px;">
             <image class style="width:100%;height:100%" src="../../assets/images/xmf.svg" mode="aspectFit|aspectFill|widthFix" lazy-load="false"></image>
           </view>
-          <view class="f12 pl4 pr4" style="color:#646572" hover-class="none" hover-stop-propagation="false">{{item.supplierName || '-'}}</view>
+          <view class="f12 pl4 pr4" style="color:#646572">{{item.supplierName || '-'}}</view>
         </view>
-        <view class="fse" hover-class="none" hover-stop-propagation="false">
-          <!-- <view class="ml8" wx:for="{{4}}" style="background:pink;width:18px;height:18px" hover-class="none" hover-stop-propagation="false"></view> -->
+        <view class="fse">
+          <!-- <view class="ml8" wx:for="{{4}}" style="background:pink;width:18px;height:18px" ></view> -->
         </view>
       </view>
       <!-- <view class="pt8 pb8 pl10 pr10 fsa cusFlexStart">
         <view class="br2 fss" style="background: #f1faff;" wx:for="{{item.labelGroup}}" wx:key="itm" wx:for-item="itm">
-          <view class="f12 pl4 pr4" style="color:#646572" hover-class="none" hover-stop-propagation="false">
+          <view class="f12 pl4 pr4" style="color:#646572" >
             {{itm || '-'}}
           </view>
         </view>

pages/detail/index.js

@@ -164,7 +164,7 @@ Page({
     // console.log('/pages/detail/index?storeJobId' + this.data.searchForm.storeJobId);
     console.log('app.globalData.loginUserInfo.agencyId', app.globalData.loginUserInfo.agencyId);
     if (e.currentTarget.dataset.customServiceUrl != '') {
-     // #if MP
+      // #if MP
       wx.openCustomerServiceChat({
         extInfo: {
           url: url || 'https://work.weixin.qq.com/kfid/kfc84d8465f4c633511'
@@ -183,16 +183,16 @@ Page({
       wx.miniapp.openCustomerServiceChat({
         corpId: 'wwc227639d3a136c8d', // 企业id
         url: url || 'https://work.weixin.qq.com/kfid/kfc84d8465f4c633511',
-        complete(res) {
+        complete (res) {
           console.error('miniapp.openCustomerServiceChat', res)
         },
-        success(res) {
+        success (res) {
           // wx.showToast({
           //   title: '成功：分享图片',
           // })
           console.log('res', res);
         },
-        fail() {
+        fail () {
           // wx.showToast({
           //   title: '失败：分享图片',
           // })
@@ -1686,18 +1686,15 @@ Page({
     var that = this;
     var contentInfo;
     const query = wx.createSelectorQuery().in(this);
+    let dataset = e.currentTarget.dataset
     query
       .select(".contactInfo")
       .boundingClientRect(function (res) {
-        let data = e.currentTarget.dataset.content + res.dataset.info
+        let data = dataset.content + (dataset.type == 'haveSet' ? res.dataset.info : '')
         app.copyFun(data)
       })
       .exec();
   },
-  getJobName (e) {
-    let data = e.currentTarget.dataset.content
-    app.copyFun(data)
-  },
   changeContact () {
     console.log(2123);
     wx.navigateTo({

pages/detail/index.wxml

@@ -126,7 +126,7 @@
                 {{jobDetail.record.monthlyPay ? '丨' + jobDetail.record.monthlyPay : '--'}}
               </view>
             </view>
-            <view wx:if="{{corpUserFlag}}" class="fss ysd-base-color" data-content="{{jobDetail.record.jobName+'@'+jobDetail.record.supplier.supplierName}}" catchtap="getJobName">
+            <view wx:if="{{corpUserFlag}}" class="fss ysd-base-color" data-content="{{jobDetail.record.jobName+'@'+jobDetail.record.supplier.supplierName}}" catchtap="setCopy">
               <view class="iconfont icon-fuzhi mr4" style></view>
               <span class="f14 biggerSize">复制</span>
             </view>
@@ -370,7 +370,7 @@
           </block>
           <block wx:if="{{currIndex == '5'}}">
             <view class="pri" style="line-height:24px;padding:5px 8px;border-radius: 4px;color:#333">
-              <view data-content="{{jobDetail.record.jobInfoWithoutReturnFee}}" catchtap="setCopy">
+              <view data-content="{{jobDetail.record.jobInfoWithoutReturnFee}}" data-type="haveSet" catchtap="setCopy">
                 <!-- <icon class="iconfont icon-fuzhi mr4" style="font-size:16px;float: right;"></icon> -->
                 <span class="desp-copy">复制</span>
               </view>
@@ -389,6 +389,10 @@
           </block>
           <block wx:if="{{currIndex == '6'}}">
             <view class="pri" style="line-height:24px;padding:5px 8px;border-radius: 4px;color:#333">
+              <view data-content="{{jobDetail.record.lastNotice}}" catchtap="setCopy">
+                <!-- <icon class="iconfont icon-fuzhi mr4" style="font-size:16px;float: right;"></icon> -->
+                <span class="desp-copy">复制</span>
+              </view>
               <rich-text class style="text-align: justify;" hover-class="none" hover-stop-propagation="false" nodes="{{jobDetail.record.lastNotice}}"></rich-text>
               <!-- <text class style="text-align: justify;" hover-class="none" hover-stop-propagation="false">{{jobDetail.record.lastNotice}}</text> -->
             </view>

pages/firstBill/index.js

@@ -2917,10 +2917,6 @@ Page({
     var that = this;
     if (app.globalData.isLogin) {
       that.data.storeJobListSearchForm.pageNum = that.data.storeJobListSearchForm.pageNum + 1;
-      that.setData({
-        recordList: [],
-        // loading:true
-      });
       if (that.data.hasMoreData) {
         that.getJobList();
       }

pages/listSharePage/index.js

@@ -2287,7 +2287,7 @@ Page({
           console.log(item);
           funObj.roundRect1(ctx, 32, baseTop - 60 + baseMiddle * index, 776, roundRectHeight, 24, "#fff");
           funObj.fillTextLineBreak(ctx, item.jobName, logoLeft, baseTop + baseMiddle * index, 500, 20, "#333", titleSize, "500"); // 岗位标题
-          funObj.fillTextLineBreak(ctx, item.salaryClassifyValueHaibao, salaryClassifyValueLeft + 570, baseTop - 10 + salaryClassifyValueTop + baseMiddle * index, 400, 20, "#1890ff", titleSize - 4, "600"); // 时薪
+          funObj.fillTextLineBreak(ctx, item.salaryClassifyValueHaibao, salaryClassifyValueLeft + 570, baseTop - 10 + salaryClassifyValueTop + baseMiddle * index, 400, 20, "#ff4400", titleSize - 4, "600"); // 时薪
           // setTimeout(() => {
           // funObj.fillTextLineBreak(ctx, item.monthlyPay, salaryClassifyValueLeft + ctx.measureText(item.salaryClassifyValueHaibao + " ").width, baseTop + salaryClassifyValueTop + baseMiddle * index, 400 , 20, "#1890ff", monthlyPaySize, "400"); // 月工资
           // }, 0);
@@ -2372,10 +2372,10 @@ Page({
 
               funObj.fillTextLineBreak(ctx, item.jobName, logoLeft, baseTop + baseMiddle * index, 500 * 2, 20, "#333", titleSize, "600"); // 岗位标题
 
-              funObj.fillTextLineBreak(ctx, item.salaryClassifyValueHaibao, logoLeft, baseTop + salaryClassifyValueTop + baseMiddle * index, 400 * 2, 20, "#1890ff", titleSize - 4, "600"); // 时薪
+              funObj.fillTextLineBreak(ctx, item.salaryClassifyValueHaibao, logoLeft, baseTop + salaryClassifyValueTop + baseMiddle * index, 400 * 2, 20, "#ff4400", titleSize - 4, "600"); // 时薪
 
               // setTimeout(() => {
-              funObj.fillTextLineBreak(ctx, item.monthlyPay, logoLeft + ctx.measureText(item.salaryClassifyValueHaibao + " ").width, baseTop + salaryClassifyValueTop + baseMiddle * index, 400 * 2, 20, "#1890ff", monthlyPaySize, "400"); // 月工资
+              funObj.fillTextLineBreak(ctx, item.monthlyPay, logoLeft + ctx.measureText(item.salaryClassifyValueHaibao + " ").width, baseTop + salaryClassifyValueTop + baseMiddle * index, 400 * 2, 20, "#ff4400", monthlyPaySize, "400"); // 月工资
               // }, 0);
 
               funObj.fillTextLineBreak(ctx, item.district, logoLeft, baseTop + ageTop + baseMiddle * index, 500 * 2, 20, "#333", monthlyPaySize); // 省市

pages/listSharePage/index.wxml

@@ -290,7 +290,7 @@
                         <view class="flex-1 vsb">
                           <view class="fsa">
                             <view class="storeName">{{item.jobName || item.aliasName}}</view>
-                            <view class="f14s c045" style="margin-right:32px">{{item.update}}</view>
+                            <view class="f14s c045" style="">{{item.update}}</view>
                           </view>
                           <view class="v-center mt8 mb6">
                             <view class="f14s c045 flex-1">
@@ -362,7 +362,6 @@
                       </view>
                     </view>
                     <view class="checkbox" style hover-class="none" hover-stop-propagation="false">
-                      <!-- disabled="{{checkedList.length >= 3 && !item.checked}}" -->
                       <checkbox class="biggerSize2" data-item="{{item}}" catchtap="checkJob" style="transform: scale(0.8,0.8)" value="{{item.age}}" color="var(--color-ysd)" checked="{{item.checked}}" />
                     </view>
                   </view>

pages/listSharePage/index.wxss

@@ -524,7 +524,8 @@ height: 746rpx;
 	min-width: 44px;
   position:absolute ;
   right: 0px;
-  top: 12px;
+  top: 50%;
+  transform: translateY(-50%);
 	display: flex;
 	align-items: center;
 	justify-content: center;

pages/mine/index.wxml

@@ -452,8 +452,8 @@
     <!-- #if MP -->
     <view class="mt10" wx:if="{{appId == 'wxe431e0b3abd9ae0b'}}" hover-class="none" hover-stop-propagation="false">
       <view class="tab_container fsa sticky" hover-class="none" hover-stop-propagation="false">
-        <view wx:for="{{tabGroup}}" class="tarbar" style="margin-right: {{ index < 2 ? '24px':''}};text-align:center" data-item="{{item}}" bindtap="collectChange">
-          <view class="tarbarText {{choiceCollect == item.key?'collectActive':''}}">{{item.name}}</view>
+        <view wx:for="{{tabGroup}}" class="tarbar flex-1" style="margin-right: {{ index < 2 ? '24px':''}};text-align:center" data-item="{{item}}" bindtap="collectChange">
+          <view class="tarbarText  {{choiceCollect == item.key?'collectActive':''}}">{{item.name}}</view>
           <!-- <image wx:if="{{toped == '1'}}" src="../../assets/images/border-circle.svg" class="tarbarImg"></image> -->
         </view>
       </view>

pages/mine/index.wxss

@@ -6,7 +6,7 @@ page {
 .container {
   /* height: 100vh; */
   /* margin-top: 10px; */
-  padding:  0;
+  padding: 0;
   overflow: auto;
 }
 .container .no_login {
@@ -379,7 +379,7 @@ page {
   display: flex;
   justify-content: space-between;
   align-items: center;
-  padding: 12px 24px;
+  padding: 12px 0;
   /* margin: 0 10px; */
   background-color: #fff;
   /* border-radius: 8px; */
@@ -392,9 +392,9 @@ page {
   z-index: 100;
 }
 .collectActive {
-  color: #1890ff;
-  font-weight: 601;
-  position: relative;
+  color: #1890ff !important;
+  font-weight: 601 !important;
+  position: relative !important;
 }
 
 .collectActive::after {