jufubao-base 1.0.232-beta7 → 1.0.232-beta8

package/package.json

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

package/src/components/JfbBaseCodeOpenVip/Attr.js

@@ -263,6 +263,18 @@ export default {
         },
         inline: false,
       },
+      {
+        label: '支付页面跳转路径:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'payPath',
+        groupKey:'advanced',
+        placeholder: '请选择支付页面跳转路径',
+        value: data['payPath'] || null,
+        setting: {
+          router: XdBus.getParentApi('getPagesTree'),
+        },
+        inline: false,
+      },
     ].filter(i=>i)
   },
   advanced: [],

package/src/components/JfbBaseCodeOpenVip/JfbBaseCodeOpenVip.vue

@@ -79,6 +79,7 @@
         //todo
         description: "",
         vipSuccessPath: "",
+        payPath: "",
       }
     },
     computed: {
@@ -114,6 +115,7 @@
       init(container) {
         this.description = getContainerPropsValue(container, 'content.description', "");
         this.vipSuccessPath = getContainerPropsValue(container, 'content.vipSuccessPath', {value: ""}).value;
+        this.payPath = getContainerPropsValue(container, 'content.payPath', {value: ""}).value;
       },
       handlePrivacy(code){
         let params = `page_id=${this.pageAttr["page_id"]}`;
@@ -144,10 +146,19 @@
             business_code: this.xnamespace,
             product_id: this.vipInfo.product_id,
             notify_provider_id: this.projectAttr.notify_provider_id,
-            need_pay_price: 0
+            need_pay_price: 0,
+            selected_card_list_json: this.vipInfo.selected_card_list_json
           }
         }).then(res => {
-
+          if(res.need_pay_price > 0){
+            this.$xdUniHelper.redirectTo({
+              url: this.payPath + `?order_id=${res.pay_order_id}&main_order_id=${res.main_order_id}`
+            })
+          }else{
+            this.$xdUniHelper.redirectTo({
+              url: this.vipSuccessPath + `?order_id=${res.main_order_id}`
+            })
+          }
         })
       },
       onJfbScroll(options) {

package/src/components/JfbBaseConsumpCode/Mock.js

@@ -16,7 +16,7 @@ module.exports = {
 
   getConsumpSettleMainInfo: { "shop_id": 1037266, "shop_logo": "\/uploads\/20230710\/44f645b06fe4da358f7b0ee06259afcd.jpg", "shop_name": "a加盟商-185", "shop_brand": 100003, "shop_partner_name": "A加盟商-余额测试", "settle_tag_list": [{ "label": "幸福西饼、goodlike品牌", "value": 262, "price": 0, "price_yuan": "0.00", "is_static_price": false, "icon_url": "https:\/\/sandbox-img.jufubao.cn\/uploads\/20230728\/70f4dd90cdf2681e71ccf41d332d71a0.jpeg" }], "request_id": "a4a6cfe9db905597" },
 
-  getConsumpBaseUserInfo: { "user_name": "", "user_code": "WuE5Wotf08", "nickname": "张三", "real_name": "", "head_url": "https:\/\/thirdwx.qlogo.cn\/mmopen\/vi_32\/AOqEDeiaxss8GR4jD1GicIgyqWSOZV8xN23Iw3DOzFjVBzTFbdv21X7u9ZASQJYsTNm07XSq6ebzp4K4qu1JT26qGZ0qYFMe1nHdQjFZib83Fg\/132", "province_code": "", "city_code": "", "province_name": "", "city_name": "", "sex": "1", "sex_name": "男", "birthday_date": "2025-04-16", "phone_number": "177****7945", "show_user_name": "张三", "user_level": "VIP", "vip_expire_time": 1776157293, "request_id": "f1dbb1c0bb8da893" }，
+  getConsumpBaseUserInfo: { "user_name": "", "user_code": "WuE5Wotf08", "nickname": "张三", "real_name": "", "head_url": "https:\/\/thirdwx.qlogo.cn\/mmopen\/vi_32\/AOqEDeiaxss8GR4jD1GicIgyqWSOZV8xN23Iw3DOzFjVBzTFbdv21X7u9ZASQJYsTNm07XSq6ebzp4K4qu1JT26qGZ0qYFMe1nHdQjFZib83Fg\/132", "province_code": "", "city_code": "", "province_name": "", "city_name": "", "sex": "1", "sex_name": "男", "birthday_date": "2025-04-16", "phone_number": "177****7945", "show_user_name": "张三", "user_level": "VIP", "vip_expire_time": 1776157293, "request_id": "f1dbb1c0bb8da893" },
 
   addConsumpCashierTempOrderData: { "cart_order_id": "c08f38347ec8bc5b", "request_id": "779bf62e988587ce" }
 }

package/src/components/JfbBaseOpenVip/JfbBaseOpenVip.vue

@@ -26,8 +26,8 @@
             <view v-else class="vip_level">普通用户</view>
           </view>
           <view class="u_sub">
-            <view v-if="isVip">已省xx</view>
-            <view v-else>{{ uInfo.phone_number }}</view>
+            <view v-if="isVip" style="color:#999999;">已省xx</view>
+            <view v-else style="color:#333333;">{{ uInfo.phone_number }}</view>
           </view>
         </view>
         <view class="buy_btn" @click="showDrawer=true">立即续费</view>
@@ -67,7 +67,7 @@
         </view>
       </view>
       
-      <xd-vip-list :list="vipCardList"
+      <xd-vip-list v-if="!isVip" :list="vipCardList"
         @handlePrivacy="handlePrivacy"
         @toVipDetail="toVipDetail"
       ></xd-vip-list>
@@ -258,6 +258,7 @@
           }
           .u_sub{
             margin-top: 24rpx;
+            font-size: 24rpx;
           }
         }
         .buy_btn{

package/src/components/JfbBaseShare/JfbBaseShare.vue

@@ -15,28 +15,30 @@
     <!-- #endif -->
     <view class="jfb-base-share__body">
       <view class="card_wrap">
-        <swiper class="card_swiper" next-margin="50rpx" previous-margin="50rpx">
-          <swiper-item class="swiper_item" v-for="i in 3" :key="i">
+        <swiper class="card_swiper" next-margin="50rpx" previous-margin="50rpx" :current="shareIndex" @change="handleSwitch">
+          <swiper-item class="swiper_item" v-for="(item,i) in shareList" :key="i">
             <view class="swiper_item-inner">
-              <view class="swiper_item-logo"></view>
+              <image :src="item.share_image_url" mode="aspectFill"></image>
+              <!-- <view class="swiper_item-logo"></view>
               <view class="swiper_item-title">邀请好友领福利</view>
               <view class="swiper_item-qrcode"></view>
-              <view class="swiper_item-visit">邀请码<br/>LWNXK7H</view>
+              <view class="swiper_item-visit">邀请码<br/>LWNXK7H</view> -->
             </view>
             <!-- <image style="width: 600rpx;height: 900rpx;"
               src="https://sandbox-img.jufubao.cn/uploads/20250410/34559f90dd5a01e7368c02bf33f1b484.png?ver=1744249748881&x-oss-process=style/size5"></image> -->
           </swiper-item>
         </swiper>
       </view>
-
+      <!-- #ifdef MP-WEIXIN -->
       <view class="share_wrap">
-        <view class="share_btn">
+        <view class="share_btn" @click="toSendWx">
           <image src="https://sandbox-img.jufubao.cn/uploads/20250410/57bc093618bc51a85dc8bb68825d2b97.png?x-oss-process=style/size8" mode="widthFix"></image>
         </view>
-        <view class="share_btn">
+        <view class="share_btn" @click="toSaveImg">
           <image src="https://sandbox-img1.jufubao.cn/uploads/20250410/faeb136bfd684ab6fa4608208ad26294.png?x-oss-process=style/size8" mode="widthFix"></image>
         </view>
       </view>
+      <!-- #endif -->
 
       <view class="visit_tip">
         好友使用你的邀请码成功注册后<br/>Ta将成为你的邀请用户
@@ -52,6 +54,8 @@
   import { getContainerPropsValue } from "@/utils/xd.base";
   import componentsMixins from "@/mixins/componentsMixins";
   import extsMixins from "@/mixins/extsMixins";
+  import getServiceUrl from "@/common/getServiceUrl";
+  import { mapState } from "vuex";
   export default {
     name: "JfbBaseShare",
     components: {
@@ -63,11 +67,14 @@
     data() {
       return {
         closeMask: true,
-
+        shareIndex: 0,
         shareList: [],
         //todo
       }
     },
+    computed: {
+      ...mapState(["shareInfo"]),
+    },
     watch: {
       container(value, oldValue) {
         if (JSON.stringify(value) === JSON.stringify(oldValue)) return;
@@ -98,11 +105,45 @@
             page_token: '1'
           }
         }).then(res => {
-          this.shareList = res.list;
+          this.shareList = res.list.map(item => {
+            item.share_image_url = getServiceUrl(item.share_image_url);
+            return item;
+          });
         })
       },
+      handleSwitch(e){
+        this.shareIndex = e.detail.current;
+      },
+      toSendWx(){
+        let shareIndex = this.shareIndex;
+        let curShare = this.shareList[shareIndex];
+        this.setShareInfo({
+          title: "您的好友邀请您使用PLUS会员",
+          imageUrl: curShare.share_image_url,
+          path: `${curShare.jump_url}`,
+        });
+      },
+      toSaveImg(){
+        let shareIndex = this.shareIndex;
+        let curShare = this.shareList[shareIndex];
+        uni.getImageInfo({
+          src: curShare.share_image_url,
+          success: (res) => {
+            uni.saveImageToPhotosAlbum({
+              filePath: res.path,
+              success: () => {
+                uni.showToast({
+                  title: '保存成功',
+                  icon: "success"
+                })
+              }
+            })
+          }
+        })
+
+      },
       onJfbScroll(options) {
-        console.log('event.onJfbScroll', options)
+        // console.log('event.onJfbScroll', options)
       },
       onJfbReachBottom(options) {
         console.log('event.onJfbReachBottom', options)
@@ -146,16 +187,18 @@
             justify-content: center;
 
             &-inner{
-              width: 630rpx;
-              height: 960rpx;
-              background: url('https://sandbox-img.jufubao.cn/uploads/20250410/2d9f5ec31efb5cddece747d8b8da51f0.png?x-oss-process=style/size8') no-repeat;
-              background-size: auto 100%;
+              width: 100%;
+              height: 100%;
+              // background: url('https://sandbox-img.jufubao.cn/uploads/20250410/2d9f5ec31efb5cddece747d8b8da51f0.png?x-oss-process=style/size8') no-repeat;
+              // background-size: auto 100%;
               box-sizing: border-box;
-              display: flex;
-              flex-direction: column;
-              align-items: center;
-              padding-top: 60rpx;
-              
+              // display: flex;
+              // flex-direction: column;
+              // align-items: center;
+              image{
+                width: 100%;
+                height: 100%;
+              }
             }
             &-logo{
               height: 96rpx;