diff --git a/src/api/groupbuy/types.ts b/src/api/groupbuy/types.ts index 5138ac2..5c41128 100644 --- a/src/api/groupbuy/types.ts +++ b/src/api/groupbuy/types.ts @@ -66,23 +66,13 @@ export interface OrderBean { ogList: any[]; orderGoods: GoodsBean[]; changeStockNum: number; - companyId: string; consumePrice: number; - consumerId: string; - consumerName: string; - createTime: string; - creatorId: number; - creatorName: string; - discount: number; discountOriginPrice: number; - discountPrice: number; goodsCode: string; goodsId: string; goodsName: string; - goodsNum: number; goodsPriceModify: string; goodsTypeName: string; - id: string; images: string; offset: string; orderId: string; @@ -91,14 +81,9 @@ export interface OrderBean { originStockNum: number; priceModify: []; produceIntegral: number; - remark: string; salePrice: number; stockId: string; stockStock: StockBean[]; - storeId: string; - type: number; - typeName: string; - updateTime: string; payStatus: number; payTypeIds: string; printed: string; diff --git a/src/api/user/index.ts b/src/api/user/index.ts index 33fffe5..eb81730 100644 --- a/src/api/user/index.ts +++ b/src/api/user/index.ts @@ -3,7 +3,7 @@ */ import type { CouponBean, LoginParams, LoginResult, RegisterParams, TerminalBean } from './types'; import { get, post } from '@/utils/request'; -import type { UserState } from '@/store/modules/user/types'; +import { UserBean } from '@/store/modules/user/types'; enum URL { // login = '/member/login', @@ -29,7 +29,7 @@ enum URL { terminal = 'wechat/coupons/terminal?companyId=' } -export const getUserProfile = () => get({ url: URL.profile }); +export const getUserProfile = () => get({ url: URL.profile }); export const login = (data: LoginParams) => post({ url: URL.login, data }); export const loginByCode = (code: string, companyId: string) => post({ url: URL.loginByCode + `?code=${code}` }); diff --git a/src/api/user/types.ts b/src/api/user/types.ts index 9f4d929..6eb5d4d 100644 --- a/src/api/user/types.ts +++ b/src/api/user/types.ts @@ -65,9 +65,11 @@ export interface CouponBean { status: number; strategyType: string; telephone: string; - threshold: string; + threshold: number; type: number; userTime: string; + + checked: boolean; } export interface TerminalBean { diff --git a/src/pages/mall/subs/components/coupon-dialog.vue b/src/pages/mall/subs/components/coupon-dialog.vue index 913c042..dfa6de1 100644 --- a/src/pages/mall/subs/components/coupon-dialog.vue +++ b/src/pages/mall/subs/components/coupon-dialog.vue @@ -3,11 +3,11 @@ 优惠券 - 确定 + 确定 - + @@ -15,62 +15,53 @@