jufubao-third 1.0.22-beta1 → 1.0.22-beta3

package/package.json

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

package/src/components/JfbThirdRideCheckPay/Api.js

@@ -0,0 +1,18 @@
+'use strict';
+/**
+ * @description  接口配置，
+ * 在设置方法名字当时候，别忘记加上【模块名字】：Ride
+ * @type {*[]}
+ */
+module.exports = [
+  {
+    mapFnName: 'checkUnpaidOrder',
+    title: "查询未支付订单",
+    path: "/thirdmall/v1/order/has-unpaid-order",
+    isRule: false,
+    params: {
+    },
+    isConsole: true,
+    disabled: true,
+  }
+];

package/src/components/JfbThirdRideCheckPay/Attr.js

@@ -0,0 +1,17 @@
+'use strict';
+
+import style from "./cusAttr/style";
+import advanced from "./cusAttr/advanced";
+import content from "./cusAttr/content";
+
+export default {
+  style: [],
+  advanced: [],
+  content: (data, gValue, gColor, oldData={})=>{
+    return [
+      ...content(data, gValue, gColor, oldData),
+      ...style(data, gValue, gColor, oldData),
+      ...advanced(data, gValue, gColor, oldData),
+    ].filter(i=>i)
+  },
+}

package/src/components/JfbThirdRideCheckPay/JfbThirdRideCheckPay.vue

@@ -0,0 +1,217 @@
+<template>
+  <view
+    class="jfb-third-ride-check-pay"
+    @click="handleEditxSelect"
+    :class="{ editx : isEditx && active }"
+  >
+    <!--#ifdef H5-->
+    <view
+      class="jfb-third-ride-check-pay__edit"
+      :class="{ editx : isEditx && active }"
+      v-if="isEditx && active"
+    >
+      <view class="jfb-third-ride-check-pay__edit-icon" @click.stop="delEdit">
+        <xd-font-icon icon="iconshanchu-01" color="#fff" size="30"></xd-font-icon>
+      </view>
+    </view>
+    <!-- #endif -->
+    <view class="jfb-third-ride-check-pay__body">
+      <!-- 预览占位 -->
+      <!-- #ifdef H5 -->
+      <view v-if="$configProject.isPreview" class="check-pay-placeholder">
+        <text class="check-pay-placeholder__text">出行待支付检查占位</text>
+      </view>
+      <!-- #endif -->
+      <!-- 待支付弹窗 -->
+      <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">
+            <text class="check-pay-modal__btn-text">去支付</text>
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+  import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
+  import { jfbRootExec } from "@/utils/xd.event";
+  import JfbThirdRideCheckPayMixin from "./JfbThirdRideCheckPayMixin";
+  import { getContainerPropsValue } from "@/utils/xd.base";
+  import componentsMixins from "@/mixins/componentsMixins";
+  import extsMixins from "@/mixins/extsMixins";
+  export default {
+    name: "JfbThirdRideCheckPay",
+    components: {
+      XdFontIcon
+    },
+    mixins: [
+      componentsMixins, extsMixins, JfbThirdRideCheckPayMixin
+    ],
+    data() {
+      return {
+        xnamespace: '',
+        showPayModal: false,
+        unpaidOrder: null,
+        orderListPath: ''
+      }
+    },
+    watch: {
+      container(value, oldValue) {
+        if (JSON.stringify(value) === JSON.stringify(oldValue)) return;
+        if (this.$configProject['isPreview']) this.init(value)
+      },
+    },
+    created() {
+      this.init(this.container);
+    },
+    methods: {
+      onJfbLoad(options) {
+        this.setNameSpace(options);
+        this.checkUnpaidOrder();
+      },
+      /**
+       * @description 检查是否有待支付订单
+       */
+      checkUnpaidOrder() {
+        jfbRootExec("checkUnpaidOrder", {
+          vm: this,
+          data: {
+            xnamespace: this.xnamespace
+          }
+        }).then(res => {
+          // if (res && res.has_unpaid_order) {
+            this.showPayModal = true;
+          // }
+        }).catch(() => {})
+      },
+      /**
+       * @description 手动关闭待支付弹窗
+       */
+      handleClosePayModal() {
+        this.showPayModal = false;
+      },
+      /**
+       * @description 点击去支付
+       */
+      handleGoPay() {
+        this.showPayModal = false;
+        if (this.orderListPath) {
+          this.$xdUniHelper.redirectTo({
+            url: this.orderListPath + '?type=unpaid'
+          });
+        }
+      },
+      /**
+       * @description 监听事件变化
+       * @param container {object} 业务组件对象自己
+       */
+      init(container) {
+        this.xnamespace = getContainerPropsValue(container, 'content.xnamespace', this.projectAttr.business_code || '');
+        this.orderListPath = getContainerPropsValue(container, 'advanced.orderListPath', {value: ""}).value;
+      },
+      onJfbScroll(options) {
+        console.log('event.onJfbScroll', options)
+      },
+      onJfbReachBottom(options) {
+        console.log('event.onJfbReachBottom', options)
+      },
+      onJfbShow(options) {
+        console.log('event.onJfbShow', options)
+      },
+      onJfbHide(options) {
+        console.log('event.onJfbHide', options)
+      },
+      onJfbBack(options) {
+        console.log('event.onJfbBack', options)
+      },
+      onJfbUpdate(...data) {
+        console.log('event.onJfbUpdate', data)
+      },
+      onJfbCustomEvent(options) {
+        console.log('event.onJfbReachBottom', options)
+      },
+    }
+  }
+
+</script>
+
+<style scoped lang="less">
+  @import "./JfbThirdRideCheckPayLess.less";
+
+  .jfb-third-ride-check-pay {
+    &__body {
+      position: relative;
+    }
+  }
+
+  // 预览占位
+  .check-pay-placeholder {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    padding: 40rpx;
+    background: #F5F5F5;
+    border: 2rpx dashed #DDD;
+    border-radius: 16rpx;
+    margin: 20rpx;
+
+    &__text {
+      font-size: 28rpx;
+      color: #999;
+    }
+  }
+
+  // 遮罩层
+  .check-pay-mask {
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background: rgba(0, 0, 0, 0.5);
+    z-index: 999;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+
+  // 弹窗
+  .check-pay-modal {
+    width: 560rpx;
+    background: #fff;
+    border-radius: 24rpx;
+    padding: 48rpx 40rpx 40rpx;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+
+    &__text {
+      font-size: 30rpx;
+      color: #333;
+      text-align: center;
+      line-height: 1.6;
+      margin-bottom: 8rpx;
+    }
+
+    &__btn {
+      margin-top: 40rpx;
+      width: 240rpx;
+      height: 72rpx;
+      background: #F5A623;
+      border-radius: 36rpx;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+    }
+
+    &__btn-text {
+      font-size: 30rpx;
+      color: #fff;
+      font-weight: 500;
+    }
+  }
+</style>

package/src/components/JfbThirdRideCheckPay/JfbThirdRideCheckPayLess.less

@@ -0,0 +1,80 @@
+/**
+* @desc 获取绝对路径完整地址
+* @param @path
+**/
+//例如：https://image.jufubao.cn/20220501010108/image/bg/default_gonghui_bg.png
+@basePath: 'business/';
+@doMain: '//sandbox-img.jufubao.cn/';
+
+.getBusinessImageUrl(@path, @size: 'size8') {
+  @url: "@{doMain}@{basePath}@{path}?x-oss-process=style/@{size}";
+  background-image: url(@url);
+}
+
+//start
+.jfb-third-ride-check-pay {
+  box-sizing: border-box;
+
+  &__body{
+      position: relative;
+      overflow: hidden;
+      z-index: 2
+  }
+
+  &.editx,&.editx:hover {
+    position: relative;
+    min-height: unit(100, rpx);
+    z-index: 3;
+    &::after {
+      border: 2rpx dashed blue;
+      content: " ";
+      position: absolute;
+      top:0;
+      left:0;
+      bottom:0;
+      right:0;
+      z-index: var(--preview-z-index);
+      cursor: pointer;
+    }
+
+  }
+
+
+  &__edit {
+    cursor: pointer;
+    position: absolute;
+    right: unit(0, rpx);
+    top: unit(0, rpx);
+    height: unit(50, rpx);
+    z-index: 100;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    background: rgba(0, 0, 0, .4);
+    border-radius: 0 0 0 20rpx;
+    box-shadow: 0 0 10px rbga(0, 0, 0, 0.3);
+    color: #fff;
+    font-size: unit(22, rpx);
+    padding: 0 6rpx 0 6px;
+
+    &-icon{
+      padding: 0 unit(20, rpx);
+    }
+
+    &.editx {
+      box-sizing: border-box;
+
+    }
+  }
+}
+//end
+
+
+/**notPreview**/
+.jfb-third-ride-check-pay {
+  //&:before {
+    //content: " ";
+    //display: table;
+  //}
+}
+/**endNotPreview**/

package/src/components/JfbThirdRideCheckPay/JfbThirdRideCheckPayMixin.js

@@ -0,0 +1,30 @@
+'use strict';
+
+
+//@AttrImport
+import Attr from "./Attr";
+//@EndAttrImport
+
+
+export default {
+  data() {
+    return {
+      //#ifdef H5
+      
+      //@AttrData
+      Attr:{}, //对外开发编辑属性
+      //@EndAttrData
+      
+      // #endif
+      cssRoot: 'jfb-third-ride-check-pay'
+    }
+  },
+  created() {
+    
+    //@AttrDataCreated
+    this.Attr = this.$xdUniHelper.customClone(Attr);
+    //@EndAttrDataCreated
+    
+
+  },
+}

package/src/components/JfbThirdRideCheckPay/Mock.js

@@ -0,0 +1,7 @@
+'use strict';
+
+module.exports = {
+  checkUnpaidOrder: {
+    "has_unpaid_order": false, //返回 true 则禁止下单
+  }
+}

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

@@ -0,0 +1,28 @@
+'use strict';
+
+export default (data, gValue, gColor, oldData) => {
+  return [
+    //高级
+    {
+      label: '订单列表跳转路径',
+      groupKey:'advanced',
+      className: 'input100',
+      ele: 'xd-select-pages-path',
+      valueKey: 'orderListPath',
+      placeholder: '请选择订单列表跳转路径',
+      labelInline: true,
+      inline: false,
+      value: data['orderListPath'] || null,
+      setting: {
+        mode:'new',
+        router: XdBus.getParentApi('getPagesTree')
+      },
+    },
+    {
+      label: '',
+      groupKey:'advanced',
+      ele: 'slot',
+      slot: 'is_reference',
+    },
+  ].filter(i=>i)
+}

package/src/components/JfbThirdRideCheckPay/cusAttr/content.js

@@ -0,0 +1,27 @@
+'use strict';
+import { dataVal } from "@/utils/AttrTools";
+
+export default (data, gValue, gColor, oldData) => {
+  return [
+    //内容
+    {
+      label: "业务线",
+      ele: "xd-choose-namespace",
+      valueKey: "xnamespace",
+      value: dataVal({data, key:'xnamespace', dValue:"", gValue}),
+      groupKey:'content',
+      className: 'input80',
+      labelInline:true,
+      placeholder: '请选择业务线',
+      notice: '空继承上级业务线',
+      inline: false,
+      handleCustom: (cb) => {
+        XdBus.getParentApi('getOptionsNamespaces')()
+          .then(res => {
+            cb(res.list)
+          })
+          .catch();
+      }
+    },
+  ].filter(i=>i)
+}

package/src/components/JfbThirdRideCheckPay/cusAttr/style.js

@@ -0,0 +1,7 @@
+'use strict';
+
+export default (data, gValue, gColor, oldData) => {
+  return [
+    //风格
+  ].filter(i=>i)
+}

package/src/components/JfbThirdRideConfirm/Api.js

@@ -6,53 +6,32 @@
  */
 module.exports = [
   {
-    //设置方法名字当别忘记加上【模块名字】：Ride
-    mapFnName: 'getRideByIdFilmSquate',
-    title: '获取电影广场列表',
-    path: '/api/account/film/list-film-square',
+    mapFnName: 'rideEstimatePriceResult',
+    title: "打车 - 查询预估价结果",
+    path: "/thirdmall/v1/:xnamespace/amapcar/ride/estimate-price-result",
     isRule: false,
-    params: {
-      last_key: ['当前页', 'Number', '必选'],
-      page_size: ['每页数量', 'Number', '必选'],
+    data: {
+      xnamespace: ['业务线', 'String', true],
+      estimate_id: ['预估价id', 'String', true],
     },
     isConsole: true,
     disabled: true,
   },
   {
-    //设置方法名字当别忘记加上【模块名字】：Ride
-    mapFnName: 'updateRideFilmPaiqiDate',
-    title: '更新排期',
-    path: '/api/account/film/paiqi-date',
+    mapFnName: 'rideH5Url',
+    title: "打车 - H5跳转",
+    path: "/thirdmall-apiuri/v1/:xnamespace/amapcar/ride/h5-url",
     isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
-      cinema_id: ['影院id', 'Number', '必选'],
+    data: {
+      xnamespace: ['业务线', 'String', true],
+      start_lng: ['起点经度', 'Number', true],
+      start_lat: ['起点纬度', 'Number', true],
+      end_lng: ['终点经度', 'Number', true],
+      end_lat: ['终点纬度', 'Number', true],
+      service_type: ['业务类型: ', '1实时/2预约/3接机/4送机/8代驾', true],
+      ride_types: ['运力类型，逗号分隔（各平台自定义）', 'Number', false],
     },
     isConsole: true,
     disabled: true,
-  },
-  {
-    //设置方法名字当别忘记加上【模块名字】：Ride
-    mapFnName: 'removeRideFilmAddress',
-    title: '删除我的配送地址',
-    path: '/api/account/film/paiqi-date',
-    isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
-  {
-    //设置方法名字当别忘记加上【模块名字】：Ride
-    mapFnName: 'addRideFilmcart',
-    title: '添加购物车',
-    path: '/api/account/film/paiqi-date',
-    isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
+  }
 ];

package/src/components/JfbThirdRideConfirm/Attr.js

@@ -1,48 +1,17 @@
 'use strict';
 
-/**
- * @description 当表单组件中有联动操作时候，使用方法进行返回
- */
+import style from "./cusAttr/style";
+import advanced from "./cusAttr/advanced";
+import content from "./cusAttr/content";
+
 export default {
   style: [],
-  content: (data) => {
+  advanced: [],
+  content: (data, gValue, gColor, oldData={})=>{
     return [
-      {
-        label: '背景颜色:',
-        ele: 'xd-color',
-        valueKey: 'bgColor',
-        value: data.bgColor || '',
-        placeholder: '请输入占位框背景颜色',
-        groupKey:'content',
-      },
-      {
-        label: '选中路径:',
-        groupKey:'advanced',
-        className: 'input100',
-        ele: 'xd-select-pages-path',
-        valueKey: 'select-pages-path',
-        value: data['select-pages-path'] || null,
-        setting: {
-          router: XdBus.getParentApi('getPagesTree')
-        },
-      },
-      data.bgColor && {
-        label: '高度:',
-        ele: 'el-input',
-        groupKey:'style',
-        type: 'number',
-        valueKey: 'height',
-        value: data.height || 100,
-        placeholder: '请输入占位框高度，单位像素，默认：10px',
-        className: 'input60',
-      },
-      {
-        label: '', //label
-        groupKey:'advanced',
-        ele: 'slot', //package 名称
-        slot: 'is_reference',
-      },
+      ...content(data, gValue, gColor, oldData),
+      ...style(data, gValue, gColor, oldData),
+      ...advanced(data, gValue, gColor, oldData),
     ].filter(i=>i)
   },
-  advanced: [],
-};
+}