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

src/case/OrderApp/src/App.js

@@ -8,8 +8,9 @@ import {getSlidesByProps} from './api/graphql/slides'
 
 import TabBarBottom from './components/App/TabBarBottom'
 import HomePage from './components/HomePage/HomePage'
-
 import UserPage from './components/UserPage/userPage'
+import StoreDetailPage from './components/StoreDetailPage/StoreDetailPage'
+import AllStorePage from './components/AllStorePage/AllStorePage'
 
 
 class OrderApp extends Component {
@@ -19,9 +20,11 @@ class OrderApp extends Component {
     this.state={
       page:'home',
       store:[],
-      slide:[]
+      slide:[],
+      currentStore:{}
     }
     this.changePage=this.changePage.bind(this)
+    this.setCurrentStore=this.setCurrentStore.bind(this)
   }
 
   componentDidMount(){
@@ -32,6 +35,11 @@ class OrderApp extends Component {
   changePage(page){
     this.setState({page})
   }
+  //
+  setCurrentStore(store){
+    console.log(store)
+    this.setState({currentStore:store})
+  }
 
   getStores(){
     //获取所有商家
@@ -59,7 +67,7 @@ class OrderApp extends Component {
         return(
           <div className="pageWrap">
             <div className="scrollPage">
-              <HomePage changePage={this.changePage} store={this.state.store} slide={this.state.slide}/>
+              <HomePage changePage={this.changePage} store={this.state.store} slide={this.state.slide} setCurrentStore={this.setCurrentStore}/>
             </div>
           </div>
           )
@@ -72,6 +80,27 @@ class OrderApp extends Component {
             </div>
           </div>
         )
+
+      case ('detail'):
+        return(
+          <div className="pageWrap">
+            <div className="scrollPage">
+              <StoreDetailPage changePage={this.changePage} store={this.state.currentStore}/>
+            </div>
+          </div>
+        )
+
+      case ('all'):
+        return(
+          <div className="pageWrap">
+            <div className="scrollPage">
+              <AllStorePage changePage={this.changePage} store={this.state.currentStore}/>
+            </div>
+          </div>
+        )
+
+
+        
  
       default:
           return(

src/case/OrderApp/src/components/AllStorePage/AllStorePage.jsx

@@ -0,0 +1,14 @@
+import React, { Component } from 'react'
+
+import NavBars from '../common/NavBar'
+
+export default class AllStorePage extends Component {
+  render() {
+    return (
+      <div>
+        <NavBars navBarText="所有店铺" changePage={this.props.changePage} page="home"/>
+        <div style={{width:"100%",height:"200px",display:"flex",justifyContent:"center",alignItems:"center"}}>待后续开发,敬请期待</div>
+      </div>
+    )
+  }
+}

src/case/OrderApp/src/components/HomePage/HomePage.jsx

@@ -1,6 +1,5 @@
 import React ,{Component} from 'react';
 
-
 import NavBars from '../common/NavBar'
 import Slide from '../common/Slide'
 import Cards from '../common/Cards'
@@ -21,15 +20,15 @@ export default class HomePage extends Component{
 
         return (
             <div>
-                <NavBars navBarText="店铺" />
+                <NavBars navBarText="店铺" changePage={this.props.changePage} page="home"/>
                 <Slide slide={this.props.slide}/>
-                <Lists text="推荐商家" extra="更多"/>
-                <div className="cardlist" style={{padding:"0 5px"}}>
+                <Lists text="推荐商家" extra="更多" callback={()=>{this.props.changePage('all')}}/>
+                <div className="cardlist">
                     {
                         store.map((item,index)=>{
                             if(item.recommended==='1'){
                                 return (
-                                    <Cards key={index} item={item} changePage={this.props.changePage}/>
+                                    <Cards key={index} item={item} changePage={this.props.changePage} setCurrentStore={this.props.setCurrentStore}/>
                                     )
                             }else{
                                 return ''

src/case/OrderApp/src/components/StoreDetailPage/StoreDetailPage.jsx

@@ -0,0 +1,14 @@
+import React, { Component } from 'react'
+
+import NavBars from '../common/NavBar'
+
+export default class StoreDetailPage extends Component {
+  render() {
+    return (
+      <div>
+        <NavBars navBarText="店铺详情" changePage={this.props.changePage} page="home"/>
+        <div style={{width:"100%",height:"200px",display:"flex",justifyContent:"center",alignItems:"center"}}>待后续开发,敬请期待</div>
+      </div>
+    )
+  }
+}

src/case/OrderApp/src/components/UserPage/userPage.jsx

@@ -4,6 +4,8 @@ import NavBars from '../common/NavBar'
 import Head from '../common/Head'
 import Lists from '../common/List'
 
+import {successToast} from '../common/Toast'
+
 
 class UserPage extends Component{
     constructor(props){
@@ -19,18 +21,18 @@ class UserPage extends Component{
     toOrder(){
         console.log('toOrder')
     }
-    
+
     render(){
         return(
             <div>
                 <NavBars navBarText="我的"/>
                 <Head />
-                <div className="lists">
-                    <Lists text="我的预约" icon="https://wly-1254337200.cos.ap-guangzhou.myqcloud.com/order.svg" callback={this.toOrder}/>
+                <div className="lists" style={{marginTop:"20px",border:"1px solid transparent"}}>
+                    <Lists text="我的预约" icon="https://wly-1254337200.cos.ap-guangzhou.myqcloud.com/order.svg" callback={()=>{successToast('敬请期待',1)}}/>
                     <div style={{height:"30px"}}></div>
-                    <Lists text="我的客服"  callback={this.toOrder}/>
+                    <Lists text="我的客服"  callback={()=>{successToast('敬请期待',1)}}/>
                     <div style={{height:"10px"}}></div>
-                    <Lists text="意见反馈"  callback={this.toOrder}/>
+                    <Lists text="意见反馈"  callback={()=>{successToast('敬请期待',1)}}/>
                 </div>
             </div>
         )

src/case/OrderApp/src/components/common/Cards.jsx

@@ -29,10 +29,14 @@ class Cards extends Component{
     render(){
         const item =this.props.item
         const changePage=this.props.changePage
+        const setCurrentStore=this.props.setCurrentStore
         return(
             <WingBlank size="lg" className="Card">
                 {/*<Link to={"/detail?product_id="+item.id}>*/}
-                    <Card onClick={(e)=>{changePage('detail',item.id)}}>
+                    <Card onClick={(e)=>{
+                        changePage('detail')
+                        setCurrentStore(item)
+                    }}>
                         <Card.Header
                             title={<span className="title">{item.name}</span>}
                             extra={<span className="hot">热门</span>}