jufubao-base 1.0.302-beta3 → 1.0.302-beta7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-base",
-  "version": "1.0.302-beta3",
+  "version": "1.0.302-beta7",
   "private": false,
   "description": "聚福宝业务组件基础插件包",
   "main": "index.js",

package/src/components/JfbBaseInvoice/JfbBaseInvoice.vue

@@ -189,7 +189,7 @@ import { getContainerPropsValue, gCPVal } from "@/utils/xd.base";
 import componentsMixins from "@/mixins/componentsMixins";
 import extsMixins from "@/mixins/extsMixins";
 import getServiceUrl from "@/common/getServiceUrl";
-import XdUnit from "@/components/XdUnit/XdUnit.vue";
+import XdUnit from "@/components/XdUnit/XdUnit";
 export default {
   name: "JfbBaseInvoice",
   components: {

package/src/components/JfbBaseInvoice/Mock.js

@@ -2,12 +2,10 @@
 
 module.exports = {
   
-  getInvoiceByIdFilmSquate:{},
+  userInvoiceDetail: { "invoice_result": { "id": 0, "open_nnid": "", "partner_id": 0, "supplier_id": 0, "site_id": "", "user_id": 0, "issuer": "", "category": "", "category_name": "", "content_type": "", "content_type_name": "", "invoice_header": "", "invoice_header_type": "", "invoice_header_type_name": "", "invoice_amount": 1, "invoice_number": "", "phone_number": "", "email": "", "status": "N", "pay_order_id": "", "main_order_id": "", "scene": "", "supplier_fulfil_type": "", "file_info": "", "product_data": [], "open_user_id": "", "open_username": "", "comment": "", "apply_time": 0, "open_time": 0, "created_time": 0, "updated_time": 0, "issuer_name": "", "product_num": 0, "status_name": "未开票", "total_amount": 0, "channel_amount": 0, "error_info": "", "status_desc": "" }, "request_id": "80f312c6000ec59a" },
   
-  updateInvoiceFilmPaiqiDate:{},
+  userInvoiceOptions: { "status_list": [{ "label": "未开票", "value": "N" }, { "label": "已开票", "value": "Y" }, { "label": "待开票", "value": "P" }], "category_list": [{ "label": "数电发票（普通发票）", "value": "normal" }], "content_type_list": [{ "label": "明细", "value": "detail" }], "invoice_header_type_list": [{ "label": "个人", "value": "person" }, { "label": "单位", "value": "company" }], "issuer_list": [{ "label": "供货商", "value": "supplier" }, { "label": "平台", "value": "platform" }], "request_id": "c989ca4688ac7ecb" },
   
-  removeInvoiceFilmAddress:{},
-  
-  addInvoiceFilmcart:{},
+  userInvoiceSubmit:{},
   
 }

package/src/components/JfbBaseInvoiceDetail/JfbBaseInvoiceDetail.vue

@@ -36,6 +36,8 @@
           v-else-if="info.status === 'Y'"
           class="jfb-base-invoice-detail__body-status-text"
           >已开发票金额：<xd-unit
+            fontSize="28"
+            colorNew="#fff"
             :isOld="false"
             :price="info.invoice_amount"
           ></xd-unit
@@ -111,6 +113,7 @@
           <image @click="handlePreview(index, item)" :src="item"></image>
         </view>
       </view>
+      <view :style="{height: layoutInfo.bottom + 'rpx'}"></view>
       <view v-if="info.status === 'Y'" class="fixe_bottom" :style="prod_bottom">
         <view :style="[bottomBtnWrapStyle]">
           <XdButton
@@ -153,6 +156,7 @@
 <script>
 import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
 import XdDailog from "@/components/XdDailog/XdDailog";
+import XdUnit from "@/components/XdUnit/XdUnit";
 import { jfbRootExec } from "@/utils/xd.event";
 import JfbBaseInvoiceDetailMixin from "./JfbBaseInvoiceDetailMixin";
 import { getContainerPropsValue, gCPVal } from "@/utils/xd.base";
@@ -164,6 +168,7 @@ export default {
   components: {
     XdFontIcon,
     XdDailog,
+    XdUnit
   },
   mixins: [componentsMixins, extsMixins, JfbBaseInvoiceDetailMixin],
   data() {
@@ -246,7 +251,7 @@ export default {
           if (res.invoice_result.file_info) {
             res.invoice_result.file_info = JSON.parse(res.invoice_result.file_info)
             this.images= res.invoice_result.file_info.map(item=>{
-              return getServiceUrl(item.url,'size3')
+              return getServiceUrl(item.path,'size3')
             })
           }
           this.info = res.invoice_result;
@@ -394,6 +399,7 @@ export default {
         justify-content: center;
         padding: 8rpx;
         margin-right: 16rpx;
+        margin-bottom: 16rpx;
 
         & > image {
           width: 192rpx;

package/src/components/JfbBaseInvoiceDetail/Mock.js

@@ -2,12 +2,8 @@
 
 module.exports = {
   
-  getInvoiceByIdFilmSquate:{},
+  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" },
   
-  updateInvoiceFilmPaiqiDate:{},
-  
-  removeInvoiceFilmAddress:{},
-  
-  addInvoiceFilmcart:{},
+  userInvoiceSend: { "email": "1212@163.com", "request_id": "a4b209365a869944" },
   
 }

package/src/components/JfbBaseOrderDetail/JfbBaseOrderDetail.vue

@@ -896,7 +896,7 @@
             </view>
             <view v-else-if="item.action === 'invoice'">
               <xd-button
-                v-if="isShowInvoice && is_show_invoice==='Y'&&invoiceStatus==='N'"
+                v-if="isShowInvoice && is_show_invoice==='Y'&&invoiceStatus==='P'"
                 size="small"
                 :type="item.type !== undefined ? item.type: 'primary'"
                 :radius="bottomBtnRadius + 'rpx'"
@@ -909,7 +909,7 @@
             </view>
             <view v-else-if="item.action === 'viewInvoice'">
               <xd-button
-                v-if="isShowInvoice && is_show_invoice==='Y'&&invoiceStatus!=='N'"
+                v-if="isShowInvoice && is_show_invoice==='Y'&&invoiceStatus==='Y'"
                 size="small"
                 :type="item.type !== undefined ? item.type: 'primary'"
                 :radius="bottomBtnRadius + 'rpx'"
@@ -1668,7 +1668,6 @@ export default {
           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.viewInvoicePath='/plus/invoice/detail'
         this.$xdUniHelper.navigateTo({
           url: `${this.viewInvoicePath}?main_order_id=${this.main_order_id}&pay_order_id=${this.info.pay_info.pay_order_id}`,
         });

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