解决冲突

src/views/course/Courseware.vue

@@ -267,7 +267,8 @@ export default {
   data() {
     return {
       resOwnerListMap: [],
-      fileBaseUrl: process.env.VUE_APP_FILE_BASE_URL,
+      //fileBaseUrl: process.env.VUE_APP_FILE_BASE_URL,
+      fileBaseUrl:this.$xpage.constants.fileBaseUrl, //获成动态获取的处理
       getType: getType,
       loading: false,
       defaultProps: {

src/views/portal/course/Detail.vue

@@ -82,7 +82,10 @@
                         <div class="title">{{item.section.name}}</div>
                         <div class="subnode" v-for="(it,itIdx) in item.contents" :key="it.id">
                           <div class="sub-title">
-                            <div class="tip"><span class="tip-type">{{getType(it.contentType)}}</span>{{it.contentName}}</div>
+                            <div class="tip">
+                              <span class="tip-type">{{getType(it.contentType)}}</span>
+                              <a :href="'studyindex?id='+it.courseId+'&contentId='+it.id"> {{it.contentName}}</a>
+                              </div>
                           </div>
                         </div>
                       </div>

src/views/study/coursenew.vue

@@ -392,6 +392,7 @@
     mounted() {
       this.$watermark.set(this.userInfo.name + this.userInfo.loginName);
       this.courseId = this.$route.query.id;
+      this.initContentId = this.$route.query.contentId;
       this.loadData();
       //console.log(this.$xpage.constants.fileBaseUrl,'this.$xpage.constants.fileBaseUrl');
     },