Merge branch 'main' of https://github.com/omnia96/designer-hub

packages/app/src/pages.json

@@ -245,6 +245,14 @@
       }
     },
     {
+      "path": "pages/mine/agents/index",
+      "type": "page",
+      "style": {
+        "navigationBarTitleText": "客服",
+        "navigationBarBackgroundColor": "#fff"
+      }
+    },
+    {
       "path": "pages/mine/authentication/index",
       "type": "page",
       "style": {
@@ -314,6 +322,14 @@
       }
     },
     {
+      "path": "pages/mine/orders/detail/index",
+      "type": "page",
+      "style": {
+        "navigationBarTitleText": "订单详情",
+        "navigationBarBackgroundColor": "#fff"
+      }
+    },
+    {
       "path": "pages/mine/authentication/submit/success/index",
       "type": "page",
       "style": {

packages/app/src/pages/mine/agents/index.vue

@@ -0,0 +1,53 @@
+<route lang="json">
+{ "style": { "navigationBarTitleText": "客服", "navigationBarBackgroundColor": "#fff" } }
+</route>
+<script setup lang="ts">
+import Card from '@/components/card.vue'
+import { materialDealers, close, phone } from '../../../core/libs/svgs'
+
+const data = ref([{}, {}, {}])
+const handleClick = () => {
+  uni.navigateTo({ url: '/pages/mine/orders/detail/index' })
+}
+const handleCall = (phone: string) => {
+  uni.makePhoneCall({ phoneNumber: phone })
+}
+</script>
+<template>
+  <div class="flex-grow flex flex-col gap-4 px-3.5 py-6">
+    <template v-for="({}, i) in data" :key="i">
+      <div>
+        <Card>
+          <div class="flex gap-4">
+            <wd-img
+              round
+              width="63"
+              height="63"
+              src="https://image.zhuchaohui.com/zhucaohui/d3a335ede20d72ebf873e1b2ebd4835749dde2b694a08dfdffd1781973e3df21.png"
+            />
+            <div class="flex flex-col flex-1 justify-around">
+              <div
+                class="text-start text-black/40 text-lg font-normal font-['PingFang SC'] leading-normal"
+              >
+                王玉辉
+              </div>
+              <div class="text-black/40 text-sm font-normal font-['PingFang SC'] leading-normal">
+                平台客服
+              </div>
+            </div>
+            <div class="flex items-center">
+              <wd-button
+                type="text"
+                size="small"
+                custom-class=" bg-[#f2f2f2]! p-0! ml-4"
+                @click="handleCall('')"
+              >
+                <wd-img width="28" height="28" :src="phone"></wd-img>
+              </wd-button>
+            </div>
+          </div>
+        </Card>
+      </div>
+    </template>
+  </div>
+</template>

packages/app/src/pages/mine/index.vue

@@ -34,7 +34,7 @@ const menus = ref([
   { title: '积分明细', icon: integral, path: '/pages/mine/points/index' },
   { title: '优惠券包', icon: coupon, path: '/pages/mine/coupons/index' },
   { title: '我的订单', icon: order, path: '/pages/mine/orders/index' },
-  { title: '专属客服', icon: agent },
+  { title: '专属客服', icon: agent, path: '/pages/mine/agents/index' },
   { title: '个人设置', icon: setting, path: '/pages/mine/setting/index' },
 ])
 const pieces = ref([

packages/app/src/pages/mine/orders/detail/index.vue

@@ -0,0 +1,55 @@
+<route lang="json">
+{ "style": { "navigationBarTitleText": "订单详情", "navigationBarBackgroundColor": "#fff" } }
+</route>
+<script setup lang="ts">
+import SectionHeading from '@/components/section-heading.vue'
+const data = ref([{}, {}, {}])
+</script>
+<template>
+  <div class="flex-grow flex flex-col gap-4 px-3.5 bg-white">
+    <div class="h-8.5 flex items-center justify-center mx--3.5 box-border bg-[#ffecec]">
+      <div
+        class="text-right text-[#ef4343] text-sm font-normal font-['PingFang SC'] leading-normal"
+      >
+        已完成
+      </div>
+    </div>
+    <div class="flex gap-4 border-b border-b-solid border-b-[#f2f2f2] pb-5">
+      <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>
+    <SectionHeading title="订单金额" size="sm" end-text="¥ 200"></SectionHeading>
+    <SectionHeading title="总积分" size="sm" end-text="¥ 200"></SectionHeading>
+    <SectionHeading title="实际支付积分" size="sm" end-text="¥ 200"></SectionHeading>
+    <SectionHeading title="订单号" size="sm" end-text="¥ 200"></SectionHeading>
+    <SectionHeading title="支付时间" size="sm" end-text="¥ 200"></SectionHeading>
+    <SectionHeading title="支付方式" size="sm" end-text="¥ 200"></SectionHeading>
+    <div class="flex-1"></div>
+    <div><wd-button :round="false" block>取消订单</wd-button></div>
+  </div>
+</template>

packages/app/src/pages/mine/orders/index.vue

@@ -5,41 +5,46 @@
 import Card from '@/components/card.vue'
 
 const data = ref([{}, {}, {}])
+const handleClick = () => {
+  uni.navigateTo({ url: '/pages/mine/orders/detail/index' })
+}
 </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 @click="handleClick">
+        <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
-              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 class="text-black/40 text-sm font-normal font-['PingFang SC'] leading-normal">
+                已完成
+              </div>
             </div>
           </div>
-        </div>
-      </Card>
+        </Card>
+      </div>
     </template>
   </div>
 </template>

packages/app/src/types/uni-pages.d.ts

@@ -26,6 +26,7 @@ interface NavigateToOptions {
        "/pages/material/mini-class/index" |
        "/pages/material/recommend/index" |
        "/pages/material/settled-in/index" |
+       "/pages/mine/agents/index" |
        "/pages/mine/authentication/index" |
        "/pages/mine/convention/index" |
        "/pages/mine/coupons/index" |
@@ -35,6 +36,7 @@ interface NavigateToOptions {
        "/pages/mine/setting/index" |
        "/pages/publish/moment/index" |
        "/pages/publish/tags/index" |
+       "/pages/mine/orders/detail/index" |
        "/pages/mine/authentication/submit/success/index";
 }
 interface RedirectToOptions extends NavigateToOptions {}