Kaynağa Gözat

修复预约小程序自适应的问题

wly 7 yıl önce
ebeveyn
işleme
bd4aad4cab

+ 9 - 4
package-lock.json

@@ -5875,7 +5875,8 @@
         },
         "ansi-regex": {
           "version": "2.1.1",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -6240,7 +6241,8 @@
         },
         "safe-buffer": {
           "version": "5.1.1",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -6288,6 +6290,7 @@
         "strip-ansi": {
           "version": "3.0.1",
           "bundled": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -6326,11 +6329,13 @@
         },
         "wrappy": {
           "version": "1.0.2",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.0.2",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         }
       }
     },

+ 1 - 1
src/case/OrderApp/src/App.js

@@ -2,7 +2,7 @@ import React, { Component } from 'react';
 
 import './App.css';
 
-import NavBars from './components/Common/NavBar'
+import NavBars from './components/App/NavBar'
 import TabBarBottom from './components/App/TabBarBottom'
 
 

+ 0 - 0
src/case/OrderApp/src/components/Common/NavBar.css → src/case/OrderApp/src/components/App/NavBar.css


+ 1 - 1
src/case/OrderApp/src/components/Common/NavBar.jsx → src/case/OrderApp/src/components/App/NavBar.jsx

@@ -18,7 +18,7 @@ export default class NavBars extends Component{
                     <Icon key="0" type="search" style={{ marginRight: '16px' }} />,
                     <Icon key="1" type="ellipsis" />,
                 ]}
-                ><span style={{fontSize:'14px'}}>电商小程序</span>
+                ><span style={{fontSize:'14px'}}>预约小程序</span>
                 </NavBar>
             </div>
         )

+ 0 - 4
src/case/OrderApp/src/components/App/TabBarBottom.css

@@ -1,7 +1,3 @@
-/* .TabBarBottom{
-    position: absolute;
-    bottom: 0;
-} */
 .subTitle{
     box-sizing: border-box;
     text-align: center;

+ 3 - 3
src/case/OrderApp/src/components/App/TabBarBottom.jsx

@@ -20,7 +20,7 @@ class TabBarBottom extends Component {
     if(page==='index'){
       //console.log(page)
       return (
-        <div style={{ backgroundColor: 'white', height: '100%', textAlign: 'center' }}>
+        <div className="pageWrap">
           <HomePage />
         </div>
       );
@@ -29,7 +29,7 @@ class TabBarBottom extends Component {
     if(page==='user'){
       //console.log(page)
       return (
-        <div style={{ backgroundColor: 'white', height: '100%', textAlign: 'center' }}>
+        <div className="pageWrap">
           <UserPage />
         </div>
       );
@@ -41,7 +41,7 @@ class TabBarBottom extends Component {
   render() {
     //这里渲染一次
     return (
-      <div style={this.state.fullScreen ? { position: 'fixed', height: '100%', width: '100%', top: 0 } : { height: 400 }} className="TabBarBottom">
+      <div style={this.state.fullScreen ? { position: 'absolute', height: '100%', width: '100%', bottom: 0 } : { height: 400 }} className="TabBarBottom">
         <TabBar
           unselectedTintColor="#949494"
           tintColor="#33A3F4"