jufubao-base 1.0.45 → 1.0.46-beta2

package/package.json

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

package/src/components/JfbBaseCard/JfbBaseCard.vue

@@ -481,16 +481,18 @@ export default {
       this.inCallback = inCallback || this.allEntryPath || this.settings.index;
       this.getContent();
 
-      this.getCardList();
+      this.getCardList(options);
     },
 
-    getCardList() {
+    getCardList(options) {
+      let params = {is_all: 'Y'};
+      if(options['jfb_business_code']) {
+        params['card_business_code'] = options['jfb_business_code'];
+      }
       this.$xdShowLoading({});
       jfbRootExec("getListCardBind", {
         vm: this,
-        data: {
-          is_all: "Y",
-        },
+        data: params
       })
         .then((res) => {
           this.showDisabled = res.is_show_invalid_card_entrance;

package/src/components/JfbBaseCardV2/JfbBaseCardV2.vue

@@ -124,12 +124,15 @@
         let { inCallback } = options;
         if (inCallback) inCallback = Base64.decode(inCallback);
         this.inCallback = inCallback || this.settings.index;
-
+  
+        let params = {is_all: 'Y'};
+        if (options['jfb_business_code']) {
+          params['card_business_code'] = options['jfb_business_code'];
+        }
+        
         jfbRootExec("getListCardBind", {
           vm: this,
-          data: {
-            is_all: "Y",
-          },
+          data: params,
         }).then((res) => {
           this.cardList = res.list.map((item) => {
             item['card_point'] = this.$xdUniHelper.divisionFloatNumber(item.card_point,100);

package/src/components/JfbBaseCardV3/JfbBaseCardV3.vue

@@ -83,12 +83,15 @@
         let { inCallback } = options;
         if (inCallback) inCallback = Base64.decode(inCallback);
         this.inCallback = inCallback || this.settings.index;
-
+        
+        let params = {is_all: 'Y'};
+        if (options['jfb_business_code']) {
+          params['card_business_code'] = options['jfb_business_code'];
+        }
+        
         jfbRootExec("getListCardBind", {
           vm: this,
-          data: {
-            is_all: "Y",
-          },
+          data: params,
         }).then((res) => {
           this.cardList = res.list.map((item) => {
             item['card_point'] = this.$xdUniHelper.divisionFloatNumber(item.card_point,100);

package/src/components/JfbBaseUserInfo/JfbBaseUserInfo.vue

@@ -40,10 +40,16 @@
           <view class="no-image" :style="{borderColor: color}" v-else>
             <xd-font-icon :color="color" icon="iconwode_mian" size="90"></xd-font-icon>
           </view>
-          <view v-if="logined" :style="{color:color}">{{userInfo|getName}}</view>
+          <view v-if="logined && textType ==='N'" :style="{color:color}">{{userInfo|getName}}</view>
+          <view class="vertical-user" v-if="logined && textType ==='Y'" :style="{color:color}">
+            <view>{{userInfo|getName}}</view>
+            <view @click="handleToLink()">
+              <xd-font-icon :color="color" size="40" icon="iconshezhi_mian"></xd-font-icon>
+            </view>
+          </view>
         </view>
-        <view @click="handleToLink()" v-if="logined && 0">
-          <xd-font-icon :color="color" size="28" icon="iconshezhi_mian"></xd-font-icon>
+        <view @click="handleToLink()" v-if="logined && textType ==='N' ">
+          <xd-font-icon :color="color" size="40" icon="iconshezhi_mian"></xd-font-icon>
         </view>
       </view>
     </view>
@@ -145,7 +151,7 @@
     methods: {
       handleToLink(){
         this.$xdUniHelper.navigateTo({
-          url: this.address_url
+          url: '/pages/settings/settings'
         })
       },
       async onJfbLoad(options) {
@@ -189,6 +195,7 @@
         this.color = getContainerPropsValue(container, 'content.textColor', '#333');
         this.backgroundColor = getContainerPropsValue(container, 'content.backgroundColor', 'rgba(0,0,0,0)');
         this.textType = getContainerPropsValue(container, 'content.text_type', 'N');
+        this.textType = 'Y'
         
         this.is_shadow = getContainerPropsValue(container, 'content.is_shadow', 'N');
         this.is_shadow_bg = getContainerPropsValue(container, 'content.is_shadow_bg', '#fff');
@@ -207,6 +214,15 @@
 
 <style scoped lang="less">
   @import "./JfbBaseUserInfoLess.less";
+  
+  .vertical-user {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    & > view:nth-child(2) {
+      margin-left: unit(10, rpx);
+    }
+  }
 
   .jfb-base-user-info {
     &__body{
@@ -219,6 +235,7 @@
         &-left {
           display: flex;
           align-items: center;
+          flex: 1;
   
           &.vertical {
             width: 100%;
@@ -230,6 +247,10 @@
               flex-shrink: 0;
               padding-top: unit(20, rpx);
             }
+  
+            & > image, .no-image {
+              margin-right: unit(0, rpx);
+            }
           }
       
           & > image, .no-image {
@@ -254,6 +275,9 @@
           }
         }
         
+        & > view:nth-child(2) {
+          flex-shrink: 0;
+        }
       }
     }
   }