jufubao-third 1.0.22-beta3 → 1.0.22-beta5

package/package.json

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

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/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,19 +155,23 @@
         this.getCoordinatesData();
       },
       /**
-       * @description 根据关键词搜索地点
+       * @description 根据关键词搜索地点(预览模式下底层自动使用Mock.js数据，无需keyword与定位)
        */
       getList(){
-        if (!this.keyword) return;
-        //定位失败时禁止请求搜索接口
-        if (this.locateFailed) {
-          console.warn('定位失败，禁止搜索');
-          return;
+        const isPreview = this.$configProject['isPreview'];
+        //预览模式无需keyword；非预览模式必须有关键词，且定位失败时禁止搜索
+        if (!isPreview) {
+          if (!this.keyword) return;
+          if (this.locateFailed) {
+            console.warn('定位失败，禁止搜索');
+            return;
+          }
         }
         //坐标兼容：mixin返回longitude/latitude，此处映射为接口所需的lng/lat
         const coords = this.currentCoords || {};
         const lng = coords.lng !== undefined ? coords.lng : coords.longitude;
         const lat = coords.lat !== undefined ? coords.lat : coords.latitude;
+        //统一调用jfbRootExec：预览模式底层自动命中Mock.js数据
         jfbRootExec("searchRidePlaces", {
           vm: this,
           data: {
@@ -165,6 +182,7 @@
           }
         }).then(res => {
           this.placeList = (res && res.list) || [];
+          this.locateFailed = false;
         }).catch(err => {
           console.warn('searchRidePlaces error', err);
         });

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
         }
     ]