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

src/case/ShopApp/src/components/AddressPage/AddressPage.jsx

@@ -24,6 +24,7 @@ class AddressPage extends Component {
     this.getAddress=this.getAddress.bind(this)
   }
 
+
   componentDidMount(){
     let user_id=sessionStorage.getItem('openid')  
     this.getAddress({user_id})

src/case/ShopApp/src/components/OrderCenterPage/OrderCenterPage.jsx

@@ -31,12 +31,20 @@ class OrderCenterPage extends Component {
   componentDidMount(){
     let user_id='ovtkn4zONC3IzhpykQ7cSLZ85YFg'
     this.getOrder({user_id})
+
   }
   //获取订单，并根据订单id获取订单产品信息，之后重构数据结构
   getOrder(data){
+      let that=this
     graphqls(getOrderByProps,data).then((res)=>{
         //console.log('order',res)
         let orderArr=res.orderbyprops||[]
+        let length=orderArr.length
+        if(!length){
+            let id=setTimeout(()=>{
+                that.setState({loading:false})
+            },10000)
+        }
         for(let i=0;i<orderArr.length;i++){
             //根据order_id获取订单产品信息,可以优化,可以只发出一次请求获取所有订单产品信息之后再经行处理
             graphqls(getProductByProps,{order_id:orderArr[i].id}).then((res)=>{
@@ -115,7 +123,11 @@ class OrderCenterPage extends Component {
         <NavBars navBarText="我的订单" changePage={this.props.changePage} page="user"/>
         <div style={{marginTop:"45px"}}><TabBarTop tabChange={this.tabChange} tabs={this.state.tabs}/></div>
         <div className="orderList">
-            {
+            {orderList.length===0?
+                <div style={{marginTop:'200px',padding:'1px',position:'relative',zIndex:'10',display:'flex',justifyContent:'center'}}>
+                    <div>订单为空<span onClick={()=>this.props.changePage('index')} style={{color:'#108ee9'}}>去购物</span></div>
+                </div>
+                :
                 orderList.map((item,index)=>{
                     //console.log(index,item)
                     return(<OrderCard order={item} key={item.id} toPay={this.toPay} toDeleteOrder={this.toDeleteOrder}/>)

src/case/ShopApp/src/components/ShopCarPage/ShopCarPage.jsx

@@ -59,19 +59,19 @@ class ShopCarPage extends Component{
     }
 
     
-    // renderShopCarList(){
-    //     return this.state.shopCarList||[].map((item)=>{
-    //         return (<div>
-    //             <ShopCarCard car={item} key={item.id} deleteCarById={this.deleteCarById}/>
-    //             </div>)
-    //     })
-    // }
-    
     render(){
         return(
             <div className="shopCarPage">
                 <ActivityIndicator toast text="loading" animating={this.state.loading}/>
                 <NavBars navBarText="购物车" changePage={this.props.changePage} page="detail"/>
+                {
+                    this.state.shopCarList.length===0 ?
+                        <div style={{marginTop:'200px',padding:'1px',position:'relative',zIndex:'10',display:'flex',justifyContent:'center'}}>
+                            <div>购物车空空如也<span onClick={()=>this.props.changePage('index')} style={{color:'#108ee9'}}>去购物</span></div>
+                        </div>
+                        :
+                        ''
+                }
                 <div className="ShopCarList">
                     {/*this.renderShopCarList()*/}
                     <ShopCarCard shopCarList={this.state.shopCarList} deleteCarById={this.deleteCarById}/>

src/case/ShopApp/src/components/UserPage/Head.css

@@ -1,5 +1,5 @@
 .head{
-    height: 100px;
+    height: 158px;
     display: flex;
     flex-direction: column;
     justify-content: center;

src/case/ShopApp/src/components/UserPage/UserPage.css

@@ -15,7 +15,7 @@
 
 
 .toWrap{
-    margin-top: 95px;
+    margin-top: 20px;
 }
 .toOrderCenter, .toAddressCenter{
     box-sizing: border-box;