urbanu před 1 měsícem
rodič
revize
edc9d8854b

+ 2 - 2
index.html

@@ -4,8 +4,8 @@
   <meta charset="UTF-8" />
   <meta http-equiv="X-UA-Compatible" content="IE=edge" />
   <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-  <link rel="icon" href="/favicon.ico" />
-  <title>Daytask</title>
+  <link rel="icon" href="/logo.svg" type="image/svg+xml" />
+  <title>Vitiens</title>
 </head>
 
 <body>

+ 3 - 2
public/logo.svg

@@ -1,3 +1,4 @@
-<svg width="31" height="24" viewBox="0 0 31 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M15.48 15.5579L17.7892 20.4788C18.6599 22.3337 20.0227 23.28 21.5748 23.28C23.0133 23.28 24.6032 22.4472 25.2847 20.7059L30.5844 7.3436C31.9473 3.93678 29.4488 0 25.5496 0C23.4297 0 21.3476 1.09775 20.2498 3.78537L15.48 15.5579ZM15.48 15.5579L10.7102 3.78537C9.61235 1.09775 7.53029 0 5.41037 0C1.51123 0 -0.987253 3.93678 0.375554 7.3436L5.67536 20.7059C6.35676 22.4472 7.94671 23.28 9.38523 23.28C10.9373 23.28 12.3001 22.3337 13.1708 20.4788L15.48 15.5579Z" fill="#FFC300"/>
+<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M16 8H30C40.4934 8 49 16.5066 49 27V37C49 47.4934 40.4934 56 30 56H16V8Z" stroke="#FF7A00" stroke-width="5" fill="none"/>
+<path d="M10 24H28M28 24V40H10" stroke="#FF7A00" stroke-width="4" stroke-linecap="round" stroke-linejoin="round" fill="none"/>
 </svg>

+ 1 - 1
src/api/index.ts

@@ -1,4 +1,4 @@
-// DayTask API 统一导出
+// Vitiens API 统一导出
 export * from './auth';
 export * from './user';
 export * from './task';

+ 2 - 8
src/assets/images/common/icon_avatar.svg

@@ -1,11 +1,5 @@
 <svg width="28" height="28" viewBox="0 0 28 28" fill="none" xmlns="http://www.w3.org/2000/svg">
 <rect width="28" height="28" rx="14" fill="#353535"/>
-<g clip-path="url(#clip0_1089_12330)">
-<path d="M14.0137 16.0708L15.2312 18.6717C15.6903 19.6522 16.4089 20.1523 17.2272 20.1523C17.9857 20.1523 18.824 19.7122 19.1834 18.7918L21.9777 11.7291C22.6963 9.92845 21.3789 7.84766 19.3231 7.84766C18.2053 7.84766 17.1075 8.42788 16.5286 9.84842L14.0137 16.0708ZM14.0137 16.0708L11.4987 9.84842C10.9198 8.42788 9.82204 7.84766 8.70428 7.84766C6.64839 7.84766 5.33102 9.92845 6.04958 11.7291L8.844 18.7918C9.20328 19.7122 10.0416 20.1523 10.8001 20.1523C11.6185 20.1523 12.337 19.6522 12.7961 18.6717L14.0137 16.0708Z" fill="white"/>
-</g>
-<defs>
-<clipPath id="clip0_1089_12330">
-<rect width="16.3242" height="12.3047" fill="white" transform="translate(5.85156 7.84766)"/>
-</clipPath>
-</defs>
+<path d="M8 6.5H13.5C17.6421 6.5 21 9.85786 21 14V14C21 18.1421 17.6421 21.5 13.5 21.5H8V6.5Z" stroke="#FF7A00" stroke-width="2" fill="none"/>
+<path d="M6.5 11H13M13 11V17H6.5" stroke="#FF7A00" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" fill="none"/>
 </svg>

+ 2 - 10
src/assets/images/common/logo.svg

@@ -1,12 +1,4 @@
 <svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
-  <!-- 日历图标背景 -->
-  <rect x="8" y="12" width="48" height="44" rx="6" fill="#FFC300"/>
-  <!-- 日历顶部条 -->
-  <rect x="8" y="12" width="48" height="12" rx="6" fill="#FF9500"/>
-  <rect x="8" y="18" width="48" height="6" fill="#FF9500"/>
-  <!-- 日历挂钩 -->
-  <rect x="18" y="6" width="6" height="12" rx="3" fill="#333"/>
-  <rect x="40" y="6" width="6" height="12" rx="3" fill="#333"/>
-  <!-- 勾选标记 -->
-  <path d="M22 36L28 42L42 28" stroke="#333" stroke-width="5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M16 8H30C40.4934 8 49 16.5066 49 27V37C49 47.4934 40.4934 56 30 56H16V8Z" stroke="#FF7A00" stroke-width="5" fill="none"/>
+<path d="M10 24H28M28 24V40H10" stroke="#FF7A00" stroke-width="4" stroke-linecap="round" stroke-linejoin="round" fill="none"/>
 </svg>

+ 6 - 0
src/assets/images/tab/hall.svg

@@ -0,0 +1,6 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="3" y="3" width="7" height="7" rx="1.5" stroke="#555555" stroke-width="1.8"/>
+<rect x="14" y="3" width="7" height="7" rx="1.5" stroke="#555555" stroke-width="1.8"/>
+<rect x="3" y="14" width="7" height="7" rx="1.5" stroke="#555555" stroke-width="1.8"/>
+<rect x="14" y="14" width="7" height="7" rx="1.5" stroke="#555555" stroke-width="1.8"/>
+</svg>

+ 6 - 0
src/assets/images/tab/hall_active.svg

@@ -0,0 +1,6 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="3" y="3" width="7" height="7" rx="1.5" stroke="#ffc300" stroke-width="1.8"/>
+<rect x="14" y="3" width="7" height="7" rx="1.5" stroke="#ffc300" stroke-width="1.8"/>
+<rect x="3" y="14" width="7" height="7" rx="1.5" stroke="#ffc300" stroke-width="1.8"/>
+<rect x="14" y="14" width="7" height="7" rx="1.5" stroke="#ffc300" stroke-width="1.8"/>
+</svg>

+ 4 - 0
src/assets/images/tab/mine.svg

@@ -0,0 +1,4 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="12" cy="8" r="4" stroke="#555555" stroke-width="1.8"/>
+<path d="M4 20C4 16.6863 7.58172 14 12 14C16.4183 14 20 16.6863 20 20" stroke="#555555" stroke-width="1.8" stroke-linecap="round"/>
+</svg>

+ 4 - 0
src/assets/images/tab/mine_active.svg

@@ -0,0 +1,4 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="12" cy="8" r="4" stroke="#ffc300" stroke-width="1.8"/>
+<path d="M4 20C4 16.6863 7.58172 14 12 14C16.4183 14 20 16.6863 20 20" stroke="#ffc300" stroke-width="1.8" stroke-linecap="round"/>
+</svg>

+ 9 - 5
src/components/NavBar/index.vue

@@ -28,13 +28,17 @@ const { t } = useI18n();
 const router = useRouter();
 const route = useRoute();
 
-// 导入图标 - 暂时使用现有图标,后续替换为新图标
+// 导入图标
 import tab1Active from "@/assets/images/tab/tab1_active.svg";
 import tab1 from "@/assets/images/tab/tab1.svg";
 import tab2Active from "@/assets/images/tab/tab2_active.svg";
 import tab2 from "@/assets/images/tab/tab2.svg";
 import tab3Active from "@/assets/images/tab/tab3_active.svg";
 import tab3 from "@/assets/images/tab/tab3.svg";
+import hallActive from "@/assets/images/tab/hall_active.svg";
+import hall from "@/assets/images/tab/hall.svg";
+import mineActive from "@/assets/images/tab/mine_active.svg";
+import mine from "@/assets/images/tab/mine.svg";
 
 const menus = ref([
   {
@@ -46,8 +50,8 @@ const menus = ref([
   {
     titleKey: "tab.hall",
     path: "/hall",
-    icon: tab2Active,
-    iconUn: tab2
+    icon: hallActive,
+    iconUn: hall
   },
   {
     titleKey: "tab.gameShow",
@@ -64,8 +68,8 @@ const menus = ref([
   {
     titleKey: "tab.mine",
     path: "/mine",
-    icon: tab2Active,
-    iconUn: tab2
+    icon: mineActive,
+    iconUn: mine
   }
 ]);
 

+ 10 - 10
src/components/headerView/index.vue

@@ -4,9 +4,9 @@
       <div class="header">
         <div class="left">
           <div class="logo">
-            <span class="logo-icon">&#10024;</span>
-            <span class="logo-day">DAY</span>
-            <span class="logo-task">TASK</span>
+            <img src="@/assets/images/common/logo.svg" alt="Vitiens" class="logo-icon" />
+            <span class="logo-vi">Vi</span>
+            <span class="logo-tiens">tiens</span>
           </div>
         </div>
         <div class="header-right">
@@ -135,17 +135,17 @@ onUnmounted(() => {
         letter-spacing: 0.5px;
 
         .logo-icon {
-          color: #ffc300;
-          margin-right: min(1.067vw, 5px);
-          font-size: min(8vw, 38.4px);
+          width: min(7vw, 32px);
+          height: min(7vw, 32px);
+          margin-right: min(1.5vw, 6px);
         }
 
-        .logo-day {
-          color: #ffc300;
+        .logo-vi {
+          color: #ffffff;
         }
 
-        .logo-task {
-          color: #ffffff;
+        .logo-tiens {
+          color: #ffc300;
         }
       }
     }

+ 2 - 2
src/store/modules/userStore.js

@@ -25,9 +25,9 @@ export const useUserStore = defineStore(
       try {
         const res = await requestGetUserInfo();
         if (res.code === 200) {
-          userInfo.value = res.data;
+          userInfo.value = res.data.user || res.data;
           isLogin.value = true;
-          return res.data;
+          return userInfo.value;
         }
       } catch (e) {
         // 获取失败,可能是未登录

+ 5 - 5
src/views/about/index.vue

@@ -10,18 +10,18 @@
     <!-- Logo和版本 -->
     <div class="app-info">
       <div class="app-logo">
-        <img src="@/assets/images/common/logo.svg" alt="Daytask" />
+        <img src="@/assets/images/common/logo.svg" alt="Vitiens" />
       </div>
-      <div class="app-name">Daytask</div>
+      <div class="app-name">Vitiens</div>
       <div class="app-version">Version {{ version }}</div>
     </div>
 
     <!-- 应用介绍 -->
     <div class="about-content">
       <div class="content-section">
-        <div class="section-title">About Daytask</div>
+        <div class="section-title">About Vitiens</div>
         <div class="section-text">
-          Daytask is a leading task-based earning platform that connects users with
+          Vitiens is a leading task-based earning platform that connects users with
           rewarding opportunities. Complete simple tasks, earn real rewards, and
           withdraw your earnings anytime.
         </div>
@@ -81,7 +81,7 @@
 
     <!-- 版权信息 -->
     <div class="copyright">
-      <p>© 2024 Daytask. All rights reserved.</p>
+      <p>© 2024 Vitiens. All rights reserved.</p>
     </div>
   </div>
 </template>

+ 2 - 2
src/views/contact/index.vue

@@ -92,8 +92,8 @@ import { showToast } from "vant";
 const { t } = useI18n();
 const router = useRouter();
 
-const telegramId = ref('@DaytaskSupport');
-const email = ref('support@daytask.com');
+const telegramId = ref('@VitiensSupport');
+const email = ref('support@vitiens.com');
 
 const openTelegram = () => {
   window.open(`https://t.me/${telegramId.value.replace('@', '')}`, '_blank');

+ 2 - 2
src/views/login/index.vue

@@ -3,9 +3,9 @@
     <!-- Logo区域 -->
     <div class="logo-section">
       <div class="logo">
-        <img src="@/assets/images/common/logo.svg" alt="DayTask" class="logo-img" />
+        <img src="@/assets/images/common/logo.svg" alt="Vitiens" class="logo-img" />
       </div>
-      <div class="title">DayTask</div>
+      <div class="title">Vitiens</div>
       <div class="subtitle">{{ $t('home.taskCenter') }}</div>
     </div>
 

+ 2 - 2
src/views/mine/index.vue

@@ -7,8 +7,8 @@
           <img :src="userInfo?.avatar || defaultAvatar" alt="" />
         </div>
         <div class="info">
-          <div class="username">{{ userInfo?.username || 'User' }}</div>
-          <div class="id">ID: {{ userInfo?.id || '--' }}</div>
+          <div class="username">{{ userInfo?.nickname || userInfo?.username || 'User' }}</div>
+          <div class="id">ID: {{ userInfo?.uid || userInfo?.id || '--' }}</div>
         </div>
       </div>
     </div>