jufubao-base 1.0.301 → 1.0.302-beta10

package/src/components/JfbBaseInvoiceDetail/JfbBaseInvoiceDetailLess.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-invoice-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-invoice-detail {
+  //&:before {
+    //content: " ";
+    //display: table;
+  //}
+}
+/**endNotPreview**/

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

package/src/components/JfbBaseInvoiceDetail/Mock.js

@@ -0,0 +1,9 @@
+'use strict';
+
+module.exports = {
+  
+  userInvoiceDetail: { "invoice_result": { "id": 8, "open_nnid": "Gymwql5D5WzlEFrqSZ233", "partner_id": 161, "supplier_id": 0, "site_id": "04c78d51890a18b8", "user_id": 5000358, "issuer": "platform", "category": "normal", "category_name": "数电发票（普通发票）", "content_type": "detail", "content_type_name": "", "invoice_header": "123", "invoice_header_type": "person", "invoice_header_type_name": "个人", "invoice_amount": 1, "invoice_number": "", "phone_number": "18888888888", "email": "163@163.com", "status": "Y", "pay_order_id": "781837433628017018", "main_order_id": "c781837426608848897", "scene": "offline", "supplier_fulfil_type": "wallet", "file_info": "[{\"uid\":1765158999985,\"url\":\"\\\/uploads\\\/20251208\\\/9a2a54219b56dca6ebd1fdd1fd5681b5.jpg\",\"name\":\"ceshi.jpg\",\"path\":\"\\\/\\\/sandbox-img.jufubao.cn\\\/uploads\\\/20251208\\\/9a2a54219b56dca6ebd1fdd1fd5681b5.jpg?v=1765159000689\",\"size\":841679,\"type\":\"image\\\/jpeg\",\"width\":1080,\"height\":1620,\"preview_url\":\"https:\\\/\\\/sandbox-private-file.jufubao.cn\\\/sandbox-img.jufubao.cn\\\/uploads\\\/20251208\\\/9a2a54219b56dca6ebd1fdd1fd5681b5.jpg%3Fv%3D1765159000689?Expires=1765244996&OSSAccessKeyId=LTAI5t5x3fSKzMHkbH54VFGi&Signature=x9%2Fvhu7y95Yo%2BmezI5pnYAP%2BczU%3D\"},{\"uid\":1765158999989,\"url\":\"\\\/uploads\\\/20251208\\\/0710b7c47859bfab774a43335378cbd4.jpeg\",\"name\":\"d5eb1020142d38771f897368ac3e577c.jpeg\",\"path\":\"\\\/\\\/sandbox-img.jufubao.cn\\\/uploads\\\/20251208\\\/0710b7c47859bfab774a43335378cbd4.jpeg?v=1765159000526\",\"size\":36934,\"type\":\"image\\\/jpeg\",\"width\":800,\"height\":800,\"preview_url\":\"https:\\\/\\\/sandbox-private-file.jufubao.cn\\\/sandbox-img.jufubao.cn\\\/uploads\\\/20251208\\\/0710b7c47859bfab774a43335378cbd4.jpeg%3Fv%3D1765159000526?Expires=1765244996&OSSAccessKeyId=LTAI5t5x3fSKzMHkbH54VFGi&Signature=xFXXhr%2BLeMiObcaUeHA91te6FUk%3D\"},{\"uid\":1765158999990,\"url\":\"\\\/uploads\\\/20251208\\\/45c20724c94a768ef22b196b0f720054.jpeg\",\"name\":\"d9cecdeeaab3c0d7a105417f2f01a1984767.jpeg\",\"path\":\"\\\/\\\/sandbox-img.jufubao.cn\\\/uploads\\\/20251208\\\/45c20724c94a768ef22b196b0f720054.jpeg?v=1765159000528\",\"size\":25981,\"type\":\"image\\\/jpeg\",\"width\":610,\"height\":488,\"preview_url\":\"https:\\\/\\\/sandbox-private-file.jufubao.cn\\\/sandbox-img.jufubao.cn\\\/uploads\\\/20251208\\\/45c20724c94a768ef22b196b0f720054.jpeg%3Fv%3D1765159000528?Expires=1765244996&OSSAccessKeyId=LTAI5t5x3fSKzMHkbH54VFGi&Signature=zDkZe%2FvJZjV1LdAE1417byZZWus%3D\"},{\"uid\":1765158999992,\"url\":\"\\\/uploads\\\/20251208\\\/f2a84bf4bc08805b775337223b1b1307.jpeg\",\"name\":\"f1a393f1c007477c1424fa19185447d4.jpeg\",\"path\":\"\\\/\\\/sandbox-img.jufubao.cn\\\/uploads\\\/20251208\\\/f2a84bf4bc08805b775337223b1b1307.jpeg?v=1765159000554\",\"size\":37881,\"type\":\"image\\\/jpeg\",\"width\":500,\"height\":647,\"preview_url\":\"https:\\\/\\\/sandbox-private-file.jufubao.cn\\\/sandbox-img.jufubao.cn\\\/uploads\\\/20251208\\\/f2a84bf4bc08805b775337223b1b1307.jpeg%3Fv%3D1765159000554?Expires=1765244996&OSSAccessKeyId=LTAI5t5x3fSKzMHkbH54VFGi&Signature=uUoAnINhVh0WzKGEvAb2NUzxis0%3D\"}]", "product_data": [], "open_user_id": "lichao", "open_username": "lichao", "comment": "", "apply_time": 1764923171, "open_time": 1765159004, "created_time": 1764923171, "updated_time": 1765159004, "issuer_name": "平台", "product_num": 1, "status_name": "已开票", "total_amount": 1, "channel_amount": 1, "error_info": "", "status_desc": "已开发票金额：¥0.01" }, "request_id": "2f2265fc4c01f34b" },
+  
+  userInvoiceSend: { "email": "1212@163.com", "request_id": "a4b209365a869944" },
+  
+}

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

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

package/src/components/JfbBaseInvoiceDetail/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/JfbBaseInvoiceDetail/cusAttr/style.js

@@ -0,0 +1,41 @@
+import {
+  dataVal,
+  statusDataVal,
+  statusShow,
+  cRaBorShadow,
+  cusDisabled,
+  getCustomAttr,
+  TestCssInfo
+} from "@/utils/AttrTools";
+export default (data, gValue, gColor, oldData = {}) => {
+  return [
+    {
+      label: '背景图',
+      ele: 'xd-upload',
+      labelInline: true,
+      valueKey: 'statusBg',
+      value: dataVal({
+        data,
+        key: 'statusBg',
+        dValue: null,
+        gValue,
+      }),
+      defaultValue: dataVal({
+        data,
+        key: 'statusBg',
+        dValue: null,
+        gValue,
+      }),
+      slot: true,
+      tipsformet: '上传文件格式：@imageType@，不超过@size@MB.，建议宽度为：<span style="color:red">750</span>像素',
+      type: ['jpg', 'png', 'jpeg'],
+      styleType: 'one',
+      uploadType: 'aliyun',
+      oneHeight: 90,
+      oneWidth: 375,
+      size: 5,
+      action: 'aliyun',
+      groupKey: 'style',
+    },
+  ].filter(i => i);
+}

package/src/components/JfbBaseOrderDetail/Api.js

@@ -61,5 +61,17 @@ module.exports = [
     },
     isConsole: true,
     disabled: true,
-  }
+  },
+  {
+    mapFnName: 'getCheckInvoice',
+    title: '用户开票 - 检查订单是否支持开票',
+    path: '/pay/v1/user-invoice/check-allow-open',
+    isRule: false,
+    params: {
+      main_order_id: ['订单编号', 'Number', '必选'],
+      pay_order_id: ['支付订单号', 'Number', '必选'],
+    },
+    isConsole: true,
+    disabled: true,
+  },
 ];

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",