Commit 7fd14fc8 authored by spc's avatar spc

fixed

parent 9179c436
......@@ -1146,7 +1146,8 @@ export default {
background-color: rgba(0, 0, 0, 0.5);
z-index: 200;
display: flex;
justify-content: flex-end;
justify-content: center;
align-items: flex-end;
}
.picker-container {
......@@ -1154,9 +1155,19 @@ export default {
width: 100%;
border-top-left-radius: 20rpx;
border-top-right-radius: 20rpx;
max-height: 80vh;
height: 80vh;
display: flex;
flex-direction: column;
animation: slideUp 0.3s ease-out;
}
@keyframes slideUp {
from {
transform: translateY(100%);
}
to {
transform: translateY(0);
}
}
.picker-header {
......@@ -1214,7 +1225,6 @@ export default {
.picker-list {
flex: 1;
overflow-y: auto;
max-height: 60vh;
}
.picker-item {
......
......@@ -276,10 +276,13 @@ import { getHealthField } from "@/api/common";
import { hideLoading, showLoading } from "../utils";
import md from "../md.js";
import { onShow } from '@dcloudio/uni-app';
import { useIntegralStore } from "../stores/integral.js";
import { useGlobalStore } from "../stores/global.js";
const { proxy } = getCurrentInstance();
const $baseUrl = proxy.$baseUrl;
const integralStore = useIntegralStore();
const globalStore = useGlobalStore();
const userStore = useUserStore();
const pageCfgStore = usePageCfgStore();
const cfgStatus = ref({
......@@ -302,8 +305,9 @@ const points = ref(0);
const babyId = ref(0);
const handleTaskClick = () => {
navigateTo('webview', { url: `${protocolUrl}?id=task&title=完成任务` })
const handleTaskClick = async () => {
await integralStore.getSigninAndTaskInfo(isdebug.value);
globalStore.showTaskPop(integralStore?.signinAndTaskInfo?.data?.taskTodo);
}
const handleHot = (e) => {
......
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