jufubao-base 1.0.311-beta1 → 1.0.311-beta101

package/package.json

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

package/src/components/JfbBaseBlock/Attr.js

@@ -1,43 +1,176 @@
 'use strict';
 
+import {dataVal, statusDataVal, statusShow} from "@/utils/AttrTools";
+
 /**
  * @description 当表单组件中有联动操作时候，使用方法进行返回
  */
 export default {
   style: [],
-  content: [
-    {
-      label: '',
-      ele: 'slot',
-      slot: 'is_reference_title',
-      groupKey:'advanced',
-    },
-    {
-      label: '背景颜色:',
-      ele: 'xd-color',
-      valueKey: 'bgcolor',
-      value: '',
-      groupKey:'style',
-      placeholder: '请输入占位框背景颜色',
-      classNmae: 'input80',
-    },
-    {
-      label: '高度:',
-      ele: 'el-input',
-      type: 'number',
-      valueKey: 'height',
-      groupKey:'style',
-      value: null,
-      classNmae: 'input60',
-      inline: false,
-      notice:'占位框高度，单位像素，默认：<span style="color:red">20</span>像素'
-    },
-    {
-      label: '',
-      ele: 'slot',
-      slot: 'is_reference',
-      groupKey:'advanced',
-    },
-  ],
+  content:(data, gValue, gColor, oldData)=>{
+    return  [
+      {
+        label: '',
+        ele: 'slot',
+        slot: 'is_reference_title',
+        groupKey:'advanced',
+      },
+      {
+        ele: 'title',
+        label: '基础',
+        size: 'small',
+        groupKey:'content',
+      },
+      {
+        label: '外边距',
+        ele: 'xd-radio',
+        groupKey: 'content',
+        valueKey: 'marginStatus',
+        value: statusDataVal({data, key:'marginStatus', fields:['margin'],gValue}),
+        labelInline:true,
+        list: [
+          {label: '默认', value: 'D'},
+          {label: '自定义', value: 'C'},
+        ]
+      },
+      {ele: 'group_start'},
+      {
+        label: '',
+        ele: 'xd-margin-padding',
+        groupKey:'content',
+        valueKey: 'margin',
+        value: dataVal({
+          data,
+          key:'margin',
+          dValue:0,
+          gValue,
+          isPM: true,
+        }),
+        hidden: !statusShow({data, key: 'marginStatus', fields:['margin'], gValue}),
+        setting: {
+          type: 'margin',
+        },
+      },
+      {ele: 'group_end'},
+      {
+        label: '背景颜色',
+        ele: 'xd-radio',
+        groupKey: 'content',
+        valueKey: 'bgcolorStatus',
+        value: statusDataVal({data, key:'bgcolorStatus', fields:['bgcolor'],gValue}),
+        labelInline:true,
+        list: [
+          {label: '默认', value: 'D'},
+          {label: '自定义', value: 'C'},
+        ]
+      },
+      {ele: 'group_start'},
+      {
+        label: '',
+        ele: 'xd-color',
+        valueKey: 'bgcolor',
+        value: dataVal({data, key:'bgcolor', dValue:'', gValue}),
+        hidden: !statusShow({data, key: 'bgcolorStatus', fields:['bgcolor'], gValue}),
+        placeholder: '请输入占位框背景颜色',
+        classNmae: 'input80',
+        groupKey: 'content',
+        labelInline: true,
+        setting: {
+          showAlpha: true
+        }
+      },
+      {ele: 'group_end'},
+      {
+        label: '高度',
+        ele: 'xd-radio',
+        groupKey: 'content',
+        valueKey: 'heightStatus',
+        value: statusDataVal({data, key:'heightStatus', fields:['height'],gValue}),
+        labelInline:true,
+        list: [
+          {label: '默认', value: 'D'},
+          {label: '自定义', value: 'C'},
+        ]
+      },
+      {ele: 'group_start'},
+      {
+        label: '',
+        ele: 'el-input',
+        type: 'number',
+        valueKey: 'height',
+        groupKey:'content',
+        value: dataVal({data, key:'height', dValue:'', gValue}), //默认0
+        hidden: !statusShow({data, key: 'heightStatus', fields:['height'], gValue}),
+        classNmae: 'input100',
+      },
+      {ele: 'group_end'},
+      {
+        label: '圆角',
+        ele: 'xd-radio',
+        groupKey: 'content',
+        valueKey: 'radiusStatus',
+        value: statusDataVal({data, key:'radiusStatus',cValue: 'N', fields:['radius'],gValue}),
+        labelInline:true,
+        list: [
+          {label: '默认', value: 'D'},
+          {label: '无圆角', value: 'N'},
+          {label: '自定义', value: 'C'},
+        ]
+      },
+      {ele: 'group_start'},
+      {
+        label: '',
+        ele: 'xd-site-select-list',
+        labelInline: true,
+        valueKey: 'radius',
+        value: dataVal({data, key:'radius', dValue:'10', gValue}),
+        hidden: !statusShow({data, key: 'radiusStatus', fields:['radius'], gValue}),
+        placeholder: '请选择圆角',
+        multiple: false,
+        className: 'input80',
+        groupKey:'content',
+        handleCustom({action, data}) {
+          XdBus.getParentApi('getOptionsSettingList')({
+            setting_id: 'edtix_style_radius',
+            key: Date.now()
+          })
+            .then(res => {
+              res.list = res.list.filter(item=>{
+                return item.label !== '无';
+              });
+              data.cb(res.list)
+            })
+            .catch(error => {
+              console.error(error);
+            });
+        },
+      },
+      {ele: 'group_end'},
+      {
+        label: '版本号:',
+        ele: 'el-input',
+        type: 'text',
+        groupKey: 'content',
+        valueKey: 'version',
+        value: 'v2.0',
+        hidden: true,
+      },
+      {
+        label: '过滤引用模版字段:',
+        ele: 'el-input',
+        type: 'text',
+        groupKey: 'content',
+        valueKey: 'refFilterKey',
+        value: '[]',
+        hidden: true,
+      },
+      {
+        label: '',
+        ele: 'slot',
+        slot: 'is_reference',
+        groupKey:'advanced',
+      },
+    ]
+  },
   advanced: [],
 };

package/src/components/JfbBaseBlock/JfbBaseBlock.vue

@@ -17,7 +17,7 @@
     </view>
     <!-- #endif -->
     <view class="jfb-base-block__body">
-      <view :style="{height: height + 'rpx', background: bgcolor}"></view>
+      <view :style="[contentStyle]"></view>
     </view>
   </view>
 </template>
@@ -28,7 +28,7 @@
   import JfbBaseBlockMixin from "./JfbBaseBlockMixin";
   import componentsMixins from "@/mixins/componentsMixins";
   import extsMixins from "@/mixins/extsMixins"
-  import {getContainerPropsValue} from "@/utils/xd.base";
+  import {getContainerPropsValue, gCPVal} from "@/utils/xd.base";
 
   export default {
     name: "JfbBaseBlock",
@@ -38,8 +38,7 @@
     mixins: [componentsMixins,extsMixins,JfbBaseBlockMixin],
     data() {
       return {
-        height: 10,
-        bgcolor: '#fff'
+        contentStyle:{},
       }
     },
     watch: {
@@ -52,11 +51,15 @@
       this.init(this.container);
     },
     methods: {
-      init(value) {
-        let bgcolor = getContainerPropsValue(value, 'content.bgcolor', 'rgba(0,0,0,0)');
-        let height = getContainerPropsValue(value, 'content.height', 20);
-        if (bgcolor) this.bgcolor = bgcolor;
-        if (height) this.height = height;
+      init(container) {
+        let radius = gCPVal(container, 'radius', [this.gStyleValue.radius,0],{sKey: 'radiusStatus', fields: ['radius']})||0;
+        let margin = gCPVal(container, 'margin', [0],{sKey: 'marginStatus', fields: ['margin'], isPMR: true});
+        this.contentStyle = {
+          backgroundColor: gCPVal(container, 'bgcolor', '',{sKey: 'bgcolorStatus', fields: ['bgcolor']}),
+          height: gCPVal(container, 'height', '20',{sKey: 'heightStatus', fields: ['height']}) + 'rpx',
+          borderRadius: radius + 'rpx',
+          margin: this.getMarginAndPadding(margin, 0)
+        };
       },
     }
   }

package/src/components/JfbBaseCardDetail/Attr.js

@@ -16,17 +16,5 @@ export default {
       },
       inline: false,
     },
-    {
-      label: '收集手机号地址:',
-      ele: 'xd-select-pages-path',
-      valueKey: 'collect_phone_url',
-      groupKey:'advanced',
-      placeholder: '请选择收集手机号地址',
-      value: null,
-      setting: {
-        router: XdBus.getParentApi('getPagesTree'),
-      },
-      inline: false,
-    },
   ],
 };

package/src/components/JfbBaseCardDetail/JfbBaseCardDetail.vue

@@ -94,49 +94,6 @@
       <!--        @onClose="handlePwdClose"-->
       <!--      ></xd-pw-pay>-->
     </view>
-    <xd-down-drawer
-    :show.sync="showDialog"
-    height="50vh"
-  >
-    <template>
-      <view class="top_title">请务必先关联，否则影响此卡使用</view>
-      <view class="method_item">
-        <view class="method_item_top">
-          <view class="method_title">方法一</view>
-          <view>复制文本，打开支付宝APP</view>
-        </view>
-        <view class="method_item_bottom">
-          <view class="method_item_bottom_left">吱口令：{{share_code}}</view>
-          <view class="method_item_bottom_right" @click="copy(share_code)">复制吱口令</view>
-        </view>
-      </view>
-      <view class="method_item">
-        <view class="method_item_top">
-          <view class="method_title">方法二</view>
-          <view>复制链接，在默认浏览器打开</view>
-        </view>
-        <view class="method_item_bottom">
-          <view class="method_item_bottom_left">{{sign_url}}</view>
-          <view class="method_item_bottom_right" @click="copy(sign_url)">复制链接</view>
-        </view>
-      </view>
-      <view class="method_item">
-        <view class="method_item_top">
-          <view class="method_title">方法三</view>
-          <view>保存图片，使用支付宝APP扫码</view>
-        </view>
-        <view class="method_item_bottom code_img">
-          <view>打开支付宝APP，点击扫一扫直接扫码或点击相册中保存图片</view>
-          <view class="code_box">
-            <view class="qr_code">
-              <image mode="aspectFit" :src="sign_url_qrcode"></image>
-            </view>
-            <view>长按保存二维码</view>
-          </view>
-        </view>
-      </view>
-    </template>
-  </xd-down-drawer>
   </view>
 </template>
 
@@ -153,7 +110,6 @@ import getBusinessImageUrl from "@/common/getBusinessImageUrl";
 import { Base64 } from "js-base64";
 import { getContainerPropsValue } from "@/utils/xd.base";
 import {mapState} from 'vuex';
-import XdDownDrawer from "@/components/XdDownDrawer/XdDownDrawer"
 
 export default {
   name: "JfbBaseCardDetail",
@@ -162,7 +118,6 @@ export default {
     XdPwPay,
     XdEditPwd,
     XdUnit,
-    XdDownDrawer,
   },
   mixins: [componentsMixins, extsMixins, JfbBaseCardDetailMixin],
   computed:{
@@ -216,25 +171,9 @@ export default {
       isBrandLogo: false,
 
       isShowUnbind: false, //是否启动绑定按钮
-      collect_phone_url: "",//收集手机号地址
-      showDialog:false,
-      sign_url:'',
-      share_code:'',
-      sign_url_qrcode:'',
-      toCollectPhoneUrl:'',
     };
   },
-  created() {
-     // ifDef小程序拼接问题
-    let url = this.$xdUniHelper.parseURL();
-    // #ifdef MP-WEIXIN
-    this.toCollectPhoneUrl = url.relative
-    // #endif
-    // #ifdef H5
-    this.toCollectPhoneUrl = '@site_domain@'+''+url.relative
-    // #endif
-    console.log(this.toCollectPhoneUrl,encodeURIComponent(this.toCollectPhoneUrl),'this.toCollectPhoneUrl')
-  },
+  created() {},
   methods: {
     onJfbLoad(options) {
       if (options["x-params"]) {
@@ -445,8 +384,6 @@ export default {
         this.timeStr = "01分19秒"
       }
       this.backUrl = getContainerPropsValue( this.container,  "content.back_url", { value: "" }).value;
-      this.collect_phone_url = getContainerPropsValue(container,  "content.collect_phone_url", { value: "" }).value;
-      console.log(this.collect_phone_url,'collect_phone_url')
     },
 
     /**
@@ -476,19 +413,6 @@ export default {
           }
 
           this.isShowUnbind = (res["is_can_unbind"] === 'Y' || res["is_can_unbind"] === undefined);
-           //支付宝弹框
-          if(res.enterprise_info&&res.enterprise_info.is_need_activate==='Y'){
-            this.share_code = res.enterprise_info.share_code;
-            this.sign_url = res.enterprise_info.sign_url;
-            this.sign_url_qrcode = res.enterprise_info.sign_url_qrcode;
-            if(res.enterprise_info.is_need_collect_phone_number==='Y'){
-              let url = `${this.collect_phone_url}?callback_url=${encodeURIComponent(this.toCollectPhoneUrl)}`
-              this.$xdUniHelper.navigateTo({
-                url:url,
-              });
-            }
-            this.showDialog = true;
-          }
         })
         .catch((err) => {
           // this.$refs["pwPay"].clearPwd();
@@ -512,26 +436,6 @@ export default {
     handlePwdClose() {
       this.$helper.navigateBack();
     },
-    /**
-     *@description 复制功能
-     * @param  text
-     */
-    copy(text) {
-      // #ifdef H5
-      this.$copyText(text).then((res) => {
-        this.$xdAlert({ content: "复制成功" });
-      });
-      // #endif
-      // #ifndef H5
-      uni.setClipboardData({
-        data: text,
-        showToast: false,
-        success: () => {
-          //this.$xdAlert({ content: "复制成功" });
-        },
-      });
-      // #endif
-    },
   },
 };
 </script>
@@ -691,70 +595,5 @@ export default {
       }
     }
   }
-  .method_item{
-    padding: unit(32, rpx);
-    border-bottom: 1px solid #F8F8F8;
-    color: #333333;
-    font-size: unit(28,rpx);
-    &_top{
-      display: flex;
-      align-items: center;
-    }
-    &_bottom{
-      display: flex;
-      justify-content: space-between;
-      align-items: flex-start;
-      margin-top: unit(16, rpx);
-      height: unit(32,rpx);
-      line-height: unit(32,rpx);
-      font-size: unit(24,rpx);
-      color: #666666;
-      &_right{
-        min-width: unit(180,rpx);
-        text-align: right;
-        color: #FF8D1A;
-      }
-      &_left{
-        color: #666666;
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
-      }
-    }
-    .code_img{
-      height: auto!important;
-    }
-
-  }
-  .method_title{
-    color: #fff;
-    background-color: #FF8D1A;
-    width: unit(120,rpx);
-    height: unit(50,rpx);
-    line-height: unit(50,rpx);
-    border-radius: unit(25,rpx);
-    text-align: center;
-    margin-right: unit(20,rpx);
-    font-size: unit(24,rpx);
-  }
-  .top_title{
-    height: unit(100,rpx);
-    text-align: center;
-    line-height:unit(100,rpx);
-    color:#333333;
-    font-size:unit(32,rpx);
-    border-bottom: 1px solid #F8F8F8;
-  }
-  .code_box{
-    text-align: center;
-    .qr_code{
-      width: unit(168,rpx);
-      height: unit(168,rpx);
-      image{
-        width: 100%;
-        height: 100%;
-      }
-    }
-  }
 }
 </style>

package/src/components/JfbBaseCardDetailEntry/Attr.js

@@ -73,17 +73,5 @@ export default {
       },
       inline: false,
     },
-    {
-      label: '收集手机号地址:',
-      ele: 'xd-select-pages-path',
-      valueKey: 'collect_phone_url',
-      groupKey:'advanced',
-      placeholder: '请选择收集手机号地址',
-      value: null,
-      setting: {
-        router: XdBus.getParentApi('getPagesTree'),
-      },
-      inline: false,
-    },
   ],
 };