jufubao-base 1.0.302-beta1 → 1.0.302-beta2

package/src/components/JfbBaseInvoiceConfirm/Api.js

@@ -7,50 +7,16 @@
 module.exports = [
   {
     //设置方法名字当别忘记加上【模块名字】：Invoice
-    mapFnName: 'getInvoiceByIdFilmSquate',
-    title: '获取电影广场列表',
-    path: '/api/account/film/list-film-square',
+    mapFnName: 'userInvoiceSubmit',
+    title: '用户开票 - 申请开票',
+    path: '/pay/v1/user-invoice/submit',
     isRule: false,
-    params: {
-      last_key: ['当前页', 'Number', '必选'],
-      page_size: ['每页数量', 'Number', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
-  {
-    //设置方法名字当别忘记加上【模块名字】：Invoice
-    mapFnName: 'updateInvoiceFilmPaiqiDate',
-    title: '更新排期',
-    path: '/api/account/film/paiqi-date',
-    isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
-      cinema_id: ['影院id', 'Number', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
-  {
-    //设置方法名字当别忘记加上【模块名字】：Invoice
-    mapFnName: 'removeInvoiceFilmAddress',
-    title: '删除我的配送地址',
-    path: '/api/account/film/paiqi-date',
-    isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
-  {
-    //设置方法名字当别忘记加上【模块名字】：Invoice
-    mapFnName: 'addInvoiceFilmcart',
-    title: '添加购物车',
-    path: '/api/account/film/paiqi-date',
-    isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
+    data: {
+      main_order_id: ['订单编号', 'Number', '必选'],
+      pay_order_id: ['支付订单号', 'Number', '必选'],
+      email: ['邮箱', 'Number', '必选'],
+      invoice_header: ['发票抬头', 'Number', '必选'],
+      invoice_header_type: ['发票抬头类型', 'Number', '必选'],
     },
     isConsole: true,
     disabled: true,

package/src/components/JfbBaseInvoiceConfirm/Attr.js

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

package/src/components/JfbBaseInvoiceConfirm/JfbBaseInvoiceConfirm.vue

@@ -2,110 +2,207 @@
   <view
     class="jfb-base-invoice-confirm"
     @click="handleEditxSelect"
-    :class="{ editx : isEditx && active }"
+    :class="{ editx: isEditx && active }"
   >
     <!--#ifdef H5-->
     <view
       class="jfb-base-invoice-confirm__edit"
-      :class="{ editx : isEditx && active }"
+      :class="{ editx: isEditx && active }"
       v-if="isEditx && active"
     >
-      <view class="jfb-base-invoice-confirm__edit-icon" @click="delEdit">删除</view>
+      <view class="jfb-base-invoice-confirm__edit-icon" @click="delEdit"
+        >删除</view
+      >
     </view>
     <!-- #endif -->
-    <view class="jfb-base-invoice-confirm__body">
-      <view>测试插件( {{containerId}} )</view>
+    <view
+      class="jfb-base-invoice-confirm__body"
+      :style="{ minHeight: layoutInfo.bodyMinHeightRpx + 'rpx' }"
+    >
+     
     </view>
   </view>
 </template>
 
 <script>
-  import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
-  import { jfbRootExec } from "@/utils/xd.event";
-  import JfbBaseInvoiceConfirmMixin from "./JfbBaseInvoiceConfirmMixin";
-  import { getContainerPropsValue } from "@/utils/xd.base";
-  import componentsMixins from "@/mixins/componentsMixins";
-  import extsMixins from "@/mixins/extsMixins";
-  export default {
-    name: "JfbBaseInvoiceConfirm",
-    components: {
-      XdFontIcon
+import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
+import { jfbRootExec } from "@/utils/xd.event";
+import JfbBaseInvoiceConfirmMixin from "./JfbBaseInvoiceConfirmMixin";
+import { getContainerPropsValue } from "@/utils/xd.base";
+import componentsMixins from "@/mixins/componentsMixins";
+import extsMixins from "@/mixins/extsMixins";
+export default {
+  name: "JfbBaseInvoiceConfirm",
+  components: {
+    XdFontIcon,
+  },
+  mixins: [componentsMixins, extsMixins, JfbBaseInvoiceConfirmMixin],
+  data() {
+    return {
+      confirmPath: "",
+      invoicePath: "",
+      main_order_id: "",
+      pay_order_id: "",
+      invoice_amount: 0,
+      invoice_header_type: "",
+      invoice_header: "",
+      phone_number: "",
+      invoice_number: "",
+      email: "",
+    };
+  },
+  computed: {
+    prod_bottom() {
+      return this.fixedStyle({ height: 0, zIndex: 111 });
     },
-    mixins: [
-      componentsMixins, extsMixins, JfbBaseInvoiceConfirmMixin
-    ],
-    data() {
+    btnStyle() {
       return {
-
-        //todo
-      }
+        color: this.mainColor,
+        border: `1px solid ${this.mainColor}`,
+      };
     },
-    watch: {
-      container(value, oldValue) {
-        if (JSON.stringify(value) === JSON.stringify(oldValue)) return;
-        if (this.$configProject['isPreview']) this.init(value)
-      },
+  },
+  watch: {
+    container(value, oldValue) {
+      if (JSON.stringify(value) === JSON.stringify(oldValue)) return;
+      if (this.$configProject["isPreview"]) this.init(value);
     },
-    created() {
-      this.init(this.container);
+  },
+  created() {
+    this.init(this.container);
 
-      //todo
+    //todo
+  },
+  methods: {
+    onJfbLoad(options) {
+      this.main_order_id = options.main_order_id;
+      this.pay_order_id = options.pay_order_id;
+      this.invoice_amount = options.invoice_amount;
+      this.invoice_header_type = options.invoice_header_type;
+      this.invoice_header = options.invoice_header;
+      this.phone_number = options.phone_number;
+      this.invoice_number = options.invoice_number;
+      this.email = options.email;
+      // jfbRootExec('baiduUserLogin', {
+      //   vm: this,//   data: {
+      //     account: 'gaoshiyong',//     password: '123456789',//     type: 3,//     ...options
+      //   }
+      // }).then().catch()
     },
-    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)
-      },
-    }
-  }
-
+    /**
+     * @description 监听事件变化
+     * @param container {object} 业务组件对象自己
+     */
+    init(container) {
+      this.confirmPath = getContainerPropsValue(
+        container,
+        "content.confirmPath",
+        { value: "" }
+      ).value;
+      this.invoicePath = getContainerPropsValue(
+        container,
+        "content.invoicePath",
+        { value: "" }
+      ).value;
+    },
+    handleConfirm() {
+      //调用确认提交接口并跳转详情页面
+      jfbRootExec("userInvoiceSubmit", {
+        vm: this,
+        data: {
+          main_order_id: this.main_order_id,
+          pay_order_id: this.pay_order_id,
+          email: this.email,
+          invoice_header_type: this.invoice_header_type,
+          invoice_header: this.invoice_header,
+          phone_number: this.phone_number,
+          invoice_number: this.invoice_number,
+        },
+      }).then((res) => {
+        let params = {
+          main_order_id: this.main_order_id,
+          pay_order_id: this.pay_order_id,
+        };
+        params = this.convertObjToQueryString(params);
+        params = this.$xdUniHelper.navigateTo({
+          url: `${this.detailPath}?${params}`,
+        });
+      });
+    },
+    handleBack() {
+      //返回修改页面
+      this.$xdUniHelper.navigateBack();
+      // this.$xdUniHelper.navigateTo({
+      //   url: `${this.invoicePath}?main_order_id=${this.main_order_id}&pay_order_id=${this.pay_order_id}`,
+      // });
+    },
+    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 "./JfbBaseInvoiceConfirmLess.less";
+@import "./JfbBaseInvoiceConfirmLess.less";
 
-  .jfb-base-invoice-confirm {
-    &__body{
+.jfb-base-invoice-confirm {
+  &__body {
+    &-content {
+      padding: 24rpx;
+      border-radius: 16rpx;
+      &-item {
+        background: #fff;
+        border-radius: 8rpx;
+        &-info {
+          padding: 20rpx 48rpx;
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          color: #333333;
+          font-size: 28rpx;
+          border-bottom: 2rpx solid #f7f7f7;
+        }
+      }
+    }
+    .fixe_bottom {
+      display: flex;
+      align-items: center;
+      justify-content: space-around;
+      height: unit(100, rpx);
+      padding: 0 unit(40, rpx);
+      flex-flow: nowrap;
+      background: #fff;
+      box-shadow: 0 0 unit(16, rpx) rgba(0, 0, 0, 0.05);
+      .flex_l {
+        display: flex;
+        align-items: center;
+        font-size: unit(32, rpx);
+      }
 
+      & > view {
+        flex: 1;
+        padding: 0 unit(15, rpx);
+      }
     }
   }
+}
 </style>

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

@@ -0,0 +1,33 @@
+import {
+  dataVal,
+} from "@/utils/AttrTools";
+export default (data, gValue, gColor, oldData = {}) => {
+  return [
+    {
+      label: '开票详情',
+      ele: 'xd-select-pages-path',
+      valueKey: 'detailPath',
+      placeholder: '请选择开票详情页面',
+      value: data['detailPath'] || {},
+      labelInline: true,
+      setting: {
+        router: XdBus.getParentApi('getPagesTree'),
+      },
+      className: 'input100',
+      groupKey: 'advanced',
+    },
+    {
+      label: '申请开票',
+      ele: 'xd-select-pages-path',
+      valueKey: 'invoicePath',
+      placeholder: '请选择申请开票页面',
+      value: data['invoicePath'] || {},
+      labelInline: true,
+      setting: {
+        router: XdBus.getParentApi('getPagesTree'),
+      },
+      className: 'input100',
+      groupKey: 'advanced',
+    },
+  ].filter(i => i);
+}

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

@@ -0,0 +1,12 @@
+'use strict';
+import {
+  dataVal,
+  statusDataVal,
+  statusShow,
+  customVal,
+  getRemoteOptions
+} from "@/utils/AttrTools";
+
+export default (data, gValue, gColor, oldData = {}) => {
+  return [].filter(i => i);
+}

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

@@ -0,0 +1,12 @@
+import {
+  dataVal,
+  statusDataVal,
+  statusShow,
+  cRaBorShadow,
+  cusDisabled,
+  getCustomAttr,
+  TestCssInfo
+} from "@/utils/AttrTools";
+export default (data, gValue, gColor, oldData = {}) => {
+  return [].filter(i => i);
+}

package/src/components/JfbBaseInvoiceDetail/Api.js

@@ -7,50 +7,27 @@
 module.exports = [
   {
     //设置方法名字当别忘记加上【模块名字】：Invoice
-    mapFnName: 'getInvoiceByIdFilmSquate',
-    title: '获取电影广场列表',
-    path: '/api/account/film/list-film-square',
+    mapFnName: 'userInvoiceDetail',
+    title: '用户开票 - 详情',
+    path: '/pay/v1/user-invoice/detail',
     isRule: false,
     params: {
-      last_key: ['当前页', 'Number', '必选'],
-      page_size: ['每页数量', 'Number', '必选'],
+      main_order_id: ['订单编号', 'Number', '必选'],
+      pay_order_id: ['支付订单号', 'Number', '必选'],
     },
     isConsole: true,
     disabled: true,
   },
   {
     //设置方法名字当别忘记加上【模块名字】：Invoice
-    mapFnName: 'updateInvoiceFilmPaiqiDate',
-    title: '更新排期',
-    path: '/api/account/film/paiqi-date',
+    mapFnName: 'userInvoiceSend',
+    title: '用户开票 - 发送邮箱',
+    path: '/pay/v1/user-invoice/send',
     isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
-      cinema_id: ['影院id', 'Number', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
-  {
-    //设置方法名字当别忘记加上【模块名字】：Invoice
-    mapFnName: 'removeInvoiceFilmAddress',
-    title: '删除我的配送地址',
-    path: '/api/account/film/paiqi-date',
-    isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
-  {
-    //设置方法名字当别忘记加上【模块名字】：Invoice
-    mapFnName: 'addInvoiceFilmcart',
-    title: '添加购物车',
-    path: '/api/account/film/paiqi-date',
-    isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
+    data: {
+      main_order_id: ['订单编号', 'Number', '必选'],
+      pay_order_id: ['支付订单号', 'Number', '必选'],
+      email: ['邮箱', 'String', '必选'],
     },
     isConsole: true,
     disabled: true,

package/src/components/JfbBaseInvoiceDetail/Attr.js

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