bug修复
This commit is contained in:
@@ -8,8 +8,8 @@
|
|||||||
"dev:prod": "cross-env NODE_ENV=production node manifest.modify.ts && uni -p mp-weixin --mode production",
|
"dev:prod": "cross-env NODE_ENV=production node manifest.modify.ts && uni -p mp-weixin --mode production",
|
||||||
"build:test": "cross-env NODE_ENV=production UNI_PLATFORM=mp-weixin vue-cli-service uni-build --mode test",
|
"build:test": "cross-env NODE_ENV=production UNI_PLATFORM=mp-weixin vue-cli-service uni-build --mode test",
|
||||||
"build:prod": "cross-env NODE_ENV=production UNI_PLATFORM=mp-weixin vue-cli-service uni-build --mode production",
|
"build:prod": "cross-env NODE_ENV=production UNI_PLATFORM=mp-weixin vue-cli-service uni-build --mode production",
|
||||||
"deploy:test": "uni build --mode test -p mp-weixin && node deploy.ts test",
|
"deploy:test": "cross-env NODE_ENV=test node manifest.modify.ts && uni build --mode test -p mp-weixin && node deploy.ts test",
|
||||||
"deploy:prod": "uni build --mode production -p mp-weixin && node deploy.ts production",
|
"deploy:prod": "cross-env NODE_ENV=production node manifest.modify.ts && uni build --mode production -p mp-weixin && node deploy.ts production",
|
||||||
"type-check": "vue-tsc --noEmit",
|
"type-check": "vue-tsc --noEmit",
|
||||||
"eslint": "eslint --fix",
|
"eslint": "eslint --fix",
|
||||||
"stylelint": "stylelint \"src/**/*.(vue|scss|css)\" --fix",
|
"stylelint": "stylelint \"src/**/*.(vue|scss|css)\" --fix",
|
||||||
|
@@ -54,6 +54,7 @@ export default {
|
|||||||
else {
|
else {
|
||||||
setCompanyId('1724629180555919361');
|
setCompanyId('1724629180555919361');
|
||||||
setRegisterStoreId('1725026299888406529');
|
setRegisterStoreId('1725026299888406529');
|
||||||
|
// setRegisterStoreId('17250262998884000000');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -115,7 +115,7 @@ const save = async () => {
|
|||||||
avatarUrl: avatarUrl.value,
|
avatarUrl: avatarUrl.value,
|
||||||
nickName: nickName.value,
|
nickName: nickName.value,
|
||||||
telephone: telephone.value,
|
telephone: telephone.value,
|
||||||
birthday: birthday.value,
|
birthday: dayjs(birthday.value).format("YYYY-MM-DD HH:mm:ss"),
|
||||||
gender: gender.value
|
gender: gender.value
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@@ -86,6 +86,7 @@ const submenuList = [
|
|||||||
title: '注册有礼',
|
title: '注册有礼',
|
||||||
icon: assetsUrl('ic_register_gift2.png'),
|
icon: assetsUrl('ic_register_gift2.png'),
|
||||||
path: '/pages/common/register/reward'
|
path: '/pages/common/register/reward'
|
||||||
|
// path: '/pages/common/register/index'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: '团购秒杀',
|
title: '团购秒杀',
|
||||||
|
@@ -85,30 +85,6 @@ const useUserStore = defineStore('user', {
|
|||||||
// referrerUserId: getReferrerUserId()
|
// referrerUserId: getReferrerUserId()
|
||||||
});
|
});
|
||||||
getApp().globalData?.logger.info('login result: ', res);
|
getApp().globalData?.logger.info('login result: ', res);
|
||||||
|
|
||||||
// if(res.user === undefined || res.user.id === null) {
|
|
||||||
// const registerForm = {
|
|
||||||
// unionId: res.user?.unionId,
|
|
||||||
// openId: res.user?.openId,
|
|
||||||
// maOpenId: res.user?.maOpenId,
|
|
||||||
// image: res.user?.image,
|
|
||||||
// nickName: res.user?.nickName,
|
|
||||||
// telephone: res.user?.telephone,
|
|
||||||
// birthday: res.user?.birthday,
|
|
||||||
// companyId: res.user?.companyId,
|
|
||||||
// creatorId: res.user?.creatorId,
|
|
||||||
// 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);
|
|
||||||
// setSessionKey(res.sessionKey);
|
|
||||||
// await this.setUserInfo(registerResult as LoginResult);
|
|
||||||
// }
|
|
||||||
// } else {
|
|
||||||
setToken(res.token);
|
setToken(res.token);
|
||||||
setSessionKey(res.sessionKey);
|
setSessionKey(res.sessionKey);
|
||||||
await this.setUserInfo(res.user);
|
await this.setUserInfo(res.user);
|
||||||
@@ -167,7 +143,7 @@ const useUserStore = defineStore('user', {
|
|||||||
await clearToken();
|
await clearToken();
|
||||||
}
|
}
|
||||||
await this.fetchTerminal();
|
await this.fetchTerminal();
|
||||||
await this.fetchCompanyInfo();
|
this.fetchCompanyInfo();
|
||||||
},
|
},
|
||||||
|
|
||||||
setCompanyInfo(partial: Partial<any>) {
|
setCompanyInfo(partial: Partial<any>) {
|
||||||
|
@@ -35,7 +35,7 @@ export const showMessage = (status: number | string): string => {
|
|||||||
message = 'HTTP版本不受支持(505)';
|
message = 'HTTP版本不受支持(505)';
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
message = `连接出错(${status})!`;
|
message = `操作失败(${status})!`;
|
||||||
}
|
}
|
||||||
return `${message},请检查网络或联系管理员!`;
|
return `${message},请检查网络或联系管理员!`;
|
||||||
};
|
};
|
||||||
|
Reference in New Issue
Block a user