Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop

@@ -303,6 +303,7 @@ $basicBtnC:#eb0313;
         font-size: pxToRem(24px);
         font-size: pxToRem(24px);
         float: right;
         float: right;
         color: #d0021b;
         color: #d0021b;
+        margin-right: 1.4rem;
         h1 {
         h1 {
             display: inline-block;
             display: inline-block;
             line-height: pxToRem(88px);
             line-height: pxToRem(88px);

@@ -12,10 +12,10 @@
         <script src="http://static.buy.test.yoho.cn/dist/yohobuy/{{version}}/index-debug.js"></script>
         <script src="http://static.buy.test.yoho.cn/dist/yohobuy/{{version}}/index-debug.js"></script>
     {{/if}}
     {{/if}}
     {{#if devEnv}}
     {{#if devEnv}}
-        <script src="http://localhost:8000/static/js/sea.js?nowrap"></script>
+        <script src="http://localhost:8001/static/js/sea.js?nowrap"></script>
         <script>
         <script>
             seajs.config({
             seajs.config({
-                base: 'http://localhost:8000/'
+                base: 'http://localhost:8001/'
             });
             });
         </script>
         </script>
     {{/if}}
     {{/if}}

@@ -56,7 +56,7 @@ gulp.task('compass-watch', function() {
 
 
 // start spm server
 // start spm server
 gulp.task('spm-doc', function() {
 gulp.task('spm-doc', function() {
-    var sd = cp.exec('spm doc');
+    var sd = cp.exec('spm doc watch --port 8001'); // pc用8001，h5用8000, 跑两个服务器，不冲突
 
 
     // sd.stdout.on('data', function(data) {
     // sd.stdout.on('data', function(data) {
     //     console.log(data);
     //     console.log(data);