amend

src/App.js

@@ -91,7 +91,7 @@ class App extends Component {
             // setCookie("openid","o2fcFv8x3wy5WtcP116S5GzzkgDQ")
             let openid = getCookie("openid")
             let user_id = getCookie("user_id")
-            console.log('oauthLogin openid', openid)
+            // console.log('oauthLogin openid', openid)
 
             if (!openid) {
                 window.location.href = "/subscribe"

src/pages/my/all/index.js

@@ -213,7 +213,7 @@ class All extends Component {
                                      '请输入账户名及密码',
                                      (login, password) => {
                                        const {username, password:userPassWord} = adminData
-                                       console.log(`login: ${login}, password: ${password}`)
+                                       // console.log(`login: ${login}, password: ${password}`)
                                        if(login === username && password === userPassWord) {
                                          this.setState({showAdmin:true})
                                          setCookie('showAdmin',true)

src/pages/my/manage/admin/index.css

@@ -1,6 +1,6 @@
 .admin-card {
     background-color: white;
-    padding: 10px;
+    padding: 15px;
     font-size: 16px;
     color: black;
     display: flex;

src/pages/my/manage/orders/index.css

@@ -9,9 +9,9 @@
 
 .order-tip-wrap {
     position: relative;
-    height: 200px;
+    height: inherit;
     width: 100%;
-    background-color: white;
+    background-color: transparent;
 }
 
 .order-tip {
@@ -23,4 +23,4 @@
 
 .search-query {
     min-height: 200px;
-}
+}

src/pages/my/order/display/index.css

@@ -61,7 +61,7 @@
     border-radius: 50px;
     background-color: white;
     height: 30px;
-    width: 75px;
+    width: 100px;
     border: 1px solid #F3F3F3 !important;
 }
 
@@ -90,4 +90,4 @@
 
 .more-button {
 
-}
+}

src/pages/my/order/display/index.js

@@ -128,11 +128,11 @@ class DisplayRender extends Component {
         let content = orderStatus === '0' ? '需付款' : '实付款'
 
         return (
-            <div className={classNames({'content-wrap': button})}>
+            <div className={classNames({'content-wrap': button})} style={{height: window.innerHeight - 45}}>
                 {
                     data.length === 0 ?
                         <div className='order-tip-wrap'>
-                            <div className='order-tip'>还没有这种订单</div>
+                            <div className='order-tip'>暂无此类订单</div>
                         </div>
                         :
                         data.map(order => (
@@ -251,7 +251,7 @@ const ButtonGroupRender = (props) => {
                 <div className='order-card-button-group'>
                     <Button size="small" className='ship-button order-button' onClick={() => {
                       message.success('已提醒')
-                    }}>催发货</Button>
+                    }}>提醒发货</Button>
                 </div>
             )
         case '2':
@@ -282,4 +282,4 @@ export default withRouter(Display)
 export {
     DisplayRender,
     ButtonGroupRender
-}
+}

src/pages/my/profile/index.css

@@ -0,0 +1,13 @@
+.user-update {
+    position: fixed;
+    bottom: 0;
+    width: 100%;
+    text-align: center;
+    font-size: 16px;
+    border-top: 1px solid #F3F3F3;
+    height: 50px;
+    line-height: 50px;
+    box-shadow: 3px -1px 1px #ebedf0;
+    background-color: #f44;
+    color: white;
+}

src/pages/my/profile/index.js

@@ -1,7 +1,7 @@
 import React, {Component} from 'react'
 import './index.css'
 import {message} from 'antd'
-import {NavBar, Icon, InputItem, List, Button, ActivityIndicator} from 'antd-mobile'
+import {NavBar, Icon, InputItem, List, ActivityIndicator} from 'antd-mobile'
 import {withRouter} from 'react-router-dom'
 import {Mutation} from "react-apollo"
 import {request} from 'graphql-request'
@@ -85,7 +85,7 @@ class Profile extends Component {
                     <div>联系电话</div>
                   </InputItem>
                 </List>
-                <Button onClick={() => {
+                <div className='user-update' onClick={() => {
                   const testPhoneNum = /^1[0-9]{10}$/;
                   const isPoneAvailable = testPhoneNum.test(telephone);
                   if(isPoneAvailable && telephone !== oldTelephone){
@@ -104,7 +104,7 @@ class Profile extends Component {
                   }else {
                     message.warning('请输入11位有效手机号码',1)
                   }
-                }}>确认</Button>
+                }}>确认</div>
               </div>
             )
           }}