Merge remote-tracking branch 'origin/master'

package.json

@@ -64,6 +64,7 @@
     "react-intl": "^2.7.2",
     "react-router": "^4.3.1",
     "react-router-dom": "^4.3.1",
+    "react-sticky": "^6.0.3",
     "redux": "^4.0.1",
     "resolve": "1.8.1",
     "sass-loader": "7.1.0",

src/app/common/manage/TencentResult.js

@@ -3,6 +3,7 @@ import {FormattedMessage} from 'react-intl';
 import {Switch, Input, Icon, Spin, Row, Col, message} from 'antd';
 import {
     DELETE_APIGWPATH,
+    DELETE_APIGROUP,
     GET_PROJECT,
     SHOW_APIGWPATH,
     UPDATE_APIGROUP,
@@ -13,7 +14,7 @@ import gql from "graphql-tag";
 import {Query, Mutation} from "react-apollo";
 import copy from 'copy-to-clipboard';
 import axios from 'axios';
-import {removeFC, removeAPI, graphqlUrl} from "../../../config";
+import {removeAPI, graphqlUrl} from "../../../config";
 
 axios.defaults.withCredentials = true;
 
@@ -80,7 +81,18 @@ class TencentResult extends Component {
                                                                 :
                                                                 <SwitchStatus group={group}/>
                                                         }
-                                                        {/*<span className={'schema-table-content name'}>删除</span>*/}
+                                                        &nbsp;
+                                                        {
+                                                            this.props.trialcase ?
+                                                                ''
+                                                                :
+                                                                <DeleteGroupSpan
+                                                                cloudID={cloudID}
+                                                                groupID={group.id}
+                                                                projectID={projectID}
+                                                                userID={this.props.userID}
+                                                            />
+                                                        }
                                                     </span>
                                                     </Col>
                                                 </Row>
@@ -94,6 +106,7 @@ class TencentResult extends Component {
                                                     cloudID={cloudID}
                                                     projectID={projectID}
                                                     userID={this.props.userID}
+                                                    trialcase={this.props.trialcase}
                                                 />
                                             </div>
                                         </div>
@@ -221,14 +234,6 @@ class APIGWPathResult extends Component {
                                                                 <span className={'schema-table-content'}>{path.apiGWDesc}</span>
                                                             </Col>
                                                             <Col span={3}>
-                                                                <DeletePathSpan
-                                                                    cloudID={this.props.cloudID}
-                                                                    groupID={id}
-                                                                    path={path}
-                                                                    projectID={this.props.projectID}
-                                                                    userID={this.props.userID}
-                                                                />
-                                                                &nbsp;
                                                                 {
                                                                     projectType === 'graphql'?
                                                                         <span className={'schema-table-content name'}
@@ -240,6 +245,19 @@ class APIGWPathResult extends Component {
                                                                         :
                                                                         ''
                                                                 }
+                                                                &nbsp;
+                                                                {
+                                                                    this.props.trialcase?
+                                                                        ''
+                                                                        :
+                                                                        <DeletePathSpan
+                                                                            cloudID={this.props.cloudID}
+                                                                            groupID={id}
+                                                                            path={path}
+                                                                            projectID={this.props.projectID}
+                                                                            userID={this.props.userID}
+                                                                        />
+                                                                }
 
                                                             </Col>
                                                         </Row>
@@ -286,6 +304,7 @@ class DeletePathSpan extends Component {
                                   axios.get(`${removeAPI}`, {
                                       params: {
                                           'cloud-id': `${_this.props.cloudID}`,
+                                          'group-id': `${_this.props.groupID}`,
                                           'api-id': `${_this.props.path.id}`
                                       }
                                   })
@@ -295,16 +314,15 @@ class DeletePathSpan extends Component {
 
                                               console.log('path id', _this.props.path.id, 'user id', _this.props.userID);
 
-                                              if(_this.props.path.id && _this.props.userID) {
-                                                  delete_apiGWPath(_this.props.path.id, _this.props.userID);
+                                              delete_apiGWPath({variables: {id:_this.props.path.id, user_id: _this.props.userID}});
+
+                                              // 写回 project 状态
+                                              request(graphqlUrl, UPDATE_PROJECT_ONLY_STATUS, {
+                                                  id: this.props.projectID,
+                                                  updatedAt: new Date().getTime(),
+                                                  projectStatus: 'grouped'
+                                              });
 
-                                                  // 写回 project 状态
-                                                  request(graphqlUrl, UPDATE_PROJECT_ONLY_STATUS, {
-                                                      id: this.props.projectID,
-                                                      updatedAt: new Date().getTime(),
-                                                      projectStatus: 'grouped'
-                                                  });
-                                              }
                                               console.log(res.data);
                                           } else {
                                               console.log('error');
@@ -322,4 +340,64 @@ class DeletePathSpan extends Component {
             </Mutation>
         )
     }
+}
+
+class DeleteGroupSpan extends Component {
+    constructor(props) {
+        super(props);
+        this.state = {
+        }
+    }
+
+    render() {
+        let {projectID, cloudID, groupID, userID} = this.props;
+        return (
+            <Mutation
+                mutation={gql(DELETE_APIGROUP)}
+                refetchQueries={[{query: gql(GET_PROJECT), variables: {id: projectID}}]}
+            >
+                {(delete_apiGWGroup, {loading, error}) => {
+                    if (error)
+                        return 'error';
+                    if (loading)
+                        return <Spin style={{marginLeft: 3}}/>;
+
+                    return (
+                        <span className={'schema-table-content name'} onClick={() => {
+                            axios.get(`${removeAPI}`, {
+                                params: {
+                                    'cloud-id': `${cloudID}`,
+                                    'group-id': `${groupID}`,
+                                }
+                            })
+                                .then((res) => {
+                                    console.log('delete service');
+                                    if (res.data !== '') {
+
+                                        delete_apiGWGroup({variables: {id: groupID, user_id: userID}});
+
+                                        // 写回 project 状态
+                                        request(graphqlUrl, UPDATE_PROJECT_ONLY_STATUS, {
+                                            id: projectID,
+                                            updatedAt: new Date().getTime(),
+                                            projectStatus: 'functioned'
+                                        });
+
+                                        console.log(res.data);
+                                    } else {
+                                        console.log('error');
+                                    }
+                                })
+                                .catch((err) => {
+                                    console.log(err);
+                                });
+                        }}
+                        >
+                            删除
+                        </span>
+                    )
+                }}
+            </Mutation>
+        )
+    }
 }

src/app/graphqlService/component/graphql/Graphql.jsx

@@ -25,7 +25,8 @@ class Graphql extends Component {
 
     graphQLFetcher = (graphQLParams) => {
         // 已经存在的 magazine api， 设想: 用户生成 schema，返回 api 自动替换这里
-        return fetch(this.state.api, {
+        // return fetch(this.state.api, {
+        return fetch('http://service-dan6exu1-1254337200.ap-shanghai.apigateway.myqcloud.com/test/graphql', {
             method: 'post',
             headers: {'Content-Type': 'application/json'},
             body: JSON.stringify(graphQLParams),

src/case/BillApp/src/App.js

@@ -14,9 +14,11 @@ import Assets from './components/Assets/Assets'
 import My from './components/My/My'
 import Bill from './components/Bill/Bill'
 import BillDetail from './components/BillDetail/BillDetail'
+import CreateAssets from './components/Create_assets/Create_assets'
+import Account from './components/Account/Account'
 
 
-import './App.css';
+import './components/App/App.css';
 
 window.sessionStorage.setItem('openid',config.APPID)
 
@@ -34,9 +36,15 @@ class BillApp extends Component{
 
     this.changePage=this.changePage.bind(this)
     this.setDetail=this.setDetail.bind(this)
+    this.getBills=this.getBills.bind(this)
+
+  }
+
+  componentDidMount() {
+      this.getBills()
   }
 
-  //更改页面
+    //更改页面
   changePage(page=''){
     console.log(page)
     this.setState({page})
@@ -50,10 +58,12 @@ class BillApp extends Component{
   //获取数据
   getBills(){
     graphqls(BILL_BY_PROPS,{}).then((e)=>{
-        //console.log('1----',e.billbyprops)
+      //console.log('1----',e.billbyprops)
         this.setState({
             bills:e.billbyprops
         })
+
+      return e
     })
   }
 
@@ -64,7 +74,7 @@ class BillApp extends Component{
         return(
           <div className="pageWrap">
             <div className="scrollPage">
-              <HomePage changePage={this.changePage} setDetail={this.setDetail}/>
+              <HomePage changePage={this.changePage} setDetail={this.setDetail} getBills={this.getBills}/>
             </div>
           </div>
           )
@@ -72,7 +82,7 @@ class BillApp extends Component{
           return(
             <div className="pageWrap">
               <div className="scrollPage">
-                <Assets changePage={this.changePage}/>
+                <Assets changePage={this.changePage} bills={this.state.bills} getBills={this.getBills}/>
               </div>
             </div>
           )
@@ -97,10 +107,27 @@ class BillApp extends Component{
           return (
             <div className="pageWrap">
               <div className="scrollPage">
-                <BillDetail changePage={this.changePage} detail={this.state.detail}/>
+                <BillDetail changePage={this.changePage} detail={this.state.detail} bills={this.state.bills}/>
               </div>
             </div>
           )
+      case('create_assets'):
+        return(
+          <div className="pageWrap">
+            <div className="scrollPage">
+              <CreateAssets changePage={this.changePage}  bills={this.state.bills}/>
+            </div>
+          </div>
+        )
+
+      case('account'):
+        return(
+          <div className="pageWrap">
+            <div className="scrollPage">
+              <Account changePage={this.changePage} />
+            </div>
+          </div>
+        )
           
       default:
           return(

src/case/BillApp/src/api/graphql/assets.js

@@ -0,0 +1,65 @@
+
+export const CREATE_ASSETS=`mutation createassets($id: ID!, $user_id: ID, $name: String, $money: Float, $createdAt: String, $updateAt: String) {
+  createassets: create_assets(id: $id user_id: $user_id name: $name money: $money createdAt: $createdAt updateAt: $updateAt) {
+    id
+    user_id {
+      id
+      openid
+      username
+      password
+      avatar
+      createdAt
+      updateAt
+    }
+    name
+    money
+    createdAt
+    updateAt
+  }
+}`
+
+export const DELETE_ASSETS=`mutation deleteassets($id: ID, $user_id: ID, $name: String, $money: Float, $createdAt: String, $updateAt: String) {
+    deleteassets: delete_assets(id: $id user_id: $user_id name: $name money: $money createdAt: $createdAt updateAt: $updateAt)
+}`
+
+export const ASSETS_BY_PROPS=`query assetsbyprops($user_id: ID, $name: String, $money: Float, $createdAt: String, $updateAt: String) {
+    assetsbyprops: assets_by_props(user_id: $user_id name: $name money: $money createdAt: $createdAt updateAt: $updateAt) {
+        id
+        user_id {
+            id
+            openid
+            username
+            password
+            avatar
+            createdAt
+            updateAt
+        }
+        name
+        money
+        createdAt
+        updateAt
+    }
+}`
+
+
+export const UPDATE_ASSETS=`mutation updateassets($id: ID, $user_id: ID, $name: String, $money: Float, $createdAt: String, $updateAt: String) {
+    updateassets: update_assets(id: $id user_id: $user_id name: $name money: $money createdAt: $createdAt updateAt: $updateAt) {
+        id
+        user_id {
+            id
+            openid
+            username
+            password
+            avatar
+            createdAt
+            updateAt
+        }
+        name
+        money
+        createdAt
+        updateAt
+    }
+}`
+
+
+

src/case/BillApp/src/api/billsGraphql.txt → src/case/BillApp/src/api/js.txt

@@ -57,18 +57,9 @@ query accountbyid($id: ID) {
     }
 }
 
-query classbyid($id: ID) {
-    classbyid: class_by_id(id: $id) {
+query tagbyprops($account_id: ID, $name: String, $icon: String, $createdAt: String, $updateAt: String) {
+    tagbyprops: tag_by_props(account_id: $account_id name: $name icon: $icon createdAt: $createdAt updateAt: $updateAt) {
         id
-        user_id {
-            id
-            openid
-            username
-            password
-            avatar
-            createdAt
-            updateAt
-        }
         account_id {
             id
 
@@ -77,30 +68,6 @@ query classbyid($id: ID) {
             updateAt
         }
         name
-        createdAt
-        updateAt
-    }
-}
-
-query tagbyprops($user_id: ID, $account_id: ID, $name: String, $icon: String, $createdAt: String, $updateAt: String) {
-    tagbyprops: tag_by_props(user_id: $user_id account_id: $account_id name: $name icon: $icon createdAt: $createdAt updateAt: $updateAt) {
-        id
-        user_id {
-            id
-            openid
-            username
-            password
-            avatar
-            createdAt
-            updateAt
-        }
-        account_id {
-            id
-            accountName
-            createdAt
-            updateAt
-        }
-        name
         icon
         createdAt
         updateAt
@@ -109,9 +76,7 @@ query tagbyprops($user_id: ID, $account_id: ID, $name: String, $icon: String, $c
 
 query billbyid($id: ID) {
     billbyid: bill_by_id(id: $id) {
-        money
-        updateAt
-        remark
+        id
         account_id {
             id
 
@@ -119,33 +84,24 @@ query billbyid($id: ID) {
             createdAt
             updateAt
         }
-        time
-        createdAt
-        id
-        class
-        user_id {
-            id
-            openid
-            username
-            password
-            avatar
-            createdAt
-            updateAt
-        }
         tag_id {
             id
 
-
             name
             icon
             createdAt
             updateAt
         }
+        money
+        class
+        remark
+        createdAt
+        updateAt
     }
 }
 
-query classbyprops($user_id: ID, $account_id: ID, $name: String, $createdAt: String, $updateAt: String) {
-    classbyprops: class_by_props(user_id: $user_id account_id: $account_id name: $name createdAt: $createdAt updateAt: $updateAt) {
+query accountbyprops($user_id: ID, $accountName: String, $createdAt: String, $updateAt: String) {
+    accountbyprops: account_by_props(user_id: $user_id accountName: $accountName createdAt: $createdAt updateAt: $updateAt) {
         id
         user_id {
             id
@@ -156,21 +112,14 @@ query classbyprops($user_id: ID, $account_id: ID, $name: String, $createdAt: Str
             createdAt
             updateAt
         }
-        account_id {
-            id
-
-            accountName
-            createdAt
-            updateAt
-        }
-        name
+        accountName
         createdAt
         updateAt
     }
 }
 
-query accountbyprops($user_id: ID, $accountName: String, $createdAt: String, $updateAt: String) {
-    accountbyprops: account_by_props(user_id: $user_id accountName: $accountName createdAt: $createdAt updateAt: $updateAt) {
+query assetsbyprops($user_id: ID, $name: String, $money: Float, $createdAt: String, $updateAt: String) {
+    assetsbyprops: assets_by_props(user_id: $user_id name: $name money: $money createdAt: $createdAt updateAt: $updateAt) {
         id
         user_id {
             id
@@ -181,7 +130,8 @@ query accountbyprops($user_id: ID, $accountName: String, $createdAt: String, $up
             createdAt
             updateAt
         }
-        accountName
+        name
+        money
         createdAt
         updateAt
     }
@@ -190,15 +140,6 @@ query accountbyprops($user_id: ID, $accountName: String, $createdAt: String, $up
 query tagbyid($id: ID) {
     tagbyid: tag_by_id(id: $id) {
         id
-        user_id {
-            id
-            openid
-            username
-            password
-            avatar
-            createdAt
-            updateAt
-        }
         account_id {
             id
 
@@ -242,22 +183,9 @@ query collectbyprops($updateAt: String, $remark: String, $account_id: ID, $month
     }
 }
 
-query billbyprops($money: Float, $updateAt: String, $remark: String, $account_id: ID, $time: String, $createdAt: String, $class: String, $user_id: ID, $tag_id: ID) {
-    billbyprops: bill_by_props(money: $money updateAt: $updateAt remark: $remark account_id: $account_id time: $time createdAt: $createdAt class: $class user_id: $user_id tag_id: $tag_id) {
-        money
-        updateAt
-        remark
-        account_id {
-            id
-
-            accountName
-            createdAt
-            updateAt
-        }
-        time
-        createdAt
+query assetsbyid($id: ID) {
+    assetsbyid: assets_by_id(id: $id) {
         id
-        class
         user_id {
             id
             openid
@@ -267,15 +195,36 @@ query billbyprops($money: Float, $updateAt: String, $remark: String, $account_id
             createdAt
             updateAt
         }
-        tag_id {
+        name
+        money
+        createdAt
+        updateAt
+    }
+}
+
+query billbyprops($account_id: ID, $tag_id: ID, $money: Float, $class: String, $remark: String, $createdAt: String, $updateAt: String) {
+    billbyprops: bill_by_props(account_id: $account_id tag_id: $tag_id money: $money class: $class remark: $remark createdAt: $createdAt updateAt: $updateAt) {
+        id
+        account_id {
             id
 
+            accountName
+            createdAt
+            updateAt
+        }
+        tag_id {
+            id
 
             name
             icon
             createdAt
             updateAt
         }
+        money
+        class
+        remark
+        createdAt
+        updateAt
     }
 }
 
@@ -307,11 +256,9 @@ mutation deleteaccount($id: ID, $user_id: ID, $accountName: String, $createdAt:
     deleteaccount: delete_account(id: $id user_id: $user_id accountName: $accountName createdAt: $createdAt updateAt: $updateAt)
 }
 
-mutation updatebill($money: Float, $updateAt: String, $remark: String, $account_id: ID, $time: String, $createdAt: String, $id: ID, $class: String, $user_id: ID, $tag_id: ID) {
-    updatebill: update_bill(money: $money updateAt: $updateAt remark: $remark account_id: $account_id time: $time createdAt: $createdAt id: $id class: $class user_id: $user_id tag_id: $tag_id) {
-        money
-        updateAt
-        remark
+mutation updatebill($id: ID, $account_id: ID, $tag_id: ID, $money: Float, $class: String, $remark: String, $createdAt: String, $updateAt: String) {
+    updatebill: update_bill(id: $id account_id: $account_id tag_id: $tag_id money: $money class: $class remark: $remark createdAt: $createdAt updateAt: $updateAt) {
+        id
         account_id {
             id
 
@@ -319,28 +266,19 @@ mutation updatebill($money: Float, $updateAt: String, $remark: String, $account_
             createdAt
             updateAt
         }
-        time
-        createdAt
-        id
-        class
-        user_id {
-            id
-            openid
-            username
-            password
-            avatar
-            createdAt
-            updateAt
-        }
         tag_id {
             id
 
-
             name
             icon
             createdAt
             updateAt
         }
+        money
+        class
+        remark
+        createdAt
+        updateAt
     }
 }
 
@@ -348,6 +286,25 @@ mutation deletecollect($updateAt: String, $remark: String, $account_id: ID, $mon
     deletecollect: delete_collect(updateAt: $updateAt remark: $remark account_id: $account_id month: $month createdAt: $createdAt allIncome: $allIncome allPay: $allPay year: $year id: $id user_id: $user_id)
 }
 
+mutation updateassets($id: ID, $user_id: ID, $name: String, $money: Float, $createdAt: String, $updateAt: String) {
+    updateassets: update_assets(id: $id user_id: $user_id name: $name money: $money createdAt: $createdAt updateAt: $updateAt) {
+        id
+        user_id {
+            id
+            openid
+            username
+            password
+            avatar
+            createdAt
+            updateAt
+        }
+        name
+        money
+        createdAt
+        updateAt
+    }
+}
+
 mutation updateuser($id: ID, $openid: String, $username: String, $password: String, $avatar: String, $createdAt: String, $updateAt: String) {
     updateuser: update_user(id: $id openid: $openid username: $username password: $password avatar: $avatar createdAt: $createdAt updateAt: $updateAt) {
         id
@@ -360,12 +317,12 @@ mutation updateuser($id: ID, $openid: String, $username: String, $password: Stri
     }
 }
 
-mutation deleteclass($id: ID, $user_id: ID, $account_id: ID, $name: String, $createdAt: String, $updateAt: String) {
-    deleteclass: delete_class(id: $id user_id: $user_id account_id: $account_id name: $name createdAt: $createdAt updateAt: $updateAt)
+mutation deleteassets($id: ID, $user_id: ID, $name: String, $money: Float, $createdAt: String, $updateAt: String) {
+    deleteassets: delete_assets(id: $id user_id: $user_id name: $name money: $money createdAt: $createdAt updateAt: $updateAt)
 }
 
-mutation updateclass($id: ID, $user_id: ID, $account_id: ID, $name: String, $createdAt: String, $updateAt: String) {
-    updateclass: update_class(id: $id user_id: $user_id account_id: $account_id name: $name createdAt: $createdAt updateAt: $updateAt) {
+mutation createassets($id: ID!, $user_id: ID, $name: String, $money: Float, $createdAt: String, $updateAt: String) {
+    createassets: create_assets(id: $id user_id: $user_id name: $name money: $money createdAt: $createdAt updateAt: $updateAt) {
         id
         user_id {
             id
@@ -376,31 +333,16 @@ mutation updateclass($id: ID, $user_id: ID, $account_id: ID, $name: String, $cre
             createdAt
             updateAt
         }
-        account_id {
-            id
-
-            accountName
-            createdAt
-            updateAt
-        }
         name
+        money
         createdAt
         updateAt
     }
 }
 
-mutation updatetag($id: ID, $user_id: ID, $account_id: ID, $name: String, $icon: String, $createdAt: String, $updateAt: String) {
-    updatetag: update_tag(id: $id user_id: $user_id account_id: $account_id name: $name icon: $icon createdAt: $createdAt updateAt: $updateAt) {
+mutation updatetag($id: ID, $account_id: ID, $name: String, $icon: String, $createdAt: String, $updateAt: String) {
+    updatetag: update_tag(id: $id account_id: $account_id name: $name icon: $icon createdAt: $createdAt updateAt: $updateAt) {
         id
-        user_id {
-            id
-            openid
-            username
-            password
-            avatar
-            createdAt
-            updateAt
-        }
         account_id {
             id
 
@@ -444,18 +386,9 @@ mutation createcollect($updateAt: String, $remark: String, $account_id: ID, $mon
     }
 }
 
-mutation createtag($id: ID!, $user_id: ID, $account_id: ID, $name: String, $icon: String, $createdAt: String, $updateAt: String) {
-    createtag: create_tag(id: $id user_id: $user_id account_id: $account_id name: $name icon: $icon createdAt: $createdAt updateAt: $updateAt) {
+mutation createtag($id: ID!, $account_id: ID, $name: String, $icon: String, $createdAt: String, $updateAt: String) {
+    createtag: create_tag(id: $id account_id: $account_id name: $name icon: $icon createdAt: $createdAt updateAt: $updateAt) {
         id
-        user_id {
-            id
-            openid
-            username
-            password
-            avatar
-            createdAt
-            updateAt
-        }
         account_id {
             id
 
@@ -510,12 +443,12 @@ mutation createaccount($id: ID!, $user_id: ID, $accountName: String, $createdAt:
     }
 }
 
-mutation deletebill($money: Float, $updateAt: String, $remark: String, $account_id: ID, $time: String, $createdAt: String, $id: ID, $class: String, $user_id: ID, $tag_id: ID) {
-    deletebill: delete_bill(money: $money updateAt: $updateAt remark: $remark account_id: $account_id time: $time createdAt: $createdAt id: $id class: $class user_id: $user_id tag_id: $tag_id)
+mutation deletebill($id: ID, $account_id: ID, $tag_id: ID, $money: Float, $class: String, $remark: String, $createdAt: String, $updateAt: String) {
+    deletebill: delete_bill(id: $id account_id: $account_id tag_id: $tag_id money: $money class: $class remark: $remark createdAt: $createdAt updateAt: $updateAt)
 }
 
-mutation deletetag($id: ID, $user_id: ID, $account_id: ID, $name: String, $icon: String, $createdAt: String, $updateAt: String) {
-    deletetag: delete_tag(id: $id user_id: $user_id account_id: $account_id name: $name icon: $icon createdAt: $createdAt updateAt: $updateAt)
+mutation deletetag($id: ID, $account_id: ID, $name: String, $icon: String, $createdAt: String, $updateAt: String) {
+    deletetag: delete_tag(id: $id account_id: $account_id name: $name icon: $icon createdAt: $createdAt updateAt: $updateAt)
 }
 
 mutation updatecollect($updateAt: String, $remark: String, $account_id: ID, $month: String, $createdAt: String, $allIncome: Float, $allPay: Float, $year: String, $id: ID, $user_id: ID) {
@@ -547,36 +480,9 @@ mutation updatecollect($updateAt: String, $remark: String, $account_id: ID, $mon
     }
 }
 
-mutation createclass($id: ID!, $user_id: ID, $account_id: ID, $name: String, $createdAt: String, $updateAt: String) {
-    createclass: create_class(id: $id user_id: $user_id account_id: $account_id name: $name createdAt: $createdAt updateAt: $updateAt) {
+mutation createbill($id: ID!, $account_id: ID, $tag_id: ID, $money: Float, $class: String, $remark: String, $createdAt: String, $updateAt: String) {
+    createbill: create_bill(id: $id account_id: $account_id tag_id: $tag_id money: $money class: $class remark: $remark createdAt: $createdAt updateAt: $updateAt) {
         id
-        user_id {
-            id
-            openid
-            username
-            password
-            avatar
-            createdAt
-            updateAt
-        }
-        account_id {
-            id
-
-            accountName
-            createdAt
-            updateAt
-        }
-        name
-        createdAt
-        updateAt
-    }
-}
-
-mutation createbill($money: Float, $updateAt: String, $remark: String, $account_id: ID, $time: String, $createdAt: String, $id: ID!, $class: String, $user_id: ID, $tag_id: ID) {
-    createbill: create_bill(money: $money updateAt: $updateAt remark: $remark account_id: $account_id time: $time createdAt: $createdAt id: $id class: $class user_id: $user_id tag_id: $tag_id) {
-        money
-        updateAt
-        remark
         account_id {
             id
 
@@ -584,27 +490,18 @@ mutation createbill($money: Float, $updateAt: String, $remark: String, $account_
             createdAt
             updateAt
         }
-        time
-        createdAt
-        id
-        class
-        user_id {
-            id
-            openid
-            username
-            password
-            avatar
-            createdAt
-            updateAt
-        }
         tag_id {
             id
 
-
             name
             icon
             createdAt
             updateAt
         }
+        money
+        class
+        remark
+        createdAt
+        updateAt
     }
 }

src/case/BillApp/src/components/Account/Account.jsx

@@ -0,0 +1,86 @@
+import React, {Component} from 'react';
+
+
+import NavBars from '../common/NavBar'
+import Buttons from '../common/Button'
+
+import {graphqls} from '../../api/graphql_request'
+import {ACCOUNT_BY_PROPS,CREATE_ACCOUNT,DELETE_ACCOUNT,UPDATE_ACCOUNT} from '../../api/graphql/account'
+
+
+import config from '../../api/url_config'
+
+const user_id=config.APPID
+
+class Account extends Component {
+  constructor(props){
+    super(props)
+    this.state={
+      accountList:[]
+    }
+
+    this.deleteAccount=this.deleteAccount.bind(this)
+  }
+
+  componentDidMount() {
+    this.getAccount({user_id})
+  }
+
+  getAccount(data){
+    graphqls(ACCOUNT_BY_PROPS,data).then((e)=>{
+      console.log(e)
+      this.setState({accountList:e.accountbyprops})
+    })
+  }
+
+
+  createAccount(data){
+    graphqls(CREATE_ACCOUNT,data).then((e)=>{
+
+    })
+  }
+
+  deleteAccount(data){
+    graphqls(DELETE_ACCOUNT,data).then((e)=>{
+      this.getAccount({user_id})
+    })
+  }
+
+  updateAccount(data){
+    graphqls(UPDATE_ACCOUNT,data).then((e)=>{
+
+    })
+  }
+
+  createAccountPage(){
+
+  }
+
+  render() {
+    const accountList=this.state.accountList
+    return (
+      <div>
+        <NavBars changePage={this.props.changePage} page={"my"} navBarText={"账户"}/>
+        {
+          accountList.length===0?
+            <div>
+              <div>暂无账户</div>
+              <div style={{height:"20px"}}></div>
+              <Buttons buttonText={"新建账户"}  changePage={this.createAccountPage}/>
+            </div>
+            :
+            accountList.map((item)=>{
+              return(
+                <div key={item.id} style={{minHeight:"20px",background:"#fff",padding:"5px",margin:"10px"}}>
+                  <div style={{padding:"10px 0",fontWeight:"bold",display:"flex"}}><span style={{flexGrow:"1"}}>{item.accountName}</span><span onClick={()=>{this.deleteAccount({id:item.id})}} style={{flexBasis:"23px",height:"23px"}}>x</span></div>
+                  <div style={{padding:"10px 0",color:"#ccc"}}>收入:<span style={{color:"red"}}>10</span>支出:<span style={{color:"green"}}>20</span></div>
+                </div>
+              )
+            })
+        }
+      </div>
+    );
+  }
+}
+
+export default Account;

src/case/BillApp/src/App.css → src/case/BillApp/src/components/App/App.css

@@ -69,6 +69,7 @@
 
 
 
+
 .assetsWrap .collect{
     text-align: center;
     margin-top: 150px;
@@ -86,6 +87,13 @@
 }
 
 
+.xxx{
+    display: flex;
+flex-basis: 100px;
+    flex-grow: 1;
+}
+
+
 
 
 

src/case/BillApp/src/components/Assets/Assets.jsx

@@ -2,25 +2,62 @@ import React, { Component } from 'react'
 
 import NavBars from '../common/NavBar'
 import Buttons from '../common/Button'
+import {getAllCollect} from '../../untils/collect'
+
+import {graphqls} from "../../api/graphql_request";
+import {CREATE_ASSETS,ASSETS_BY_PROPS,UPDATE_ASSETS} from '../../api/graphql/assets'
+import {BILL_BY_PROPS} from '../../api/graphql/bills'
+
+import config from '../../api/url_config'
+
+
+const user_id=config.APPID
 
 export default class Assets extends Component {
   constructor(props){
     super(props)
     this.state={
       navBarText:'资产统计',
-      collect:'0.00'
+      collect:0,
+      pay:0,
+      money:0,
+      bills:[]
     }
+
   }
   componentWillMount(){
-   
+
+
+    let collects= getAllCollect(this.state.bills)
+    this.setState({pay:collects.pay})
+
+    graphqls(ASSETS_BY_PROPS,{user_id}).then(e=>{
+      this.setState({money:e.assetsbyprops[0].money||0})
+    })
+
+  }
+
+  getBills(){
+    graphqls(BILL_BY_PROPS,{}).then((e)=>{
+      //console.log('1----',e.billbyprops)
+      this.setState({
+        bills:e.billbyprops
+      })
+    })
   }
+
+  // componentWillReceiveProps(props) {
+  //   console.log(props)
+  // }
+
   render() {
+    console.log(this.state)
     return (
       <div>
        <NavBars navBarText={this.state.navBarText} changePage={this.props.changePage}/>
        <div className="assetsWrap">
-        <div className="collect">￥<span>{this.state.collect}</span>元</div>
-        <div className="buttonWrap"><Buttons changePage={this.props.changePage} toPage='assets' buttonText='去统计资产'/></div>
+        <div className="collect">￥<span>{this.state.money-this.state.collect}</span>元</div>
+        <div className="buttonWrap"><Buttons  changePage={this.props.changePage} toPage='create_assets' buttonText='去统计资产'/></div>
         <div className="tips">tip:总资产使用统计自己每个月内的消费的情况</div>
        </div>
       </div>

src/case/BillApp/src/components/BillDetail/BillDetail.css

@@ -0,0 +1,41 @@
+.detail-wrap{
+    padding: 10px 5px;
+    background:#fff;
+}
+
+
+
+.detail-wrap .balance{
+    font-size: 9px;
+    color: #cccccc;
+}
+
+.balance-money{
+    font-size: 15px;
+    font-weight: bold;
+    padding: 3px 0;
+}
+.income-wrap , .pay-wrap{
+    display: flex;
+    padding: 5px 0;
+}
+
+.income-wrap span:nth-child(1){
+    flex-grow: 0.9;
+
+}
+
+.income-wrap span:nth-child(2){
+    flex-grow: 0.1;
+    color: red;
+}
+
+.pay-wrap span:nth-child(1){
+    flex-grow: 0.9;
+
+}
+
+.pay-wrap span:nth-child(2){
+    flex-grow: 0.1;
+    color: green;
+}

src/case/BillApp/src/components/BillDetail/BillDetail.jsx

@@ -1,54 +1,115 @@
 import React, { Component } from 'react'
 
 import NavBars from '../common/NavBar'
-import Pickers from '../common/Picker'
+//import Pickers from '../common/Picker'
 
 
-//import {setSessionStorage,getSessionStorage} from '../../untils/session_help'
-import {collectByDate} from '../../untils/date'
 
 
+//import {setSessionStorage,getSessionStorage} from '../../untils/session_help'
+import {getDayCollect,getWeekCollect,getMonthCollect,getAllCollect} from '../../untils/collect'
+import './BillDetail.css'
 
 
-const season = [
-    {
-      label: '春',
-      value: '春',
-    },
-    {
-      label: '夏',
-      value: '夏',
-    },
-  ];
+// const season = [
+//     {
+//       label: '春',
+//       value: '春',
+//     },
+//     {
+//       label: '夏',
+//       value: '夏',
+//     },
+//   ];
 
 export default class BillDetail extends Component {
     constructor(props){
         super(props)
         this.state={
-            bill:[]
+            bill:[],
+            pay:0,
+            income:0,
+            billArr:[]
         }
-        console.log('detailPage',props)
+
     }
 
     componentDidMount(props){
-        
-    }
+        console.log('detailPageProps',props)
+        const detail=this.props.detail
+        const bills=this.props.bills
+        if(detail==='day'){
+            this.getDay(bills)
+        }else if(detail==='week'){
+            this.getWeek(bills)
+        }else if(detail==='month'){
+            this.getMonth(bills)
+        }else{
+            this.getAll(bills)
+        }
 
-    componentWillUnmount(){
+    }
 
+    getDay(bills){
+        let collect=getDayCollect(bills)
+        this.setState({pay:collect.pay,income:collect.income,billArr:collect.billArr})
+    }
+    getWeek(bills){
+        let collect=getWeekCollect(bills)
+        this.setState({pay:collect.pay,income:collect.income,billArr:collect.billArr})
+    }
+    getMonth(bills){
+        let collect=getMonthCollect(bills)
+        this.setState({pay:collect.pay,income:collect.income,billArr:collect.billArr})
+    }
+    getAll(bills){
+        let collect=getAllCollect(bills)
+        this.setState({pay:collect.pay,income:collect.income,billArr:collect.billArr})
     }
 
-    classBill(bill){
+    renderList(){
+        let billArr=this.state.billArr||[]
+        let length=billArr.lemgth
+        if(length){
+            return <div>没有流水记录</div>
+        }else{
+            return (
+             billArr.map((item)=>{
+                 return (
+                   <div className={"pay-wrap"} style={{background:"#fff",margin:"5px 0",padding:"13px 5px"}} key={item.id}>
+                       <span>{item.remark}</span>
+                       <span>{item.money}</span>
+                   </div>
+                 )
+             })
+            )
+        }
 
     }
 
     render() {
+
         return (
         <div>
-            <NavBars changePage={this.props.changePage} page="home"/>
-            <div className="deatilWrap">
-                <Pickers data={season}/>
+            <NavBars changePage={this.props.changePage} page="home" navBarText={"账单详情"}/>
+            <div className={'detail-wrap'}>
+                <div className="balance">结余:</div>
+                <div className={"balance-money"}>{this.state.income - this.state.pay}</div>
+                <div className={"income-wrap"}>
+                    <span>收入</span>
+                    <span>{this.state.income}</span>
+                </div>
+                <div className={"pay-wrap"}>
+                    <span>支出</span>
+                    <span>{this.state.pay}</span>
+                </div>
             </div>
+            <div style={{height:'20px'}}></div>
+            {this.renderList()}
+
+            {/*<div className="deatilWrap">
+                <Pickers data={season}/>
+            </div>*/}
         </div>
         )
     }

src/case/BillApp/src/components/Create_assets/Create_assets.jsx

@@ -0,0 +1,88 @@
+import React, {Component} from 'react';
+import {  WhiteSpace } from 'antd-mobile';
+
+import NavBars from '../common/NavBar'
+import Input from '../common/Input'
+import Buttons from '../common/Button'
+
+
+import {graphqls} from '../../api/graphql_request'
+import {CREATE_ASSETS,ASSETS_BY_PROPS,UPDATE_ASSETS} from '../../api/graphql/assets'
+import config from '../../api/url_config'
+
+const user_id=config.APPID
+
+
+
+class CreateAssets extends Component {
+  constructor(props){
+    super(props)
+    this.state={
+      navBarText:'统计资产',
+      assetsList:[],
+      name:'',
+      money:0
+    }
+    this.save=this.save.bind(this)
+  }
+
+
+  componentDidMount() {
+    this.getAssets({user_id})
+  }
+
+  getAssets(data){
+    graphqls(ASSETS_BY_PROPS,data).then((e)=>{
+      this.setState({
+        assetsList:e.assetsbyprops,
+        money:e.assetsbyprops[0].money||0
+      })
+    })
+
+    this.handleChange=this.handleChange.bind(this)
+  }
+
+  renderList(){
+
+
+  }
+
+  handleChange(e){
+    this.setState({money:e})
+  }
+
+  save(){
+    let that=this
+    console.log('money',this.state)
+    let data={
+      user_id:user_id,
+      money:this.state.money
+    }
+    this.updateAssets(data)
+  }
+
+
+  updateAssets(data){
+    graphqls(UPDATE_ASSETS,data).then((e)=>{
+      this.getAssets()
+    })
+  }
+
+  render() {
+    return (
+      <div>
+        <NavBars navBarText={this.state.navBarText} changePage={this.props.changePage} page={'assets'}/>
+        <div style={{display:"flex",justifyContent:"center",flexDirection: "column",alignItems: "center",height:"500px"}}>
+          <div style={{fontSize:"10px",coloe:"#ccc",padding:"10px"}}>我拥有：</div>
+          <WhiteSpace/>
+          <Input title="财富值" callback={this.handleChange} value={this.state.money} />
+          <WhiteSpace/>
+          <div style={{width:"300px"}}><Buttons buttonText={"确认修改"}  changePage={this.save}/></div>
+        </div>
+      </div>
+    );
+  }
+
+}
+
+export default CreateAssets;

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

@@ -24,15 +24,14 @@ class HomePage  extends Component{
         super(props)
         const month =new Date().getMonth()+1
         const year=new Date().getFullYear()
-        this.state={
+        this.state= {
             month,
             year,
-            weekBottom:'',
-            weekTop:'',
-            bills:[],
-            navBarText:'微记账本'
+            weekBottom: '',
+            weekTop: '',
+            bills: [],
+            navBarText: '微记账本'
         }
-        
         //this.handleChange=this.handleChange.bind(this)
     }
 
@@ -73,7 +72,7 @@ class HomePage  extends Component{
                     <div className="buttonWrap">
                     <Buttons changePage={this.props.changePage} toPage='bill' buttonText='+ 记一笔'/>
                 </div>
-                <IconList bills={this.state.bills} week={{weekTop,weekBottom}} changePage={this.props.changePage} setDetail={this.props.setDetail}/>
+                <IconList bills={this.state.bills} week={{weekTop,weekBottom}} changePage={this.props.changePage} setDetail={this.props.setDetail} getBills={this.props.getBills}/>
             </div>
         )
     }

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

@@ -20,6 +20,8 @@ export default class IconList extends Component{
             allIncome:0.00
         }
     }
+
+
     componentWillReceiveProps(props){
         let {bills,week}=props
         this.getDayCollect(bills)
@@ -28,7 +30,7 @@ export default class IconList extends Component{
         this.getAllCollect(bills)
     }
 
-    
+
     getDayCollect(bills=[]){
         let day=new Date().toDateString()
         bills.forEach((item)=>{
@@ -50,8 +52,6 @@ export default class IconList extends Component{
                 return 0
             }
         })
-        
-
     }
 
     getWeekCollect(bills,week){

src/case/BillApp/src/components/My/My.jsx

@@ -4,6 +4,8 @@ import React, { Component } from 'react'
 import NavBars from '../common/NavBar'
 import Head from '../common/Head'
 import Lists from '../common/List'
+import {successToast} from '../common/Toast'
+
 
 export default class My extends Component {
   constructor(props){
@@ -21,19 +23,19 @@ export default class My extends Component {
   }
 
   myAccount(){
-
+    this.props.changePage('account')
   }
 
   myAssets(){
-
+    successToast('待后续开发',1)
   }
 
     
   contactServer(){
-    
+    successToast('待后续开发',1)
   }
   feedback(){
-
+    successToast('待后续开发',1)
   }
 
   render() {

src/case/BillApp/src/components/common/Input.jsx

@@ -14,9 +14,10 @@ export default class Input extends Component {
         <List>
             <InputItem
                 clear
+                data-name={this.props.name}
                 value={value}
                 placeholder={placeholder}
-                ref={el => this.autoFocusInst = el}
+                ref={(el) => {}}
                 extra={<span style={extra}></span>}
                 disabled={disabled}
                 onChange={(e)=>{callback(e)}}

src/case/BillApp/src/components/common/NavBar.jsx

@@ -4,7 +4,6 @@ import { NavBar, Icon } from 'antd-mobile';
 import {PageContext} from '../context'
 
 
-
 export default class NavBars extends Component{
     render(){
         let page=this.props.page||'home'

src/case/BillApp/src/untils/collect.js

@@ -0,0 +1,87 @@
+import {getMonDayAndSunDay} from "./date";
+
+
+function collectByDate(arr=[],bottom,top){
+
+  //console.log('log',bottom,top)
+  let Pay=0,Income=0;
+  arr=arr.filter((item)=>{
+    return (new Date(item.time).getTime()>=bottom&&new Date(item.time).getTime()<=top)
+  })
+
+  arr.forEach(item => {
+    if(item.class==='pay'){
+      Pay+=parseInt(item.money,10)
+    }else{
+      Income+=parseInt(item.money,10)
+    }
+  })
+
+  //console.log(Pay,Income)
+  return{Pay,Income,arr}
+}
+
+export function getDayCollect(bills=[]){
+  let day=new Date().toDateString()
+  let dayPay=0,dayIncome=0,billArr=[];
+  bills.forEach((item)=>{
+    let itemDay=new Date(item.time).toDateString()
+    if(itemDay===day){
+      billArr=item
+      if(item.class==='pay'){
+          dayPay=item.money
+      }else{
+          dayIncome=item.money
+      }
+    }
+
+  })
+  return {pay:dayPay,income:dayIncome,billArr}
+}
+
+export function getWeekCollect(bills=[]){
+
+  let today=new Date().toLocaleString('chinese', { hour12: false }).slice(0,10)
+
+  let result=getMonDayAndSunDay(today)
+
+  let weekBottom='20' + result[1].slice(1,10)
+  let weekTop='20'+ result[2].slice(1,10)
+
+
+  let bottom=new Date(weekBottom).getTime(),
+    top=new Date(weekTop).getTime();
+
+  let weeks=collectByDate(bills,bottom,top)
+
+  let weekPay=weeks.Pay
+  let weekIncome=weeks.Income
+  let billArr=weeks.arr
+
+
+  return {pay:weekPay,income:weekIncome,billArr}
+}
+
+export function getMonthCollect(bills=[]){
+
+  const month =new Date().getMonth()+1
+  const year=new Date().getFullYear()
+  let bottom=new Date(year+'/'+month+'/1').getTime(),
+    top=new Date(year+'/'+month+'/31').getTime();
+  let months=collectByDate(bills,bottom,top)
+
+  return {pay:months.Pay,income:months.Income,billArr:months.billArr}
+}
+
+export function getAllCollect(bills=[]){
+  let allPay=0,allIncome=0;
+  bills.forEach((item)=>{
+    if(item.class==='pay'){
+      allPay+=item.money
+    }else{
+      allIncome+=item.money
+    }
+  })
+
+  return {pay:allPay,income:allIncome,billArr:bills}
+}

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

@@ -49,7 +49,7 @@ export function collectByDate(arr=[],bottom,top){
             Income+=parseInt(item.money,10)
         }
     })
-    
+
     //console.log(Pay,Income)
     return{Pay,Income,arr}
 }

src/case/OrderApp/src-bak/App.js

@@ -0,0 +1,138 @@
+import React, { Component } from 'react';
+import {PageContext} from './components/context'
+
+import './App.css';
+import {graphqls} from './api/graphql_request'
+import {getStoreByProps} from './api/graphql/store'
+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 {
+
+  constructor(props){
+    super(props)
+    this.state={
+      page:'home',
+      store:[],
+      slide:[],
+      currentStore:{}
+    }
+    this.changePage=this.changePage.bind(this)
+    this.setCurrentStore=this.setCurrentStore.bind(this)
+  }
+
+  componentDidMount(){
+    this.getStores()
+    this.getSlides()
+  }
+
+  changePage(page){
+    this.setState({page})
+  }
+  //
+  setCurrentStore(store){
+    console.log(store)
+    this.setState({currentStore:store})
+  }
+
+  getStores(){
+    //获取所有商家
+    return graphqls(getStoreByProps,{}).then((e)=>{
+      console.log(e.storebyprops)
+      this.setState({
+        store:e.storebyprops
+      })
+    })
+  }
+
+  getSlides(){
+    return graphqls(getSlidesByProps,{}).then((e)=>{
+
+      this.setState({ slide:e.slidsbyprops })
+    })
+  }
+
+
+  //根据状态渲染页面
+  renderPage(page){
+    switch(page){
+      case ('home'):
+        //console.log('++++1+++++',this.state.store)
+        return(
+          <div className="pageWrap">
+            <div className="scrollPage">
+              <HomePage changePage={this.changePage} store={this.state.store} slide={this.state.slide} setCurrentStore={this.setCurrentStore}/>
+            </div>
+          </div>
+          )
+
+      case ('user'):
+        return(
+          <div className="pageWrap">
+            <div className="scrollPage">
+              <UserPage changePage={this.changePage} />
+            </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(
+            <div>页面加载失败,请刷新页面</div>
+          )
+    }
+  }
+
+  renderBottom(){
+    let page=this.state.page
+    if(page==='home'||page==='user'){
+      return(<TabBarBottom changePage={this.changePage}/>)
+    }
+  }
+
+  render() {
+    const changePage=this.changePage
+    return (
+      <div className="AppWrap">
+        <div className="phone6s">
+          <div className="App">
+          <div className="App orderApp">
+            <PageContext.Provider value={changePage}>
+              {this.renderPage(this.state.page)}
+              {this.renderBottom()}
+            </PageContext.Provider>
+        </div>
+          </div>
+        </div>
+      </div>
+    );
+  }
+}
+
+export default OrderApp;

src/case/OrderApp/src/App.js

@@ -1,138 +1,19 @@
-import React, { Component } from 'react';
-import {PageContext} from './components/context'
+import React, {Component} from 'react';
+import './index.css';
 
-import './App.css';
-import {graphqls} from './api/graphql_request'
-import {getStoreByProps} from './api/graphql/store'
-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 {
-
-  constructor(props){
-    super(props)
-    this.state={
-      page:'home',
-      store:[],
-      slide:[],
-      currentStore:{}
+class App extends Component {
+    constructor(props) {
+        super(props);
+        this.state = {}
     }
-    this.changePage=this.changePage.bind(this)
-    this.setCurrentStore=this.setCurrentStore.bind(this)
-  }
-
-  componentDidMount(){
-    this.getStores()
-    this.getSlides()
-  }
-
-  changePage(page){
-    this.setState({page})
-  }
-  //
-  setCurrentStore(store){
-    console.log(store)
-    this.setState({currentStore:store})
-  }
-
-  getStores(){
-    //获取所有商家
-    return graphqls(getStoreByProps,{}).then((e)=>{
-      console.log(e.storebyprops)
-      this.setState({
-        store:e.storebyprops
-      })
-    })
-  }
-
-  getSlides(){
-    return graphqls(getSlidesByProps,{}).then((e)=>{
-
-      this.setState({ slide:e.slidsbyprops })
-    })
-  }
-
-
-  //根据状态渲染页面
-  renderPage(page){
-    switch(page){
-      case ('home'):
-        //console.log('++++1+++++',this.state.store)
-        return(
-          <div className="pageWrap">
-            <div className="scrollPage">
-              <HomePage changePage={this.changePage} store={this.state.store} slide={this.state.slide} setCurrentStore={this.setCurrentStore}/>
-            </div>
-          </div>
-          )
 
-      case ('user'):
-        return(
-          <div className="pageWrap">
-            <div className="scrollPage">
-              <UserPage changePage={this.changePage} />
+    render() {
+        return (
+            <div className="limit">
+                1
             </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(
-            <div>页面加载失败,请刷新页面</div>
-          )
     }
-  }
-
-  renderBottom(){
-    let page=this.state.page
-    if(page==='home'||page==='user'){
-      return(<TabBarBottom changePage={this.changePage}/>)
-    }
-  }
-
-  render() {
-    const changePage=this.changePage
-    return (
-      <div className="AppWrap">
-        <div className="phone6s">
-          <div className="App">
-          <div className="App orderApp">
-            <PageContext.Provider value={changePage}>
-              {this.renderPage(this.state.page)}
-              {this.renderBottom()}
-            </PageContext.Provider>
-        </div>
-          </div>
-        </div>
-      </div>
-    );
-  }
 }
 
-export default OrderApp;
+export default App;

src/case/OrderApp/src/components/App/App.css

@@ -0,0 +1,39 @@
+
+
+.orderApp .pageWrap{
+    position: relative;
+    z-index: 2;
+    height: 100%;
+    margin-top: 0;
+    padding-top: 45px;
+}
+.scrollPage{
+    height: 440px;
+    overflow-y: hidden;
+    overflow:scroll;
+    margin-top: 1px;
+}
+
+.orderApp div.am-tabs-default-bar-tab{
+    font-size: 10px;
+}
+
+
+.orderApp  .navBars{
+    position: absolute;
+    width: 100%;
+    top: 0;
+    left: 0;
+    z-index:2;
+}
+
+.orderApp  .listText{
+    font-size: 14px;
+}
+
+
+
+
+
+
+

src/case/OrderApp/src/index.css

@@ -0,0 +1,5 @@
+.limit {
+  width: 400px;
+  height: 600px;
+  overflow: scroll;
+}

src/case/ShopApp/src/App.js

@@ -1,5 +1,5 @@
 import React, { Component } from 'react';
-import './App.css';
+import './components/App/App.css';
 
 import {PageContext,NumContext} from './context/context'
 

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

@@ -3,28 +3,16 @@ import { List } from 'antd-mobile';
 
 import './RadioAddress.css'
 
-
-
-
-
-
-
-
 import {graphqls} from '../../api/graphql_request'
 import {updateAddress,getAddressByProps} from '../../api/graphql/address'
 
-
-
 const Item = List.Item;
 const Brief = Item.Brief;
 
-
-
-
 export default class RadioAddress extends Component{
 
   onChange = (id) => {
-   // console.log('id:',id)
+   //console.log('id:',id)
     this.updateAddress(id)
   };
 

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

@@ -30,23 +30,24 @@ class HomePage extends Component{
     //获取所有商品
     getGoods(variables={}){
         return graphqls(getProductByProps,variables).then((data)=>{
-        let products=data.productbyprops||[]
-        let arr=products.map((item)=>{
-          return item.category
-        })
-        arr = Array.from(new Set(arr))
-        let tabs=arr.map((item)=>{
-          return {title:item}
-        })
-        this.setState({
-          tabs:[{title: '所有果品'},...tabs],
-          products:products,
-          select:'所有果品',
-          detail:'false',
-          loading:false
-        })
-       // sessionStorage.setItem("products",JSON.stringify(products))
-        })
+            console.log(data)
+            let products=data.productbyprops||[]
+            let arr=products.map((item)=>{
+              return item.category
+            })
+            arr = Array.from(new Set(arr))
+            let tabs=arr.map((item)=>{
+              return {title:item}
+            })
+            this.setState({
+              tabs:[{title: '所有果品'},...tabs],
+              products:products,
+              select:'所有果品',
+              detail:'false',
+              loading:false
+            })
+           // sessionStorage.setItem("products",JSON.stringify(products))
+            })
     }
 
     tabChange(e){

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

@@ -70,7 +70,9 @@ class OrderCenterPage extends Component {
   }
 
   deleteOrder(data){
+      console.log('deleteOrderData',data)
     graphqls(DELETE_ORDER,data).then(e=>{
+        console.log('deleteOrer',e)
         let user_id=sessionStorage.getItem('openid')
         this.getOrder({user_id})
     })

src/gql.js

@@ -583,6 +583,12 @@ const UPDATE_APIGROUP = `
             }
         `;
 
+const DELETE_APIGROUP = `
+            mutation deleteapiGWGroup($id: ID, $user_id: ID) {
+                delete_apiGWGroup(id: $id user_id: $user_id)
+            }
+        `;
+
 const SHOW_APIGWPATH = `
             query PATH($apiGWGroup_id: ID!) {
                 apiGWPath_by_props(apiGWGroup_id: $apiGWGroup_id) {
@@ -1003,6 +1009,7 @@ export {
     UPDATE_DEPLOY,
     ADD_APIGROUP,
     UPDATE_APIGROUP,
+    DELETE_APIGROUP,
     SHOW_APIGWPATH,
     ADD_APIGWPATH,
     UPDATE_APIGWPATH,