s-material-react 0.1.6 → 0.1.7

package/css/common/icon.scss

@@ -1,12 +1,12 @@
 @font-face {
     font-family: 'iconfont'; /* Project id 3540782 */
-    src: url('//at.alicdn.com/t/c/font_3540782_lef74xv0ryn.woff2?t=1668067769509') format('woff2'),
-        url('//at.alicdn.com/t/c/font_3540782_lef74xv0ryn.woff?t=1668067769509') format('woff'),
-        url('//at.alicdn.com/t/c/font_3540782_lef74xv0ryn.ttf?t=1668067769509') format('truetype');
+    src: url('//at.alicdn.com/t/c/font_3540782_w0k03fwojrs.woff2?t=1669970496419') format('woff2'),
+        url('//at.alicdn.com/t/c/font_3540782_w0k03fwojrs.woff?t=1669970496419') format('woff'),
+        url('//at.alicdn.com/t/c/font_3540782_w0k03fwojrs.ttf?t=1669970496419') format('truetype');
 }
 
 .iconfont {
-    display: inline-block;
+    //display: inline-block;
     font: {
         family: iconfont;
         variant: normal;
@@ -21,6 +21,30 @@
     -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-jiangxu:before {
+    content: '\e618';
+}
+
+.icon-shengxu:before {
+    content: '\e61b';
+}
+
+.icon-paixusort-jiang:before {
+    content: '\e7c6';
+}
+
+.icon-paixusort-sheng:before {
+    content: '\e7c7';
+}
+
+.icon-gouwuche:before {
+    content: '\e73d';
+}
+
+.icon-kefu:before {
+    content: '\ec2e';
+}
+
 .icon-my:before {
     content: '\e66f';
 }

package/css/pages/goodsClassify.scss

@@ -1,5 +1,5 @@
 .goods-classify {
-    padding: 0 10px;
+    padding: 0 15px;
     &-search {
         width: 100%;
         margin-bottom: 17px;

package/css/pages/goodsDetail.scss

@@ -1,5 +1,5 @@
 .GoodsDetailWrap {
-    overflow: scroll;
+    //overflow: scroll;
     background-color: #f6f6f6;
     padding-top: 12px;
     padding-bottom: 12px;
@@ -122,25 +122,18 @@
         position: fixed;
         bottom: 0;
         left: 0;
+        box-sizing: border-box;
         padding: 7px 10px;
         display: grid;
         grid-template-columns: 30px 40px 1fr;
         gap: 20px;
 
+        .txt {
+            font-size: 12px;
+            margin-top: 6px;
+        }
         .linkGroup {
             text-align: center;
-
-            .icon {
-                display: block;
-                width: 20px;
-                height: 20px;
-                background-color: yellowgreen;
-                margin: 0 auto;
-            }
-
-            .txt {
-                font-size: 12px;
-            }
         }
 
         .btnGroup {
@@ -182,11 +175,10 @@
             line-height: 50px;
             text-align: center;
             margin-bottom: 10px;
-
+            display: flex;
             .tabsItem {
-                width: 150px;
+                flex: 1;
                 display: inline-block;
-                padding: 0 30px;
                 font-size: 16px;
                 position: relative;
 
@@ -211,6 +203,13 @@
     }
 
     .goodsDetail-info {
+        .mystyle {
+            width: 100% !important;
+            height: auto;
+            display: block;
+            background-size: cover !important;
+        }
+
         width: 100%;
         background-color: #ffffff;
 
@@ -230,7 +229,7 @@
 
     .stampWrap {
         max-height: 40vh;
-        overflow: scroll;
+        overflow-y: scroll;
 
         .stamp {
             width: 100%;
@@ -318,7 +317,21 @@
     }
 }
 
+@keyframes popup {
+    0% {
+        transform: translateY(50vh);
+    }
+
+    100% {
+        transform: translateY(0);
+    }
+}
+
 .goodsDetail-size-popup {
+    animation: popup 300ms cubic-bezier(0.36, 0.66, 0.04, 1);
+    position: fixed;
+    bottom: 0;
+    background: #fff;
     height: 50vh;
     display: grid;
     grid-template-rows: calc(50vh - 88px) 88px;
@@ -339,7 +352,7 @@
     }
 
     .content {
-        overflow: scroll;
+        overflow-y: scroll;
 
         .goodsInfo {
             width: 100%;
@@ -348,7 +361,7 @@
             display: grid;
             grid-template-columns: 72px 1fr;
             gap: 10px;
-
+            box-sizing: border-box;
             .lPart {
                 .goodsImg {
                     width: 70px;
@@ -400,7 +413,8 @@
                     color: #a7a7a7;
 
                     &.active {
-                        color: #1a1a1a;
+                        background: #346fc2;
+                        color: #fff;
                         border-color: #1a1a1a;
                     }
                 }

package/css/pages/goodsList.scss

@@ -1,27 +1,21 @@
 @import '../basic/textLine.scss';
 
 .goodsList {
-    .topInfo {
-        .search {
-            width: 86%;
+    .top-info {
+        &-search {
+            box-sizing: border-box;
+            margin: 0 15px 17px;
             height: 34px;
-            line-height: 34px;
             background-color: #f4f4f4;
             border-radius: 20px;
-            margin: 0 auto;
-            text-indent: 10px;
-            .logo {
+            text-align: center;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            .icon {
                 width: 14px;
                 height: 14px;
-                display: inline-block;
-                margin-left: 14px;
-                margin-right: 8px;
-                margin-top: -2px;
-            }
-
-            .title {
-                font-size: 14px;
-                color: #999999;
+                margin-right: 5px;
             }
         }
 

package/css/pages/index.scss

@@ -23,6 +23,10 @@
 @import './cart';
 @import './mine';
 
+* {
+    box-sizing: border-box;
+}
+
 .design-container .monitor .actived:after {
     display: none;
 }

package/css/pages/searchPage.scss

@@ -1,7 +1,8 @@
 .searchPage {
     .search-title {
-        padding: 10px 10px 5px 15px;
+        padding: 10px 15px 5px 15px;
         width: 100%;
+        box-sizing: border-box;
         border-bottom: 1px solid #ececec;
         display: grid;
         grid-template-columns: 28px 1fr 40px;

package/dist/common/evaluateItem/index.js

@@ -2,12 +2,12 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useComponent } from '@brushes/qj-simulate-component';
 import { Rate } from 'antd-mobile';
 const EvaluateItem = ({ starColor = '#FF0934', starSize = '12px', itemData }) => {
-    const { View, Text } = useComponent();
-    return (_jsxs(View, Object.assign({ className: 'evaluateItem' }, { children: [_jsxs(View, Object.assign({ className: 'userInfo' }, { children: [_jsx("img", { src: itemData.avatar, className: 'avatar' }), _jsxs(View, Object.assign({ className: 'userNameWrap' }, { children: [_jsx(Text, Object.assign({ className: 'userName' }, { children: itemData.userName })), _jsx(Rate, { readOnly: true, value: itemData.rate, style: {
+    const { View, Text, Image } = useComponent();
+    return (_jsxs(View, Object.assign({ className: 'evaluateItem' }, { children: [_jsxs(View, Object.assign({ className: 'userInfo' }, { children: [_jsx(Image, { src: itemData.avatar, className: 'avatar' }), _jsxs(View, Object.assign({ className: 'userNameWrap' }, { children: [_jsx(Text, Object.assign({ className: 'userName' }, { children: itemData.userName })), _jsx(Rate, { readOnly: true, value: itemData.rate, style: {
                                     '--star-size': starSize,
                                     '--active-color': starColor
                                 } })] }))] })), _jsxs(View, Object.assign({ className: 'size' }, { children: ["\u89C4\u683C\uFF1A ", itemData.size] })), _jsx(View, Object.assign({ className: 'content' }, { children: itemData.evaluate })), _jsx(View, Object.assign({ className: 'img-group' }, { children: itemData.imgUrls.map((item, index) => {
-                    return _jsx("img", { src: item.imgUrl, className: 'img' }, index);
+                    return _jsx(Image, { src: item.imgUrl, className: 'img' }, index);
                 }) }))] })));
 };
 export default EvaluateItem;

package/dist/common/icon/index.d.ts

@@ -3,5 +3,4 @@ export declare const QjMobileIcon: ({ className, prefixClass, style, value }: {
     prefixClass?: string | undefined;
     style?: Object | undefined;
     value: string;
-    onClick?: Function | undefined;
 }) => JSX.Element;

package/dist/common/icon/index.js

@@ -8,5 +8,5 @@ export const QjMobileIcon = ({ className = 'iconfont', prefixClass = 'icon', sty
 }, value }) => {
     const { Text } = useComponent();
     const iconName = value ? `${prefixClass}-${value}` : '';
-    return (_jsx(Text, { className: classNames(prefixClass, iconName, className), style: style }));
+    return _jsx(Text, { className: classNames(prefixClass, iconName, className), style: style });
 };

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

@@ -7,8 +7,8 @@ interface ClassifyItemType {
 interface ClassifyNavType {
     defaultValue: Array<ClassifyItemType>;
     borderRadius: number;
-    marginTop: number;
-    marginBottom: number;
+    paddingTop: number;
+    paddingBottom: number;
     selectClassifyNav: Array<ClassifyItemType>;
 }
 export declare const ClassifyNav: React.NamedExoticComponent<ClassifyNavType>;

package/dist/components/ClassifyNav/index.js

@@ -3,11 +3,10 @@ import { memo, useEffect, useState } from 'react';
 import { useComponent } from '@brushes/qj-simulate-component';
 import { _ } from '@brushes/tools';
 const { isUndefined, isEmpty } = _;
-const ClassifyNavJsx = ({ defaultValue, borderRadius, marginTop, marginBottom, selectClassifyNav }) => {
+const ClassifyNavJsx = ({ defaultValue, borderRadius, paddingTop, paddingBottom, selectClassifyNav }) => {
     const [list, setList] = useState(defaultValue);
     const { View, Text } = useComponent();
     useEffect(() => {
-        console.log(1111, selectClassifyNav);
         const computedArr = selectClassifyNav
             .filter((item) => !isUndefined(item))
             .filter((item) => !Object.values(item).every((citem) => isUndefined(citem)));
@@ -17,8 +16,8 @@ const ClassifyNavJsx = ({ defaultValue, borderRadius, marginTop, marginBottom, s
         }
         setList(arr);
     }, [selectClassifyNav]);
-    return (_jsx(View, Object.assign({ className: 'classifyNav' }, { children: list.map((item, index) => {
-            return (_jsxs(View, Object.assign({ className: 'classifyNavItem' }, { children: [_jsx("img", { src: item.imgUrl, alt: "", className: 'img' }), _jsx(Text, Object.assign({ className: 'label' }, { children: item.title }))] }), index));
-        }) })));
+    return (_jsx(View, Object.assign({ style: { paddingTop, paddingBottom } }, { children: _jsx(View, Object.assign({ className: 'classifyNav' }, { children: list.map((item, index) => {
+                return (_jsxs(View, Object.assign({ className: 'classifyNavItem' }, { children: [_jsx("img", { src: item.imgUrl, alt: "", className: 'img' }), _jsx(Text, Object.assign({ className: 'label' }, { children: item.title }))] }), index));
+            }) })) })));
 };
 export const ClassifyNav = memo(ClassifyNavJsx);

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

@@ -7,8 +7,10 @@ interface CubeType {
     defaultValue: Array<ImgType>;
     type: number;
     borderRadius: number;
-    marginTop: number;
-    marginBottom: number;
+    paddingTop: number;
+    paddingBottom: number;
+    paddingLeft: number;
+    paddingRight: number;
     selectImg: Array<ImgType>;
 }
 export declare const Cube: React.NamedExoticComponent<CubeType>;

package/dist/components/Cube/index.js

@@ -3,7 +3,7 @@ import { memo, useEffect, useState } from 'react';
 import { useComponent } from '@brushes/qj-simulate-component';
 import { _ } from '@brushes/tools';
 const { isUndefined, isEmpty } = _;
-const CubeJsx = ({ defaultValue, type, borderRadius, marginBottom, marginTop, selectImg }) => {
+const CubeJsx = ({ defaultValue, type, borderRadius, paddingTop, paddingLeft, paddingRight, paddingBottom, selectImg }) => {
     const [list, setList] = useState(defaultValue);
     const { View, Image } = useComponent();
     useEffect(() => {
@@ -16,21 +16,24 @@ const CubeJsx = ({ defaultValue, type, borderRadius, marginBottom, marginTop, se
         }
         setList(arr);
     }, [selectImg]);
-    return (_jsx(View, Object.assign({ className: `cube-type${type}` }, { children: list.map((item, index) => {
-            return type === 1 ? (_jsx(Image, { mode: 'widthFix', src: item.imgUrl, style: {
-                    width: '100%',
-                    borderRadius: borderRadius + 'px'
-                } }, index)) : (_jsx(View, { className: 'block', style: {
-                    backgroundImage: `url(${item.imgUrl})`,
-                    width: '100%',
-                    borderRadius: borderRadius + 'px'
-                }, onClick: () => {
-                    if (process.env.TARO_ENV === 'weapp') {
-                        // Taro?.navigateTo({
-                        //   url: item.link,
-                        // })
-                    }
-                } }, index));
-        }) })));
+    return (_jsx(View, Object.assign({ style: {
+            paddingTop,
+            paddingBottom
+        } }, { children: _jsx(View, Object.assign({ className: `cube-type${type}`, style: { paddingLeft, paddingRight } }, { children: list.map((item, index) => {
+                return type === 1 ? (_jsx(Image, { mode: 'widthFix', src: item.imgUrl, style: {
+                        width: '100%',
+                        borderRadius: borderRadius + 'px'
+                    } }, index)) : (_jsx(View, { className: 'block', style: {
+                        backgroundImage: `url(${item.imgUrl})`,
+                        width: '100%',
+                        borderRadius: borderRadius + 'px'
+                    }, onClick: () => {
+                        if (process.env.TARO_ENV === 'weapp') {
+                            // Taro?.navigateTo({
+                            //   url: item.link,
+                            // })
+                        }
+                    } }, index));
+            }) })) })));
 };
 export const Cube = memo(CubeJsx);

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

@@ -15,6 +15,10 @@ interface GoodsType {
     circular?: number;
     markedPrice?: number;
     classCode?: string;
+    paddingTop: number;
+    paddingBottom: number;
+    paddingLeft: number;
+    paddingRight: number;
 }
 export declare const Goods: import("react").NamedExoticComponent<GoodsType>;
 export {};

package/dist/components/Goods/index.js

@@ -16,7 +16,7 @@ import { _ } from '@brushes/tools';
 import classNames from 'classnames';
 import { QjMobileIcon } from '../../common/icon';
 const { isEqual, isEmpty } = _;
-const GoodsJsx = ({ defaultValue = [], classCode = '', margin, circular, cell, gap = 10, goods = [], markedPrice }) => {
+const GoodsJsx = ({ defaultValue = [], classCode = '', margin, circular, cell, gap = 10, goods = [], markedPrice, paddingTop, paddingBottom, paddingLeft, paddingRight }) => {
     const [list, setList] = useState(defaultValue);
     const preGoods = useRef();
     const { View, Text } = useComponent();
@@ -54,14 +54,16 @@ const GoodsJsx = ({ defaultValue = [], classCode = '', margin, circular, cell, g
             console.log(54, goods, preGoods.current);
         };
     }, [goods]);
-    return (_jsx(View, Object.assign({ className: classNames({ [`goods-${classCode}`]: true }), style: {
-            display: 'grid',
-            gap,
-            marginBottom: margin,
-            gridTemplateColumns: `repeat(${cell}, 1fr)`
-        } }, { 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))) })));
+    return (_jsx(View, Object.assign({ style: { paddingTop, paddingBottom } }, { children: _jsx(View, Object.assign({ className: classNames({ [`goods-${classCode}`]: true }), style: {
+                display: 'grid',
+                gap,
+                marginBottom: margin,
+                gridTemplateColumns: `repeat(${cell}, 1fr)`,
+                paddingLeft,
+                paddingRight
+            } }, { 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))) })) })));
 };
 export const Goods = memo(GoodsJsx);

package/dist/components/GoodsClassify/index.js

@@ -9,13 +9,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { memo, useEffect, useState } from 'react';
-import { useComponent, antdMobile } from '@brushes/qj-simulate-component';
+import { useComponent, antdMobile, navigatorImpl } from '@brushes/qj-simulate-component';
 import { ClassifyFloor } from './components/classifyFloor';
 // import {SEARCH} from "../../static";
 import { getEnv } from '@brushes/api';
 import { queryGoodsClassTree } from '@brushes/api';
 import { QjMobileIcon } from '../../common/icon';
 import { _ } from '@brushes/tools';
+import { routerMap } from '../../routerMap';
 const { get } = _;
 const { SideBar } = antdMobile;
 const GoodsClassifyJsx = () => {
@@ -37,7 +38,7 @@ const GoodsClassifyJsx = () => {
             console.log(err);
         }
     });
-    return (_jsxs(_Fragment, { children: [_jsx(View, Object.assign({ className: 'goods-classify' }, { children: _jsxs(View, Object.assign({ className: 'goods-classify-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(_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: {
                                 '--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 }) }))] }))] }));
 };

package/dist/components/GoodsDetail/components/goodsDetailEvaluate.js

@@ -1,8 +1,7 @@
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx } from "react/jsx-runtime";
 import { useComponent } from '@brushes/qj-simulate-component';
-import EvaluateItem from '../../../common/evaluateItem';
 const GoodsDetailEvaluate = () => {
     const { View } = useComponent();
-    return (_jsxs(View, Object.assign({ className: 'goodsDetailEvaluate' }, { children: ["\u8BC4\u4EF7", _jsx(EvaluateItem, {})] })));
+    return (_jsx(View, Object.assign({ className: 'goodsDetailEvaluate' }, { children: "1231232" })));
 };
 export default GoodsDetailEvaluate;

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

@@ -1,7 +1,8 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { navigatorImpl, useComponent } from '@brushes/qj-simulate-component';
+import { QjMobileIcon } from '../../../common/icon';
 const GoodsDetailHandleBar = () => {
     const { Text, View } = useComponent();
-    return (_jsxs(View, Object.assign({ className: 'goodsDetailHandleBar' }, { children: [_jsxs(View, Object.assign({ className: 'linkGroup' }, { children: [_jsx(Text, { className: 'icon' }), _jsx(Text, Object.assign({ className: 'txt' }, { children: "\u5BA2\u670D" }))] })), _jsxs(View, Object.assign({ className: 'linkGroup' }, { children: [_jsx(Text, { className: 'icon' }), _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({ className: 'btn buy' }, { children: "\u7ACB\u5373\u8D2D\u4E70" }))] }))] })));
+    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" }))] }))] })));
 };
 export default GoodsDetailHandleBar;

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

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

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

@@ -1,7 +1,15 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useComponent } from '@brushes/qj-simulate-component';
-const GoodsDetailInfo = ({ goods }) => {
+import { useEffect, useState } from 'react';
+const GoodsDetailInfo = ({ goods, tabActive }) => {
     const { View } = useComponent();
-    return (_jsx(View, Object.assign({ className: 'goodsDetail-info' }, { children: _jsx("div", { dangerouslySetInnerHTML: { __html: goods.goodsRemark || '' } }) })));
+    const [goodsDetail, setDetail] = useState('');
+    useEffect(() => {
+        setDetail(goods.goodsRemark
+            .replace(/<style>[\s\S]*<\/style>/gi, '')
+            .replace(/\<img/gi, `<img class="mystyle" mode="widthFix"`)
+            .replace(/<!--[\s\S]*-->/gi, ''));
+    }, [goods.goodsRemark, tabActive]);
+    return (_jsx(View, Object.assign({ className: 'goodsDetail-info' }, { children: _jsx("div", { dangerouslySetInnerHTML: { __html: goodsDetail || '' } }) })));
 };
 export default GoodsDetailInfo;

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

@@ -1,9 +1,8 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-import { useComponent, antdMobile } from '@brushes/qj-simulate-component';
+import { useComponent } from '@brushes/qj-simulate-component';
 import { useState } from 'react';
-const { Popup, Radio } = antdMobile;
 const GoodsDetailPopup = ({ popupVisible, setPopupVisible, goods }) => {
-    const { View, Text, Image } = useComponent();
+    const { View, Text, Image, RootPortal } = useComponent();
     const [selectSizeCoe, setSelectSizeCoe] = useState(0);
     const [count, setCount] = useState(1);
     const handleChooseSize = (index) => {
@@ -20,7 +19,7 @@ const GoodsDetailPopup = ({ popupVisible, setPopupVisible, goods }) => {
                 break;
         }
     };
-    return (_jsx(_Fragment, { children: _jsx(Popup, Object.assign({ visible: popupVisible, onMaskClick: () => setPopupVisible(false) }, { 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(_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" })) }))] })) })) }));
 };

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

@@ -1,10 +1,9 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-import { useComponent, antdMobile } from '@brushes/qj-simulate-component';
+import { useComponent } from '@brushes/qj-simulate-component';
 import { THREE_DOTS } from '../../../static';
 import GoodsDetailPopup from './goodsDetailPopup';
-const { Popup, Radio } = antdMobile;
 const GoodsDetailSize = ({ goods, popupVisible, setPopupVisible }) => {
-    const { View, Text, Image } = useComponent();
+    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 })] }));
 };
 export default GoodsDetailSize;

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

@@ -0,0 +1,75 @@
+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
+    };
+}