jufubao-third 1.0.22-beta2 → 1.0.22-beta3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-third",
-  "version": "1.0.22-beta2",
+  "version": "1.0.22-beta3",
   "private": false,
   "description": "聚福宝业务组件第三方购物平台包",
   "main": "index.js",

package/src/components/JfbThirdRideCheckPay/Api.js

@@ -6,15 +6,11 @@
  */
 module.exports = [
   {
-    mapFnName: 'rideOrderList',
-    title: "打车 - 订单列表",
-    path: "/thirdmall/v1/:xnamespace/amapcar/ride/order-list",
+    mapFnName: 'checkUnpaidOrder',
+    title: "查询未支付订单",
+    path: "/thirdmall/v1/order/has-unpaid-order",
     isRule: false,
-    data: {
-      xnamespace: ['业务线', 'String', true],
-      order_type: ['类型', 'COM已完成，ING进行中', true],
-      page_token: ['分页参数', 'String', false],
-      page_size: ['分页大小', 'Number', false],
+    params: {
     },
     isConsole: true,
     disabled: true,

package/src/components/JfbThirdRideCheckPay/JfbThirdRideCheckPay.vue

@@ -19,12 +19,12 @@
       <!-- 预览占位 -->
       <!-- #ifdef H5 -->
       <view v-if="$configProject.isPreview" class="check-pay-placeholder">
-        <text class="check-pay-placeholder__text">出行待支付检查（引用组件）</text>
+        <text class="check-pay-placeholder__text">出行待支付检查占位</text>
       </view>
       <!-- #endif -->
       <!-- 待支付弹窗 -->
-      <view class="check-pay-mask" v-if="showPayModal" @click.stop>
-        <view class="check-pay-modal">
+      <view class="check-pay-mask" v-if="showPayModal" @click="handleClosePayModal">
+        <view class="check-pay-modal" @click.stop>
           <text class="check-pay-modal__text">当前您还有待支付的订单</text>
           <text class="check-pay-modal__text">请先完成支付</text>
           <view class="check-pay-modal__btn" @click="handleGoPay">
@@ -77,26 +77,23 @@
        * @description 检查是否有待支付订单
        */
       checkUnpaidOrder() {
-        jfbRootExec("rideOrderList", {
+        jfbRootExec("checkUnpaidOrder", {
           vm: this,
           data: {
-            xnamespace: this.xnamespace,
-            order_type: 'ING',
-            page_token: '1',
-            page_size: 10
+            xnamespace: this.xnamespace
           }
         }).then(res => {
-          const list = res && res.list || [];
-          // 查找待支付订单（need_pay_price > 0 或 show_status 表示待支付）
-          const unpaid = list.find(item => {
-            return item.need_pay_price > 0 || item.show_status_name === '待支付';
-          });
-          if (unpaid) {
-            this.unpaidOrder = unpaid;
+          // if (res && res.has_unpaid_order) {
             this.showPayModal = true;
-          }
+          // }
         }).catch(() => {})
       },
+      /**
+       * @description 手动关闭待支付弹窗
+       */
+      handleClosePayModal() {
+        this.showPayModal = false;
+      },
       /**
        * @description 点击去支付
        */

package/src/components/JfbThirdRideCheckPay/Mock.js

@@ -1,38 +1,7 @@
 'use strict';
 
 module.exports = {
-  rideOrderList: {
-    "total_size": 1,
-    "next_page_token": "",
-    "list": [
-      {
-        "channel_order_id": "40160320001350016846830466",
-        "pay_order_id": "pay_order_001",
-        "need_pay_price": 500,
-        "user_id": 5000020,
-        "mobile": "",
-        "user_name": "",
-        "start_name": "中国民生银行(北京西客站支行)",
-        "end_name": "清华大学",
-        "ride_type": 1,
-        "ride_type_name": "经济型",
-        "total_fee": 8527,
-        "enterprise_amount": 0,
-        "person_amount": 0,
-        "estimate_price": 10430,
-        "estimate_mileage": 19200,
-        "estimate_time": 2473,
-        "duration": "41",
-        "mileage": "19200",
-        "show_status": 2,
-        "show_status_name": "待支付",
-        "to_order_detail": "N",
-        "order_service_type": 1,
-        "order_service_type_name": "实时单",
-        "request_time": "2026-08-14 16:48:07",
-        "depart_time": 1786697287,
-      }
-    ],
-    "request_id": "8d5f00c80f8d22ce"
+  checkUnpaidOrder: {
+    "has_unpaid_order": false, //返回 true 则禁止下单
   }
 }

package/src/components/JfbThirdRideRecord/Api.js

@@ -18,5 +18,16 @@ module.exports = [
     },
     isConsole: true,
     disabled: true,
+  },
+  {
+    mapFnName: 'orderDetailUrl',
+    title: "订单详情url",
+    path: "/thirdmall-apiuri/v1/order/detail-url/:channel_order_id",
+    isRule: false,
+    params: {
+      channel_order_id: ['订单号', 'String', true],
+    },
+    isConsole: true,
+
   }
 ];

package/src/components/JfbThirdRideRecord/JfbThirdRideRecord.vue

@@ -261,9 +261,25 @@
         jfbRootExec('navigateBack', { vm: this })
       },
       handleCardClick(item) {
-        this.$xdUniHelper.navigateTo({
-          url: this.orderDetailsPath + '?order_id=' + item.channel_order_id
-        })
+        if(item.to_order_detail === 'Y'){
+          this.$xdUniHelper.navigateTo({
+            url: this.orderDetailsPath + '?order_id=' + item.main_order_id
+          })
+        }else{
+          jfbRootExec("orderDetailUrl", {
+            vm: this,
+            data: {
+              channel_order_id: item.channel_order_id,
+              channel_code: "amapcar",
+              business_code: this.xnamespace
+            }
+          }).then(res => {
+            let url = res.value;
+            // #ifdef H5
+            window.location.href = url;
+            // #endif
+          })
+        }
       },
       /**
        * @description 监听事件变化