chenzhfa 2 éve
szülő
commit
2c5a582989

+ 1 - 1
src/components/CartListComp/index.js

@@ -314,7 +314,7 @@ class CartListComp extends Component {
                 <span style={{'marginLeft': '20px'}}>型号:{item.model}</span>
               </p>
               <p style={{ color: '#999','fontSize': '12px', margin: '0px'}}>
-                <span>规格:{item.specification}{item.specification.indexOf("/") >= 0 ? "" : item.mainNumUnitName}</span>
+                <span>规格:{item.specification}{item.specification == null || item.specification.indexOf("/") >= 0 ? "" : item.mainNumUnitName}</span>
               </p>
             </div>
           </div>

+ 1 - 1
src/models/cartList.js

@@ -63,7 +63,7 @@ export default {
       const response = yield call(getCartNumDataAPI, payload);
       yield put({
         type: "cartNum",
-        cartNum: response
+        // cartNum: response
       });
     },
     // 添加购物车

+ 20 - 20
src/pages/Buyer/orderEdit/index.js

@@ -1027,25 +1027,25 @@ class OrderEidt extends PureComponent {
       ifSubmit: true
     });
 
-    if (this.state.underPaymentModeName == "在线支付") {
-      // this.saveTempHandle(true);
-      this.setState({ isSubBut: true });
+    // if (this.state.underPaymentModeName == "在线支付") {
+    //   // this.saveTempHandle(true);
+    //   this.setState({ isSubBut: true });
 
-      dispatch({
-        type: "orderEdit/saveTempOrder",
-        payload: postData
-      })
-        .finally(() => {
-          this.setState({
-            loading: false
-          });
-        });
-      return;
-    }
+    //   dispatch({
+    //     type: "orderEdit/saveTempOrder",
+    //     payload: postData
+    //   })
+    //     .finally(() => {
+    //       this.setState({
+    //         loading: false
+    //       });
+    //     });
+    //   return;
+    // }
 
-    if (orderCredit && orderCredit.validMessage) {
-      message.info(orderCredit.validMessage);
-    }
+    // if (orderCredit && orderCredit.validMessage) {
+    //   message.info(orderCredit.validMessage);
+    // }
     // totalDealAmount: 0, // 订单成交金额
     // totalAmount: 0, // 商品总金额(订单原金额)
     // if (parseFloat(orderCredit) + parseFloat(postData.totalDealAmount) < parseFloat(postData.totalAmount)) {
@@ -1149,9 +1149,9 @@ class OrderEidt extends PureComponent {
     if (!this.state.supplierId) {
       msg += "供应商不能为空!";
     }
-    if (!this.state.underPaymentModeId) {
-      msg += "请输入支付方式!";
-    }
+    // if (!this.state.underPaymentModeId) {
+    //   msg += "请输入支付方式!";
+    // }
     // if (!postData.transportModeId) {
     //   msg += "运输方式不能为空!";
     // }