jufubao-base 1.0.181-beta6 → 1.0.181-beta8

package/package.json

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

package/src/components/JfbBaseCardReceiveCover/Attr.js

@@ -30,6 +30,15 @@ export default {
           { required: true, message: '请上传图片', trigger: ['blur', 'change'] },
         ]
       },
+      {
+        label: '可领取背景颜色:',
+        ele: 'xd-color',
+        valueKey: 'canReceiveBgColor',
+        value: data['canReceiveBgColor'] || '',
+        groupKey: "style",
+        placeholder: '请输入可领取背景颜色',
+        classNmae: 'input80',
+      },
       {
         label: '不可领取背景图:', //label
         ele: 'xd-upload', //package 名称
@@ -53,6 +62,15 @@ export default {
           { required: true, message: '请上传图片', trigger: ['blur', 'change'] },
         ]
       },
+      {
+        label: '不可领取背景颜色:',
+        ele: 'xd-color',
+        valueKey: 'cannotReceiveBgColor',
+        value: data['cannotReceiveBgColor'] || '',
+        groupKey: "style",
+        placeholder: '请输入不可领取背景颜色',
+        classNmae: 'input80',
+      },
       {
         label: '按钮背景图:', //label
         ele: 'xd-upload', //package 名称
@@ -119,7 +137,7 @@ export default {
         ele: 'xd-color',
         valueKey: 'btnColor',
         value: data['btnColor'] || '',
-        groupKey: "content",
+        groupKey: "style",
         placeholder: '请输入按钮文字颜色',
         classNmae: 'input80',
       },

package/src/components/JfbBaseCardReceiveCover/JfbBaseCardReceiveCover.vue

@@ -15,13 +15,24 @@
       >
     </view>
     <!-- #endif -->
-    <view :style="bgStyle" class="jfb-base-card-receive-cover__body">
-      <view v-if="status==='N'" class="content" :style="contentBgStyle">
-        <view class="content-info">{{ greeting }}</view>
+    <view
+      :style="{
+        height: layoutInfo.bodyMinHeightRpx + 'rpx',
+        background: status === 'N' ? canReceiveBgColor : cannotReceiveBgColor,
+      }"
+    >
+      <view class="jfb-base-card-receive-cover__body" :style="[bgStyle]">
+        <view v-if="status === 'N'" class="content" :style="contentBgStyle">
+          <view class="content-info">{{ greeting }}</view>
+        </view>
+        <view
+          v-if="status === 'N'"
+          class="btn"
+          @click="handleToReceive"
+          :style="btnBgStyle"
+          >{{ status === "T" ? "链接已失效" : "立即领取" }}</view
+        >
       </view>
-      <view v-if="status==='N'" class="btn" @click="handleToReceive" :style="btnBgStyle">{{
-        status === "T" ? "链接已失效" : "立即领取"
-      }}</view>
     </view>
   </view>
 </template>
@@ -52,6 +63,8 @@ export default {
       status: "N",
       cannotReceiveBg: "",
       canReceiveBg: "",
+      cannotReceiveBgColor: "",
+      canReceiveBgColor: "",
     };
   },
   computed: {
@@ -59,7 +72,10 @@ export default {
       let status = this.status;
       return {
         height: this.layoutInfo.bodyMinHeightRpx + "rpx",
-        backgroundImage: status==='N' ? `url(${this.canReceiveBg})` : `url(${this.cannotReceiveBg})`,
+        backgroundImage:
+          status === "N"
+            ? `url(${this.canReceiveBg})`
+            : `url(${this.cannotReceiveBg})`,
         backgroundSize: "100% 100%",
       };
     },
@@ -77,13 +93,13 @@ export default {
         border: "none",
       });
     },
-    contentBgStyle() {
-      return this.styleObjectToString({
+    contentBgStyle() {      
+      return [this.styleObjectToString({
         backgroundImage: "url(" + this.contentBg + ")",
         backgroundRepeat: "no-repeat",
         backgroundSize: "100% 100%",
         color: this.mainColor,
-      });
+      })];
     },
   },
   watch: {
@@ -128,6 +144,11 @@ export default {
           path: "",
         }
       ).path;
+      this.canReceiveBgColor = getContainerPropsValue(
+        container,
+        "content.canReceiveBgColor",
+        "#000"
+      );
       this.cannotReceiveBg = getContainerPropsValue(
         container,
         "content.cannotReceiveBg",
@@ -135,6 +156,11 @@ export default {
           path: "",
         }
       ).path;
+      this.cannotReceiveBgColor = getContainerPropsValue(
+        container,
+        "content.cannotReceiveBgColor",
+        "#000"
+      );
       this.receive_get_url = getContainerPropsValue(
         container,
         "content.receive_get_url",