jufubao-base 1.0.302-beta9 → 1.0.303

package/package.json

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

package/src/components/JfbBaseOrderDetail/Api.js

@@ -61,17 +61,5 @@ 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,20 +300,6 @@ 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',
@@ -544,30 +530,6 @@ 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,32 +894,6 @@
                 @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"
@@ -1083,12 +1057,7 @@ export default {
       supplementList: [],
       supplementTitle: "",
 
-      code_location: 'none',
-      is_show_invoice: 'N',
-      invoicePath: '',
-      isShowInvoice: false,
-      invoiceStatus: '',
-      viewInvoicePath: ''
+      code_location:'none',
     };
   },
   watch: {
@@ -1112,11 +1081,6 @@ export default {
         this.getOrderDetail();
       }
     },
-    is_show_invoice(){
-      if (this.isPreview) {
-        this.getOrderDetail();
-      }
-    },
   },
   computed: {
     ...mapState(['siteInfo']),
@@ -1195,18 +1159,6 @@ 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,
@@ -1379,21 +1331,6 @@ 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", {
@@ -1421,9 +1358,6 @@ export default {
           }
           else {
             this.info = res;
-            if (this.is_show_invoice === 'Y') {
-              this.getIsInvoice()
-            }
             if (this.info.status.loading_timeout != "-1") {
               this.timeDown();
             }
@@ -1498,9 +1432,6 @@ 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(() => {
@@ -1663,14 +1594,6 @@ 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,6 +102,5 @@ module.exports = {
     "request_id": "6178d3499b91f274"
   },
   cancelBaseOrder:{"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" }
+  deleteBaseOrder:{"pay_order_id": "488003809474256896","request_id": "6178d3499b91f274"},
 }

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/JfbBaseInvoice/Api.js

@@ -1,49 +0,0 @@
-'use strict';
-/**
- * @description  接口配置，
- * 在设置方法名字当时候，别忘记加上【模块名字】：Invoice
- * @type {*[]}
- */
-module.exports = [
-  {
-    //设置方法名字当别忘记加上【模块名字】：Invoice
-    mapFnName: 'userInvoiceDetail',
-    title: '用户开票 - 详情',
-    path: '/pay/v1/user-invoice/detail',
-    isRule: false,
-    params: {
-      main_order_id: ['订单编号', 'Number', '必选'],
-      pay_order_id: ['支付订单号', 'Number', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  }, {
-    //设置方法名字当别忘记加上【模块名字】：Invoice
-    mapFnName: 'userInvoiceOptions',
-    title: '用户开票 - options',
-    path: '/pay/v1/user-invoice/options',
-    isRule: false,
-    params: {
-      main_order_id: ['订单编号', 'Number', '必选'],
-      pay_order_id: ['支付订单号', 'Number', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
-  {
-    //设置方法名字当别忘记加上【模块名字】：Invoice
-    mapFnName: 'userInvoiceSubmit',
-    title: '用户开票 - 申请开票',
-    path: '/pay/v1/user-invoice/submit',
-    isRule: false,
-    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/JfbBaseInvoice/Attr.js

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