s-material-react 0.1.13 → 0.1.15

package/dist/components/Goods/index.js

@@ -9,12 +9,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useEffect, useState, memo, useRef } from 'react';
-import { useComponent } from '@brushes/qj-simulate-component';
+import { navigatorImpl, useComponent } from '@brushes/qj-simulate-component';
 import { querySkuNotOnShelf } from '@brushes/api';
 import { _ } from '@brushes/tools';
-// import { QjIcon } from '@brushes/share-resource';
 import classNames from 'classnames';
 import { QjMobileIcon } from '../../common/icon';
+import { routerMap } from '../../routerMap';
 const { isEqual, isEmpty } = _;
 const GoodsJsx = ({ defaultValue = [], classCode = '', margin, circular, cell, gap = 10, goods = [], markedPrice, paddingTop, paddingBottom, paddingLeft, paddingRight }) => {
     const [list, setList] = useState(defaultValue);
@@ -64,6 +64,6 @@ const GoodsJsx = ({ defaultValue = [], classCode = '', margin, circular, cell, g
             } }, { children: list.map((item, index) => (_jsxs(View, Object.assign({ style: {
                     overflow: 'hidden',
                     borderRadius: circular === 2 ? 0 : '8px'
-                }, className: 'goods' }, { children: [_jsx(View, { className: `goods-img`, style: { backgroundImage: `url(${item.dataPic})` } }), _jsxs(View, Object.assign({ className: 'space' }, { children: [_jsx(View, Object.assign({ className: 'titleType' }, { children: item.goodsName })), _jsx(View, Object.assign({ className: 'subTitle' }, { children: item.brandName })), _jsxs(View, Object.assign({ className: 'price' }, { children: [_jsx(Text, Object.assign({ className: 'subPrice' }, { children: "\u00A5" })), item.pricesetNprice, markedPrice === 1 && (_jsxs(Text, Object.assign({ className: 'markedPrice' }, { children: [_jsx(Text, Object.assign({ className: 'subPrice' }, { children: "\u00A5" })), item.pricesetMakeprice] })))] })), _jsx(View, Object.assign({ className: 'anticon' }, { children: _jsx(QjMobileIcon, { style: { fontSize: 30, color: '#f00' }, value: 'cart' }) }))] }))] }), index))) })) })));
+                }, onClick: () => navigatorImpl(`${routerMap.goodDetail}?skuCode=${item.skuCode}`), className: 'goods' }, { children: [_jsx(View, { className: `goods-img`, style: { backgroundImage: `url(${item.dataPic})` } }), _jsxs(View, Object.assign({ className: 'space' }, { children: [_jsx(View, Object.assign({ className: 'titleType' }, { children: item.goodsName })), _jsx(View, Object.assign({ className: 'subTitle' }, { children: item.brandName })), _jsxs(View, Object.assign({ className: 'price' }, { children: [_jsx(Text, Object.assign({ className: 'subPrice' }, { children: "\u00A5" })), item.pricesetNprice, markedPrice === 1 && (_jsxs(Text, Object.assign({ className: 'markedPrice' }, { children: [_jsx(Text, Object.assign({ className: 'subPrice' }, { children: "\u00A5" })), item.pricesetMakeprice] })))] })), _jsx(View, Object.assign({ className: 'anticon' }, { children: _jsx(QjMobileIcon, { style: { fontSize: 30, color: '#f00' }, value: 'cart' }) }))] }))] }), index))) })) })));
 };
 export const Goods = memo(GoodsJsx);

package/dist/components/GoodsClassify/components/classifySkeleton.d.ts

@@ -0,0 +1 @@
+export declare const ClassifySkeleton: () => JSX.Element;

package/dist/components/GoodsClassify/components/classifySkeleton.js

@@ -0,0 +1,12 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { useComponent } from '@brushes/qj-simulate-component';
+import { getEnv } from '@brushes/api';
+import { useRef } from 'react';
+export const ClassifySkeleton = () => {
+    const flag = getEnv();
+    const { View, Skeleton } = useComponent();
+    const lBlcArr = useRef(Array(3).fill(1));
+    return (_jsxs(View, Object.assign({ className: 'classifySkeleton', style: { height: flag ? 'calc(100vh - 51px)' : '667px' } }, { children: [_jsx(View, Object.assign({ className: 'lPart' }, { children: lBlcArr.current.map((item, index) => {
+                    return _jsx(Skeleton, { animated: true, className: 'blc' }, index);
+                }) })), _jsx(View, Object.assign({ className: 'rPart' }, { children: _jsx(Skeleton.Paragraph, { lineCount: 5, animated: true }) }))] })));
+};

package/dist/components/GoodsClassify/index.js

@@ -7,7 +7,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { memo, useEffect, useState } from 'react';
 import { useComponent, antdMobile, navigatorImpl } from '@brushes/qj-simulate-component';
 import { ClassifyFloor } from './components/classifyFloor';
@@ -31,15 +31,15 @@ const GoodsClassifyJsx = () => {
         try {
             let commits = yield queryGoodsClassTree();
             setNavList(commits || []);
-            const code = get(commits, 'commits[0].goodsClassCode');
+            const code = get(commits, '[0].goodsClassCode');
             setActiveKey(code);
         }
         catch (err) {
             console.log(err);
         }
     });
-    return (_jsxs(_Fragment, { children: [_jsx(View, Object.assign({ className: 'goods-classify' }, { children: _jsxs(View, Object.assign({ className: 'goods-classify-search', onClick: () => navigatorImpl(routerMap.search) }, { children: [_jsx(QjMobileIcon, { value: "fenxiang" }), _jsx(Text, { children: "\u641C\u7D22\u5546\u54C1" })] })) })), _jsxs(View, Object.assign({ className: 'goodsClassifyContainer', style: { height: flag ? 'calc(100vh - 51px)' : '600px' } }, { children: [_jsx(View, Object.assign({ className: 'side' }, { children: _jsx(SideBar, Object.assign({ activeKey: activeKey, onChange: setActiveKey, style: {
+    return (_jsxs(View, Object.assign({ className: 'goodsClassifyWrap', style: { height: flag ? '100%' : '667px' } }, { children: [_jsx(View, Object.assign({ className: 'goods-classify' }, { children: _jsxs(View, Object.assign({ className: 'goods-classify-search', onClick: () => navigatorImpl(routerMap.search) }, { children: [_jsx(QjMobileIcon, { value: "fenxiang" }), _jsx(Text, { children: "\u641C\u7D22\u5546\u54C1" })] })) })), _jsxs(View, Object.assign({ className: 'goodsClassifyContainer' }, { children: [_jsx(View, Object.assign({ className: 'side' }, { children: _jsx(SideBar, Object.assign({ activeKey: activeKey, onChange: setActiveKey, style: {
                                 '--width': '88px'
-                            } }, { children: navList.map((item) => (_jsx(SideBar.Item, { title: item.goodsClassName }, item.goodsClassCode))) })) })), _jsx(View, Object.assign({ className: 'main' }, { children: _jsx(ClassifyFloor, { navList: navList, activeKey: activeKey }) }))] }))] }));
+                            } }, { children: navList.map((item) => (_jsx(SideBar.Item, { title: item.goodsClassName }, item.goodsClassCode))) })) })), _jsx(View, Object.assign({ className: 'main' }, { children: _jsx(ClassifyFloor, { navList: navList, activeKey: activeKey }) }))] }))] })));
 };
 export const GoodsClassify = memo(GoodsClassifyJsx);

package/dist/components/GoodsDetail/components/goodsDetailCollection.d.ts

@@ -1,2 +1,2 @@
-declare const GoodsDetailCollection: ({ goods, checkCollectionObj, setCheckCollectionObj }: any) => JSX.Element;
+declare const GoodsDetailCollection: ({ checkCollectionObj, setCheckCollectionObj, goods }: any) => JSX.Element;
 export default GoodsDetailCollection;

package/dist/components/GoodsDetail/components/goodsDetailCollection.js

@@ -14,7 +14,7 @@ import { checkCollectExit, saveCollect, deleteCollectByCode } from '@brushes/api
 import { _ } from '@brushes/tools';
 import { useEffect } from 'react';
 const { isEmpty } = _;
-const GoodsDetailCollection = ({ goods, checkCollectionObj, setCheckCollectionObj }) => {
+const GoodsDetailCollection = ({ checkCollectionObj, setCheckCollectionObj, goods }) => {
     const { Text, View } = useComponent();
     useEffect(() => {
         checkCollection();
@@ -24,8 +24,13 @@ const GoodsDetailCollection = ({ goods, checkCollectionObj, setCheckCollectionOb
             collectType: 0,
             collectOpcode: goods.rsSkuDomainList[0].skuCode || ''
         };
-        const result = yield checkCollectExit(checkCollectionParams);
-        setCheckCollectionObj(result);
+        try {
+            const result = yield checkCollectExit(checkCollectionParams);
+            setCheckCollectionObj(result);
+        }
+        catch (err) {
+            console.log(err);
+        }
     });
     const handleSaveCollect = () => __awaiter(void 0, void 0, void 0, function* () {
         const saveCollectParmas = {

package/dist/components/GoodsDetail/components/goodsDetailCoupon.js

@@ -1,56 +1,45 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-import { useComponent, antdMobile } from '@brushes/qj-simulate-component';
+import { useComponent, Popup, SmoothRadio } from '@brushes/qj-simulate-component';
 import { THREE_DOTS } from '../../../static';
 import { useState } from 'react';
 import { Coupon } from '../../../common/coupon';
-const { Popup, Radio } = antdMobile;
+import { useDispatchImpl, useStore } from '../store';
 const fake = [
     {
         title: '五一大促疯抢 满100立减10',
         date: '2022-10-01',
-        price: 10
+        price: 10,
+        id: 1
     },
     {
         title: '五一大促疯抢 满100立减10',
         date: '2022-10-01',
-        price: 10
+        price: 20,
+        id: 2
     },
     {
         title: '五一大促疯抢 满100立减10',
         date: '2022-10-01',
-        price: 10
-    },
-    {
-        title: '五一大促疯抢 满100立减10',
-        date: '2022-10-01',
-        price: 10
-    },
-    {
-        title: '五一大促疯抢 满100立减10',
-        date: '2022-10-01',
-        price: 10
-    },
-    {
-        title: '五一大促疯抢 满100立减10',
-        date: '2022-10-01',
-        price: 10
-    },
-    {
-        title: '五一大促疯抢 满100立减10',
-        date: '2022-10-01',
-        price: 10
-    },
-    {
-        title: '五一大促疯抢 满100立减10',
-        date: '2022-10-01',
-        price: 10
+        price: 30,
+        id: 3
     }
 ];
 const GoodsDetailCoupon = () => {
     const { View, Text } = useComponent();
     const [visible, setVisible] = useState(false);
-    return (_jsxs(_Fragment, { children: [_jsxs(View, Object.assign({ className: 'goodsDetail-coupon', onClick: () => setVisible(true) }, { children: [_jsx(Text, Object.assign({ className: 'label' }, { children: "\u4F18\u60E0\u5238" })), _jsxs(View, Object.assign({ className: 'info' }, { children: [_jsx(Text, Object.assign({ className: 'label' }, { children: "\u8BF7\u9009\u62E9\u4F18\u60E0\u5238" })), _jsx("img", { src: THREE_DOTS, alt: "", className: 'icon' })] }))] })), _jsx(Popup, Object.assign({ visible: visible, onMaskClick: () => setVisible(false) }, { children: _jsxs(View, Object.assign({ className: 'goodsDetail-coupon-popup' }, { children: [_jsx(View, Object.assign({ className: 'stampWrap' }, { children: _jsx(Radio.Group, Object.assign({ defaultValue: 0 }, { children: fake.map((item, index) => {
-                                    return _jsx(Coupon, { index: index, item: item }, index);
-                                }) })) })), _jsx(View, Object.assign({ className: 'confirm' }, { children: "\u786E\u5B9A" }))] })) }))] }));
+    const dispatch = useDispatchImpl();
+    const { couponValue } = useStore();
+    console.log(34, couponValue);
+    const onChange = (value) => {
+        dispatch({
+            type: 'select',
+            payload: {
+                couponValue: value.detail.value
+            }
+        });
+    };
+    return (_jsxs(_Fragment, { children: [_jsxs(View, Object.assign({ className: 'goodsDetail-coupon', onClick: () => setVisible(true) }, { children: [_jsx(Text, Object.assign({ className: 'label' }, { children: "\u4F18\u60E0\u5238" })), _jsxs(View, Object.assign({ className: 'info' }, { children: [_jsx(Text, Object.assign({ className: 'label' }, { children: couponValue ? `已选择: ${couponValue}` : '请选择优惠券' })), _jsx("img", { src: THREE_DOTS, alt: "", className: 'icon' })] }))] })), _jsx(Popup, Object.assign({ popupVisible: visible, popupHandler: setVisible }, { children: _jsx(View, Object.assign({ className: 'goodsDetail-coupon-popup' }, { children: _jsx(View, Object.assign({ className: 'stampWrap' }, { children: _jsx(SmoothRadio, Object.assign({ onChange: onChange, defaultValue: 0 }, { children: fake.map((item, index) => {
+                                return _jsx(Coupon, { index: index, item: item }, index);
+                            }) })) })) })) }))] }));
 };
 export default GoodsDetailCoupon;

package/dist/components/GoodsDetail/components/goodsDetailHandleBar.js

@@ -1,8 +1,28 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { navigatorImpl, useComponent } from '@brushes/qj-simulate-component';
-import { QjMobileIcon } from '../../../common/icon';
+import { switchTabImpl, useComponent, IconMobile } from '@brushes/qj-simulate-component';
+import { useDispatchImpl } from '../store';
+import { routerMap } from '../../../routerMap';
 const GoodsDetailHandleBar = () => {
     const { Text, View } = useComponent();
-    return (_jsxs(View, Object.assign({ className: 'goodsDetailHandleBar' }, { children: [_jsxs(View, Object.assign({ className: 'linkGroup' }, { children: [_jsx(QjMobileIcon, { value: 'kefu', style: { fontSize: 22, display: 'block' } }), _jsx(Text, Object.assign({ className: 'txt' }, { children: "\u5BA2\u670D" }))] })), _jsxs(View, Object.assign({ className: 'linkGroup' }, { children: [_jsx(QjMobileIcon, { value: 'gouwuche', style: { fontSize: 22, display: 'block' } }), _jsx(Text, Object.assign({ className: 'txt' }, { children: "\u8D2D\u7269\u8F66" }))] })), _jsxs(View, Object.assign({ className: 'btnGroup' }, { children: [_jsx(View, Object.assign({ className: 'btn addCart', onClick: () => navigatorImpl('/subpackage/orderconfirm/index') }, { children: "\u52A0\u5165\u8D2D\u7269\u8F66" })), _jsx(View, Object.assign({ onClick: () => navigatorImpl('/subpackage/orderconfirm/index'), className: 'btn buy' }, { children: "\u7ACB\u5373\u8D2D\u4E70" }))] }))] })));
+    const dispatch = useDispatchImpl();
+    return (_jsxs(View, Object.assign({ className: 'goodsDetailHandleBar' }, { children: [_jsxs(View, Object.assign({ className: 'linkGroup' }, { children: [_jsx(IconMobile, { value: 'kefu', style: { fontSize: 22, display: 'block' } }), _jsx(Text, Object.assign({ className: 'txt' }, { children: "\u5BA2\u670D" }))] })), _jsxs(View, Object.assign({ className: 'linkGroup', onClick: () => switchTabImpl(routerMap.shopping) }, { children: [_jsx(IconMobile, { value: 'gouwuche', style: { fontSize: 22, display: 'block' } }), _jsx(Text, Object.assign({ className: 'txt' }, { children: "\u8D2D\u7269\u8F66" }))] })), _jsxs(View, Object.assign({ className: 'btnGroup' }, { children: [_jsx(View, Object.assign({ className: 'btn addCart', onClick: () => {
+                            dispatch({
+                                type: 'popupImpl',
+                                payload: {
+                                    orderType: 0,
+                                    popupVisible: true,
+                                    isNeedButton: true
+                                }
+                            });
+                        } }, { children: "\u52A0\u5165\u8D2D\u7269\u8F66" })), _jsx(View, Object.assign({ onClick: () => {
+                            dispatch({
+                                type: 'popupImpl',
+                                payload: {
+                                    orderType: 1,
+                                    popupVisible: true,
+                                    isNeedButton: true
+                                }
+                            });
+                        }, className: 'btn buy' }, { children: "\u7ACB\u5373\u8D2D\u4E70" }))] }))] })));
 };
 export default GoodsDetailHandleBar;

package/dist/components/GoodsDetail/components/goodsDetailInfo.d.ts

@@ -1,2 +1,2 @@
-declare const GoodsDetailInfo: ({ goods, tabActive }: any) => JSX.Element;
+declare const GoodsDetailInfo: ({ tabActive, goods }: any) => JSX.Element;
 export default GoodsDetailInfo;

package/dist/components/GoodsDetail/components/goodsDetailInfo.js

@@ -1,7 +1,7 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useComponent } from '@brushes/qj-simulate-component';
 import { useEffect, useState } from 'react';
-const GoodsDetailInfo = ({ goods, tabActive }) => {
+const GoodsDetailInfo = ({ tabActive, goods }) => {
     const { View } = useComponent();
     const [goodsDetail, setDetail] = useState('');
     useEffect(() => {

package/dist/components/GoodsDetail/components/goodsDetailPopup.d.ts

@@ -1,2 +1,2 @@
-declare const GoodsDetailPopup: ({ popupVisible, setPopupVisible, goods }: any) => JSX.Element;
+declare const GoodsDetailPopup: ({ goods }: any) => JSX.Element;
 export default GoodsDetailPopup;

package/dist/components/GoodsDetail/components/goodsDetailPopup.js

@@ -1,26 +1,12 @@
-import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { Popup, NumStep } from '@brushes/qj-simulate-component';
+import { useAddShopping } from '../hooks';
 import { useComponent } from '@brushes/qj-simulate-component';
-import { useState } from 'react';
-const GoodsDetailPopup = ({ popupVisible, setPopupVisible, goods }) => {
-    const { View, Text, Image, RootPortal } = useComponent();
-    const [selectSizeCoe, setSelectSizeCoe] = useState(0);
-    const [count, setCount] = useState(1);
-    const handleChooseSize = (index) => {
-        setSelectSizeCoe(index);
-        console.log(12, selectSizeCoe);
-    };
-    const handleStep = (type) => {
-        switch (type) {
-            case 'minus':
-                setCount((count) => count - 1);
-                break;
-            case 'plus':
-                setCount((count) => count + 1);
-                break;
-        }
-    };
-    return (_jsx(_Fragment, { children: popupVisible && (_jsx(RootPortal, { children: _jsxs(View, Object.assign({ className: 'goodsDetail-size-popup' }, { children: [_jsxs(View, Object.assign({ className: 'content' }, { children: [_jsx(View, Object.assign({ className: 'closeWrap' }, { children: _jsx(Text, { className: 'icon', onClick: () => setPopupVisible(false) }) })), _jsxs(View, Object.assign({ className: 'goodsInfo' }, { children: [_jsx(View, Object.assign({ className: 'lPart' }, { children: _jsx(Image, { mode: 'widthFix', src: "", alt: "", className: 'goodsImg' }) })), _jsxs(View, Object.assign({ className: 'rPart' }, { children: [_jsx(View, Object.assign({ className: 'name' }, { children: goods.goodsShowname || '' })), _jsxs(View, Object.assign({ className: 'price' }, { children: ["\uFFE5: ", goods.pricesetNprice.toFixed(2) || ''] })), _jsx(View, Object.assign({ className: 'chosen' }, { children: "\u5DF2\u9009\u62E9: 15ml" }))] }))] })), _jsxs(View, Object.assign({ className: 'sizeArr' }, { children: [_jsx(Text, Object.assign({ className: 'title' }, { children: "\u9009\u62E9\u989C\u8272" })), _jsx(View, Object.assign({ className: 'sizeArrItemWrap' }, { children: goods.rsSpecValueDomainList.map((item, index) => {
-                                            return (_jsx(View, Object.assign({ className: `sizeItem ${index === selectSizeCoe ? 'active' : ''}`, "data-index": index, onClick: handleChooseSize.bind(null, index) }, { children: item.specValueValue }), index));
-                                        }) }))] })), _jsxs(View, Object.assign({ className: 'countWrap' }, { children: [_jsx(View, Object.assign({ className: 'label' }, { children: "\u8D2D\u4E70\u6570\u91CF" })), _jsxs(View, Object.assign({ className: 'numStep' }, { children: [_jsx(Text, Object.assign({ className: 'btn minus', onClick: handleStep.bind(null, 'minus') }, { children: "-" })), _jsx(Text, Object.assign({ className: 'content' }, { children: count })), _jsx(Text, Object.assign({ className: 'btn plus', onClick: handleStep.bind(null, 'plus') }, { children: "+" }))] }))] }))] })), _jsx(View, Object.assign({ className: 'btnWrap' }, { children: _jsx(Text, Object.assign({ className: 'btn' }, { children: "\u786E\u8BA4" })) }))] })) })) }));
+const GoodsDetailPopup = ({ goods }) => {
+    const { count, spec, popupVisible, isNeedButton, handleChooseSize, handleStep, popupHandler, addShoppingImpl } = useAddShopping();
+    const { View, Text, Image } = useComponent();
+    return (_jsx(Popup, Object.assign({ popupVisible: popupVisible, popupHandler: popupHandler }, { children: _jsxs(View, Object.assign({ className: 'goodsDetail-size-popup' }, { children: [_jsxs(View, Object.assign({ className: 'content' }, { children: [_jsxs(View, Object.assign({ className: 'goodsInfo' }, { children: [_jsx(View, Object.assign({ className: 'lPart' }, { children: _jsx(Image, { src: goods.dataPic, alt: "", className: 'goodsImg' }) })), _jsxs(View, Object.assign({ className: 'rPart' }, { children: [_jsx(View, Object.assign({ className: 'name' }, { children: goods.goodsShowname || '' })), _jsxs(View, Object.assign({ className: 'price' }, { children: ["\uFFE5 ", goods.pricesetNprice.toFixed(2) || ''] })), _jsxs(View, Object.assign({ className: 'chosen' }, { children: ["\u5DF2\u9009\u62E9: ", spec] }))] }))] })), _jsxs(View, Object.assign({ className: 'sizeArr' }, { children: [_jsx(Text, Object.assign({ className: 'title' }, { children: "\u9009\u62E9\u989C\u8272" })), _jsx(View, Object.assign({ className: 'sizeArrItemWrap' }, { children: goods.rsSpecValueDomainList.map((item, index) => {
+                                        return (_jsx(View, Object.assign({ className: `sizeItem ${spec === item.specValueValue ? 'active' : ''}`, onClick: handleChooseSize.bind(null, item.specValueValue) }, { children: item.specValueValue }), index));
+                                    }) }))] })), _jsxs(View, Object.assign({ className: 'countWrap' }, { children: [_jsx(View, Object.assign({ className: 'label' }, { children: "\u8D2D\u4E70\u6570\u91CF" })), _jsx(NumStep, { count: count, handleStep: handleStep })] }))] })), isNeedButton && (_jsx(View, Object.assign({ className: 'btnWrap', onClick: addShoppingImpl }, { children: _jsx(Text, Object.assign({ className: 'btn' }, { children: "\u786E\u8BA4" })) })))] })) })));
 };
 export default GoodsDetailPopup;

package/dist/components/GoodsDetail/components/goodsDetailPromotion.js

@@ -1,10 +1,9 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useComponent } from '@brushes/qj-simulate-component';
-const fake = ['促销', '大促销', '大大促销', '大大大大促销', '大大大大大促销', '大促销', '大促销'];
 const GoodsDetailPromotion = ({ promotionList }) => {
     const { View, Text } = useComponent();
-    return (_jsxs(View, Object.assign({ className: 'goodsDetail-promotion' }, { children: [_jsx(Text, Object.assign({ className: 'label' }, { children: "\u4FC3\u9500" })), _jsx(View, Object.assign({ className: 'group' }, { children: promotionList.length ? (fake.map((item, index) => {
-                    return (_jsx(View, Object.assign({ className: 'item' }, { children: item }), index));
+    return (_jsxs(View, Object.assign({ className: 'goodsDetail-promotion' }, { children: [_jsx(Text, Object.assign({ className: 'label' }, { children: "\u4FC3\u9500" })), _jsx(View, Object.assign({ className: 'group' }, { children: promotionList.length ? (promotionList.map(({ discName }, index) => {
+                    return (_jsx(View, Object.assign({ className: 'item' }, { children: discName }), index));
                 })) : (_jsx(View, Object.assign({ className: 'noPromotion' }, { children: "\u6682\u65E0\u4FC3\u9500\u6D3B\u52A8" }))) }))] })));
 };
 export default GoodsDetailPromotion;

package/dist/components/GoodsDetail/components/goodsDetailSize.d.ts

@@ -1,2 +1,2 @@
-declare const GoodsDetailSize: ({ goods, popupVisible, setPopupVisible }: any) => JSX.Element;
+declare const GoodsDetailSize: ({ goods }: any) => JSX.Element;
 export default GoodsDetailSize;

package/dist/components/GoodsDetail/components/goodsDetailSize.js

@@ -2,8 +2,17 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
 import { useComponent } from '@brushes/qj-simulate-component';
 import { THREE_DOTS } from '../../../static';
 import GoodsDetailPopup from './goodsDetailPopup';
-const GoodsDetailSize = ({ goods, popupVisible, setPopupVisible }) => {
+import { useDispatchImpl, useStore } from '../store';
+const GoodsDetailSize = ({ goods }) => {
     const { View, Text } = useComponent();
-    return (_jsxs(_Fragment, { children: [_jsxs(View, Object.assign({ className: 'goodsDetail-size', onClick: () => setPopupVisible(true) }, { children: [_jsx(Text, Object.assign({ className: 'label' }, { children: "\u89C4\u683C" })), _jsxs(View, Object.assign({ className: 'info' }, { children: [_jsx(Text, Object.assign({ className: 'label' }, { children: "\u8BF7\u9009\u62E9 \u89C4\u683C" })), _jsx("img", { src: THREE_DOTS, alt: "", className: 'icon' })] }))] })), _jsx(GoodsDetailPopup, { popupVisible: popupVisible, setPopupVisible: setPopupVisible, goods: goods })] }));
+    const { count, spec } = useStore();
+    const dispatch = useDispatchImpl();
+    return (_jsxs(_Fragment, { children: [_jsxs(View, Object.assign({ className: 'goodsDetail-size', onClick: () => dispatch({
+                    type: 'popupImpl',
+                    payload: {
+                        popupVisible: true,
+                        isNeedButton: false
+                    }
+                }) }, { children: [_jsx(Text, Object.assign({ className: 'label' }, { children: "\u89C4\u683C" })), _jsxs(View, Object.assign({ className: 'info' }, { children: [_jsxs(Text, Object.assign({ className: 'label' }, { children: ["\u5DF2\u9009\u62E9 \u6570\u91CF: ", count, " \u89C4\u683C: ", spec] })), _jsx("img", { src: THREE_DOTS, alt: "", className: 'icon' })] }))] })), _jsx(GoodsDetailPopup, { goods: goods })] }));
 };
 export default GoodsDetailSize;

package/dist/components/GoodsDetail/hooks/index.d.ts

@@ -0,0 +1,2 @@
+export * from './useAddShopping';
+export * from './useGoodsDetailImpl';

package/dist/components/GoodsDetail/hooks/index.js

@@ -1,75 +1,2 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-import { useEffect, useState } from 'react';
-import { useComponent } from '@brushes/qj-simulate-component';
-import { getResourceGoodsInfoBySkuCode, queryPromotionListByGoodsCode } from '@brushes/api';
-import { _ } from '@brushes/tools';
-const { isEmpty, get } = _;
-export function useGoodsDetailmpl(skuCode) {
-    const [goods, setGoods] = useState({});
-    const { View, Text, Skeleton } = useComponent();
-    const [promotionArr, setPromotionArr] = useState([]);
-    const [checkCollectionObj, setCheckCollectionObj] = useState({});
-    const [sliderArr, setSliderArr] = useState([]);
-    const [tabActive, setTabActive] = useState(1);
-    const [popupVisible, setPopupVisible] = useState(false);
-    useEffect(() => {
-        getGoodsDetailData();
-    }, []);
-    const getGoodsDetailData = () => __awaiter(this, void 0, void 0, function* () {
-        try {
-            const goodsDetailResult = yield getResourceGoodsInfoBySkuCode({
-                skuCode
-            });
-            const promotionListParams = {
-                skuNo: goodsDetailResult.skuNo || '',
-                skuCode: goodsDetailResult.rsSkuDomainList[0].skuCode || '',
-                classtreeCode: goodsDetailResult.classtreeCode || '',
-                brandCode: goodsDetailResult.brandCode || '',
-                pntreeCode: goodsDetailResult.pntreeCode || '',
-                memberCode: goodsDetailResult.memberCode || ''
-            };
-            console.log(22, goodsDetailResult.rsGoodsFileDomainList);
-            const arr = get(goodsDetailResult, 'rsGoodsFileDomainList', []);
-            if (isEmpty(arr))
-                return;
-            const sliderData = arr.map((item) => {
-                return {
-                    imgUrl: item.goodsFileUrl,
-                    link: ''
-                };
-            });
-            setSliderArr(sliderData);
-            setGoods(goodsDetailResult);
-            getPromotionData(promotionListParams);
-        }
-        catch (err) {
-            console.log(59, err);
-        }
-    });
-    const getPromotionData = (params) => __awaiter(this, void 0, void 0, function* () {
-        const result = yield queryPromotionListByGoodsCode(params);
-        setPromotionArr(result);
-    });
-    return {
-        View,
-        Text,
-        Skeleton,
-        goods,
-        promotionArr,
-        checkCollectionObj,
-        setCheckCollectionObj,
-        sliderArr,
-        tabActive,
-        setTabActive,
-        popupVisible,
-        setPopupVisible
-    };
-}
+export * from './useAddShopping';
+export * from './useGoodsDetailImpl';

package/dist/components/GoodsDetail/hooks/useAddShopping.d.ts

@@ -0,0 +1,10 @@
+export declare function useAddShopping(): {
+    count: any;
+    spec: any;
+    popupVisible: any;
+    isNeedButton: any;
+    handleChooseSize: (value: string) => void;
+    handleStep: (type: string) => void;
+    addShoppingImpl: () => void;
+    popupHandler: () => void;
+};

package/dist/components/GoodsDetail/hooks/useAddShopping.js

@@ -0,0 +1,74 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import { useDispatchImpl, useStore } from '../store';
+import { _ } from '@brushes/tools';
+import { checkSkuSpec, addCardSku } from '../../../utils/payment';
+import { navigatorImpl } from '@brushes/qj-simulate-component';
+import { routerMap } from '../../../routerMap';
+const { get } = _;
+export function useAddShopping() {
+    const { count, spec, orderType, popupVisible, isNeedButton, goodsCode } = useStore();
+    const dispatch = useDispatchImpl();
+    const handleChooseSize = (value) => {
+        dispatch({
+            type: 'select',
+            payload: {
+                spec: value
+            }
+        });
+    };
+    const popupHandler = () => {
+        dispatch({
+            type: 'popupImpl',
+            payload: {
+                popupVisible: !popupVisible
+            }
+        });
+    };
+    const handleStep = (type) => {
+        dispatch({
+            type
+        });
+    };
+    const addCardImpl = () => __awaiter(this, void 0, void 0, function* () {
+        try {
+            const data = yield checkSkuSpec(spec, goodsCode);
+            const skuId = get(data, 'dataObj.skuId');
+            yield addCardSku(skuId, count);
+            popupHandler();
+        }
+        catch (err) { }
+    });
+    const cashImpl = () => __awaiter(this, void 0, void 0, function* () {
+        const data = yield checkSkuSpec(spec, goodsCode);
+        const skuId = get(data, 'dataObj.skuId');
+        navigatorImpl(`${routerMap.confirm}?skuId=${skuId}&goodsNum=${count}`);
+    });
+    const addShoppingImpl = () => {
+        if (orderType === 0) {
+            // 添加到购物车
+            addCardImpl();
+        }
+        else {
+            // 去支付页面
+            cashImpl();
+        }
+    };
+    return {
+        count,
+        spec,
+        popupVisible,
+        isNeedButton,
+        handleChooseSize,
+        handleStep,
+        addShoppingImpl,
+        popupHandler
+    };
+}

package/dist/components/GoodsDetail/hooks/useGoodsDetailImpl.d.ts

@@ -0,0 +1,13 @@
+/// <reference types="react" />
+import { itemType } from '../../Slider';
+export declare const useGoodsDetailImpl: (skuCode: string) => {
+    promotionArr: never[];
+    checkCollectionObj: {};
+    setCheckCollectionObj: import("react").Dispatch<import("react").SetStateAction<{}>>;
+    sliderArr: itemType[];
+    tabActive: number;
+    setTabActive: import("react").Dispatch<import("react").SetStateAction<number>>;
+    popupVisible: boolean;
+    setPopupVisible: import("react").Dispatch<import("react").SetStateAction<boolean>>;
+    goods: {};
+};

package/dist/components/GoodsDetail/hooks/useGoodsDetailImpl.js

@@ -0,0 +1,85 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import { useEffect, useState } from 'react';
+import { getResourceGoodsInfoBySkuCode, queryPromotionListByGoodsCode } from '@brushes/api';
+import { _ } from '@brushes/tools';
+import { useDispatchImpl } from '../store';
+const { isEmpty, get } = _;
+export const useGoodsDetailImpl = (skuCode) => {
+    const [goods, setGoods] = useState({});
+    const [promotionArr, setPromotionArr] = useState([]);
+    const [checkCollectionObj, setCheckCollectionObj] = useState({});
+    const [sliderArr, setSliderArr] = useState([]);
+    const [tabActive, setTabActive] = useState(1);
+    const [popupVisible, setPopupVisible] = useState(false);
+    const dispatch = useDispatchImpl();
+    useEffect(() => {
+        getGoodsDetailData();
+    }, []);
+    const getGoodsDetailData = () => __awaiter(void 0, void 0, void 0, function* () {
+        try {
+            const goodsDetailResult = yield getResourceGoodsInfoBySkuCode({
+                skuCode
+                // isLocalMock: true
+            });
+            const promotionListParams = {
+                skuNo: goodsDetailResult.skuNo || '',
+                skuCode: goodsDetailResult.rsSkuDomainList[0].skuCode || '',
+                classtreeCode: goodsDetailResult.classtreeCode || '',
+                brandCode: goodsDetailResult.brandCode || '',
+                pntreeCode: goodsDetailResult.pntreeCode || '',
+                memberCode: goodsDetailResult.memberCode || ''
+            };
+            const arr = get(goodsDetailResult, 'rsGoodsFileDomainList', []);
+            if (isEmpty(arr))
+                return;
+            const sliderData = arr.map((item) => {
+                return {
+                    imgUrl: item.goodsFileUrl,
+                    link: ''
+                };
+            });
+            dispatch({
+                type: 'initGoods',
+                payload: {
+                    spec: get(goodsDetailResult, 'rsSpecValueDomainList[0].specValueValue', ''),
+                    goodsCode: goodsDetailResult.goodsCode,
+                    goodsNum: goodsDetailResult.goodsNum
+                }
+            });
+            setSliderArr(sliderData);
+            setGoods(goodsDetailResult);
+            getPromotionData(promotionListParams);
+        }
+        catch (err) {
+            console.log(59, err);
+        }
+    });
+    const getPromotionData = (params) => __awaiter(void 0, void 0, void 0, function* () {
+        try {
+            const result = yield queryPromotionListByGoodsCode(params);
+            setPromotionArr(result);
+        }
+        catch (err) {
+            console.log(err);
+        }
+    });
+    return {
+        promotionArr,
+        checkCollectionObj,
+        setCheckCollectionObj,
+        sliderArr,
+        tabActive,
+        setTabActive,
+        popupVisible,
+        setPopupVisible,
+        goods
+    };
+};

package/dist/components/GoodsDetail/index.d.ts

@@ -1,2 +1,6 @@
 /// <reference types="react" />
-export declare const GoodsDetail: import("react").NamedExoticComponent<{}>;
+interface GoodsDetailType {
+    skuCode: string;
+}
+export declare const GoodsDetail: import("react").NamedExoticComponent<GoodsDetailType>;
+export {};