jufubao-base 1.0.237-beta2 → 1.0.237-beta5

package/package.json

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

package/src/components/JfbBaseBalance/JfbBaseBalance.vue

@@ -23,7 +23,6 @@
             </XdFontIcon>
           </view>
           <view>{{getAmout(amount)}}</view>
-          <view>可用：{{getAmout(amount)}}</view>
         </view>
         <xd-button v-if="isWithDraw==='Y'" style="margin: 0" size="mini" type="primary"
           @click="handleWithdraw">提现</xd-button>

package/src/components/JfbBaseCodeOpenVip/Api.js

@@ -8,10 +8,9 @@ module.exports = [
   {
     mapFnName: "getExchangeCode",
     title: "兑换码",
-    path: "/member/v1/:xnamespace/exchange/:exchange_code",
+    path: "/member/v1/exchange/:exchange_code",
     isRule: true,
     params: {
-      xnamespace: ['命名空间', 'String', '必选'],
       exchange_code: ['兑换码', 'String', '必选']
     },
     isConsole: true,

package/src/components/JfbBaseCodeOpenVip/JfbBaseCodeOpenVip.vue

@@ -106,7 +106,6 @@
     },
     methods: {
       onJfbLoad(options) {
-        this.setNameSpace(options);
       },
       /**
        * @description 监听事件变化
@@ -130,7 +129,6 @@
         jfbRootExec("getExchangeCode", {
           vm: this,
           data: {
-            xnamespace: this.xnamespace,
             exchange_code: this.exchange_code
           }
         }).then(res => {

package/src/components/JfbBaseConsumpCode/Attr.js

@@ -47,9 +47,9 @@ export default {
         ele: 'xd-select-pages-path',
         valueKey: 'cash_pay_path',
         placeholder: '请选择核销支付路径',
+        value: data.cash_pay_path || null,
         className: 'input100',
         groupKey:'advanced',
-        value: null,
         setting: {
           router: XdBus.getParentApi('getPagesTree')
         },

package/src/components/JfbBaseConsumpCode/JfbBaseConsumpCode.vue

@@ -79,7 +79,7 @@
 
       </view>
     </view>
-    <XdDialog :show.sync="showDialog" :showClose="false" :showTitle="false">
+    <XdDialog :show.sync="showDialog" :showClose="false" :showTitle="true">
       <view class="dialog-title" slot="title">门店确认</view>
       <view class="dialog-content">
         <view>当前门店：<span :style="{color:mainColor}">{{shopName}}</span></view>
@@ -192,6 +192,8 @@
       }
     },
     created() {
+      console.log(this.siteInfo,'configProject');
+      
       this.init(this.container);
     },
     methods: {
@@ -725,11 +727,12 @@
   .jfb-base-consump-code {
     &__body {
       .content-box {
-        margin: 158rpx 30rpx 0 30rpx;
+        margin: 0 30rpx 0 30rpx;
         background-color: #fff;
         padding: 81rpx 32rpx 32rpx 32rpx;
         border-radius: 24rpx;
         position: relative;
+        top: 158rpx;
         display: flex;
         flex-direction: column;
         align-items: center;
@@ -886,16 +889,20 @@
         &-item {
           display: flex;
           margin-top: 60rpx;
+          align-items: baseline;
 
           &-label {
             color: #999999;
             font-size: 30rpx;
             margin-right: 64rpx;
+            width: 117rpx;
+            flex-shrink: 0;
           }
 
           &-tags {
             display: flex;
             align-items: flex-start;
+            flex-wrap: wrap;
 
             &>view {
               margin-right: 32rpx;
@@ -904,6 +911,11 @@
               padding: 16rpx 24rpx;
               border: 2rpx solid #EEEEEE;
               color: #CCCCCC;
+              margin-bottom: 18rpx;
+            }
+
+            &>view:last-child {
+              margin-bottom: 0;
             }
 
           }

package/src/components/JfbBaseFastLink/Attr.js

@@ -24,7 +24,8 @@ export default {
         multiple: false,
         className: 'input80',
         list: [
-          {label: '平铺', value: 'noraml'},
+          {label: '垂直', value: 'noraml'},
+          {label: '水平', value: 'horizontal'},
           {label: '悬浮', value: 'fixed'},
         ],
         inline: false,
@@ -53,6 +54,16 @@ export default {
         placeholder: '请输入自定义名称',
         className: 'input80',
       },
+      {
+        label: '自定义服务名称:',
+        ele: 'el-input',
+        type: 'text',
+        groupKey:'content',
+        valueKey: 'customName',
+        value: data['customName']? data['customName']: '我的服务',
+        placeholder: '请输入自定义服务名称',
+        className: 'input80',
+      },
       {
         label: '背景颜色:',
         ele: 'xd-color',

package/src/components/JfbBaseFastLink/JfbBaseFastLink.vue

@@ -56,6 +56,22 @@
           :layoutInfo="layoutInfo"
         ></xd-fast-nav>
       </template>
+      <template v-if="is_layout === 'horizontal'">
+        <view :style="[horizontalStyle]">
+          <view class="x-line"></view>
+          <view class="fast-link__horizontal-title">{{customName}}</view>
+          <view class="fast-link__horizontal" v-if="list.length > 0">
+            <view :style="[horizontalItemStyle]" class="fast-link__horizontal-item" v-for="item in list" :key="item.key"  @click="handleClick(item)">
+              <view class="fast-link__horizontal-item-icon" v-if="item.icon">
+                <xd-font-icon :color="iconColor" :size="item.size" :icon="item.icon"></xd-font-icon>
+              </view>
+              <view class="fast-link__horizontal-item-text" :style="{color: color, fontSize: fontSize + 'rpx'}">
+                <view>{{item.name}}</view>
+              </view>
+            </view>
+          </view>
+        </view>
+      </template>
     </view>
   </view>
 </template>
@@ -107,6 +123,8 @@
         margin: {},
         padding:{},
         rowSpacing: 20, //间距
+
+        customName: '我的服务'
       }
     },
     watch: {
@@ -117,6 +135,22 @@
     },
 
     computed: {
+      horizontalStyle(){
+        let border = 0;
+        if (this.is_border === 'Y') border = `${this.is_border_w}rpx solid ${this.is_border_c}`;
+        return {
+          margin: this.getMarginAndPadding(this.margin, 20),
+          padding:this.getMarginAndPadding(this.padding, 20),
+          border,
+          background: this.backgroundColor,
+          borderRadius: this.radius + 'rpx',
+        }
+      },
+      horizontalItemStyle(){
+        return {
+          marginBottom: this.rowSpacing + 'rpx',
+        }
+      },
       bodyStyle(){
         let margin = `${this.checkValue(this.margin.top, 20)}rpx`;
         margin = `${margin} ${this.checkValue(this.margin.right, 20)}rpx`;
@@ -199,6 +233,7 @@
         this.subColor = getContainerPropsValue(container, 'content.textSubColor', '#000');
         this.fontSubSize = getContainerPropsValue(container, 'content.fontSubSize', 24);
         this.isNotExpand = getContainerPropsValue(container, 'content.isNotExpand', 'Y');
+        this.customName = getContainerPropsValue(container, 'content.customName', '我的服务');
         if(this.is_layout === 'fixed') {
           this.listNave = this.list.map(item=>{
             let {appValue,path} = item.path
@@ -228,6 +263,14 @@
             return index < 3
           });
 
+        } else if(this.is_layout === 'horizontal'){
+          const remainder = this.list.length % 4;
+          if (remainder !== 0) {
+            const needed = 4 - remainder;
+            for (let i = 0; i < needed; i++) {
+              this.list.push({}); // 或者你可以插入其他默认值
+            }
+          }
         }
       },
     }
@@ -285,6 +328,26 @@
         align-items: center;
       }
     }
+    &__horizontal {
+      display: flex;
+      justify-content: space-around;
+      &-title {
+        color: #000000;
+        font-size: 26rpx;
+        font-weight: 500;
+        margin-bottom: 43rpx;
+        padding-left: 36rpx;
+      }
+      &-item {
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
+        &-icon {
+          margin-bottom: 22rpx;
+        }
+      }
+    }
   }
 
 </style>

package/src/components/JfbBaseNoticeDialog/JfbBaseNoticeDialog.vue

@@ -139,7 +139,7 @@ export default {
             this.contentList = res.list
             this.currentImage = getServiceUrl(
               this.contentList[0].image_url,
-              "size3"
+              "size8"
             );
             this.currentLinkUrl = this.getLinkUrl(
               this.contentList[0].redirect_data
@@ -216,7 +216,7 @@ export default {
       );
       this.currentImage = getServiceUrl(
         this.contentList[this.currentIndex].image_url,
-        "size3"
+        "size8"
       );
     },
     handleToLink() {

package/src/components/JfbBaseOpenVip/Api.js

@@ -17,7 +17,7 @@ module.exports = [
   {
     mapFnName: "getVipList",
     title: "会员中心 - 会员卡列表",
-    path: "/member/v1/:namespace/vip-card",
+    path: "/member/v1/vip-card",
     isRule: false,
     params: {
       namespace: ['业务线', 'String', true],

package/src/components/JfbBaseOpenVip/Attr.js

@@ -7,6 +7,17 @@ export default {
   style: [],
   content: (data) => {
     return [
+      {
+        label: "是否展示兑换码",
+        ele: "xd-radio",
+        valueKey: 'showExchangeCode',
+        value: data.showExchangeCode || "Y",
+        groupKey: "content",
+        list: [
+          {label: "展示", value: "Y"},
+          {label: "不展示", value: "N"},
+        ]
+      },
       {
         label: '共享PLUS会员用户协议:',
         ele: 'xd-site-news',
@@ -232,6 +243,29 @@ export default {
         inline: false,
         notice: '',
       },
+      {
+        label: "PLUS会员banner背景图",
+        ele: 'xd-upload',
+        valueKey: "bannerBgImg",
+        groupKey: "content",
+        value: data.bannerBgImg || {},
+        defaultValue: data.bannerBgImg || null,
+        slot: true,
+        oneWidth: 355,
+        oneHeight: 92,
+        elinputClassName: 'input40',
+        tipsformet: '上传文件格式：@imageType@，不超过@size@MB.建议宽度为<span style="color:red">710px</span>,高度<span style="color:red">184px</span>',
+        type: ['jpg', 'png', 'jpeg'],
+        styleType: 'one',
+        uploadType: 'aliyun',
+        size: 5,
+        action: 'action',
+        sort: true,
+        maxlen: 100,
+        rules: [
+          {required: true, message: '请添加背景图', trigger: 'change'},
+        ],
+      },
       {
         label: '4大特权图片:',
         ele: 'xd-upload',
@@ -243,7 +277,7 @@ export default {
         oneWidth: 375,
         oneHeight: 500,
         elinputClassName: 'input40',
-        tipsformet: '上传文件格式：@imageType@，不超过@size@MB.建议高度为<span style="color:red">750px</span>,宽度自适应',
+        tipsformet: '上传文件格式：@imageType@，不超过@size@MB.建议宽度为<span style="color:red">750px</span>,高度自适应',
         type: ['jpg', 'png', 'jpeg'],
         styleType: 'one',
         uploadType: 'aliyun',
@@ -251,6 +285,9 @@ export default {
         action: 'action',
         sort: true,
         maxlen: 100,
+        rules: [
+          {required: true, message: '请添加特权图片', trigger: 'change'},
+        ],
       },
       {
         label: '会员详情路径:',
@@ -264,6 +301,18 @@ export default {
         },
         inline: false,
       },
+      {
+        label: '兑换码详情路径:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'exchangeCodePath',
+        groupKey:'advanced',
+        placeholder: '请选择兑换码详情路径',
+        value: data['exchangeCodePath'] || null,
+        setting: {
+          router: XdBus.getParentApi('getPagesTree'),
+        },
+        inline: false,
+      },
     ].filter(i=>i)
   },
   advanced: [],

package/src/components/JfbBaseOpenVip/JfbBaseOpenVip.vue

@@ -31,19 +31,22 @@
           </view>
         </view>
         <view v-if="isVip" class="buy_btn" @click="showDrawer=true">立即续费</view>
-        <view v-else class="buy_btn" @click="showDrawer=true">立即开通</view>
+        <!-- <view v-else class="buy_btn" @click="showDrawer=true">立即开通</view> -->
       </view>
 
       <!-- plus会员权益 -->
       <view class="vip_info">
-        <view class="vip_box">
+        <view class="vip_box" :style="{
+          backgroundImage: `url(${bannerBgImg})`,
+        }">
           <view class="vip_box-left">
             <view class="vip_box-title">PLUS会员</view>
-            <view>开通享受更多权益</view>
+            <view v-if="isVip">有效期至：{{ vip_expire_time }}</view>
+            <view v-else>开通享受更多权益</view>
           </view>
-          <view class="vip_logo">
+          <!-- <view class="vip_logo">
             <image :src="siteLogo" mode="aspectFill"></image>
-          </view>
+          </view> -->
         </view>
       </view>
       <view>
@@ -72,14 +75,14 @@
         </view> -->
       </view>
       
-      <xd-vip-list v-if="!isVip" :list="vipCardList"
+      <xd-vip-list v-if="!isVip" :list="showVipCardList"
         @handlePrivacy="handlePrivacy"
         @toVipDetail="toVipDetail"
       ></xd-vip-list>
 
       <xd-down-drawer :show.sync="showDrawer" height="480rpx">
         <view class="drawer_title">立即续费</view>
-        <xd-vip-list :list="vipCardList"
+        <xd-vip-list :list="showVipCardList"
           @handlePrivacy="handlePrivacy"
           @toVipDetail="toVipDetail"
         ></xd-vip-list>
@@ -118,14 +121,22 @@
 
         showDrawer: false,
         uInfo: {},
-        xnamespace: "",
         vipCardList: [],
         save_amount: 0,
+        vip_expire_time: "",
 
         siteLogo: "",
+        exchangeCodeVip: {
+          product_name: "兑换码",
+          sale_price: 0,
+          vip_card_id: -1
+        },
         //todo
         vipDetailPath: "",
+        bannerBgImg: "",
         specialImage: "",
+        showExchangeCode: "",
+        exchangeCodePath: "",
       }
     },
     computed: {
@@ -137,6 +148,9 @@
       },
       isVip(){
         return this.uInfo.user_level === 'VIP';
+      },
+      showVipCardList(){
+        return this.showExchangeCode === 'Y' ? [this.exchangeCodeVip, ...this.vipCardList] : [...this.vipCardList]
       }
     },
     watch: {
@@ -152,7 +166,6 @@
     },
     methods: {
       onJfbLoad(options) {
-        this.setNameSpace(options);
         this.p_getBaseUserInfo();
         this.p_getVipMoneySaving();
         this.p_getVipList();
@@ -163,7 +176,10 @@
        */
       init(container) {
         this.vipDetailPath = getContainerPropsValue(container, 'content.vipDetailPath', {value: "/system/system/vipdetail"}).value;
+        this.bannerBgImg = getServiceUrl(getContainerPropsValue(container, 'content.bannerBgImg', {url: ""}).url);
         this.specialImage = getServiceUrl(getContainerPropsValue(container, 'content.specialImage', {url: ""}).url);
+        this.exchangeCodePath = getContainerPropsValue(container, 'content.exchangeCodePath', {value: ""}).value;
+        this.showExchangeCode = getContainerPropsValue(container, 'content.showExchangeCode', '');
       },
       p_getBaseUserInfo(){
         jfbRootExec("getOpenBaseUserInfo", {
@@ -171,6 +187,7 @@
           data: {}
         }).then(res => {
           this.uInfo = res;
+          this.vip_expire_time = this.$xdUniHelper.getDate(res.vip_expire_time * 1000 ).fullTime;
         })
       },
       p_getVipMoneySaving(){
@@ -184,9 +201,7 @@
       p_getVipList(){
         jfbRootExec("getVipList", {
           vm: this,
-          data: {
-            namespace: this.xnamespace,
-          }
+          data: {}
         }).then(res => {
           this.vipCardList = res.list;
         })
@@ -199,6 +214,12 @@
         })
       },
       toVipDetail(vip_card_id){
+        if(vip_card_id === -1){
+          this.$xdUniHelper.navigateTo({
+            url: this.exchangeCodePath
+          })
+          return;
+        }
         this.$xdUniHelper.navigateTo({
           url: `${this.vipDetailPath}?vip_card_id=${vip_card_id}`
         })
@@ -291,12 +312,16 @@
       }
 
       .vip_info{
-        padding: 20rpx;
+        // padding: 20rpx;
         .vip_box{
-          width: 100%;
+          width: 710rpx;
           height: 184rpx;
+          margin: auto;
           border-radius: 24rpx;
-          background: linear-gradient(90deg, #E8A841 0%, #FAD48E 100%);
+          background-color: #E8A841;
+          // background: linear-gradient(90deg, #E8A841 0%, #FAD48E 100%);
+          background-size: 100% 100%;
+          background-repeat: no-repeat;
           display: flex;
           align-items: center;
           justify-content: space-between;

package/src/components/JfbBaseOpenVip/Mock.js

@@ -1,7 +1,7 @@
 'use strict';
 
 module.exports = {
-  getOpenBaseUserInfo: {"user_name":"","user_code":"Uf4zx6EPfV","nickname":"未来～","real_name":"","head_url":"https:\/\/thirdwx.qlogo.cn\/mmopen\/vi_32\/Q0j4TwGTfTJsajZzh53IB56crRSdmKvRbjT4V1Ha8v5uCOkASbWS0GibgLeic8OKBzAwUyBa3vZGhjwmd6RfpG9g\/132","province_code":"","city_code":"","province_name":"","city_name":"","sex":"","sex_name":"未知","birthday_date":"","phone_number":"13611111111","show_user_name":"未来～","user_level":"VIP","vip_expire_time":1745026677,"request_id":"250e5709e6c95066"},
+  getOpenBaseUserInfo: {"user_name":"","user_code":"Uf4zx6EPfV","nickname":"未来～","real_name":"","head_url":"https:\/\/thirdwx.qlogo.cn\/mmopen\/vi_32\/Q0j4TwGTfTJsajZzh53IB56crRSdmKvRbjT4V1Ha8v5uCOkASbWS0GibgLeic8OKBzAwUyBa3vZGhjwmd6RfpG9g\/132","province_code":"","city_code":"","province_name":"","city_name":"","sex":"","sex_name":"未知","birthday_date":"","phone_number":"13611111111","show_user_name":"未来～","user_level":"","vip_expire_time":1745026677,"request_id":"250e5709e6c95066"},
   getVipList: {"total_size":3,"next_page_token":"","list":[{"vip_card_id":3,"product_id":60038520,"product_name":"体验卡","sale_price":200,"vip_card_icon":""},{"vip_card_id":2,"product_id":60038519,"product_name":"月卡","sale_price":2678,"vip_card_icon":""},{"vip_card_id":1,"product_id":60038515,"product_name":"测1","sale_price":20085,"vip_card_icon":""}],"request_id":"6b4aef5e06411d8a"},
   getVipMoneySaving: { "save_amount": 100 , "request_id": "6b4aef5e06411d8a" }
 }

package/src/components/JfbBaseOpenVip/XdVipList.vue

@@ -10,7 +10,10 @@
       </view>
     </view>
     <view class="vip_pay">
-      <view class="pay_btn" @click="toVipDetail">立即支付 <xd-unit style="margin-left: 16rpx;" :price="curVipCard.sale_price" :isOld="false" colorNew="#FFFFFF"></xd-unit></view>
+      <view class="pay_btn" @click="toVipDetail">
+        <template v-if="vip_card_id===-1">0元开通</template>
+        <template v-else>立即支付 ￥{{ $xdUniHelper.divisionFloatNumber(curVipCard.sale_price, 100) }}</template>
+      </view>
       <view class="vip_tip">开通视为同意<text @click.stop="handlePrivacy('privacy_service')">《共享PLUS会员用户协议》</text></view>
     </view>
   </view>

package/src/components/JfbBaseOpenVipDetail/Api.js

@@ -8,11 +8,10 @@ module.exports = [
   {
     mapFnName: "getVipConfirm",
     title: "获取vip确认信息",
-    path: "/member/v1/:xnamespace/order/confirm",
+    path: "/member/v1/order/confirm",
     isRule: false,
     data: {
       vip_card_id: ["vip卡id", "Number", "必选"],
-      xnamespace: ['业务线', 'String', '必选']
     },
     isConsole: true,
     disabled: true,

package/src/components/JfbBaseOpenVipDetail/JfbBaseOpenVipDetail.vue

@@ -20,7 +20,8 @@
         <xd-list-item label="套餐期限" paddingLR="40rpx">{{ vipInfo.life_cycle_label }}</xd-list-item>
       </view>
 
-      <view class="combo_section">
+      <!-- #13418 开通plus会员：此版本没有平台优惠 -->
+      <view v-if="0" class="combo_section">
         <xd-list-item label="套餐金额" paddingLR="40rpx">¥{{ $xdUniHelper.divisionFloatNumber(vipInfo.user_pay_amount, 100) }}</xd-list-item>
         <xd-list-item label="平台优惠" paddingLR="40rpx">-¥{{ $xdUniHelper.divisionFloatNumber(vipInfo.platform_discount_amount, 100) }}</xd-list-item>
       </view>
@@ -98,7 +99,6 @@
     },
     methods: {
       onJfbLoad(options) {
-        this.setNameSpace(options);
         this.vip_card_id = options.vip_card_id;
         this.p_getVipConfirm();
       },
@@ -115,7 +115,6 @@
           vm: this,
           data: {
             vip_card_id: this.vip_card_id,
-            xnamespace: this.xnamespace
           }
         }).then(res => {
           this.vipInfo = res;

package/src/components/JfbBaseOpenVipDetail/Mock.js

@@ -1,13 +1,15 @@
-'use strict';
+"use strict";
 
 module.exports = {
-  
-  getOpenByIdFilmSquate:{},
-  
-  updateOpenFilmPaiqiDate:{},
-  
-  removeOpenFilmAddress:{},
-  
-  addOpenFilmcart:{},
-  
-}
+  getVipConfirm: {
+    vip_card_id: 1,
+    product_id: 60038515,
+    product_name: "年卡会员",
+    sale_price: 20000,
+    platform_discount_amount: 120,
+    user_pay_amount: 20000,
+    life_cycle_label: "1年",
+    request_id: "cc61b6e3a8e0931f"
+  },
+  createVipOrder: {}
+};

package/src/components/JfbBasePay/Attr.js

@@ -8,6 +8,46 @@ export default {
   advanced: [],
   content: data=>{
     return [
+      {
+        label: "【仍需扣点】文案:",
+        ele: "el-input",
+        valueKey: "text1",
+        value: data.text1 || "仍需扣点",
+        groupKey: "content",
+        inline: false,
+        className: "input80",
+      },
+      {
+        label: "【（可使用多张票券点数）】文案:",
+        ele: "el-input",
+        valueKey: "text2",
+        value: data.text2 || '',
+        placeholder: '（可使用多张票券点数）',
+        groupKey: "content",
+        inline: false,
+        className: "input80",
+      },
+      {
+        label: "【选择以下补差方式】文案:",
+        ele: "el-input",
+        valueKey: "text3",
+        value: data.text3 || '选择以下补差方式',
+        groupKey: "content",
+        inline: false,
+        className: "input80",
+      },
+      {
+        label: "是否展示继续补差",
+        ele: "xd-radio",
+        valueKey: "showContinuePay",
+        value: data.showContinuePay || 'Y',
+        groupKey: "content",
+        inline: true,
+        list: [
+          { label: "展示", value: "Y" },
+          { label: "不展示", value: "N" },
+        ],
+      },
       ...styleForm.getForm(data),
       {
         label: '支付成功跳转路径:', //label