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

src/pages/lxMall/components/FindMore/components/shoppingNews/index.tsx

@@ -43,7 +43,7 @@ const ShoppingNews: React.FC = () => {
                   item.map((item, index) => (
                     <div className={styles.popular_buy_dynamic_list_item} key={`popular_buy_dynamic_list_item_${index}`}>
                       <div className={styles.popular_buy_dynamic_list_item_header}>
-                        <Link to={`/memberCenter/tranactionAbility/enquirySubmit/viewEnquiryDetail?id=${item.id}`}>{item.details}</Link>
+                        <Link to={`/memberCenter/tranactionAbility/enquiryOffer/enquirySearch/preview?id=${item.id}`}>{item.details}</Link>
                         <div className={cx(styles.status_tag, item.state === 1 ? styles.success : '')}>{item.state === 1 ? '已完成' : '比价中'}</div>
                       </div>
                       <div className={styles.popular_buy_dynamic_list_item_content}>

src/pages/lxMall/pay/components/wechat/index.tsx

@@ -81,7 +81,7 @@ const WechatPayWay: React.FC<WechatPayWayPropsType> = (props) => {
             checkCount++
             checkTimer = setTimeout(() => {
               checkPayState()
-            }, 8000)
+            }, 5000)
           }
         } else {
           message.error(res.message)

src/pages/lxMall/purchaseOnline/index.tsx

@@ -31,7 +31,7 @@ const PurchaseOnline: React.FC<PurchaseOnlinePropsType> = (props) => {
   const [loading, setLoading] = useState<boolean>(true)
   const [commodityList, setCommodityList] = useState<GetOrderRequisitionFormOnlineShoppingListResponseDetail[]>([])
   const [current, setCurrent] = useState<number>(1)
-  const [pageSize] = useState<number>(20)
+  const [pageSize] = useState<number>(21)
   const [totalCount, setTotalCount] = useState<number>(0)
 
   const filterConfig = [FILTER_TYPE.category, FILTER_TYPE.useArea]

src/pages/lxMall/purchaseOnline/list.tsx

@@ -31,7 +31,7 @@ const CommodityList: React.FC<CommodityListPropsType> = (props) => {
         commodityList.map((item, index) => (
           <div key={item.id} className={cx(styles.purchase_list_item, styles.row)}>
             <div className={styles.purchase_list_item_title}>
-              <Link to={`/memberCenter/tranactionAbility/enquiryOffer/toAddSubmitList/rfq/preview?id=${item.id}`}>{item.details}</Link>
+              <Link to={`/memberCenter/tranactionAbility/enquiryOffer/enquirySearch/preview?id=${item.id}`}>{item.details}</Link>
             </div>
             <div className={styles.purchase_list_item_info_box}>
               <div className={styles.purchase_list_item_info_line}>

src/pages/lxMall/shopList/list.tsx

@@ -52,7 +52,7 @@ const CommodityList: React.FC<CommodityListPropsType> = (props) => {
                 <div className={styles.shop_list_info_box}>
                   <div className={styles.shop_list_info_name}>
                     <Link to={`/shop?shopId=${btoa(JSON.stringify({ shopId: item.id, memberId: item.memberId }))}`}>{item.memberName}</Link>
-                    <span className={styles.shop_list_info_city}>{item.memberShopAreas}</span>
+                    <span className={styles.shop_list_info_city}>{item.areas}</span>
                   </div>
                   <div className={styles.shop_list_info_about}>
                     <div className={styles.shop_list_info_about_item}>