jufubao-base 1.0.63-beta217 → 1.0.63-beta218

package/src/components/JfbBaseUserOrder/JfbBaseUserOrder.vue

@@ -51,7 +51,7 @@
                   class="my-order__content-type-item-number"
                 >{{item.num}}</view>
               </view>
-              <view :style="{color: color}" class="my-order__content-type-item-text">{{item.label}}</view>
+              <view :style="{color: color}" class="my-order__content-type-item-text">{{item.customName || item.label}}</view>
             </view>
           </view>
         </view>
@@ -89,22 +89,22 @@
       return {
         options: {},
         list: [],
-  
+
         //基础
         color: '#333',
         backgroundColor: 'rgba(0,0,0,0)',
         radius: 0,
         iconColor: '',
-  
+
         //边框
         is_border: 'Y',
         is_border_w: 0,
         is_border_c: '',
-  
+
         //其他
         afterUrl: null,
         orderListUrl: null,
-        
+
         //整体
         bodyPadding: {top: 20, left: 20, right: 20, bottom: 20},
         bodyRadius: 0,
@@ -124,7 +124,7 @@
     methods: {
       onJfbLoad(options) {
         this.options = options;
-        
+
         //处理方法
         const handle = (res)=>{
           this.list = this.list.map(item => {
@@ -134,7 +134,7 @@
             }
           })
         };
-        
+
         //Preview
         if(this.$configProject.isPreview) {
           setTimeout(() => {
@@ -158,38 +158,38 @@
             console.error('getBaseOrderListCount', error)
           })
         }
-        
+
       },
       /**
        * @description 监听事件变化
        * @param container {object} 业务组件对象自己
        */
       init(container) {
-  
+
         //整体
         this.bodyMargin = getContainerPropsValue(container, 'content.bodyMargin', {top: 0, left: 0, right: 0, bottom: 0});
         this.bodyRadius = getContainerPropsValue(container, 'content.bodyRadius', 0);
         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.afterUrl = getContainerPropsValue(container, 'content.after_url', {value: ''}).value;
         this.orderListUrl = getContainerPropsValue(container, 'content.order_url', {value: ''}).value;
         this.margin = getContainerPropsValue(container, 'content.margin', {top: 0, left: 0, right: 0, bottom: 0});
-       
+
         //基础
         this.radius = getContainerPropsValue(container, 'content.radius', 0);
         this.color = getContainerPropsValue(container, 'content.textColor', '#333');
         this.iconColor = getContainerPropsValue(container, 'content.iconColor', this.mainColor);
         this.backgroundColor = getContainerPropsValue(container, 'content.backgroundColor', '#f8f8f8');
-        
+
         //边框
         this.is_border = getContainerPropsValue(container, 'content.is_border', 'N');
         this.is_border_c = getContainerPropsValue(container, 'content.is_border_c', '#f8f8f8');
         this.is_border_w = getContainerPropsValue(container, 'content.is_border_w', '2');
-  
-        
+
+
         this.list = getContainerPropsValue(container, 'content.orderTypeList', []).map(item=>{
           return {
             ...item,
@@ -198,17 +198,17 @@
           }
         })
       },
-      
+
       onJfbShow(options) {
         this.onJfbLoad(options);
       },
-  
+
       handleToLink(path, type) {
         this.$xdUniHelper.navigateTo({
           url: type ? `${path}?type=${type}` : path
         })
       },
-      
+
     }
   }
 
@@ -222,14 +222,14 @@
 
     }
   }
-  
+
   .my-order {
     &__add {
       display: flex;
       justify-content: space-between;
       align-items: center;
       font-size: unit(28, rpx);
-    
+
       & > view:nth-child(2) {
         width: unit(200, rpx);
         height: unit(60, rpx);
@@ -246,12 +246,12 @@
         justify-content: space-around;
         align-items: center;
         padding: unit(40, rpx) unit(20, rpx) unit(35, rpx);
-      
+
         &-item {
           font-size: unit(24, rpx);
           color: #999999;
           flex: 1;
-          
+
           &-icon {
             height: unit(40, rpx);
             width: unit(40, rpx);
@@ -261,7 +261,7 @@
             margin: 0 auto;
             position: relative;
           }
-          
+
           &-text {
             padding-top: unit(10, rpx);
             width: 100%;
@@ -270,7 +270,7 @@
             line-height: unit(48, rpx);
             text-align: center;
           }
-        
+
           &-number {
             position: absolute;
             top: unit(-20, rpx);

package/src/components/JfbBaseUserOrder/JfbBaseUserOrderLess.less

@@ -15,7 +15,7 @@
 .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;

package/src/components/JfbBaseVideo/JfbBaseVideoLess.less

@@ -15,7 +15,7 @@
 .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;

package/src/components/JfbBaseWebview/JfbBaseWebviewLess.less

@@ -15,7 +15,7 @@
 .jfb-base-webview {
   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;

package/src/components/JfbBaseWxAuthorize/JfbBaseWxAuthorizeLess.less

@@ -15,7 +15,7 @@
 .jfb-base-wx-authorize {
   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;

package/src/components/JfbBaseWxAuthorizeError/JfbBaseWxAuthorizeErrorLess.less

@@ -15,7 +15,7 @@
 .jfb-base-wx-authorize-error {
   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;