jufubao-base 1.0.133 → 1.0.134-beta3

package/src/components/JfbBaseWxAuthorize/JfbBaseWxAuthorize.vue

@@ -15,8 +15,14 @@
     <!-- #endif -->
     <view class="jfb-base-wx-authorize__body">
       <view class="app-body">
-        <view class="app-body__bg" :style="{ height: layoutInfo.bodyMinHeightRpx + 'rpx'}">
-          <image :src="bgImage" mode="widthFix"></image>
+        <view
+          class="app-body__bg"
+          :style="{
+            height: layoutInfo.bodyMinHeightRpx + 'rpx',
+            backgroundImage:'url('+ (bgImage ? bgImage:'none') + ')',
+            color:'#ff0'
+          }"
+        >
         </view>
         <view class="app-body__bottom">
           <view class="app-body__bottom-btn">
@@ -68,7 +74,7 @@
   import getServiceUrl from "@/common/getServiceUrl";
   import {Base64} from 'js-base64';
   import {mapState} from 'vuex';
-  
+
   export default {
     name: "JfbBaseWxAuthorize",
     components: {
@@ -107,7 +113,7 @@
       this.isPreview = this.$configProject.isPreview;
       this.init(this.container);
     },
-  
+
     methods: {
       handlePrivacy(code) {
         let params = `page_id=${this.pageAttr["page_id"]}`;
@@ -116,11 +122,11 @@
           url: `/pages/content/content?${params}`
         })
       },
-      
+
       handleRadioClick(e) {
         this.selectPolicy = !this.selectPolicy;
       },
-  
+
       decryptPhoneNumber(e) {
         if (e === undefined) {
           this.$xdConfirm({
@@ -136,10 +142,10 @@
         if (e.detail.errMsg.indexOf('fail') !== -1) {
           return;
         }
-    
+
         let {iv, encryptedData} = e.detail;
         let raw_data = JSON.stringify({iv, encryptedData});
-        
+
         jfbRootExec("userPhoneWxLogin", {
           vm: this,
           data: {
@@ -160,7 +166,7 @@
               $vm: this,
               isTitle: false,
               showClose: false,
-              content: '用户登陆失败',
+              content: '用户登录失败',
               cancel: false,
               confirmText: '我知道了',
               zIndex: this.isPreview ? 2000 : 1400
@@ -171,16 +177,16 @@
             $vm: this,
             isTitle: false,
             showClose: false,
-            content: '用户登陆失败',
+            content: '用户登录失败',
             cancel: false,
             confirmText: '我知道了',
             zIndex: this.isPreview ? 2000 : 1400
           });
         })
-        
+
       },
-      
-     
+
+
       /**
        * @description 监听事件变化
        * @param container {object} 业务组件对象自己
@@ -191,7 +197,7 @@
         this.notice = getContainerPropsValue(container, 'content.notice', '');
         this.textColor = getContainerPropsValue(container, 'content.textColor', '#fff');
       },
-  
+
       onJfbLoad(options = {}) {
         if(this.$xdUniHelper.checkVarType(options) === 'object') {
           this.auth_code = options.auth_code;
@@ -224,30 +230,30 @@
     height: 100%;
     position: relative;
     box-sizing: border-box;
-  
+
     &__bg {
       width: 100%;
       display: flex;
       justify-content: center;
       align-items: center;
-    
-      & > image {
-        width: 100%;
-      }
+      background-repeat: no-repeat;
+      background-size: 100% 100%;
+      background-position: top left;
+
     }
-  
+
     &__bottom {
       position: absolute;
       bottom: unit(80, rpx);
       right: unit(30, rpx);
       left: unit(30, rpx);
-    
+
       &-btn {
         display: flex;
         justify-content: center;
         align-items: center;
         padding-bottom: unit(26, rpx);
-      
+
         & > button {
           width: unit(400, rpx);
           height: unit(90, rpx);
@@ -262,13 +268,13 @@
           color: #fff;
         }
       }
-    
+
       &-tips {
         font-size: @xd-font-size-base;
         color: #fffbf9;
         text-align: center;
       }
-    
+
       &-policy {
         padding-top: unit(50, rpx);
         display: flex;
@@ -276,21 +282,21 @@
         align-items: center;
         font-size: @xd-font-size-base;
         color: #fffbf9;
-      
+
         & > view:first-child {
           transform: scale(0.7);
         }
-      
+
         & > view:last-child {
           display: flex;
           justify-content: flex-start;
           align-items: center;
           flex-wrap: wrap;
-  
+
           & > view:first-child {
             color: #fff;
           }
-        
+
           .privacy_book {
             color: #e5e5e5;
             text-decoration: underline;

package/src/components/JfbBaseWxAuthorize/JfbBaseWxAuthorizeLess.less

@@ -13,9 +13,8 @@
 
 //start
 .jfb-base-wx-authorize {
-  border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(50, rpx);
+  min-height: unit(100, rpx);
 
   &__body{
       position: relative;
@@ -23,21 +22,21 @@
       z-index: 2
   }
 
-  &.editx {
+  &.editx,&:hover {
     position: relative;
-    border: 1px dashed blue;
-    box-sizing: border-box;
-    z-index: 3
-
-  }
-
-  &:hover {
-    border: 1px dashed blue;
-  }
+    z-index: 3;
+    &::after {
+      border: 2rpx dashed blue;
+      content: " ";
+      position: absolute;
+      top:0;
+      left:0;
+      bottom:0;
+      right:0;
+      z-index: 4;
+      cursor: pointer;
+    }
 
-  &.noBorder {
-    border-color: rgba(0,0,0,0);
-    border-width: 0;
   }
 
 
@@ -72,9 +71,9 @@
 
 /**notPreview**/
 .jfb-base-wx-authorize {
-  &:before {
-    content: " ";
-    display: table;
-  }
+  //&:before {
+    //content: " ";
+    //display: table;
+  //}
 }
 /**endNotPreview**/

package/src/components/JfbBaseWxAuthorizeError/Attr.js

@@ -7,33 +7,37 @@ export default {
   style: [],
   content: (data) => {
     return [
-      {
-        label: '提示图片:', //label
-        ele: 'xd-upload', //package 名称
-        valueKey: 'noticeBg', //form[valueKey]
-        value: data.noticeBg || null, //v-model
-        defaultValue: data.noticeBg || null, //默认图片对象
-        slot: true, //按钮是否使用slot
-        tipsformet: '上传文件格式：@imageType@，不超过@size@MB.，建议尺寸：800*800像素',
-        type: ['jpg', 'png', 'jpeg'],
-        styleType: 'one', //其值：one=>单文件上传 auth=>证件正反面上传 list=>多文件上传
-        uploadType: 'aliyun', //''=>API服务上传  qiniu=>七牛云OSS上传  aliyun=> 阿里云OSS上传
-        size: 5, //5M
-        action: 'aliyun',
-      },
       {
         label: '按钮自定义文案:',
         ele: 'el-input',
         type: 'text',
         valueKey: 'btn_placeholder',
+        groupKey: 'content',
         value: data.btn_placeholder || '',
         placeholder: '按钮自定义文案',
         className: 'input80'
       },
       {
-        label: '返回地址路径:', //label
-        ele: 'xd-select-pages-path', //package 名称
-        valueKey: 'backPath', //form[valueKey]
+        label: '提示图片:',
+        ele: 'xd-upload',
+        valueKey: 'noticeBg',
+        groupKey: 'content',
+        value: data.noticeBg || null,
+        defaultValue: data.noticeBg || null,
+        slot: true,
+        tipsformet: '上传文件格式：@imageType@，不超过@size@MB.，建议尺寸：200*200像素',
+        type: ['jpg', 'png', 'jpeg'],
+        styleType: 'one',
+        uploadType: 'aliyun',
+        size: 5, //5M
+        action: 'aliyun',
+      },
+
+      {
+        label: '返回地址路径:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'backPath',
+        groupKey: 'advanced',
         value: data['backPath'] || {},
         setting: {
           router: XdBus.getParentApi('getPagesTree')

package/src/components/JfbBaseWxAuthorizeError/JfbBaseWxAuthorizeError.vue

@@ -18,7 +18,7 @@
         <image v-if="noticeBg" :src="noticeBg"></image>
         <xd-font-icon v-else icon="iconguanbi_xian" :size="130" color="#FF5733"></xd-font-icon>
       </view>
-      
+
       <view class="jfb-base-wx-authorize-error__body-text">{{message}}</view>
       <xd-button
         mode="scaleToFill"
@@ -78,9 +78,9 @@ export default {
       let back = back_url || inCallback;
       if(message) this.message = Base64.decode(message)
 
-      //登陆成功调整地址优先级
+      //登录成功调整地址优先级
       this.inCallback = back || this.$settings.index;
-      
+
     },
     /**
      * @description 监听事件变化
@@ -127,7 +127,7 @@ export default {
     display: flex;
     flex-direction: column;
     align-items: center;
-    
+
     & .icon {
       padding: unit(50, rpx) 0 0;
       width: unit(160, rpx);

package/src/components/JfbBaseWxAuthorizeError/JfbBaseWxAuthorizeErrorLess.less

@@ -13,9 +13,8 @@
 
 //start
 .jfb-base-wx-authorize-error {
-  border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(50, rpx);
+  min-height: unit(100, rpx);
 
   &__body{
       position: relative;
@@ -23,21 +22,21 @@
       z-index: 2
   }
 
-  &.editx {
+  &.editx,&:hover {
     position: relative;
-    border: 1px dashed blue;
-    box-sizing: border-box;
-    z-index: 3
-
-  }
-
-  &:hover {
-    border: 1px dashed blue;
-  }
+    z-index: 3;
+    &::after {
+      border: 2rpx dashed blue;
+      content: " ";
+      position: absolute;
+      top:0;
+      left:0;
+      bottom:0;
+      right:0;
+      z-index: 4;
+      cursor: pointer;
+    }
 
-  &.noBorder {
-    border-color: rgba(0,0,0,0);
-    border-width: 0;
   }
 
 
@@ -72,9 +71,9 @@
 
 /**notPreview**/
 .jfb-base-wx-authorize-error {
-  &:before {
-    content: " ";
-    display: table;
-  }
+  //&:before {
+    //content: " ";
+    //display: table;
+  //}
 }
 /**endNotPreview**/

package/src/components/JfbBaseLine/Attr.js

@@ -1,59 +0,0 @@
-'use strict';
-
-export default {
-  style: [],
-  advanced: [],
-  content: [
-    {
-      label: '背景颜色:', //label
-      ele: 'xd-color', //package 名称
-      valueKey: 'bgcolor', //form[valueKey]
-      value: '', //v-model
-      placeholder: '请输入占位框背景颜色',
-      classNmae: 'input80', //样式名称 //input100,input80,input70,input60,input50,input40,input30,input20,
-      rules: [
-        {
-          required: true,
-          message: '请输入占位框背景颜色',
-          trigger: 'blur'
-        },
-      ]
-    },
-    {
-      label: '分割线高度:', //label
-      ele: 'el-input', //package 名称
-      type: 'number',
-      valueKey: 'height', //form[valueKey]
-      value: 1, //v-model
-      placeholder: '请输入分割线高度，单位像素',
-      classNmae: 'input80', //样式名称 //input100,input80,input70,input60,input50,input40,input30,input20,
-      rules: [
-        {
-          required: true,
-          message: '请输入分割线高度',
-          trigger: 'blur'
-        },
-      ]
-    },
-    {
-      label: '分割线边距:', //label
-      ele: 'xd-margin-padding', //package 名称
-      valueKey: 'margin', //form[valueKey]
-      value: null, //v-model
-      placeholder: '请输入分割线边距',
-      classNmae: 'input80', //样式名称 //input100,input80,input70,input60,input50,input40,input30,input20,
-      rules: [
-        {
-          required: true,
-          message: '请输入分割线边距，单位像素',
-          trigger: 'blur'
-        },
-      ]
-    },
-    {
-      label: '', //label
-      ele: 'slot', //package 名称
-      slot: 'is_reference',
-    },
-  ]
-}

package/src/components/JfbBaseLine/JfbBaseLine.vue

@@ -1,105 +0,0 @@
-<template>
-  <view
-    class="jfb-base-line"
-    @click="handleEditxSelect"
-    :class="{
-      editx : isEditx && active,
-      noBorder: noBorder
-    }"
-  >
-    <!--#ifdef H5-->
-    <view
-      class="jfb-base-line__edit"
-      :class="{ editx : isEditx && active }"
-      v-if="isEditx && active && !noBorder"
-    >
-      <view class="jfb-base-line__edit-icon" @click="delEdit">删除</view>
-    </view>
-    <!-- #endif -->
-    <view class="jfb-base-line__body">
-      <view
-        :style="{
-          height: height * 2 + 'rpx',
-          background: bgcolor,
-          marginTop: topMargin * 2 + 'rpx',
-          marginBottom: bottomMargin * 2 + 'rpx',
-          marginLeft: leftMargin * 2 + 'rpx',
-          marginRight: rightMargin * 2 + 'rpx',
-        }"
-      ></view>
-    </view>
-  </view>
-</template>
-
-<script>
-  import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
-  import JfbBaseLineMixin from "./JfbBaseLineMixin";
-  import componentsMixins from "@/mixins/componentsMixins";
-  import extsMixins from "@/mixins/extsMixins"
-  import {getContainerPropsValue} from "@/utils/xd.base";
-  
-  export default {
-    name: "JfbBaseLine",
-    components: {
-      XdFontIcon
-    },
-    mixins: [componentsMixins,extsMixins,JfbBaseLineMixin],
-    data() {
-      return {
-        height: 1, //px
-        bgcolor: '#ececec',
-        topMargin: 2, //px
-        bottomMargin: 2,//px
-        leftMargin: 0, //px
-        rightMargin: 0 //px
-      }
-    },
-    watch: {
-      container(value) {
-        this.init(value)
-      }
-    },
-    created() {
-      this.init(this.container);
-    },
-    methods: {
-      init(value) {
-        let bgcolor = getContainerPropsValue(value, 'content.bgcolor');
-        let height = getContainerPropsValue(value, 'content.height');
-        let margin = getContainerPropsValue(value, 'content.margin');
-        if (bgcolor) this.bgcolor = bgcolor;
-        if (height) this.height = height;
-        
-        if(margin) {
-          this.topMargin = margin.top;
-          this.bottomMargin = margin.bottom;
-          this.rightMargin = margin.right;
-          this.leftMargin = margin.left;
-        }
-      },
-    }
-  }
-
-</script>
-
-<style scoped lang="less">
-  @import "./JfbBaseLineLess.less";
-
-  .jfb-base-line {
-
-
-    &__body{
-      display: flex;
-      justify-content: center;
-      align-items: center;
-
-      & > view {
-        overflow: hidden;
-        display: flex;
-        flex-flow: wrap;
-        width: 100%;
-        box-sizing: border-box;
-      }
-    }
-  }
-</style>

package/src/components/JfbBaseLine/JfbBaseLineLess.less

@@ -1,80 +0,0 @@
-/**
-* @desc 获取绝对路径完整地址
-* @param @path
-**/
-//例如：https://image.jufubao.cn/20220501010108/image/bg/default_gonghui_bg.png
-@basePath: 'business/';
-@doMain: '//sandbox-img.jufubao.cn/';
-
-.getBusinessImageUrl(@path, @size: 'size8') {
-  @url: "@{doMain}@{basePath}@{path}?x-oss-process=style/@{size}";
-  background-image: url(@url);
-}
-
-//start
-.jfb-base-line {
-  border: 1px dashed rgba(0, 0, 0, 0);
-  box-sizing: border-box;
-  min-height: unit(50, rpx);
-
-  &__body{
-      position: relative;
-      overflow: hidden;
-      z-index: 2
-  }
-
-  &.editx {
-    position: relative;
-    border: 1px dashed blue;
-    box-sizing: border-box;
-    z-index: 3
-
-  }
-
-  &:hover {
-    border: 1px dashed blue;
-  }
-
-  &.noBorder {
-    border-color: rgba(0,0,0,0);
-    border-width: 0;
-  }
-
-
-  &__edit {
-    cursor: pointer;
-    position: absolute;
-    right: unit(0, rpx);
-    top: unit(-52, rpx);
-    height: unit(50, rpx);
-    line-height: unit(50, rpx);
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    background: rgba(0, 0, 0, .6);
-    border-radius: unit(10, rpx);
-    box-shadow: 0 0 10px rbga(0, 0, 0, 0.3);
-    color: #fff;
-    font-size: unit(22, rpx);
-
-    &-icon{
-      padding: 0 unit(20, rpx);
-    }
-
-    &.editx {
-      box-sizing: border-box;
-
-    }
-  }
-}
-//end
-
-
-/**notPreview**/
-.jfb-base-line {
-  &:before {
-    content: " ";
-    display: table;
-  }
-}
-/**endNotPreview**/

package/src/components/JfbBaseLine/JfbBaseLineMixin.js

@@ -1,30 +0,0 @@
-'use strict';
-
-
-//@AttrImport
-import Attr from "./Attr";
-//@EndAttrImport
-
-
-export default {
-  data() {
-    return {
-      //#ifdef H5
-      
-      //@AttrData
-      Attr:{}, //对外开发编辑属性
-      //@EndAttrData
-      
-      // #endif
-      cssRoot: 'jfb-base-line'
-    }
-  },
-  created() {
-    
-    //@AttrDataCreated
-    this.Attr = this.$xdUniHelper.customClone(Attr);
-    //@EndAttrDataCreated
-    
-
-  },
-}