jufubao-base 1.0.269-beta3 → 1.0.269-beta5

package/package.json

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

package/src/components/JfbBaseConsumpCode/JfbBaseConsumpCode.vue

@@ -145,6 +145,9 @@
     >
       <shop-list
         v-if="showShopList"
+        :style="{
+          '--main-color': mainColor,
+        }"
         :getList="p_getShopList"
         @handleCityDone="handleCityDone"
         @handleCityChange="handleCityChange"

package/src/components/JfbBaseConsumpCode/shopList.vue

@@ -13,7 +13,7 @@
     </view>
     <view class="shop_list" v-if="list && list.length">
       <view
-        class="shop_item"
+        class="shop_item" :class="{active: i === 0}"
         v-for="(item,i) in list"
         :key="item.shop_id"
         @click="$emit('onChose', item)"
@@ -196,6 +196,11 @@ export default {
       background: #FFFFFF;
       padding: 20rpx;
       margin-bottom: 20rpx;
+      border-radius: 12rpx;
+
+      &.active{
+        border: 1px solid var(--main-color);
+      }
     }
     .shop_image{
       width: 200rpx;

package/src/components/JfbBaseLogin/JfbBaseLogin.vue

@@ -439,6 +439,7 @@ export default {
       customLogoUrl: {}, //自定义logo地址
       loginMenuMargin: {},
       share_code: "",
+      xShare: "",
     };
   },
   computed: {
@@ -611,6 +612,7 @@ export default {
         this.dialogPreview = true;
       }
       if(options['x-share']){
+        this.xShare = options['x-share'];
         let decodeParams = Base64.decode(options['x-share']);
         try{
           let commonParams = JSON.parse(decodeParams);
@@ -810,11 +812,10 @@ export default {
                 urlStr = `url=${url}`;
               }
 
-
               //需要授权操作
               if (res.auth_code) {
                 this.$xdUniHelper.navigateTo({
-                  url: `${regUrl}?auth_code=${res.auth_code}&provider_id=${this.quickLogin.provider_id}&${urlStr}`,
+                  url: `${regUrl}?auth_code=${res.auth_code}&provider_id=${this.quickLogin.provider_id}&x-share=${this.xShare}&${urlStr}`,
                 });
               }
               //无需授权直接进行登录
@@ -931,7 +932,6 @@ export default {
           }
         }, 1000);
       }).catch((error) => {
-        debugger
         this.$xdHideLoading();
         console.error(error);
         this.$xdLog.catch(error)

package/src/components/JfbBaseUserInfo/Api.js

@@ -13,6 +13,16 @@ module.exports = [
     isRule: false,
     isConsole: true,
     disabled: true,
+  },
+  {
+    mapFnName: "getVipMoneySaving",
+    title: "获取会员省钱金额",
+    path: '/member/v1/money-saving-record/total-amount',
+    isRule: false,
+    params: {
+    },
+    isConsole: true,
+    disabled: true
   }
 
 ];

package/src/components/JfbBaseUserInfo/JfbBaseUserInfo.vue

@@ -20,18 +20,18 @@
               <image v-else @click="handleToPersonal" :style="{border: `1px solid ${imageColor}`, borderRadius:imageRadius}" src="https://img1-b.jufubao.cn/uploads/20250528/e88bb70d4ccdcdd01a277bdf6b66c488.jpg"></image>
               <view class="jfb-base-user-info__body-plus-header-top-left-info">
                 <view class="jfb-base-user-info__body-plus-header-top-left-info-name" v-if="logined">
-                  <view :style="is_vip==='Y'?[plusNickNameStyle]:[normalNickNameStyle]">{{userInfo|getName}} </view>
+                  <view :style="[nickStyleComp]">{{userInfo|getName}} </view>
                   <view v-if="is_vip==='Y'"><text>PLUS</text>会员</view>
                   <view v-else>普通用户</view>
                 </view>
                 <view>
                   <view v-if="is_vip==='Y'">
-                    <text style="color:#D19E6B;">已省</text><text style="color: #FEE9CC;">￥30.00</text>
+                    <text style="color:#D19E6B;">已省</text><text style="color: #FEE9CC;">￥{{ $xdUniHelper.divisionFloatNumber(save_amount, 100) }}</text>
                   </view>
-                  <view v-else>
+                  <!-- <view v-else>
                     <text style="color:#CCCCCC;">开通会员预计可省</text>
                     <text style="color:#FFFFFF;">￥49.00</text>
-                  </view>
+                  </view> -->
                 </view>
               </view>
             </view>
@@ -42,7 +42,7 @@
           <view :style="[boxPlusStyleCompBottom]" :class="is_vip==='Y'?'is_vip_bottom':'is_normal_bottom'"
             class="jfb-base-user-info__body-plus-header-bottom">
             <view class="_left">
-              <view v-if="is_vip==='Y'">有效期至：2025年10月01日</view>
+              <view v-if="is_vip==='Y'">有效期至：{{ userInfo.vip_expire_time }}</view>
               <view v-else></view>
             </view>
             <view class="_right">
@@ -204,6 +204,9 @@
         if (this.is_border === 'Y') return `${this.is_border_w}rpx ${this.is_border_s} ${this.is_border_c}`;
         else return '0';
       },
+      nickStyleComp(){
+        return this.is_vip==='Y'? this.plusNickNameStyle:this.normalNickNameStyle
+      },
       plusNickNameStyle() {
         return {
           fontSize: this.plusNickStyle.fontSize || '32rpx',
@@ -257,6 +260,7 @@
         isSetting: 'N',
         // logoutName:'[退出登录]',
         imageRadius: '50%',
+        save_amount: 0,
 
         //基础
         imageColor: '#333',
@@ -378,10 +382,14 @@
         }).then(res => {
           res = res || {};
           if(res['head_url']) res['head_url'] = getServiceUrl(res['head_url'], 'size2')
+          res.vip_expire_time = this.$xdUniHelper.getDate(
+            res.vip_expire_time * 1000
+          ).fullDate;
           this.userInfo = res;
         }).catch(error => {
           console.log('getBaseUserInfo', error)
         })
+        this.p_getVipMoneySaving();
       },
       /**
        * @description 监听事件变化
@@ -451,6 +459,14 @@
           this.$xdRoot.$emit("setLayoutPageBg", bg);
         }
       },
+      p_getVipMoneySaving(){
+        jfbRootExec("getVipMoneySaving", {
+          vm: this,
+          data: {}
+        }).then(res => {
+          this.save_amount = res.save_amount;
+        })
+      },
       handleToPersonal(){
         this.$xdUniHelper.navigateTo({
           url: this.profilePath