diff --git a/src/api/groupbuy/index.ts b/src/api/groupbuy/index.ts new file mode 100644 index 0000000..f53d181 --- /dev/null +++ b/src/api/groupbuy/index.ts @@ -0,0 +1,10 @@ +import { get } from '@/utils/request'; + +export const getGroupBuyList = (data: { + pageNum: string, + pageSize: string, + obj: { + companyId: string, + } +}) => get({ url: '/wc/coupons/group/pageList', data }); + diff --git a/src/api/user/index.ts b/src/api/user/index.ts index 2dfacbf..f87af33 100644 --- a/src/api/user/index.ts +++ b/src/api/user/index.ts @@ -17,7 +17,8 @@ enum URL { addressCreate = '/ext/addr/create', addressUpdate = '/ext/addr/update', addressDelete = '/ext/addr/delete', - dynamicCode = '/member/dynccode' + dynamicCode = '/member/dynccode', + rechargeList = '/ext/recharge/rule_config' } export const getUserProfile = () => get({ url: URL.profile }); @@ -30,14 +31,13 @@ export const logout = () => post({ url: URL.logout }); export const getAddressList = () => get({ url: URL.addressList }); export const getAddressDetail = (id: string) => get({ url: URL.addressDetail + `?id=${id}` }); + export const addressCreate = (data: any) => post({ url: URL.addressCreate, data }); export const addressUpdate = (data: any) => post({ url: URL.addressUpdate, data }); export const addressDelete = (id: string) => post({ url: URL.addressDelete + `?id=${id}` }); export const getDynamicCode = () => post({ url: URL.dynamicCode }); -export const getCouponList = (params: { - obj: { memberId: string, status: number }, - pageNum: number, - pageSize: number -}) => get({ url: '/couponseUse/pageList' }); +export const getRechargeList = () => get({ url: URL.rechargeList }); + +export const getCouponList = (data: any) => post({ url: '/couponseUse/pageList', data }); diff --git a/src/pages.json b/src/pages.json index 92a1d92..5501799 100644 --- a/src/pages.json +++ b/src/pages.json @@ -58,6 +58,12 @@ "navigationBarBackgroundColor": "#F32B2B" } }, + { + "path": "groupbuy/detail", + "style": { + "navigationBarTitleText": "商品团购券" + } + }, { "path": "webview/index", "navigationBarTitleText": "网页" @@ -95,6 +101,12 @@ "style": { "navigationBarTitleText": "购物车" } + }, + { + "path": "search/index", + "style": { + "navigationBarTitleText": "搜索" + } } ] }, diff --git a/src/pages/common/groupbuy/detail.vue b/src/pages/common/groupbuy/detail.vue new file mode 100644 index 0000000..f45039f --- /dev/null +++ b/src/pages/common/groupbuy/detail.vue @@ -0,0 +1,11 @@ + + + + + diff --git a/src/pages/common/groupbuy/index.vue b/src/pages/common/groupbuy/index.vue index af3b5bb..fe63d82 100644 --- a/src/pages/common/groupbuy/index.vue +++ b/src/pages/common/groupbuy/index.vue @@ -34,8 +34,13 @@ diff --git a/src/pages/mine/index.vue b/src/pages/mine/index.vue index 9662b7e..7d08f8b 100644 --- a/src/pages/mine/index.vue +++ b/src/pages/mine/index.vue @@ -25,7 +25,7 @@ {{ userInfo.balance }} 余额 - + 3 优惠券 @@ -98,7 +98,7 @@ const serviceList = [ { title: '消费记录', icon: assetsUrl('ic_member_service_record.png'), - path: '/pages/mine/subs/trade/trade-list' + path: '/pages/mine/subs/trade/index' }, { title: '关注公众号', diff --git a/src/pages/mine/subs/address/add-address.vue b/src/pages/mine/subs/address/add-address.vue index 31284dc..d2e96d7 100644 --- a/src/pages/mine/subs/address/add-address.vue +++ b/src/pages/mine/subs/address/add-address.vue @@ -31,7 +31,7 @@ - + @@ -39,6 +39,26 @@