Merge branch 'develop' of git.yoho.cn:fe/yohoblk-wap into develop

@@ -114,12 +114,11 @@ const component = {
         res.render('feedback', {
         res.render('feedback', {
             module: 'me',
             module: 'me',
             page: 'feedback',
             page: 'feedback',
-            suggestSub: true,
             noLocalCSS: true
             noLocalCSS: true
         });
         });
     },
     },
     saveFeedback: (req, res, next) => {
     saveFeedback: (req, res, next) => {
-        let saveFeedbackPara = {
+        const saveFeedbackPara = {
             uid: req.user.uid,
             uid: req.user.uid,
             udid: req.sessionID,
             udid: req.sessionID,
             content: req.body.content,
             content: req.body.content,

@@ -139,7 +139,7 @@ exports.getHelpDetail = (data) => {
  * @param data
  * @param data
  */
  */
 exports.saveFeedback = (data) => {
 exports.saveFeedback = (data) => {
-    return serviceAPI.post('/suggest/api/v1/suggest/saveSuggest', data).then(result => {
+    return serviceAPI.post('suggest/api/v1/suggest/saveSuggest', data).then(result => {
         return {
         return {
             code: result.code,
             code: result.code,
             message: result.message
             message: result.message

 <div class="yoho-suggest-sub-page yoho-page">
 <div class="yoho-suggest-sub-page yoho-page">
-    {{# suggestSub}}
     <div class="suggest-sub-form">
     <div class="suggest-sub-form">
         <textarea name="" id="suggest-textarea" placeholder="请写下对于BLK的意见和建议，我们将及时根据您的意见作出改进"></textarea>
         <textarea name="" id="suggest-textarea" placeholder="请写下对于BLK的意见和建议，我们将及时根据您的意见作出改进"></textarea>
     </div>
     </div>
-    {{/ suggestSub}}
 </div>
 </div>
 <style>
 <style>
     html,
     html,

@@ -23,7 +23,9 @@ function tip(param) {
     };
     };
 
 
     if (typeof param === 'string') {
     if (typeof param === 'string') {
-        $.extend(viewData, { txt: param });
+        $.extend(viewData, {
+            txt: param
+        });
     } else {
     } else {
         $.extend(viewData, param);
         $.extend(viewData, param);
     }
     }

@@ -19,6 +19,7 @@ $(() => {
             return;
             return;
         }
         }
 
 
+        $('#suggest-textarea').blur();
         $.ajax({
         $.ajax({
             type: 'post',
             type: 'post',
             url: '/me/save-feedback',
             url: '/me/save-feedback',
@@ -28,6 +29,9 @@ $(() => {
         }).then(function(data) {
         }).then(function(data) {
             if (data.code === 200) {
             if (data.code === 200) {
                 tip('提交成功');
                 tip('提交成功');
+                setTimeout(() => {
+                    yoho.goBack();
+                }, 2000)
             } else {
             } else {
                 tip('提交失败~');
                 tip('提交失败~');
             }
             }

@@ -19,7 +19,7 @@
             max-height: 255px;
             max-height: 255px;
             min-height: 255px;
             min-height: 255px;
             padding: 30px;
             padding: 30px;
-            font-size: 26px;
+            font-size: 30px;
             line-height: 48px;
             line-height: 48px;
             color: #000;
             color: #000;
             display: block;
             display: block;

@@ -15,7 +15,7 @@
             <div class="bottom clearfix">
             <div class="bottom clearfix">
                 <span class="icon time-icon">&#xe612;</span>
                 <span class="icon time-icon">&#xe612;</span>
                 <span class="time">{{editorial.publishTime}}</span>
                 <span class="time">{{editorial.publishTime}}</span>
-                <span class="icon icon-share share" @click="share(editorial.title, editorial.intro, editorial.src, editorial.share.url)"></span>
+                <span class="icon icon-share share" @click="share(editorial.title, editorial.intro, editorial.src, editorial.id)"></span>
             </div>
             </div>
         </div>
         </div>
     </div>
     </div>
@@ -119,12 +119,20 @@
             },
             },
 
 
             /* 分享资讯 */
             /* 分享资讯 */
-            share(title, des, img, url) {
+            share(title, des, img, id) {
                 yoho.goShare({
                 yoho.goShare({
                     title: title,
                     title: title,
                     des: des,
                     des: des,
-                    img: img,
-                    url: url
+                    img: img.replace(/(\{width}|\{height}|\{mode})/g, ($0) => {
+                        let dict = {
+                            '{width}': 300,
+                            '{height}': 300,
+                            '{mode}': 2
+                        };
+
+                        return dict[$0];
+                    }),
+                    url: `//m.yohoblk.com/editorial/${id}.html`
                 });
                 });
             }
             }
         },
         },

@@ -99,7 +99,8 @@
                         };
                         };
 
 
                         return dict[$0];
                         return dict[$0];
-                    })
+                    }),
+                    url: `//m.yohoblk.com/editorial/${this.article.id}.html`
                 });
                 });
             }
             }
         },
         },