diff --git a/src/App.vue b/src/App.vue index 12c95e1..582dd67 100644 --- a/src/App.vue +++ b/src/App.vue @@ -3,7 +3,32 @@ import { mpUpdate, setCompanyId, setReferrerUserId, setRegisterStoreId } from '@ onLaunch((options) => { console.log('App Launch options ', options); - // setRegisterStoreId('1144085996641443841'); + + const miniProgram = uni.getAccountInfoSync().miniProgram; + const env = miniProgram.envVersion; + console.table(miniProgram); + + //生产 + if(env === 'release') { + uni.request({ + url: 'https://api.lakeapp.cn/wechat/version_info', + success(res) { + console.log(res); + const { version, audit } = res.data; + if(miniProgram.version === version && audit == 1) { + setCompanyId('1144085996213624833'); + setRegisterStoreId('1150930317436633090'); + } + } + }); + // setCompanyId('1144085996213624833'); + // setRegisterStoreId('1150930317436633090'); + } + //测试、开发 trial,develop + else { + setCompanyId('1150930317231112193'); + setRegisterStoreId('1144085996641443841'); + } if(options?.query) { //保存登录邀请员工id @@ -29,11 +54,11 @@ onLaunch((options) => { } if(options?.query.scene === 'edit_avatar_nickname') { - setTimeout(()=>{ + setTimeout(() => { uni.reLaunch({ url: '/pages/mine/subs/profile/index' }); - },500) + }, 500); } } } diff --git a/src/pages/common/login/index.vue b/src/pages/common/login/index.vue index 4d951d9..b0ee32e 100644 --- a/src/pages/common/login/index.vue +++ b/src/pages/common/login/index.vue @@ -10,11 +10,15 @@ 微信登录 - 登录代表同意 - - 《小程序隐私保护协议》 + + + 请先阅读并同意 + + 《小程序隐私保护协议》 + + 并授权使用您的账号信息(如昵称、头像、收获地址)以便您统一管理 - 并授权使用您的账号信息(如昵称、头像、收获地址)以便您统一管理 @@ -22,10 +26,16 @@ diff --git a/src/static/images/ic_checked_gray.png b/src/static/images/ic_checked_gray.png new file mode 100644 index 0000000..56fba9f Binary files /dev/null and b/src/static/images/ic_checked_gray.png differ diff --git a/src/static/images/ic_checked_green.png b/src/static/images/ic_checked_green.png new file mode 100644 index 0000000..2c07018 Binary files /dev/null and b/src/static/images/ic_checked_green.png differ