jufubao-base 1.0.232-beta6 → 1.0.232-beta8

package/package.json

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

package/src/components/JfbBaseBalance/JfbBaseBalance.vue

@@ -90,6 +90,7 @@
         recordList: [],
         hasNext: true,
         page_token: 1,
+        next_page_token: ''
       }
     },
     computed: {
@@ -153,12 +154,13 @@
             ).fullTime;
             return item;
           })
-          this.hasNext = res.next_page_token !== "";
           if (this.page_token === 1) {
             this.recordList = list
           } else {
             this.recordList = this.recordList.concat(list);
           }
+          this.next_page_token = res.next_page_token
+          this.hasNext = res.next_page_token !== "";
         })
       },
       getContent() {
@@ -201,6 +203,7 @@
         this.wallet_type = item.wallet_type;
         this.isWithDraw = item.is_support_withdraw;
         this.amount = item.amount;
+        this.next_page_token=''
         this.hasNext = true;
         this.page_token = 1;
         this.recordList = [];

package/src/components/JfbBaseBalance/Mock.js

@@ -1,13 +1,9 @@
 'use strict';
 
 module.exports = {
-  
-  getBalanceByIdFilmSquate:{},
-  
-  updateBalanceFilmPaiqiDate:{},
-  
-  removeBalanceFilmAddress:{},
-  
-  addBalanceFilmcart:{},
-  
+
+  getBalanceDetail: { "wallet_list": [{ "sort": 2, "wallet_type": "UC", "show_name": "可用余额", "amount": 19940, "is_support_withdraw": "Y" }, { "sort": 0, "wallet_type": "UT", "show_name": "待到账余额", "amount": 0, "is_support_withdraw": "N" }], "request_id": "279b309d137cae9f" },
+
+  getBalanceWalletTradeList: { "next_page_token": "2", "total_size": 0, "list": [{ "trade_nnid": "eDaOl5aPD4Fx8gtBJC1bd", "order_id": "i771037005030096968", "amount": 10, "trade_type": "user_withdraw_chargeback", "trade_type_name": "提现失败", "operate_type": "A", "operate_type_name": "收入", "trade_name": "", "comment": "余额提现", "created_time": 1744883229 }, { "trade_nnid": "qhBI-btv4hh8TpsGdCrDG", "order_id": "i771066286233878607", "amount": 10, "trade_type": "user_withdraw", "trade_type_name": "余额提现", "operate_type": "R", "operate_type_name": "支出", "trade_name": "", "comment": "", "created_time": 1744796528 }, { "trade_nnid": "NCI4DolRx-0GqFfY5J9-P", "order_id": "i771065517556367438", "amount": 10, "trade_type": "user_withdraw", "trade_type_name": "余额提现", "operate_type": "R", "operate_type_name": "支出", "trade_name": "", "comment": "", "created_time": 1744796345 }, { "trade_nnid": "upM7epMxX3FqoTytFyKUn", "order_id": "i771062549364867149", "amount": 10, "trade_type": "user_withdraw", "trade_type_name": "余额提现", "operate_type": "R", "operate_type_name": "支出", "trade_name": "", "comment": "", "created_time": 1744795637 }, { "trade_nnid": "nzH3e_P25C-q7wcN52L-z", "order_id": "i771061580484837452", "amount": 10, "trade_type": "user_withdraw", "trade_type_name": "余额提现", "operate_type": "R", "operate_type_name": "支出", "trade_name": "", "comment": "", "created_time": 1744795406 }, { "trade_nnid": "aduSpdXNKl0dwqxPhovf0", "order_id": "i771059916772212811", "amount": 10, "trade_type": "user_withdraw", "trade_type_name": "余额提现", "operate_type": "R", "operate_type_name": "支出", "trade_name": "", "comment": "", "created_time": 1744795009 }, { "trade_nnid": "dTTmA75uN-Mv3as8XE1Te", "order_id": "i771054224359293002", "amount": 10, "trade_type": "user_withdraw", "trade_type_name": "余额提现", "operate_type": "R", "operate_type_name": "支出", "trade_name": "", "comment": "", "created_time": 1744793652 }, { "trade_nnid": "jo4IOWJ1wPyGXiA5wQYUU", "order_id": "i771037005030096968", "amount": 10, "trade_type": "user_withdraw", "trade_type_name": "余额提现", "operate_type": "R", "operate_type_name": "支出", "trade_name": "", "comment": "", "created_time": 1744789547 }, { "trade_nnid": "78qU6Cemnhqnvms2-iJDI", "order_id": "i771019326374281284", "amount": 1000, "trade_type": "user_withdraw_chargeback", "trade_type_name": "提现失败", "operate_type": "A", "operate_type_name": "收入", "trade_name": "", "comment": "余额提现", "created_time": 1744789418 }, { "trade_nnid": "yLLohJoE-qowAuxastB1z", "order_id": "i771034873199591494", "amount": 1000, "trade_type": "user_withdraw_chargeback", "trade_type_name": "提现失败", "operate_type": "A", "operate_type_name": "收入", "trade_name": "", "comment": "余额提现", "created_time": 1744789410 }], "request_id": "e9f0142e62066570" },
+
 }

package/src/components/JfbBaseCodeOpenVip/Attr.js

@@ -263,6 +263,18 @@ export default {
         },
         inline: false,
       },
+      {
+        label: '支付页面跳转路径:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'payPath',
+        groupKey:'advanced',
+        placeholder: '请选择支付页面跳转路径',
+        value: data['payPath'] || null,
+        setting: {
+          router: XdBus.getParentApi('getPagesTree'),
+        },
+        inline: false,
+      },
     ].filter(i=>i)
   },
   advanced: [],

package/src/components/JfbBaseCodeOpenVip/JfbBaseCodeOpenVip.vue

@@ -79,6 +79,7 @@
         //todo
         description: "",
         vipSuccessPath: "",
+        payPath: "",
       }
     },
     computed: {
@@ -114,6 +115,7 @@
       init(container) {
         this.description = getContainerPropsValue(container, 'content.description', "");
         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"]}`;
@@ -144,10 +146,19 @@
             business_code: this.xnamespace,
             product_id: this.vipInfo.product_id,
             notify_provider_id: this.projectAttr.notify_provider_id,
-            need_pay_price: 0
+            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) {

package/src/components/JfbBaseConsumpCode/Api.js

@@ -7,52 +7,127 @@
 module.exports = [
   {
     //设置方法名字当别忘记加上【模块名字】：Consump
-    mapFnName: 'getConsumpByIdFilmSquate',
-    title: '获取电影广场列表',
-    path: '/api/account/film/list-film-square',
+    mapFnName: 'getConsumpCode',
+    title: '获取支付码',
+    path: '/store/v1/order/get-quick-pay-code',
     isRule: false,
     params: {
-      last_key: ['当前页', 'Number', '必选'],
-      page_size: ['每页数量', 'Number', '必选'],
+      shop_id: ['门店ID', 'Number', '必选'],
+      temp_order_id: ['临时订单号第一次获取为空，再次获取需要传上次获取到数据', 'Number', '非必选'],
     },
     isConsole: true,
     disabled: true,
   },
   {
     //设置方法名字当别忘记加上【模块名字】：Consump
-    mapFnName: 'updateConsumpFilmPaiqiDate',
-    title: '更新排期',
-    path: '/api/account/film/paiqi-date',
+    mapFnName: 'getConsumpCodeScanStatus',
+    title: '获取支付码扫码状态',
+    path: '/store/v1/order/get-quick-pay-scan-status',
     isRule: false,
     params: {
-      film_id: ['电影id', 'Number', '必选'],
-      cinema_id: ['影院id', 'Number', '必选'],
+      temp_order_id: ['临时订单号', 'Number', '必选'],
     },
     isConsole: true,
     disabled: true,
   },
   {
-    //设置方法名字当别忘记加上【模块名字】：Consump
-    mapFnName: 'removeConsumpFilmAddress',
-    title: '删除我的配送地址',
-    path: '/api/account/film/paiqi-date',
+    mapFnName: "getConsumpListUserPayChannel",
+    title: "获取用户可用支付渠道",
+    path: "/pay/v1/pay-channel/list-user-pay-channel",
+    isRule: false,
+    params: {
+      providers: ['支付方式id 多个用逗号分隔', "String", '必选']
+    },
+    isConsole: true,
+    disabled: true
+  },
+  {
+    path: '/store/v1/order/async-submit-status',
+    title: "获取异步下单的状态",
+    mapFnName: "getConsumpAsyncSubmitStatus",
     isRule: false,
     params: {
-      film_id: ['电影id', 'Number', '必选'],
+      request_order_id: ['temp_order_id', 'Number', '必选'],
     },
     isConsole: true,
     disabled: true,
   },
+  {
+    mapFnName: "setConsumpThirdPlace",
+    title: "第三方渠道下单",
+    path: "/pay/v1/order/third-place",
+    isRule: false,
+    data: {
+      order_id: ['订单号', "String", "必填"],
+      channel_provider_id: ['支付渠道id', "String", '必选']
+    },
+    isConsole: true,
+    disabled: true
+  },
+  {
+    mapFnName: "updateConsumpPay",
+    title: "修改订单为支付中",
+    path: "/order/v1/order/update-to-paying",
+    isRule: false,
+    data: {
+      main_order_id: ['订单号', "String", "必填"],
+    },
+    isConsole: true,
+    disabled: true
+  },
   {
     //设置方法名字当别忘记加上【模块名字】：Consump
-    mapFnName: 'addConsumpFilmcart',
-    title: '添加购物车',
-    path: '/api/account/film/paiqi-date',
+    mapFnName: 'batchConsumpUseCardCreated',
+    title: '批量使用卡券下单',
+    path: '/store/v1/order/batch-use-card-created',
+    isRule: false,
+    data: {
+      temp_order_id: ['临时订单号', 'Number', '必选'],
+    },
+    isConsole: true,
+    disabled: true,
+  },
+  {
+    //设置方法名字当别忘记加上【模块名字】：Consump
+    mapFnName: 'getConsumpShopList',
+    title: '获取附近门店列表',
+    path: '/mall/v1/shop/msearch',
+    isRule: false,
+    params: {},
+    isConsole: true,
+    disabled: true,
+  },
+  {
+    mapFnName: 'getConsumpSettleMainInfo',
+    title: '门店核销 - 展示主界面数据',
+    // path: '/store/v1/cash/settle/main-info',
+    path: "/store/v1/order/main-info",
     isRule: false,
     params: {
-      film_id: ['电影id', 'Number', '必选'],
+      shop_id: ['门店id', 'Number', '必选'],
     },
     isConsole: true,
     disabled: true,
   },
+  {
+    mapFnName: 'addConsumpCashierTempOrderData',
+    title: '门店核销 - 保存临时购物数据',
+    path: "/store/v1/order/save-cart-order-data",
+    isRule: false,
+    data: {
+      shop_id: ['门店id', 'Number', '必选'],
+      settle_tag_id: ['结算标签id', 'Number', '必选'],
+    },
+    isConsole: true,
+    disabled: true,
+  },
+  {
+    mapFnName: 'getConsumpBaseUserInfo',
+    title: '获取用户信息',
+    path: '/passport/v1/user/get',
+    params: {},
+    isRule: false,
+    isConsole: true,
+    disabled: true,
+  }
 ];

package/src/components/JfbBaseConsumpCode/Attr.js

@@ -42,6 +42,19 @@ export default {
         },
         inline: false,
       },
+      {
+        label: '核销支付路径:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'cash_pay_path',
+        placeholder: '请选择核销支付路径',
+        className: 'input100',
+        groupKey:'advanced',
+        value: null,
+        setting: {
+          router: XdBus.getParentApi('getPagesTree')
+        },
+        inline: false,
+      },
     ].filter(i=>i)
   },
   advanced: [],