jufubao-base 1.0.242-beta4 → 1.0.242-beta7

package/package.json

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

package/src/components/JfbBaseConsumpCode/JfbBaseConsumpCode.vue

@@ -146,6 +146,9 @@
   import { mapState } from 'vuex';
 
   export default {
+    //#ifdef MP-WEIXIN
+    options: { styleIsolation: 'shared' },
+    //#endif
     name: "JfbBaseConsumpCode",
     components: {
       XdFontIcon,
@@ -258,10 +261,12 @@
 
           if (Object.keys(this.stateLocation).length === 0) {
             this.tip = '为了给您提供更好的服务需要获取您的位置信息'
-            this.showLocationDialog = true
+            this.showLocationDialog = true;
             this.showMask = true;
             this.showDialog = false;
             return
+          } else{
+            this.showLocationDialog = false
           }
         }
         if (!this.options.shop_id) {
@@ -1076,7 +1081,7 @@
     .dialog-btns {
       width: 100%;
       display: flex;
-      justify-content: space-between;
+      justify-content: space-around;
 
     }
 

package/src/components/JfbBaseFooter/JfbBaseFooter.vue

@@ -19,7 +19,7 @@
     <view class="jfb-base-footer__body">
       <view :style="[bodyStyle]">
         <xd-footer-bar
-          class="footer-bar"
+          class="footer-bar-deep"
           style="height:100%"
           v-if="list !== null"
           :height="height"
@@ -49,6 +49,9 @@
   import getServiceUrl from "@/common/getServiceUrl";
 
   export default {
+    //#ifdef MP-WEIXIN
+    options: { styleIsolation: 'shared' },
+    //#endif
     name: "JfbBaseFooter",
     components: {
       XdFontIcon,
@@ -200,7 +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', '');
+        this.borderColor = getContainerPropsValue(value, 'content.borderColor', '#eee');
         this.list = {
           bgColor: getContainerPropsValue(value, 'content.bgColor', '#fff'),
           bodyStyle: this.bodyStyle,
@@ -226,9 +229,12 @@
 
 <style scoped lang="less">
   @import "./JfbBaseFooterLess.less";
-  .footer-bar ::v-deep .xd-footer-tabbar__border {
-    border-color: var(--border-color);
+  .footer-bar-deep {
+    ::v-deep .xd-footer-tabbar__border {
+      border-color: var(--border-color);
+    }
   }
+  
 
   .jfb-base-footer {
 

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

@@ -116,6 +116,7 @@
             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;
           });
         })
@@ -128,7 +129,7 @@
         let curShare = this.shareList[shareIndex];
         this.setShareInfo({
           title: "您的好友邀请您使用PLUS会员",
-          imageUrl: curShare.share_image_url,
+          imageUrl: curShare.wx_mini_share_image,
           path: `${curShare.jump_url}`,
         });
       },