jufubao-base 1.0.169-beta10 → 1.0.169-beta11

package/package.json

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

package/src/components/JfbBaseHeader/JfbBaseHeader.vue

@@ -110,7 +110,7 @@
         partnerName: "",
         useSearch: "N",   //Y:用于搜索;  N:用于跳转搜索页面
         searchPagePath: "",
-        placeholder: "搜索商品名称",
+        placeholder: "请输入关键词",
         choseCityPath: "",  //选择城市i
 
 
@@ -166,7 +166,7 @@
         this.showBack = getContainerPropsValue(container, "content.showBack", "Y");
         this.showPartner = getContainerPropsValue(container, "content.showPartner", "N")
         this.showPartnerName = getContainerPropsValue(container, "content.showPartnerName", "N");
-        this.placeholder = getContainerPropsValue(container, "content.placeholder");
+        this.placeholder = getContainerPropsValue(container, "content.placeholder",'请输入关键词');
         this.useSearch = getContainerPropsValue(container, "content.useSearch", "Y");
         this.searchPagePath = getContainerPropsValue(container, "content.searchPagePath", {value:""}).value;
         this.choseCityPath = getContainerPropsValue(container, "content.choseCityPath", {value:""}).value;

package/src/components/JfbBaseTfkCardBind/Attr.js

@@ -631,7 +631,7 @@ export default {
         valueKey: 'my_card_url',
         groupKey: 'advanced',
         placeholder: '请选择我的票券跳转地址',
-        value: null,
+        value: data.my_card_url || null,
         setting: {
           router: XdBus.getParentApi('getPagesTree'),
         },
@@ -643,7 +643,7 @@ export default {
         valueKey: 'back_url',
         groupKey: 'advanced',
         placeholder: '请选择卡绑定成功回跳地址',
-        value: null,
+        value: data.back_url || null,
         setting: {
           router: XdBus.getParentApi('getPagesTree'),
         },

package/src/components/JfbBaseTfkCardDetail/JfbBaseTfkCardDetail.vue

@@ -248,12 +248,12 @@
         return bg
       },
       listColWrapBoxStyle(){
-        let margin = `${this.checkValue(this.listColMargin.top, 20)}rpx`;
-        margin = `${margin} ${this.checkValue(this.listColMargin.right, 20)}rpx`;
-        margin = `${margin} ${this.checkValue(this.listColMargin.bottom, 20)}rpx`;
-        margin = `${margin} ${this.checkValue(this.listColMargin.left, 20)}rpx`;
+        let padding = `${this.checkValue(this.listColMargin.top, 20)}rpx`;
+        padding = `${padding} ${this.checkValue(this.listColMargin.right, 20)}rpx`;
+        padding = `${padding} ${this.checkValue(this.listColMargin.bottom, 20)}rpx`;
+        padding = `${padding} ${this.checkValue(this.listColMargin.left, 20)}rpx`;
         return this.styleObjectToString({
-          margin: margin,
+          padding: padding,
         })
       },
       listColItemStyle(){
@@ -652,7 +652,6 @@
         }
       }
       .list_col_wrap{
-        margin: 40rpx 0;
 
         .list_item{
           display: flex;

package/src/components/JfbBaseTfkSearch/ContentFilm.vue

@@ -160,6 +160,7 @@
     height: 100%;
     box-sizing: border-box;
     width: 160rpx;
+    min-height: 200rpx;
 
     & .score {
       height: 40rpx;