From 77ef9cb2360adcb05cf9868bc8c7b980339c0860 Mon Sep 17 00:00:00 2001
From: wangxia <779219182@qq.com>
Date: Mon, 1 Sep 2025 18:38:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components/list/apply.vue | 12 ++-
.../conversation-list/conversation-item.vue | 12 ++-
pages/workBench/index.vue | 47 +++++++---
root/NEUIKit/pages/Chat/index.vue | 80 +++++++++++++----
root/NEUIKit/pages/Chat/message/message-input.vue | 99 ++++++++++------------
root/NEUIKit/pages/Chat/message/message-item.vue | 50 ++++++++++-
static/css/iconfont.css | 14 ++-
utils/ajax.js | 3 -
utils/common.js | 8 +-
9 files changed, 222 insertions(+), 103 deletions(-)
diff --git a/components/list/apply.vue b/components/list/apply.vue
index 973c86f..85f1778 100644
--- a/components/list/apply.vue
+++ b/components/list/apply.vue
@@ -19,8 +19,8 @@
-
-
+
+
@@ -36,6 +36,9 @@
+
+
+
@@ -123,7 +126,7 @@ export default {
watch: {},
created() {
this.tabbarHeight = uni.getStorageSync("TABBAR_HEIGHT");
- console.log('this.tabbarHeight',this.tabbarHeight);
+ console.log("this.tabbarHeight", this.tabbarHeight);
},
mounted() {},
// 组件方法
@@ -161,6 +164,9 @@ export default {
});
}
},
+ sendApply(_item) {
+ uni.$emit("sendApply", { ..._item, active: this.tabActive + 1 });
+ },
},
};
diff --git a/pages/NEUIKit/pages/Conversation/conversation-list/conversation-item.vue b/pages/NEUIKit/pages/Conversation/conversation-list/conversation-item.vue
index 69ee7ea..8788802 100644
--- a/pages/NEUIKit/pages/Conversation/conversation-list/conversation-item.vue
+++ b/pages/NEUIKit/pages/Conversation/conversation-list/conversation-item.vue
@@ -151,11 +151,17 @@ const lastMsgContent = computed(() => {
let _str = "[多媒体]";
if (!lastMsg.text && lastMsg.attachment && lastMsg.attachment.raw) {
- if(!lastMsg.text && lastMsg.attachment && lastMsg.attachment.raw && lastMsg.attachment.ext == '.mp4' && lastMsg.attachment.url){
+ console.log("lastMsglastMsglastMsg123", lastMsg);
+ if(!lastMsg.text && lastMsg.attachment && la+stMsg.attachment.raw && lastMsg.attachment.ext == '.mp4' && lastMsg.attachment.url){
_str = "[视频]";
- }else{
- _str = "[职位] " + JSON.parse(lastMsg.attachment.raw).title;
}
+ else if (JSON.parse(lastMsg.attachment.raw).type == 100002){
+ _str = "[工单] " + JSON.parse(lastMsg.attachment.raw).userName;
+ }
+ else {
+ _str = "[职位] " + JSON.parse(lastMsg.attachment.raw).title;
+
+ }
}
if (!lastMsg.text && lastMsg.attachment && lastMsg.attachment.ext == ".mp3") {
_str = "[语音]";
diff --git a/pages/workBench/index.vue b/pages/workBench/index.vue
index 1c074de..d9e2355 100644
--- a/pages/workBench/index.vue
+++ b/pages/workBench/index.vue
@@ -12,7 +12,7 @@
-
+
@@ -20,8 +20,8 @@
-
-
+
+
@@ -35,7 +35,7 @@
-
+
@@ -51,6 +51,16 @@ export default {
};
// return this.G.shareFun();
},
+ props: {
+ from: {
+ type: String,
+ default: "",
+ },
+ upAgencyId: {
+ type: Number,
+ default: null,
+ },
+ },
data() {
return {
isHaveOrder: -1,
@@ -162,13 +172,12 @@ export default {
// that.menuActive = Number(options.status);
// }, 200);
}
+
+ console.log(123123123);
},
created() {
let that = this;
- console.log(12312312312);
- },
- onShow() {
- let that = this;
+ console.log(4567456456);
// 导航栏高度信息
that.navInfo = that.G.getNavInfo();
if (uni.getStorageSync("apply-supplierAccount") == 1) {
@@ -191,7 +200,7 @@ export default {
that.menuActive = uni.getStorageSync("applyType");
uni.removeStorageSync("applyType");
}
-
+ this.getList();
if (!that.isLogin) {
that.loading = false;
that.speed = 0;
@@ -202,6 +211,12 @@ export default {
this.menuList = this.tabInfo[this.tabActive].childList;
this.getList();
}
+ },
+ onShow() {
+ let that = this;
+ if (that.isLogin) {
+ this.getList();
+ }
this.getGZHInfo();
that.G.watchUserPage("pages/workBench/index");
},
@@ -227,8 +242,9 @@ export default {
{
pageNum: that.query.page,
pageSize: that.query.size,
- keys: "",
+ keys: that.keyword,
classify: 1,
+ upAgencyId: that.upAgencyId,
// classify: that.tabActive + 1,
statusStr: that.tabInfo[that.tabActive].childList[that.menuActive].tip,
},
@@ -347,7 +363,16 @@ export default {
this.getList();
}
},
- getSearch(e) {},
+ getSearch(type) {
+ let that = this;
+ console.log("typetypetype", type);
+ console.log("getSearch", that.keyword);
+ if (type == "clear" && !that.keyword) {
+ that.getList();
+ } else if (type == "search") {
+ that.getList();
+ }
+ },
goDetail($item, $index) {
let that = this;
console.log("$item", $item);
diff --git a/root/NEUIKit/pages/Chat/index.vue b/root/NEUIKit/pages/Chat/index.vue
index 60b6b51..dd2d56b 100644
--- a/root/NEUIKit/pages/Chat/index.vue
+++ b/root/NEUIKit/pages/Chat/index.vue
@@ -21,12 +21,12 @@
:jobListShow="jobListShow"
@jobListShow="
(e) => {
- jobListShow = e;
+ jobListShow = e.isShow;
+ popType = e.type;
}
"
:conversation-type="conversationType"
:to="to"
- @exportPointJob="exportPointJob"
/>
@@ -36,11 +36,17 @@
@@ -49,6 +55,7 @@