jufubao-base 1.0.232-beta2 → 1.0.232-beta4

package/src/components/JfbBaseRechargeOrder/JfbBaseRechargeOrder.vue

@@ -10,9 +10,7 @@
       :class="{ editx: isEditx && active }"
       v-if="isEditx && active"
     >
-      <view class="jfb-base-recharge-order__edit-icon" @click="delEdit"
-        >删除</view
-      >
+      <view class="jfb-base-recharge-order__edit-icon" @click="delEdit">删除</view>
     </view>
     <!-- #endif -->
     <view class="jfb-base-recharge-order__body">
@@ -67,16 +65,11 @@
             }"
           >
             <view class="jfb-base-recharge-order__body-order-header">
-              {{ type === "recharge" ? "充值订单" : "延期订单" }}
+              {{ item.rechargeType === "recharge" ? "充值订单" : "延期订单" }}
             </view>
             <view class="jfb-base-recharge-order__body-order-middle">
-              <view
-                >订单编号：
-                {{ item.order_id }}
-              </view>
-              <view :style="{ color: item.textColor }">
-                {{ item.pay_status_name }}
-              </view>
+              <view>订单编号： {{ item.order_id }}</view>
+              <view :style="{ color: item.textColor }">{{ item.pay_status_name }}</view>
             </view>
             <view class="jfb-base-recharge-order__body-order-bottom">
               <view>交易日期：{{ item.created_time }} </view>
@@ -158,13 +151,7 @@ export default {
       is_border_c: "",
 
       //其他
-      margin: {
-        top: 0,
-        left: 0,
-        right: 0,
-        bottom: 0,
-      },
-      type: "recharge",
+      margin: {top: 0, left: 0, right: 0, bottom: 0,},
     };
   },
   watch: {
@@ -175,11 +162,7 @@ export default {
   },
   computed: {
     outMargin() {
-      let str = `${this.checkValue(this.margin.top, 20)}rpx`;
-      str = `${str} ${this.checkValue(this.margin.right, 20)}rpx`;
-      str = `${str} ${this.checkValue(this.margin.bottom, 20)}rpx`;
-      str = `${str} ${this.checkValue(this.margin.left, 20)}rpx`;
-      return str;
+      return this.getMarginAndPadding(this.margin, 20)
     },
     shadowBox() {
       if (this.is_shadow === "Y")
@@ -197,7 +180,6 @@ export default {
   },
   methods: {
     onJfbLoad(options) {
-      this.type = options.type || "recharge";
       this.getList();
     },
     /**
@@ -205,12 +187,7 @@ export default {
      * @param container {object} 业务组件对象自己
      */
     init(container) {
-      this.margin = getContainerPropsValue(container, "content.margin", {
-        top: 0,
-        left: 0,
-        right: 0,
-        bottom: 0,
-      });
+      this.margin = getContainerPropsValue(container, "content.margin", {top: 0,left: 0,right: 0,bottom: 0});
       this.radius = getContainerPropsValue(container, "content.radius", 0);
       this.backgroundColor = getContainerPropsValue(
         container,
@@ -260,8 +237,7 @@ export default {
       }).value;
     },
     getList() {
-      let fnName = this.type === "recharge" ? "getRechargeOrderList" : "getDelayOrderList";
-      jfbRootExec(fnName, {
+      jfbRootExec('getRechargeOrderList', {
         vm: this,
         data: {
           page_size: this.page_size,
@@ -282,6 +258,12 @@ export default {
             } else {
               item.textColor = "#FA5C5C";
             }
+
+            //订单设置
+            item['rechargeType'] = item.source;
+            if(['new-recharge','recharge'].includes(item.source)) {
+              item['rechargeType'] = 'recharge'
+            }
             return item;
           });
           this.hasNext = res.next_page_token !== "";
@@ -293,12 +275,12 @@ export default {
     },
     handleToPay(item) {
       this.$xdUniHelper.navigateTo({
-        url: `${this.payPath}?order_id=${item.pay_order_id}&main_order_id=${item.order_id}&type=${this.type}`,
+        url: `${this.payPath}?order_id=${item.pay_order_id}&main_order_id=${item.order_id}&type=${item.rechargeType}`,
       });
     },
     handleToDetail(item) {
       this.$xdUniHelper.navigateTo({
-        url: `${this.detailPath}?id=${item.order_id}&type=${this.type}`,
+        url: `${this.detailPath}?id=${item.order_id}&type=${item.rechargeType}`,
       });
     },
 

package/src/components/JfbBaseSavingDetail/Api.js

@@ -0,0 +1,58 @@
+'use strict';
+/**
+ * @description  接口配置，
+ * 在设置方法名字当时候，别忘记加上【模块名字】：Saving
+ * @type {*[]}
+ */
+module.exports = [
+  {
+    //设置方法名字当别忘记加上【模块名字】：Saving
+    mapFnName: 'getSavingByIdFilmSquate',
+    title: '获取电影广场列表',
+    path: '/api/account/film/list-film-square',
+    isRule: false,
+    params: {
+      last_key: ['当前页', 'Number', '必选'],
+      page_size: ['每页数量', 'Number', '必选'],
+    },
+    isConsole: true,
+    disabled: true,
+  },
+  {
+    //设置方法名字当别忘记加上【模块名字】：Saving
+    mapFnName: 'updateSavingFilmPaiqiDate',
+    title: '更新排期',
+    path: '/api/account/film/paiqi-date',
+    isRule: false,
+    params: {
+      film_id: ['电影id', 'Number', '必选'],
+      cinema_id: ['影院id', 'Number', '必选'],
+    },
+    isConsole: true,
+    disabled: true,
+  },
+  {
+    //设置方法名字当别忘记加上【模块名字】：Saving
+    mapFnName: 'removeSavingFilmAddress',
+    title: '删除我的配送地址',
+    path: '/api/account/film/paiqi-date',
+    isRule: false,
+    params: {
+      film_id: ['电影id', 'Number', '必选'],
+    },
+    isConsole: true,
+    disabled: true,
+  },
+  {
+    //设置方法名字当别忘记加上【模块名字】：Saving
+    mapFnName: 'addSavingFilmcart',
+    title: '添加购物车',
+    path: '/api/account/film/paiqi-date',
+    isRule: false,
+    params: {
+      film_id: ['电影id', 'Number', '必选'],
+    },
+    isConsole: true,
+    disabled: true,
+  },
+];

package/src/components/JfbBaseSavingDetail/Attr.js

@@ -0,0 +1,48 @@
+'use strict';
+
+/**
+ * @description 当表单组件中有联动操作时候，使用方法进行返回
+ */
+export default {
+  style: [],
+  content: (data) => {
+    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',
+      },
+    ].filter(i=>i)
+  },
+  advanced: [],
+};

package/src/components/JfbBaseSavingDetail/JfbBaseSavingDetail.vue

@@ -0,0 +1,111 @@
+<template>
+  <view
+    class="jfb-base-saving-detail"
+    @click="handleEditxSelect"
+    :class="{ editx : isEditx && active }"
+  >
+    <!--#ifdef H5-->
+    <view
+      class="jfb-base-saving-detail__edit"
+      :class="{ editx : isEditx && active }"
+      v-if="isEditx && active"
+    >
+      <view class="jfb-base-saving-detail__edit-icon" @click="delEdit">删除</view>
+    </view>
+    <!-- #endif -->
+    <view class="jfb-base-saving-detail__body">
+      <view>测试插件( {{containerId}} )</view>
+    </view>
+  </view>
+</template>
+
+<script>
+  import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
+  import { jfbRootExec } from "@/utils/xd.event";
+  import JfbBaseSavingDetailMixin from "./JfbBaseSavingDetailMixin";
+  import { getContainerPropsValue } from "@/utils/xd.base";
+  import componentsMixins from "@/mixins/componentsMixins";
+  import extsMixins from "@/mixins/extsMixins";
+  export default {
+    name: "JfbBaseSavingDetail",
+    components: {
+      XdFontIcon
+    },
+    mixins: [
+      componentsMixins, extsMixins, JfbBaseSavingDetailMixin
+    ],
+    data() {
+      return {
+
+        //todo
+      }
+    },
+    watch: {
+      container(value, oldValue) {
+        if (JSON.stringify(value) === JSON.stringify(oldValue)) return;
+        if (this.$configProject['isPreview']) this.init(value)
+      },
+    },
+    created() {
+      this.init(this.container);
+
+      //todo
+    },
+    methods: {
+      onJfbLoad(options) {
+
+        // jfbRootExec('baiduUserLogin', {
+
+        //   vm: this,//   data: {
+
+        //     account: 'gaoshiyong',//     password: '123456789',//     type: 3,//     ...options
+
+        //   }
+
+        // }).then().catch()
+      },
+      /**
+       * @description 监听事件变化
+       * @param container {object} 业务组件对象自己
+       */
+      init(container) {
+
+        //this.bgcolor = getContainerPropsValue(container, 'content.bgcolor', '#fff');
+
+        //this.height = getContainerPropsValue(container, 'content.height', 10);
+      },
+      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 "./JfbBaseSavingDetailLess.less";
+
+  .jfb-base-saving-detail {
+    &__body{
+
+    }
+  }
+</style>

package/src/components/JfbBaseSavingDetail/JfbBaseSavingDetailLess.less

@@ -0,0 +1,79 @@
+/**
+* @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-base-saving-detail {
+  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: 4;
+      cursor: pointer;
+    }
+
+  }
+
+
+  &__edit {
+    cursor: pointer;
+    position: absolute;
+    right: unit(0, rpx);
+    top: unit(-52, rpx);
+    height: unit(50, rpx);
+    line-height: unit(50, rpx);
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    background: rgba(0, 0, 0, .6);
+    border-radius: unit(10, rpx);
+    box-shadow: 0 0 10px rbga(0, 0, 0, 0.3);
+    color: #fff;
+    font-size: unit(22, rpx);
+
+    &-icon{
+      padding: 0 unit(20, rpx);
+    }
+
+    &.editx {
+      box-sizing: border-box;
+
+    }
+  }
+}
+//end
+
+
+/**notPreview**/
+.jfb-base-saving-detail {
+  //&:before {
+    //content: " ";
+    //display: table;
+  //}
+}
+/**endNotPreview**/

package/src/components/JfbBaseSavingDetail/JfbBaseSavingDetailMixin.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-base-saving-detail'
+    }
+  },
+  created() {
+    
+    //@AttrDataCreated
+    this.Attr = this.$xdUniHelper.customClone(Attr);
+    //@EndAttrDataCreated
+    
+
+  },
+}

package/src/components/JfbBaseSavingDetail/Mock.js

@@ -0,0 +1,13 @@
+'use strict';
+
+module.exports = {
+  
+  getSavingByIdFilmSquate:{},
+  
+  updateSavingFilmPaiqiDate:{},
+  
+  removeSavingFilmAddress:{},
+  
+  addSavingFilmcart:{},
+  
+}

package/src/components/JfbBaseShare/Api.js

@@ -0,0 +1,58 @@
+'use strict';
+/**
+ * @description  接口配置，
+ * 在设置方法名字当时候，别忘记加上【模块名字】：Share
+ * @type {*[]}
+ */
+module.exports = [
+  {
+    //设置方法名字当别忘记加上【模块名字】：Share
+    mapFnName: 'getShareByIdFilmSquate',
+    title: '获取电影广场列表',
+    path: '/api/account/film/list-film-square',
+    isRule: false,
+    params: {
+      last_key: ['当前页', 'Number', '必选'],
+      page_size: ['每页数量', 'Number', '必选'],
+    },
+    isConsole: true,
+    disabled: true,
+  },
+  {
+    //设置方法名字当别忘记加上【模块名字】：Share
+    mapFnName: 'updateShareFilmPaiqiDate',
+    title: '更新排期',
+    path: '/api/account/film/paiqi-date',
+    isRule: false,
+    params: {
+      film_id: ['电影id', 'Number', '必选'],
+      cinema_id: ['影院id', 'Number', '必选'],
+    },
+    isConsole: true,
+    disabled: true,
+  },
+  {
+    //设置方法名字当别忘记加上【模块名字】：Share
+    mapFnName: 'removeShareFilmAddress',
+    title: '删除我的配送地址',
+    path: '/api/account/film/paiqi-date',
+    isRule: false,
+    params: {
+      film_id: ['电影id', 'Number', '必选'],
+    },
+    isConsole: true,
+    disabled: true,
+  },
+  {
+    //设置方法名字当别忘记加上【模块名字】：Share
+    mapFnName: 'addShareFilmcart',
+    title: '添加购物车',
+    path: '/api/account/film/paiqi-date',
+    isRule: false,
+    params: {
+      film_id: ['电影id', 'Number', '必选'],
+    },
+    isConsole: true,
+    disabled: true,
+  },
+];

package/src/components/JfbBaseShare/Attr.js

@@ -0,0 +1,48 @@
+'use strict';
+
+/**
+ * @description 当表单组件中有联动操作时候，使用方法进行返回
+ */
+export default {
+  style: [],
+  content: (data) => {
+    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',
+      },
+    ].filter(i=>i)
+  },
+  advanced: [],
+};