jufubao-base 1.0.237-beta13 → 1.0.237-beta15

package/package.json

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

package/src/components/JfbBaseOrderDetail/JfbBaseOrderDetail.vue

@@ -590,6 +590,9 @@
             >
               <view :style="{ fontWeight: item.style }">{{ item.label }}</view>
               <xd-unit
+                :isShowIcon="isShowIcon"
+                :colorNew="isPlusSite ? '#999':''"
+                :largeZero="false"
                 :fontSize="28"
                 :iconSize="0.28"
                 :fontWeight="item.style"
@@ -992,7 +995,14 @@ export default {
         padding: padding,
         backgroundColor: this.bottomBgColor,
       }
-    }
+    },
+    isShowIcon() {
+      if(this.$configProject['isPreview']) return true;
+      return this.siteInfo.mapping.is_show_coin_icon==='Y'
+    },
+    isPlusSite(){
+      return this.projectAttr.headers['X-Site-Group']==="vip";
+    },
   },
   created() {
     this.noticeBgc = Color(this.warningColor).alpha(0.2).toString();
@@ -1658,6 +1668,28 @@ export default {
           border-radius: unit(8, rpx);
         }
 
+         &-bottom {
+        margin-top: unit(32, rpx);
+
+        &-title {
+          color: #333333;
+          font-size: unit(28, rpx);
+          font-weight: 500;
+          margin-bottom: unit(20, rpx);
+        }
+
+        &-item {
+          color: #666666;
+          font-size: unit(28, rpx);
+          display: flex;
+          margin-bottom: unit(16, rpx);
+
+          & > view:nth-child(2) {
+            width: 80%;
+          }
+        }
+      }
+
         &-info {
           flex: 1;
           display: flex;
@@ -1728,8 +1760,32 @@ export default {
           margin-bottom: 0 !important;
         }
       }
+
+      &-bottom {
+        margin-top: unit(32, rpx);
+
+        &-title {
+          color: #333333;
+          font-size: unit(28, rpx);
+          font-weight: 500;
+          margin-bottom: unit(20, rpx);
+        }
+
+        &-item {
+          color: #666666;
+          font-size: unit(28, rpx);
+          display: flex;
+          margin-bottom: unit(16, rpx);
+
+          & > view:nth-child(2) {
+            width: 80%;
+          }
+        }
+      }
+      
     }
 
+
     &-num {
       &-info {
         display: flex;
@@ -1852,7 +1908,7 @@ export default {
         color: #737373;
       }
     }
-
+ 
     &-order {
       display: flex;
       align-items: center;

package/src/components/JfbBaseSavingDetail/JfbBaseSavingDetail.vue

@@ -311,14 +311,12 @@
           let max = this.getAmout(res.total_amount);
           // 数量
           let value = this.getAmout(res.save_amount);
-          // 计算
-          let rate = Math.round((value * 1000) / max)||0;
           this.option = {
             backgroundColor: '#fff', // 设置图表区域的背景颜色
             borderRadius: 10, // 设置图表区域的圆角
             title: [
               {
-                text: '{a|周期已省}\n{b|' + rate + '}', // 显示标题
+                text: '{a|周期已省}\n{b|' + value + '}', // 显示标题
                 show: true, // 是否显示
                 x: 'center', // x轴位置
                 y: 'center', // y轴位置
@@ -405,14 +403,12 @@
           let max = this.getAmout(res.total_amount);
           // 数量
           let value = this.getAmout(res.save_amount);
-          // 计算
-          let rate = Math.round((value * 1000) / max)||0;
           this.option = {
             backgroundColor: '#fff', // 设置图表区域的背景颜色
             borderRadius: 10, // 设置图表区域的圆角
             title: [
               {
-                text: '{a|周期已省}\n{b|' + rate + '}', // 显示标题
+                text: '{a|周期已省}\n{b|' + value + '}', // 显示标题
                 show: true, // 是否显示
                 x: 'center', // x轴位置
                 y: 'center', // y轴位置

package/src/components/JfbBaseWithDrawRecord/JfbBaseWithDrawRecord.vue

@@ -174,7 +174,7 @@
           color: #333;
         }
 
-        &> :last-child {
+        &> view:last-child {
           color: #CCCCCC;
         }
       }
@@ -204,7 +204,7 @@
             color: #999999;
           }
 
-          &> :last-child {
+          &> view:last-child {
             color: #ccc;
             font-size: 26rpx;
             display: flex;