聊天:订单状态实时展示、图片收发修复、联系打手跳转优化
Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
@@ -15,7 +15,8 @@ Page({
|
||||
nicheng: '',
|
||||
beizhu: '',
|
||||
zhuangtai: 0,
|
||||
fadanpingtai: 0
|
||||
fadanpingtai: 0,
|
||||
is_cross: 0
|
||||
},
|
||||
xiangxiShuju: {
|
||||
shangjia_id: '',
|
||||
@@ -181,7 +182,8 @@ Page({
|
||||
'jibenShuju.zhuangtai': data.zhuangtai || 0,
|
||||
'jibenShuju.beizhu': data.beizhu || '',
|
||||
'liuyan': data.dashou_liuyan || '',
|
||||
'jibenShuju.fadanpingtai': data.fadanpingtai || 0
|
||||
'jibenShuju.fadanpingtai': data.fadanpingtai || 0,
|
||||
'jibenShuju.is_cross': data.is_cross || 0,
|
||||
})
|
||||
const currentStatus = data.zhuangtai || 0
|
||||
const showRefund = [4,5,6].includes(currentStatus)
|
||||
@@ -301,12 +303,19 @@ goToChatWithBoss() {
|
||||
const identityType = 'dashou'
|
||||
const userId = 'Ds' + uid
|
||||
|
||||
const fadanPingtai = this.data.jibenShuju.fadanpingtai || 0
|
||||
const partnerUid = fadanPingtai === 2
|
||||
? (this.data.xiangxiShuju.shangjia_id || '')
|
||||
: (this.data.xiangxiShuju.laoban_id || '')
|
||||
|
||||
connectionManager.connectToGroupChat({
|
||||
identityType,
|
||||
userId,
|
||||
orderId,
|
||||
partnerUid,
|
||||
fadanPingtai,
|
||||
groupName: this.data.jibenShuju.nicheng + '的订单群',
|
||||
isCross: this.data.jibenShuju.fadanpingtai || 0
|
||||
isCross: this.data.jibenShuju.is_cross || 0
|
||||
}).catch(err => {
|
||||
console.error('跳转群聊失败', err)
|
||||
})
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
const app = getApp();
|
||||
import { formatDate } from '../../static/lib/utils';
|
||||
import { formatDate, normalizeChatMessage, getChatImageUrl } from '../../static/lib/utils';
|
||||
import { showConfirmByScene } from '../../utils/scriptService.js';
|
||||
import { sendGoEasyImage } from '../../utils/chatImageSend.js';
|
||||
|
||||
Page({
|
||||
data: {
|
||||
@@ -21,6 +23,7 @@ Page({
|
||||
lastTapMsgId: '',
|
||||
emojiList: ['😀','😁','😂','🤣','😃','😄','😅','😆','😉','😊','😋','😎','😍','😘','😗','😙','😚','🙂','🤗','🤩','🤔','🤨','😐','😑','😶','🙄','😏','😣','😥','😮','🤐','😯','😪','😫','😴','😌','😛','😜','😝','🤤','😒','😓','😔','😕','🙃','🤑','😲','☹','🙁','😖','😞','😟','😤','😢','😭','😦','😧','😨','😩','🤯','😬','😰','😱','🥵','🥶','😳','🤪','😵','😡','😠','🤬','😷','🤒','🤕','🤢','🤮','🤧','😇','🤠','🤡','🤥','🤫','🤭','🧐','🤓','😈','👿','👹','👺','💀','👻','👽','🤖','💩','😺','😸','😹','😻','😼','😽','🙀','😿','😾'],
|
||||
pendingImage: '',
|
||||
pendingImageFile: null,
|
||||
keyboardHeight: 0,
|
||||
bottomSafeHeight: 10
|
||||
},
|
||||
@@ -29,7 +32,10 @@ Page({
|
||||
if (options.data) {
|
||||
try {
|
||||
const p = JSON.parse(decodeURIComponent(options.data));
|
||||
this.setData({ toUserId: p.toUserId || '', toName: p.toName || '聊天', toAvatar: p.toAvatar || '' });
|
||||
const toId = p.toUserId || (p.to && p.to.id) || '';
|
||||
const toName = p.toName || (p.to && p.to.name) || '聊天';
|
||||
const toAvatar = p.toAvatar || (p.to && p.to.avatar) || '';
|
||||
this.setData({ toUserId: toId, toName, toAvatar });
|
||||
} catch (e) {}
|
||||
}
|
||||
wx.setNavigationBarTitle({ title: this.data.toName });
|
||||
@@ -37,10 +43,14 @@ Page({
|
||||
},
|
||||
|
||||
onShow() {
|
||||
app.globalData.pageState.isInChatPage = true;
|
||||
app.globalData.pageState.currentChatId = this.data.toUserId;
|
||||
this.autoConnect();
|
||||
},
|
||||
|
||||
onHide() {
|
||||
app.globalData.pageState.isInChatPage = false;
|
||||
app.globalData.pageState.currentChatId = '';
|
||||
this.clearAllListeners();
|
||||
},
|
||||
|
||||
@@ -142,6 +152,7 @@ Page({
|
||||
let list = res.content || [];
|
||||
list.sort((a, b) => a.timestamp - b.timestamp);
|
||||
list.forEach((m, idx) => {
|
||||
normalizeChatMessage(m);
|
||||
m.formattedTime = formatDate(m.timestamp);
|
||||
if (idx === 0) m.showTime = true;
|
||||
else m.showTime = (m.timestamp - list[idx-1].timestamp) / 60000 > 5;
|
||||
@@ -180,6 +191,7 @@ Page({
|
||||
if (this._msgHandler) wx.goEasy.im.off(wx.GoEasy.IM_EVENT.PRIVATE_MESSAGE_RECEIVED, this._msgHandler);
|
||||
this._msgHandler = (msg) => {
|
||||
if (msg.receiverId !== this.data.currentUser.id && msg.senderId !== this.data.toUserId) return;
|
||||
normalizeChatMessage(msg);
|
||||
msg.formattedTime = formatDate(msg.timestamp);
|
||||
if (msg.senderId === this.data.currentUser.id) {
|
||||
msg.senderData = { name: this.data.currentUser.name, avatar: this.data.currentUser.avatar };
|
||||
@@ -237,16 +249,42 @@ Page({
|
||||
onInput(e) { this.setData({ inputText: e.detail.value }); },
|
||||
chooseImage() {
|
||||
const that = this;
|
||||
const onPick = (file) => {
|
||||
if (!file) return;
|
||||
const path = typeof file === 'string' ? file : (file.tempFilePath || file.path);
|
||||
if (!path) return;
|
||||
that.setData({
|
||||
pendingImage: path,
|
||||
pendingImageFile: typeof file === 'string' ? { tempFilePath: path, path } : file,
|
||||
showPlusPanel: false,
|
||||
});
|
||||
};
|
||||
if (wx.chooseMedia) {
|
||||
wx.chooseMedia({
|
||||
count: 1,
|
||||
mediaType: ['image'],
|
||||
sourceType: ['album', 'camera'],
|
||||
sizeType: ['compressed'],
|
||||
success(res) { onPick(res.tempFiles[0]); }
|
||||
});
|
||||
return;
|
||||
}
|
||||
wx.chooseImage({
|
||||
count: 1, sizeType: ['compressed'], sourceType: ['album', 'camera'],
|
||||
success(res) { that.setData({ pendingImage: res.tempFilePaths[0] }); }
|
||||
success(res) {
|
||||
const p = res.tempFilePaths[0];
|
||||
onPick(res.tempFiles && res.tempFiles[0] || { tempFilePath: p, path: p });
|
||||
}
|
||||
});
|
||||
},
|
||||
clearPendingImage() { this.setData({ pendingImage: '' }); },
|
||||
clearPendingImage() { this.setData({ pendingImage: '', pendingImageFile: null }); },
|
||||
sendMessage() {
|
||||
if (this.data.pendingImage) {
|
||||
this.sendImageMsg(this.data.pendingImage);
|
||||
this.setData({ pendingImage: '' });
|
||||
const file = this.data.pendingImageFile || this.data.pendingImage;
|
||||
showConfirmByScene('chat_image_confirm', () => {
|
||||
this.sendImageMsg(file);
|
||||
this.setData({ pendingImage: '', pendingImageFile: null });
|
||||
});
|
||||
return;
|
||||
}
|
||||
const text = this.data.inputText.trim();
|
||||
@@ -280,19 +318,40 @@ Page({
|
||||
sendImageMsg(file) {
|
||||
const { currentUser, toUserId } = this.data;
|
||||
if (!toUserId || !currentUser) return;
|
||||
const preview = typeof file === 'string' ? file : (file.tempFilePath || file.path);
|
||||
const id = 'img-'+Date.now();
|
||||
const local = {
|
||||
messageId:id, type:'image', timestamp:Date.now(),
|
||||
senderId:currentUser.id, receiverId:toUserId,
|
||||
payload:{url:file}, status:'sending', read:false,
|
||||
senderData: { name: currentUser.name, avatar: currentUser.avatar },
|
||||
payload:{url:preview}, imageUrl:preview, status:'sending', read:false,
|
||||
formattedTime:formatDate(Date.now()), showTime:this.needShow(Date.now())
|
||||
};
|
||||
this.setData({ messages: [...this.data.messages, local], scrollToView: 'msg-bottom' });
|
||||
const imgMsg = wx.goEasy.im.createImageMessage({
|
||||
const to = { type: wx.GoEasy.IM_SCENE.PRIVATE, id: toUserId, data: { avatar: currentUser.avatar, name: currentUser.name } };
|
||||
sendGoEasyImage({
|
||||
file,
|
||||
to:{ type:wx.GoEasy.IM_SCENE.PRIVATE, id:toUserId, data:{ avatar:currentUser.avatar, name:currentUser.name } }
|
||||
to,
|
||||
onSuccess: (sentMsg) => this.onImageSendSuccess(id, sentMsg, preview),
|
||||
onFailed: () => this.updateMsg(id, 'failed'),
|
||||
});
|
||||
},
|
||||
onImageSendSuccess(localId, sentMsg, localFile) {
|
||||
const normalized = normalizeChatMessage(sentMsg || {});
|
||||
const url = getChatImageUrl(normalized) || localFile;
|
||||
this.setData({
|
||||
messages: this.data.messages.map(m => {
|
||||
if (m.messageId !== localId) return m;
|
||||
return {
|
||||
...m,
|
||||
...normalized,
|
||||
messageId: normalized.messageId || m.messageId,
|
||||
payload: { ...(m.payload || {}), url },
|
||||
imageUrl: url,
|
||||
status: 'success'
|
||||
};
|
||||
})
|
||||
});
|
||||
wx.goEasy.im.sendMessage({ message:imgMsg, onSuccess:()=>this.updateMsg(id,'success'), onFailed:()=>{ this.updateMsg(id,'failed'); } });
|
||||
},
|
||||
updateMsg(id, status) { this.setData({ messages: this.data.messages.map(m => m.messageId === id ? { ...m, status } : m) }); },
|
||||
needShow(ts) { const ms = this.data.messages; if (!ms.length) return true; const last = ms[ms.length-1]; return (ts - last.timestamp) / 60000 > 5; },
|
||||
@@ -361,7 +420,15 @@ Page({
|
||||
});
|
||||
},
|
||||
|
||||
previewImage(e) { wx.previewImage({ urls: [e.currentTarget.dataset.url], current: e.currentTarget.dataset.url }); },
|
||||
previewImage(e) {
|
||||
const url = e.currentTarget.dataset.url;
|
||||
if (!url) return;
|
||||
const urls = this.data.messages
|
||||
.filter(m => m.type === 'image')
|
||||
.map(m => m.imageUrl || getChatImageUrl(m))
|
||||
.filter(Boolean);
|
||||
wx.previewImage({ urls: urls.length ? urls : [url], current: url });
|
||||
},
|
||||
|
||||
togglePlusPanel() { this.setData({ showPlusPanel: !this.data.showPlusPanel, showEmojiPanel: false }); },
|
||||
closePlusPanel() { this.setData({ showPlusPanel: false }); },
|
||||
|
||||
@@ -2,7 +2,8 @@ const app = getApp();
|
||||
import { formatDate } from '../../static/lib/utils';
|
||||
import { sendGroupMessage } from '../../utils/message-sender';
|
||||
import { showConfirmByScene } from '../../utils/scriptService.js';
|
||||
import { normalizeGroupMessage } from '../../utils/group-chat.js';
|
||||
import { normalizeGroupMessage, getZhuangtaiText } from '../../utils/group-chat.js';
|
||||
import { persistGroupMeta } from '../../utils/im-user.js';
|
||||
import { getFreshImUser } from '../../utils/im-user.js';
|
||||
|
||||
Page({
|
||||
@@ -12,6 +13,10 @@ Page({
|
||||
groupAvatar: '',
|
||||
orderId: '',
|
||||
isCross: 0,
|
||||
orderZhuangtai: null,
|
||||
orderZhuangtaiText: '',
|
||||
orderJine: '',
|
||||
orderJieshao: '',
|
||||
currentUser: null,
|
||||
messages: [],
|
||||
inputText: '',
|
||||
@@ -61,33 +66,101 @@ Page({
|
||||
} else {
|
||||
this.initCurrentUser();
|
||||
}
|
||||
},
|
||||
|
||||
/*onLoad(options) {
|
||||
if (options.data) {
|
||||
try {
|
||||
const p = JSON.parse(decodeURIComponent(options.data));
|
||||
this.setData({
|
||||
groupId: p.groupId || '',
|
||||
groupName: p.groupName || '订单群聊',
|
||||
groupAvatar: p.groupAvatar || '',
|
||||
orderId: p.orderId || '',
|
||||
isCross: p.isCross || 0
|
||||
});
|
||||
} catch (e) {}
|
||||
|
||||
const meta = (app.globalData.groupInfoMap && app.globalData.groupInfoMap[p.groupId]) || {};
|
||||
const initZt = p.orderZhuangtai != null ? p.orderZhuangtai : meta.orderZhuangtai;
|
||||
if (initZt != null) {
|
||||
this.applyOrderStatus(initZt, {
|
||||
orderId: p.orderId || meta.orderId,
|
||||
jine: p.orderJine || meta.orderJine,
|
||||
jieshao: p.orderDesc || meta.orderDesc,
|
||||
});
|
||||
}
|
||||
wx.setNavigationBarTitle({ title: this.data.groupName });
|
||||
this.initCurrentUser();
|
||||
},*/
|
||||
},
|
||||
|
||||
onShow() {
|
||||
app.globalData.pageState.isInChatPage = true;
|
||||
app.globalData.pageState.currentChatId = this.data.groupId;
|
||||
app.globalData.pageState.isInGroupChat = true;
|
||||
this.ensureChatConnection();
|
||||
},
|
||||
|
||||
onHide() {
|
||||
app.globalData.pageState.isInChatPage = false;
|
||||
app.globalData.pageState.currentChatId = '';
|
||||
app.globalData.pageState.isInGroupChat = false;
|
||||
this.clearPageListeners();
|
||||
},
|
||||
|
||||
applyOrderStatus(zhuangtai, extra) {
|
||||
if (zhuangtai == null && zhuangtai !== 0) return;
|
||||
const patch = {
|
||||
orderZhuangtai: zhuangtai,
|
||||
orderZhuangtaiText: getZhuangtaiText(zhuangtai),
|
||||
};
|
||||
if (extra) {
|
||||
if (extra.jine) patch.orderJine = extra.jine;
|
||||
if (extra.jieshao) patch.orderJieshao = extra.jieshao;
|
||||
if (extra.orderId) patch.orderId = extra.orderId;
|
||||
}
|
||||
this.setData(patch);
|
||||
|
||||
const groupId = this.data.groupId;
|
||||
if (!groupId) return;
|
||||
if (!app.globalData.groupInfoMap) app.globalData.groupInfoMap = {};
|
||||
const meta = { ...(app.globalData.groupInfoMap[groupId] || {}), orderZhuangtai: zhuangtai };
|
||||
if (extra && extra.orderId) meta.orderId = extra.orderId;
|
||||
app.globalData.groupInfoMap[groupId] = meta;
|
||||
persistGroupMeta(app, groupId, meta);
|
||||
},
|
||||
|
||||
applyOrderCardPayload(payload) {
|
||||
if (!payload) return;
|
||||
const zt = payload.zhuangtai != null ? payload.zhuangtai : this.data.orderZhuangtai;
|
||||
payload.zhuangtaiText = getZhuangtaiText(zt);
|
||||
this.applyOrderStatus(zt, {
|
||||
orderId: payload.orderId || payload.dingdan_id || this.data.orderId,
|
||||
jine: payload.jine,
|
||||
jieshao: payload.jieshao,
|
||||
});
|
||||
this.updateOrderBubblesInList(payload);
|
||||
},
|
||||
|
||||
updateOrderBubblesInList(payload) {
|
||||
if (!payload) return;
|
||||
const orderId = payload.orderId || payload.dingdan_id;
|
||||
if (!orderId) return;
|
||||
const messages = this.data.messages.map((m) => {
|
||||
if (m.type !== 'order' || !m.payload) return m;
|
||||
const oid = m.payload.orderId || m.payload.dingdan_id;
|
||||
if (oid !== orderId) return m;
|
||||
return { ...m, payload: { ...m.payload, ...payload, orderId: oid } };
|
||||
});
|
||||
this.setData({ messages });
|
||||
},
|
||||
|
||||
mergeServerMessage(localId, status, serverMsg) {
|
||||
if (!serverMsg) {
|
||||
this.updateMsg(localId, status);
|
||||
return;
|
||||
}
|
||||
normalizeGroupMessage(serverMsg);
|
||||
serverMsg.formattedTime = formatDate(serverMsg.timestamp);
|
||||
if (serverMsg.type === 'order') {
|
||||
this.applyOrderCardPayload(serverMsg.payload);
|
||||
}
|
||||
const msgs = this.data.messages.map((m) => {
|
||||
if (m.messageId !== localId) return m;
|
||||
return {
|
||||
...serverMsg,
|
||||
showTime: m.showTime,
|
||||
status: status || 'success',
|
||||
formattedTime: serverMsg.formattedTime || m.formattedTime,
|
||||
};
|
||||
});
|
||||
this.setData({ messages: msgs });
|
||||
},
|
||||
|
||||
ensureChatConnection() {
|
||||
const role = app.globalData.currentRole || 'normal';
|
||||
const uid = wx.getStorageSync('uid');
|
||||
@@ -100,10 +173,11 @@ Page({
|
||||
this.loadHistory(true).then(() => this.markGroupMessageAsRead());
|
||||
};
|
||||
|
||||
const connectedId = app.globalData?.goEasyConnection?.userId || wx.goEasy?.im?.userId;
|
||||
const status = wx.goEasy?.getConnectionStatus?.() || 'disconnected';
|
||||
const currentUserId = wx.goEasy?.im?.userId;
|
||||
const imOk = status === 'connected' || status === 'reconnected';
|
||||
|
||||
if ((status === 'connected' || status === 'reconnected') && currentUserId === targetUserId) {
|
||||
if (imOk && connectedId === targetUserId) {
|
||||
onReady();
|
||||
return;
|
||||
}
|
||||
@@ -219,6 +293,9 @@ Page({
|
||||
if (idx === 0) m.showTime = true;
|
||||
else m.showTime = (m.timestamp - list[idx-1].timestamp) / 60000 > 5;
|
||||
if (!m.senderData) m.senderData = { name: '未知用户', avatar: '' };
|
||||
if (m.type === 'order' && m.payload) {
|
||||
this.applyOrderCardPayload(m.payload);
|
||||
}
|
||||
});
|
||||
let final = refresh ? list : [...list, ...this.data.messages];
|
||||
if (!refresh) {
|
||||
@@ -249,10 +326,14 @@ Page({
|
||||
if (this._msgHandler) wx.goEasy.im.off(wx.GoEasy.IM_EVENT.GROUP_MESSAGE_RECEIVED, this._msgHandler);
|
||||
this._msgHandler = (msg) => {
|
||||
if (msg.groupId !== this.data.groupId) return;
|
||||
if (msg.senderId === this.data.currentUser.id) return;
|
||||
normalizeGroupMessage(msg);
|
||||
if (msg.type === 'order' && msg.payload) {
|
||||
this.applyOrderCardPayload(msg.payload);
|
||||
}
|
||||
if (msg.senderId === this.data.currentUser.id && msg.type !== 'order') return;
|
||||
msg.formattedTime = formatDate(msg.timestamp);
|
||||
const msgs = this.data.messages;
|
||||
if (msgs.some((m) => m.messageId === msg.messageId)) return;
|
||||
const last = msgs.length ? msgs[msgs.length-1] : null;
|
||||
msg.showTime = last ? (msg.timestamp - last.timestamp) / 60000 > 5 : true;
|
||||
this.setData({ messages: [...msgs, msg], scrollToView: 'msg-bottom' });
|
||||
@@ -339,8 +420,8 @@ Page({
|
||||
}
|
||||
that.setData({ messages: [...msgs, localMsg], scrollToView: 'msg-bottom' });
|
||||
},
|
||||
onSuccess: (messageId, status) => {
|
||||
that.updateMsg(messageId, status);
|
||||
onSuccess: (messageId, status, serverMsg) => {
|
||||
that.mergeServerMessage(messageId, status, serverMsg);
|
||||
}
|
||||
});
|
||||
},
|
||||
@@ -367,8 +448,8 @@ Page({
|
||||
}
|
||||
that.setData({ messages: [...msgs, localMsg], scrollToView: 'msg-bottom' });
|
||||
},
|
||||
onSuccess: (messageId, status) => {
|
||||
that.updateMsg(messageId, status);
|
||||
onSuccess: (messageId, status, serverMsg) => {
|
||||
that.mergeServerMessage(messageId, status, serverMsg);
|
||||
}
|
||||
});
|
||||
},
|
||||
@@ -403,7 +484,7 @@ Page({
|
||||
const msgId = e.currentTarget.dataset.messageid;
|
||||
if (!msgId) return;
|
||||
const msg = this.data.messages.find(m => m.messageId === msgId);
|
||||
if (!msg || msg.messageId.startsWith('local-')) return;
|
||||
if (!msg || String(msg.messageId).startsWith('local-')) return;
|
||||
const itemList = ['复制'];
|
||||
if (msg.senderId === this.data.currentUser.id && (Date.now() - msg.timestamp < 120000) && !msg.recalled) {
|
||||
itemList.push('撤回');
|
||||
|
||||
@@ -1,4 +1,11 @@
|
||||
<view class="chat-page">
|
||||
<view class="order-status-bar" wx:if="{{orderId}}">
|
||||
<view class="order-status-main">
|
||||
<text class="order-status-id">订单 {{orderId}}</text>
|
||||
<text class="order-status-tag" wx:if="{{orderZhuangtaiText}}">{{orderZhuangtaiText}}</text>
|
||||
</view>
|
||||
<text class="order-status-desc" wx:if="{{orderJieshao}}">{{orderJieshao}}</text>
|
||||
</view>
|
||||
<scroll-view class="msg-list" scroll-y="true"
|
||||
scroll-into-view="{{scrollToView}}"
|
||||
refresher-enabled="{{true}}"
|
||||
@@ -15,16 +22,16 @@
|
||||
<image class="avatar" src="{{item.senderData.avatar || '/images/default-avatar.png'}}" mode="aspectFill" />
|
||||
<text class="sender-name">{{item.senderData.name || item.senderId}}</text>
|
||||
</view>
|
||||
<view class="bubble {{item.senderId === currentUser.id ? 'bubble-right' : 'bubble-left'}}"
|
||||
<view class="bubble {{item.senderId === currentUser.id ? 'bubble-right' : 'bubble-left'}} {{item.type === 'image' ? 'bubble-image' : ''}}"
|
||||
data-messageid="{{item.messageId}}"
|
||||
data-text="{{item.type==='text' ? item.payload.text : ''}}"
|
||||
bindtap="{{item.type==='text' ? 'onBubbleTap' : (item.type==='image' ? 'previewImage' : '')}}"
|
||||
data-url="{{item.type==='image' ? item.payload.url : ''}}">
|
||||
bindtap="{{item.type==='text' ? 'onBubbleTap' : ''}}">
|
||||
<text wx:if="{{item.type === 'text'}}" class="msg-text">{{item.payload.text}}</text>
|
||||
<image wx:elif="{{item.type === 'image'}}" class="msg-image" src="{{item.payload.url}}" mode="widthFix" />
|
||||
<image wx:elif="{{item.type === 'image'}}" class="msg-image" src="{{item.imageUrl || item.payload.url}}" mode="widthFix" catchtap="previewImage" data-url="{{item.imageUrl || item.payload.url}}" />
|
||||
<view wx:elif="{{item.type === 'order'}}" class="order-bubble" data-payload="{{item.payload}}" bindtap="viewOrderDetail">
|
||||
<text class="order-label">[订单]</text>
|
||||
<text class="order-info">ID: {{item.payload.orderId}}</text>
|
||||
<text class="order-info order-status-inline" wx:if="{{item.payload.zhuangtaiText || item.payload.zhuangtai}}">状态: {{item.payload.zhuangtaiText || item.payload.zhuangtai}}</text>
|
||||
<text class="order-info">内容: {{item.payload.jieshao}}</text>
|
||||
<text class="order-info">金额: ¥{{item.payload.jine}}</text>
|
||||
<view class="order-detail-link">点击查看详情</view>
|
||||
|
||||
@@ -1,8 +1,29 @@
|
||||
.chat-page { width:100%; height:100vh; background:#f5f5f5; }
|
||||
|
||||
.order-status-bar {
|
||||
position: fixed;
|
||||
top: 0; left: 0; right: 0;
|
||||
z-index: 11;
|
||||
background: #fff;
|
||||
padding: 16rpx 24rpx;
|
||||
border-bottom: 1rpx solid #e8e8e8;
|
||||
box-shadow: 0 4rpx 12rpx rgba(0,0,0,0.04);
|
||||
}
|
||||
.order-status-main { display: flex; align-items: center; justify-content: space-between; }
|
||||
.order-status-id { font-size: 26rpx; color: #333; font-weight: 600; }
|
||||
.order-status-tag {
|
||||
font-size: 22rpx; color: #07c160; background: #e8f8ee;
|
||||
padding: 4rpx 16rpx; border-radius: 20rpx;
|
||||
}
|
||||
.order-status-desc {
|
||||
font-size: 24rpx; color: #888; margin-top: 8rpx;
|
||||
display: block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;
|
||||
}
|
||||
|
||||
.msg-list {
|
||||
position: absolute;
|
||||
left:0; right:0;
|
||||
top: 100rpx;
|
||||
padding: 0 20rpx;
|
||||
box-sizing: border-box;
|
||||
overflow-y: auto;
|
||||
@@ -18,12 +39,15 @@
|
||||
.bubble { max-width:70%; padding:16rpx 20rpx; border-radius:16rpx; position:relative; word-break:break-all; font-size:30rpx; line-height:1.5; }
|
||||
.bubble-left { background:#fff; border-top-left-radius:4rpx; }
|
||||
.bubble-right { background:#00aaff; color:#fff; border-top-right-radius:4rpx; }
|
||||
.bubble-image { padding:0; background:transparent !important; overflow:hidden; }
|
||||
.bubble-image.bubble-right { color:inherit; }
|
||||
.msg-text { color:inherit; }
|
||||
.msg-image { max-width:240rpx; border-radius:10rpx; }
|
||||
.msg-image { max-width:360rpx; min-width:120rpx; display:block; border-radius:10rpx; }
|
||||
|
||||
.order-bubble { background:#fff7e0; padding:12rpx; border-radius:8rpx; }
|
||||
.order-label { font-size:24rpx; color:#e6a23c; font-weight:600; }
|
||||
.order-info { font-size:24rpx; color:#333; margin:6rpx 0; }
|
||||
.order-status-inline { color: #07c160; font-weight: 600; }
|
||||
.order-detail-link { color:#007aff; font-size:24rpx; margin-top:8rpx; }
|
||||
|
||||
.input-area {
|
||||
|
||||
@@ -8,7 +8,7 @@ Page({
|
||||
data: {
|
||||
jibenShuju: {
|
||||
dingdan_id: '', tupian: '', jieshao: '', create_time: '',
|
||||
jine: '', nicheng: '', beizhu: '', zhuangtai: 0, fadanpingtai: 0
|
||||
jine: '', nicheng: '', beizhu: '', zhuangtai: 0, fadanpingtai: 0, is_cross: 0
|
||||
},
|
||||
dashouInfo: { yonghuid: '', nicheng: '', avatar: '' },
|
||||
xiangxiShuju: {
|
||||
@@ -131,6 +131,7 @@ Page({
|
||||
'jibenShuju.beizhu': dingdanData.beizhu || '',
|
||||
'jibenShuju.zhuangtai': dingdanData.zhuangtai || 0,
|
||||
'jibenShuju.fadanpingtai': dingdanData.fadanpingtai || 0,
|
||||
'jibenShuju.is_cross': dingdanData.is_cross || 0,
|
||||
isLoading: false
|
||||
})
|
||||
this.jiazaiXiangxiShuju(dingdanData.dingdan_id)
|
||||
@@ -186,7 +187,9 @@ Page({
|
||||
fadanData: d.fadan || null,
|
||||
fenhongLilv: parseFloat(d.fenhong_lilv) || 0,
|
||||
xinDingdanId: d.xin_dingdan_id || '',
|
||||
'jibenShuju.zhuangtai': d.zhuangtai || this.data.jibenShuju.zhuangtai
|
||||
'jibenShuju.zhuangtai': d.zhuangtai || this.data.jibenShuju.zhuangtai,
|
||||
'jibenShuju.is_cross': d.is_cross != null ? d.is_cross : this.data.jibenShuju.is_cross,
|
||||
'jibenShuju.fadanpingtai': d.fadanpingtai != null ? d.fadanpingtai : this.data.jibenShuju.fadanpingtai,
|
||||
})
|
||||
} else {
|
||||
wx.showToast({ title: res?.data?.msg || '获取详情失败', icon: 'none' })
|
||||
@@ -243,8 +246,10 @@ Page({
|
||||
identityType: 'shangjia',
|
||||
userId: 'Sj' + uid,
|
||||
orderId,
|
||||
partnerUid: this.data.dashouInfo.yonghuid,
|
||||
fadanPingtai: this.data.jibenShuju.fadanpingtai || 0,
|
||||
groupName: (this.data.dashouInfo.nicheng || this.data.jibenShuju.nicheng) + '的订单群',
|
||||
isCross: this.data.jibenShuju.fadanpingtai || 0
|
||||
isCross: this.data.jibenShuju.is_cross || 0
|
||||
}).catch(err => {
|
||||
console.error('跳转群聊失败', err)
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user