Commit b0514923 authored by youjie's avatar youjie

no message

parent cfcb263e
......@@ -217,6 +217,11 @@ export default {
deleteSuccess: '删除成功',
idCard: '身份证号',
placeholderIdCard: '请输入身份证号',
couponStatus: {
UNUSED: '未使用',
USED: '已使用',
EXPIRED: '已过期',
},
},
// HTTP 错误状态码
httpError: {
......
import i18n from '@/i18n'
// 优惠券类型枚举
const CouponTypeEnum = Object.freeze({
UNUSED: {
value: 1,
desc: i18n.global.t('personal.couponStatus.UNUSED'),
icon: '',
color: ''
},
USED: {
value: 2,
desc: i18n.global.t('personal.couponStatus.USED'),
icon: '',
color: ''
},
EXPIRED: {
value: 3,
desc: i18n.global.t('personal.couponStatus.EXPIRED'),
icon: '',
color: ''
},
})
export default CouponTypeEnum
import i18n from '@/i18n'
// 订单状态枚举
const OrderStatusEnum = Object.freeze({
UN_PAY: {
value: 1,
......
import i18n from '@/i18n'
// 登录方式枚举
const ProviderTypeEnum = Object.freeze({
PASSWORD: {
value: 'Password',
......
......@@ -383,7 +383,6 @@ const getUserDetail = async () => {
formData.residentialArea = response.residentialArea || null
formData.sex = response.sex || null
formData.wechatId = response.wechatId || null
console.log(formData,'---6666')
}
} catch (error) {
......
<template>
<div class="w-[977px] h-full flex flex-col flex-shrink-0 overflow-hidden">
优惠券
<a-spin :loading="loading">
<div class="flex items-center">
<div class="mr-[70px]">
<a-dropdown position="br" trigger="click">
<div class="orderType-down px-[20px] rounded-[6px]
from-blue-50 to-indigo-50 flex items-center
justify-center cursor-pointer transition-all
duration-200 text-nowrap SourceHanSansCN">
<span class="text-sm font-medium flex items-center">
<span class="mr-[6px]">{{ t('personal.orderType') }}</span>
<icon-down />
</span>
</div>
<template #content>
<a-doption
v-for="option in productTypeList"
:key="option.value"
class="orderType-text SourceHanSansCN"
:class="{ 'bg-blue-50': currentType === option.value }"
>
<div class="flex items-center space-x-3 px-2 py-1">
<span class="font-medium">{{ option.label }}</span>
</div>
</a-doption>
</template>
</a-dropdown>
</div>
<div v-for="(item,index) in TitleBars"
class="myOrder-status px-[13px] py-[22px] cursor-pointer relative"
:class="[currentStatus==item.value?'active font-medium':'font-light']"
@click="changeStatus(item.value)">
{{ item.lable }}
<div class="myOrder-status-border absolute left-0 bottom-0 w-full flex justify-center">
<div></div>
</div>
</div>
</div>
<a-divider class="!m-[0]"/>
<a-scrollbar class="max-h-[615px] overflow-auto"
@scroll="handleDivScroll"
ref="scrollContainer">
</a-scrollbar>
</a-spin>
</div>
</template>
<script setup lang="ts">
......@@ -8,34 +50,47 @@ import { ref } from 'vue'
import { useI18n } from 'vue-i18n'
import { useUserStore } from '@/stores/user'
import { useSystemConfigStore } from '@/stores/index'
// 引入订单状态枚举
import OrderStatusEnum from '@/utils/orderStautsEnum'
// 引入状态枚举
import CouponTypeEnum from '@/utils/couponTypeEnum'
// 引入产品类型枚举
import ListProductTypeEnum from '@/utils/listProductType'
const { t } = useI18n()
const userStore = useUserStore()
const systemConfigStore = useSystemConfigStore()
const orderList = ref<any>([])
const currentStatus = ref(0)
orderList.value.push({
value: 0,
lable: t('personal.orderStatus.ALL'),
const TitleBars = ref<{value: number, lable: string}[]>([])
const currentStatus = ref(1)
const loading = ref(false)
// TitleBars.value.push({
// value: 0,
// lable: t('personal.orderStatus.ALL'),
// })
TitleBars.value.push({
value: CouponTypeEnum.UNUSED.value,
lable: CouponTypeEnum.UNUSED.desc,
})
orderList.value.push({
value: OrderStatusEnum.UN_PAY.value,
lable: OrderStatusEnum.UN_PAY.desc,
TitleBars.value.push({
value: CouponTypeEnum.USED.value,
lable: CouponTypeEnum.USED.desc,
})
orderList.value.push({
value: OrderStatusEnum.PAYED.value,
lable: OrderStatusEnum.PAYED.desc,
TitleBars.value.push({
value: CouponTypeEnum.EXPIRED.value,
lable: CouponTypeEnum.EXPIRED.desc,
})
orderList.value.push({
value: OrderStatusEnum.FINISH.value,
lable: OrderStatusEnum.FINISH.desc,
const productTypeList = ref<any>([])
const currentType = ref(0)
productTypeList.value.push({
value: ListProductTypeEnum.HOTEL.value,
label: ListProductTypeEnum.HOTEL.desc,
})
orderList.value.push({
value: OrderStatusEnum.CANCEL.value,
lable: OrderStatusEnum.CANCEL.desc,
productTypeList.value.push({
value: ListProductTypeEnum.SCENIC.value,
label: ListProductTypeEnum.SCENIC.desc,
})
const queryParams = ref<any>({
......@@ -43,6 +98,9 @@ const queryParams = ref<any>({
pageSize: 10,
orderStatus: currentStatus.value,
})
const dataList = ref<any>([])
const loding = ref(false)
const noMoreData = ref(false)
......@@ -75,16 +133,16 @@ const handleDivScroll = (e: any) => {
</script>
<style scoped lang="scss">
.myOrderData{
background: #FBFBFA;
}
.myOrder-text-l{
color: rgb(var(--gray-7));
.myOrder-status:hover{
color: rgb(var(--arcoblue-6));
}
:deep(.arco-scrollbar-track-direction-vertical){
display: none;
.myOrder-status.active .myOrder-status-border div{
width: 20px;
height: 5px;
background-color: rgb(var(--arcoblue-6));
border-radius: 3px;
}
.myOrder-time{
color: rgb(var(--gray-6));
.myOrder-status.active{
color: rbg(var(--gray-10));
}
</style>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment