Merge remote-tracking branch 'origin/master'

src/app/common/manage/TencentResult.js

@@ -59,7 +59,12 @@ class TencentResult extends Component {
                                                     </Col>
                                                     <Col span={3}>
                                                     <span className={'schema-table-content'}>
-                                                        <SwitchStatus group={group}/>
+                                                        {
+                                                            this.props.trialcase?
+                                                                <Switch checked={true} disabled/>
+                                                                :
+                                                                <SwitchStatus group={group}/>
+                                                        }
                                                         {/*<span className={'schema-table-content name'}>删除</span>*/}
                                                     </span>
                                                     </Col>

src/case/BillApp/src/components/HomePage/HomePage.css

@@ -26,6 +26,6 @@
 }
 
 .itemWrap > div:nth-child(2){
-    padding-left: 133px;
+    padding-left: 126px;
 }
 

src/case/BillApp/src/components/HomePage/IconList.jsx

@@ -35,7 +35,7 @@ export default class IconList extends Component{
             let itemDay=new Date(item.time).toDateString()
             if(itemDay===day){
 
-                console.log('todayBill',[item])
+                //console.log('todayBill',[item])
                 //setSessionStorage('todayBill',[item])
 
                 if(item.class==='pay'){
@@ -75,7 +75,7 @@ export default class IconList extends Component{
         let bottom=new Date(year+'/'+month+'/1').getTime(),
             top=new Date(year+'/'+month+'/31').getTime();
         let months=collectByDate(bills,bottom,top)
-        console.log('monthBill',months.arr)
+        //console.log('monthBill',months.arr)
         //setSessionStorage('monthBill',months.arr)
         this.setState({monthPay:months.Pay,monthIncome:months.Income})
     }

src/case/BillApp/src/components/HomePage/List.jsx

@@ -17,9 +17,10 @@ export default class Lists extends React.Component {
     let bottom=new Date(year+'/'+month+'/1').getTime(),
         top=new Date(year+'/'+month+'/31').getTime();
     let collect=collectByDate(bills,bottom,top)
+    
     this.setState({monthPay:collect.Pay,monthIncome:collect.Income})
     
-    //console.log(monthPay,monthIncome)
+    //console.log('---',collect)
   }
 
   render() {

src/case/BillApp/src/untils/date.js

@@ -44,11 +44,12 @@ export function collectByDate(arr=[],bottom,top){
 
     arr.forEach(item => {
         if(item.class==='pay'){
-            Pay+=item.money
+            Pay+=parseInt(item.money,10)
         }else{
-            Income+=item.money
+            Income+=parseInt(item.money,10)
         }
     })
+    //console.log(Pay,Income)
     return{Pay,Income,arr}
 }
 

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" />,