Merge branch 'master' of http://101.37.147.115:3000/bocaigroup/dandelionPlatform

* 'master' of http://101.37.147.115:3000/bocaigroup/dandelionPlatform:
  客服
  职位logo

pages/detail/index.js

@@ -157,10 +157,10 @@ Page({
 	},
 	showphone: function () {
 		var that = this;
-    console.log( that.data.serviceInfo.workPhone);
+    // console.log( that.data.serviceInfo.workPhone);
 		wx.makePhoneCall({
 			// number: that.data.jobDetail.assistantUserTel + ""
-			phoneNumber: that.data.serviceInfo.workPhone || "0371-6611 3723",
+			phoneNumber: that.data.jobDetail.customServiceUser.tel || "0371-6611 3723",
 		});
 	},
 	close: function () {
@@ -1211,7 +1211,7 @@ Page({
 		var that = this;
 		wx.makePhoneCall({
 			// number: that.data.jobDetail.assistantUserTel + ""
-			phoneNumber: that.data.serviceInfo.workPhone || "0371-6611 3723",
+			phoneNumber: that.data.jobDetail.customServiceUser.tel || "0371-6611 3723",
 		});
 		// var that = this;
 
@@ -1252,8 +1252,9 @@ Page({
     console.log('jobDetail',that.data.jobDetail);
 		wx.setClipboardData({
 			// data: that.data.jobDetail.assistantUserWechat,
-			data: "16619732648",
+			data: that.data.jobDetail.customServiceUser.weChat ,
 			success: function (res) {
+        console.log(res);
 				wx.getClipboardData({
 					success: function (res) {
 						wx.showToast({
@@ -1278,6 +1279,9 @@ Page({
 					},
 				});
 			},
+      fail: function(err) {
+          console.log(err);
+      }
 		});
 	},
 	/*collectPaste() {

pages/detail/index.wxml

@@ -1,11 +1,8 @@
 <view class="bt1">
-
   <scroll-view id="listBox" style="height: calc(100vh - constant(safe-area-inset-bottom) - 64px);height: calc(100vh - env(safe-area-inset-bottom) - 64px);padding-bottom: 30px;" scroll-y="{{true}}">
     <view class="p20 pt12 pb10" id="tocanvas">
       <view class="v-center">
-    <view class="jobTitle">
-      {{jobDetail.jobName}}
-    </view>
+        <view class="jobTitle">{{jobDetail.jobName}}</view>
       </view>
       <view class="display-flex mt12">
         <view class="display-flex flex-1">
@@ -61,29 +58,24 @@
     </view>
     <view class="p016 mt12" wx:if="{{images.length > 0}}">
       <block wx:for="{{images}}" wx:for-item="item" wx:key="index">
-    <image src="{{item.url}}" bind:tap="showImage" wx:if="{{item.isImg}}" data-src="{{item.url}}" class="img5" mode=""/>
+        <image src="{{item.url}}" bind:tap="showImage" wx:if="{{item.isImg}}" data-src="{{item.url}}" class="img5" mode />
         <view class="videoContainer" data-id="{{item.id}}" hover-class="none" catchtap="showVideo" hover-stop-propagation="false" wx:if="{{!item.isImg && item.url}}" style="display:inline-block">
-      <video class="img5" id="{{item.id}}" data-id="{{item.id}}" src="{{item.url}}" show-fullscreen-btn="{{true}}" show-play-btn="{{true}}" show-center-play-btn="{{true}}" enable-play-gesture="{{true}}"  bindfullscreenchange="fullScreen">
-      </video>
+          <video class="img5" id="{{item.id}}" data-id="{{item.id}}" src="{{item.url}}" show-fullscreen-btn="{{true}}" show-play-btn="{{true}}" show-center-play-btn="{{true}}" enable-play-gesture="{{true}}" bindfullscreenchange="fullScreen"></video>
         </view>
       </block>
     </view>
 
-
     <view class="p020">
       <view class="f14">
         <block wx:if="{{currIndex == '1'}}">
           <view>
             <view class="detailH3">
-          <view class="fl mr12" style="width: 4px;height: 19px;background: #0dcc91;border-radius: 2px;"></view>
-          
-          职位描述</view>
+              <view class="fl mr12" style="width: 4px;height: 19px;background: #0dcc91;border-radius: 2px;"></view>职位描述
+            </view>
             <view class="pri f16" style="line-height:24px;padding:3px 0px;border-radius: 4px;color:#777;">{{jobDetail.jobInfo}}</view>
           </view>
 
-
           <view style="height: 40px;"></view>
-
         </block>
         <block wx:if="{{currIndex == '2'}}">
           <view class="detailH3">面试</view>
@@ -240,25 +232,22 @@
       </view>-->
     </view>
   </scroll-view>
-
 </view>
 <view class="bottomBtn" style="height:calc(constant(safe-area-inset-bottom) + 64px);height:calc(env(safe-area-inset-bottom) + 64px);">
   <view class="norecruit" wx:if="{{isMaskShow}}">该职位暂时停招</view>
   <view class="fsa tc bottomBox">
-    <!-- <view style='width: 56px;padding-left: 8px;' bindtap='showphone'>
+    <view style="width: 56px;padding-left: 8px;" wx:if="{{jobDetail.customServiceUser.tel}}" bindtap="showphone">
       <view style="position:relative;top:2px;">
         <icon class="iconfont icon-dianhua2 lh1" style="color:#787878;font-size:18px;position:relative;top:1px"></icon>
         <view class="btext" style="margin-top:2px;">电话</view>
       </view>
     </view>
-    <view style='width: 56px;padding-right: 10px;' bindtap="textPaste">
+    <view style="width: 56px;padding-right: 10px;" wx:if="{{jobDetail.customServiceUser.weChat}}" bindtap="textPaste">
       <view style="position:relative;top:2px;">
-            <icon class="iconfont icon-weixin lh1" style="color:#787878;font-size:18px;">
-            </icon>
+        <icon class="iconfont icon-weixin lh1" style="color:#787878;font-size:18px;"></icon>
         <view class="btext" style="margin-top:2px;">微信</view>
       </view>
-    </view> -->
-    
+    </view>
 
     <view class="flex-1 pr16 pl16" wx:if="{{!isMaskShow}}">
       <button type class="loginOut" bindtap="goNewEnroll" data-job="{{jobDetail}}">立即报名</button>