Browse Source

3

dev_YWQ
congzc 1 year ago
parent
commit
5def988ecb
5 changed files with 42 additions and 21 deletions
  1. +2
    -4
      src/api/camera.js
  2. +9
    -2
      src/pages/camera/index.vue
  3. +27
    -12
      src/pages/created/index.vue
  4. +3
    -2
      src/pages/createing/index.vue
  5. +1
    -1
      src/store/modules/userInfo.js

+ 2
- 4
src/api/camera.js View File

@@ -5,13 +5,11 @@ import { request } from "../utils/request"
* @param machineQrcodeId
* @return: status
*/
export function getImageQrcode(machineQrcodeId) {
export function getImageQrcode(data) {
return request({
url: `/api/screenImg/imageQrcode`,
method: 'post',
data: {
machineQrcodeId
}
data
})
}



+ 9
- 2
src/pages/camera/index.vue View File

@@ -87,6 +87,7 @@ let isUpload = ref(false);

let modelUrl = ref("");
let modelId = ref("");
let modelMouldType = ref("");

let QRCodeUrl = ref("");
let showQrCode = ref(false);
@@ -363,9 +364,14 @@ const reTry = () => {

// 点击上传照片按钮
const uploadImg = async () => {
const UserId = localStorage.getItem("UserId");
const data = {
machineQrcodeId: localStorage.getItem("UserId"),
mouldType: modelMouldType.value,
};
// const UserId = localStorage.getItem("UserId");
// const mouldType = modelMouldType.value;
try {
const res = await getImageQrcode(UserId);
const res = await getImageQrcode(data);
QRCodeUrl.value = res.data.wxQrcode;
showQrCode.value = true;

@@ -412,6 +418,7 @@ onLoad((options) => {
console.log(options, "options");
modelUrl.value = options.modelUrl;
modelId.value = options.id;
modelMouldType.value = options.mouldType;
});

onMounted(() => {


+ 27
- 12
src/pages/created/index.vue View File

@@ -21,9 +21,15 @@
@change="getSwiperIndex"
@click="previewImage"
></u-swiper>
<view class="logoBox" v-if="createState != 2">
<image class="logo" src="../../assets/img/logo-4.png" mode="aspectFit" />
</view>
<image
class="logo"
v-if="createState != 2"
:src="modelImgUrl"
mode="aspectFit"
/>
<!-- <view class="logoBox" v-if="createState != 2"> -->
<!-- <image class="logo" src="../../assets/img/logo-4.png" mode="aspectFit" /> -->
<!-- </view> -->
<view v-if="createState == 2" class="checkMore">左右滑动查看更多</view>
<view v-if="createState != 2" class="wait">生成中,请稍后...</view>
<!-- <view
@@ -56,8 +62,10 @@ const userInfoModulesPinia = userInfoModules();
const createState = ref(1); //制作状态:1生成中,2完成,3失败
const workId = ref(null); //作品id

const modelImgUrl = ref("");
onLoad(async (options) => {
workId.value = options.id;
modelImgUrl.value = options.imgUrl;
// await getTemplateMsg();
getUser();
await getSwiperList();
@@ -298,19 +306,26 @@ onUnload(() => {
}
}
}
.logoBox {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
.logo {
margin-top: 70rpx;
border-radius: 30rpx;
width: 540rpx;
height: 720rpx !important;
}
.logoBox {
// display: flex;
// flex-direction: column;
// align-items: center;
// justify-content: center;
// margin-top: 70rpx;
width: 540rpx;
height: 720rpx !important;
.logo {
width: 260rpx;
margin: 90rpx;
animation: rotateAnimation 3s 0s infinite;
opacity: 0.7;
border-radius: 30rpx;
width: 100%;
// margin: 90rpx;
// animation: rotateAnimation 3s 0s infinite;
// opacity: 0.7;
}
}
@keyframes rotateAnimation {


+ 3
- 2
src/pages/createing/index.vue View File

@@ -130,7 +130,7 @@ async function createing2() {
console.log(res2);
// userInfoModulesPinia.createTimes = userInfoModulesPinia.createTimes - 1;
uni.navigateTo({
url: `/pages/created/index?id=${res2.data.id}`,
url: `/pages/created/index?id=${res2.data.id}&imgUrl=${styleData.value.coverImg}`,
});
} else {
throw new Error();
@@ -310,8 +310,9 @@ function toChooseModel() {
function toCamera() {
const url = styleData.value.coverImg;
const id = styleData.value.id;
const mouldType = styleData.value.mouldType;
uni.navigateTo({
url: `/pages/camera/index?modelUrl=${url}&id=${id}`,
url: `/pages/camera/index?modelUrl=${url}&id=${id}&mouldType=${mouldType}`,
});
}
//#endregion ---------------------


+ 1
- 1
src/store/modules/userInfo.js View File

@@ -34,7 +34,7 @@ export const userInfoModules = defineStore("userInfoStore", () => {
function clearStorage() {
token.value = null
phone.value = null
createTimes.value = null
createTimes.value = 0
uni.setStorageSync("token", null);
uni.setStorageSync("createTimes", 0);
uni.setStorageSync("phone", null);


Loading…
Cancel
Save