jufubao-third 1.0.22-beta2 → 1.0.22-beta4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-third",
-  "version": "1.0.22-beta2",
+  "version": "1.0.22-beta4",
   "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/JfbThirdRideConfirm/JfbThirdRideConfirm.vue

@@ -187,9 +187,7 @@
         this.selectedIndex = index
       },
       handleEdit() {
-        this.$xdUniHelper.redirectTo({
-          url: this.rideDrivePath
-        })
+        this.$xdUniHelper.navigateBack();
       },
       handleCallRide() {
         const car = this.carTypes[this.selectedIndex]
@@ -229,7 +227,6 @@
        */
       init(container) {
         this.xnamespace = getContainerPropsValue(container, 'content.xnamespace', this.projectAttr.business_code || '');
-        this.rideDrivePath = getContainerPropsValue(container, 'content.rideDrivePath', {value: ""}).value;
       },
       onJfbScroll(options) {
         console.log('event.onJfbScroll', options)

package/src/components/JfbThirdRideConfirm/cusAttr/advanced.js

@@ -3,20 +3,5 @@
 export default (data, gValue, gColor, oldData) => {
   return [
     //高级
-    {
-      label: '重选出行路线',
-      groupKey:'advanced',
-      className: 'input100',
-      ele: 'xd-select-pages-path',
-      valueKey: 'rideDrivePath',
-      placeholder: '请选择重选出行路线跳转路径',
-      labelInline: true,
-      inline: false,
-      value: data['rideDrivePath'] || null,
-      setting: {
-        mode:'new',
-        router: XdBus.getParentApi('getPagesTree')
-      },
-    },
   ].filter(i=>i)
 }

package/src/components/JfbThirdRideHome/Api.js

@@ -35,7 +35,7 @@ module.exports = [
       start_address: ['起始地址', 'String', '必选'],
       end_address: ['结束地址', 'String', '必选'],
       service_type: ['业务类型: 1实时/2预约/3接机/4送机/8代驾', 'String', '必选'],
-      ride_types: ['运力类型', 'String', '必选','1,12,3,4,15'],
+      ride_types: ['运力类型', 'String', '必选','1,12,3,4'],
       departure_time: ['出发时间', 'String', '可选'],
     },
     isConsole: true,

package/src/components/JfbThirdRideHome/JfbThirdRideHome.vue

@@ -500,7 +500,7 @@
           start_address: start.address || '',
           end_address: end.address || '',
           service_type: this.tabIndex === 0 ? 1 : 2,
-          ride_types: '1,12,3,4,15',
+          ride_types: '1,12,3,4',
         };
         //仅预约用车才传departure_time(所选时间的13位毫秒时间戳)；现在用车不传
         if (this.tabIndex !== 0) {
@@ -510,7 +510,7 @@
           .then(res => {
             //接口返回 {list:[{name,address,lng,lat,distance}]}
             console.log('getRideEstimatePrice result', res);
-            this.$xdUniHelper.redirectTo({
+            this.$xdUniHelper.navigateTo({
               url: this.rideConfirmPath + `?estimate_id=${res.estimate_id}`
             })
           })

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 监听事件变化

package/src/components/JfbThirdRideStartEnd/JfbThirdRideStartEnd.vue

@@ -99,11 +99,11 @@
       },
     },
     created() {
-      this.init(this.container);
-      this.getCoordinatesData();
+        this.init(this.container);
+        this.initPlaces();
 
-      //todo
-    },
+        //todo
+      },
     methods: {
       onJfbLoad(options) {
         //解析上一页跳转传参 type(起点start/终点end)
@@ -119,6 +119,19 @@
         this.xnamespace = gCPVal(container, 'xnamespace', '');
         // this.selectToLocationPath = gCPVal(container, 'content.selectToLocationPath', {value: ""}).value;
       },
+      /**
+       * @description 初始化地点列表：预览模式不请求定位、不判断定位失败，默认展示接口mock数据；非预览模式按定位逻辑
+       */
+      initPlaces(){
+        //预览模式：跳过定位，直接通过jfbRootExec加载mock列表(底层自动命中Mock.js数据)
+        if (this.$configProject['isPreview']) {
+          this.locateFailed = false;
+          this.getList();
+          return;
+        }
+        //非预览模式：请求定位
+        this.getCoordinatesData();
+      },
       /**
        * @description 获取定位信息：成功则进入正常页面，失败则显示失败页
        */
@@ -142,9 +155,27 @@
         this.getCoordinatesData();
       },
       /**
-       * @description 根据关键词搜索地点
+       * @description 根据关键词搜索地点(预览模式下底层自动使用Mock.js数据，无需keyword与定位)
        */
       getList(){
+        //预览模式：加载默认mock数据，不校验keyword、不校验定位
+        if (this.$configProject['isPreview']) {
+          jfbRootExec("searchRidePlaces", {
+            vm: this,
+            data: {
+              channel_code: "amapcar",
+              keyword: '',
+              lng: '',
+              lat: '',
+            }
+          }).then(res => {
+            this.placeList = (res && res.list) || [];
+            this.locateFailed = false;
+          }).catch(err => {
+            console.warn('searchRidePlaces error', err);
+          });
+          return;
+        }
         if (!this.keyword) return;
         //定位失败时禁止请求搜索接口
         if (this.locateFailed) {

package/src/components/JfbThirdRideStartEnd/Mock.js

@@ -5,10 +5,10 @@ module.exports = {
   searchRidePlaces:{
     "list": [
         {
-            "name": "string",
-            "address": "string",
-            "lng": "string",
-            "lat": "string",
+            "name": "故宫",
+            "address": "北京市故宫路",
+            "lng": "116.397428",
+            "lat": "39.90923",
             "distance": 0
         }
     ]