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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ countdown }}
+
+
+ 注册领券
+
+
+ 长按扫码注册
+
+
+
+
+
+
+ {{ couponBean.title }}
+
+
+
+ 有效期至{{ dayjs(Date.now()).add(couponBean.triggerEndDay, 'day').format('YYYY.MM.DD') }}
+
+
+
+
+ 福利详情
+
+ 1.优惠金额{{ couponBean.reduce }}元\n
+ 2.满{{ couponBean.threshold }}减{{ couponBean.reduce }}\n
+ 3.赠送{{ couponBean.publicNum }}张
+
+
+
+
+ 微信扫一扫领取会员卡
+
+
+ 1、及时接受消费小票\n
+ 2、随时查询消费记录\n
+ 3、及时接收优惠信息
+
+
+
+
+
+
+
+
+
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 0000000..2585083
Binary files /dev/null and b/src/static/images/ic_checkmark_red.png differ
diff --git a/src/store/modules/user/index.ts b/src/store/modules/user/index.ts
index 99aff34..9734b31 100644
--- a/src/store/modules/user/index.ts
+++ b/src/store/modules/user/index.ts
@@ -93,6 +93,7 @@ const useUserStore = defineStore('user', {
resetInfo() {
this.$reset();
},
+
// 获取用户信息
async getProfile() {
const result = await getUserProfile();
@@ -103,6 +104,10 @@ const useUserStore = defineStore('user', {
this.companyConfigInfo = await getCompanyInfo();
},
+ checkUserRegisterStatus() {
+
+ },
+
userRegister(registerForm: RegisterParams) {
return new Promise(async (resolve, reject) => {
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);