jufubao-base 1.0.294 → 1.0.295-beta2

package/package.json

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

package/src/components/JfbBaseCodeOpenVip/JfbBaseCodeOpenVip.vue

@@ -39,7 +39,7 @@
           <xd-list-item label="套餐金额" paddingLR="40rpx">¥{{ $xdUniHelper.divisionFloatNumber(vipInfo.sale_price, 100) }}</xd-list-item>
         </view>
         <view class="fixed_bottom" :style="fixed_bottom">
-          <xd-button type="primary" width="600rpx" @click="p_createVipOrder">立即兑换</xd-button>
+          <xd-button type="primary" width="600rpx" @click="createVipOrder">立即兑换</xd-button>
           <view class="plus_privacy">开通视为同意 <text @click.stop="handlePrivacy('privacy_service')">《共享PLUS会员用户协议》</text></view>
         </view>
       </view>
@@ -74,9 +74,10 @@
         xnamespace: "",
 
         exchange_code: "",
+        createStatus: false,
         step: 1,
         vipInfo: {},
-        //todo
+
         description: "",
         vipSuccessPath: "",
         payPath: "",
@@ -102,11 +103,15 @@
     created() {
       this.init(this.container);
 
-      //todo
     },
     methods: {
       onJfbLoad(options) {
+        if(options['ecode']) {
+          this.exchange_code = options['ecode'];
+          this.searchCode();
+        }
       },
+
       /**
        * @description 监听事件变化
        * @param container {object} 业务组件对象自己
@@ -116,6 +121,7 @@
         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"]}`;
         params = `${params}&container_id=${this.containerId}${code}`;
@@ -123,6 +129,7 @@
           url: `/pages/content/content?${params}`
         })
       },
+
       searchCode(){
         if(!this.exchange_code) return;
         this.$xdShowLoading({});
@@ -135,9 +142,15 @@
           this.$xdHideLoading();
           this.step = 2;
           this.vipInfo = res;
+        }).catch(e=>{
+          this.$xdHideLoading();
         })
       },
-      p_createVipOrder(){
+
+      createVipOrder(){
+        if(this.createStatus) return
+        this.createStatus = true;
+        this.$xdShowLoading({});
         jfbRootExec("createVipOrder", {
           vm: this,
           data: {
@@ -147,38 +160,25 @@
             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) {
-        // console.log('event.onJfbScroll', options)
-      },
-      onJfbReachBottom(options) {
-        console.log('event.onJfbReachBottom', options)
-      },
-      onJfbShow(options) {
-        console.log('event.onJfbShow', options)
-      },
-      onJfbHide(options) {
-        console.log('event.onJfbHide', options)
-      },
-      onJfbBack(options) {
-        console.log('event.onJfbBack', options)
-      },
-      onJfbUpdate(...data) {
-        console.log('event.onJfbUpdate', data)
-      },
-      onJfbCustomEvent(options) {
-        console.log('event.onJfbReachBottom', options)
+          .then(res => {
+            this.createStatus = false;
+            this.$xdHideLoading();
+            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}`
+              })
+            }
+          })
+          .catch(err=>{
+            this.createStatus = false;
+            this.$xdHideLoading();
+          })
       },
     }
   }

package/src/components/JfbBaseSavingDetail/JfbBaseSavingDetail.vue

@@ -154,6 +154,7 @@
       },
       tab(value, oldValue) {
         //请求数据
+        this.option = null;
         this.hasNext = true;
         this.page_token = 1
         if (value === 'month') {
@@ -350,7 +351,7 @@
             },
             angleAxis: {
               max: max,
-              startAngle: 90, // 开始的角度  
+              startAngle: 90, // 开始的角度
               show: false,
             },
             radiusAxis: {
@@ -446,7 +447,7 @@
             },
             angleAxis: {
               max: max,
-              startAngle: 90, // 开始的角度  
+              startAngle: 90, // 开始的角度
               show: false,
             },
             radiusAxis: {
@@ -534,10 +535,10 @@
           // 提取年份和月份
           const year = dateStr.match(/(\d{4})年/)[1];
           const month = dateStr.match(/(\d+)月/)[1];
-          
+
           // 确保月份是两位数
           const formattedMonth = month.padStart(2, '0');
-          
+
           // 组合成目标格式
           return `${year}-${formattedMonth}-01`;
       },
@@ -733,4 +734,4 @@
       }
     }
   }
-</style>
+</style>