diff --git a/src/components/official-account-dialog.vue b/src/components/official-account-dialog.vue new file mode 100644 index 0000000..44ec21a --- /dev/null +++ b/src/components/official-account-dialog.vue @@ -0,0 +1,74 @@ + + + + + diff --git a/src/pages.json b/src/pages.json index ab4820d..a8e557b 100644 --- a/src/pages.json +++ b/src/pages.json @@ -48,6 +48,16 @@ "navigationBarTitleText": "注册有礼" } }, + { + "path": "groupbuy/index", + "style": { + "navigationBarTitleText": "团购秒杀", + "backgroundColor": "#F32B2B", + "backgroundColorTop": "#F32B2B", + "navigationBarTextStyle": "white", + "navigationBarBackgroundColor": "#F32B2B" + } + }, { "path": "webview/index", "navigationBarTitleText": "网页" diff --git a/src/pages/common/groupbuy/index.vue b/src/pages/common/groupbuy/index.vue index f45039f..af3b5bb 100644 --- a/src/pages/common/groupbuy/index.vue +++ b/src/pages/common/groupbuy/index.vue @@ -1,11 +1,168 @@ diff --git a/src/pages/home/index.vue b/src/pages/home/index.vue index b2731b6..76cc048 100644 --- a/src/pages/home/index.vue +++ b/src/pages/home/index.vue @@ -84,7 +84,7 @@ const submenuList = [ { title: '团购秒杀', icon: assetsUrl('ic_groupbuy.png'), - path: '/pages/order/order' + path: '/pages/common/groupbuy/index' }, { title: '入群有礼', @@ -95,7 +95,6 @@ const submenuList = [ onLoad(async (e) => { const data = await getCompanyInfo('1471673498334113794'); - console.log(data); bannerList.value = data.bannerinx?.map((res: { src: string }) => res.src); recommendBannerList.value = data.bannerhot?.map((res: { src: string }) => res.src); }); diff --git a/src/pages/mine/index.vue b/src/pages/mine/index.vue index 6ebfe47..9662b7e 100644 --- a/src/pages/mine/index.vue +++ b/src/pages/mine/index.vue @@ -8,9 +8,8 @@ - - {{ userInfo.nickName}} + {{ userInfo.nickName }} {{ userInfo.telephone }} @@ -18,15 +17,15 @@ - + {{ userInfo.integration }} 积分 - + {{ userInfo.balance }} 余额 - + 3 优惠券 @@ -36,14 +35,14 @@ 将会员卡放入微信卡包,及时了解积分变动 去添加 - + 我的订单 - + {{ item.title }} {{ item.amount }} @@ -55,18 +54,23 @@ - + {{ item.title }} + + diff --git a/src/static/images/bg_groupbuy_price.png b/src/static/images/bg_groupbuy_price.png new file mode 100644 index 0000000..e767eae Binary files /dev/null and b/src/static/images/bg_groupbuy_price.png differ diff --git a/src/static/images/bg_groupbuy_price_disabled.png b/src/static/images/bg_groupbuy_price_disabled.png new file mode 100644 index 0000000..b96852d Binary files /dev/null and b/src/static/images/bg_groupbuy_price_disabled.png differ diff --git a/src/static/images/ic_decline.png b/src/static/images/ic_decline.png new file mode 100644 index 0000000..8fddb9a Binary files /dev/null and b/src/static/images/ic_decline.png differ diff --git a/src/static/images/official_account_qrcode.png b/src/static/images/official_account_qrcode.png new file mode 100644 index 0000000..4ccdf85 Binary files /dev/null and b/src/static/images/official_account_qrcode.png differ diff --git a/types/components.d.ts b/types/components.d.ts index 4a20e99..da6c43c 100644 --- a/types/components.d.ts +++ b/types/components.d.ts @@ -7,6 +7,7 @@ export {} declare module 'vue' { export interface GlobalComponents { + OfficialAccountDialog: typeof import('./../src/components/official-account-dialog.vue')['default'] PageNav: typeof import('./../src/components/page-nav/page-nav.vue')['default'] RouterLink: typeof import('vue-router')['RouterLink'] RouterView: typeof import('vue-router')['RouterView']