@pisell/private-materials 6.4.75 → 6.4.76

package/lib/plus/walletPassGallery/components/passList/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 interface IPassListProps {
     dataSource: any[];
     value?: string | number;

package/lib/plus/walletPassGallery/components/recharge/index.js

@@ -51,6 +51,7 @@ var Recharge = ({
   const { action, storage } = ((_a = context.appHelper) == null ? void 0 : _a.utils) || {};
   const dvaStore = (_e = (_d = (_c = (_b = context.appHelper) == null ? void 0 : _b.utils) == null ? void 0 : _c.getStore) == null ? void 0 : _d.call(_c)) == null ? void 0 : _e.getState();
   const shop = ((_g = (_f = dvaStore == null ? void 0 : dvaStore.core) == null ? void 0 : _f.core) == null ? void 0 : _g.shop) || {};
+  const [loading, setLoading] = (0, import_react.useState)(false);
   (0, import_react.useEffect)(() => {
     if (detailData) {
       setChargeItem(((detailData == null ? void 0 : detailData.gift_option) || [])[0]);
@@ -59,6 +60,7 @@ var Recharge = ({
   const handleRecharge = async () => {
     var _a2;
     try {
+      setLoading(true);
       const params = {
         voucher_id: (detailData == null ? void 0 : detailData.id) || "",
         product_id: (detailData == null ? void 0 : detailData.product_id) || "",
@@ -87,11 +89,14 @@ var Recharge = ({
         import_utils.locales.getText("wallet-pass-gallery.log.rechargeOrderFailed"),
         error
       );
+    } finally {
+      setLoading(false);
     }
   };
   return /* @__PURE__ */ import_react.default.createElement(
     import_antd.Drawer,
     {
+      destroyOnClose: true,
       title: import_utils.locales.getText("wallet-pass-gallery.rechargeOptions"),
       open,
       zIndex: 999,
@@ -105,7 +110,8 @@ var Recharge = ({
           block: true,
           size: "large",
           onClick: handleRecharge,
-          disabled: !(chargeItem == null ? void 0 : chargeItem.id)
+          disabled: !(chargeItem == null ? void 0 : chargeItem.id),
+          loading
         },
         import_utils.locales.getText("wallet-pass-gallery.recharge")
       )

package/lib/plus/walletPassGallery/components/timelineSection/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 interface TimelineSectionProps {
     code: string;

package/lib/plus/walletPassGallery/index.js

@@ -89,7 +89,8 @@ var WalletPassGallery = (props) => {
         num: 20,
         skip: (d == null ? void 0 : d.nextId) || 1,
         tags: TAGS,
-        filter_wallet_id: walletId || void 0
+        filter_wallet_id: walletId || void 0,
+        "with": ["customScheduleSnapshot"]
       });
       return {
         list: (res == null ? void 0 : res.list) || [],
@@ -115,7 +116,8 @@ var WalletPassGallery = (props) => {
         num: 20,
         skip: (d == null ? void 0 : d.nextId) || 1,
         tags: TAGS,
-        filter_wallet_id: walletId || void 0
+        filter_wallet_id: walletId || void 0,
+        "with": ["customScheduleSnapshot"]
       });
       return {
         list: (res == null ? void 0 : res.list) || [],
@@ -440,7 +442,9 @@ var WalletPassGallery = (props) => {
     ), /* @__PURE__ */ import_react.default.createElement(
       import_materials.PisellModal,
       {
-        platform: "h5",
+        zIndex: 997,
+        destroyOnClose: true,
+        platform,
         visible: !!_currentItem,
         onCancel: () => setCurrentItemId(""),
         footer: null,

package/lib/plus/walletPassGallery/serve.d.ts

@@ -17,6 +17,7 @@ export interface IWalletListParmsProps {
     skip?: number;
     filter_wallet_id?: string;
     available: 0 | 1;
+    with?: string[];
 }
 /**
  * 钱包列表项属性接口
@@ -171,6 +172,8 @@ export declare const getAssetList: (params: IAssetListProps) => Promise<{
  */
 export declare const getDetailApi: (params: {
     id: string;
+    order_behavior_count_customer_id: string;
+    apiPrefix: string;
 }) => Promise<IDetailResponse>;
 /**
  * 详情响应数据结构，供组件消费

package/lib/plus/walletPassGallery/serve.js

@@ -69,11 +69,12 @@ var getAssetList = async (params) => {
   return data;
 };
 var getDetailApi = async (params) => {
-  const { data } = await import_utils.request.getRequest().get(`/h5/machinecode/lowcode/detail/${params.id}`, {
+  const { data } = await import_utils.request.getRequest().get(`${params.apiPrefix || "/h5"}/machinecode/lowcode/detail/${params.id}`, {
     order_behavior_count: 1,
     // 订单行为次数
-    order_behavior_count_customer: 1
+    order_behavior_count_customer: 1,
     // 客户订单行为次数
+    order_behavior_count_customer_id: params.apiPrefix === "/shop" ? params.order_behavior_count_customer_id : void 0
   });
   return data;
 };

package/lib/pro/Login2.0/index.less

@@ -15,6 +15,14 @@
   
   /* 默认底部内边距 */
   padding-bottom: 24px;
+
+  // 加载状态优化
+  .pisell-lowcode-btn-loading-icon {
+    .anticon {
+      color: #ffffff !important;
+    }
+  }
+
   
   /* 在弹窗模式下不需要额外的底部内边距，因为使用 sticky 定位 */
   .pisell-lowcode-modal-body & {
@@ -462,6 +470,13 @@
   .login-lm-drawer-popover & {
     padding-bottom: 100px;
   }
+    // 加载状态优化
+  .pisell-lowcode-btn-loading-icon {
+    .anticon {
+      color: #ffffff !important;
+    }
+  }
+
 }
 
 // 错误提示样式优化
@@ -521,14 +536,6 @@
 //     }
 //   }
 // }
-
-// 加载状态优化
-.pisell-lowcode-btn-loading-icon {
-  .anticon {
-    color: #ffffff !important;
-  }
-}
-
 // 切换认证方式按钮
 .login2-switch-button {
   margin-top: 0;

package/lowcode/wallet-pass-detail/meta.ts

@@ -0,0 +1,89 @@
+const Meta = {
+  componentName: 'WalletPassDetail',
+  title: 'WalletPassDetail',
+  docUrl: '',
+  screenshot: '',
+  devMode: 'proCode',
+  npm: {
+    package: '@pisell/private-materials',
+    version: '1.1.558',
+    exportName: 'WalletPassDetail',
+    main: 'src/index.ts',
+    destructuring: true,
+    subName: '',
+  },
+  configure: {
+    props: [
+      {
+        "title": {
+          "label": {
+            "type": "i18n",
+            "en-US": "详情数据",
+            "zh-CN": "详情数据"
+          }
+        },
+        "name": "dataSource",
+        "setter": ["JsonSetter", "VariableSetter"],
+      },
+      {
+        "title": {
+          "label": {
+            "type": "i18n",
+            "en-US": "平台",
+            "zh-CN": "平台"
+          }
+        },
+        "name": "platform",
+        "setter": "StringSetter",
+      },
+      {
+        name: 'buttonGroupList',
+        "title": {
+          "label": {
+            "type": "i18n",
+            "en-US": "按钮组列表",
+            "zh-CN": "按钮组列表"
+          }
+        },
+        type: 'array',
+        default: [],
+        setter: 'ArraySetter',
+        itemSetter: {
+          componentName: 'ObjectSetter',
+          props: {
+            itemSetter: {
+              componentName: 'ObjectSetter',
+              props: {
+                itemSetter: 'StringSetter',
+              },
+            },
+          },
+        },
+      },
+      {
+        name: 'showTimeLine',
+        title: { label: '显示时间轴', tip: 'showTimeLine | 显示时间轴' },
+        setter: 'BoolSetter',
+      },
+    ],
+    supports: {},
+    component: {},
+  },
+};
+const snippets = [
+  {
+    title: 'wallet详情',
+    screenshot: '',
+    schema: {
+      componentName: 'WalletPassDetail',
+      props: {
+
+      },
+    },
+  },
+];
+
+export default {
+  ...Meta,
+  snippets,
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.4.75",
+  "version": "6.4.76",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -61,10 +61,10 @@
     "styled-components": "^6.0.0-rc.3",
     "@react-spring/web": "^9.6.1",
     "@use-gesture/react": "^10.3.1",
-    "@pisell/utils": "3.0.2",
-    "@pisell/materials": "6.4.19",
+    "@pisell/materials": "6.4.20",
     "@pisell/icon": "0.0.11",
-    "@pisell/date-picker": "3.0.7"
+    "@pisell/date-picker": "3.0.7",
+    "@pisell/utils": "3.0.2"
   },
   "peerDependencies": {
     "react": "^18.0.0",