jufubao-base 1.0.242-beta1 → 1.0.242-beta11

package/package.json

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

package/src/components/JfbBaseConsumpCode/Attr.js

@@ -55,6 +55,19 @@ export default {
         },
         inline: false,
       },
+      {
+        label: '选取城市路径:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'cityPath',
+        placeholder: '请选择选取城市路径',
+        value: data.cityPath || null,
+        className: 'input100',
+        groupKey:'advanced',
+        setting: {
+          router: XdBus.getParentApi('getPagesTree')
+        },
+        inline: false,
+      },
     ].filter(i=>i)
   },
   advanced: [],

package/src/components/JfbBaseConsumpCode/JfbBaseConsumpCode.vue

@@ -115,6 +115,21 @@
         <XdButton @click="handleConfirm" size="small" type="primary">确认</XdButton>
       </view>
     </XdDialog>
+    <XdDialog class="location-dialog-title" width="80%" :show.sync="showLocationDialog" :showClose="false"
+      :showTitle="true">
+      <view slot="title">
+        <xd-font-icon icon="icondingweixiao" color="#999999" size="60"></xd-font-icon>
+        <text style="font-size: 32rpx;color: #333;margin-top: 12rpx;">定位请求</text>
+      </view>
+      <view class="location-dialog-content">
+        <view>为了给您提供更好的服务需要获取您的位置信息</view>
+      </view>
+      <view class="dialog-btns" slot="btn">
+        <XdButton @click="showLocationDialog=false" bgColor="#EEEEEE" color="#888888" size="small" type="info">取消
+        </XdButton>
+        <XdButton @click="handleToCity" size="small" type="primary">允许</XdButton>
+      </view>
+    </XdDialog>
   </view>
 </template>
 
@@ -131,6 +146,9 @@
   import { mapState } from 'vuex';
 
   export default {
+    //#ifdef MP-WEIXIN
+    options: { styleIsolation: 'shared' },
+    //#endif
     name: "JfbBaseConsumpCode",
     components: {
       XdFontIcon,
@@ -174,7 +192,10 @@
         userInfo: {},
         is_vip: 'N',
         isPreview: false,
-        jwxSDK: null
+        jwxSDK: null,
+        refresh: true, //onshow是否刷新数据
+        showLocationDialog: false,
+        cityPath: ''
       }
     },
     watch: {
@@ -240,9 +261,12 @@
 
           if (Object.keys(this.stateLocation).length === 0) {
             this.tip = '为了给您提供更好的服务需要获取您的位置信息'
+            this.showLocationDialog = true;
             this.showMask = true;
             this.showDialog = false;
             return
+          } else{
+            this.showLocationDialog = false
           }
         }
         if (!this.options.shop_id) {
@@ -292,6 +316,13 @@
         ).value;
         this.cashPayPath = getContainerPropsValue(container, 'content.cash_pay_path', { value: "" }
         ).value;
+        this.successPath = getContainerPropsValue(
+          container,
+          "content.successPath",
+          { value: "" }
+        ).value;
+        this.cityPath = getContainerPropsValue(container, 'content.cityPath', { value: "" }
+        ).value;
       },
       getUserInfo() {
         jfbRootExec("getConsumpBaseUserInfo", {
@@ -458,6 +489,7 @@
             if (parseFloat(need_pay_price) > 0) {//补差
               this.handleThirdPay(pay_order_id, order_id);
             } else {//订单成功
+              this.refresh = false
               this.$xdUniHelper.redirectTo({
                 url: this.successPath + `?order_id=${order_id}`
               })
@@ -693,6 +725,7 @@
                 },
               })
                 .then((res) => {
+                  this.refresh = false;
                   this.$xdUniHelper.redirectTo({
                     url: this.successPath + `?order_id=${main_order_id}`
                   });
@@ -737,6 +770,11 @@
           this.price = "";
         }
       },
+      handleToCity() {
+        this.$xdUniHelper.navigateTo({
+          url: this.cityPath
+        },true);
+      },
       handleNumberChange(num) {
         let curTag = this.curTag;
         this.total_price = this.$xdUniHelper.multiplyFloatNumber(curTag.price_yuan, num);
@@ -761,7 +799,9 @@
       },
       onJfbShow(options) {
         console.log('event.onJfbShow', options)
-        this.onJfbLoad(options);
+        if (this.refresh) {
+          this.onJfbLoad(options);
+        }
       },
       onJfbHide(options) {
         console.log('event.onJfbHide', options)
@@ -1041,8 +1081,29 @@
     .dialog-btns {
       width: 100%;
       display: flex;
-      justify-content: space-between;
+      justify-content: space-around;
+
+    }
+
+    .location-dialog-content {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      border-bottom: 2rpx dashed #E5E5E5;
+      padding-bottom: 30rpx;
+
+      &>view:first-child {
+        font-size: 26rpx;
+        color: #999999;
+        width: 60%;
+      }
+    }
 
+    .location-dialog-title ::v-deep .xd-dailog__body-title {
+      padding-top: 40rpx;
+      padding-bottom: 32rpx;
+      height: auto;
+      line-height: inherit;
     }
   }
 </style>

package/src/components/JfbBaseFooter/Attr.js

@@ -56,6 +56,18 @@ export default {
         },
         classNmae: 'input80',
       },
+      {
+        label: '边框颜色:',
+        ele: 'xd-color',
+        valueKey: 'borderColor',
+        groupKey:'content',
+        value: data['borderColor'] || '',
+        placeholder: '请选择边框颜色',
+        setting: {
+          isAlpha: false
+        },
+        classNmae: 'input80',
+      },
       {
         label: '菜单文字颜色:',
         ele: 'xd-color',

package/src/components/JfbBaseFooter/JfbBaseFooter.vue

@@ -19,6 +19,7 @@
     <view class="jfb-base-footer__body">
       <view :style="[bodyStyle]">
         <xd-footer-bar
+          class="footer-bar-deep"
           style="height:100%"
           v-if="list !== null"
           :height="height"
@@ -48,6 +49,9 @@
   import getServiceUrl from "@/common/getServiceUrl";
 
   export default {
+    //#ifdef MP-WEIXIN
+    options: { styleIsolation: 'shared' },
+    //#endif
     name: "JfbBaseFooter",
     components: {
       XdFontIcon,
@@ -61,6 +65,7 @@
           backgroundSize: '100% 100%',
           backgroundRepeat: 'no-repeat',
           backgroundPosition: 'top center',
+          '--border-color': this.borderColor
         }
 
         if(this.backgroundImage && this.backgroundImage.url) {
@@ -78,6 +83,7 @@
         footerBarKey: 'footerBarKey', //刷新
         baseUrl: '',
         backgroundImage: '',
+        borderColor: ''
       }
     },
     watch: {
@@ -197,6 +203,7 @@
         let bar = getContainerPropsValue(value, 'content.footer-setting', []);
         let imageIcons = getContainerPropsValue(value, 'content.footerSettingImage', []);
         this.backgroundImage = getContainerPropsValue(value, 'content.backgroundImage', '');
+        this.borderColor = getContainerPropsValue(value, 'content.borderColor', '#eee');
         this.list = {
           bgColor: getContainerPropsValue(value, 'content.bgColor', '#fff'),
           bodyStyle: this.bodyStyle,
@@ -222,6 +229,12 @@
 
 <style scoped lang="less">
   @import "./JfbBaseFooterLess.less";
+  .footer-bar-deep {
+    ::v-deep .xd-footer-tabbar__border {
+      border-color: var(--border-color);
+    }
+  }
+  
 
   .jfb-base-footer {
 

package/src/components/JfbBaseLogin/JfbBaseLogin.vue

@@ -605,8 +605,8 @@ export default {
     },
 
     onJfbLoad(options) {
-      if(options['x-common']){
-        let decodeParams = Base64.decode(options['x-common']);
+      if(options['x-share']){
+        let decodeParams = Base64.decode(options['x-share']);
         try{
           let commonParams = JSON.parse(decodeParams);
           this.share_code = commonParams.share_code;
@@ -788,6 +788,7 @@ export default {
             data: {
               third_auth_code: loginRes.code,
               provider_id: this.quickLogin.provider_id,
+              share_code: this.share_code
             },
           })
             .then((res) => {

package/src/components/JfbBaseNoticeDialog/JfbBaseNoticeDialog.vue

@@ -141,9 +141,11 @@ export default {
               this.contentList[0].image_url,
               "size8"
             );
-            this.currentLinkUrl = this.getLinkUrl(
-              this.contentList[0].redirect_data
-            );
+            if(this.contentList[0].redirect_data){
+              this.currentLinkUrl = this.getLinkUrl(
+                this.contentList[0].redirect_data
+              );
+            }
             this.currentIndex = 0;
             if(this.systemType === 'fuli'){
               this.handlePop();
@@ -211,9 +213,11 @@ export default {
         return;
       }
       this.currentIndex = this.currentIndex + 1;
-      this.currentLinkUrl = this.getLinkUrl(
-        this.contentList[this.currentIndex].redirect_data
-      );
+      if(this.contentList[this.currentIndex].redirect_data) {
+        this.currentLinkUrl = this.getLinkUrl(
+          this.contentList[this.currentIndex].redirect_data
+        );
+      }
       this.currentImage = getServiceUrl(
         this.contentList[this.currentIndex].image_url,
         "size8"

package/src/components/JfbBaseOrderDetail/JfbBaseOrderDetail.vue

@@ -1045,6 +1045,7 @@ export default {
           custom_content_container_id: this.cid,
           is_show_jhd_code: Number(this.is_show),
           is_show_product: this.is_show_product === "Y" ? 1 : 0,
+          version: 'v2'
         },
       })
         .then((res) => {

package/src/components/JfbBasePay/JfbBasePay.vue

@@ -24,7 +24,6 @@
             <view class="column_value text-gray">
               <xd-unit
                 :price="payInfo.total_amount"
-                :isShowIcon="isShowIcon"
                 :isOld="false"
                 :font-size="28"
                 :icon-size="0.28"
@@ -40,7 +39,6 @@
               <!-- <xd-button width="220rpx" radius="60rpx" type="primary" size="small" @click="xdDownDrawer=true">使用新票券</xd-button> -->
               <xd-unit
                 :price="payInfo.card_amount"
-                :isShowIcon="isShowIcon"
                 :isOld="false"
                 :font-size="28"
                 :icon-size="0.28"
@@ -106,7 +104,6 @@
             <view class="column_value text-primary">
               <xd-unit
                 :price="payInfo.channel_amount"
-                :isShowIcon="isShowIcon"
                 :isOld="false"
                 :font-size="28"
                 :icon-size="0.28"
@@ -247,10 +244,6 @@ export default {
       }
       return url
     },
-    isShowIcon() {
-      if(this.$configProject['isPreview']) return true;
-      return this.siteInfo.mapping.is_show_coin_icon==='Y'
-    },
     ...styleForm.getComputedItem(),
   },
   created() {

package/src/components/JfbBasePhoneLogin/JfbBasePhoneLogin.vue

@@ -371,8 +371,8 @@ export default {
       this.auth_code = options.auth_code;
       this.provider_id = options.provider_id;
       this.callback_url = options.callback_url;
-      if(options['x-common']){
-        let decodeParams = Base64.decode(options['x-common']);
+      if(options['x-share']){
+        let decodeParams = Base64.decode(options['x-share']);
         try{
           let commonParams = JSON.parse(decodeParams);
           this.share_code = commonParams.share_code;
@@ -574,7 +574,7 @@ export default {
           auth_code,
           provider_id,
           phone_number,
-          share_code,
+          share_code: this.share_code,
         }
       }).then(res => {
         this.$xdHideLoading();

package/src/components/JfbBaseSavingDetail/JfbBaseSavingDetail.vue

@@ -142,9 +142,9 @@
           padding: this.getMarginAndPadding(this.tabPadding, { top: 40, right: 0, bottom: 40, left: 0 }),
         }
       },
-      disabledMonth(){
+      disabledMonth() {
         let month = new Date().getMonth() + 1
-        return this.getYearAndMonth(this.monthDateRange).month==month
+        return this.getYearAndMonth(this.monthDateRange).month == month
       }
     },
     watch: {
@@ -154,6 +154,8 @@
       },
       tab(value, oldValue) {
         //请求数据
+        this.hasNext = true;
+        this.page_token = 1
         if (value === 'month') {
           this.getMonthData()
         } else if (value === 'year') {
@@ -161,8 +163,6 @@
         } else if (value === 'total') {
           this.getTotalData()
         }
-        this.hasNext = true;
-        this.page_token = 1
         this.monthDateRange = ""
       }
     },
@@ -180,7 +180,10 @@
         }
       },
       getMonthData() {
-        let data = {}
+        let data = {
+          page_size: 10,
+          page_token: this.page_token,
+        }
         if (this.monthDateRange) {
           data.year = this.getYearAndMonth(this.monthDateRange).year
           data.month = this.getYearAndMonth(this.monthDateRange).month
@@ -287,18 +290,22 @@
           };
           this.monthDateRange = res.date_range
           this.saveAmount = res.save_amount
-          this.hasNext = res.next_page_token !== "";
           if (this.page_token === 1) {
             this.productList = list
           } else {
             this.productList = this.productList.concat(list);
           }
+          this.next_page_token = res.next_page_token
+          this.hasNext = res.next_page_token !== "";
         })
       },
       getYearData() {
         jfbRootExec('getYearSavingDetail', {
           vm: this,
-          data: {},
+          data: {
+            page_size: 10,
+            page_token: this.page_token,
+          },
         }).then(res => {
           let list = res.list.map(item => {
             item["order_time"] = this.$xdUniHelper.getDate(
@@ -380,18 +387,22 @@
           };
           this.yearDateRange = res.date_range
           this.saveAmount = res.save_amount
-          this.hasNext = res.next_page_token !== "";
           if (this.page_token === 1) {
             this.productList = list
           } else {
             this.productList = this.productList.concat(list);
           }
+          this.next_page_token = res.next_page_token
+          this.hasNext = res.next_page_token !== "";
         })
       },
       getTotalData() {
         jfbRootExec('getTotalSavingDetail', {
           vm: this,
-          data: {},
+          data: {
+            page_size: 10,
+            page_token: this.page_token,
+          },
         }).then(res => {
           let list = res.list.map(item => {
             item["order_time"] = this.$xdUniHelper.getDate(
@@ -472,12 +483,13 @@
           };
           this.totalDateRange = res.date_range
           this.saveAmount = res.save_amount
-          this.hasNext = res.next_page_token !== "";
           if (this.page_token === 1) {
             this.productList = list
           } else {
             this.productList = this.productList.concat(list);
           }
+          this.next_page_token = res.next_page_token
+          this.hasNext = res.next_page_token !== "";
         })
       },
       /**
@@ -497,7 +509,7 @@
         this.tabIndex = i;
       },
       getAmout(amount) {
-        return this.$xdUniHelper.divisionFloatNumber(amount, 100)||0
+        return this.$xdUniHelper.divisionFloatNumber(amount, 100) || 0
       },
       getYearAndMonth(dateStr) {
         // 将输入的日期字符串转换为Date对象
@@ -673,6 +685,7 @@
 
           &-info {
             flex: 1;
+
             &-name {
               font-size: 28rpx;
               color: #333333;
@@ -701,7 +714,8 @@
           }
         }
       }
-      .monthDisabled{
+
+      .monthDisabled {
         background: #FCFCFC !important;
         color: #EEEEEE !important;
       }

package/src/components/JfbBaseShare/JfbBaseShare.vue

@@ -25,11 +25,11 @@
       </view>
       
       <view v-if="showShare" class="share_wrap">
-        <button class="share_btn" open-type="share" @click="toSendWx" :style="{backgroundImage: `url(${shareImage})`}">
-          <!-- <image :src="shareImage" mode="widthFix"></image> -->
+        <button class="share_btn" open-type="share" @click="toSendWx">
+          <image :src="shareImage" mode="widthFix"></image>
         </button>
-        <view class="share_btn" @click="toSaveImg" :style="{backgroundImage: `url(${savaImage})`}">
-          <!-- <image src="https://sandbox-img1.jufubao.cn/uploads/20250410/faeb136bfd684ab6fa4608208ad26294.png?x-oss-process=style/size8" mode="widthFix"></image> -->
+        <view class="share_btn" @click="toSaveImg">
+          <image :src="savaImage" mode="widthFix"></image>
         </view>
       </view>
 
@@ -66,6 +66,7 @@
         //todo
         shareImage: "",
         savaImage: "",
+        shareData: {},
       }
     },
     computed: {
@@ -116,8 +117,10 @@
             let urlSearch = item.share_image_url.split('?')[1];
             let newImgUrl = getServiceUrl(item.share_image_url);
             item.share_image_url = newImgUrl.split('?')[0] + '?' + urlSearch;
+            item.wx_mini_share_image = getServiceUrl(item.wx_mini_share_image);
             return item;
           });
+          this.shareData = res;
         })
       },
       handleSwitch(e){
@@ -127,9 +130,9 @@
         let shareIndex = this.shareIndex;
         let curShare = this.shareList[shareIndex];
         this.setShareInfo({
-          title: "您的好友邀请您使用PLUS会员",
-          imageUrl: curShare.share_image_url,
-          path: `${curShare.jump_url}`,
+          title: this.shareData.wx_mini_title,
+          imageUrl: curShare.wx_mini_share_image,
+          path: this.shareData.wx_mini_path,
         });
       },
       toSaveImg(){
@@ -245,16 +248,19 @@
       }
       .share_wrap{
         display: flex;
-        align-items: center;
+        // align-items: center;
+        align-items: flex-start;
         justify-content: center;
         .share_btn{
           width: 300rpx;
-          height: 80rpx;
+          // height: 80rpx;
           background-size: 100% 100%;
           background-color: transparent;
           margin: 60rpx 0 0 0;
+          padding: 0;
           &::after{
             border: none !important;
+            content: initial !important;
           }
           image{
             width: 100%;

package/src/components/JfbBaseSuccess/JfbBaseSuccess.vue

@@ -575,6 +575,7 @@ export default {
           is_show_product: this.is_show_product === "Y" ? 1 : 0,
           custom_content_page_id: this.pageAttr.page_id,
           custom_content_container_id: this.cid,
+          version: 'v2'
         },
       })
         .then((res) => {

package/src/components/JfbBaseWxAuthorize/JfbBaseWxAuthorize.vue

@@ -256,8 +256,8 @@
           this.auth_code = options.auth_code;
           this.provider_id = options.provider_id;
           if(options.url) this.nextUrl = Base64.decode(options.url);
-          if(options['x-common']){
-            let decodeParams = Base64.decode(options['x-common']);
+          if(options['x-share']){
+            let decodeParams = Base64.decode(options['x-share']);
             try{
               let commonParams = JSON.parse(decodeParams);
               this.share_code = commonParams.share_code;