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

src/frontend/web/js/home/components/video-intro.vue

@@ -12,9 +12,9 @@
                     <small>{{coursewareInfo.comment_count}}</small>
                 </div>
             </div>
-            <!--<div v-if="coursewareInfo.isGuest" class="comment-login">
+            <div v-if="coursewareInfo.isGuest" class="comment-login">
                 需要 <a @click="login" href="javascript:;">登录</a> 才能评论
-            </div>-->
+            </div>
             <div v-else class="comment-box">
 
                 <div class="comment-input">
@@ -24,21 +24,27 @@
 
                     <div v-if="coursewareInfo.isGuest" class="comment-foot clearfix">
 
-                        <div class="comment-head pull-left" >
+                        <div class="comment-head pull-left">
                             <span>需要 <a @click="login" href="javascript:;">登录</a> 才能评论</span>
                         </div>
 
-                        <button @click="comment" class="btn btn-info pull-right m-t-10 m-r-10" disabled="disabled">发表评论</button>
+                        <button @click="comment" class="btn btn-info pull-right m-t-10 m-r-10" disabled="disabled">
+                            发表评论
+                        </button>
                     </div>
 
                     <div v-else class="comment-foot clearfix">
 
-                        <div class="comment-head pull-left" >
+                        <div class="comment-head pull-left">
                             <img :src="coursewareInfo.userAvatar">
                         </div>
 
-                        <button v-if="!coursewareInfo.isPreview" @click="comment" class="btn btn-primary pull-right m-t-10 m-r-10">发表评论</button>
-                        <button v-else="!coursewareInfo.isPreview"  class="btn btn-primary pull-right m-t-10 m-r-10">发表评论</button>
+                        <button v-if="!coursewareInfo.isPreview" @click="comment"
+                                class="btn btn-primary pull-right m-t-10 m-r-10">发表评论
+                        </button>
+                        <button v-else="!coursewareInfo.isPreview" class="btn btn-primary pull-right m-t-10 m-r-10">
+                            发表评论
+                        </button>
 
                     </div>
 

src/frontend/web/js/user-center/conponents/info.vue → src/frontend/web/js/user-center/components/info.vue

 <template>
-    <div id="edit-container" class="add-box" v-if="showEdit">
-        <div class="add-box-main">
-            <div class="tit">个人信息</div>
+    <div>
+        <div id="edit-container" class="add-box" v-if="showEdit">
+            <div class="add-box-main">
+                <div class="tit">个人信息</div>
 
-            <avatar-upload  :avatar="avatarsrc" :uptoken="publicToken"></avatar-upload>
+                <avatar-upload  :avatar="avatarsrc" :uptoken="publicToken"></avatar-upload>
 
-            <input id="avatar" type="hidden"
-                   v-model="avatar">
+                <input id="avatar" type="hidden"
+                       v-model="avatar">
 
 
-            <div class="type-name">
-                <input id="username" type="text"
-                       v-model="username"
-                       placeholder="请输入您的昵称...">
-            </div>
+                <div class="type-name">
+                    <input id="username" type="text"
+                           v-model="username"
+                           placeholder="请输入您的昵称...">
+                </div>
 
-            <div class="btn-box m-t-20">
-                <button @click="cancel"  class="btn btn-nobg">取消
-                </button>
-                <button @click="save" id="save" class="btn btn-save m-l-10">保存</button>
+                <div class="btn-box m-t-20">
+                    <button @click="cancel"  class="btn btn-nobg">取消
+                    </button>
+                    <button @click="save" id="save" class="btn btn-save m-l-10">保存</button>
+                </div>
             </div>
         </div>
-    </div>
 
 
-    <div v-if="!showEdit" id="normal-container" class="add-box">
-        <div class="add-box-main">
-            <div class="tit">个人信息</div>
+        <div v-if="!showEdit" id="normal-container" class="add-box">
+            <div class="add-box-main">
+                <div class="tit">个人信息</div>
 
-            <div class="upload-avatar">
-                <img id="avatar-uploader"
-                     :src="avatarsrc">
-            </div>
-            <div class="type-name m-b-20">{{username}}</div>
+                <div class="upload-avatar">
+                    <img id="avatar-uploader"
+                         :src="avatarsrc">
+                </div>
+                <div class="type-name m-b-20">{{username}}</div>
 
-            <a @click="showEdit=true" id="edit" href="javascript:;" class="edit-info"><i class="icon-mode_edit"></i></a>
+                <a @click="showEdit=true" id="edit" href="javascript:;" class="edit-info"><i class="icon-mode_edit"></i></a>
 
+            </div>
         </div>
     </div>
 </template>

src/frontend/web/js/user-center/info.js

@@ -2,7 +2,7 @@
  * Created by xiabin on 2016/9/29.
  */
 var Vue = require('vue');
-var info = require('./conponents/info.vue');
+var info = require('./components/info.vue');
 new Vue({
     el:'#user-center-info-container',
     components: {

src/frontend/web/package.json

@@ -27,8 +27,8 @@
     "style-loader": "^0.13.0",
     "url-loader": "^0.5.7",
     "expose-loader": "^0.7.1",
-    "vue-hot-reload-api": "^2.0.6",
-    "vue-loader": "^10.0.0",
+    "vue-hot-reload-api": "^1.2.0",
+    "vue-loader": "^9.4.0",
     "expose": "^0.1.4",
     "jsx-loader": "^0.13.2",
     "file-loader": "^0.8.5",
@@ -44,6 +44,6 @@
     "moment": "^2.13.0",
     "simditor": "^2.3.6",
     "video.js": "^5.11.9",
-    "vue": "^2.0.8"
+    "vue": "^2.0.1"
   }
 }