Merge branch 'master' of http://gogs.ioobot.com:6680/xy/online

src/case/ShopApp/src/components/HomePage/HomePage.jsx

@@ -44,7 +44,7 @@ class HomePage extends Component{
           detail:'false',
           loading:false
         })
-        sessionStorage.setItem("products",JSON.stringify(products))
+       // sessionStorage.setItem("products",JSON.stringify(products))
         })
     }
 

src/case/ShopApp/src/components/OrderPage/OrederPage.jsx

@@ -7,7 +7,7 @@ import OrderCard from './OrderCard'
 
 
 import {graphqls} from '../../api/graphql_request'
-import {getProductById} from '../../api/graphql/product'
+//import {getProductById} from '../../api/graphql/product'
 import {getAddressByProps} from '../../api/graphql/address'
 import {createOrders,createOrderProducts} from '../../api/graphql/order'
 import {getShopCarByProps,deleteCarByProps} from '../../api/graphql/shopCar'
@@ -42,9 +42,9 @@ class OrderPage extends React.Component{
     ///获取默认地址
     getAddress(){
         let user_id=sessionStorage.getItem('openid')
-        console.log('user_id',user_id)
+        
         graphqls(getAddressByProps,{user_id}).then((e)=>{
-            console.log('getAddressByProps',e.userAddressbyprops)
+            //console.log('getAddressByProps----------',e.userAddressbyprops)
             let address=e.userAddressbyprops.filter((item)=>{return item.default===1})[0]
             this.setState({address})
         })
@@ -201,7 +201,7 @@ class OrderPage extends React.Component{
     }
 
     createProductOrder(order_id,count,product){
-        console.log('product-----------',product)
+        //console.log('product-----------',product)
         let that=this,openid=sessionStorage.getItem('openid')
         let data={
             "count": count,
@@ -254,6 +254,7 @@ class OrderPage extends React.Component{
     render(){
         const address=this.state.address
         const num =this.state.num
+        console.log('+++',address)
         return(
             <div className="orderWrap">
                 <ActivityIndicator toast text="loading" animating={this.state.loading}/>
@@ -268,7 +269,10 @@ class OrderPage extends React.Component{
                             this.props.changePage('addressPage')
                             this.props.triggerAddress(true)
                         }}
-                        >{address.username+address.telephone+address.province+address.city+address.area+address.address}</Item>
+                        >{address ?
+                            address.username+address.telephone+address.province+address.city+address.area+address.address:'地址为空,新建一个地址'
+                        }
+                        </Item>
                     </List>
                 </div>
                 <div className="cardList">{this.renderCardList()}</div>