@@ -23,10 +23,8 @@ | |||||
<div class="uploadText">上传照片</div> | <div class="uploadText">上传照片</div> | ||||
</div> | </div> | ||||
<div id="action" @click="takePicture"> | <div id="action" @click="takePicture"> | ||||
<view v-show="showTakeTips" class="takeTips1">请把脸面向摄像头</view> | |||||
<view v-show="showTakeTips" class="takeTips2" | |||||
>点击三秒后开始拍照 | |||||
</view> | |||||
<view v-show="showTakeTips" class="takeTips1"> 请正视摄像头</view> | |||||
<view v-show="showTakeTips" class="takeTips2"> 点击开始拍照 </view> | |||||
<div class="circleInside"></div> | <div class="circleInside"></div> | ||||
</div> | </div> | ||||
</div> | </div> | ||||
@@ -39,10 +37,13 @@ | |||||
<div class="confirm" @click="confirmPhoto"> | <div class="confirm" @click="confirmPhoto"> | ||||
<!-- <img src="../../assets/img/success.png" /> --> | <!-- <img src="../../assets/img/success.png" /> --> | ||||
<div class="sure">确定</div> | |||||
<!-- <div class="sure">确定</div> | |||||
<div class="uploadText"> | <div class="uploadText"> | ||||
就这张了 <img src="../../assets/img/success.png" /> | 就这张了 <img src="../../assets/img/success.png" /> | ||||
</div> --> | |||||
<div class="sure"> | |||||
<div class="uploadText">就这张了 ✔</div> | |||||
</div> | </div> | ||||
</div> | </div> | ||||
@@ -594,9 +595,12 @@ onLoad((options) => { | |||||
onMounted(() => { | onMounted(() => { | ||||
clearInterval(timer.value); | clearInterval(timer.value); | ||||
startCamera(); | |||||
const CimageUrl = uni.getStorageSync("CcurrentUrl"); | const CimageUrl = uni.getStorageSync("CcurrentUrl"); | ||||
const UimageUrl = uni.getStorageSync("UcurrentUrl"); | const UimageUrl = uni.getStorageSync("UcurrentUrl"); | ||||
if (!CimageUrl) { | |||||
startCamera(); | |||||
} | |||||
if (CimageUrl || UimageUrl) { | if (CimageUrl || UimageUrl) { | ||||
setTimeout(async () => { | setTimeout(async () => { | ||||
showQrCode.value = false; | showQrCode.value = false; | ||||
@@ -645,15 +649,15 @@ onUnload(() => { | |||||
<style lang="scss" scoped> | <style lang="scss" scoped> | ||||
:deep(.uni-toast) { | :deep(.uni-toast) { | ||||
width: 300rpx; | |||||
font-size: 50rpx; | |||||
width: 500rpx; | |||||
font-size: 70rpx; | |||||
font-weight: 900; | font-weight: 900; | ||||
padding: 20rpx 30rpx; | padding: 20rpx 30rpx; | ||||
color: #ff4f00; | color: #ff4f00; | ||||
.uni-toast__icon { | .uni-toast__icon { | ||||
width: 50rpx !important; | |||||
height: 50rpx !important; | |||||
width: 70rpx !important; | |||||
height: 70rpx !important; | |||||
} | } | ||||
} | } | ||||
.page { | .page { | ||||
@@ -820,8 +824,22 @@ onUnload(() => { | |||||
width: 100%; | width: 100%; | ||||
height: 50rpx; | height: 50rpx; | ||||
line-height: 50rpx; | line-height: 50rpx; | ||||
background-color: #2ba245; | |||||
line-height: 50rpx; | |||||
background-color: #ff4f00; | |||||
border-radius: 15rpx; | border-radius: 15rpx; | ||||
.uploadText { | |||||
// position: absolute; | |||||
// left: 50%; | |||||
// bottom: -40rpx; | |||||
// width: 150%; | |||||
width: 100%; | |||||
height: 30rpx; | |||||
line-height: 50rpx; | |||||
font-size: 20rpx; | |||||
// transform: translateX(-32%); | |||||
text-align: center; | |||||
} | |||||
} | } | ||||
.uploadText { | .uploadText { | ||||
// position: absolute; | // position: absolute; | ||||
@@ -29,32 +29,11 @@ | |||||
:src="modelImgUrl" | :src="modelImgUrl" | ||||
mode="aspectFit" | 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="checkMore">左右滑动查看更多</view> | ||||
<!-- <view v-if="createState != 2" class="wait"> | |||||
<view class="creating" | |||||
>写真生成中 | |||||
<u-loading-icon | |||||
size="60" | |||||
color="#ff4f00" | |||||
style="display: inline-block" | |||||
></u-loading-icon> | |||||
</view> | |||||
<view class="check">稍后您可在“智像小相册”微信小程序中查看</view> | |||||
</view> --> | |||||
<!-- <view | |||||
@click="subscribe" | |||||
v-if="createState != 2" | |||||
style="text-decoration: underline; color: #ff4f00" | |||||
class="wait" | |||||
>做好后通知我</view | |||||
> --> | |||||
<view class="orangeBtn" @click="goChooseStyle" | <view class="orangeBtn" @click="goChooseStyle" | ||||
>{{ | |||||
userInfoModulesPinia.createTimes == 0 ? "再玩一次" : "稍后查看 再来一套" | |||||
}} | |||||
>{{ userInfoModulesPinia.createTimes == 0 ? "再玩一次" : "再来一套" }} | |||||
</view> | </view> | ||||
<view class="grayBtn" @click="loginOut"> | <view class="grayBtn" @click="loginOut"> | ||||
{{ | {{ | ||||
@@ -14,13 +14,13 @@ | |||||
userInfoModulesPinia.createTimes == 0 ? "查看相册" : "结束拍摄" | userInfoModulesPinia.createTimes == 0 ? "查看相册" : "结束拍摄" | ||||
}}</view> | }}</view> | ||||
</view> | </view> | ||||
<text class="name">{{ styleData.title }}</text> | |||||
<!-- 展示图 --> | <!-- 展示图 --> | ||||
<view class="showImgBox imgContenBox" | <view class="showImgBox imgContenBox" | ||||
><image :src="styleData.coverImg" | ><image :src="styleData.coverImg" | ||||
/></view> | /></view> | ||||
<text class="name">{{ styleData.title }}</text> | |||||
<view class="orangeBtn" @click="createing1" style="margin-top: -20rpx" | |||||
>开始制作写真 | |||||
<view class="orangeBtn" @click="createing1" style="margin-top: 50rpx" | |||||
>开始制作 | |||||
</view> | </view> | ||||
<view class="grayBtn" @click="toChooseModel" style="margin-top: 30rpx" | <view class="grayBtn" @click="toChooseModel" style="margin-top: 30rpx" | ||||
>重新选择模版 | >重新选择模版 | ||||
@@ -471,25 +471,12 @@ onUnload(() => { | |||||
} | } | ||||
.name { | .name { | ||||
margin-top: 80rpx; | margin-top: 80rpx; | ||||
margin-bottom: 80rpx; | |||||
margin-bottom: 20rpx; | |||||
font-size: 44rpx; | font-size: 44rpx; | ||||
font-weight: 800; | font-weight: 800; | ||||
} | } | ||||
.orangeBtn { | .orangeBtn { | ||||
position: relative; | position: relative; | ||||
.free { | |||||
position: absolute; | |||||
top: -18rpx; | |||||
right: -70rpx; | |||||
width: 142rpx; | |||||
height: 50rpx; | |||||
background-color: #000; | |||||
border-radius: 25rpx 25rpx 25rpx 0; | |||||
font-size: 22rpx; | |||||
font-weight: 900; | |||||
line-height: 50rpx; | |||||
text-align: center; | |||||
} | |||||
} | } | ||||
.overlay { | .overlay { | ||||
.content { | .content { | ||||