zhuce
/
lilishop-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

宽度，表情

master
程 2023-01-12 14:34:38 +08:00
parent 8ea3843d61
commit 7e33598b8e
6 changed files with 147 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
buyer/src/pages/GoodsDetail.vue
View File

@ -81,19 +81,8 @@ export default {
this.$Message.error("请登录后再联系客服"); this.$Message.error("请登录后再联系客服");
return; return;
} }
// window.open(
// this.IMLink +
// "?token=" +
// accessToken +
// "&id=" +
// this.goodsMsg.data.storeId +
// "&goodsId=" +
// this.goodsMsg.data.goodsId +
// "&skuId=" +
// this.goodsMsg.data.id
// );
window.open( window.open(
'http://192.168.0.139:8000/' + this.IMLink +
"?token=" + "?token=" +
accessToken + accessToken +
"&id=" + "&id=" +
@ -103,6 +92,17 @@ export default {
"&skuId=" + "&skuId=" +
this.goodsMsg.data.id this.goodsMsg.data.id
); );
// window.open(
// 'http://192.168.0.139:8000/' +
// "?token=" +
// accessToken +
// "&id=" +
// this.goodsMsg.data.storeId +
// "&goodsId=" +
// this.goodsMsg.data.goodsId +
// "&skuId=" +
// this.goodsMsg.data.id
// );
}, },
// 获取im信息 // 获取im信息
async getIMDetailMethods () { async getIMDetailMethods () {

3
im/src/components/chat/panel/TalkPanel.vue
View File

@ -500,6 +500,9 @@ export default {
if (item.messageType == 'GOODS') { if (item.messageType == 'GOODS') {
item.text = JSON.parse(item.text) item.text = JSON.parse(item.text)
} }
if (item.messageType == 'MESSAGE') {
item.text = textReplaceEmoji(item.text)
}
if (item.messageType == 'ORDER') { if (item.messageType == 'ORDER') {
item.text = JSON.parse(item.text) item.text = JSON.parse(item.text)
} }

4
im/src/components/chat/panel/template/footPrint.vue
View File

@ -51,7 +51,7 @@
</div> </div>
<div class="order_footer"> <div class="order_footer">
<span> 订单金额： <span style="color: red;">￥{{ item.orderItems[0].goodsPrice }}</span></span> <span> 订单金额： <span style="color: red;">￥{{ item.orderItems[0].goodsPrice }}</span></span>
<span class="order_status" <span class="order_status" v-if="item.orderStatus"
:style="{ 'color': item.orderStatus == 'CANCELLED' || item.orderStatus == 'UNPAID' || item.orderStatus == 'TAKE' ? '#5a606b' : '#f23030' }">{{ :style="{ 'color': item.orderStatus == 'CANCELLED' || item.orderStatus == 'UNPAID' || item.orderStatus == 'TAKE' ? '#5a606b' : '#f23030' }">{{
item.orderStatus == 'CANCELLED' ? '已取消' : item.orderStatus == 'UNPAID' ? '未付款' : item.orderStatus == item.orderStatus == 'CANCELLED' ? '已取消' : item.orderStatus == 'UNPAID' ? '未付款' : item.orderStatus ==
'PAID' ? '已付款' : item.orderStatus == 'UNDELIVERED' ? '待发货' : item.orderStatus == 'DELIVERED' 'PAID' ? '已付款' : item.orderStatus == 'UNDELIVERED' ? '待发货' : item.orderStatus == 'DELIVERED'
@ -168,7 +168,7 @@ export default {
}, },
mounted () { mounted () {
// state.user.toUser // state.user.toUser
console.log(this.$store.state.user.toUser, ' this.$store.state.user.toUser this.$store.state.user.toUser this.$store.state.user.toUser'); console.log(this.orderList, ' this.$store.state.user.toUser this.$store.state.user.toUser this.$store.state.user.toUser');
this.btnHide = localStorage.getItem('btnHide') this.btnHide = localStorage.getItem('btnHide')
} }
} }

4
im/src/views/layout/MainLayout.vue
View File

@ -108,7 +108,7 @@ export default {
<style lang="less" > <style lang="less" >
.main-layout { .main-layout {
position: fixed; position: fixed;
width: 75%; width: 80%;
height: 80%; height: 80%;
top: 0; top: 0;
right: 0; right: 0;
@ -120,7 +120,7 @@ export default {
border-radius: 5px; border-radius: 5px;
&.full-mode { &.full-mode {
width: 70%; width: 1200px;
height: 85%; height: 85%;
border-radius: 0; border-radius: 0;
} }

4
seller/src/views/home/home.vue
View File

@ -260,8 +260,8 @@ export default {
} }
// console.log(res.result, 'res.result'); // console.log(res.result, 'res.result');
// http://192.168.0.139:8000/ // http://192.168.0.139:8000/
window.open(`http://192.168.0.139:8000/?token=` + accessToken); // window.open(`http://192.168.0.139:8000/?token=` + accessToken);
// window.open(`${res.result}?token=` + accessToken); window.open(`${res.result}?token=` + accessToken);
}, },
// 获取im信息 // 获取im信息