From ac5d8b0d61d33eb9b9456b56f0fe76e3c1c6784f Mon Sep 17 00:00:00 2001 From: congzc Date: Tue, 12 Sep 2023 15:32:15 +0800 Subject: [PATCH] 2 --- src/api/login.js | 7 +- src/pages/generateVideo/index.vue | 9 +- src/pages/index/index.vue | 74 +++++---------- src/pages/login/index.vue | 148 +++++++++++++++++++++++++++++- src/pages/lookPhoto/index.vue | 9 +- src/pages/recorded/index.vue | 9 +- 6 files changed, 191 insertions(+), 65 deletions(-) diff --git a/src/api/login.js b/src/api/login.js index d8acf3f..8eb58b1 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -1,11 +1,6 @@ import { request } from "../utils/request" -export function voiceTotalApi() { - return request({ - url: `api/voiceMould/voiceTotal`, - method: 'GET', - }) -} + // 微信登录 export function loginApi(data) { return request({ diff --git a/src/pages/generateVideo/index.vue b/src/pages/generateVideo/index.vue index e7e4536..7b4a375 100644 --- a/src/pages/generateVideo/index.vue +++ b/src/pages/generateVideo/index.vue @@ -129,9 +129,14 @@ function inviteFriend() { //#region 页面跳转 function bueCoin() { - uni.navigateTo({ - url: "/pages/home/buyCoin", + uni.showToast({ + title: "暂未开放", + icon: "none", + mask: true, }); + // uni.navigateTo({ + // url: "/pages/home/buyCoin", + // }); } //#endregion --------------------- diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index 4f2fb42..978823b 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -30,9 +30,7 @@ 我的金币:   {{ userInfoModulesPinia.myGlod }} - 购买金币购买金币 登录即可体验更多功能哦! @@ -70,9 +68,7 @@ v-for="item in PhotoList" :key="item.id" class="showListItem" - @click=" - goOtherPage(`/pages/lookPhoto/index?id=${item.id}`, item.status) - " + @click="goLookPhoto(item.id, item.status)" > {{ item.title }} @@ -116,11 +112,7 @@ 暂无数据 , - 去生成! + 去生成! @@ -246,47 +238,22 @@ function chooseAvatar() { url: "/pages/uploadPhoto/uploadPhoto", }); return; - uni.chooseImage({ - count: 1, // 最多可以选择的图片张数,这里设置为1,只选择一张图片 - success: async (res) => { - // avatarUrl.value = res.tempFilePaths[0]; - // TODO: 在这里处理图片上传逻辑,你可以调用上传接口将图片上传到服务器 - // 示例代码: - // uploadImageToServer(tempFilePaths[0]); - // 图片压缩 - console.log(res.tempFiles[0].size); - if (userInfoModulesPinia.platForm != 1) { - uni.compressImage({ - src: res.tempFilePaths[0], - quality: 20, - success: (res2) => { - avatarUrl.value = res2.tempFilePath; - console.log(res2.tempFilePath); - }, - }); - } else { - const options = { - maxSizeMB: 2, // 最大压缩大小为 4MB - useWebWorker: true, // 使用 Web Worker 进行压缩,提高性能 - }; - const compressedFile = await imageCompression( - res.tempFiles[0], - options - ); - //compressedFile是一个blob对象 - avatarUrl.value = URL.createObjectURL(compressedFile); - console.log(compressedFile); - // avatarUrl.value = compressedFile; - console.log("压缩图片h5"); - } - }, - fail: (err) => { - console.error("选择图片失败", err); - }, +} +//#endregion + +//#region 路由跳转 +function goBuyCoin() { + uni.showToast({ + title: "暂未开放", + icon: "none", + mask: true, }); + // uni.navigateTo({ + // url: "/pages/home/buyCoin", + // }); } -function goOtherPage(url, status) { +function goLookPhoto(id, status) { if (status != 2) { uni.showToast({ title: "正在生成,请稍后", @@ -295,9 +262,16 @@ function goOtherPage(url, status) { return; } uni.navigateTo({ - url: url, + url: `/pages/lookPhoto/index?id=${id}`, }); } + +function goCloseStyle() { + uni.navigateTo({ + url: `/pages/closeStyle/closeStyle`, + }); +} + //#endregion //#region tab diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue index 18b950c..8b12618 100644 --- a/src/pages/login/index.vue +++ b/src/pages/login/index.vue @@ -129,7 +129,7 @@ import { ref, reactive, computed } from "vue"; import { onLoad } from "@dcloudio/uni-app"; import { - voiceTotalApi, + loginApi, loginPhoneApi, getCodeApi, loginByCodeApi, @@ -137,7 +137,7 @@ import { import { userInfoModules } from "@/store/modules/userInfo"; //#endregion const userInfoModulesPinia = userInfoModules(); - +console.log(userInfoModulesPinia.platForm); const pageClass = computed(() => { if (userInfoModulesPinia.platForm == 1) { return "page pageH5"; @@ -380,19 +380,161 @@ async function loginByCode() { onLoad((options) => { uni.hideHomeButton(); // workId.value = options.id; + if (options.type == "tokenFfalse") { uni.showToast({ title: "登录失效,请重新登录", icon: "none", }); } + + if (userInfoModulesPinia.platForm == 2) { + uni.login({ + provider: "weixin", // 使用微信登录授权 + success: async (res) => { + if (res.code) { + try { + uni.showLoading({ + title: "加载中...", + mask: true, + }); + const data = { + appId: userInfoModulesPinia.getAppId(), + code: res.code, + }; + const res2 = await loginApi(data); + userInfoModulesPinia.openId = res2.data.openId; + if (res2.data.token) { + userInfoModulesPinia.token = res2.data.token; + // uni.setStorageSync("token", userInfoModulesPinia.token); + console.log(userInfoModulesPinia.openId, "获取openid"); + // 获取头像和金币 + const res3 = await findImageApi(); + userInfoModulesPinia.myAvatar = + res3.data && res3.data.image ? res3.data.image : ""; + const res4 = await findGlodApi(); + if (!res4.data) { + userInfoModulesPinia.myGlod = 0; + } else { + userInfoModulesPinia.myGlod = res4.data.digitalAvatarResidueGlod + ? res4.data.digitalAvatarResidueGlod + : 0; + } + uni.hideLoading(); + if (res2.data.token) { + // uni.redirectTo({ + // url: "/pages/index/index", + // }); + } else { + uni.redirectTo({ + url: "/pages/login/index", + }); + console.log("error1"); + uni.showToast({ + title: "登录失败,请重试", + icon: "none", + }); + } + } + uni.hideLoading(); + } catch (error) { + // uni.redirectTo({ + // url: "pages/index/index", + // }); + console.log(error, "error2"); + uni.showToast({ + title: "登录失败,请重试", + icon: "none", + }); + } + } else { + // uni.redirectTo({ + // url: "pages/index/index", + // }); + console.log("error3"); + uni.showToast({ + title: "登录失败,请重试", + icon: "none", + }); + } + }, + fail: (err) => { + // uni.redirectTo({ + // url: "pages/index/index", + // }); + console.log("error4"); + uni.showToast({ + title: "登录失败,请重试", + icon: "none", + }); + }, + }); + } + // 抖音头条授权 + else if (userInfoModulesPinia.platForm == 3) { + uni.login({ + provider: "toutiao", // 使用微信登录授权 + success: async (res) => { + if (res.code) { + try { + uni.showLoading({ + title: "加载中...", + mask: true, + }); + const data = { + appId: userInfoModulesPinia.getAppId(), + code: res.code, + }; + const res2 = await loginApi(data); + userInfoModulesPinia.openId = res2.data.openId; + if (res2.data.token) { + userInfoModulesPinia.token = res2.data.token; + // uni.setStorageSync("token", userInfoModulesPinia.token); + console.log(userInfoModulesPinia.openId, "获取openid"); + uni.hideLoading(); + } else { + uni.hideLoading(); + // uni.redirectTo({ + // url: "/pages/login/index", + // }); + console.log("error1"); + uni.showToast({ + title: "登录失败,请重试", + icon: "none", + }); + } + uni.hideLoading(); + } catch (error) { + uni.hideLoading(); + console.log(error, "error2"); + uni.showToast({ + title: "登录失败,请重试", + icon: "none", + }); + } + } else { + console.log("error3"); + uni.showToast({ + title: "登录失败,请重试", + icon: "none", + }); + } + }, + fail: (err) => { + console.log("error4"); + uni.showToast({ + title: "登录失败,请重试", + icon: "none", + }); + }, + }); + } }); //#endregion --------------------------------- //#region //#endregion --------------------------------- -// voiceTotalApi();