diff --git a/im/src/assets/css/global.less b/im/src/assets/css/global.less index c1353b95..4c5db740 100644 --- a/im/src/assets/css/global.less +++ b/im/src/assets/css/global.less @@ -6,6 +6,9 @@ -ms-user-select: none; user-select: none; } +.main-color{ + color: #508afe; +} .no-padding { padding: 0; diff --git a/im/src/components/chat/panel/OtherLink.vue b/im/src/components/chat/panel/OtherLink.vue index a1b7b673..ec7a8a3a 100644 --- a/im/src/components/chat/panel/OtherLink.vue +++ b/im/src/components/chat/panel/OtherLink.vue @@ -275,4 +275,13 @@ export default { /deep/.el-tabs__nav-scroll{ min-width: 362px; } +/deep/ .el-tabs__item{ + height: 100%; + display: flex; + align-items: center; + justify-content: center; +} +/deep/ .el-tabs__header{ + margin-bottom: 0; +} \ No newline at end of file diff --git a/im/src/components/chat/panel/TalkPanel.vue b/im/src/components/chat/panel/TalkPanel.vue index 6e29d2f4..99e5a65d 100644 --- a/im/src/components/chat/panel/TalkPanel.vue +++ b/im/src/components/chat/panel/TalkPanel.vue @@ -98,22 +98,29 @@ 订单号:{{ item.text.sn }} -
- +
+
+ +
+
{{ item.text.groupName }} - {{ item.text.paymentTime }} +
{{ item.text.paymentTime }}
- 订单金额:{{ item.text.flowPrice | unitPrice('¥') }} - - {{ - item.text.orderStatus == 'CANCELLED' ? '已取消' : item.text.orderStatus == 'UNPAID' ? '未付款' : - item.text.orderStatus == - 'PAID' ? '已付款' : item.text.orderStatus == 'UNDELIVERED' ? '待发货' : item.text.orderStatus == - 'DELIVERED' - ? '已发货' : item.text.orderStatus == ' COMPLETED' ? '已完成' : item.text.orderStatus == ' TAKE' ? - '待校验' : '' - }} + 订单金额:{{ item.text.flowPrice | unitPrice('¥') }} + +
+ {{ + item.text.orderStatus == 'CANCELLED' ? '已取消' : item.text.orderStatus == 'UNPAID' ? '未付款' : + item.text.orderStatus == + 'PAID' ? '已付款' : item.text.orderStatus == 'UNDELIVERED' ? '待发货' : item.text.orderStatus == + 'DELIVERED' + ? '已发货' : item.text.orderStatus == ' COMPLETED' ? '已完成' : item.text.orderStatus == ' TAKE' ? + '待校验' : '' + }} +
+
@@ -841,25 +848,18 @@ export default { }; diff --git a/im/src/components/chat/panel/template/footPrint.vue b/im/src/components/chat/panel/template/footPrint.vue index dac02033..014c5478 100644 --- a/im/src/components/chat/panel/template/footPrint.vue +++ b/im/src/components/chat/panel/template/footPrint.vue @@ -1,33 +1,29 @@