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

src/pages/lxMall/commodityDetail/index.tsx

@@ -348,7 +348,7 @@ const CommodityDetail = (props) => {
           postFn = PublicApi.postSearchShopPurchaseSaveOrUpdatePurchase
           break;
       }
-      PublicApi.postOrderDirectPayment({ productId: selectCommodityId }).then(res => {
+      PublicApi.postOrderDirectPayment({ productId: selectCommodityId, memberId }).then(res => {
         if (res.code === 1000) {
           message.destroy()
           postFn && postFn(param).then(res => {
@@ -362,6 +362,8 @@ const CommodityDetail = (props) => {
             clickFlag = true
           })
         }
+      }).catch(() => {
+        clickFlag = true
       })
     }
   }
@@ -468,7 +470,7 @@ const CommodityDetail = (props) => {
             category: commodityDetail.customerCategory.name,
             brand: commodityDetail.brand.name,
             stockCount: stockCount,
-            commodityPic: attrAndValList.commodityPic ? attrAndValList.commodityPic[0] : '',
+            commodityPic: attrAndValList.commodityPic ? attrAndValList.commodityPic[0] : commodityDetail.mainPic,
             attribute: attrAndValList.attributeAndValueList
           }
 
@@ -480,6 +482,7 @@ const CommodityDetail = (props) => {
             supplyMembersName: commodityDetail.memberName,
             supplyMembersId: commodityDetail.memberId,
             supplyMembersRoleId: commodityDetail.memberRoleId,
+            isInvoice: commodityDetail.isInvoice,
             orderList: [{
               id: shopInfo.id,
               shopname: shopInfo.company,
@@ -497,6 +500,8 @@ const CommodityDetail = (props) => {
         } else {
           clickFlag = true
         }
+      }).catch(() => {
+        clickFlag = true
       })
     }
 

src/pages/lxMall/order/index.tsx

@@ -423,7 +423,9 @@ const Order: React.FC<OrderPropsType> = (props) => {
               }
               <PayWay supplyMembersId={orderInfo.supplyMembersId} supplyMembersRoleId={orderInfo.supplyMembersRoleId}  selectItem={selectPayWay} payWayList={orderInfo.payWayList} onChange={(val) => setSelectPayWay(val)} />
               {/* <Delivery /> */}
-              <Invoice state={needTheInvoice} onChange={(val) => setNeedTheInvoice(val)} onSelect={(val) => setSelectInvoiceInfo(val)} />
+              {
+                orderInfo.isInvoice && <Invoice state={needTheInvoice} onChange={(val) => setNeedTheInvoice(val)} onSelect={(val) => setSelectInvoiceInfo(val)} />
+              }
               {
                 isElectronicContract && <Contract contractInfo={contractInfo} state={needTheContract} onChange={(val) => setneedTheContract(val)} />
               }