addressPage 重构完成

src/app/App.jsx

@@ -365,9 +365,9 @@ class GraphqlSidebar extends Component {
                         if (loading) return <Spin style={{marginLeft: 3}}/>;
                         if (error) return 'error!';
                         // console.log('CASE_SCHEMA_AND_PROJECT data', data);
-                        localStorage.setItem('ecommerce', data.caseProject.find(project => project.schema_id.schemaName === 'ecommerce').schema_id.schemaData);
-                        localStorage.setItem('subscribe', data.caseProject.find(project => project.schema_id.schemaName === 'subscribe').schema_id.schemaData);
-                        localStorage.setItem('bills', data.caseProject.find(project => project.schema_id.schemaName === 'bills').schema_id.schemaData);
+                        // localStorage.setItem('ecommerce', data.caseProject.find(project => project.schema_id.schemaName === 'ecommerce').schema_id.schemaData);
+                        // localStorage.setItem('subscribe', data.caseProject.find(project => project.schema_id.schemaName === 'subscribe').schema_id.schemaData);
+                        // localStorage.setItem('bills', data.caseProject.find(project => project.schema_id.schemaName === 'bills').schema_id.schemaData);
                         return (
                             <Menu
                                 theme="dark"

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

@@ -2,6 +2,7 @@ import React, { Component } from 'react'
 import RadioAddress from './RadioAddress'
 import EditAddress from './EditAddress'
 import { List } from 'antd-mobile';
+import NavBars from '../Common/NavBar'
 import './AddressPage.css'
 
 import {graphqls} from '../../api/graphql_request'
@@ -38,24 +39,37 @@ class AddressPage extends Component {
   }
 
   renderPage(page){
+    let triggerAddress=this.props.address.triggerAddress
+    //console.log('000',triggerAddress)
     if(page===true){
-      return(<EditAddress address={this.props.address} address_id={this.props.address_id} getAddress={this.getAddress}/>)
+      return(
+        <div>
+        <NavBars navBarText="编辑地址" changePage={this.props.changePage} page="addressPage" triggerAddress={triggerAddress}/>
+        <div style={{marginTop:"45px"}}></div>
+        <EditAddress address={this.props.address} address_id={this.props.address_id} getAddress={this.getAddress}/>
+        </div>
+        )
     }else{
       return(
-        <div className="addressPageWrap">
-          <div  onClick={()=>this.props.address.triggerAddress(true)}>
-          <List>
-            <Item
-              thumb="https://wly-1254337200.cos.ap-guangzhou.myqcloud.com/positioning.svg"
-              arrow="horizontal"
-              onClick={() => {}}
-            >+新建地址</Item>
-          </List>
-          </div>
-          <div className="addressList">
-              <RadioAddress addressList={this.state.addressList} triggerAddress={this.props.triggerAddress} changePage={this.props.changePage} getAddress={this.getAddress} setAddressId={this.props.setAddressId} address_id={this.props.address_id}/>
+        <div>
+          <NavBars navBarText="我的地址" changePage={this.props.changePage} page="user"/>
+          <div style={{marginTop:"45px"}}></div>
+          <div className="addressPageWrap">
+            <div  onClick={()=>this.props.address.triggerAddress(true)}>
+            <List>
+              <Item
+                thumb="https://wly-1254337200.cos.ap-guangzhou.myqcloud.com/positioning.svg"
+                arrow="horizontal"
+                onClick={() => {}}
+              >+新建地址</Item>
+            </List>
+            </div>
+            <div className="addressList">
+                <RadioAddress addressList={this.state.addressList} triggerAddress={this.props.triggerAddress} changePage={this.props.changePage} getAddress={this.getAddress} setAddressId={this.props.setAddressId} address_id={this.props.address_id}/>
+            </div>
           </div>
         </div>
+        
       )
     }
   }

src/case/ShopApp/src/components/Common/NavBar.jsx

@@ -5,13 +5,18 @@ import { NavBar, Icon } from 'antd-mobile';
 export default class NavBars extends Component{
     render(){
         let page=this.props.page||'home'
+        let triggerAddress=this.props.triggerAddress||console.log
         //console.log(this.props)
         return(
             <div className="navBars" style={{zIndex:"2000"}}>
                 <NavBar
                 mode="dark" 
                 icon={ <Icon type="left"/> }
-                onLeftClick={() => this.props.changePage(page)}
+                onLeftClick={() => {
+                    triggerAddress(false)
+                    this.props.changePage(page)
+                    }
+                }
                 rightContent={[
                     <Icon key="0" type="search" style={{ marginRight: '16px' }}/>,
                     <Icon key="1" type="ellipsis" />,