jufubao-base 1.0.64-beta200 → 1.0.64-beta300

package/src/components/JfbBasePay/JfbBasePay.vue

@@ -229,6 +229,13 @@ export default {
     prod_bottom() {
       return this.fixedStyle({ height: 0, zIndex: 111 });
     },
+    getSuccessUrl(){
+      let url = this.paySuccessPath;
+      if(this.type === 'recharge') {
+        url = this.rechargeSuccessPath || url;
+      }
+      return url
+    },
     ...styleForm.getComputedItem(),
   },
   created() {
@@ -247,7 +254,7 @@ export default {
       this.type = options.type;
       this.p_getPayOrderDetail();
       this.p_getListUserPayChannel();
-      
+
       //充值不进行检查订单状态
       if(this.type !== 'recharge') {
         this.p_getBaseOrderDetail();
@@ -381,8 +388,9 @@ export default {
               },
             })
               .then((res) => {
-                if (this.type === "recharge") this.$xdUniHelper.redirectTo({url: this.rechargeSuccessPath + `?order_id=${this.main_order_id}`,});
-                this.$xdUniHelper.redirectTo({url: this.paySuccessPath + `?order_id=${this.main_order_id}`});
+                this.$xdUniHelper.redirectTo({
+                  url: this.getSuccessUrl + `?order_id=${this.main_order_id}`
+                });
               })
               .catch(error=>{
                 this.$xdLog.setARMSCustomError('update_loading_fail', {options: this.options, error});
@@ -449,7 +457,7 @@ export default {
       if (flat) this.channel_provider_id = channel_provider_id;
       else this.channel_provider_id = "";
     },
-   
+
     onJfbBack(options) {
       this.$xdUniHelper.navigateBack();
     },
@@ -506,11 +514,11 @@ export default {
         border-radius: 10rpx;
         margin: 0 auto 30rpx auto;
         padding: 30rpx 0 10rpx;
-        
+
         &:last-child {
           margin-bottom: 0;
         }
-        
+
         ._header {
           display: flex;
           justify-content: space-between;
@@ -579,7 +587,7 @@ export default {
       align-items: center;
       height: unit(120, rpx);
       background: #ffffff;
-      
+
       &-mask {
         height: unit(120, rpx);
       }

package/src/components/JfbBasePoster/Attr.js

@@ -25,6 +25,7 @@ export default {
           if(data) {
             data.params = Object.assign({}, {scene: 'normal'}, data.params || {})
           }
+          console.log(action,data,'hjhjhjhjhj');
 
           //获取显示内容
           if (action === 'screenList') {
@@ -336,7 +337,16 @@ export default {
           {"label": "两行", "value": 2},
         ]
       },
-
+      params['isCarousel']===2&&params['rows']===1&&{
+        label: '是否启用配套背景:',
+        ele: 'xd-radio',
+        valueKey: 'isSupport',
+        value: params['isSupport'] || 'Y',
+        list: [
+          {"label": "启用", "value": 'Y'},
+          {"label": "禁用", "value": 'N'},
+        ]
+      },
 
     ].filter(i=>i)
   },

package/src/components/JfbBasePoster/JfbBasePoster.vue

@@ -83,6 +83,9 @@
 				:content="info"
 			></more-screen>
     </view>
+    <view v-for="(item,index) in info" :key="index" style="position: absolute; top: -19999px; left: -100000px">
+        <image :src="item.image_background_url" ></image>
+      </view>
   </view>
 </template>
 
@@ -131,6 +134,8 @@
         rows: 1, //四分屏起作用
         radius: 0,
 				timer: null,
+        isSupport: 'Y',
+        currentImage: '',
 				info: [],
         mS: {
           top: 0,
@@ -258,7 +263,34 @@
         this.timer = setTimeout(()=>{
           if (this.$configProject['isPreview']) this.onJfbLoad()
 				}, 400)
-      }
+      },
+      isSupport(n,o) {
+        if(this.isPreview) {
+          if(n==='N') {
+          this.$xdRoot.$emit("setLayoutPageBg", null);
+        } else {
+          this.$xdRoot.$emit("setLayoutPageBg", this.currentImage);
+        }
+        }
+      },
+      rows(n,o) {
+        if(this.isPreview) {
+          if(n!==1) {
+          this.$xdRoot.$emit("setLayoutPageBg", null);
+        } else {
+          this.$xdRoot.$emit("setLayoutPageBg", this.currentImage);
+        }
+        }
+      },
+      isCarousel(n,o) {
+        if(this.isPreview) {
+          if(n!==2) {
+          this.$xdRoot.$emit("setLayoutPageBg", null);
+        } else {
+          this.$xdRoot.$emit("setLayoutPageBg", this.currentImage);
+        }
+        }
+      },
     },
     created() {
       this.init(this.container);
@@ -276,7 +308,11 @@
 				}
         return temp
 			},
-      handleAnimationfinish(e) {
+      handleAnimationfinish(e) {  
+        this.currentImage = this.info[e.detail.current]['image_background_url']
+        if(this.isSupport==='Y' && this.rows===1 && this.isCarousel===2) {
+          this.$xdRoot.$emit("setLayoutPageBg", this.info[e.detail.current]['image_background_url']);
+        }    
         this.current = e.detail.current;
       },
       handleClick(item) {
@@ -329,15 +365,21 @@
         }
       },
       handleImage(list){
-      	return list.map(item => {
+      	return list.map((item,index) => {
           return {
             ...item,
+            image_background_url: getServiceUrl(item.image_background_url),
             image_url: getServiceUrl(item.image_url)
           }
         })
 			},
       handleOne(list){
         this.info = this.handleImage(list);
+        let current = this.current || 0;
+        this.currentImage = this.info[current]['image_background_url']        
+        if(this.isSupport==='Y' && this.rows===1 && this.isCarousel===2) {
+          this.$xdRoot.$emit("setLayoutPageBg", this.currentImage);
+        }
 			},
    
 			getDefualtValue(key){
@@ -355,17 +397,18 @@
         if (this.poster.type) {
           this.posterType = this.poster.type
         }
-        if(this.poster.position) {
+        if(this.poster.position) { 
           this.posterPosition = this.poster.position
 				}
         this.radius = getContainerPropsValue(container, 'content.radius', 0);
         this.padding = getContainerPropsValue(container, 'content.padding', 0);
         this.rows = getContainerPropsValue(container, 'content.rows', 1);
+        this.isSupport = getContainerPropsValue(container, 'content.isSupport', 'Y');
         this.mS = getContainerPropsValue(container, 'content.margin', this.getDefualtValue('margin'));
         
         //content
         this.mode = getContainerPropsValue(container, 'content.dot_type', 'dot');
-        this.isCarousel = getContainerPropsValue(container, 'content.isCarousel', 1) === 2;
+        this.isCarousel = getContainerPropsValue(container, 'content.isCarousel', 1);
         this.carouselTime = Number(getContainerPropsValue(container, 'content.carouselTime', 5)) * 1000;
         this.useNumber = getContainerPropsValue(container, 'content.number', 1);
         
@@ -386,6 +429,7 @@
           },
         })
           .then(res => {
+            
             if(res.list.length === 0 && this.isPreview) {
               res.list = this.getTestData();
 						}

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);