Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev

src/pages/lxMall/commodityDetail/index.tsx

@@ -117,7 +117,7 @@ const CommodityDetail = (props) => {
     const param: any = {
       current: 1,
       pageSize: 10,
-      categoryId
+      customerCategoryId: categoryId
     }
     let headers = {}
     let getListFn

src/pages/lxMall/components/ShopHeader/index.tsx

@@ -3,8 +3,6 @@ import { CaretDownOutlined } from '@ant-design/icons'
 import { Rate, Input, Button, message } from 'antd'
 import { history, Link } from 'umi'
 import isEmpty from 'lodash/isEmpty'
-import shop_icon from '@/assets/imgs/shop_icon.png'
-import credit_icon from '@/assets/imgs/credit_icon.png'
 import ImageBox from '@/components/ImageBox'
 import ShopCredit from '../ShopCredit'
 import styles from './index.less'
@@ -107,15 +105,6 @@ const ShopHeader: React.FC<ShopHeaderPropsType> = (props) => {
                   </div>
                   <div className={styles.shop_header_info_content_about}>
                     <ShopCredit creditPoint={shopInfo?.creditPoint || 0 } />
-                    {/* <div className={styles.shop_header_info_content_about_item}>
-                      <i className={styles.icon}><img src={shop_icon} /></i>
-                      <span className={styles.red}>{shopInfo?.registerYears}</span>
-                      <span>年</span>
-                    </div> */}
-                    {/* <div className={styles.shop_header_info_content_about_item}>
-                      <i className={styles.icon}><img src={credit_icon} /></i>
-                      <span>{shopInfo?.creditPoint || 0}</span>
-                    </div> */}
                   </div>
                 </div>
                 <div className={styles.shop_info}>
@@ -128,7 +117,7 @@ const ShopHeader: React.FC<ShopHeaderPropsType> = (props) => {
                     <div className={styles.shop_info_list}>
                       <div className={styles.shop_info_list_item}>
                         <div className={styles.label}>信誉：</div>
-                        <div className={styles.breif}>{shopInfo?.creditPoint || 0}</div>
+                        <div className={styles.breif}><ShopCredit creditPoint={shopInfo?.creditPoint || 0 } /></div>
                       </div>
                       <div className={styles.shop_info_list_item}>
                         <div className={styles.label}>注册资本：</div>

src/pages/lxMall/pointsMall/list.less

@@ -93,4 +93,4 @@
     }
   }
 
-}
\ No newline at end of file
+}