|
|
|
|
@ -1090,6 +1090,7 @@
|
|
|
|
|
pageSize: 10,
|
|
|
|
|
},
|
|
|
|
|
(historyRes) => {
|
|
|
|
|
|
|
|
|
|
uni.setStorageSync('isExecute',0)
|
|
|
|
|
if ($type == "concat") {
|
|
|
|
|
uni.hideToast();
|
|
|
|
|
@ -1102,10 +1103,12 @@
|
|
|
|
|
item.ids = '';
|
|
|
|
|
item.comList = [];
|
|
|
|
|
try {
|
|
|
|
|
console.log('0811 try')
|
|
|
|
|
item.chatType = "markdown";
|
|
|
|
|
item.message = JSON.parse(item.message);
|
|
|
|
|
item.ids = item.message.map(itm => itm['职位ID']).join(',');
|
|
|
|
|
} catch (e) {
|
|
|
|
|
console.log('0811 catch')
|
|
|
|
|
if(item.messageType == 99){
|
|
|
|
|
item.chatType = "markdown";
|
|
|
|
|
item.message = item.message;
|
|
|
|
|
@ -1140,7 +1143,7 @@
|
|
|
|
|
attr2:item.attr2 || '',
|
|
|
|
|
};
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
console.log('0811 001')
|
|
|
|
|
if ($type != "concat") {
|
|
|
|
|
uni.showLoading({ title: '加载中' });
|
|
|
|
|
setTimeout(()=>{
|
|
|
|
|
@ -1148,6 +1151,7 @@
|
|
|
|
|
},300)
|
|
|
|
|
that.isShowWelcome = false;
|
|
|
|
|
}
|
|
|
|
|
console.log('0811 002')
|
|
|
|
|
const promises = _array.map(item => {
|
|
|
|
|
if (item.ids && item.ids.replace(/,/g, "")) {
|
|
|
|
|
return new Promise((resolve, reject) => {
|
|
|
|
|
@ -1160,9 +1164,9 @@
|
|
|
|
|
return Promise.resolve(); // 如果没有 ids,直接返回已解决的 Promise
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
console.log('0811 003')
|
|
|
|
|
Promise.all(promises).then(() => {
|
|
|
|
|
|
|
|
|
|
console.log('0811 004')
|
|
|
|
|
if ($type != "concat") {
|
|
|
|
|
uni.hideLoading();
|
|
|
|
|
}
|
|
|
|
|
|