From d3bb76a85850d92842e04656e101dd8dcfe59aff Mon Sep 17 00:00:00 2001 From: Huakk <1751826683@qq.com> Date: Wed, 17 Jul 2024 22:32:56 +0800 Subject: [PATCH] =?UTF-8?q?feat(custom):=20=E6=96=B0=E5=A2=9E=E8=8B=A5?= =?UTF-8?q?=E5=B9=B2=E8=90=A5=E9=94=80=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/workspace.xml | 8 ++ components.d.ts | 1 + config/index.ts | 4 +- src/api/code.ts | 9 ++ src/api/goods.ts | 4 + src/app.config.ts | 2 +- src/pages/fastBuy/index.vue | 105 ++++++++++++++- src/pages/index/index.scss | 3 +- src/pages/index/index.vue | 3 +- src/pages/marketing/scratch/index.config.ts | 3 + src/pages/marketing/scratch/index.scss | 67 ++++++++++ src/pages/marketing/scratch/index.vue | 141 ++++++++++++++++++++ src/pages/marketing/yq/index.config.ts | 4 + src/pages/marketing/yq/index.scss | 32 +++++ src/pages/marketing/yq/index.vue | 128 ++++++++++++++++++ 15 files changed, 507 insertions(+), 7 deletions(-) create mode 100644 .idea/workspace.xml create mode 100644 src/api/code.ts create mode 100644 src/pages/marketing/scratch/index.config.ts create mode 100644 src/pages/marketing/scratch/index.scss create mode 100644 src/pages/marketing/scratch/index.vue create mode 100644 src/pages/marketing/yq/index.config.ts create mode 100644 src/pages/marketing/yq/index.scss create mode 100644 src/pages/marketing/yq/index.vue diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 0000000..94a25ca --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,8 @@ + + + { + "keyToString": { + "settings.editor.selected.configurable": "settings.sync" + } +} + \ No newline at end of file diff --git a/components.d.ts b/components.d.ts index 8934366..6576eb4 100644 --- a/components.d.ts +++ b/components.d.ts @@ -13,6 +13,7 @@ declare module '@vue/runtime-core' { MerList: typeof import('./src/components/MerList.vue')['default'] NutAvatar: typeof import('@nutui/nutui-taro')['Avatar'] NutBacktop: typeof import('@nutui/nutui-taro')['Backtop'] + NutbigScratchCard: typeof import('@nutui/nutui-taro')['bigScratchCard'] NutButton: typeof import('@nutui/nutui-taro')['Button'] NutCalendar: typeof import('@nutui/nutui-taro')['Calendar'] NutCell: typeof import('@nutui/nutui-taro')['Cell'] diff --git a/config/index.ts b/config/index.ts index d1a5dd9..dfec81a 100644 --- a/config/index.ts +++ b/config/index.ts @@ -9,7 +9,7 @@ const {robot = 1, desc} = argv; const CIPluginOptFn = async () => { /** - * @typedef { import("@tarojs/plugin-mini-ci").CIOptions } CIOptions + * @typedef { import('@tarojs/plugin-mini-ci').CIOptions } CIOptions * @type {CIOptions} */ return { @@ -133,7 +133,7 @@ const config = { }, }; -module.exports = function (merge) { +module.exports = function(merge) { if (process.env.NODE_ENV === 'development') { return merge({}, config, require('./dev')); } diff --git a/src/api/code.ts b/src/api/code.ts new file mode 100644 index 0000000..bfc9b2a --- /dev/null +++ b/src/api/code.ts @@ -0,0 +1,9 @@ +import request from "../utils/request"; + +// 获取二维码信息 +export const getQrCode = (data: object) => + request("/qrcode/get", data, "POST"); + +// 绑定二维码 +export const bindQrCode = (data: object) => + request("/qrcode/bind", data, "POST"); \ No newline at end of file diff --git a/src/api/goods.ts b/src/api/goods.ts index 8d1d37b..7adcd51 100644 --- a/src/api/goods.ts +++ b/src/api/goods.ts @@ -86,3 +86,7 @@ export const getActiveOrderDetail = (data: object) => // 校验交易密码 export const checkTradePwd = (data: object) => request('/user/check/payPassword', data, 'POST'); + +// 获取活动商品或者活动积分商品 +export const getHdOrJfGoods = (data: object) => + request('/activity/goods', data, 'POST'); diff --git a/src/app.config.ts b/src/app.config.ts index 1610233..67a7e87 100644 --- a/src/app.config.ts +++ b/src/app.config.ts @@ -73,7 +73,7 @@ export default defineAppConfig({ }, { root: 'pages/marketing', - pages: ['sign/index'], + pages: ['sign/index', 'yq/index', 'scratch/index'], }, { root: 'pages/search', diff --git a/src/pages/fastBuy/index.vue b/src/pages/fastBuy/index.vue index 0b7b5af..4c5a33d 100644 --- a/src/pages/fastBuy/index.vue +++ b/src/pages/fastBuy/index.vue @@ -1,15 +1,57 @@ diff --git a/src/pages/marketing/yq/index.config.ts b/src/pages/marketing/yq/index.config.ts new file mode 100644 index 0000000..b52af90 --- /dev/null +++ b/src/pages/marketing/yq/index.config.ts @@ -0,0 +1,4 @@ +export default definePageConfig({ + navigationBarTitleText: '', + navigationStyle: 'custom', +}); diff --git a/src/pages/marketing/yq/index.scss b/src/pages/marketing/yq/index.scss new file mode 100644 index 0000000..67b1d4e --- /dev/null +++ b/src/pages/marketing/yq/index.scss @@ -0,0 +1,32 @@ +page { + background-image: url('https://pic.imgdb.cn/item/6697ab53d9c307b7e95e032c.png'); + background-size: 100% 100%; + background-repeat: no-repeat; +} + +.tag { + width: 140px; + height: 40px; + border-radius: 8px; + background-image: linear-gradient( + 90deg, + rgb(254, 43, 34) 0%, + rgb(255, 193, 0) 100% + ); + color: #fff; + font-size: 24px; + text-align: center; + line-height: 40px; +} + +.stock { + width: 140px; + height: 40px; + border-radius: 8px; + border: 0.5px solid rgba(254, 46, 33, 1); + color: rgba(254, 46, 33, 1); + font-size: 24px; + text-align: center; + line-height: 40px; + margin-left: 30px; +} diff --git a/src/pages/marketing/yq/index.vue b/src/pages/marketing/yq/index.vue new file mode 100644 index 0000000..a18686e --- /dev/null +++ b/src/pages/marketing/yq/index.vue @@ -0,0 +1,128 @@ + + + + +