From 1e9cd792b42d0281d75552a45dd7b1f54ffa3147 Mon Sep 17 00:00:00 2001
From: jqtmviyu <jqtmviyu@gmail.com>
Date: Thu, 8 May 2025 17:05:45 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20:sparkles:=20=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E7=9A=84=E7=AB=8B=E5=8D=B3=E8=B4=AD?=
 =?UTF-8?q?=E4=B9=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/goods/goods.vue           |  6 ++++--
 src/pagesMember/address/address.vue |  4 ++--
 src/pagesOrder/create/create.vue    | 17 ++++++++++++++---
 src/services/order.ts               | 21 +++++++++++++++++++--
 4 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/src/pages/goods/goods.vue b/src/pages/goods/goods.vue
index b10b326..6ca2fd6 100644
--- a/src/pages/goods/goods.vue
+++ b/src/pages/goods/goods.vue
@@ -270,8 +270,10 @@ const handlerAddCart = async (e: SkuPopupEvent) => {
 }
 
 // 立即购买
-const handlerBuyNow = () => {
-  console.log('立即购买')
+const handlerBuyNow = (e: SkuPopupEvent) => {
+  uni.navigateTo({
+    url: `/pagesOrder/create/create?skuId=${e._id}&count=${e.buy_num}`,
+  })
 }
 </script>
 
diff --git a/src/pagesMember/address/address.vue b/src/pagesMember/address/address.vue
index 6139237..b717e83 100644
--- a/src/pagesMember/address/address.vue
+++ b/src/pagesMember/address/address.vue
@@ -79,13 +79,13 @@ const handleDelete = (id: string) => {
 
 // 创建订单时更改地址
 const props = defineProps<{
-  from: string
+  from?: string
 }>()
 
 const useSelectedAddress = useSelectedAddressStore()
 
 const handleSelectAddress = (address: AddressItem) => {
-  if (props.from === 'order') {
+  if (props?.from === 'order') {
     useSelectedAddress.setSelectedAddress(address)
     uni.navigateBack()
   }
diff --git a/src/pagesOrder/create/create.vue b/src/pagesOrder/create/create.vue
index 824e005..c977c54 100644
--- a/src/pagesOrder/create/create.vue
+++ b/src/pagesOrder/create/create.vue
@@ -92,9 +92,8 @@
 </template>
 
 <script setup lang="ts">
-import { getMemberOrderAPI } from '@/services/order'
+import { getMemberOrderPreAPI, getMemberOrderPreNowAPI } from '@/services/order'
 import { useSelectedAddressStore } from '@/stores/modules/selectedAddress'
-import type { AddressItem } from '@/types/address'
 import type { OrderPreResult } from '@/types/order'
 import { onShow } from '@dcloudio/uni-app'
 import { computed, ref } from 'vue'
@@ -120,8 +119,20 @@ const onChangeDelivery: UniHelper.SelectorPickerOnChange = (ev) => {
 
 // 获取预付订单
 const orderPreList = ref<OrderPreResult>()
+const props = defineProps<{
+  skuId?: string
+  count?: number
+}>()
 const getOrderPre = async () => {
-  const res = await getMemberOrderAPI()
+  let res
+  if (props?.skuId && props?.count) {
+    res = await getMemberOrderPreNowAPI({
+      skuId: props.skuId,
+      count: props.count,
+    })
+  } else {
+    res = await getMemberOrderPreAPI()
+  }
   console.log(res)
   if (res.code === '1') {
     orderPreList.value = res.result
diff --git a/src/services/order.ts b/src/services/order.ts
index f7062ae..3bad6bd 100644
--- a/src/services/order.ts
+++ b/src/services/order.ts
@@ -28,11 +28,28 @@ export const orderStateList = [
 ]
 
 /**
- * 获取预付订单
+ * 获取预付订单: 从购物车跳转
  */
-export const getMemberOrderAPI = () => {
+export const getMemberOrderPreAPI = () => {
   return http<OrderPreResult>({
     url: '/member/order/pre',
     method: 'GET',
   })
 }
+
+/**
+ * 获取预付订单-立即购买: 从商品详情页跳转
+ * */
+type getMemberOrderPreNowParams = {
+  skuId: string
+  count: number
+  addressId?: string
+}
+
+export const getMemberOrderPreNowAPI = (data: getMemberOrderPreNowParams) => {
+  return http<OrderPreResult>({
+    url: '/member/order/pre/now',
+    method: 'GET',
+    data,
+  })
+}