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

src/pages/lxMall/commodityDetail/index.tsx

@@ -627,7 +627,7 @@ const CommodityDetail = (props) => {
 
     const sessionKey = `inquiry${selectCommodityId}${new Date().getTime()}`
     updateOrderInfo(inquiryParam, sessionKey).then(() => {
-      window.location.href = `/memberCenter/tranactionAbility/goodsOffer/addEnquiryOrder/rfq?id=${id}&memberId=${memberId}&spam_id=${sessionKey}`
+      window.location.href = `/memberCenter/tranactionAbility/goodsOffer/addEnquiryOrder/rfq?id=${id}&memberId=${memberId}&spam_id=${sessionKey}&commodityId=${id}`
     })
   }
 

src/pages/lxMall/components/Category/index.less

@@ -53,6 +53,7 @@
         margin: 0;
 
         &_item {
+          position: relative;
           padding-left: 20px;
           padding-top: 12px;
           height: 56px;

src/pages/lxMall/components/Filter/components/Category/index.tsx

@@ -237,6 +237,7 @@ const Category: React.FC<CategoryPropsType> = (props) => {
 
     switch(layoutType) {
       case LAYOUT_TYPE.mall:
+      case LAYOUT_TYPE.shopList:
         onFilter({
           type: FILTER_TYPE.category,
           key: selectedKeys,

src/pages/lxMall/order/index.less

@@ -149,6 +149,12 @@
           background-color: var(--mall_main_color);
           cursor: pointer;
 
+          &[disabled] {
+            background: #F4F5F7;
+            border-color: #F4F5F7;
+            color: rgba(0, 0, 0, 0.25);
+          }
+
           &:hover {
             opacity: .9;
           }

src/pages/lxMall/order/index.tsx

@@ -70,7 +70,7 @@ const Order: React.FC<OrderPropsType> = (props) => {
   const [contracErrorInfo, setContracErrorInfo] = useState<any>()
   const [electronicContractId, setElectronicContractId] = useState<number>()
   const [agreeSingLoading, setAgreeSignLoading] = useState<boolean>(false)
-  const [btnDisabled] = useState<boolean>(false)
+  const [btnDisabled, setBtnDisable] = useState<boolean>(true)
   const { storeId } = useStoreId(getLayoutType(layoutType, Number(type)))
 
   useEffect(() => {
@@ -131,6 +131,7 @@ const Order: React.FC<OrderPropsType> = (props) => {
             if (sessionStorage.getItem(`contract${spam_id}`)) {
               setContractInfo(JSON.parse(sessionStorage.getItem(`contract${spam_id}`)))
               setIsElectronicContract(true)
+              setBtnDisable(false)
             } else {
               // 根据电子合同模板id获取生成电子合同
               const param: any = {
@@ -155,12 +156,19 @@ const Order: React.FC<OrderPropsType> = (props) => {
                 setContracErrorInfo(signRes.message)
               }
               setIsElectronicContract(true)
+              setBtnDisable(false)
             }
+          }  else {
+            setBtnDisable(false)
           }
+        } else {
+          setBtnDisable(false)
         }
       } catch (error) {
         console.log("获取交易规则失败")
       }
+    } else {
+      setBtnDisable(false)
     }
   }
 
@@ -193,8 +201,6 @@ const Order: React.FC<OrderPropsType> = (props) => {
     setSpinningState(false)
   }
 
-
-
   const renderLogisticsInfo = (type, logisticsInfo) => {
     switch (type) {
       case 1:

src/pages/lxMall/pay/index.tsx

@@ -74,7 +74,10 @@ const PayPage: React.FC<PayPagePropsType> = (props) => {
   }, [query])
 
   const fetchOrderInfo = () => {
-    PublicApi.getOrderOrderPayDetails({ id: query.orderId }).then(res => {
+    const param: any = {
+      id: query.orderId
+    }
+    PublicApi.getOrderOrderPayDetails(param).then(res => {
       message.destroy()
       setLoading(false)
       if (res.code === 1000) {

src/pages/lxMall/purchaseOrder/index.tsx

@@ -103,7 +103,7 @@ const PurchaseOrder: React.FC<PurchaseOrderPropsType> = (props) => {
         const tempResult = []
         for(const tempItem of result) {
           if (tempItem.id === item.commodityUnitPrice.commodity.storeId) {
-            const tempPriceRange = []
+            let tempPriceRange = []
             const unitPrice = item.commodityUnitPrice.unitPrice
             let parameter: any = 1
             const isMemberPrice = item.commodityUnitPrice.commodity.isMemberPrice
@@ -122,7 +122,11 @@ const PurchaseOrder: React.FC<PurchaseOrderPropsType> = (props) => {
                 price: isMemberPrice ? Number(unitPrice[key]) * Number(parameter)  : unitPrice[key]
               })
             })
-
+            try {
+              tempPriceRange = tempPriceRange.sort((a, b) => a.price < b.price ? 1: -1)
+            } catch (error) {
+              console.log(error)
+            }
             item.commodityUnitPrice['priceRange'] = tempPriceRange
             tempItem.orderList = [...tempItem.orderList, item]
             tempResult.push(tempItem)
@@ -137,7 +141,7 @@ const PurchaseOrder: React.FC<PurchaseOrderPropsType> = (props) => {
         temp.memberId = item.commodityUnitPrice.commodity.memberId
         temp.memberRoleId = item.commodityUnitPrice.commodity.memberRoleId
         temp.shopname = item.commodityUnitPrice.commodity.memberName
-        const tempPriceRange = []
+        let tempPriceRange = []
         const unitPrice = item.commodityUnitPrice.unitPrice
         let parameter: any = 1
         const isMemberPrice = item.commodityUnitPrice.commodity.isMemberPrice
@@ -156,7 +160,11 @@ const PurchaseOrder: React.FC<PurchaseOrderPropsType> = (props) => {
             price: isMemberPrice ? Number(unitPrice[key]) * Number(parameter)  : unitPrice[key]
           })
         })
-
+        try {
+          tempPriceRange = tempPriceRange.sort((a, b) => a.price < b.price ? 1: -1)
+        } catch (error) {
+          console.log(error)
+        }
         item.commodityUnitPrice['priceRange'] = tempPriceRange
         temp.orderList = [item]
         result.push(temp)