diff --git a/pages/admin/business/index.vue b/pages/admin/business/index.vue index 32f9852..851ced4 100644 --- a/pages/admin/business/index.vue +++ b/pages/admin/business/index.vue @@ -73,7 +73,7 @@ export default { icon: 'iconfont icon-kefujilu' }); } - if(this.service.is_verify && [0].includes(Number(merchantInfo.merchant_type))){ + if(this.service.is_verify && [0,3].includes(Number(merchantInfo.merchant_type))){ list.push({ title: '订单核销', url: '/pages/admin/order_cancellation/index?mer_id=' + merId, diff --git a/pages/admin/business/login.vue b/pages/admin/business/login.vue index 6a3cca9..4cd214d 100644 --- a/pages/admin/business/login.vue +++ b/pages/admin/business/login.vue @@ -252,8 +252,14 @@ export default { .name{ width: calc(100% - 130rpx); height: 120rpx; - line-height: 120rpx; padding-left: 20rpx; + display: inline-flex; + flex-direction: row; + flex-wrap: wrap; + justify-content: flex-start; + align-items: center; + align-content: center; + overflow: hidden; } } .right{