jufubao-base 1.0.297-beta23 → 1.0.298

package/package.json

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

package/src/components/JfbBaseChangeCompany/JfbBaseChangeCompany.vue

@@ -10,9 +10,7 @@
       :class="{ editx: isEditx && active }"
       v-if="isEditx && active"
     >
-      <view class="jfb-base-change-company__edit-icon" @click="delEdit"
-        >删除</view
-      >
+      <view class="jfb-base-change-company__edit-icon" @click="delEdit">删除</view>
     </view>
     <!-- #endif -->
     <view class="jfb-base-change-company__body">

package/src/components/JfbBaseChoseCompany/JfbBaseChoseCompany.vue

@@ -10,9 +10,7 @@
       :class="{ editx: isEditx && active }"
       v-if="isEditx && active"
     >
-      <view class="jfb-base-chose-company__edit-icon" @click="delEdit"
-        >删除</view
-      >
+      <view class="jfb-base-chose-company__edit-icon" @click="delEdit">删除</view>
     </view>
     <!-- #endif -->
     <view
@@ -257,9 +255,11 @@ export default {
           company_source_from: item.company_source_from,
         },
       }).then((res) => {
+
         //#ifdef MP-WEIXIN
         if (this.jfbAuthorize !== null) {
-          this.jfbAuthorize.setAllToken(res);
+          this.jfbAuthorize.setAllToken(res);//只返回用户登陆信息，无卡登陆信息
+          this.jfbAuthorize.removeAllCardToken();
         }
         //#endif
 

package/src/components/JfbBaseConsumpCode/Attr.js

@@ -1,20 +1,108 @@
 'use strict';
-import style from "./cusAttr/style";
-import advanced from "./cusAttr/advanced";
-import content from "./cusAttr/content";
 
 /**
  * @description 当表单组件中有联动操作时候，使用方法进行返回
  */
 export default {
   style: [],
-  advanced: [],
-  content: (data, gValue, gColor, oldData={})=>{
-
+  content: (data) => {
     return [
-      ...content(data, gValue,gColor,oldData),
-      ...style(data, gValue,gColor,oldData),
-      ...advanced(data),
+      {
+        label: "是否展示优先支付账户：",
+        ele: "xd-radio",
+        valueKey: "isShowPaySoft",
+        value: data.isShowPaySoft || "N",
+        groupKey: "content",
+        list: [
+          { label: "展示", value: "Y" },
+          { label: "不展示", value: "N" }
+        ]
+      },
+      {
+        label: '背景图片:', //label
+        ele: 'xd-upload', //package 名称
+        valueKey: 'bodyBgImg', //form[valueKey]
+        value: data.bodyBgImg || null, //v-model
+        defaultValue: data.bodyBgImg || null, //默认图片对象
+        groupKey: "content",
+        slot: true, //按钮是否使用slot
+        oneWidth: 200, //单个图片显示宽度
+        oneHeight: 350, //单个图片显示高度
+        elinputClassName: 'input40',
+        tipsformet: '上传文件格式：@imageType@，不超过@size@MB.',
+        type: ['jpg', 'png', 'jpeg'],
+        styleType: 'one', //其值：one=>单文件上传 auth=>证件正反面上传 list=>多文件上传
+        uploadType: 'aliyun', //''=>API服务上传  qiniu=>七牛云OSS上传  aliyun=> 阿里云OSS上传
+        size: 5, //5M
+        action: 'aliyun',
+        sort: true, //当上传图片列表时候，是否启用排序
+        maxlen: 100, //当上传图片列表时候，最大数量数量
+        rules: [
+          { required: true, message: '请上传图片', trigger: ['blur', 'change'] },
+        ]
+      },
+      {
+        label: '开通路径:',
+        groupKey:'advanced',
+        className: 'input100',
+        ele: 'xd-select-pages-path',
+        valueKey: 'openPath',
+        value: data['openPath'] || null,
+        setting: {
+          router: XdBus.getParentApi('getPagesTree')
+        },
+      },
+      {
+        label: '切换门店路径:',
+        groupKey:'advanced',
+        className: 'input100',
+        ele: 'xd-select-pages-path',
+        valueKey: 'shopPath',
+        value: data['shopPath'] || null,
+        setting: {
+          router: XdBus.getParentApi('getPagesTree')
+        },
+      },
+      {
+        label: '支付成功跳转路径:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'successPath',
+        value: data.successPath || null,
+        placeholder: '请选择支付成功跳转路径',
+        className: 'input100',
+        groupKey:'advanced',
+        setting: {
+          router: XdBus.getParentApi('getPagesTree')
+        },
+        inline: false,
+      },
+      {
+        label: '核销支付路径:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'cash_pay_path',
+        placeholder: '请选择核销支付路径',
+        value: data.cash_pay_path || null,
+        className: 'input100',
+        groupKey:'advanced',
+        setting: {
+          router: XdBus.getParentApi('getPagesTree')
+        },
+        inline: false,
+      },
+      {
+        label: '选取城市路径:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'cityPath',
+        placeholder: '请选择选取城市路径',
+        value: data.cityPath || null,
+        className: 'input100',
+        groupKey:'advanced',
+        setting: {
+          router: XdBus.getParentApi('getPagesTree')
+        },
+        inline: false,
+      },
     ].filter(i=>i)
   },
+  advanced: [],
 };