Merge branch 'master' into release

Application/Home/View/default/layout.tpl

@@ -71,7 +71,7 @@
             language: (navigator.browserLanguage || navigator.language).toLowerCase()
         }
     </script>
-    <title>{:block name='title'}一键定制你的X50影像旗舰头像{:/block}</title>
+    <title>{:block name='title'}一键定制vivo X50系列头像{:/block}</title>
     {:if $projectId &&  strpos( $smarty.server.HTTP_HOST , 'dev.izhida.cn') !== false}
     <link rel="stylesheet" type="text/css" href="http://projectx.dev.izhida.cn/api/css/rem/{:$rem}/id/{:$projectId}?version={:$version}"
           media="all"/>
@@ -100,9 +100,9 @@
         window.num = '{:$num}';
 
         var link = location.origin;
-        var friend_title = '一键定制你的X50影像旗舰头像';
+        var friend_title = '一键定制vivo X50系列头像';
         var friend_desc = '超感光微云台，夜色更精彩';
-        var timeline_desc = '一键定制你的X50影像旗舰头像';
+        var timeline_desc = '一键定制vivo X50系列头像';
         window.wxFriendData = {
             'link': link,
             'imgUrl': link + '/Public/static/image2/share.jpg',