Commit 262c1dd2 authored by spc's avatar spc

fixed

parent 49e4050c
assets/logo.png

13.6 KB | W: | H:

assets/logo.png

10.6 KB | W: | H:

assets/logo.png
assets/logo.png
assets/logo.png
assets/logo.png
  • 2-up
  • Swipe
  • Onion skin
<script setup>
import {ref} from "vue";
import { ref } from "vue";
import RegisterLayer from "../../components/RegisterLayer.vue";
import {useUserStore} from "../../stores/user";
import {jump, JumpType} from "../../utils";
import { useUserStore } from "../../stores/user";
import { jump, JumpType } from "../../utils";
import md from "../../md";
import Checkbox from "./toggle-button/index.vue";
......@@ -93,7 +93,7 @@ const handleHot = (e) => {
}
};
function clickRegister(e){
function clickRegister(e) {
uni.showToast({
title: "请先阅读并同意协议《会员规则》及《隐私协议》",
icon: "none",
......@@ -113,15 +113,16 @@ function testClick() {
<template>
<div class="page">
<view >
<image src="@/assets/images/back-btn.png" class="btn-back" @click="clickBack"/>
<view>
<image src="@/assets/images/back-btn.png" class="btn-back" @click="clickBack" />
</view>
<div class="content">
<div class="logo-container">
<image src="@/assets/logo.png" class="logo"/>
<image src="@/assets/logo.png" class="logo" />
<text>星妈会</text>
</div>
<button v-if="readProtocol" class="register-button" open-type="getPhoneNumber" @getphonenumber="getRealtimePhoneNumber">
<button v-if="readProtocol" class="register-button" open-type="getPhoneNumber"
@getphonenumber="getRealtimePhoneNumber">
授权登录
</button>
<button v-else class="register-button disabled" @click="clickRegister">
......@@ -131,7 +132,7 @@ function testClick() {
测试
</button>-->
<view class="protocol-container">
<Checkbox v-model="readProtocol" class="checkbox"/>
<Checkbox v-model="readProtocol" class="checkbox" />
我已阅读并同意
<view class="link" :data-log="{
xcxClick: '注册页面点击',
......@@ -148,7 +149,7 @@ function testClick() {
</view>
</view>
</div>
<RegisterLayer v-model="showRegisterLayer" @confirm="onRegisterConfirm" @cancel="onRegisterCancel"/>
<RegisterLayer v-model="showRegisterLayer" @confirm="onRegisterConfirm" @cancel="onRegisterCancel" />
</div>
</template>
......@@ -159,7 +160,7 @@ function testClick() {
flex-direction: column;
align-items: center;
.btn-back{
.btn-back {
position: absolute;
left: 10rpx;
top: 100rpx;
......@@ -167,7 +168,7 @@ function testClick() {
height: 60rpx;
}
.logo-container{
.logo-container {
width: 100vw;
display: flex;
align-items: center;
......@@ -175,10 +176,12 @@ function testClick() {
flex-direction: column;
background-image: linear-gradient(180deg, #F4E2B2 0%, transparent 100%);
font-size: 34rpx;
font-weight: bold;
padding-top: 350rpx;
padding-bottom: 80rpx;
.logo{
.logo {
width: 176rpx;
height: 176rpx;
}
......@@ -197,7 +200,7 @@ function testClick() {
color: white;
margin-top: 130rpx;
&.disabled{
&.disabled {
background-color: #E3CC9E;
}
}
......
pages/activity/toggle-button/assets/check-select.png

911 Bytes | W: | H:

pages/activity/toggle-button/assets/check-select.png

754 Bytes | W: | H:

pages/activity/toggle-button/assets/check-select.png
pages/activity/toggle-button/assets/check-select.png
pages/activity/toggle-button/assets/check-select.png
pages/activity/toggle-button/assets/check-select.png
  • 2-up
  • Swipe
  • Onion skin
pages/activity/toggle-button/assets/check-unselect.png

611 Bytes | W: | H:

pages/activity/toggle-button/assets/check-unselect.png

717 Bytes | W: | H:

pages/activity/toggle-button/assets/check-unselect.png
pages/activity/toggle-button/assets/check-unselect.png
pages/activity/toggle-button/assets/check-unselect.png
pages/activity/toggle-button/assets/check-unselect.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -8,15 +8,9 @@
<WxFriendCircleSimplePage v-if="globalStore.isWxFriendCircle" />
<!-- 邀请奖品弹窗 -->
<InvitePrizePanel
:visible="globalStore.isShowInvitePrizePanel"
:inviteCount="globalStore.inviteCount"
:prizeName="globalStore.prizeName"
:prizeImage="globalStore.prizeImage"
@close="handleCloseInvitePrizePanel"
@record="handleInvitePrizePanelRecord"
@prize="handleInvitePrizePanelPrize"
/>
<InvitePrizePanel :visible="globalStore.isShowInvitePrizePanel" :inviteCount="globalStore.inviteCount"
:prizeName="globalStore.prizeName" :prizeImage="globalStore.prizeImage" @close="handleCloseInvitePrizePanel"
@record="handleInvitePrizePanelRecord" @prize="handleInvitePrizePanelPrize" />
<!-- 任务完成弹窗 -->
<!-- <TaskComplete
......@@ -28,54 +22,40 @@
/> -->
<!-- 任务弹窗 -->
<TaskPop
:visible="globalStore.isShowTaskPop"
:taskTodo="globalStore.taskTodo"
@close="handleCloseTaskPop"
@taskClick="handleTaskClick"
/>
<TaskPop :visible="globalStore.isShowTaskPop" :taskTodo="globalStore.taskTodo" @close="handleCloseTaskPop"
@taskClick="handleTaskClick" />
<!-- 任务完成提示弹窗 -->
<TaskCompleteTips
:visible="globalStore.isShowTaskComplete"
:points="globalStore.taskCompletePoints"
:taskTitle="globalStore.taskCompleteTitle"
@close="handleCloseTaskCompleteTips"
/>
<TaskCompleteTips :visible="globalStore.isShowTaskComplete" :points="globalStore.taskCompletePoints"
:taskTitle="globalStore.taskCompleteTitle" @close="handleCloseTaskCompleteTips" />
<!-- 任务信息弹窗 -->
<TaskPerson
:visible="globalStore.isShowTaskPerson"
@close="handleCloseTaskPerson"
@submit="handleTaskPersonSubmit"
/>
<TaskPerson :visible="globalStore.isShowTaskPerson" @close="handleCloseTaskPerson"
@submit="handleTaskPersonSubmit" />
<!-- 公众号弹窗 -->
<GongzhonghaoPop :visible="showGongzhonghaoPop" :title="gongzhonghaoTitle"
:description="gongzhonghaoDescription" :qrCodeUrl="gongzhonghaoQrCodeUrl"
@close="handleCloseGongzhonghaoPop" @download="handleDownloadQrCode" />
<GongzhonghaoPop :visible="showGongzhonghaoPop" :title="gongzhonghaoTitle" :description="gongzhonghaoDescription"
:qrCodeUrl="gongzhonghaoQrCodeUrl" @close="handleCloseGongzhonghaoPop" @download="handleDownloadQrCode" />
<!-- 视频弹窗 -->
<view v-if="showVideo" class="video-popup1">
<video :src="currentVideoUrl" controls autoplay
:style="{ width: videoWidth + 'px', height: videoHeight + 'px' }" @loadedmetadata="onVideoLoadedMeta"
@play="onVideoPlay"></video>
<video :src="currentVideoUrl" controls autoplay :style="{ width: videoWidth + 'px', height: videoHeight + 'px' }"
@loadedmetadata="onVideoLoadedMeta" @play="onVideoPlay"></video>
<view class="close-btn-bottom" @tap="closeVideo">×</view>
</view>
<button v-if="isBackApp" class="back-app" open-type="launchApp" app-parameter="wechat" @binderror="handleLaunchAppError"
:style="{
<button v-if="isBackApp" class="back-app" open-type="launchApp" app-parameter="wechat"
@binderror="handleLaunchAppError" :style="{
backgroundImage: `url(${$baseUrl}homepage/backAppBtn.png)`,
}"
>
}">
<!-- <text class="back-text">返回app</text> -->
</button>
<!-- 悬浮授权手机号模块 -->
<view class="auth-phone-module" v-if="!userStore.memberInfo?.mobile">
<view class="auth-phone-module" v-if="true || !userStore.memberInfo?.mobile">
<image class="auth-phone-bg" :src="$baseUrl + 'homepage/Q3Res/accessBg3.png'"></image>
<view class="auth-phone-btn-container">
<image class="auth-phone-btn" :src="$baseUrl + 'homepage/Q3Res/accessBtn3.png'" @tap="handleAuthPhoneClick">
......@@ -87,7 +67,7 @@
<script setup>
import { ref, getCurrentInstance, onMounted } from "vue";
import { onLoad, onShareAppMessage, onShareTimeline, onPageScroll, onShow} from "@dcloudio/uni-app";
import { onLoad, onShareAppMessage, onShareTimeline, onPageScroll, onShow } from "@dcloudio/uni-app";
import TabBar from "@/components/TabBar.vue";
import Home from "@/views/Home.vue";
import Brand from "@/views/Brand.vue";
......@@ -184,7 +164,7 @@ const checkAndUpdateTaskResult = async () => {
await integralStore.queryTodoResultServer();
console.log('queryTodoResult:', integralStore.queryTodoResult);
if(integralStore.queryTodoResult?.success && integralStore.queryTodoResult?.data?.length > 0) {
if (integralStore.queryTodoResult?.success && integralStore.queryTodoResult?.data?.length > 0) {
globalStore.isShowTaskComplete = true;
globalStore.taskCompletePoints = integralStore.queryTodoResult.data[0]?.actualCredits;
globalStore.taskCompleteTitle = integralStore.queryTodoResult.data[0]?.taskName;
......@@ -204,8 +184,8 @@ onMounted(async () => {
// const unionId = uni.getStorageSync('unionId');
const unclaimedPrize = res.data?.unclaimedPrize;
if(res.success){
if(unclaimedPrize) {
if (res.success) {
if (unclaimedPrize) {
globalStore.isShowInvitePrizePanel = true;
globalStore.inviteCount = res.data?.invitedCount;
globalStore.prizeName = unclaimedPrize?.prizeName;
......@@ -241,7 +221,7 @@ onShow(async () => {
console.log('onShow--index');
//完成了浏览任务
if(taskId.value > 0) {
if (taskId.value > 0) {
await handleTaskComplete(taskId.value);
}
});
......@@ -371,35 +351,35 @@ const handleTaskClick = async (data) => {
// 这里可以设置任务ID用于后续完成检测
const extra1 = JSON.parse(data?.task?.taskTodoExtra?.extra);
if(extra1.type == 'VIDEO') {
if (extra1.type == 'VIDEO') {
showVideo.value = true;
currentVideoUrl.value = extra1.url;
} else if(extra1.type == 'GOODS'){
} else if (extra1.type == 'GOODS') {
let url = `subPackages/shopMainProcess/product/index?productId=${extra1.value}&skuId=${extra1.skuId}&entrySource=xmh_wechatmp_points_north`;
jump({
type: JumpType.MINI,
url: url,
extra: {envVersion: "release", appId: "wx4205ec55b793245e",embedded: true}
extra: { envVersion: "release", appId: "wx4205ec55b793245e", embedded: true }
});
}else if(extra1.type == 'PAGE' || extra1.type == 'MINI_APP'){
} else if (extra1.type == 'PAGE' || extra1.type == 'MINI_APP') {
jump({
type: JumpType.INNER,
url: extra1.url
});
}else if(extra1.type == 'MINI_APP_THIRD'){
} else if (extra1.type == 'MINI_APP_THIRD') {
jump({
type: JumpType.MINI,
url: extra1.url,
extra: {envVersion: "release", appId: extra1.value,embedded: true}
extra: { envVersion: "release", appId: extra1.value, embedded: true }
});
}else if(extra1.type == 'SELF_GOODS'){
} else if (extra1.type == 'SELF_GOODS') {
jump({
type: JumpType.INNER,
url: `/v3/goodDetail/goodDetail?gid=${extra1.value}`
});
}else{
} else {
jump({
type: JumpType.H5,
url: extra1.url
......@@ -414,19 +394,19 @@ const handleTaskClick = async (data) => {
jump({
type: JumpType.MINI,
url: 'subPackages/xmhMainProcess/member/index?entrySource=xmh_wechatmp_points_recgoodsbot',
extra: {envVersion: "release", appId: "wx4205ec55b793245e",embedded: true}
extra: { envVersion: "release", appId: "wx4205ec55b793245e", embedded: true }
});
break;
case 'EXCHANGE_GOODS'://消费商品
const extra3 = JSON.parse(data?.task?.taskTodoExtra?.extra);
if(extra3.length > 0) {
if (extra3.length > 0) {
let url = 'subPackages/shopMainProcess/product/index?productId={productId}&skuId={skuId}&entrySource=xmh_wechatmp_points_north';
url = url.replace('{productId}', extra3[0].itemId).replace('{skuId}', extra3[0].skuId);
jump({
type: JumpType.MINI,
url: url,
extra: {envVersion: "release", appId: "wx4205ec55b793245e",embedded: true}
extra: { envVersion: "release", appId: "wx4205ec55b793245e", embedded: true }
})
}
break;
......@@ -546,7 +526,7 @@ const handleTaskPersonSubmit = (formData) => {
const closeVideo = async () => {
//完成了浏览任务
if(taskId.value > 0) {
if (taskId.value > 0) {
await handleTaskComplete(taskId.value);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment