Merge branch 'master' of http://gogs.ioobot.com:6680/xy/ec-react

src/pages/cart/all/detail/index.js

@@ -29,8 +29,6 @@ class CartDetail extends Component {
         },()=>{
             if(cartListLength){
                 this.sumPrice(false)
-            }else {
-                this.checkedAll('',true)
             }
         })
     }
@@ -45,8 +43,6 @@ class CartDetail extends Component {
                 },()=>{
                     if(cartListLength){
                         this.sumPrice(false)
-                    }else {
-                        this.checkedAll('',true)
                     }
                 })
             })
@@ -304,6 +300,8 @@ class CartDetail extends Component {
                             onClick={()=>{
                                 if(selectedCount){
                                     this.settleAccounts()
+                                }else {
+                                    message.warning('请选择商品！')
                                 }
                             }}
                         >

src/pages/cart/all/edit/index.js

@@ -1,7 +1,7 @@
 import React, {Component} from 'react'
 import {withRouter} from 'react-router-dom'
 import {message} from 'antd'
-import {Checkbox, WhiteSpace, Modal, Toast} from 'antd-mobile'
+import {Checkbox, WhiteSpace, Modal} from 'antd-mobile'
 import classNames from 'classnames'
 import {Mutation} from "react-apollo"
 import gql from "graphql-tag"
@@ -98,7 +98,7 @@ class CartEdit extends Component {
                         // console.log('delete data',data)
                         let num = data.data.delete_userCart.replace(/[^0-9]/ig,"")
                         if(num){
-                            Toast.info('删除成功', 1)
+                            message.success('删除成功')
                             let cartCount = JSON.parse(localStorage.getItem("cartCount")) - num
                             localStorage.setItem("cartCount",JSON.stringify(cartCount))
 
@@ -284,6 +284,8 @@ class CartEdit extends Component {
                                             onClick={()=>{
                                                 if(selectedCount){
                                                     this.delete(delete_userCart_by_id)
+                                                }else {
+                                                    message.warning('请选择商品！')
                                                 }
                                             }}
                                         >

src/pages/cart/all/index.js

@@ -20,14 +20,15 @@ class All extends Component {
     }
 
     componentWillMount() {
-        // console.log('cartAll componentWillMount',this.props)
+        // console.log('cartAll componentWillMount',this.props,this.state)
         this.getHash()
     }
 
     componentDidMount() {
-        // console.log('cartAll componentDidMount',this.props)
+        // console.log('cartAll componentDidMount',this.props,this.state)
         let state = this.props.history.location.state
         let updateData = state ? state.updateData : false
+
         if(updateData){
             this.setState({
                 updateData
@@ -86,7 +87,7 @@ class All extends Component {
                         if (error) {
                             return 'error!'
                         }
-                        console.log('cart all data',data)
+                        // console.log('cart all data',data)
 
                         return (
                             <div className='cart-wrap'>

src/pages/home/detail/index.js

@@ -136,8 +136,10 @@ class DetailRender extends Component {
                               onClick={()=>{
                                   this.props.history.push({
                                       pathname: '/cart',
-                                      updateData:true,
-                                      tabHidden:false
+                                      state:{
+                                          updateData:true,
+                                          tabHidden:false
+                                      }
                                   })
                               }}
                         >
@@ -277,7 +279,7 @@ class SelectModal extends Component {
 
         this.props.changeDetailState('openSelect',false)
         create_userCart({variables:cartContent}).then((data)=>{
-            console.log('create_userCart data',data)
+            // console.log('create_userCart data',data)
             let cartCount = JSON.parse(localStorage.getItem("cartCount")) + count
             this.props.changeDetailState('cartCount',cartCount)
             message.success('成功添加至购物车')
@@ -343,7 +345,7 @@ class SelectModal extends Component {
                 visible={this.props.openSelect}
                 onClose={()=>this.props.changeDetailState('openSelect',false)}
                 animationType="slide-up"
-                afterClose={() => { console.log('close model')}}
+                // afterClose={() => { console.log('close model')}}
             >
                 <div className="popup-box" >
                     <div className="main-goods-box">