Merge pull request #313 from Silence-WWT/develop

Develop
silencewwt · Dec 12, 2015 · d84e0dc · d84e0dc
2 parents ea6646b + 556253e
commit d84e0dc
Show file tree

Hide file tree

Showing 28 changed files with 59 additions and 46 deletions.
diff --git a/app/static/img/user/nav_05_01.jpg b/app/static/img/user/nav_05_01.jpg
diff --git a/app/static/js/user/404.bundle.js b/app/static/js/user/404.bundle.js
diff --git a/app/static/js/user/About.bundle.js b/app/static/js/user/About.bundle.js
diff --git a/app/static/js/user/Brand.bundle.js b/app/static/js/user/Brand.bundle.js
diff --git a/app/static/js/user/Brands.bundle.js b/app/static/js/user/Brands.bundle.js
diff --git a/app/static/js/user/Compare.bundle.js b/app/static/js/user/Compare.bundle.js
diff --git a/app/static/js/user/Detail.bundle.js b/app/static/js/user/Detail.bundle.js
diff --git a/app/static/js/user/Furniture.bundle.js b/app/static/js/user/Furniture.bundle.js
diff --git a/app/static/js/user/Home.bundle.js b/app/static/js/user/Home.bundle.js
diff --git a/app/static/js/user/Login.bundle.js b/app/static/js/user/Login.bundle.js
diff --git a/app/static/js/user/Profile.bundle.js b/app/static/js/user/Profile.bundle.js
diff --git a/app/static/js/user/ResetPassword.bundle.js b/app/static/js/user/ResetPassword.bundle.js
diff --git a/app/static/js/user/Search.bundle.js b/app/static/js/user/Search.bundle.js
diff --git a/app/static/js/user/SignedUp.bundle.js b/app/static/js/user/SignedUp.bundle.js
diff --git a/app/static/js/user/commons.bundle.js b/app/static/js/user/commons.bundle.js
diff --git a/app/templates/user/404.html b/app/templates/user/404.html
@@ -31,6 +31,7 @@
         s.parentNode.insertBefore(bp, s);
     })();
   </script>
+  <script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=sdp9qCbToS7E23nDRxaAAwbh"></script>
 </head>
 <body>
   <div id="wrap"></div>

diff --git a/app/templates/user/about.html b/app/templates/user/about.html
@@ -31,6 +31,7 @@
         s.parentNode.insertBefore(bp, s);
     })();
   </script>
+  <script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=sdp9qCbToS7E23nDRxaAAwbh"></script>
 </head>
 <body>
   <div id="wrap"></div>

diff --git a/app/templates/user/brand_detail.html b/app/templates/user/brand_detail.html
@@ -31,6 +31,7 @@
         s.parentNode.insertBefore(bp, s);
     })();
   </script>
+  <script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=sdp9qCbToS7E23nDRxaAAwbh"></script>
 </head>
 <body>
   <div id="content"></div>

diff --git a/app/templates/user/brands.html b/app/templates/user/brands.html
@@ -31,6 +31,7 @@
         s.parentNode.insertBefore(bp, s);
     })();
   </script>
+  <script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=sdp9qCbToS7E23nDRxaAAwbh"></script>
 </head>
 <body>
   <div id="content"></div>

diff --git a/app/templates/user/compare.html b/app/templates/user/compare.html
@@ -31,6 +31,7 @@
         s.parentNode.insertBefore(bp, s);
     })();
   </script>
+  <script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=sdp9qCbToS7E23nDRxaAAwbh"></script>
 </head>
 <body>
   <div id="content"></div>

diff --git a/app/templates/user/detail.html b/app/templates/user/detail.html
@@ -31,6 +31,7 @@
         s.parentNode.insertBefore(bp, s);
     })();
   </script>
+  <script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=sdp9qCbToS7E23nDRxaAAwbh"></script>
 </head>
 <body>
   <div id="content"></div>

diff --git a/app/templates/user/furniture.html b/app/templates/user/furniture.html
@@ -31,6 +31,7 @@
         s.parentNode.insertBefore(bp, s);
     })();
   </script>
+  <script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=sdp9qCbToS7E23nDRxaAAwbh"></script>
 </head>
 <body>
   <div id="content"></div>

diff --git a/app/templates/user/index.html b/app/templates/user/index.html
@@ -31,6 +31,7 @@
         s.parentNode.insertBefore(bp, s);
     })();
   </script>
+  <script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=sdp9qCbToS7E23nDRxaAAwbh"></script>
 </head>
 <body>
   <div id="content"></div>

diff --git a/app/templates/user/login.html b/app/templates/user/login.html
@@ -31,6 +31,7 @@
         s.parentNode.insertBefore(bp, s);
     })();
   </script>
+  <script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=sdp9qCbToS7E23nDRxaAAwbh"></script>
 </head>
 <body>
 

diff --git a/app/templates/user/profile.html b/app/templates/user/profile.html
@@ -31,6 +31,7 @@
         s.parentNode.insertBefore(bp, s);
     })();
   </script>
+  <script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=sdp9qCbToS7E23nDRxaAAwbh"></script>
 </head>
 <body>
   <div id="content"></div>

diff --git a/app/templates/user/reset_password.html b/app/templates/user/reset_password.html
@@ -31,6 +31,7 @@
         s.parentNode.insertBefore(bp, s);
     })();
   </script>
+  <script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=sdp9qCbToS7E23nDRxaAAwbh"></script>
 </head>
 <body>
 

diff --git a/app/templates/user/search.html b/app/templates/user/search.html
@@ -31,6 +31,7 @@
       s.parentNode.insertBefore(bp, s);
     })();
   </script>
+  <script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=sdp9qCbToS7E23nDRxaAAwbh"></script>
 </head>
 <body>
 <div id="box"></div>

diff --git a/app/templates/user/signed_up.html b/app/templates/user/signed_up.html
@@ -31,6 +31,7 @@
         s.parentNode.insertBefore(bp, s);
     })();
   </script>
+  <script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=sdp9qCbToS7E23nDRxaAAwbh"></script>
 </head>
 <body>
-Original file line number
+Diff line change
@@ Expand Up / @@ -31,6 +31,7 @@ @@
             s.parentNode.insertBefore(bp, s);
         })();
       </script>
+      <script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=sdp9qCbToS7E23nDRxaAAwbh"></script>
     </head>
     <body>
@@ Expand Down @@