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

src/pages/commodity/products/index.tsx

@@ -390,7 +390,7 @@ const Products: React.FC<{}> = () => {
   const onChangeUpShop = (values) => {
     // 判断上架之前是否有店铺 有即可以上下架
     if(judgeShopRef.current){
-      PublicApi.getTemplateShopFindShop({
+      PublicApi.getTemplateWebMemberShopWebFindCurrMemberShop({
         memberId: JSON.parse(window.localStorage.getItem('auth')).memberId,
         memberRoleId: JSON.parse(window.localStorage.getItem('auth')).memberRoleId
       }).then(res => {

src/pages/transaction/components/orderPayModal/index.tsx

@@ -161,9 +161,10 @@ const OrderPayModal: React.FC<OrderPayModalProps> = (props) => {
               history.goBack()
             }, 1000)
           }
-        } else {
-          message.error(res.message)
         }
+        // else {
+        //   message.error(res.message)
+        // }
       })
     }
   }
@@ -189,8 +190,6 @@ const OrderPayModal: React.FC<OrderPayModalProps> = (props) => {
           }).then(res => {
             if(res.code === 1000) {
               setCreditInfo(res.data)
-            } else {
-              message.error(res.message)
             }
             setIsSpin(false)
           })

src/pages/transaction/purchaseOrder/orderCollect/index.tsx

@@ -223,7 +223,7 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = (props) => {
             throw new Error('请选择支付方式或支付渠道')
           }
           let judgementByRatio = params.paymentInformationResponses.map(item => {
-            if(Number(item.payRatio) > 0 && Number(item.payRatio) < 100){
+            if(Number(item.payRatio) > 0 && Number(item.payRatio) <= 100){
               return true
             } else {
               return false