Browse Source

Merge branch 'master' into dev

master
HolyKnightIX 1 year ago
parent
commit
3c038c893f
7 changed files with 59 additions and 10 deletions
  1. BIN
      src/assets/img/homeImg.jpg
  2. BIN
      src/assets/img/homeImg.png
  3. +1
    -1
      src/pages/closeStyle/goCreatePhoto.vue
  4. +27
    -3
      src/pages/index/index.vue
  5. +4
    -4
      src/pages/login/index.vue
  6. +1
    -1
      src/pages/lookPhoto/index.vue
  7. +26
    -1
      src/pages/uploadPhoto/uploadPhoto.vue

BIN
src/assets/img/homeImg.jpg View File

Before After
Width: 720  |  Height: 1373  |  Size: 128 KiB

BIN
src/assets/img/homeImg.png View File

Before After
Width: 750  |  Height: 1430  |  Size: 205 KiB

+ 1
- 1
src/pages/closeStyle/goCreatePhoto.vue View File

@@ -2,7 +2,7 @@
<view class="page"> <view class="page">
<!-- 毛玻璃 --> <!-- 毛玻璃 -->
<view class="glass"> <view class="glass">
<image src="../../assets/img/homeImg.png" mode="scaleToFill" />
<image src="../../assets/img/homeImg.jpg" mode="scaleToFill" />
</view> </view>
<view class="showImgBox imgContenBox" <view class="showImgBox imgContenBox"
><image :src="styleData.coverImg" ><image :src="styleData.coverImg"


+ 27
- 3
src/pages/index/index.vue View File

@@ -5,7 +5,7 @@
<!-- 毛玻璃 --> <!-- 毛玻璃 -->
<view class="glass"> <view class="glass">
<image src="../../assets/img/homeImg.png" mode="scaleToFill" />
<image src="../../assets/img/homeImg.jpg" mode="scaleToFill" />
</view> </view>
<!-- 头像 --> <!-- 头像 -->
<view class="avatarBox"> <view class="avatarBox">
@@ -212,7 +212,13 @@
<script setup> <script setup>
//#region 导入 //#region 导入
import dayjs from "dayjs"; import dayjs from "dayjs";
import { onLoad, onShow } from "@dcloudio/uni-app";
import {
onLoad,
onShareAppMessage,
onShareTimeline,
onAddToFavorites,
onShow,
} from "@dcloudio/uni-app";
import { ref, reactive, computed, inject } from "vue"; import { ref, reactive, computed, inject } from "vue";
// import App from "../../App.vue"; // import App from "../../App.vue";
import { import {
@@ -506,8 +512,26 @@ onShow(() => {
} }
}); });
//#endregion ---------------------------
// 分享到朋友圈
// onShareTimeline((res) => {
// return {
// title: "邃芒智像",
// };
// });
// 收藏
// onAddToFavorites((res) => {
// return {
// title: "邃芒智像",
// };
// });
//#endregion ---------------------------
onShareAppMessage((res) => {
return {
title: "邃芒智像",
};
});
//#region //#region
//#endregion --------------------------- //#endregion ---------------------------


+ 4
- 4
src/pages/login/index.vue View File

@@ -1,7 +1,7 @@
<template> <template>
<view :class="pageClass"> <view :class="pageClass">
<!-- mode="aspectFit" --> <!-- mode="aspectFit" -->
<image class="bgImg" src="../../assets/img/homeImg.png" />
<image class="bgImg" src="../../assets/img/homeImg.jpg" />
<!-- 视频,已废弃 --> <!-- 视频,已废弃 -->
<view v-show="false" class="videoBox"> <view v-show="false" class="videoBox">
<!-- <video <!-- <video
@@ -26,7 +26,7 @@
id="getPhoneNumber" id="getPhoneNumber"
@click="toCreate" @click="toCreate"
> >
开始制作我的数字分身
开始制作我的数字写真
</button> </button>
<button <button
v-if="checkboxValue[0]" v-if="checkboxValue[0]"
@@ -36,9 +36,9 @@
id="getPhoneNumber" id="getPhoneNumber"
@getphonenumber="toCreate" @getphonenumber="toCreate"
> >
开始制作我的数字分身
开始制作我的数字写真
</button> </button>
<!-- <view class="bottomBtn" @click="toCreate"> 开始制作我的数字分身 </view> -->
<!-- <view class="bottomBtn" @click="toCreate"> 开始制作我的数字写真 </view> -->
<u-checkbox-group <u-checkbox-group
v-model="checkboxValue" v-model="checkboxValue"
placement="row" placement="row"


+ 1
- 1
src/pages/lookPhoto/index.vue View File

@@ -255,7 +255,7 @@ async function photoSupper() {
console.log(res); console.log(res);
uni.hideLoading(); uni.hideLoading();
uni.showToast({ uni.showToast({
title: "高清处理请求成功,请重稍后",
title: "高清处理请求成功,请稍等",
icon: "none", icon: "none",
}); });


+ 26
- 1
src/pages/uploadPhoto/uploadPhoto.vue View File

@@ -86,7 +86,13 @@
<script setup> <script setup>
//#region 导入 //#region 导入
import { ref, reactive, nextTick } from "vue"; import { ref, reactive, nextTick } from "vue";
import { onLoad, onShow } from "@dcloudio/uni-app";
import {
onLoad,
onShareAppMessage,
onShareTimeline,
onAddToFavorites,
onShow,
} from "@dcloudio/uni-app";
import { loginApi } from "../../api/login"; import { loginApi } from "../../api/login";
import { addImageApi } from "../../api/uploadphoto.js"; import { addImageApi } from "../../api/uploadphoto.js";
import { userInfoModules } from "@/store/modules/userInfo"; import { userInfoModules } from "@/store/modules/userInfo";
@@ -419,6 +425,25 @@ onShow(() => {
}); });
//#endregion --------------------- //#endregion ---------------------
onShareAppMessage((res) => {
return {
title: "邃芒智像",
};
});
// 分享到朋友圈
onShareTimeline((res) => {
return {
title: "邃芒智像",
};
});
// 收藏
onAddToFavorites((res) => {
return {
title: "邃芒智像",
};
});
//#region 公共方法 //#region 公共方法
function goOtherPage(url) { function goOtherPage(url) {


Loading…
Cancel
Save