diff --git a/App.vue b/App.vue index 38747c6..b244026 100644 --- a/App.vue +++ b/App.vue @@ -14,20 +14,27 @@ const { token } = useAuthUser() const { loginTencentIM } = useUserStore() /** 静默登录逻辑 */ - const silentLogin = async () => { + const silentLogin = async (e: any) => { if (token.value) { loginTencentIM() // reLaunch('/TUIKit/components/TUIConversation/index') return } - // 没有token去登录页 - reLaunch('/pages/login/login') + console.log(e, '=====222==') + if (e?.query?.invitationCode) { + reLaunch('/pages/login/phone-register/phone-register', { + invitationCode: e.query.invitationCode + }) + } else { + // 没有token去登录页 + reLaunch('/pages/login/login') + } } - onLaunch(() => { + onLaunch((e: any) => { console.log('App Launch111') - silentLogin() + silentLogin(e) // #ifdef APP-PLUS setSdkLanguageFromSystem() diff --git a/TUIKit/components/TUIChat/message-input-toolbar/index.vue b/TUIKit/components/TUIChat/message-input-toolbar/index.vue index 59101e6..29d9333 100644 --- a/TUIKit/components/TUIChat/message-input-toolbar/index.vue +++ b/TUIKit/components/TUIChat/message-input-toolbar/index.vue @@ -67,7 +67,7 @@ - + +
{{ isPhone ? '手机' : '邮箱' }}注册 - +
- +
diff --git a/manifest.json b/manifest.json index 7dd019a..3802adf 100644 --- a/manifest.json +++ b/manifest.json @@ -1,9 +1,9 @@ { - "name" : "uniapp-imitate-wx", + "name" : "密谈IM", "appid" : "__UNI__9EFDC69", "description" : "", - "versionName" : "1.0.3", - "versionCode" : 102, + "versionName" : "1.0.4", + "versionCode" : 103, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { @@ -61,13 +61,53 @@ "UIBackgroundModes" : [ "audio" ] }, /* SDK配置 */ - "sdkConfigs" : {} + "sdkConfigs" : {}, + "splashscreen" : { + "androidStyle" : "default", + "android" : { + "hdpi" : "D:/下载/聊天界面（其他功能）.png", + "xhdpi" : "D:/下载/聊天界面（其他功能）.png", + "xxhdpi" : "D:/下载/聊天界面（其他功能）.png" + } + }, + "icons" : { + "android" : { + "hdpi" : "unpackage/res/icons/72x72.png", + "xhdpi" : "unpackage/res/icons/96x96.png", + "xxhdpi" : "unpackage/res/icons/144x144.png", + "xxxhdpi" : "unpackage/res/icons/192x192.png" + }, + "ios" : { + "appstore" : "unpackage/res/icons/1024x1024.png", + "ipad" : { + "app" : "unpackage/res/icons/76x76.png", + "app@2x" : "unpackage/res/icons/152x152.png", + "notification" : "unpackage/res/icons/20x20.png", + "notification@2x" : "unpackage/res/icons/40x40.png", + "proapp@2x" : "unpackage/res/icons/167x167.png", + "settings" : "unpackage/res/icons/29x29.png", + "settings@2x" : "unpackage/res/icons/58x58.png", + "spotlight" : "unpackage/res/icons/40x40.png", + "spotlight@2x" : "unpackage/res/icons/80x80.png" + }, + "iphone" : { + "app@2x" : "unpackage/res/icons/120x120.png", + "app@3x" : "unpackage/res/icons/180x180.png", + "notification@2x" : "unpackage/res/icons/40x40.png", + "notification@3x" : "unpackage/res/icons/60x60.png", + "settings@2x" : "unpackage/res/icons/58x58.png", + "settings@3x" : "unpackage/res/icons/87x87.png", + "spotlight@2x" : "unpackage/res/icons/80x80.png", + "spotlight@3x" : "unpackage/res/icons/120x120.png" + } + } + } } }, "h5" : { "optimization" : { "treeShaking" : { - "enable" : true + "enable" : false } }, "router" : { diff --git a/pages.json b/pages.json index b4a3a03..245d38c 100644 --- a/pages.json +++ b/pages.json @@ -112,7 +112,8 @@ "path": "pages/discover/discover", "style": { "navigationBarTitleText": "发现", - "navigationBarBackgroundColor": "#ffffff" + "navigationBarBackgroundColor": "#ffffff", + "navigationStyle": "custom" } }, { @@ -193,6 +194,13 @@ "navigationBarBackgroundColor": "#ffffff" } }, + { + "path": "pages/my-index/wallet/invite", + "style": { + "navigationBarTitleText": "邀请好友", + "navigationBarBackgroundColor": "#ffffff" + } + }, { "path": "pages/my-index/my-team", "style": { @@ -479,4 +487,4 @@ } ] } -} \ No newline at end of file +} diff --git a/pages/discover/discover.vue b/pages/discover/discover.vue index da1794d..3bd7b7f 100644 --- a/pages/discover/discover.vue +++ b/pages/discover/discover.vue @@ -59,34 +59,61 @@ return } } + + const onScan = () => { + uni.scanCode({ + onlyFromCamera: false, + scanType: ['qrCode'], + success: res => { + navigateTo(res.result) + } + }) + } + diff --git a/pages/my-index/my-index.vue b/pages/my-index/my-index.vue index 95645be..b425b58 100644 --- a/pages/my-index/my-index.vue +++ b/pages/my-index/my-index.vue @@ -4,6 +4,7 @@ import { navigateTo } from '@/utils/router' import { useUI } from '@/utils/use-ui' import { formatNumberWithWan } from '../../utils' + import { getUserPayPwd } from '@/api/my-index' const bottomList = [ { @@ -43,6 +44,23 @@ const { showDialog } = useUI() const { userInfo, integralData } = useAuthUser() + /** 点击列表跳转 */ + const onGo = async item => { + if (item.url === '/pages/my-index/wallet/index') { + const res = await getUserPayPwd() + if (res?.data) { + navigateTo(item.url) + } else { + const show = await showDialog('提示', '请先设置支付密码') + if (show) { + navigateTo('/pages/my-index/wallet/edit-password', { type: 0 }) + } + } + } else { + navigateTo(item.url) + } + } + onLoad(() => { // 获取用户信息 console.log(userInfo.value, '===获取用户信息') @@ -99,7 +117,7 @@ v-for="(item, index) in bottomList" :key="index" class="item-box" - @click="item.url && navigateTo(item.url)" + @click="item.url && onGo(item)" > { getData() }) diff --git a/pages/my-index/wallet/invite.vue b/pages/my-index/wallet/invite.vue new file mode 100644 index 0000000..3c0ede6 --- /dev/null +++ b/pages/my-index/wallet/invite.vue @@ -0,0 +1,178 @@ + + + + + diff --git a/pages/my-index/wallet/real-id.vue b/pages/my-index/wallet/real-id.vue index 48599cd..46d7c9d 100644 --- a/pages/my-index/wallet/real-id.vue +++ b/pages/my-index/wallet/real-id.vue @@ -136,20 +136,6 @@