diff --git a/pages/order/MyOrder/index.vue b/pages/order/MyOrder/index.vue index fe79d94..c834027 100644 --- a/pages/order/MyOrder/index.vue +++ b/pages/order/MyOrder/index.vue @@ -301,8 +301,18 @@ export default { return this.$force2Decimal(v); }, goRoom(order) { + const params = { + goodsId: order.cartInfo[0].productId, + goodsName: order.cartInfo[0].productInfo.storeName, + skuStr: order.cartInfo[0].productInfo.attrInfo.sku, + price: order.cartInfo[0].productInfo.attrInfo.price, + seckillId: order.cartInfo[0].seckillId, + cover: order.cartInfo[0].productInfo.attrInfo.image, + goodsData: '', + seckillData: '' + } uni.navigateTo({ - url: `/pkg_common/views/room?id=${order.merId}&name=${order.merName}` + url: `/pkg_common/views/room?id=${order.merId}&name=${order.merName}¶ms=${JSON.stringify(params)}` }) }, goRefund(order) { diff --git a/pages/order/OrderDetails/index.vue b/pages/order/OrderDetails/index.vue index 4fbbca0..cd4f7d3 100644 --- a/pages/order/OrderDetails/index.vue +++ b/pages/order/OrderDetails/index.vue @@ -531,8 +531,18 @@ export default { }); }, goRoom(order) { + const params = { + goodsId: order.cartInfo[0].productId, + goodsName: order.cartInfo[0].productInfo.storeName, + skuStr: order.cartInfo[0].productInfo.attrInfo.sku, + price: order.cartInfo[0].productInfo.attrInfo.price, + seckillId: order.cartInfo[0].seckillId, + cover: order.cartInfo[0].productInfo.attrInfo.image, + goodsData: '', + seckillData: '' + } uni.navigateTo({ - url: `/pkg_common/views/room?id=${order.merId}&name=${order.merName}` + url: `/pkg_common/views/room?id=${order.merId}&name=${order.merName}¶ms=${JSON.stringify(params)}` }) }, force2Decimal(v) { diff --git a/pkg_common/views/room.vue b/pkg_common/views/room.vue index e14063a..121e24a 100644 --- a/pkg_common/views/room.vue +++ b/pkg_common/views/room.vue @@ -26,28 +26,47 @@ - {{ params.goodsName }} + {{ wsJson(item.msg_content).goodsName }} - {{ params.skuStr }} + {{ wsJson(item.msg_content).skuStr }} - ¥{{ params.price }} + ¥{{ wsJson(item.msg_content).price }} + + + + + + + + {{ params.goodsName }} + + + {{ params.skuStr }} + + + + ¥{{ params.price }} + + - + @@ -87,13 +106,16 @@ export default { roomId: null, //房间ID content: "", //消息内容 list: [], //消息列表, - params: {} + params: null } }, onLoad(options) { this.storeId = options.id; this.merName = options.name; - this.params = options.params && JSON.parse(options.params) || {} + this.params = options.params && JSON.parse(options.params) || null + setTimeout(()=>{ + this.params = null + }, 10000) if (this.merName!="undefined" && this.merName!="null") { uni.setNavigationBarTitle({ title: this.merName @@ -110,6 +132,9 @@ export default { } }, methods: { + wsJson(json) { + return JSON.parse(json) + }, getUploadToken() { let that = this; @@ -165,7 +190,14 @@ export default { } }) }, - + sendGoods() { + if(Object.values(this.params).length > 0) { + this.content = JSON.stringify(this.params) + // this.list.push(this.params) + this.userSend(2) + } + this.params = null + }, // 预览图片 preview(url) { uni.previewImage({ @@ -186,11 +218,7 @@ export default { console.log('WebSocket连接已打开!', res); this.socketOpen = true; this.createRoom(); - if(Object.values(this.params).length > 0) { - this.content = JSON.stringify(this.params) - // this.list.push(this.params) - this.userSend(2) - } + }); uni.onSocketError(err => { @@ -292,6 +320,12 @@ export default {