Merge remote-tracking branch 'origin/dev' into dev

src/frontend/views/home/video.php

@@ -11,7 +11,9 @@ $js = <<<JS
  window._bd_share_config = {
         "common": {
             "bdSnsKey": {},
-            "bdText": "",
+            "bdText": "{$coursewareInfo['courseName']}-{$coursewareInfo['className']}",
+            "bdDesc":"",
+            "bdPic":"{$coursewareInfo['previewUrl']}",
             "bdMini": "1",
             "bdMiniList": ["qzone", "tsina", "weixin"],
             "bdPic": "",
@@ -19,7 +21,7 @@ $js = <<<JS
             "bdSize": "24"
         }, "share": {}
     };
-    with (document)0[(getElementsByTagName('head')[0] || body).appendChild(createElement('script')).src = 'http://bdimg.share.baidu.com/static/api/js/share.js?v=89860593.js?cdnversion=' + ~(-new Date() / 36e5)];
+	with(document)0[(getElementsByTagName('head')[0]||body).appendChild(createElement('script')).src='http://bdimg.share.baidu.com/static/api/js/share.js?cdnversion='+~(-new Date()/36e5)];
 
 JS;
 

src/frontend/views/layouts/userCenter.php

@@ -19,7 +19,7 @@ $this->beginContent('@app/views/layouts/center.php');
         <ul class="simple-menu">
 
             <li <?= (Yii::$app->controller->id === 'user-center' and Yii::$app->controller->action->id === 'info') ? 'class = "active"' : '' ?>>
-                <a href="<?= $baseUrl . '/user-center' ?>"><i class="icon-person_pin"></i>基本信息</a>
+                <a href="<?= $baseUrl . '/user-center/' ?>"><i class="icon-person_pin"></i>基本信息</a>
             </li>
             <li <?= (Yii::$app->controller->id === 'user-center' and Yii::$app->controller->action->id === 'purchased-course') ? 'class = "active"' : '' ?>>
                 <a href="<?= $baseUrl . '/user-center/purchased-course' ?>"><i