jufubao-base 1.0.302-beta4 → 1.0.302-beta9

package/package.json

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

package/src/components/JfbBaseInvoice/JfbBaseInvoice.vue

@@ -115,7 +115,11 @@
           </view>
         </view>
         <view class="fixe_bottom" :style="prod_bottom">
-          <XdButton @click="handleToSecondStep" size="small" type="primary"
+          <XdButton
+            width="700rpx"
+            @click="handleToSecondStep"
+            size="small"
+            type="primary"
             >下一步</XdButton
           >
         </view>
@@ -165,13 +169,18 @@
         </view>
         <view class="fixe_bottom" :style="prod_bottom">
           <XdButton
+            style="width: 300rpx"
             :cusStyle="[btnStyle]"
             @click="handleBack"
             size="small"
             type="default"
             >返回修改</XdButton
           >
-          <XdButton @click="handleConfirm" size="small" type="primary"
+          <XdButton
+            style="width: 300rpx"
+            @click="handleConfirm"
+            size="small"
+            type="primary"
             >确认提交</XdButton
           >
         </view>
@@ -189,7 +198,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: {
@@ -288,7 +297,6 @@ export default {
         "content.detailPath",
         { value: "" }
       ).value;
-      debugger
     },
     radioChange: function (evt) {
       for (let i = 0; i < this.invoice_header_type_list.length; i++) {
@@ -330,13 +338,26 @@ export default {
           return;
         }
       }
-      if (!this.email) {
-        this.$xdAlert({ content: "请填写接收邮箱" });
-        return;
-      }
       if (!this.phone_number) {
         this.$xdAlert({ content: "请填写联系电话" });
         return;
+      } else {
+        const reg = /^1[3456789]\d{9}$/;
+        if (!reg.test(this.phone_number)) {
+          this.$xdAlert({ content: "请填写正确的手机号" });
+          return;
+        }
+      }
+      if (!this.email) {
+        this.$xdAlert({ content: "请填写接收邮箱" });
+        return;
+      } else {
+        const reg =
+          /^[a-zA-Z0-9_.-]+@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*\.[a-zA-Z0-9]{2,6}$/;
+        if (!reg.test(this.email)) {
+          this.$xdAlert({ content: "请填写正确的邮箱" });
+          return;
+        }
       }
       this.firstStep = false;
     },
@@ -431,7 +452,7 @@ export default {
           }
           input {
             font-size: 26rpx;
-            text-align: end;
+            text-align: right;
           }
         }
         .required {
@@ -461,7 +482,7 @@ export default {
         padding: 0 unit(15, rpx);
       }
     }
-     &-step2-content {
+    &-step2-content {
       padding: 24rpx;
       border-radius: 16rpx;
       &-item {

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() {
@@ -244,12 +249,17 @@ export default {
             ).fullTime;
           }
           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')
-            })
+            res.invoice_result.file_info = JSON.parse(
+              res.invoice_result.file_info
+            );
+            this.images = res.invoice_result.file_info.map((item) => {
+              return getServiceUrl(item.path, "size3");
+            });
           }
           this.info = res.invoice_result;
+          if (this.info.status_name === "待开票") {
+            this.info.status_name = "开票中";
+          }
         })
         .catch();
     },
@@ -299,6 +309,7 @@ export default {
       }).then((res) => {
         this.showDialog = false;
         this.email = "";
+        this.$xdAlert({ content: "发送成功" });
       });
     },
     handleSend() {
@@ -394,6 +405,7 @@ export default {
         justify-content: center;
         padding: 8rpx;
         margin-right: 16rpx;
+        margin-bottom: 16rpx;
 
         & > image {
           width: 192rpx;

package/src/components/JfbBaseOrderDetail/Attr.js

@@ -310,7 +310,7 @@ export default {
         multiple: false,
         className: 'input80',
         list: [
-          { label: '展示', value: 'Y' },
+          { label: '显示', value: 'Y' },
           { label: '隐藏', value: 'N' },
         ]
       },

package/src/components/JfbBaseOrderDetail/JfbBaseOrderDetail.vue

@@ -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}`,
         });