Merge branch 'dev'

appdotdot · Aug 25, 2016 · a2d9f76 · a2d9f76
2 parents 5f53686 + 1e2a00d
commit a2d9f76
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 6 deletions.
diff --git a/public/images/homePage/landlord.jpg b/public/images/homePage/landlord.jpg
diff --git a/public/src/components/OrderPage.js b/public/src/components/OrderPage.js
@@ -66,7 +66,7 @@ class OrderPage extends Component {
             </table>
           </div>
           <div style={{float: 'right', marginTop: '30px'}}>
-            <button className="btn btn-success btn-lg">提交订单</button>
+            <button className="btn btn-success">提交订单</button>
           </div>
         </div>
         <Footer/>

diff --git a/public/src/components/houseDetails/HouseDetails.js b/public/src/components/houseDetails/HouseDetails.js
@@ -70,6 +70,7 @@ export default class HouseDetails extends Component {
                 <div className="per">每晚</div>
               </div>
               <div className="start">
+                <span>入住日期：</span>
                 <select ref="startYear">
                   <option>2015年</option>
                   <option>2016年</option>
@@ -78,6 +79,7 @@ export default class HouseDetails extends Component {
                 <DaySelect ref="startDay"/>
               </div>
               <div className="end">
+                <span>离开日期：</span>
                 <select ref="endYear">
                   <option>2015年</option>
                   <option>2016年</option>
@@ -86,7 +88,18 @@ export default class HouseDetails extends Component {
                 <DaySelect ref="endDay"/>
               </div>
               <div className="subscribe">
-                <button>立即预订 ￥</button>
+                <Link to='/orderPage'>立即预订</Link>
+              </div>
+              <div className="landlord">
+                <img src="images/homePage/landlord.jpg" className="head-pic"/>
+              </div>
+              <div>
+                <div className="name">
+                  <span>shary</span>
+                  <p>
+                    <span>实名认证.个人房东</span>
+                  </p>
+                </div>
               </div>
             </div>
             <div>

diff --git a/public/src/index.js b/public/src/index.js
@@ -14,6 +14,7 @@ import LoginComponent from './components/LoginComponent';
 import HouseResource from './components/houseComponents/HouseResource';
 import HouseDetails from './components/houseDetails/HouseDetails';
 import Homepage from './components/Homepage';
+import OrderPage from './components/OrderPage';
 import UserGuide from './components/UserGuide';
 import {requestHouseList} from './actions/houselist';
 
@@ -35,6 +36,7 @@ render(
         <Route path="/houseDetail/:id" component={HouseDetails}/>
         <Route path="/houseResource/?city=:city" component={HouseResource}/>
         <Route path="/homepage" component={Homepage}/>
+        <Route path="/orderPage" component={OrderPage}/>
         <Route path="/userGuide" components={UserGuide}/>
       </Route>
     </Router>

diff --git a/public/style/index.css b/public/style/index.css
@@ -126,7 +126,7 @@ a {
 }
 
 .day-price {
-    width: 340px;
+    width: 290px;
     height:25px;
     text-align: center;
     margin: 10px 20px;
@@ -135,25 +135,45 @@ a {
 
 .body-right{
     float:right;
-    width:380px;
-    height:366px;
+    width:330px;
+    height:400px;
+    background-color:#d0e9c6;
+    margin-left: 10px;
 }
 
 .carousel{
-    width:550px;
+    width:600px;
     float:left;
 }
 .start {
     float: left;
+    width:290px;
     margin:10px 20px;
 }
 .end{
     float:left;
+    width:290px;
     margin:10px 20px;
 }
 .subscribe{
     text-align: center;
+    width: 290px;
+    margin:10px 20px;
+}
+
+.landlord{
+    text-align: center;
 }
+.head-pic{
+    height: 170px;
+    width: 140px;
+}
+
+.name{
+    margin: 10px 10px;
+    text-align: center;
+}
+
 /*hompage*/
 .header {
     width: 100%;