Merge pull request 'develop' (#1) from develop into test

Reviewed-on: http://gitea.qinglakeji.com:3000/develop/jiajia-h5/pulls/1

css/common.css

@@ -51,7 +51,7 @@
 .header{
     position: relative;
     height: 105px;
-    background-color: pink;
+    /* background-color: pink; */
 }
 .logo{
     position: absolute;

index.html

@@ -4,7 +4,7 @@
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>品优购商城-网上购物商城</title>
+    <title>shopping商城-网上购物商城</title>
     <meta name="description" content="品优购商城-专业的综合网上购物商城,销售家电、数码通讯、电脑、
 家居百货、服装服饰、母婴、图书、食品等数万个品牌优质商品.便捷、诚信的服务，为您提供愉悦的网上购物
 体验!" />
@@ -25,7 +25,7 @@
              <div class="fl">
                  <ul>
                      <li>品优购欢迎您! &nbsp;</li>
-                     <li><a href="#"> 请登录</a><a href="#" class="style_red">&nbsp;欢迎注册</a></li>
+                     <li><a href="#"> 请登录</a><a href="regisiter.html" class="style_red">&nbsp;欢迎注册</a></li>
                  </ul>
              </div>
              <div class="fr">   
@@ -226,10 +226,10 @@
           </div>
           <div class="recom_bd">
               <ul>
-                  <li><a href="#"><img src="upload/recom_03.jpg" alt=""></a></li>
-                  <li><a href="#"><img src="upload/recom_03.jpg" alt=""></a></li>
-                  <li><a href="#"><img src="upload/recom_03.jpg" alt=""></a></li>
-                  <li><a href="#"><img src="upload/recom_03.jpg" alt=""></a></li>
+                  <li><a href="list.html"><img src="upload/recom_03.jpg" alt=""></a></li>
+                  <li><a href="list.html"><img src="upload/recom_03.jpg" alt=""></a></li>
+                  <li><a href="list.html"><img src="upload/recom_03.jpg" alt=""></a></li>
+                  <li><a href="list.html"><img src="upload/recom_03.jpg" alt=""></a></li>
               </ul>
           </div>
       </div>

regisiter.html

@@ -12,7 +12,7 @@
     <div class="w">
         <header>
             <div class="logo">
-                <a href="#"><img src="images/logo.png" alt=""></a>
+                <a href="index.html"><img src="images/logo.png" alt=""></a>
                 
             </div>
         </header>