jufubao-base 1.0.302-beta1 → 1.0.302-beta13

package/src/components/JfbBaseOrderDetail/Attr.js

@@ -300,6 +300,20 @@ export default {
           { label: '不允许', value: 'N' },
         ]
       },
+      {
+        label: "发票申请:",
+        ele: 'xd-radio',
+        valueKey: "is_show_invoice",
+        value: data['is_show_invoice'] || 'N',
+        groupKey: 'content',
+        placeholder: '请选择是否发票申请',
+        multiple: false,
+        className: 'input80',
+        list: [
+          { label: '显示', value: 'Y' },
+          { label: '隐藏', value: 'N' },
+        ]
+      },
       {
         label: '外填充:',
         ele: 'xd-margin-padding',
@@ -530,6 +544,30 @@ export default {
         },
         inline: false,
       },
+      {
+        label: '发票申请页面路径:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'invoicePath',
+        groupKey: 'advanced',
+        placeholder: '发票申请页面路径',
+        value: data['invoicePath'] || null,
+        setting: {
+          router: XdBus.getParentApi('getPagesTree'),
+        },
+        inline: false,
+      },
+      {
+        label: '查看发票页面路径:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'viewInvoicePath',
+        groupKey: 'advanced',
+        placeholder: '发票申请页面路径',
+        value: data['viewInvoicePath'] || null,
+        setting: {
+          router: XdBus.getParentApi('getPagesTree'),
+        },
+        inline: false,
+      },
 
 
       // 废弃 - 隐藏

package/src/components/JfbBaseOrderDetail/JfbBaseOrderDetail.vue

@@ -894,6 +894,32 @@
                 @click="handleAction(item)"
               >{{ item.text }}</xd-button>
             </view>
+            <view v-else-if="item.action === 'invoice'">
+              <xd-button
+                v-if="isShowInvoice && is_show_invoice==='Y'&&invoiceStatus==='N'"
+                size="small"
+                :type="item.type !== undefined ? item.type: 'primary'"
+                :radius="bottomBtnRadius + 'rpx'"
+                :style="{
+                  height: bottomBtnHeight + 'rpx',
+                  lineHeight: bottomBtnHeight + 'rpx',
+                }"
+                @click="handleAction(item)"
+              >{{ item.text }}</xd-button>
+            </view>
+            <view v-else-if="item.action === 'viewInvoice'">
+              <xd-button
+                v-if="isShowInvoice && is_show_invoice==='Y'&&invoiceStatus!=='N'"
+                size="small"
+                :type="item.type !== undefined ? item.type: 'primary'"
+                :radius="bottomBtnRadius + 'rpx'"
+                :style="{
+                  height: bottomBtnHeight + 'rpx',
+                  lineHeight: bottomBtnHeight + 'rpx',
+                }"
+                @click="handleAction(item)"
+              >{{ item.text }}</xd-button>
+            </view>
             <view v-else>
               <xd-button
                 size="small"
@@ -1057,7 +1083,12 @@ export default {
       supplementList: [],
       supplementTitle: "",
 
-      code_location:'none',
+      code_location: 'none',
+      is_show_invoice: 'N',
+      invoicePath: '',
+      isShowInvoice: false,
+      invoiceStatus: '',
+      viewInvoicePath: ''
     };
   },
   watch: {
@@ -1081,6 +1112,11 @@ export default {
         this.getOrderDetail();
       }
     },
+    is_show_invoice(){
+      if (this.isPreview) {
+        this.getOrderDetail();
+      }
+    },
   },
   computed: {
     ...mapState(['siteInfo']),
@@ -1159,6 +1195,18 @@ export default {
         this.getCountDown();
       }
     },
+    getIsInvoice() {
+      jfbRootExec("getCheckInvoice", {
+        vm: this,
+        data: {
+          main_order_id: this.main_order_id,
+          pay_order_id: this.info.pay_info.pay_order_id,
+        },
+      }).then(res => {
+        this.isShowInvoice = res.is_allow_open === 'Y'
+        this.invoiceStatus = res.status
+      })
+    },
     getOrderDetail() {
       jfbRootExec("getBaseOrderDetail", {
         vm: this,
@@ -1331,6 +1379,21 @@ export default {
             });
           }
 
+          //增加删除订单按钮
+          if(this.is_show_invoice === 'Y') {
+            let pay = (res.buttons||[]).filter(item => item.action === 'invoice');
+            let del = [{action:'invoice', text:'申请开票'}];
+            if(pay.length === 1) del = []
+            res.buttons = del.concat(res.buttons || [])
+          }
+          //增加删除订单按钮
+          if(this.is_show_invoice === 'Y') {
+            let pay = (res.buttons||[]).filter(item => item.action === 'viewInvoice');
+            let del = [{action:'viewInvoice', text:'查看开票'}];
+            if(pay.length === 1) del = []
+            res.buttons = del.concat(res.buttons || [])
+          }
+
           if (res.product) {
             try {
               jfbRootExec("getBaseProductDetail", {
@@ -1358,6 +1421,9 @@ export default {
           }
           else {
             this.info = res;
+            if (this.is_show_invoice === 'Y') {
+              this.getIsInvoice()
+            }
             if (this.info.status.loading_timeout != "-1") {
               this.timeDown();
             }
@@ -1432,6 +1498,9 @@ export default {
           this.showPreviewCode = true;
         }
       }
+      this.is_show_invoice = getContainerPropsValue(container, "content.is_show_invoice", "N");
+      this.invoicePath = getContainerPropsValue(container, "content.invoicePath", { value: "", }).value;
+      this.viewInvoicePath = getContainerPropsValue(container, "content.viewInvoicePath", { value: "", }).value;
     },
     getCountDown() {
       this.timer = setInterval(() => {
@@ -1594,6 +1663,14 @@ export default {
         }).catch(err => {
           this.$xdHideLoading();
         })
+      }if (item.action === "invoice") {
+        this.$xdUniHelper.navigateTo({
+          url: `${this.invoicePath}?main_order_id=${this.main_order_id}&pay_order_id=${this.info.pay_info.pay_order_id}`,
+        });
+      }if (item.action === "viewInvoice") {
+        this.$xdUniHelper.navigateTo({
+          url: `${this.viewInvoicePath}?main_order_id=${this.main_order_id}&pay_order_id=${this.info.pay_info.pay_order_id}`,
+        });
       }
       else {
         console.error(`item.action=${item.action}, 此action不可用`)

package/src/components/JfbBaseOrderDetail/Mock.js

@@ -102,5 +102,6 @@ module.exports = {
     "request_id": "6178d3499b91f274"
   },
   cancelBaseOrder:{"pay_order_id": "488003809474256896","request_id": "6178d3499b91f274"},
-  deleteBaseOrder:{"pay_order_id": "488003809474256896","request_id": "6178d3499b91f274"},
+  deleteBaseOrder: { "pay_order_id": "488003809474256896", "request_id": "6178d3499b91f274" },
+  getCheckInvoice: { "partner_id": 0, "site_id": "", "user_id": 5000358, "is_allow_open": "Y", "error_reason": "", "open_nnid": "", "status": "N", "status_name": "未开票", "request_id": "420fc4fe050beb91" }
 }

package/src/components/JfbBasePhoneCollect/JfbBasePhoneCollect.vue

@@ -175,6 +175,8 @@ export default {
       callback_url: "",
       is_show_skip: "Y",
       isCollectUsername: false,
+      phonePlaceholder:'', //
+      codePlaceholder:'', //
 
       inputStyle: "linear", //输入框样式 linear:线性  face: 面性
       formBorderColor: "#F9F9F9", //
@@ -350,10 +352,27 @@ export default {
       this.phoneIcon = getContainerPropsValue(value, "content.phoneIcon", '');
       this.codeIcon = getContainerPropsValue(value, "content.codeIcon", '');
       this.passwordIcon = getContainerPropsValue(value, "content.passwordIcon", '');
-      this.labelFont = getContainerPropsValue(value, "content.labelFont", {});
-      this.placeholderFont = getContainerPropsValue(value, "content.placeholderFont", {});
-      this.contentFont = getContainerPropsValue(value, "content.contentFont", {});
-      this.getCodeFont = getContainerPropsValue(value, "content.getCodeFont", {});
+      this.labelFont = getContainerPropsValue(value, "content.labelFont", {
+        color: "#333",
+        fontSize: "24rpx",
+        fontWeight: "normal",
+      });
+      this.placeholderFont = getContainerPropsValue(value, "content.placeholderFont", {
+        color: "#d4d4d4",
+        fontSize: "24rpx",
+        fontWeight: "normal",
+      });
+      this.contentFont = getContainerPropsValue(value, "content.contentFont", {
+        color: "#333",
+        fontSize: "24rpx",
+        fontWeight: "normal",
+      });
+      this.getCodeFont = getContainerPropsValue(value, "content.getCodeFont", {
+        color: "#ff5a39",
+        fontSize: "24rpx",
+        fontWeight: "normal",
+      });
+
       this.getCodeShowType = getContainerPropsValue(value, "content.getCodeShowType", 'text');
       this.btnMargin = getContainerPropsValue(value, "content.btnMargin", {});
       this.btnRadius = getContainerPropsValue(value, "content.btnRadius", '20');

package/src/components/JfbBasePhoneLogin/JfbBasePhoneLogin.vue

@@ -65,10 +65,7 @@
             label="手机号"
             content-align="left"
           >
-            <xd-form-input
-              v-model="accountForm.phone_number"
-              :placeholder="phonePlaceholder"
-            />
+            <xd-form-input v-model="accountForm.phone_number" :placeholder="phonePlaceholder"/>
           </xd-form-item>
           <xd-form-item
             class="form-item"
@@ -199,6 +196,8 @@ export default {
       isCollectUsername: false,
       showDialog: false,
       share_code: "",
+      phonePlaceholder:'', //
+      codePlaceholder:'', //
 
       inputStyle: "linear", //输入框样式 linear:线性  face: 面性
       formBorderColor: "#F9F9F9", //
@@ -432,22 +431,27 @@ export default {
         "content.passwordIcon",
         ""
       );
-      this.labelFont = getContainerPropsValue(value, "content.labelFont", {});
-      this.placeholderFont = getContainerPropsValue(
-        value,
-        "content.placeholderFont",
-        {}
-      );
-      this.contentFont = getContainerPropsValue(
-        value,
-        "content.contentFont",
-        {}
-      );
-      this.getCodeFont = getContainerPropsValue(
-        value,
-        "content.getCodeFont",
-        {}
-      );
+      this.labelFont = getContainerPropsValue(value, "content.labelFont", {
+        color: "#333",
+        fontSize: "24rpx",
+        fontWeight: "normal",
+      });
+      this.placeholderFont = getContainerPropsValue(  value, "content.placeholderFont", {
+        color: "#d4d4d4",
+        fontSize: "24rpx",
+        fontWeight: "normal",
+      });
+      this.contentFont = getContainerPropsValue(value, "content.contentFont", {
+          //表单内容字体
+          color: "#333",
+          fontSize: "24rpx",
+          fontWeight: "normal",
+        });
+      this.getCodeFont = getContainerPropsValue(value, "content.getCodeFont", {
+          color: "#ff5a39",
+          fontSize: "24rpx",
+          fontWeight: "normal",
+      });
       this.getCodeShowType = getContainerPropsValue(
         value,
         "content.getCodeShowType",

package/src/components/JfbBaseInvoiceConfirm/Api.js

@@ -1,58 +0,0 @@
-'use strict';
-/**
- * @description  接口配置，
- * 在设置方法名字当时候，别忘记加上【模块名字】：Invoice
- * @type {*[]}
- */
-module.exports = [
-  {
-    //设置方法名字当别忘记加上【模块名字】：Invoice
-    mapFnName: 'getInvoiceByIdFilmSquate',
-    title: '获取电影广场列表',
-    path: '/api/account/film/list-film-square',
-    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', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
-];

package/src/components/JfbBaseInvoiceConfirm/Attr.js

@@ -1,48 +0,0 @@
-'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/JfbBaseInvoiceConfirm/JfbBaseInvoiceConfirm.vue

@@ -1,111 +0,0 @@
-<template>
-  <view
-    class="jfb-base-invoice-confirm"
-    @click="handleEditxSelect"
-    :class="{ editx : isEditx && active }"
-  >
-    <!--#ifdef H5-->
-    <view
-      class="jfb-base-invoice-confirm__edit"
-      :class="{ editx : isEditx && active }"
-      v-if="isEditx && active"
-    >
-      <view class="jfb-base-invoice-confirm__edit-icon" @click="delEdit">删除</view>
-    </view>
-    <!-- #endif -->
-    <view class="jfb-base-invoice-confirm__body">
-      <view>测试插件( {{containerId}} )</view>
-    </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
-    },
-    mixins: [
-      componentsMixins, extsMixins, JfbBaseInvoiceConfirmMixin
-    ],
-    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 "./JfbBaseInvoiceConfirmLess.less";
-
-  .jfb-base-invoice-confirm {
-    &__body{
-
-    }
-  }
-</style>

package/src/components/JfbBaseInvoiceConfirm/JfbBaseInvoiceConfirmLess.less

@@ -1,79 +0,0 @@
-/**
-* @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-invoice-confirm {
-  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-invoice-confirm {
-  //&:before {
-    //content: " ";
-    //display: table;
-  //}
-}
-/**endNotPreview**/

package/src/components/JfbBaseInvoiceConfirm/JfbBaseInvoiceConfirmMixin.js

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

package/src/components/JfbBaseInvoiceConfirm/Mock.js

@@ -1,13 +0,0 @@
-'use strict';
-
-module.exports = {
-  
-  getInvoiceByIdFilmSquate:{},
-  
-  updateInvoiceFilmPaiqiDate:{},
-  
-  removeInvoiceFilmAddress:{},
-  
-  addInvoiceFilmcart:{},
-  
-}