cyl/master-0822
wangxia 3 months ago
parent fe66e9c508
commit c03732498a

@ -131,7 +131,7 @@
<checkbox class="biggerSize" style="transform: scale(0.8, 0.8)" color="g_c_main" :checked="item.checked" :value="item.checked"></checkbox> <checkbox class="biggerSize" style="transform: scale(0.8, 0.8)" color="g_c_main" :checked="item.checked" :value="item.checked"></checkbox>
</view> </view>
<view class="checkBox g_c_main g_fs_14" hover-class="none" v-if="from == 'chat'" @click.stop="sendJob(item)"> <view class="checkBox g_c_main g_fs_14" hover-class="none" v-if="from == 'chat'" @click.stop="sendJob(item)">
选择 发送
</view> </view>
</view> </view>
</block> </block>

@ -14,23 +14,23 @@
@click="handleConversationItemClick()" @click="handleConversationItemClick()"
> >
<div class="conversation-item-content"> <div class="conversation-item-content">
<div class="conversation-item-left"> <div class="conversation-item-left u-skeleton-fillet">
<div class="unread" v-if="unread"> <div class="unread" v-if="unread">
<div class="dot" v-if="isMute"></div> <div class="dot" v-if="isMute"></div>
<div class="badge" v-else>{{ unread }}</div> <div class="badge" v-else>{{ unread }}</div>
</div> </div>
<Avatar class="u-skeleton-fillet" :account="to" size="48" :avatar="teamAvatar" /> <Avatar class="" :account="to" size="48" :avatar="teamAvatar" />
</div> </div>
<div class="conversation-item-right"> <div class="conversation-item-right">
<div class="conversation-item-top"> <div class="conversation-item-top u-skeleton-fillet">
<Appellation :pid="props.conversation.conversationId" class="conversation-item-title u-skeleton-fillet" fontSize="17" v-if="conversation.type === V2NIMConst.V2NIMConversationType.V2NIM_CONVERSATION_TYPE_P2P" :account="to" /> <Appellation :pid="props.conversation.conversationId" class="conversation-item-title" fontSize="17" v-if="conversation.type === V2NIMConst.V2NIMConversationType.V2NIM_CONVERSATION_TYPE_P2P && !loading" :account="to" />
<span v-else class="conversation-item-title u-skeleton-fillet"> <span v-else class="conversation-item-title">
{{ sessionName }} {{ sessionName }}
</span> </span>
<span class="conversation-item-time" :data-time="date">{{ date }}</span> <span class="conversation-item-time" :data-time="date">{{ date }}</span>
</div> </div>
<div class="conversation-item-desc"> <div class="conversation-item-desc u-skeleton-fillet">
<span v-if="beMentioned" class="beMentioned u-skeleton-fillet"> <span v-if="beMentioned && !loading" class="beMentioned">
{{ "[" + t("someoneText") + "@" + t("meText") + "]" }} {{ "[" + t("someoneText") + "@" + t("meText") + "]" }}
</span> </span>
<!-- <ConversationItemIsRead v-if="showSessionUnread" :conversation="props.conversation"></ConversationItemIsRead> --> <!-- <ConversationItemIsRead v-if="showSessionUnread" :conversation="props.conversation"></ConversationItemIsRead> -->
@ -44,8 +44,10 @@
{{ action.name }} {{ action.name }}
</div> </div>
</div> </div>
<u-skeleton :loading="loading" :animation="true" bgColor="#ededed"></u-skeleton>
<!-- <u-skeleton :loading="loading" :animation="true" bgColor="#ededed"></u-skeleton> -->
</div> </div>
<u-skeleton :loading="loading" :animation="true" el-color="#ededed" bg-color="#fff"></u-skeleton>
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>

@ -1,16 +1,18 @@
<template> <template>
<div class="conversation-wrapper"> <div class="conversation-wrapper">
<!-- {{ conversationList }} -->
<!-- 页面初始化的过程中sessionList编译到小程序和h5出现sessionList为undefined的情况即使给了默认值为空数组故在此处进行判断 --> <!-- 页面初始化的过程中sessionList编译到小程序和h5出现sessionList为undefined的情况即使给了默认值为空数组故在此处进行判断 -->
<div class="conversation-list-wrapper " v-if="conversationList && conversationList.length > 0"> <div class="conversation-list-wrapper " v-if="conversationList && conversationList.length > 0">
<!-- 此处的key如果用session.id会在ios上渲染存在问题会出现会话列表显示undefined --> <!-- 此处的key如果用session.id会在ios上渲染存在问题会出现会话列表显示undefined -->
<div v-for="(conversation, index) in conversationList" :key="conversation.renderKey"> <div v-for="(conversation, index) in conversationList" class="" style="min-height:72px" :key="conversation.renderKey">
<ConversationItem :key="conversation.renderKey" :loading="loading" :showMoreActions="currentMoveSessionId === conversation.conversationId" :conversation="conversation" @delete="handleSessionItemDeleteClick" :heihei="'mmp' + index" @stickyToTop="handleSessionItemStickTopChange" @click="handleSessionItemClick" @leftSlide="handleSessionItemLeftSlide" /> <ConversationItem :key="conversation.renderKey" :loading="loading" :showMoreActions="currentMoveSessionId === conversation.conversationId" :conversation="conversation" @delete="handleSessionItemDeleteClick" :heihei="'mmp' + index" @stickyToTop="handleSessionItemStickTopChange" @click="handleSessionItemClick" @leftSlide="handleSessionItemLeftSlide" />
</div> </div>
</div> </div>
<!-- <div style="height: 48px; background-color: #ededed" v-if="conversationList && conversationList.length > 0"></div> --> <!-- <div style="height: 48px; background-color: #ededed" v-if="conversationList && conversationList.length > 0"></div> -->
<div v-if="conversationList.length == 0" style="padding-top: 130px; background-color: #ededed"> <div v-if="conversationList.length == 0 && !loading" style="padding-top: 130px; background-color: #ededed">
<g-empty text="暂无会话" style="margin-top: 0px" /> <g-empty text="暂无会话" style="margin-top: 0px" />
</div> </div>
<!-- <u-skeleton :loading="loading" :animation="true" el-color="#fff" bg-color="#000"></u-skeleton> -->
</div> </div>
</template> </template>
@ -34,7 +36,7 @@ defineExpose({
conversationList, conversationList,
}); });
const addDropdownVisible = ref(false); const addDropdownVisible = ref(false);
const loading = ref(false); const loading = ref(true);
const currentMoveSessionId = ref(""); const currentMoveSessionId = ref("");

@ -66,7 +66,7 @@ const contactList = ref(null);
const AIList = ref(null); const AIList = ref(null);
const cdnBaseImg = ref(G.store().cdnBaseImg); const cdnBaseImg = ref(G.store().cdnBaseImg);
const isLogin = ref(false); const isLogin = ref(true);
// //
const resetScroll = ref(0); const resetScroll = ref(0);
const tabbarHeight = ref(uni.getStorageSync("TABBAR_HEIGHT")); const tabbarHeight = ref(uni.getStorageSync("TABBAR_HEIGHT"));

@ -18,7 +18,7 @@
<!-- <div style="height: 'auto';position: fixed;left: 0;bottom: 0;width: 100vw;"> --> <!-- <div style="height: 'auto';position: fixed;left: 0;bottom: 0;width: 100vw;"> -->
<MessageInput <MessageInput
:reply-msgs-map="replyMsgsMap" :reply-msgs-map="replyMsgsMap"
:jobListShow.sync="jobListShow" :jobListShow="jobListShow"
@jobListShow=" @jobListShow="
(e) => { (e) => {
jobListShow = e; jobListShow = e;
@ -30,12 +30,15 @@
<!-- </div> --> <!-- </div> -->
<u-popup v-model="jobListShow" mode="bottom" z-index="999999" border-radius="12" :closeable="false" :mask-close-able="true" :mask="true" @close="jobListShow = false"> <u-popup v-model="jobListShow" mode="bottom" z-index="999999" border-radius="12" :closeable="false" :mask-close-able="true" :mask="true" @close="jobListShow = false">
<view class="g_bg_ed" style="min-height: 70vh"> <div class="" @click="sendMsg">123123</div>
<div class="m-search g_p_10 g_pt_8 g_position_rela g_flex_1 bg_shawdoc" style id="searchInputBox"> <scroll-view :scroll-y="true" @scrolltolower="reachBottom" class="g_bg_ed" style="height: 90vh">
<div class="">
<div class="m-search g_p_10 g_pt_8 g_position_rela g_flex_1 g_bg_ed sticky" style id="searchInputBox">
<u-search height="80" v-model="keyword" @input="checkLength" @clear="searchJob" @search="searchJob" class="" placeholder="搜索职位名称" bg-color="#fff" :show-action="false" placeholder-class="g_c_c" search-icon-color="#999999" :maxlength="20"></u-search> <u-search height="80" v-model="keyword" @input="checkLength" @clear="searchJob" @search="searchJob" class="" placeholder="搜索职位名称" bg-color="#fff" :show-action="false" placeholder-class="g_c_c" search-icon-color="#999999" :maxlength="20"></u-search>
</div> </div>
<g-list-job from="chat" @uploadList="getList" @sendJob="sendJob" bg="#ededed" class="" :query="query" :list="query.list" :loading="loading" :speed="speed" :isShowLoginBtn="false" emptyText="嘿,这里还没有数据呢" /> <g-list-job from="chat" @uploadList="getList" @sendJob="sendJob" bg="#ededed" class="" :query="query" :list="query.list" :loading="loading" :speed="speed" :isShowLoginBtn="false" emptyText="嘿,这里还没有数据呢" />
</view> </div>
</scroll-view>
</u-popup> </u-popup>
</div> </div>
</template> </template>
@ -524,6 +527,23 @@ const getList = ($type = "init") => {
} }
); );
}; };
const sendMsg = () => {
const customMsg = uni.$UIKitNIM.V2NIMMessageCreator.createCustomMessage(
"",
JSON.stringify({
type: "0",
content: "测试自定义消息",
})
);
uni.$UIKitStore.msgStore.sendMessageActive({
message: customMsg,
conversationId,
sendBefore: () => {
jobListShow.value = false;
uni.$emit(events.ON_SCROLL_BOTTOM);
},
});
};
const sendJob = (_item) => { const sendJob = (_item) => {
console.log("_item", _item); console.log("_item", _item);
let listInner = ["district", "gender", "age"]; let listInner = ["district", "gender", "age"];
@ -558,6 +578,12 @@ const sendJob = (_item) => {
}, },
}); });
}; };
const reachBottom = () => {
if (query.value.isFinish == -1 || query.value.isFinish == query.value.size) {
query.value.page++;
getList("concat");
}
};
onUnload(() => { onUnload(() => {
uni.$off(events.CONFIRM_FORWARD_MSG); uni.$off(events.CONFIRM_FORWARD_MSG);
uni.$off(events.CANCEL_FORWARD_MSG); uni.$off(events.CANCEL_FORWARD_MSG);
@ -566,6 +592,7 @@ onUnload(() => {
<style lang="scss"> <style lang="scss">
@import "../../base.scss"; @import "../../base.scss";
@import "../../../../static/css/iconfont.css";
page { page {
height: 100%; height: 100%;
overflow: hidden; overflow: hidden;
@ -623,4 +650,10 @@ page {
.msg-wrapper > message-list { .msg-wrapper > message-list {
height: 100%; height: 100%;
} }
.sticky {
position: sticky;
top: 0px;
left: 0;
z-index: 100;
}
</style> </style>

@ -130,7 +130,7 @@
</div> --> </div> -->
<div class="send-more-panel-item-wrapper" v-if="corpUserFlag"> <div class="send-more-panel-item-wrapper" v-if="corpUserFlag">
<div class="send-more-panel-item" @tap="(event) => handleSendJob()"> <div class="send-more-panel-item" @tap="(event) => handleSendJob()">
<Icon type="icon-touxiang5" :size="30"></Icon> <div class="iconfont icon-fasong1 g_c_6 g_fs_24 g_fw_600"></div>
</div> </div>
<div class="icon-text">{{ "发送职位" }}</div> <div class="icon-text">{{ "发送职位" }}</div>
</div> </div>
@ -388,7 +388,7 @@ const keyboardheightchange = (e) => {
const availableHeight = systemInfo.windowHeight - e.detail.height - safeBottom - 120; const availableHeight = systemInfo.windowHeight - e.detail.height - safeBottom - 120;
uni.$emit("msgKeyHeight", availableHeight); // uni.$emit("msgKeyHeight", availableHeight); //
writeStyle.value = `bottom: calc(${e.detail.height}px - env(safe-area-inset-bottom))`; writeStyle.value = `bottom: calc(${e.detail.height}px + env(safe-area-inset-bottom))`;
// #endif // #endif
// #ifdef APP-PLUS // #ifdef APP-PLUS
// //

@ -151,7 +151,7 @@
screenHeight1.value = res; screenHeight1.value = res;
// 100% // 100%
if (typeof res === 'number') { if (typeof res === 'number') {
msgKeyHeight.value = `${(res) * 2}rpx`; msgKeyHeight.value = `${res * 2}rpx`;
} else { } else {
msgKeyHeight.value = res; // '100%' msgKeyHeight.value = res; // '100%'
} }

@ -371,7 +371,7 @@
</view> </view>
</slot> </slot>
</g-panel-fixed> --> </g-panel-fixed> -->
<g-panel-fixed style="box-shadow: 0 -4px 12px #ededed"> <g-panel-fixed style="box-shadow: 0 -4px 12px #ededed" v-if="(orderDetail.downAgencyId && orderDetail.downAgencyId != agencyId) || (orderDetail.upAgencyId && orderDetail.upAgencyId != agencyId)">
<slot> <slot>
<view class="g_ml_20 g_mr_20 g_flex_row_between flex_center flex_nw"> <view class="g_ml_20 g_mr_20 g_flex_row_between flex_center flex_nw">
<view class="g_flex_column_center flex_center g_mr_12" @click="getServiceInfo({ type: 'tel' })"> <i class="iconfont icon-phone g_c_main"></i><view class="g_fs_12 g_c_6 g_mt_4">电话客服</view> </view> <view class="g_flex_column_center flex_center g_mr_12" @click="getServiceInfo({ type: 'tel' })"> <i class="iconfont icon-phone g_c_main"></i><view class="g_fs_12 g_c_6 g_mt_4">电话客服</view> </view>

@ -101,7 +101,7 @@
</template> </template>
</div> </div>
</view> </view>
<div class="g_bg_f g_pt_8"> <div class="g_bg_f g_pt_8" v-if="info.recordStatus == 1 || info.recordStatus == 2">
<u-tabs bg-color="transparent" from="index" gutter="20" :list="tabInfo.list" :is-scroll="true" v-model="tabInfo.active" active-color="#000" bar-width="64" bar-height="6" @change="handleUpdateTab" font-size="32" duration="0.05" height="56"></u-tabs> <u-tabs bg-color="transparent" from="index" gutter="20" :list="tabInfo.list" :is-scroll="true" v-model="tabInfo.active" active-color="#000" bar-width="64" bar-height="6" @change="handleUpdateTab" font-size="32" duration="0.05" height="56"></u-tabs>
</div> </div>
@ -569,15 +569,19 @@ export default {
let that = this; let that = this;
console.log("$type", $type); console.log("$type", $type);
this.G.isLogin(); this.G.isLogin();
if (this.G.isLogin()) { let params = {
that.G.Post(
that.api.job_list,
{
pageNum: that.query.page, pageNum: that.query.page,
pageSize: that.query.size, pageSize: that.query.size,
agencyId: that.info.id, agencyId: that.info.id,
}, };
(res) => { console.log("that.tabInfo.active", that.tabInfo.active);
if (that.tabInfo.active == 1) {
params.jobClassify = 1;
} else if (that.tabInfo.active == 2) {
params.recruitment = 1;
}
if (this.G.isLogin()) {
that.G.Post(that.api.job_list, params, (res) => {
console.log("resresresresresres", res); console.log("resresresresresres", res);
if (res.recordCount == 0) { if (res.recordCount == 0) {
that.loading = false; that.loading = false;
@ -587,8 +591,7 @@ export default {
that.speed = res.recordCount; that.speed = res.recordCount;
that.setJobList(res.recordList, $type); that.setJobList(res.recordList, $type);
console.log("query.list", that.query.list); console.log("query.list", that.query.list);
} });
);
} }
}, },
checkLength(e) { checkLength(e) {
@ -756,7 +759,13 @@ export default {
} }
}, },
handleUpdateTab() {}, handleUpdateTab(e) {
let that = this;
console.log("eeeeeee", e);
that.tabInfo.active = e;
that.query.page = 1;
that.getDefault();
},
goIm() { goIm() {
let that = this; let that = this;
if (that.goImLoading) { if (that.goImLoading) {

@ -119,6 +119,7 @@ export default {
duration: 2000, duration: 2000,
}); });
let userInfo = uni.getStorageSync("apply-userinfo"); let userInfo = uni.getStorageSync("apply-userinfo");
uni.$emit("updateJobList");
uni.$emit("isGlogin", { uni.$emit("isGlogin", {
uid: userInfo.user.id, uid: userInfo.user.id,
}); });

@ -1,5 +1,8 @@
import common from './common.js'
console.log('common',common);
// let ajaxUrl = "http://192.168.3.83:8001"; // let ajaxUrl = "http://192.168.3.83:8001";
let ajaxUrl = "https://daotian.matripe.com.cn"; // let ajaxUrl = "https://daotian.matripe.com.cn";
let ajaxUrl = common.store().baseUrl;
let data = { let data = {
ajaxUrl: ajaxUrl, ajaxUrl: ajaxUrl,
Get ($url = '', $parmas = {}, callback = () => { }, failback = () => { }) { Get ($url = '', $parmas = {}, callback = () => { }, failback = () => { }) {

@ -10,6 +10,8 @@ let data = {
fadanBaseImg: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/dailibaoming/", fadanBaseImg: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/dailibaoming/",
loginText: '请登录', loginText: '请登录',
coziID: '7537572244600471579', coziID: '7537572244600471579',
// baseUrl:"https://daotian.matripe.com.cn",// 网络请求的基础路径
baseUrl: "http://192.168.3.83:8001", // 网络请求的基础路径
// #ifdef MP-WEIXIN // #ifdef MP-WEIXIN
version: uni.getAccountInfoSync().miniProgram.version || "1.0.16", version: uni.getAccountInfoSync().miniProgram.version || "1.0.16",
// #endif // #endif

@ -1,5 +1,8 @@
import common from './common.js'
console.log('common',common);
// let ajaxUrl = "http://192.168.3.83:8001"; // let ajaxUrl = "http://192.168.3.83:8001";
let ajaxUrl = "https://daotian.matripe.com.cn"; // let ajaxUrl = "https://daotian.matripe.com.cn";
let ajaxUrl = common.store().baseUrl;
let data = { let data = {
wyyxajaxUrl: ajaxUrl, wyyxajaxUrl: ajaxUrl,
wyyxGet ($url = '', $parmas = {}, callback = () => { }, failback = () => { }) { wyyxGet ($url = '', $parmas = {}, callback = () => { }, failback = () => { }) {

Loading…
Cancel
Save