Merge branch 'feature/tideCommand' into 'release/6.0.2'

潮流口令



See merge request !877

@@ -11,9 +11,7 @@ exports.tideCommand = (req, res, next) => {
         res.render('tide-command', {
             page: 'tide-command',
             pageHeader: headerModel.setNav({
-                navTitle: '我的潮流口令',
-                navBtn: false,
-                save: true
+                navTitle: '我的潮流口令'
             }),
             title: '我的潮流口令',
             width750: true,

@@ -2,6 +2,8 @@
     {{# invitionDta}}
     <div class="set-world">
         <textarea name="" class="command-textarea" id="command-textarea" placeholder="请设置15位字符以内的潮流口令">{{#if trendWord}}{{trendWord}}{{/if}}</textarea>
+
+        <div class="save">保存</div>
     </div>
     
     <span class="world-number">15</span>

@@ -66,12 +66,12 @@
                 var s = document.getElementsByTagName("script")[0];
                 s.parentNode.insertBefore(hm, s);
             })();
-            (function() {
+            {{!-- (function() {
                 var hm = document.createElement("script");
                 hm.src = "https://hm.baidu.com/hm.js?e5b83a487a4458aa5abca43f5779b764";
                 var s = document.getElementsByTagName("script")[0];
                 s.parentNode.insertBefore(hm, s);
-            })();
+            })(); --}}
 
             {{#if @root.isLogin}}
                 {{#if @root.isApp}}
@@ -83,13 +83,9 @@
         }, 1000);
     }());
 
-    {{!--/* tar add 170426 品众代码去除 */--}}
-    {{!--/* tar add 170601 品众代码恢复 */--}}
     window._fxcmd = window._fxcmd || [];
     _fxcmd.sid = 'bb3b16fa1106a6ab8619da0095755f32';
     _fxcmd.trackAll = false;
-    // 参数配置(可选)...
-    // 追踪配置(可选)...
 
     setTimeout(function() {
         var _pzfx = document['createElement']('script');

@@ -6,19 +6,33 @@
 
     .set-world {
         background-color: #fff;
+        padding-bottom: 20px;
     }
 
     .command-textarea {
         height: 130px;
         width: 690px;
-        font-size: 44px;
+        font-size: 42px;
         border: none;
         resize: none;
         background-color: #dfdfdf;
         margin: 20px 30px;
         border-radius: 10px;
+        padding: 15px 20px;
     }
 
+    .save {
+        width: 240px;
+        height: 80px;
+        line-height: 80px;
+        color: #fff;
+        background-color: #414141;
+        text-align: center;
+        margin: 0 auto;
+        border-radius: 10px;
+    }
+ 
+
     .world-number {
         position: absolute;
         font-size: 24px;