From d757f99b5d1e3062d1a28ad56a9c46de5cf234f5 Mon Sep 17 00:00:00 2001 From: Waiting Date: Wed, 22 May 2024 17:00:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=99=BB=E5=BD=95=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E5=9F=8B=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 3 +- src/App.vue | 264 +++++++++++++++++-------- src/components/company-dialog.vue | 29 ++- src/pages.json | 6 + src/pages/common/register/reward.vue | 228 +++++++++++++++++++++ src/pages/home/index.vue | 4 +- src/permission.ts | 1 + src/static/images/ic_checkmark_red.png | Bin 0 -> 3464 bytes src/store/modules/user/index.ts | 10 +- 9 files changed, 461 insertions(+), 84 deletions(-) create mode 100644 src/pages/common/register/reward.vue create mode 100644 src/static/images/ic_checkmark_red.png diff --git a/.env.development b/.env.development index fd86701..4da5bf5 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,8 @@ VITE_APP_TITLE='uniapp-vue3-project' VITE_APP_ENV='development' # 接口地址 -VITE_APP_BASE_API='https://apidev.lakeapp.cn/' +#VITE_APP_BASE_API='https://apidev.lakeapp.cn/' +VITE_APP_BASE_API='https://api.lakeapp.cn/' # 删除console VITE_DROP_CONSOLE=false diff --git a/src/App.vue b/src/App.vue index 4960ae4..2b36d39 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,103 +1,213 @@ - diff --git a/src/pages.json b/src/pages.json index 30f2fd5..551c6a9 100644 --- a/src/pages.json +++ b/src/pages.json @@ -50,6 +50,12 @@ }, { "path": "register/index", + "style": { + "navigationBarTitleText": "用户注册" + } + }, + { + "path": "register/reward", "style": { "navigationBarTitleText": "注册有礼" } diff --git a/src/pages/common/register/reward.vue b/src/pages/common/register/reward.vue new file mode 100644 index 0000000..333360b --- /dev/null +++ b/src/pages/common/register/reward.vue @@ -0,0 +1,228 @@ + + + + + diff --git a/src/pages/home/index.vue b/src/pages/home/index.vue index 1ef813d..d999c01 100644 --- a/src/pages/home/index.vue +++ b/src/pages/home/index.vue @@ -85,7 +85,7 @@ const submenuList = [ { title: '注册有礼', icon: assetsUrl('ic_register_gift2.png'), - path: '/pages/common/register/index' + path: '/pages/common/register/reward' }, { title: '团购秒杀', @@ -139,7 +139,7 @@ onShow(async () => { const switchCompany = () => { fetchCompanyList((companyList: any[], userList: any[]) => { - companyDialogRef.value.show((index: number) => { + companyDialogRef.value.show(getCompanyId(),(index: number) => { userStore.setUserInfo(userList[index]); userStore.setCompanyInfo(companyList[index]); }); diff --git a/src/permission.ts b/src/permission.ts index 83bb5ac..4d899f3 100644 --- a/src/permission.ts +++ b/src/permission.ts @@ -4,6 +4,7 @@ import { getToken } from '@/utils/auth'; const loginPage = '/pages/common/login/index'; // 页面白名单 const whiteList = ['/', '/pages/common/login/index', '/pages/home/index','/pages/common/register/index', + '/pages/common/register/reward', '/pages/mine/index','/pages/mine/subs/order/index']; // 检查地址白名单 diff --git a/src/static/images/ic_checkmark_red.png b/src/static/images/ic_checkmark_red.png new file mode 100644 index 0000000000000000000000000000000000000000..25850832897f8867c4c6da3a361b6b85b13496aa GIT binary patch literal 3464 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 { try { @@ -136,7 +141,7 @@ const useUserStore = defineStore('user', { signature: wechatUserInfo?.signature, iv: wechatUserInfo.iv }; - + getApp().globalData?.logger.info('login params: ', userInfo); const res = await login({ code: result.code, userInfo: userInfo, @@ -144,6 +149,7 @@ const useUserStore = defineStore('user', { // referrerUserId: '1727303781559697409' // referrerUserId: getReferrerUserId() }); + getApp().globalData?.logger.info('login result: ', res); if(res.user == undefined || res.user.id === null) { const registerForm = { @@ -159,7 +165,9 @@ const useUserStore = defineStore('user', { gender: res.user?.gender, storeId: getRegisterStoreId() }; + getApp().globalData?.logger.info('register params: ', registerForm); const registerResult = await this.userRegister(registerForm); + getApp().globalData?.logger.info('register result: ', registerResult); if(registerResult != null) { setToken(res.token); await this.setUserInfo(registerResult as LoginResult);