jufubao-base 1.0.254 → 1.0.256-beta1

package/package.json

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

package/src/components/JfbBaseAddress/XdAddress.vue

@@ -16,11 +16,12 @@
           <view class="xd-address__body-item-label">收货人</view>
           <view class="xd-address__body-item-input">
             <input
+              :cursor-spacing="10"
               class="xd-address__body-item-input-el"
               placeholder-class="xd-address__body-item-input-placeholder"
               @confirm="doneInput"
               placeholder="收货人"
-              :adjust-position="false"
+              :adjust-position="true"
               @blur="handleUsername"
               maxlength="25"
               v-model="receipt_username"
@@ -35,11 +36,12 @@
           <view class="xd-address__body-item-label">手机号码</view>
           <view class="xd-address__body-item-input">
             <input
+              :cursor-spacing="10"
               class="xd-address__body-item-input-el"
               placeholder-class="xd-address__body-item-input-placeholder"
               @confirm="doneInput"
               placeholder="手机号码"
-              :adjust-position="false"
+              :adjust-position="true"
               maxlength="11"
               v-model="receipt_phone"
               @blur="handlePhone"
@@ -93,7 +95,8 @@
               placeholder-class="xd-address__body-item-input-placeholder"
               @confirm="doneInput"
               placeholder="详细地址"
-              :adjust-position="false"
+              :adjust-position="true"
+              :cursor-spacing="10"
               :focus="focus"
               auto-height
               maxlength="50"

package/src/components/JfbBaseConsumpCode/JfbBaseConsumpCode.vue

@@ -12,7 +12,8 @@
     }">
       <view class="content-box">
         <view class="logo-box">
-          <image :src="userInfo['head_url']" class="logo"></image>
+          <image v-if="userInfo['head_url']" :src="userInfo['head_url']" class="logo"></image>
+          <image v-else class="logo" src="https://img1-b.jufubao.cn/uploads/20250528/e88bb70d4ccdcdd01a277bdf6b66c488.jpg"></image>
         </view>
         <view v-if="isFlow">
           <view @click="handleToShop" class="shop">
@@ -69,7 +70,10 @@
             <image mode="aspectFit" class="bar-code" :src="barcode_url">
             </image>
             <view class="bar-code-text">{{barCode}}</view>
-            <image mode="aspectFit" class="qrcode" :src="code_url">
+            <view style="position: relative">
+              <image mode="aspectFit" class="qrcode" :src="code_url">
+              <image v-if="qrcode_icon" class="logo-icon" :src="qrcode_icon"></image>
+            </view>
             </image>
             <view class="code-refresh">{{expiration_sec_str}}后自动更新</view>
             <view v-if="plusDiscount">
@@ -195,7 +199,9 @@
         jwxSDK: null,
         refresh: true, //onshow是否刷新数据
         showLocationDialog: false,
-        cityPath: ''
+        cityPath: '',
+        resource_shop_id: '',
+        qrcode_icon: '',
       }
     },
     watch: {
@@ -252,7 +258,7 @@
       // #endif
     },
     methods: {
-      async onJfbLoad(options) {
+      async onJfbLoad(options) {        
         this.xnamespace = this.projectAttr.business_code
         this.getUserInfo()
         this.options = options
@@ -281,6 +287,7 @@
           }).then(res => {
             if (res && res.list.length > 0) {
               this.shop_id = res.list[0].shop_id;
+              this.resource_shop_id = res.list[0].resource_shop_id;
               this.shopName = res.list[0].resource_shop_name;
               this.showMask = true;
               this.showDialog = true;
@@ -291,6 +298,7 @@
           })
         } else {
           this.shop_id = this.options.shop_id;
+          this.resource_shop_id = this.options.resource_shop_id;
           this.p_getAsyncStep();
         }
       },
@@ -372,12 +380,16 @@
       p_getQuickPayQRCode() {
         return new Promise((resolve, reject) => {
           this.$xdShowLoading({});
+          let data = {
+            shop_id: this.shop_id,
+            temp_order_id: this.temp_order_id,
+            // business_code: this.xnamespace,
+            // resource_shop_id: this.resource_shop_id
+          }
+          if(data.resource_shop_id) delete data.shop_id
           jfbRootExec("getConsumpCode", {
             vm: this,
-            data: {
-              shop_id: this.shop_id,
-              temp_order_id: this.temp_order_id,
-            }
+            data: data
           }).then(res => {
             this.$xdHideLoading();
             this.plusDiscount = res.plus_discount
@@ -392,12 +404,15 @@
               this.temp_order_id = res.temp_order_id;
               let code_url = this.brandInfo['api_host'] + res.code_url;
               let barcode_url = this.brandInfo['api_host'] + res.barcode_url;
+              let qrcode_icon = res.qrcode_icon;
               if (this.isPreview) {
                 code_url = 'https://sandbox-apis.jufubao.cn/common/v1/image/qrcode?code_content=h.161.v91654768653746&size=240'
                 barcode_url = 'https://sandbox-apis.jufubao.cn/common/v1/image/barcode?code_content=h.161.v91654768653746'
+                qrcode_icon = 'https://img1-b.jufubao.cn/uploads/20250528/e88bb70d4ccdcdd01a277bdf6b66c488.jpg'
               }
               this.code_url = code_url;
               this.barcode_url = barcode_url;
+              this.qrcode_icon = qrcode_icon;
               this.barCode = res.payment_code
               this.expiration_sec = res.expiration_sec;
               this.showMask = false;
@@ -1107,5 +1122,15 @@
       height: auto;
       line-height: inherit;
     }
+
+    .logo-icon {
+      width: unit(80, rpx) !important;
+      height: unit(80, rpx) !important;
+      position: absolute;
+      top: 50%;
+      left: 50%;
+      transform: translate(-40rpx, -40rpx);
+      margin-top: 0;
+    }
   }
 </style>

package/src/components/JfbBaseNoticeDialog/Attr.js

@@ -248,29 +248,16 @@ export default {
         ]
       },
       {
-        label: '展示位置:',
+        label: '是否开启展示方式过滤:',
         ele: 'xd-radio',
-        valueKey: 'systemType',
+        valueKey: 'is_order_by_show_group',
         groupKey:'content',
-        value: data['systemType'] || 'fuli',
-        placeholder: '请选择展示位置',
+        value: data['is_order_by_show_group'] || 'N',
+        placeholder: '请选择是否开启展示方式过滤',
         className: 'input60',
         list: [
-          { label: '福利系统', value: 'fuli' },
-          { label: 'plus系统', value: 'plus' },
-        ]
-      },
-      data['systemType']==='plus'&&{
-        label: '展示方式:',
-        ele: 'xd-radio',
-        valueKey: 'showGroup',
-        groupKey:'content',
-        value: data['showGroup'] || 'all',
-        placeholder: '请选择展示方式',
-        className: 'input60',
-        list: [
-          { label: '全部用户', value: 'all' },
-          { label: '仅会员', value: 'vip' },
+          { label: '是', value: 'Y' },
+          { label: '否', value: 'N' },
         ]
       },
       {

package/src/components/JfbBaseNoticeDialog/JfbBaseNoticeDialog.vue

@@ -85,8 +85,7 @@ export default {
       currentIndex: 0,
       contentList: [],
       number: '',
-      systemType: '',
-      showGroup: ''
+      is_order_by_show_group: '',
     };
   },
   watch: {
@@ -129,6 +128,7 @@ export default {
           page_id: this.pageAttr["page_id"], //页面ID
           container_id: this.containerId, //组件ID
           page_size: this.number, //数量
+          is_order_by_show_group: this.is_order_by_show_group
         },
       })
         .then((res) => {
@@ -147,17 +147,7 @@ export default {
               );
             }
             this.currentIndex = 0;
-            if(this.systemType === 'fuli'){
-              this.handlePop();
-            } else {
-              if(this.showGroup==='all') {
-                this.handlePop();
-              }else {        
-                if(this.getTokenForKey('user_level')&&this.getTokenForKey('user_level')==='VIP') {
-                  this.handlePop();
-                }
-              }
-            }
+            this.handlePop();
           }
         })
         .catch((error) => {
@@ -186,15 +176,10 @@ export default {
       );
       this.type = getContainerPropsValue(container, "content.type", "pop");
       this.number = getContainerPropsValue(container, "content.number", 1);
-      this.systemType = getContainerPropsValue(
-        container,
-        "content.systemType",
-        "fuli"
-      );
-      this.showGroup = getContainerPropsValue(
+      this.is_order_by_show_group = getContainerPropsValue(
         container,
-        "content.showGroup",
-        "all"
+        "content.is_order_by_show_group",
+        "N"
       );
     },
     handlePop() {

package/src/components/JfbBaseOpenVip/JfbBaseOpenVip.vue

@@ -74,11 +74,13 @@
           </view>
         </view> -->
       </view>
-
-      <xd-vip-list v-if="!isVip" :list="showVipCardList"
-        @handlePrivacy="handlePrivacy"
-        @toVipDetail="toVipDetail"
-      ></xd-vip-list>
+      <view :style="{height: '342rpx'}"></view>
+      <view :style="prod_bottom">
+        <xd-vip-list v-if="!isVip" :list="showVipCardList"
+          @handlePrivacy="handlePrivacy"
+          @toVipDetail="toVipDetail"
+        ></xd-vip-list>
+      </view>
 
       <xd-down-drawer :show.sync="showDrawer" height="480rpx">
         <view class="drawer_title">立即续费</view>
@@ -152,7 +154,10 @@
       },
       showVipCardList(){
         return this.showExchangeCode === 'Y' ? [this.exchangeCodeVip, ...this.vipCardList] : [...this.vipCardList]
-      }
+      },
+      prod_bottom() {
+        return this.fixedStyle({height: 0, zIndex: 111});
+      },
     },
     watch: {
       container(value, oldValue) {

package/src/components/JfbBasePersonalData/JfbBasePersonalData.vue

@@ -9,7 +9,8 @@
       <view class="jfb-base-personal-data__body-item">
         <view class="jfb-base-personal-data__body-item-label">头像</view>
         <view class="profile">
-          <image :src="info.head_url"></image>
+          <image v-if="info.head_url" :src="info.head_url"></image>
+          <image v-else src="https://img1-b.jufubao.cn/uploads/20250528/e88bb70d4ccdcdd01a277bdf6b66c488.jpg"></image>
           <!--#ifdef MP-->
           <button type="default" open-type="chooseAvatar" @chooseavatar="handleChooseAvatar"></button>
           <!-- #endif -->
@@ -203,7 +204,6 @@
         if(!this.$xdUniHelper.isEmpty(ext)) {
           params = Object.assign({},params,ext);
         }
-        debugger
         jfbRootExec("setBasePersonInfo", {
           vm: this,
           data: params,

package/src/components/JfbBaseUserInfo/JfbBaseUserInfo.vue

@@ -15,13 +15,9 @@
               <template v-if="logined">
                 <image @click="handleToPersonal" :style="{border: `1px solid ${imageColor}`, borderRadius:imageRadius}"
                   v-if="userInfo['head_url']" :src="userInfo['head_url']"></image>
-                <view @click="handleToPersonal" :style="{borderColor: imageColor, borderRadius:imageRadius}" class="no-image" v-else>
-                  <xd-font-icon :color="imageColor" icon="iconwode_mian" size="100"></xd-font-icon>
-                </view>
+                <image v-else @click="handleToPersonal" :style="{border: `1px solid ${imageColor}`, borderRadius:imageRadius}" src="https://img1-b.jufubao.cn/uploads/20250528/e88bb70d4ccdcdd01a277bdf6b66c488.jpg"></image>
               </template>
-              <view @click="handleToPersonal" :style="{borderColor: imageColor, borderRadius:imageRadius}" v-else class="no-image">
-                <xd-font-icon :color="imageColor" icon="iconwode_mian" size="90"></xd-font-icon>
-              </view>
+              <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>