jufubao-base 1.0.436 → 1.0.437

package/get.package.path.js

@@ -8,11 +8,11 @@
  */
 const getPackagePath = (threePackagePath, packname = 'gxd-commands-bussiness')=>{
   if(packname === 'gxd-commands-bussiness') {
-    return `/Users/shiyonggao/home/root/Base-Jufubao/xd-commands-bussiness/${threePackagePath}`;
+    return `/Users/shiyonggao/Desktop/code/BASE/UNIAPP/xd-commands-bussiness/${threePackagePath}`;
   }
 
   if (packname === 'gxd-uni-library-editx') {
-    return `/Users/shiyonggao/home/root/Base-Jufubao/xd-uni-library-editx/${threePackagePath}`;
+    return `/Users/shiyonggao/Desktop/code/BASE/UNIAPP/xd-uni-library-editx/${threePackagePath}`;
   }
 
 };

package/package.json

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

package/src/components/JfbBaseCard/JfbBaseCard.vue

@@ -416,7 +416,63 @@ export default {
       buy_name: '',
       isShowBuy: 'N',
       buy_new_url: '',
-      entryGroupId:'default'
+      entryGroupId:'default',
+
+      testCouponList: [
+        {
+          card_number: '10001000001168',
+          card_point: 5000,
+          card_type: '0',
+          card_type_name: '满50减50',
+          unit: '点',
+          end_time: '2024-11-23',
+          is_valid: 'Y',
+          main_business_code_name: '',
+          other_card_point: 0,
+          is_exchange: 'N',
+          card_point_type: 1,
+          business_codes: [
+            'cake',
+            'movie',
+            'video',
+            'market',
+            'book'
+          ],
+          is_login: 'N',
+          consume_type: '2',
+          card_use_rule: '满50减1',
+          is_transfering: 'N',
+          "card_status": "F",
+          "card_status_name": "已冻结"
+
+        },
+        {
+          card_number: '10001000001169',
+          card_point: 6000,
+          card_type: '0',
+          card_type_name: '满50减50',
+          unit: '点',
+          end_time: '2024-11-23',
+          is_valid: 'Y',
+          main_business_code_name: '',
+          other_card_point: 0,
+          is_exchange: 'N',
+          card_point_type: 1,
+          business_codes: [
+            'cake',
+            'movie',
+            'video',
+            'market',
+            'book'
+          ],
+          is_login: 'N',
+          consume_type: '2',
+          card_use_rule: '满50减1',
+          is_transfering: 'N',
+          "card_status": "Y",
+          "card_status_name": "正常"
+        }
+      ],
     };
   },
   created() {
@@ -513,6 +569,7 @@ export default {
       this.show_type = show_type;
       this.getCardList(this.options);
     },
+
     getContent() {
       jfbRootExec("getListBaseNewsContent", {
         vm: this,
@@ -583,9 +640,10 @@ export default {
 
     handleToDisabled() {
       if (this.$configProject['isPreview']) return;
+      if(!this.disabledUrl) return;
 
       this.$xdUniHelper.navigateTo({
-        url: `${this.disabledUrl}`,
+        url: `${this.disabledUrl}?show-type=${this.show_type}`,
       });
     },
 
@@ -704,6 +762,7 @@ export default {
     },
 
     getCardList(options) {
+
       let params = {is_all: 'Y',is_show_entry_settings: 'Y'};
       if(options['jfb_business_code']) {
         params['card_business_code'] = options['jfb_business_code'];
@@ -720,6 +779,14 @@ export default {
         .then((res) => {
           this.loadingCardList = false;
           this.showDisabled = res.is_show_invalid_card_entrance;
+
+          //优惠券 - 预览模式测试数据
+          if(this.show_type === 'coupon') {
+            if(this.$configProject.isPreview) {
+              res.list = this.testCouponList;
+            }
+          }
+
           res.list = res.list.map((item) => {
             return {
               ...item,

package/src/components/JfbBaseCardDisabled/JfbBaseCardDisabled.vue

@@ -112,6 +112,9 @@ export default {
       disableList: [],
       isShowUnbind: true,
       loadingList: true,
+
+      //普通卡｜优惠券
+      showType:'',
     };
   },
   watch: {
@@ -126,15 +129,20 @@ export default {
   },
   methods: {
     onJfbLoad(options) {
+      if(['normal','coupon'].includes(options['show-type'])) {
+        this.showType = options['show-type']
+      }
       this.getCardList();
     },
+
     getCardList() {
       this.$xdShowLoading({});
+      let params = { is_all: "Y" }
+      if(this.showType) params.show_type = this.showType;
+
       jfbRootExec("getDisableCardList", {
         vm: this,
-        data: {
-          is_all: "Y",
-        },
+        data: params,
       })
         .then((res) => {
           this.loadingList = false;

package/src/components/JfbBaseCardDisabledEntry/JfbBaseCardDisabledEntry.vue

@@ -175,6 +175,9 @@ export default {
     return {
       isShowUnbind: true,
       isShowIndex:false,
+
+      //普通卡｜优惠券
+      showType:'',
     };
   },
   computed:{
@@ -197,12 +200,21 @@ export default {
   methods: {
     onJfbLoad(options) {
       this.isShowIndex = options['show_index'] === '1';
+
+      //普通卡｜优惠券
+      if(['normal','coupon'].includes(options['show-type'])) {
+        this.showType = options['show-type']
+      }
       this.getCardList();
     },
 
     getCardList() {
       this.$xdShowLoading({});
-      jfbRootExec("getDisableCardListEntry", {vm: this, data: {is_all: "Y", is_show_entry_settings: 'Y'},})
+
+      let params =  {is_all: "Y", is_show_entry_settings: 'Y'};
+      if(this.showType) params.show_type = this.showType;
+
+      jfbRootExec("getDisableCardListEntry", {vm: this, data: params,})
         .then((res) => {
           res.list = res.list.map((item) => {
             return {

package/src/components/JfbBaseCardEntry/JfbBaseCardEntry.vue

@@ -563,6 +563,11 @@ export default {
     emptyBg() {
         return this.getNoData();
     },
+    showTypeComp(){
+      if( this.tabIndex === 1) return 'normal'
+      if( this.tabIndex === 2) return 'coupon'
+      return 'all'
+    }
   },
   filters:{
     cutstr(val){
@@ -930,10 +935,12 @@ export default {
 
     handleToDisabled() {
       if (this.$configProject['isPreview']) return;
+      if(!this.disabledUrl) return;
 
-      this.$xdUniHelper.navigateTo({
-        url: `${this.disabledUrl}`,
-      });
+      //设置URL
+      let url = this.disabledUrl;
+      if(!['all'].includes(this.showTypeComp)) url += `?show-type=${this.showTypeComp}`;
+      this.$xdUniHelper.navigateTo({url});
     },
 
     checkTabStatus(res){
@@ -1117,18 +1124,18 @@ export default {
         data: params
       }).then(res=>{
         this.loadingCardList = false;
+        this.showDisabled = res.is_show_invalid_card_entrance;
+        if(this.isPreview) {
+          res.list = this.testCouponList
+        }
         this.totalCouponCardNum = res.list.length || 0;
-          this.showDisabled = res.is_show_invalid_card_entrance;
-          if(this.isPreview) {
-            res.list = this.testCouponList
-          }
-          //过滤入口配置
-          res['site_entry_settings'] = this.filterNotSupportEntry(res['site_entry_settings']);
-          let newCardList = this.$xdUniHelper.cloneDeep(res.list);
-          this.couponList = this.getCardGroupItem(newCardList, res['site_entry_settings']);
-          console.log(this.couponList,'this.couponList');
+        //过滤入口配置
+        res['site_entry_settings'] = this.filterNotSupportEntry(res['site_entry_settings']);
+        let newCardList = this.$xdUniHelper.cloneDeep(res.list);
+        this.couponList = this.getCardGroupItem(newCardList, res['site_entry_settings']);
+        console.log(this.couponList,'this.couponList');
 
-          this.$xdHideLoading({});
+        this.$xdHideLoading({});
 
       }) .catch(() => this.$xdHideLoading());