Browse Source

Merge branch 'dev' into dev_YWQ

dev_YWQ
HolyKnightIX 1 year ago
parent
commit
c79bb178a2
2 changed files with 26 additions and 9 deletions
  1. +19
    -2
      src/pages/created/index.vue
  2. +7
    -7
      src/pages/createing/index.vue

+ 19
- 2
src/pages/created/index.vue View File

@@ -61,6 +61,7 @@ import {
photoSupperApi, photoSupperApi,
getSupperPhotoStateApi, getSupperPhotoStateApi,
} from "../../api/lookPhoto.js"; } from "../../api/lookPhoto.js";
import { getUserApi } from "../../api/createing";
import { userInfoModules } from "@/store/modules/userInfo"; import { userInfoModules } from "@/store/modules/userInfo";
const userInfoModulesPinia = userInfoModules(); const userInfoModulesPinia = userInfoModules();
//#endregion //#endregion
@@ -74,10 +75,10 @@ const QRCodeUrl = ref("");
onLoad(async (options) => { onLoad(async (options) => {
workId.value = options.id; workId.value = options.id;
// await getTemplateMsg(); // await getTemplateMsg();
getUser();
await getSwiperList(); await getSwiperList();
await getSupperPhotoState(swiperList.value[0].id); await getSupperPhotoState(swiperList.value[0].id);

uni.setStorageSync("createTimes", userInfoModulesPinia.createTimes);
// uni.setStorageSync("createTimes", userInfoModulesPinia.createTimes);
}); });
onUnload(() => { onUnload(() => {
clearTimeout(timer); clearTimeout(timer);
@@ -127,6 +128,22 @@ function previewImage(index) {
} }
//#endregion --------------------- //#endregion ---------------------


//#region 获取次数
async function getUser() {
try {
const res = await getUserApi(uni.getStorageSync("UserId"));
// 如果接口200就说明已登录
if (res.code == 200 && res.data) {
// 查询支付状态 0:待支付,2:支付中,3:已支付
if (res.data.payStatus == 3) {
uni.setStorageSync("createTimes", res.data.createTimes);
userInfoModulesPinia.createTimes = res.data.createTimes;
}
}
} catch (err) {
console.log(err);
}
}
//#endregion --------------------- //#endregion ---------------------


//#region 页面跳转 //#region 页面跳转


+ 7
- 7
src/pages/createing/index.vue View File

@@ -128,7 +128,7 @@ async function createing2() {
const res2 = await createPhotoApi(data); const res2 = await createPhotoApi(data);
if (res2.data) { if (res2.data) {
console.log(res2); console.log(res2);
userInfoModulesPinia.createTimes = userInfoModulesPinia.createTimes - 1;
// userInfoModulesPinia.createTimes = userInfoModulesPinia.createTimes - 1;
uni.navigateTo({ uni.navigateTo({
url: `/pages/created/index?id=${res2.data.id}`, url: `/pages/created/index?id=${res2.data.id}`,
}); });
@@ -218,17 +218,17 @@ async function getUser() {
// 如果接口200就说明已登录 // 如果接口200就说明已登录
if (res.code == 200 && res.data) { if (res.code == 200 && res.data) {
// 查询支付状态 0:待支付,2:支付中,3:已支付 // 查询支付状态 0:待支付,2:支付中,3:已支付
uni.setStorageSync("token", res.data.token);
uni.setStorageSync("createTimes", res.data.createTimes);
uni.setStorageSync("phone", res.data.phone);
userInfoModulesPinia.token = res.data.token;
userInfoModulesPinia.phone = res.data.phone;
userInfoModulesPinia.createTimes = res.data.createTimes;
if (res.data.payStatus == 3) { if (res.data.payStatus == 3) {
clearInterval(payCountTimer.value); clearInterval(payCountTimer.value);
payCountTimer.value = null; payCountTimer.value = null;
uni.hideLoading(); uni.hideLoading();
payMask.value = false; payMask.value = false;
uni.setStorageSync("token", res.data.token);
uni.setStorageSync("createTimes", res.data.createTimes);
uni.setStorageSync("phone", res.data.phone);
userInfoModulesPinia.token = res.data.token;
userInfoModulesPinia.phone = res.data.phone;
userInfoModulesPinia.createTimes = res.data.createTimes;
showQrCode.value = false; showQrCode.value = false;
uni.showToast({ uni.showToast({
title: "支付成功!", title: "支付成功!",


Loading…
Cancel
Save