jufubao-base 1.0.61-beta1013 → 1.0.61-beta1015

package/package.json

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

package/src/components/JfbBaseCardDetailEntry/JfbBaseCardDetailEntry.vue

@@ -82,25 +82,26 @@
     <view :style="{height: '100rpx'}"></view>
         <!-- 靠底支付 -->
         <view class="fixe_bottom" :style="prod_bottom">
-          <!-- <xd-button
-          size="small"
-          type="primary">
-          消费记录
-        </xd-button> -->
-          <xd-button
-          v-if="info.is_exchange==='Y'"
-          @click="handleToShift"
-          size="small"
-          type="primary">
-          券转换
-        </xd-button>
-          <xd-button
-          v-if="isShowUnbind"
-          @click="handleUnBindCard"
-          size="small"
-          type="primary">
-          解除绑定
-        </xd-button>
+          <view v-if="0">
+            <xd-button size="small" type="primary" width="100%">消费记录</xd-button>
+          </view>
+          <view v-if="info.is_exchange==='Y'">
+            <xd-button
+              width="100%"
+              @click="handleToShift"
+              size="small"
+              type="primary"
+            >券转换</xd-button>
+          </view>
+          <view v-if="isShowUnbind">
+            <xd-button
+              width="100%"
+              @click="handleUnBindCard"
+              size="small"
+              type="primary">
+              解除绑定
+            </xd-button>
+          </view>
         </view>
     </view>
   </view>
@@ -354,7 +355,7 @@ export default {
             if (this.$configProject.isPreview) {
               console.log("handleBindLogin", "预览模式不跳转", this.inCallback);
             }
-            
+
             else {
               this.handleToApp(entry);
             }
@@ -377,7 +378,7 @@ export default {
       }
       const {dir, path, host} = item;
       let nsp = Base64.encodeURI(JSON.stringify({business_code: entry['business_code']}));
-      
+
       //外站配置地址
       if (entry.redirect_type === 'URL') {
         if (item['path'].indexOf('?') === -1) {
@@ -386,13 +387,13 @@ export default {
         this.toApp(redirectUrl);
         return;
       }
-      
+
       //站内转换
       let jumpUrl = item.path;
       //#ifdef H5
       jumpUrl = `//${host}/${dir}${path}`;
       //#endif
-  
+
       if (item['fixed_business_code'] === '') {
         redirectUrl = `${jumpUrl}?x-common=${nsp}&vs=${new Date().getTime()}`
       }
@@ -571,18 +572,18 @@ export default {
   overflow: hidden;
   border-radius: unit(16, rpx);
   margin-bottom: unit(30, rpx);
-  
+
   &:last-child {
     margin-bottom: 0;
   }
-  
-  
+
+
   &__title {
     height: unit(56, rpx);
     display: flex;
     justify-content: flex-start;
     align-items: center;
-    
+
     & > view {
       padding: 0 unit(80, rpx);
       font-size: unit(24, rpx);
@@ -591,23 +592,23 @@ export default {
       color: #fff;
       border-radius: 0 0 unit(16, rpx) 0;
     }
-    
+
   }
-  
+
   &__content {
     padding: unit(10, rpx) unit(40, rpx) 0;
     height: unit(86, rpx);
     display: flex;
     justify-content: space-between;
     align-items: center;
-    
+
     & > view:first-child {
       font-size: unit(36, rpx);
       line-height: unit(86, rpx);
       color: #fff;
       font-weight: 700;
     }
-    
+
     & > view:nth-child(2) {
       font-size: unit(24, rpx);
       display: flex;
@@ -618,32 +619,32 @@ export default {
       color: #fff;
     }
   }
-  
+
   &__date {
     padding: 0 unit(40, rpx);
     font-size: unit(28, rpx);
     line-height: unit(32, rpx);
     color: #fff;
   }
-  
+
   &__yue {
     padding: unit(10, rpx) unit(40, rpx) 0;
     font-size: unit(28, rpx);
     line-height: unit(32, rpx);
     color: #fff;
-    
+
     & > text:nth-child(2) {
       font-weight: 700;
     }
   }
-  
+
   &__other {
     display: flex;
     justify-content: flex-start;
     align-items: center;
     padding: unit(20, rpx) unit(40, rpx) 0;
     margin-top: unit(0, rpx);
-    
+
     & > view {
       border-radius:unit(8, rpx);
       background: rgba(255, 255, 255, 0.2);
@@ -657,17 +658,17 @@ export default {
       padding: 0 unit(20, rpx);
       color: #fff;
     }
-    
-    
+
+
   }
-  
+
   &__nodata {
     padding: unit(20, rpx) unit(40, rpx) 0;
     margin-top: unit(0, rpx);
     color: #fff;
     font-size: unit(28, rpx);
   }
-  
+
   &__entry {
     padding: unit(20, rpx) unit(40, rpx) 0;
     & > view {
@@ -680,26 +681,26 @@ export default {
       font-weight: 500;
     }
   }
-  
+
   &__entrys {
     margin: unit(20, rpx) unit(20, rpx) 0;
     padding: unit(30, rpx);
     border-radius: unit(16, rpx);
     background: rgba(255, 255, 255, 1);
     box-shadow: 0 unit(4, rpx) unit(8, rpx) rgba(156, 62, 0, 0.11);
-    
+
     &-title {
       display: flex;
       justify-content: space-between;
       align-items: center;
-     
-      
+
+
       & > view:first-child {
         font-size: unit(28, rpx);
         font-weight: 500;
         flex: 1;
       }
-      
+
       & > view:nth-child(2) {
         display: flex;
         justify-content: flex-start;
@@ -709,11 +710,11 @@ export default {
         color: #999;
       }
     }
-    
+
     &-scroll {
-    
+
     }
-  
+
     &-item {
       display: flex;
       justify-content: flex-start;
@@ -721,7 +722,7 @@ export default {
       flex-flow: nowrap;
       margin-left: unit(-14, rpx);
       padding-top: unit(20, rpx);
-      
+
       & > view {
         width: unit(120, rpx);
         margin-right: unit(10, rpx);
@@ -730,25 +731,25 @@ export default {
         justify-content: center;
         flex-direction: column;
         align-items: center;
-        
+
         & > view:first-child {
           width: unit(76, rpx);
           height: unit(76, rpx);
           overflow: hidden;
-    
+
           & > image {
             height: 100%;
             width: 100%;
           }
         }
-        
+
         & > view:nth-child(2) {
           margin-top: unit(10, rpx);
           font-size: unit(24, rpx);
           line-height: unit(36, rpx);
           margin-bottom: unit(10, rpx);
         }
-        
+
         & > view:nth-child(3) {
           display: flex;
           justify-content: flex-start;
@@ -757,17 +758,17 @@ export default {
           font-size: unit(20, rpx);
           color: #999;
         }
-        
+
         &:last-child {
           margin-right: 0;
         }
-        
+
       }
-      
-      
+
+
     }
   }
-  
+
   &-warp {
     width: unit(700, rpx);
     // min-height: unit(290, rpx);
@@ -803,12 +804,11 @@ export default {
         box-sizing: border-box;
         height: unit(200, rpx);
         width: 100%;
-        margin-top: unit(20, rpx);
 
         & > view {
           width: 100%;
           height: unit(200, rpx);
-          padding: unit(10, rpx);
+          padding: 0 unit(10, rpx) unit(10, rpx) unit(10, rpx);
           display: flex;
           justify-content: center;
           align-items: center;
@@ -857,7 +857,7 @@ export default {
       align-items: center;
       flex-flow: wrap;
       padding-left: unit(30, rpx);
-      
+
       & > view {
         width: unit(120, rpx);
         margin-right: unit(10, rpx);
@@ -866,25 +866,25 @@ export default {
         justify-content: center;
         flex-direction: column;
         align-items: center;
-        
+
         & > view:first-child {
           width: unit(76, rpx);
           height: unit(76, rpx);
           overflow: hidden;
-    
+
           & > image {
             height: 100%;
             width: 100%;
           }
         }
-        
+
         & > view:nth-child(2) {
           margin-top: unit(10, rpx);
           font-size: unit(24, rpx);
           line-height: unit(36, rpx);
           margin-bottom: unit(10, rpx);
         }
-        
+
         & > view:nth-child(3) {
           display: flex;
           justify-content: flex-start;
@@ -893,7 +893,7 @@ export default {
           font-size: unit(20, rpx);
           color: #999;
         }
-        
+
         &:last-child {
           margin-right: 0;
         }
@@ -902,19 +902,27 @@ export default {
     }
 
     .fixe_bottom{
+      display: flex;
+      align-items: center;
+      justify-content: space-around;
+      height: unit(100, rpx);
+      padding: 0 unit(40, rpx);
+      flex-flow: nowrap;
+      background: #FFF;
+      box-shadow: 0 0 unit(16, rpx) rgba(0,0,0,.05);
+      .flex_l{
         display: flex;
         align-items: center;
-        justify-content: space-between;
-        height: unit(100, rpx);
-        padding: 0 unit(40, rpx);
-        background: #FFF;
-        box-shadow: 0 0 unit(16, rpx) rgba(0,0,0,.05);
-        .flex_l{
-          display: flex;
-          align-items: center;
-          font-size: unit(32,rpx);
-        }
+        font-size: unit(32,rpx);
       }
+
+      & > view {
+        flex: 1;
+        padding:0 unit(15, rpx);
+
+      }
+
+    }
   }
 }
 </style>

package/src/components/JfbBaseCardEntry/JfbBaseCardEntry.vue

@@ -175,7 +175,7 @@
                   >进入{{item['entries'][0]['entry_name']}}</view>
                 </view>
                 <view class="card-list__nodata" v-if="item.entries.length === 0">暂无支持服务列表</view>
-                <view class="card-list__entrys" v-if="item.entries.length > 1">
+                <view class="card-list__entrys" v-if="item.entries.length > 1" @click.stop>
                   <view class="card-list__entrys-title">
                     <view>可兑换权益</view>
                     <view @click.stop="toDetail(item, false)">
@@ -617,19 +617,9 @@ export default {
     },
 
     toDetail(item, out=true) {
-      if(out) {
-        if(item.entries.length === 1) {
-          this.$xdUniHelper.navigateTo({
-            url: `${this.detailUrl}?card_number=${item["card_number"]}`,
-          }, false);
-        }
-      }
-      else{
-        this.$xdUniHelper.navigateTo({
-          url: `${this.detailUrl}?card_number=${item["card_number"]}`,
-        }, false);
-      }
-
+      this.$xdUniHelper.navigateTo({
+        url: `${this.detailUrl}?card_number=${item["card_number"]}`,
+      }, false);
     },
 
     onJfbLoad(options) {
@@ -1010,6 +1000,7 @@ export default {
         justify-content: center;
         flex-direction: column;
         align-items: center;
+        padding-bottom: unit(10,rpx);
 
         & > view:first-child {
           width: unit(76, rpx);