main
fanfan 3 months ago
parent b946030543
commit 478bb3126f
  1. 3
      src/components/Table/UserItem/UserItem.vue
  2. 76
      src/views/order/Index.vue

@ -14,8 +14,7 @@
<div class="in-right flex flex-dir-column flex-x-center">
<p class="user-name oneline-hide"> {{ user.nick_name }}</p>
<p class="user-name oneline-hide">手机号{{ user.mobile }}</p>
<!-- <p class="user-name oneline-hide">归属地{{ JSON.parse(user.homelocation).prov }} {{ JSON.parse(user.homelocation).city }}</p> -->
<p class="user-name oneline-hide">归属地{{ JSON.parse(user.homelocation).prov }} {{ JSON.parse(user.homelocation).city }}</p>
<p class="user-platform">
<platform-icon :name="user.platform" :showTips="true" />
</p>

@ -85,8 +85,16 @@
<span class="mr-20">{{ item.create_time }}</span>
<span class="mr-20">订单号{{ item.order_no }}</span>
<platform-icon :name="item.platform" :showTips="true" />
<img v-if="item.merchant && Object.keys(item.merchant).length > 0" :src="item.merchant.logoImage[0].external_url" style="width: 60px;height: 60px;margin: 0 10px 0 20px;border-radius: 8px;">
<span v-if="item.merchant && Object.keys(item.merchant).length > 0" class="mr-20">{{ item.merchant.shop_name }}</span>
<div v-if="item.merchant.logoImage">
<img
v-if="item.merchant && Object.keys(item.merchant).length > 0"
:src="item.merchant.logoImage[0].external_url"
style="width: 60px; height: 60px; margin: 0 10px 0 20px; border-radius: 8px"
/>
<span v-if="item.merchant && Object.keys(item.merchant).length > 0" class="mr-20">{{
item.merchant.shop_name
}}</span>
</div>
</td>
</tr>
<!-- <div :key="`order_${item.order_id}_1`">{{ item.copy_text }}</div> -->
@ -99,7 +107,7 @@
title: goodsItm.goods_name,
goodsProps: goodsItm.goods_props,
isCheck: goodsItm.is_check,
source:1
source: 1,
}"
/>
</td>
@ -175,7 +183,8 @@
!inArray(item.order_status, [
OrderStatusEnum.CANCELLED.value,
OrderStatusEnum.APPLY_CANCEL.value,
]) && (storeVersion === 0 || (storeVersion === 1 && isSuper === 0))
]) &&
(storeVersion === 0 || (storeVersion === 1 && isSuper === 0))
"
@click="handleDelivery(item)"
>发货</a
@ -189,18 +198,27 @@
!inArray(item.order_status, [
OrderStatusEnum.CANCELLED.value,
OrderStatusEnum.APPLY_CANCEL.value,
]) && (storeVersion === 0 || (storeVersion === 1 && isSuper === 0))
]) &&
(storeVersion === 0 || (storeVersion === 1 && isSuper === 0))
"
@click="handleExtract(item)"
>自提核销</a
>
<a
v-action:cancel
v-if="item.order_status == OrderStatusEnum.APPLY_CANCEL.value && (storeVersion === 0 || (storeVersion === 1 && isSuper === 0))"
v-if="
item.order_status == OrderStatusEnum.APPLY_CANCEL.value &&
(storeVersion === 0 || (storeVersion === 1 && isSuper === 0))
"
@click="handleCancel(item)"
>审核取消</a
>
<a v-if="storeVersion === 0 || (storeVersion === 1 && isSuper === 0)" v-action:delete @click="handleDelete(item)">删除</a>
<a
v-if="storeVersion === 0 || (storeVersion === 1 && isSuper === 0)"
v-action:delete
@click="handleDelete(item)"
>删除</a
>
<a @click="copyText(item.copy_text)">复制</a>
</div>
</td>
@ -252,7 +270,7 @@ import {
OrderSourceEnum,
OrderStatusEnum,
PayStatusEnum,
ReceiptStatusEnum
ReceiptStatusEnum,
} from '@/common/enum/order'
import { PaymentMethodEnum } from '@/common/enum/payment'
import { DeliveryForm, ExtractForm, CancelForm } from './modules'
@ -263,45 +281,45 @@ const columns = [
title: '商品信息',
align: 'center',
dataIndex: 'goods',
scopedSlots: { customRender: 'goods' }
scopedSlots: { customRender: 'goods' },
},
{
title: '单价/数量',
align: 'center',
scopedSlots: { customRender: 'unit_price' }
scopedSlots: { customRender: 'unit_price' },
},
{
title: '实付款',
align: 'center',
dataIndex: 'pay_price',
scopedSlots: { customRender: 'pay_price' }
scopedSlots: { customRender: 'pay_price' },
},
{
title: '买家',
dataIndex: 'user',
scopedSlots: { customRender: 'user' }
scopedSlots: { customRender: 'user' },
},
{
title: '支付方式',
dataIndex: 'pay_method',
scopedSlots: { customRender: 'pay_method' }
scopedSlots: { customRender: 'pay_method' },
},
{
title: '配送方式',
dataIndex: 'delivery_type',
scopedSlots: { customRender: 'delivery_type' }
scopedSlots: { customRender: 'delivery_type' },
},
{
title: '交易状态',
dataIndex: 'status',
scopedSlots: { customRender: 'status' }
scopedSlots: { customRender: 'status' },
},
{
title: '操作',
dataIndex: 'action',
width: '180px',
scopedSlots: { customRender: 'action' }
}
scopedSlots: { customRender: 'action' },
},
]
//
@ -310,7 +328,7 @@ const SearchTypeEnum = [
{ name: '会员昵称', value: 20 },
{ name: '会员ID', value: 30 },
{ name: '收货人姓名', value: 40 },
{ name: '收货人电话', value: 50 }
{ name: '收货人电话', value: 50 },
]
export default {
@ -321,7 +339,7 @@ export default {
UserItem,
DeliveryForm,
ExtractForm,
CancelForm
CancelForm,
},
data() {
return {
@ -344,7 +362,7 @@ export default {
pageSizeOptions: ['15', '30', '50', '100', '200', '300', '400', '500'],
showTotal: (total) => `${total} 条记录`, //
//
shopList: []
shopList: [],
}
},
beforeCreate() {
@ -359,7 +377,7 @@ export default {
ReceiptStatusEnum,
PaymentMethodEnum,
SearchTypeEnum,
simpleImage: Empty.PRESENTED_IMAGE_SIMPLE
simpleImage: Empty.PRESENTED_IMAGE_SIMPLE,
})
},
computed: {
@ -367,14 +385,16 @@ export default {
return window.localStorage.getItem('roles') ? JSON.parse(window.localStorage.getItem('roles')).isSuper : 0
},
storeVersion() {
return window.localStorage.getItem('storeInfo') ? JSON.parse(window.localStorage.getItem('storeInfo')).store_version : 0
}
return window.localStorage.getItem('storeInfo')
? JSON.parse(window.localStorage.getItem('storeInfo')).store_version
: 0
},
},
watch: {
//
$route() {
this.init()
}
},
},
created() {
//
@ -428,7 +448,7 @@ export default {
[OrderStatusEnum.NORMAL.value]: '',
[OrderStatusEnum.CANCELLED.value]: 'red',
[OrderStatusEnum.APPLY_CANCEL.value]: 'red',
[OrderStatusEnum.COMPLETED.value]: 'green'
[OrderStatusEnum.COMPLETED.value]: 'green',
}
return ColorEnum[orderStatus]
},
@ -482,7 +502,7 @@ export default {
app.handleRefresh()
})
.finally((result) => modal.destroy())
}
},
})
},
@ -499,8 +519,8 @@ export default {
//
handleCancel(record) {
this.$refs.CancelForm.show(record)
}
}
},
},
}
</script>
<style lang="less" scoped>

Loading…
Cancel
Save