同步

3 months ago · e3a2cbcd58
parent 150828eaa9
commit e3a2cbcd58
12 changed files with 122 additions and 59 deletions
--- a/api/job.js
+++ b/api/job.js
@ -18,7 +18,9 @@ let jobInfo = {
  job_getPolicyShare: '/yishoudan/store/job/getPolicyByStoreJobId',// 获取共享职位政策
  job_ai: '/yishoudan/common/structure/get', // 获取ai结果
  yi_job_class_new: "/labels/getListByTypeAndIndustry", // 新职位要求接口(新)
-	job_get_cus: "/yishoudan/job/customer/support/getJobCustomerSupportIM", // 获取客服ID
+	job_get_cus: "/yishoudan/job/customer/support/getJobCustomerSupportIMAccid", // 获取客服ID
+	job_get_agency_cus: "/yishoudan/job/customer/support/getAgencyCustomerSupportIMAccid", // 获取代理客服ID
+  
 	hasSee: "/yishoudan/job/view/record/addRecord",
  getCityNameByLatLng: '/location/getCityNameByLatLng' ,// 根据经纬度获取城市
  get_city_list: '/city/getAllCityLevel2', // 获取城市列表
--- a/components/panel/record.vue
+++ b/components/panel/record.vue
@ -124,7 +124,7 @@ export default {
 		border-left: 2px solid #cccccc;
 		left: 0px;
 		line-height: 22px;
-		height: 50px;
+		// height: 50px;
 		font-size: 16px;
 		font-weight: bold;
 		color: #333333;
--- a/main.js
+++ b/main.js
@ -190,7 +190,7 @@ export function createApp () {
        G.Get(apiInfo.getOssInfo, { prefix: customDir }, ({ data }) => {
          console.log('uploadImgToOssresresresres', data);
          const { policy, signature, accessid, dir, host } = data;
-          let key = (customDir ? (customDir + '/') : dir) + that.getUUID()
+          let key = dir + that.getUUID()
          const formData = {
            "key": key + "_${filename}",
            "policy": policy,
--- a/pages.json
+++ b/pages.json
@ -169,7 +169,10 @@
        {
          "path": "loginIndex",
          "style": {
-            "navigationBarTitleText": "登录"
+            "navigationBarTitleText": "登录",
+            "backgroundColor": "#ffffff",
+            "backgroundColorTop": "#ffffff",
+            "backgroundColorBottom": "#ffffff"
          }
        },
        {
@ -412,9 +415,9 @@
          "path": "job",
          "style": {
            "navigationBarTitleText": "职位详情",
-            "backgroundColor": "#ffffff",
-            "backgroundColorTop": "#ffffff",
-            "backgroundColorBottom": "#ffffff"
+            "backgroundColor": "#ededed",
+            "backgroundColorTop": "#ededed",
+            "backgroundColorBottom": "#ededed"
          }
        },
        {
@ -520,7 +523,10 @@
        {
          "path": "city",
          "style": {
-            "navigationBarTitleText": "选择城市"
+            "navigationBarTitleText": "选择城市",
+            "backgroundColor": "#ededed",
+            "backgroundColorTop": "#ededed",
+            "backgroundColorBottom": "#ededed"
          }
        },
        {
--- a/pages/message/index.vue
+++ b/pages/message/index.vue
@ -1,6 +1,5 @@
 <template>
-	<div style="" class="g_bg_f_5 g_h_all">
-		<view class="g_h_all">
+	<div style="" class="g_bg_page">
 		<!-- <view class="m-tabs" v-if="isLogin" style="position: fixed; width: 100%; z-index: 999">
 				<u-tabs :list="typeGroup" :is-scroll="false" v-model="current" @change="updateType" item-width="126" :active-color="globalData.themeColor" bar-width="60" bar-height="6" font-size="32" :gutter="22" duration="0.1" itemWidth="auto" height="84"></u-tabs>
 			</view> -->
@ -9,11 +8,11 @@
 		<scroll-view @scroll="getScrollInfo" :scroll-top="resetScroll" :style="{ minHeight: `calc(100vh - ${tabbarHeight}px)`, 'padding-top': '' }" :scroll-y="true" v-if="isLogin">
 			<view class="" v-show="current == 0">
 				<view class="g_h_10"></view>
-					<view class="g_bg_f">
+				<view class="">
 					<ConversationList ref="contactList" />
 				</view>
 			</view>
-				<view class="g_bg_f" v-if="current == 1">
+			<view class="" v-if="current == 1">
 				<telPanel />
 			</view>
 		</scroll-view>
@ -25,7 +24,6 @@
 				<g-button btnText="去登录" size="small" class="g_mt_32" @clickBtn="goLogin" />
 			</view>
 		</view>
-		</view>
 		<servicePopup
 			:show="showService"
 			@updateShow="
@ -42,8 +40,8 @@
 				</view>
 			</view>
 		</u-popup> -->
-		<g-tabbar></g-tabbar>
 	</div>
+	<g-tabbar></g-tabbar>
 </template>

 <script lang="ts" setup>
@ -205,6 +203,9 @@ const updateType = (e) => {
 </script>

 <style lang="scss">
+page {
+  background-color: #ededed;
+}
 .i-items {
 	// border-bottom: 1px solid #eee;
 	position: relative;
--- a/root/detail/job.vue
+++ b/root/detail/job.vue
@ -488,14 +488,21 @@
 								<div class="g_fs_12 g_c_6" style="margin-top: 8px">{{ isSc ? "已收藏" : "收藏" }}</div>
 							</button>
 						</div>
-						<div class="g_flex_none g_flex_column_center" v-if="userinfo && userinfo.agencyId">
-							<button class="g_pl_0 g_pr_0 g_bg_f g_mr_12 g_w_36" hover-class="thover" style="line-height: 1; border-radius: 0" @click="goIm">
+						<div class="g_flex_none g_flex_column_center" v-if="userinfo && userinfo.agencyId && false">
+							<g-button btnText="客服" class="g_flex_1 g_fw_600" size="small_auto" @clickBtn="goIm"></g-button>
+
+							<!-- <button class="g_pl_0 g_pr_0 g_bg_f g_mr_12 g_w_36" hover-class="thover" style="line-height: 1; border-radius: 0" @click="goIm">
 								<icon class="iconfont icon-xiaoxi" style="color: #787878; line-height: 1; margin-top: -5px; font-size: 20px !important; position: relative; top: 3px"></icon>
 								<div class="g_fs_12 g_c_6" style="margin-top: 8px">客服</div>
-							</button>
+							</button> -->
+						</div>
+						<div class="g_flex_1 g_flex_row_center">
+							<div class="g_flex_none g_flex_column_center g_mr_12">
+								<g-button btnText="联系客服" class="g_w_100" size="small_auto" @clickBtn="goIm"></g-button>
 							</div>
 							<div class="g_flex_1 g_flex_column_center ">
-							<g-button btnText="我要报名" class="g_flex_1 g_fw_600" size="small_auto" :type="jobDetail.recruitment == 2 || !attention ? 'infro' : 'primary'" @clickBtn="handleOpenApplyPopup" style="width: calc(100% - 36px)"></g-button>
+								<g-button btnText="我要报名" class="" size="small_auto" :type="jobDetail.recruitment == 2 || !attention ? 'infro' : 'primary'" @clickBtn="handleOpenApplyPopup" style="width: calc(100% - 32px)"></g-button>
+							</div>
 						</div>
 					</div>
 				</slot>
@ -1357,22 +1364,34 @@ export default {
 				that.F.wyyxPost(
 					that.api.wyyx_create,
 					{
-						senderUserId: uni.getStorageSync("apply-uid"),
-						receiverUserId: cusData,
+						// senderUserId: uni.getStorageSync("apply-uid"),
+						// receiverUserId: cusData,
+						senderAccid: uni.getStorageSync("im-accid"),
+						receiverAccid: cusData,
 					},
 					(res) => {
 						uni.$UIKitStore.uiStore.selectConversation(res.conversationId);
 						console.log("that.jobDetail", that.jobDetail);
+						let list = ["addss", "genderRestrict", "genderAge"];
+						let newList = [];
+						list.forEach((item) => {
+							if (that.jobDetail[item]) {
+								newList.push(that.jobDetail[item]);
+							}
+						});
+						that.jobDetail.info = newList.join("丨");
 						that.F.wyyxPost(
 							that.api.wyyx_sendCard,
 							{
 								conversationType: 1,
-								senderUserId: uni.getStorageSync("apply-uid"), // 发送者id 即当前登录用户id
-								receiverUserId: cusData, // 接收方用户id
+								// senderUserId: uni.getStorageSync("apply-uid"), // 发送者id 即当前登录用户id
+								// receiverUserId: cusData, // 接收方用户id
+								senderAccid: uni.getStorageSync("im-accid"),
+								receiverAccid: cusData,
 								type: 100000,
 								jobDetail: {
 									title: that.jobDetail.jobName,
-									info: (that.jobDetail.addss ? that.jobDetail.addss + "丨" : "") + that.jobDetail.genderRestrict + "丨" + that.jobDetail.age,
+									info: that.jobDetail.info,
 									label: that.jobDetail.jobRequestLabelNames.length > 0 ? that.jobDetail.jobRequestLabelNames : [],
 									salaryClassifyValue: that.jobDetail.priceStr,
 									serviceFee: that.showPrice ? that.jobDetail.serverPrice : "",
--- a/root/detail/userShare.vue
+++ b/root/detail/userShare.vue
@ -64,20 +64,28 @@
 							<!-- <g-button btnText="不能关注自己" size="auto" type="disabled"></g-button> -->
 						</div>
 						<!--  -->
-						<div v-else>
-							<div class="g_flex_row_center" v-if="info.recordStatus == 1">
+						<template v-else>
+							<div style="width: calc(100vw - 40px)" class="g_flex_row_center" v-if="info.recordStatus == 1">
 								<!-- 已关注 1 -->
 								<!-- class="g_mr_10" -->
-								<div style="width: calc(100vw - 40px)" @click="handleCancel">
-									<g-button btnText="已关注发单号" size="auto" type="disabled" class></g-button>
+								<div class="g_flex_1">
+									<g-button btnText="已关注发单号" size="auto" @clickBtn="handleCancel" type="disabled" class></g-button>
+								</div>
+								<div class="g_ml_16 g_w_100 g_flex_none">
+									<g-button btnText="联系客服" class="" size="auto" @clickBtn="goIm"></g-button>
 								</div>
 								<!-- <div style="width:calc((100vw - 50px) / 2);">
 									<g-button btnText="联系客服" size="auto" type="disabled" class></g-button>
 								</div>-->
 							</div>

-							<div style="width: calc(100vw - 40px)" v-else-if="info.recordStatus == 2" @click="handleCancel">
-								<g-button btnText="互相关注" size="auto" type="disabled" class></g-button>
+							<div style="width: calc(100vw - 40px)" class="g_flex_row_center" v-else-if="info.recordStatus == 2">
+								<div class="g_flex_1">
+									<g-button btnText="互相关注" size="auto" type="disabled" @clickBtn="handleCancel" class></g-button>
+								</div>
+								<div class="g_ml_16 g_w_100 g_flex_none">
+									<g-button btnText="联系客服" class="" size="auto" @clickBtn="goIm"></g-button>
+								</div>
 							</div>

 							<div style="width: calc(100vw - 40px)" v-else-if="(info.recordStatus == 3 || info.recordStatus == 4) && !isSelf">
@ -90,7 +98,7 @@
 							<div style="width: calc(100vw - 40px)" v-else-if="info.recordStatus == 6 && !isSelf">
 								<g-button btnText="申请关注" size="auto" type="primary" :loading="btnLoading" class @clickBtn="handleSubmit"></g-button>
 							</div>
-						</div>
+						</template>
 					</div>
 				</view>
 				<div class="g_bg_f g_pt_8">
@ -146,7 +154,7 @@ export default {
 			isLogin: null,
 			isShowMore: true,
 			isShowJob: true,
-
+			goImLoading: false, // 客服点击loading
 			loading: true,
 			keyword: "", // 搜索内容
 			speed: -1,
@ -747,6 +755,33 @@ export default {
 		},

 		handleUpdateTab() {},
+		goIm() {
+			let that = this;
+			if (that.goImLoading) {
+				return false;
+			}
+
+			that.goImLoading = true;
+			that.F.wyyxGet(that.api.job_get_agency_cus + "?agencyId=" + that.uid, {}, (cusData) => {
+				that.F.wyyxPost(
+					that.api.wyyx_create,
+					{
+						// senderUserId: uni.getStorageSync("apply-uid"),
+						// receiverUserId: cusData,
+						senderAccid: uni.getStorageSync("im-accid"),
+						receiverAccid: cusData,
+					},
+					(res) => {
+						uni.$UIKitStore.uiStore.selectConversation(res.conversationId);
+						uni.navigateTo({
+							url: "/root/NEUIKit/pages/Chat/index",
+						});
+						that.goImLoading = false;
+					},
+					() => {}
+				);
+			});
+		},
 	},
 };
 </script>
--- a/root/home/editTownsman.vue
+++ b/root/home/editTownsman.vue
@ -1,5 +1,5 @@
 <template>
-  <view class="p-root-detail-fellow g_w_all g_h_all g_bg_f_5 g_kuaishou">
+  <view class="p-root-detail-fellow g_w_all g_bg_page g_kuaishou">
    <view style="padding-bottom: 200rpx;">
      <AiApply class @outputInfo="getTownsManInfo" />
      <view class="g_h_10"></view>
--- a/root/other/city.vue
+++ b/root/other/city.vue
@ -1,5 +1,5 @@
 <template>
-	<view class="g_pl_16 container" style="background-color: #f5f5f5">
+	<view class="g_pl_16 container g_bg_page">
 		<scroll-view class="cities-scroll" scroll-with-animation="true" style="box-sizing: border-box" :scroll-into-view="az" scroll-y ref="scrollViewRef">
 			<view class="">
 				<view class="headTxt">当前城市</view>
@ -239,7 +239,7 @@ export default {
 		display: flex;
 		flex-direction: column;
 		align-items: center;
-		background-color: #f5f5f5;
+		// background-color: #f5f5f5;

 		.indexItem {
 			display: flex;
--- a/root/person/avatar.vue
+++ b/root/person/avatar.vue
@ -72,8 +72,8 @@ export default {
 		},
 		setAvatar($type) {
 			let that = this;
-			that.G.uploadImg(
-			// that.G.uploadImgToOss(
+			// that.G.uploadImg(
+			that.G.uploadImgToOss(
 				(res) => {
 					console.log("获取数据", res);
 					that.avatar = res.image;
--- a/root/person/feedbackList.vue
+++ b/root/person/feedbackList.vue
@ -1,5 +1,5 @@
 <template>
-	<view class="p-root-person-feedbackList g_w_all g_bg_f_5 g_pl_10 g_pr_10 g_pt_10 g_pb_14 g_kuaishou">
+	<view class="p-root-person-feedbackList g_bg_page g_pl_10 g_pr_10 g_pt_10 g_pb_14 g_kuaishou" style="overflow:hidden">
 		<view class="sub f14" v-for="(item, index) in list" :key="index" hover-class="none" hover-stop-propagation="false">
 			<view class="g_flex_row_between g_mb_8 g_c_9" hover-class="none" hover-stop-propagation="false">
 				<view class hover-class="none" hover-stop-propagation="false">{{ item.updateTime }}</view>
--- a/utils/common.js
+++ b/utils/common.js
@ -731,13 +731,13 @@ let data = {
        }
        // 性别限制
         if (Boolean(jobList.minAgeWoman) === true && Boolean(jobList.minAgeMan) === false) {
-          jobList.genderAge = "女" + jobList.minAgeWoman + "-" + jobList.maxAgeWoman + "岁";
+          jobList.genderAge = "女" + '丨' + jobList.minAgeWoman + "-" + jobList.maxAgeWoman + "岁";
        } else if (Boolean(jobList.minAgeWoman) === false && Boolean(jobList.minAgeMan) === true) {
-          jobList.genderAge = "男" + jobList.minAgeMan + "-" + jobList.maxAgeMan + "岁";
+          jobList.genderAge = "男" + '丨' + jobList.minAgeMan + "-" + jobList.maxAgeMan + "岁";
        } else if ((jobList.minAgeWoman != jobList.minAgeMan) || (jobList.maxAgeWoman != jobList.maxAgeMan)) {
-          jobList.genderAge = "男" + jobList.minAgeMan + "-" + jobList.maxAgeMan + "岁" + " " + "女" + jobList.minAgeWoman + "-" + jobList.maxAgeWoman + "岁"
+          jobList.genderAge = "男" + jobList.minAgeMan + "-" + jobList.maxAgeMan + "岁" + "丨" + "女" + jobList.minAgeWoman + "-" + jobList.maxAgeWoman + "岁"
        } else {
-          jobList.genderAge = "男女不限" + jobList.minAge + "-" + jobList.maxAge + "岁";
+          jobList.genderAge = "男女不限" + '丨' + jobList.minAge + "-" + jobList.maxAge + "岁";
        }
        //年龄
        var ageStr = "";