Browse Source

feat(app): 新增我的订单页面并优化个人中心页面

EvilDragon 5 months ago
parent
commit
62ce599e37

+ 8 - 0
packages/app/src/pages.json

@@ -276,6 +276,14 @@
       }
     },
     {
+      "path": "pages/mine/orders/index",
+      "type": "page",
+      "style": {
+        "navigationBarTitleText": "我的订单",
+        "navigationBarBackgroundColor": "#fff"
+      }
+    },
+    {
       "path": "pages/mine/points/index",
       "type": "page",
       "style": {

+ 2 - 9
packages/app/src/pages/mine/index.vue

@@ -33,7 +33,7 @@ const { data: taskData, run: getTaskData } = useRequest(() => getTasks({}), {
 const menus = ref([
   { title: '积分明细', icon: integral, path: '/pages/mine/points/index' },
   { title: '优惠券包', icon: coupon, path: '/pages/mine/coupons/index' },
-  { title: '我的订单', icon: order },
+  { title: '我的订单', icon: order, path: '/pages/mine/orders/index' },
   { title: '专属客服', icon: agent },
   { title: '个人设置', icon: setting, path: '/pages/mine/setting/index' },
 ])
@@ -99,7 +99,7 @@ onMounted(async () => {
 })
 const navBarProps = ref({ customClass: 'bg-transparent!' })
 onPageScroll(({ scrollTop }: { scrollTop: number }) => {
-  console.log(scrollTop)
+  // console.log(scrollTop)
   navBarProps.value.customClass = scrollTop === 0 ? 'bg-transparent!' : ''
 })
 </script>
@@ -119,13 +119,6 @@ onPageScroll(({ scrollTop }: { scrollTop: number }) => {
         </wd-button>
       </template>
     </wd-navbar>
-    <!-- <StartMenuButton>
-      <div class="flex">
-        <wd-button type="text" size="small" custom-class="p-0!" :round="false">
-          <wd-img width="25" height="25" :src="scan" custom-class="vertical-bottom"></wd-img>
-        </wd-button>
-      </div>
-    </StartMenuButton> -->
     <div
       class="bg-black/30 backdrop-blur-[60px] flex flex-col justify-end box-border bg-[url(https://image.zhuchaohui.com/zhucaohui/723968e69b86768f546f5df6cf03f25e2aa5c989e4f781a4fe90079dedd39fdd.jpg)]"
       :class="[userInfo.userStatusEnabled ? 'aspect-[0.94/1] pb-44' : 'aspect-[1.15/1] pb-20']"

+ 45 - 0
packages/app/src/pages/mine/orders/index.vue

@@ -0,0 +1,45 @@
+<route lang="json">
+{ "style": { "navigationBarTitleText": "我的订单", "navigationBarBackgroundColor": "#fff" } }
+</route>
+<script setup lang="ts">
+import Card from '@/components/card.vue'
+
+const data = ref([{}, {}, {}])
+</script>
+<template>
+  <div class="flex-grow flex flex-col gap-4 px-3.5 py-5">
+    <template v-for="({}, i) in data" :key="i">
+      <Card>
+        <div class="flex gap-4">
+          <wd-img
+            width="94"
+            height="94"
+            custom-class="rounded-2xl overflow-hidden"
+            src="https://via.placeholder.com/94x94"
+          />
+          <div class="flex flex-col flex-1">
+            <div class="text-black text-base font-normal font-['PingFang SC'] leading-normal">
+              方晓峰
+            </div>
+            <div
+              class="text-start text-black/40 text-sm font-normal font-['PingFang SC'] leading-normal"
+            >
+              x1
+            </div>
+            <div class="flex-1"></div>
+            <div
+              class="text-start text-black/60 text-sm font-normal font-['PingFang SC'] leading-normal"
+            >
+              1600积分
+            </div>
+          </div>
+          <div>
+            <div class="text-black/40 text-sm font-normal font-['PingFang SC'] leading-normal">
+              已完成
+            </div>
+          </div>
+        </div>
+      </Card>
+    </template>
+  </div>
+</template>

+ 0 - 1
packages/app/src/pages/mine/points/index.vue

@@ -2,7 +2,6 @@
 { "style": { "navigationStyle": "custom" } }
 </route>
 <script setup lang="ts">
-import { pageHeaderBg, pageHeaderFilter } from '@designer-hub/assets/src'
 import { back } from '../../../core/utils/router'
 import Card from '@/components/card.vue'
 </script>

+ 1 - 0
packages/app/src/types/uni-pages.d.ts

@@ -30,6 +30,7 @@ interface NavigateToOptions {
        "/pages/mine/convention/index" |
        "/pages/mine/coupons/index" |
        "/pages/mine/homepage/index" |
+       "/pages/mine/orders/index" |
        "/pages/mine/points/index" |
        "/pages/mine/setting/index" |
        "/pages/publish/moment/index" |