diff --git a/buyer/src/pages/shopEntry/FirstApply.vue b/buyer/src/pages/shopEntry/FirstApply.vue index 756f569e..57337c3d 100644 --- a/buyer/src/pages/shopEntry/FirstApply.vue +++ b/buyer/src/pages/shopEntry/FirstApply.vue @@ -234,7 +234,7 @@ export default { ], companyPhone: [ { required: true, message: '请填写公司电话' }, - { pattern: RegExp.TEL, message: '请填写正确的号码' } + { pattern: RegExp.mobile, message: '请填写正确的号码' } ], companyEmail: [ { required: true, message: '请填写电子邮箱' }, diff --git a/im/src/components/chat/panel/TalkPanel.vue b/im/src/components/chat/panel/TalkPanel.vue index 7b4c5b21..6e29d2f4 100644 --- a/im/src/components/chat/panel/TalkPanel.vue +++ b/im/src/components/chat/panel/TalkPanel.vue @@ -92,7 +92,7 @@
+ }" @click="linkToOrders(item.text.sn)">
订单号:{{ item.text.sn }} @@ -100,7 +100,7 @@
- {{ item.text.groupName }} + {{ item.text.groupName }} {{ item.text.paymentTime }} 订单金额:{{ item.text.flowPrice | unitPrice('¥') }} diff --git a/im/src/components/chat/panel/template/footPrint.vue b/im/src/components/chat/panel/template/footPrint.vue index cdcaf8f7..dac02033 100644 --- a/im/src/components/chat/panel/template/footPrint.vue +++ b/im/src/components/chat/panel/template/footPrint.vue @@ -37,7 +37,7 @@
- 订单号:{{ item.sn }} + 订单号:{{ item.sn }}
@@ -53,12 +53,6 @@ 订单金额: {{ item.orderItems[0].goodsPrice | unitPrice("¥") }} - {{ item.orderStatus == 'STAY_PICKED_UP' ? '待自提' : item.orderStatus == 'CANCELLED' ? '已取消' : item.orderStatus == 'UNPAID' ? '未付款' : item.orderStatus diff --git a/im/src/main.js b/im/src/main.js index 3c26ff5f..321eab3a 100644 --- a/im/src/main.js +++ b/im/src/main.js @@ -30,7 +30,7 @@ Vue.component('face-null', faceNull) Vue.prototype.linkToGoods = function (goodsId, skuId) { // 跳转买家端商品 if (localStorage.getItem('storeFlag') == 'false') { - window.open(`${config.PC_STORE}goods-operation-edit?id=${goodsId}`, '_blank') + window.open(`${config.PC_URL}goodsDetail?skuId=${skuId}&goodsId=${goodsId}`, '_blank') } else { window.open(`${config.PC_URL}goodsDetail?skuId=${skuId}&goodsId=${goodsId}`, '_blank') }