Merge branch 'dev' into test

src/pages/lxMall/commodityDetail/index.tsx

@@ -1007,6 +1007,7 @@ const CommodityDetail = (props) => {
                 <div className={styles.product_info_line_label}>支付方式</div>
                 <div className={styles.product_info_line_brief}>
                   {
+                    commodityDetail?.priceType === 3 ? <span className={styles.text}>积分支付</span> :
                      payWayList.map((item, index) => <span key={`pay_way_item_${index}`} className={styles.text}>{item.payVal}</span>)
                   }
                 </div>

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

@@ -22,7 +22,7 @@ interface BablancePayWayPropsType {
 }
 
 const BablancePayWay: React.FC<BablancePayWayPropsType> = (props) => {
-  const { payInfo, orderId, orderInfo, layoutType, shopUrlParam } = props
+  const { payInfo, orderId, orderInfo, layoutType, shopUrlParam, onChange } = props
   const [balanceInfo, setBalanceInfo] = useState<GetPayAssetAccountGetUserBalanceResponse>(0)
   const [securityInfo, setSecurityInfo] = useState<GetMemberSecurityGetResponse>()
   const [payPassword, setPayPassword] = useState<string>('')
@@ -51,7 +51,12 @@ const BablancePayWay: React.FC<BablancePayWayPropsType> = (props) => {
       if (res.code === 1000) {
         setBalanceInfo(res.data)
         setPageLoading(false)
+      } else {
+        setPageLoading(false)
+        onChange(true, res.message)
       }
+    }).catch(() => {
+
     })
   }
 

src/pages/lxMall/pay/index.tsx

@@ -90,8 +90,10 @@ const PayPage: React.FC<PayPagePropsType> = (props) => {
     })
   }
 
-  const handlePayChangge = (state) => {
+  const handlePayChangge = (state, errMsg?) => {
+    console.log(state, "state")
     setPayState(state)
+    errMsg && setErrMsg(errMsg)
   }
 
   const renderPayWay = () => {
@@ -101,17 +103,17 @@ const PayPage: React.FC<PayPagePropsType> = (props) => {
 
     switch (payInfo.paymentChannelsId) {
       case PayWayType.point:
-        return <PointPayWay payInfo={payInfo} orderInfo={orderInfo} orderId={orderId} onChange={(state) => handlePayChangge(state)} {...props}  />
+        return <PointPayWay payInfo={payInfo} orderInfo={orderInfo} orderId={orderId} onChange={(state, errMsg) => handlePayChangge(state, errMsg)} {...props}  />
       case PayWayType.balance:
-        return <BablancePayWay payInfo={payInfo} orderInfo={orderInfo} orderId={orderId} onChange={(state) => handlePayChangge(state)} {...props}  />
+        return <BablancePayWay payInfo={payInfo} orderInfo={orderInfo} orderId={orderId} onChange={(state, errMsg) => handlePayChangge(state, errMsg)} {...props}  />
       case PayWayType.credit:
-        return <CreditPayWay payInfo={payInfo} orderInfo={orderInfo} orderId={orderId} onChange={(state) => handlePayChangge(state)} {...props} />
+        return <CreditPayWay payInfo={payInfo} orderInfo={orderInfo} orderId={orderId} onChange={(state, errMsg) => handlePayChangge(state, errMsg)} {...props} />
       case PayWayType.wechat:
-        return <WechatPayWay payInfo={payInfo} orderInfo={orderInfo} orderId={orderId} onChange={(state) => handlePayChangge(state)} {...props} />
+        return <WechatPayWay payInfo={payInfo} orderInfo={orderInfo} orderId={orderId} onChange={(state, errMsg) => handlePayChangge(state, errMsg)} {...props} />
       case PayWayType.bank:
         return <BankPayWay  />
       case PayWayType.transfer:
-        return <TransferPayWay payInfo={payInfo} orderId={orderId} onChange={(state) => handlePayChangge(state)} {...props} />
+        return <TransferPayWay payInfo={payInfo} orderId={orderId} onChange={(state, errMsg) => handlePayChangge(state, errMsg)} {...props} />
       default:
         return null
     }
@@ -133,16 +135,7 @@ const PayPage: React.FC<PayPagePropsType> = (props) => {
         }
       </div>
     </div>
-  ) : (<div>
-    <CommonHeader
-      logoUrl={(layoutType === LAYOUT_TYPE.channel || layoutType === LAYOUT_TYPE.ichannel) ? shopInfo?.logo : mallInfo.logoUrl}
-      title="支付成功"
-    />
-    <div className={styles.errmsg}>
-      <p>支付成功</p>
-      <Button type="primary" className={styles.backbtn} onClick={() => backHome()}>继续购物</Button>
-    </div>
-    </div>) : loading ? null : (
+  ) : loading ? null : (
       <div>
         <CommonHeader
           logoUrl={(layoutType === LAYOUT_TYPE.channel || layoutType === LAYOUT_TYPE.ichannel) ? shopInfo?.logo : mallInfo.logoUrl}
@@ -153,7 +146,7 @@ const PayPage: React.FC<PayPagePropsType> = (props) => {
           <Button type="primary" className={styles.backbtn} onClick={() => backHome()}>返回首页</Button>
         </div>
       </div>
-    )
+    ): null
 
 }
 

src/pages/lxMall/purchaseOrder/index.tsx

@@ -736,7 +736,7 @@ const PurchaseOrder: React.FC<PurchaseOrderPropsType> = (props) => {
                           }
                         </div>
                         <div className={cx(styles.order_list_item_item, styles.count)}>
-                          <InputNumber max={childItem.stockCount || 0} min={childItem.commodityUnitPrice.commodity.minOrder || 1} value={childItem.count} onChange={(value) => handleCountChange(value, childItem.id)} />
+                          <InputNumber max={childItem.stockCount || 0} disabled={childItem.stockCount === 0} min={childItem.commodityUnitPrice.commodity.minOrder || 1} value={childItem.count} onChange={(value) => handleCountChange(value, childItem.id)} />
                           <div className={styles.stock}>
                             <span>(库存{numFormat(childItem.stockCount)}{childItem.commodityUnitPrice.commodity.unitName})</span>
                           </div>