jufubao-base 1.0.71-beta2 → 1.0.71-beta4

package/package.json

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

package/src/components/JfbBaseConList/JfbBaseConList.vue

@@ -18,7 +18,7 @@
     <!-- #endif -->
     <view class="jfb-base-con-list__body" v-if="done">
       <view
-        v-if="couponList.length > 0"
+        v-if="couponList&&couponList.length > 0"
         :style="{
           backgroundImage: `url(${background})`,
           backgroundSize: '100%',
@@ -29,11 +29,11 @@
         <view class="jfb-base-con-list__body-content">
           <view class="jfb-base-con-list__body-content-header">
             <view class="jfb-base-con-list__body-content-header-left">
-              <view :style="{ backgroundColor: mainColor }"></view>
+              <view :style="{ backgroundColor: '#FF4D4A' }"></view>
               <view>赠送优惠券</view>
             </view>
             <view
-              :style="{ color: mainColor, backgroundColor: contentBackground }"
+              :style="{ color: '#FA2125', backgroundColor: contentBackground }"
               class="jfb-base-con-list__body-content-header-right"
               @click="showRule = true"
             >
@@ -90,7 +90,7 @@
                   >
                     <!-- <view
                     :style="{
-                      color: mainColor,
+                      color: '#FF4D4A',
                       display: 'flex',
                       alignItems: 'center',
                       fontSize: '28rpx',
@@ -211,8 +211,8 @@ export default {
   },
   methods: {
     init(value) {
-      this.contentBackground = Color(this.mainColor).alpha(0.2).toString();
-      this.iconColor = Color(this.mainColor).alpha(0.3).toString();
+      this.contentBackground = '#FFF8F8';
+      this.iconColor = '#FF4D4A';
     },
     getList() {
       jfbRootExec("getCouponList", {
@@ -238,10 +238,11 @@ export default {
                       )})`,
                       backgroundSize: "100%",
                       backgroundRepeat: "no-repeat",
+                      backgroundColor: '',
                       margin: "0",
                     }
                   : {
-                      backgroundColor: this.mainColor,
+                      backgroundColor: '#FB5B3F',
                       margin: "0",
                     };
                 //整块背景
@@ -382,7 +383,7 @@ export default {
       })
         .then((res) => {
           console.log(res, "ajajajajaj");
-          if (res.list.length > 0) {
+          if (res.list&&res.list.length > 0) {
             this.notice = res.list[0].content;
           }
         })

package/src/components/JfbBaseConList/Mock.js

@@ -1,18 +1,11 @@
 'use strict';
 
 module.exports = {
-  getCouponList: {
-    "list": [
-      {
-        "prize_id": 25,
-        "prize_name": "满100减1",
-        "prize_num": 23
-      }
-    ],
-    "background": "//sandbox-img.jufubao.cn/uploads/20231123/4767f11be07185af4d31c657812dd96f.jpg",
-    "app_coupon_url": "//sandbox-img.jufubao.cn/uploads/20231123/9709c60e75753585d7bab94699ce1d96.jpg",
-    "request_id": "60417690eab2c156"
-  },
+  getCouponList: {"list":[
+    {"prize_id":153,"prize_name":"满50减50","prize_type":"满减券","prize_num":1,"can_take":"Y","is_over":"N","can_take_num":"P","today_times":1,"today_num":0,"total_times":1,"total_num":0,"remain_card_count":55},
+    {"prize_id":153,"prize_name":"满50减50","prize_type":"满减券","prize_num":1,"can_take":"Y","is_over":"N","can_take_num":"P","today_times":1,"today_num":0,"total_times":1,"total_num":0,"remain_card_count":55},
+    {"prize_id":153,"prize_name":"满50减50","prize_type":"满减券","prize_num":1,"can_take":"Y","is_over":"N","can_take_num":"P","today_times":1,"today_num":0,"total_times":1,"total_num":0,"remain_card_count":55}
+  ],"background":"//sandbox-img.jufubao.cn/uploads/20231204/96b801e0dc27422c183dc90d905dd2ed.jpg","can_take":"Y","message":"","app_coupon_url":"//sandbox-img.jufubao.cn/uploads/20231205/fee9b644b83495c9ba8a4db277600b54.jpg","app_activity_button":"//sandbox-img.jufubao.cn/uploads/20231207/35f3065b2b2bc3fc2dda73d7b5b9eae8.jpg","app_coupon_button_bg_url":"//sandbox-img.jufubao.cn/uploads/20231212/026a3ea901f87f51b531d06c24604676.png","app_coupon_invalid_url":"//sandbox-img.jufubao.cn/uploads/20231208/8b153ce4870686a37295c16fbc992235.jpg","request_id":"a2603f2a480485f4"},
   getAllCoupon: {
     "request_id": "5987aa28c709d4ef"
   }