kulley 6 роки тому
батько
коміт
683da45f7d

+ 1 - 1
src/App.js

@@ -84,8 +84,8 @@ class App extends Component {
     }
 
     oauthLogin = () => {
+        setCookie("openid","obR_j5GbxDfGlOolvSeTdZUwfpKA")
         let openid =  getCookie("openid")
-        // setCookie("openid","obR_j5GbxDfGlOolvSeTdZUwfpKA")
         let user_id =  getCookie("user_id")
         console.log('oauthLogin openid',openid)
 

+ 8 - 0
src/components/logo/index.css

@@ -0,0 +1,8 @@
+.footer-logo {
+    height: 50px;
+    background-color: white;
+    text-align: center;
+    line-height: 50px;
+    font-size: 16px;
+    color: #b9b9b9;
+}

+ 17 - 0
src/components/logo/index.js

@@ -0,0 +1,17 @@
+import React, {Component} from "react"
+import './index.css'
+
+class Logo extends Component {
+    constructor(props) {
+        super(props)
+        this.state = {}
+    }
+
+    render() {
+        return (
+            <div className='footer-logo'>IooBot 提供技术支持</div>
+        )
+    }
+}
+
+export default Logo

+ 2 - 1
src/pages/home/all/index.js

@@ -3,7 +3,7 @@ import {withRouter} from 'react-router-dom'
 import {Query} from "react-apollo"
 import gql from "graphql-tag"
 import {Grid, Carousel, WhiteSpace, ActivityIndicator} from 'antd-mobile'
-
+import Logo from '../../../components/logo'
 import {category_by_props, productbyprops} from "../../../utils/gql"
 import './index.css'
 
@@ -114,6 +114,7 @@ class All extends Component {
                         }
                     </Query>
                 </div>
+                <Logo/>
             </div>
         )
     }

+ 3 - 0
src/pages/my/all/index.js

@@ -2,6 +2,7 @@ import React, {Component} from 'react'
 import './index.css'
 import {Grid} from 'antd-mobile'
 import {withRouter} from 'react-router-dom'
+import Logo from '../../../components/logo'
 
 const orderIcon = [
     {
@@ -178,6 +179,8 @@ class All extends Component {
                         />
                     </div>
                 </div>
+
+                <Logo/>
             </div>
         )
     }

+ 7 - 2
src/pages/my/order/display/index.js

@@ -190,7 +190,7 @@ class DisplayRender extends Component {
 
                                 {
                                     button?
-                                        <ButtonGroupRender orderStatus={this.props.orderStatus}/>
+                                        <ButtonGroupRender orderStatus={this.props.orderStatus} history={this.props.history}/>
                                         :
                                         ''
                                 }
@@ -209,7 +209,12 @@ const ButtonGroupRender = (props) => {
         case '0':
             return (
                 <div className='order-card-button-group'>
-                    <Button size="small" className='pay-button order-button'>去支付</Button>
+                    <Button size="small" className='pay-button order-button' onClick={()=>{
+                        props.history.push({
+                            pathname:'/cart/pay',
+                            state:{}
+                        })
+                    }}>去支付</Button>
                 </div>
             )
         case '1':