jufubao-base 1.0.287 → 1.0.289

package/src/components/JfbBaseChoseCompany/cusAttr/style.js

@@ -0,0 +1,327 @@
+'use strict';
+import {
+  dataVal,
+  statusDataVal,
+  statusShow,
+  cRaBorShadow
+} from "@/utils/AttrTools";
+
+export default (data, gValue, gColor, oldData) => {
+  let defListBorder = cRaBorShadow(data, 'listBorder', {}, gValue);
+  let defListShadow = cRaBorShadow(data, 'listShadow', { old: ['is_shadow', 'is_shadow_w', 'is_shadow_bg'] }, gValue);
+  return [
+    {
+      ele: 'title',
+      label: '内容区',
+      size: 'small',
+      groupKey: 'style',
+    },
+    {
+      label: '内边距',
+      ele: 'xd-radio',
+      groupKey: 'style',
+      valueKey: 'contentPaddingStatus',
+      value: statusDataVal({ data, key: 'contentPaddingStatus', fields: ['contentPadding'], gValue }),
+      labelInline: true,
+      list: [
+        { label: '默认', value: 'D' },
+        { label: '自定义', value: 'C' },
+      ]
+    },
+    { ele: 'group_start' },
+    {
+      label: '',
+      groupKey: 'style',
+      ele: 'xd-margin-padding',
+      valueKey: 'contentPadding',
+      value: dataVal({
+        data,
+        key: 'contentPadding',
+        dValue: { top: 36, bottom: 0, left: 20, right: 20 },
+        gValue,
+        isPM: true,
+      }),
+      setting: {
+        type: 'padding',
+      },
+      placeholder: '请填充设置',
+      hidden: !statusShow({ data, key: 'contentPaddingStatus', fields: ['contentPadding'], gValue }),
+    },
+    { ele: 'group_end' },
+    {
+      ele: 'title',
+      label: '企业列表样式',
+      size: 'small',
+      groupKey: 'style',
+    },
+    {
+      label: '内边距',
+      ele: 'xd-radio',
+      groupKey: 'style',
+      valueKey: 'listPaddingStatus',
+      value: statusDataVal({ data, key: 'listPaddingStatus', fields: ['listPadding'], gValue }),
+      labelInline: true,
+      list: [
+        { label: '默认', value: 'D' },
+        { label: '自定义', value: 'C' },
+      ]
+    },
+    { ele: 'group_start' },
+    {
+      label: '',
+      groupKey: 'style',
+      ele: 'xd-margin-padding',
+      valueKey: 'listPadding',
+      value: dataVal({
+        data,
+        key: 'listPadding',
+        dValue: { top: 40, bottom: 40, left: 32, right: 32 },
+        gValue,
+        isPM: true,
+      }),
+      setting: {
+        type: 'padding',
+      },
+      placeholder: '请填充设置',
+      hidden: !statusShow({ data, key: 'listPaddingStatus', fields: ['listPadding'], gValue }),
+    },
+    { ele: 'group_end' },
+    {
+      label: '行间距',
+      ele: 'xd-radio',
+      groupKey: 'style',
+      valueKey: 'listSpacingStatus',
+      value: statusDataVal({ data, key: 'listSpacingStatus', fields: ['listSpacing'], gValue }),
+      labelInline: true,
+      list: [
+        { label: '默认', value: 'D' },
+        { label: '自定义', value: 'C' },
+      ]
+    },
+    { ele: 'group_start' },
+    {
+      label: "间距",
+      groupKey: 'style',
+      ele: 'xd-slider',
+      valueKey: "listSpacing",
+      value: dataVal({ data, key: 'listSpacing', dValue: '24', gValue }),
+      hidden: !statusShow({ data, key: 'listSpacingStatus', fields: ['listSpacing'], gValue }),
+      className: "input100",
+      labelInline: true,
+      setting: {
+        min: 0,
+        max: 100,
+        step: 1,
+        showStops: false,
+        showInput: false,
+      }
+    },
+    { ele: 'group_end' },
+    {
+      label: '圆角',
+      ele: 'xd-radio',
+      groupKey: 'style',
+      valueKey: 'listRadiusStatus',
+      value: statusDataVal({ data, key: 'listRadiusStatus', fields: ['listRadius'], gValue }),
+      labelInline: true,
+      list: [
+        { label: '默认', value: 'D' },
+        { label: '无圆角', value: 'N' },
+        { label: '自定义', value: 'C' },
+      ]
+    },
+    { ele: 'group_start' },
+    {
+      label: "",
+      ele: 'xd-site-select-list',
+      valueKey: 'listRadius',
+      groupKey: 'style',
+      value: dataVal({
+        data,
+        key: 'listRadius',
+        dValue: '8',
+        gValue,
+      }),
+      placeholder: '请选择内容圆角设置',
+      multiple: false,
+      hidden: !statusShow({ data, key: 'listRadiusStatus', fields: ['listRadius'], gValue }),
+      className: 'input80',
+      handleCustom({ action, data }) {
+        XdBus.getParentApi('getOptionsSettingList')({ setting_id: 'edtix_style_radius' })
+          .then(res => {
+            data.cb(res.list)
+          })
+          .catch(error => {
+            console.error(error);
+          });
+      },
+    },
+    { ele: 'group_end' },
+    {
+      label: '描边',
+      ele: 'xd-border',
+      labelInline: true,
+      groupKey: 'style',
+      valueKey: 'listBorder',
+      value: defListBorder,
+      setting: {
+        selected: defListBorder.type,
+        isRadio: true,//启用editx默认
+        isDef: true, //启动默认选项
+        //==设置默认值==
+        color: '#e5e5e5',
+        width: '0',
+        style: 'solid'
+        //==设置默认值==
+      },
+    },
+    {
+      label: '投影',
+      ele: 'xd-shadow',
+      labelInline: true,
+      groupKey: 'style',
+      valueKey: 'listShadow',
+      value: defListShadow,
+      className: 'input100',
+      setting: {
+        selected: defListShadow.type,
+        isRadio: true,
+        isDef: true,
+        default: {
+          color: 'rgba(0,0,0,.05)',
+          width: '10',
+        }
+      },
+      handleCustom({ action, data }) {
+        XdBus.getParentApi('getOptionsSettingList')({ setting_id: 'edtix_style_radius' })
+          .then(res => {
+            res.list = res.list.filter(item => {
+              return item.label !== '无';
+            });
+            data.cb(res.list)
+          })
+          .catch(error => {
+            console.error(error);
+            data.cb([])
+          });
+      },
+    },
+    {
+      label: '文字',
+      ele: 'xd-radio',
+      groupKey: 'style',
+      valueKey: 'listFontStyleStatus',
+      value: statusDataVal({ data, key: 'listFontStyleStatus', fields: ['listFontStyle'], gValue }),
+      labelInline: true,
+      list: [
+        { label: '默认', value: 'D' },
+        { label: '自定义', value: 'C' },
+      ]
+    },
+    { ele: 'group_start' },
+    {
+      label: '',
+      ele: 'xd-text-and-bgc',
+      groupKey: 'style',
+      valueKey: 'listFontStyle',
+      value: dataVal({ data, key: 'listFontStyle', dValue: null, gValue }),
+      hidden: !statusShow({ data, key: 'listFontStyleStatus', fields: ['listFontStyle'], gValue }),
+      setting: {
+        fontSize: false,
+        weight: false,
+        selected: false,
+        bgColor: false,
+        default: {
+          color: '#333',
+        }
+      },
+      handleCustom({ action, data }) {
+        XdBus.getParentApi('getOptionsSettingList')({ setting_id: 'edtix_style_font_size' })
+          .then(res => {
+            data.cb(res.list)
+          })
+          .catch(error => {
+            console.error(error);
+            data.cb([])
+          });
+      },
+    },
+    { ele: 'group_end' },
+    {
+      ele: 'title',
+      label: '添加企业样式',
+      size: 'small',
+      groupKey: 'style',
+    },
+    {
+      label: '背景',
+      ele: 'xd-radio',
+      groupKey: 'style',
+      valueKey: 'addBackgroundStatus',
+      value: statusDataVal({ data, key: 'addBackgroundStatus', fields: ['addBackground'], gValue }),
+      labelInline: true,
+      list: [
+        { label: '默认', value: 'D' },
+        { label: '自定义', value: 'C' },
+      ]
+    },
+    { ele: 'group_start' },
+    {
+      label: '背景颜色',
+      ele: 'xd-color',
+      labelInline: true,
+      valueKey: 'addBackground',
+      value: dataVal({ data, key: 'addBackground', dValue: '#F8F8F8', gValue }),
+      hidden: !statusShow({ data, key: 'addBackgroundStatus', fields: ['addBackground'], gValue }),
+      placeholder: '请选择背景颜色',
+      className: 'input80',
+      groupKey: 'style',
+      setting: {
+        showAlpha: true
+      },
+    },
+    { ele: 'group_end' },
+    {
+      label: '文字颜色',
+      ele: 'xd-radio',
+      groupKey: 'style',
+      valueKey: 'addFontStyleStatus',
+      value: statusDataVal({ data, key: 'addFontStyleStatus', fields: ['addFontStyle'], gValue }),
+      labelInline: true,
+      list: [
+        { label: '默认', value: 'D' },
+        { label: '自定义', value: 'C' },
+      ]
+    },
+    { ele: 'group_start' },
+    {
+      label: '',
+      ele: 'xd-text-and-bgc',
+      groupKey: 'style',
+      valueKey: 'addFontStyle',
+      value: dataVal({ data, key: 'addFontStyle', dValue: {}, gValue }),
+      hidden: !statusShow({ data, key: 'addFontStyleStatus', fields: ['addFontStyle'], gValue }),
+      setting: {
+        fontSize: false,
+        weight: false,
+        bgColor: false,
+        selected: false,
+        default: {
+          color: '#999999',
+        },
+        isBorder: false,
+      },
+      handleCustom({ action, data }) {
+        XdBus.getParentApi('getOptionsSettingList')({ setting_id: 'edtix_style_font_size' })
+          .then(res => {
+            data.cb(res.list)
+          })
+          .catch(error => {
+            console.error(error);
+            data.cb([])
+          });
+      },
+    },
+    { ele: 'group_end' },
+  ]
+}

package/src/components/JfbBaseNotice/JfbBaseNotice.vue

@@ -182,7 +182,6 @@
   import getServiceUrl from "@/common/getServiceUrl";
   import storage from "@/common/storage";
   import Color from "color";
-  const color = require('color');
   export default {
     name: "JfbBaseNotice",
     components: {
@@ -346,13 +345,13 @@
        * @param container {object} 业务组件对象自己
        */
       init(container) {
-        let colorBg = color(this.warningColor).alpha(0.1).array();
+        let colorBg = Color(this.warningColor).alpha(0.1).array();
         this.style = getContainerPropsValue(container, 'content.style', '1');
         this.time = Number(getContainerPropsValue(container, 'content.time', 3));
         this.textColor = getContainerPropsValue(container, 'content.textColor', this.warningColor);
         this.textAlign = getContainerPropsValue(container, 'content.textAlign', 'left');
         this.bgc = getContainerPropsValue(container, 'content.bgc', `rgba(${colorBg.join(',')})`);
-        this.borderTitleColor = color(this.bgc).lighten(.15).hex();
+        this.borderTitleColor = Color(this.bgc).lighten(.15).hex();
         this.margin = getContainerPropsValue(container, 'content.margin', {top: 0, left: 0, bottom: 0, right: 0});
         this.padding = getContainerPropsValue(container, 'content.padding', {top: 8, left: 10, bottom: 8, right: 10});
         this.scrollMargin =  getContainerPropsValue(container, 'content.scrollMargin', {});

package/src/components/JfbBaseOrderList/Mock.js

@@ -25,7 +25,7 @@ module.exports = {
         "product_thumb": "\/\/sandbox-img.jufubao.cn\/uploads\/20230506\/40018e35f8d9b3bcc2f180cfe073ce28.png",
         "sale_price": 2678
       }],
-      "buttons": [{"text": "支付", "action": "pay"}, {"text": "取消订单", "action": "cancel_unpaid"}, { "text": "申请退款", "action": "apply_refund"}]
+      "buttons": [{"text": "支付", "action": "pay"}, {"text": "取消订单", "action": "cancel_unpaid"}, { "text": "申请售后", "action": "apply_refund"}]
     },
       {
       "main_order_id": "m513033785675509760",

package/src/components/JfbBaseWalletDetail/JfbBaseWalletDetail.vue

@@ -64,6 +64,7 @@ export default {
       list: [],
       amount: "",
       status: false,
+      wallet_nnid: null
     };
   },
   watch: {
@@ -77,10 +78,12 @@ export default {
   },
   methods: {
     onJfbLoad(options) {
+      this.wallet_nnid = options.wallet_nnid;
       jfbRootExec("getRecordDetail", {
         vm: this,
         data: {
           trade_id: options.trade_id,
+          wallet_nnid: this.wallet_nnid
         },
       })
         .then((res) => {

package/src/components/JfbBaseWalletEffective/JfbBaseWalletEffective.vue

@@ -66,6 +66,7 @@ export default {
       type: "",
       wallet_type: "",
       status: false,
+      wallet_nnid: null
     };
   },
   watch: {
@@ -81,6 +82,7 @@ export default {
     async onJfbLoad(options) {
       this.wallet_type = options.wallet_type;
       this.type = options.type;
+      this.wallet_nnid = options.wallet_nnid;
       await this.getList();
       this.status = true;
     },
@@ -98,6 +100,7 @@ export default {
         vm: this,
         data: {
           wallet_type: this.wallet_type,
+          wallet_nnid: this.wallet_nnid,
           page_size: this.page_size,
           page_token: this.page_token,
         },

package/src/components/JfbBaseWalletIndex/JfbBaseWalletIndex.vue

@@ -64,8 +64,9 @@
             class="jfb-base-wallet-index__body-type-item"
             @click="handleToWalletDetail(item)"
           >
-            <view>{{ dividePrice(item.amount) }}</view>
-            <view :style="{ color: mainColor }">{{ item.wallet_name }}</view>
+            <view class="jfb-base-wallet-index__body-type-item-name" :style="{ color: mainColor }">{{ item.wallet_name }}</view>
+            <view class="jfb-base-wallet-index__body-type-item-amount">{{ dividePrice(item.amount) }}</view>
+            <view class="jfb-base-wallet-index__body-type-item-company" v-if="item.customer_name">{{item.customer_name}}</view>
           </view>
         </view>
       </view>
@@ -275,6 +276,7 @@ export default {
       total_amount: 0,
       show_name: "",
       status: false,
+      wallet_nnid: null
     };
   },
   watch: {
@@ -387,6 +389,7 @@ export default {
         vm: this,
         data: {
           wallet_type: this.wallet_type,
+          wallet_nnid: this.wallet_nnid,
         },
       })
         .then((res) => {
@@ -462,17 +465,18 @@ export default {
     },
     handleToWalletDetail(item) {
       this.$xdUniHelper.navigateTo({
-        url: `${this.walletDetailPath}?wallet_type=${item.wallet_type}&type=${this.type}`,
+        url: `${this.walletDetailPath}?wallet_type=${item.wallet_type}&type=${this.type}&wallet_nnid=${item.wallet_nnid}`,
       });
     },
     handleToBillDetail(item) {
       this.$xdUniHelper.navigateTo({
-        url: `${this.billDetailPath}?trade_id=${item.trade_id}`,
+        url: `${this.billDetailPath}?trade_id=${item.trade_id}&wallet_nnid=${item.wallet_nnid}`,
       });
     },
     handleShowQrcode() {
       if (this.typeList.length === 1) {
         this.wallet_type = this.typeList[0].wallet_type;
+        this.wallet_nnid = this.typeList[0].wallet_nnid;
         this.getQrcode();
       } else {
         this.showPayType = true;
@@ -482,8 +486,10 @@ export default {
       console.log(flat, item, "alalaalaal");
       if (flat) {
         this.wallet_type = item.wallet_type;
+        this.wallet_nnid = item.wallet_nnid;
       } else {
         this.wallet_type = null;
+        this.wallet_nnid = null;
       }
     },
     handleUse() {
@@ -589,12 +595,16 @@ export default {
       &-item {
         text-align: center;
         margin-bottom: 20rpx;
-        & > view:first-child {
+        &-name{
           font-size: 36rpx;
         }
-        & > view:last-child {
+        &-amount {
+          font-size: 36rpx;
+          margin: 10rpx 0;
+        }
+        &-company {
           font-size: 24rpx;
-          margin-top: 20rpx;
+          color: #999
         }
       }
     }

package/src/components/JfbBaseWalletItem/JfbBaseWalletItem.vue

@@ -180,6 +180,7 @@ export default {
       wallet_type: "",
       walletInfo: {},
       status: false,
+      wallet_nnid: null
     };
   },
   watch: {
@@ -194,6 +195,7 @@ export default {
   methods: {
     async onJfbLoad(options) {
       this.type = options.type;
+      this.wallet_nnid = options.wallet_nnid;
       this.date = `${new Date().getFullYear()}-${String(
         new Date().getMonth() + 1
       ).padStart(2, "0")}`;
@@ -202,6 +204,7 @@ export default {
         vm: this,
         data: {
           wallet_type: this.wallet_type,
+          wallet_nnid: this.wallet_nnid,
         },
       })
         .then((res) => {
@@ -226,6 +229,7 @@ export default {
           page_token: this.page_token,
           operate_type: this.operate_type,
           wallet_type: this.wallet_type,
+          wallet_nnid: this.wallet_nnid,
         },
       })
         .then((res) => {
@@ -314,7 +318,7 @@ export default {
     },
     handleToBillDetail(item) {
       this.$xdUniHelper.navigateTo({
-        url: `${this.billDetailPath}?trade_id=${item.trade_id}`,
+        url: `${this.billDetailPath}?trade_id=${item.trade_id}&wallet_nnid=${this.wallet_nnid}`,
       });
     },
     handleConfirm(status) {
@@ -322,7 +326,7 @@ export default {
     },
     handleToEffective(item) {
       this.$xdUniHelper.navigateTo({
-        url: `${this.effectivePath}?wallet_type=${this.wallet_type}&type=${this.type}`,
+        url: `${this.effectivePath}?wallet_type=${this.wallet_type}&type=${this.type}&wallet_nnid=${this.wallet_nnid}`,
       });
     },
     /**