jufubao-base 1.0.130-beta5 → 1.0.130

package/src/components/JfbBaseUserOrder/JfbBaseUserOrder.vue

@@ -21,14 +21,14 @@
       <view :style="{borderRadius: bodyRadius + 'rpx', backgroundColor:bodyBackgroundColor, padding:outPadding}">
         <view class="my-order__add">
           <view :style="{color:cardNameColor}">我的订单</view>
-          <view @click="handleToLink(afterUrl)" :style="{borderColor:subColor || mainColor,color: subColor || mainColor}">售后订单</view>
+          <view @click="handleToLink(afterUrl)" :style="{borderColor:mainColor,color: mainColor}">售后订单</view>
         </view>
         <view
           class="my-order__content"
           :style="{
             borderRadius: radius + 'rpx',
             background: backgroundColor,
-            marginTop: spacing + 'rpx',
+            marginTop: margin.top ? margin.top + 'rpx': '20rpx',
             border: borderBox,
           }"
         >
@@ -75,18 +75,10 @@
     mixins: [componentsMixins,extsMixins,JfbBaseUserOrderMixin],
     computed: {
       outPadding() {
-        let str = `${this.checkValue(this.bodyPadding.top, 0)}rpx`;
-        str = `${str} ${this.checkValue(this.bodyPadding.right, 0)}rpx`;
-        str = `${str} ${this.checkValue(this.bodyPadding.bottom, 0)}rpx`;
-        str = `${str} ${this.checkValue(this.bodyPadding.left, 0)}rpx`;
-        return str
+        return `${this.bodyPadding.top || 20}rpx ${this.bodyPadding.right || 20}rpx ${this.bodyPadding.bottom || 20}rpx ${this.bodyPadding.left || 20}rpx`
       },
       outMargin() {
-        let str = `${this.checkValue(this.bodyMargin.top, 20)}rpx`;
-        str = `${str} ${this.checkValue(this.bodyMargin.right, 20)}rpx`;
-        str = `${str} ${this.checkValue(this.bodyMargin.bottom, 20)}rpx`;
-        str = `${str} ${this.checkValue(this.bodyMargin.left, 20)}rpx`;
-        return str
+        return `${this.bodyMargin.top || 0}rpx ${this.bodyMargin.right || 0}rpx ${this.bodyMargin.bottom || 0}rpx ${this.bodyMargin.left || 0}rpx`
       },
       borderBox() {
         if (this.is_border === 'Y') return `${this.is_border_w}rpx solid ${this.is_border_c}`;
@@ -103,7 +95,6 @@
         backgroundColor: 'rgba(0,0,0,0)',
         radius: 0,
         iconColor: '',
-        spacing:20,
 
         //边框
         is_border: 'Y',
@@ -120,15 +111,11 @@
         bodyBackgroundColor: 'rgba(0,0,0,0)',
         bodyMargin: {top: 0, left: 0, right: 0, bottom: 0},
         cardNameColor: '#333',
-        subColor:'',
       }
     },
     watch: {
       container(value) {
-        this.init(value);
-        if(this.$configProject.isPreview) {
-          this.onJfbLoad( this.options)
-        }
+        this.init(value)
       }
     },
     created() {
@@ -137,6 +124,7 @@
     methods: {
       onJfbLoad(options) {
         this.options = options;
+
         //处理方法
         const handle = (res)=>{
           this.list = this.list.map(item => {
@@ -158,7 +146,7 @@
               'com': [0, 4, 9, 99, 888][this.$xdUniHelper.random(0, 4)],
             };
             handle(res)
-          }, 400)
+          }, 1000)
         }
         else{
           jfbRootExec('getBaseOrderListCount', {
@@ -184,8 +172,6 @@
         this.bodyBackgroundColor = getContainerPropsValue(container, 'content.bodyBackgroundColor', 'rgba(0,0,0,0)');
         this.bodyPadding = getContainerPropsValue(container, 'content.bodyPadding', {top: 20, left: 20, right: 20, bottom: 20});
         this.cardNameColor = getContainerPropsValue(container, 'content.cardNameColor', '#333');
-        this.subColor = getContainerPropsValue(container, 'content.cardNameColor', '');
-        this.spacing = getContainerPropsValue(container, 'content.spacing', 20);
 
         //其他
         this.afterUrl = getContainerPropsValue(container, 'content.after_url', {value: ''}).value;

package/src/components/JfbBaseUserOrder/JfbBaseUserOrderLess.less

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

package/src/components/JfbBaseVideo/Attr.js

@@ -8,28 +8,16 @@ import console from "@dcloudio/uni-h5/src/core/helpers/console";
 export default {
   style:[],
   content:(params)=>{
-    let size = {width:750};
-    let video = {
-      size: Object.assign({},(params.video && params.video.size),size),
-      type:'1',
-      position: Object.assign({},params.video && params.video.position)
-    };
     return [
       {
-        label: '视频位置配置:',
-        ele: 'xd-site-poster',
-        valueKey: 'video',
-        groupKey:'content',
+        label: '视频位置配置:', //label
+        ele: 'xd-site-poster', //package 名称
+        valueKey: 'video', //form[valueKey]
         className: 'input80',
-        value:video,
+        value: params.video || {},
         setting: {
           count: 1,
-          scene: {label: '视频', value: 'video'},
-          sizeDisabled: {
-            wDisabled:true,
-            hDisabled: false,
-          },
-          typeDisabled: true
+          scene: {label: '视频', value: 'video'}
         },
         handleCustom({action, data}) {
           //设置场景参数
@@ -224,46 +212,32 @@ export default {
             loading.close()
           }
         },
+        inline: false,
+        notice: '',
         rules: [
-          {
-            required: true,
-            validator: (rule, value, callback) => {
-              let message = '请设置视频位置相关内容';
-              if(!value) {
-                callback(message);
-                return;
-              }
-              if(value.size && !value.size.height){
-                callback(message);
-                return
-              }
-              // if(value.position && (!value.position['position_name'] || !value.position['position_id'])) {
-              //   callback(message);
-              //   return
-              // }
-              callback()
-            },trigger: ['blur', 'change']
-          }
+          {required: true, message: '请选择视频位置', trigger: 'change'},
         ],
       },
       {
-        label: '背景颜色:',
-        ele: 'xd-color',
-        valueKey: 'bgColor',
-        groupKey:'style',
-        value: params.bgColor || '',
-        placeholder: '请选择背景颜色',
-        classNmae: 'input80',
+        label: '视频位边距设置:',
+        ele: 'xd-margin-padding',
+        valueKey: 'margin',
+        value: params.margin || null,
+        disabled: false,
+        setting: {
+          type: 'margin',
+        },
+        placeholder: '请设置视频位边距设置',
+
       },
       {
         label: '内容圆角设置:',
         ele: 'xd-site-select-list',
         valueKey: 'radius',
-        groupKey:'style',
         value: params['radius'] || '0',
         placeholder: '请选择内容圆角设置',
         multiple: false,
-        className: 'input60',
+        className: 'input80',
         handleCustom({action, data}) {
           XdBus.getParentApi('getOptionsSettingList')({
             setting_id: 'edtix_style_radius',
@@ -277,33 +251,6 @@ export default {
             });
         },
       },
-      {
-        label: '视频位边距设置:',
-        ele: 'xd-margin-padding',
-        valueKey: 'margin',
-        groupKey:'style',
-        value: params.margin || null,
-        setting: {
-          type: 'margin',
-        },
-        placeholder: '请设置视频位边距设置',
-        inline: false,
-        notice: '设置内边距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">0</span>像素',
-      },
-      {
-        label: '视频位填充设置:',
-        ele: 'xd-margin-padding',
-        valueKey: 'padding',
-        groupKey:'style',
-        value: params.padding || null,
-        setting: {
-          type: 'padding',
-        },
-        placeholder: '请设置视频位填充设置',
-        inline: false,
-        notice: '设置填充设置，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">0</span>像素',
-      },
-
     ].filter(i=>i)
   },
   advanced: [

package/src/components/JfbBaseVideo/JfbBaseVideo.vue

@@ -14,29 +14,16 @@
     </view>
     <!-- #endif -->
     <view class="jfb-base-video__body">
-      <view class="x-line"></view>
-      <view
-        class="x-video"
-        :style="{
-          backgroundColor:bgColor,
-          margin:outMargin,
-          borderRadius:radius + 'rpx',
-          padding:outPadding,
-          width: contentWidth + 'rpx',
-          height:contentHeight + 'rpx'
-        }"
-      >
-
+      <view class="float"></view>
+      <view class="video" v-if="video !== null">
         <xd-video
-          v-if="video !== null && video !== ''"
           :key="videoKey"
+          :margin="margin"
           :poster="videoSetting"
           :video="video"
+          :radius="radius"
           :pack-this="$vm"
         ></xd-video>
-        <view class="not-video" v-if="video === ''">
-          <image :src="getVideoSrc"></image>
-        </view>
       </view>
     </view>
   </view>
@@ -68,10 +55,6 @@
         video: null,
         videoSetting: null,
         margin:{},
-        padding:{},
-        height:0,
-        width:750,
-        bgColor:'',
         radius:0,
         $vm: {},
         videoKey : Date.now()
@@ -84,51 +67,39 @@
         if(this.autoplay === 'R') return 'iconplayreplay';
       },
       contentWidth(){
-        let margin = Number(this.checkValue(this.margin.left, 0)) + Number(this.checkValue(this.margin.right, 0));
-        let padding = Number(this.checkValue(this.padding.left, 0)) + Number(this.checkValue(this.padding.right, 0));
         let border = 0;
-        //if(this.isPreview) border = 2;
-        return this.width - (padding + margin + border);
+        if(this.isPreview) border = 2;
+        return 750 - (this.margin.left + this.margin.right + border);
       },
       contentHeight(){
-        let margin = Number(this.checkValue(this.margin.left, 0)) + Number(this.checkValue(this.margin.right, 0));
-        let padding = Number(this.checkValue(this.padding.left, 0)) + Number(this.checkValue(this.padding.right, 0));
         let border = 0;
-        //if(this.isPreview) border = 2;
-        let winWidth = this.width - (padding + margin + border);
+        if(this.isPreview) border = 2;
+        let winWidth = 750 - ((this.margin.left||0) + (this.margin.right||0) + border);
         return winWidth * this.height/this.width;
       },
+
       outMargin(){
-        let str = `${this.checkValue(this.margin.top, 0)}rpx`;
-        str = `${str} ${this.checkValue(this.margin.right, 0)}rpx`;
-        str = `${str} ${this.checkValue(this.margin.bottom, 0)}rpx`;
-        str = `${str} ${this.checkValue(this.margin.left, 0)}rpx`;
-        return str
-      },
-      outPadding(){
-        let str = `${this.checkValue(this.padding.top, 0)}rpx`;
-        str = `${str} ${this.checkValue(this.padding.right, 0)}rpx`;
-        str = `${str} ${this.checkValue(this.padding.bottom, 0)}rpx`;
-        str = `${str} ${this.checkValue(this.padding.left, 0)}rpx`;
-        return str
-      },
-      getVideoSrc(){
-        let width = Math.floor(this.contentWidth * this.$rpxNum);
-        let height = Math.floor(this.contentHeight * this.$rpxNum);
-        return `//dummyimage.com/${width}x${height}`;
+        let margin = `${this.margin.top !== null ? this.margin.top : 0}rpx`;
+        margin = `${margin} ${this.margin.right !== null ? this.margin.right : 0}rpx`;
+        margin = `${margin} ${this.margin.bottom !== null ? this.margin.bottom :0}rpx`;
+        margin = `${margin} ${this.margin.left !== null ? this.margin.left : 0}rpx`;
+        return margin;
       }
 		},
     watch: {
-      container(value, oloValue) {
-        if(JSON.stringify(value) === JSON.stringify(oloValue)) return;
+      container(value) {
         this.init(value);
-        if (this.$configProject['isPreview']) this.onJfbLoad(this.options)
+        if(this.timer) clearTimeout(this.timer);
+        this.timer = setTimeout(()=>{
+          if (this.$configProject['isPreview']) this.onJfbLoad(this.options)
+				}, 400)
       }
     },
     created() {
       this.$vm = this;
       this.isPreview = this.$configProject.isPreview;
       this.init(this.container);
+
     },
     methods: {
 
@@ -138,14 +109,8 @@
        */
       init(container) {
         this.videoSetting = getContainerPropsValue(container, 'content.video', {size:{width: 400, height: 300}, type: '1'});
-        if(this.videoSetting && this.videoSetting.size && this.videoSetting.size.height) {
-          this.height = Number(this.videoSetting.size.height) || 563;
-          this.width = 750;
-        }
-        this.margin = getContainerPropsValue(container, 'content.margin', {});
-        this.padding = getContainerPropsValue(container, 'content.padding', {});
+        this.margin = getContainerPropsValue(container, 'content.margin', {top:0, bottom:0, right:0, left: 0});
         this.radius = getContainerPropsValue(container, 'content.radius', 0);
-        this.bgColor = getContainerPropsValue(container, 'content.bgColor', 'rgba(0,0,0,0)');
       },
 
       onJfbLoad(options) {
@@ -162,7 +127,6 @@
             if(res && res.list &&  res.list.length > 0) {
               this.video = res.list[0];
             }
-            else this.video = '';
             this.videoKey = Date.now()
           })
           .catch(error => {
@@ -184,20 +148,15 @@
 
   .jfb-base-video {
     &__body{
-      .x-video {
-        overflow: hidden;
-      }
 
-      .not-video {
-        width: 100%;
-        height: 100%;
-
-        & > image {
-          width: 100%;
-          height: 100%;
-        }
-      }
     }
+
+  }
+
+  .float {
+    height: 1px;
+    width: 100%;
+    overflow: hidden;
   }
 
 </style>

package/src/components/JfbBaseVideo/JfbBaseVideoLess.less

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

package/src/components/JfbBaseVideo/XdVideo.vue

@@ -1,6 +1,18 @@
 <template>
-  <view class="video-box">
-    <view class="thumb" :class="{noImageUrl: !imageUrl}" v-if="!playStatus">
+  <view
+    class="video-box"
+    :style="{
+      width: contentWidth + 'rpx',
+      height:contentHeight + 'rpx',
+      margin: outMargin
+    }"
+  >
+    <view
+      class="thumb"
+      :class="{noImageUrl: !imageUrl}"
+      v-if="!playStatus"
+      :style="{borderRadius: radius + 'rpx'}"
+    >
       <image :src="imageUrl" v-if="imageUrl" />
       <view v-if="videoUrl" @click="handlePlay()">
         <xd-font-icon
@@ -8,6 +20,7 @@
           size="100"
           color="#fff"
         ></xd-font-icon>
+
       </view>
     </view>
     <view
@@ -39,7 +52,12 @@
       margin:{
         type: Object,
         default(){
-          return {}
+          return {
+            top:0,
+            left:0,
+            right:0,
+            bottom:0
+          }
         }
       },
       poster:{
@@ -63,6 +81,10 @@
       return {
         isPreview: false,
 
+        //css
+        width: 0,
+        height: 0,
+
         //play
         imageUrl: '',
         videoUrl: '',
@@ -76,6 +98,25 @@
         if(this.autoplay === 'E') return 'iconshibai';
         if(this.autoplay === 'R') return 'iconplayreplay';
       },
+      contentWidth(){
+        let border = 0;
+        if(this.isPreview) border = 2;
+        return 750 - (this.margin.left + this.margin.right + border);
+      },
+      contentHeight(){
+        let border = 0;
+        if(this.isPreview) border = 2;
+        let winWidth = 750 - ((this.margin.left||0) + (this.margin.right||0) + border);
+        return winWidth * this.height/this.width;
+      },
+
+      outMargin(){
+        let margin = `${this.margin.top !== null ? this.margin.top : 0}rpx`;
+        margin = `${margin} ${this.margin.right !== null ? this.margin.right : 0}rpx`;
+        margin = `${margin} ${this.margin.bottom !== null ? this.margin.bottom :0}rpx`;
+        margin = `${margin} ${this.margin.left !== null ? this.margin.left : 0}rpx`;
+        return margin;
+      }
     },
     watch:{
       poster(){
@@ -132,9 +173,6 @@
 
 <style scoped lang="less">
 .video-box {
-  width: 100%;
-  height: 100%;
-  box-sizing: border-box;
   view.noImageUrl {
     background: rgba(0,0,0,.6);
   }

package/src/components/JfbBaseWallet/JfbBaseWalletLess.less

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

package/src/components/{JfbBaseClear → JfbBaseWalletDetail}/Attr.js

@@ -11,7 +11,6 @@ export default {
     ].filter(i=>i)
   },
   advanced: [
-
   ],
 };