feat: 订单支付|商品详情调整

src/pages/goods/index.vue

@@ -43,21 +43,24 @@
     </scroll-view>
 
     <!-- 立即抢购 -->
-    <view class="footer">
-      <view class="left">
-        <text class="label">价格：</text>
-        <text class="price">{{ calculatedTotalPrice }}</text>
+    <view class="footer border-top">
+      <view
+        class="amt font-size-20 font-bold color-FF3D60 line-height-28 flex flex-items-center mr-8"
+      >
+        {{ calculatedTotalPrice }}
       </view>
-      <view class="buy-button" @click="showConfirmPopup">立即抢购</view>
-    </view>
 
-    <!-- 商品确认弹窗 -->
-    <GoodConfirm
-      ref="goodConfirmRef"
-      :goodsData="goodsData"
-      @confirm="handleConfirmOrder"
-      @close="handleCloseConfirm"
-    />
+      <view
+        class="btn border-box rounded-10 flex flex-items-center ml-auto pl-8"
+        @click="navigateToPay(goodsData)"
+      >
+        <image
+          class="icon"
+          src="https://oss.nianxx.cn/mp/static/version_101/common/btn.png"
+        />
+        <text class="font-size-16 font-500 color-white">立即预定</text>
+      </view>
+    </view>
 
     <!-- 日历组件 -->
     <Calender
@@ -73,12 +76,8 @@
 <script setup>
 import { ref } from "vue";
 import { onLoad } from "@dcloudio/uni-app";
-import {
-  goodsDetail,
-  commodityDailyPriceList,
-  orderPay,
-} from "@/request/api/GoodsApi";
-import { ThrottleUtils, DateUtils } from "@/utils";
+import { goodsDetail, commodityDailyPriceList } from "@/request/api/GoodsApi";
+import { DateUtils } from "@/utils";
 import TopNavBar from "@/components/TopNavBar/index.vue";
 import ImageSwiper from "@/components/ImageSwiper/index.vue";
 import GoodInfo from "./components/GoodInfo/index.vue";
@@ -94,7 +93,6 @@ import { useSelectedDateStore } from "@/store";
 const navOpacity = ref(0);
 const calendarVisible = ref(false);
 const goodsData = ref({});
-const goodConfirmRef = ref(null);
 
 // 处理滚动事件
 const handleScroll = (e) => {
@@ -160,135 +158,6 @@ const getGoodsDailyPrice = async (params) => {
   priceData.value = res.data;
 };
 
-// 显示确认弹窗
-const showConfirmPopup = () => {
-  // 当商品类型为"0"时，需要校验入住和离店日期
-  if (goodsData.value.commodityTypeCode === "0") {
-    // 检查是否已选择日期
-    if (
-      !selectedDate.value ||
-      !selectedDate.value.startDate ||
-      !selectedDate.value.endDate
-    ) {
-      calendarVisible.value = true;
-
-      uni.showToast({
-        title: "请先选择入住和离店日期",
-        icon: "none",
-        duration: 2000,
-      });
-      return;
-    }
-  }
-
-  // 校验通过或非住宿类商品，显示确认弹窗
-  goodConfirmRef.value?.showPopup();
-};
-
-// 处理确认订单
-const handleConfirmOrder = ThrottleUtils.createThrottle(async (orderData) => {
-  console.log("确认订单---1:", orderData);
-  const { goodsData } = orderData;
-  // 购买的商品id
-  const commodityId = goodsData.commodityId;
-  // 消费者信息
-  const consumerInfoEntityList = orderData.userFormList;
-  // 购买数量
-  const purchaseAmount = orderData.userFormList.length;
-  // 支付方式 0-微信 1-支付宝 2-云闪付
-  const payWay = "0";
-  // 支付渠道 0-app 1-小程序 2-h5
-  const paySource = "1";
-
-  const params = {
-    commodityId,
-    purchaseAmount,
-    payWay,
-    paySource,
-    consumerInfoEntityList,
-  };
-
-  //酒店类型添加入住时间、离店时间
-  if (goodsData.commodityTypeCode === "0" && selectedDate.value) {
-    const { startDate, endDate } = selectedDate.value;
-    // 入住时间
-    params.checkInData = startDate;
-    // 离店时间
-    params.checkOutData = endDate;
-  }
-
-  // 购买数量
-
-  const res = await orderPay(params);
-  console.log("确认订单---2:", res);
-
-  // 检查接口返回数据
-  if (!res || !res.data) {
-    uni.showToast({
-      title: "订单创建失败，请重试",
-      icon: "none",
-      duration: 2000,
-    });
-    return;
-  }
-
-  const { data } = res;
-  const { nonceStr, packageVal, paySign, signType, timeStamp } = data;
-
-  // 验证支付参数是否完整
-  if (!nonceStr || !packageVal || !paySign || !signType || !timeStamp) {
-    console.error("支付参数不完整:", {
-      nonceStr: !!nonceStr,
-      packageVal: !!packageVal,
-      paySign: !!paySign,
-      signType: !!signType,
-      timeStamp: !!timeStamp,
-    });
-    uni.showToast({
-      title: "支付参数错误，请重试",
-      icon: "none",
-      duration: 2000,
-    });
-    return;
-  }
-
-  // 调用微信支付
-  uni.requestPayment({
-    provider: "wxpay",
-    timeStamp: String(timeStamp), // 确保为字符串类型
-    nonceStr: String(nonceStr),
-    package: String(packageVal), // 确保为字符串类型
-    signType: String(signType),
-    paySign: String(paySign),
-    success: (res) => {
-      console.log("支付成功:" + JSON.stringify(res));
-      uni.showToast({
-        title: "支付成功",
-        icon: "success",
-        duration: 2000,
-        success: () => {
-          uni.navigateTo({
-            url: "/pages-order/order/list",
-          });
-        },
-      });
-    },
-    fail: (err) => {
-      console.error("支付失败:" + JSON.stringify(err));
-      uni.showToast({
-        title: "支付失败，请重试",
-        icon: "none",
-        duration: 2000,
-      });
-    },
-  });
-}, 1000);
-
-// 处理关闭弹窗
-const handleCloseConfirm = () => {
-  console.log("关闭确认弹窗");
-};
-
 const selectedDateStore = useSelectedDateStore();
 onLoad(({ commodityId = "1950766939442774018" }) => {
   // 从store中获取选中的日期
@@ -374,6 +243,13 @@ const handleDateSelect = (data) => {
   // 日历组件会自动关闭，无需手动设置
   calendarVisible.value = false;
 };
+
+// 跳转订购
+const navigateToPay = ({ commodityId }) => {
+  uni.navigateTo({
+    url: `/pages-booking/index?commodityId=${commodityId}`,
+  });
+};
 </script>
 
 <style scoped lang="scss">