详情页面改造

src/views/merge-detail.vue

@@ -288,9 +288,11 @@ export default {
     let _this = this;
     this.from = this.$route.query.from || this.from || "native";
     this.projectId = this.$route.query.id || 1;
-    this.courseRequire = this.$route.query.courseRequire;
-    this.provinceId = this.$route.query && this.$route.query.provinceId || 0;
-    this.organizationId = this.$route.query && this.$route.query.organizationId || 0;
+
+    // 此两个参数将由接口返回
+    // this.courseRequire = this.$route.query.courseRequire;
+    // this.provinceId = this.$route.query && this.$route.query.provinceId || 0;
+    // this.organizationId = this.$route.query && this.$route.query.organizationId || 0;
 
     window.__getUserInfo64Comp = function(param) {
       // appVersion 安卓 3.2.2  iOS
@@ -798,17 +800,18 @@ export default {
 
           _this.provinceId = res.data.positionModel.provinceId;
           _this.organizationId = res.data.positionModel.organizationId;
+          _this.courseRequire = res.data.courseRequire || 0;
 
           setTimeout( () => {
-              cataOffsetTop = document.getElementById("catalogue-content").offsetTop;
-              intorOffsetTop = document.getElementById("intro-content").offsetTop;
-              console.log('getProjectParticularsV2', cataOffsetTop, intorOffsetTop);
-              // 直接跳转
-              if(_this.project.jumpToContents) {
-                setTimeout(() => {
-                  this.jumpCatalogue();
-                }, 200);
-              }
+            cataOffsetTop = document.getElementById("catalogue-content").offsetTop;
+            intorOffsetTop = document.getElementById("intro-content").offsetTop;
+            console.log('getProjectParticularsV2', cataOffsetTop, intorOffsetTop);
+            // 直接跳转
+            if(_this.project.jumpToContents) {
+              setTimeout(() => {
+                this.jumpCatalogue();
+              }, 200);
+            }
           }, 200);
           setTimeout(() => {
             _this.showLoading = false;

src/views/parent-page.vue

@@ -28,7 +28,6 @@
       <CommonTcPlayer v-if="bannerType == 2" style="flex" :options="videoOptions"></CommonTcPlayer>
       <CommonDescription :descTitle="projectName" :value="projectIntro"></CommonDescription>
       <CommonSpliteLine></CommonSpliteLine>
-      <!-- <CellListItem :paramData="contentList" :moduleName="moduleName"></CellListItem> -->
       <div v-if="visibleFlag == 1" class="project-num">共 {{ childrenList.length }} 个项目</div>
       <CoopListItem v-if="visibleFlag == 1" :paramData="childrenList" :coopType="1" :tabTo="3" :isShow="isShow"></CoopListItem>
       <NoPermContent v-if="visibleFlag == 2"></NoPermContent>
@@ -54,11 +53,7 @@ export default {
       from: "inner",
       isBlack: false,
       showLoading: false,
-      projectId: 1,
-      componentId: 1,
-      moduleId: 1,
       contentList: [],
-      moduleName: "",
       bannerType: 1,
       videoOptions: {
         mp4: "",
@@ -109,25 +104,17 @@ export default {
   created() {
     let _this = this;
     this.from = this.$route.query.from || this.from || "native";
-    this.projectId = this.$route.query.projectId;
-    this.componentId = this.$route.query.componentId;
-    this.moduleId = this.$route.query.moduleId;
-    this.moduleName = this.$route.query.moduleName;
     this.entryId = this.$route.query.entryId;
 
     window.__getUserInfo4Comp = function(param) {
       _this.token = param.userToken;
       _this.setUserInfo(param);
       _this.checkToken();
-      // _this.getContentList(_this.moduleId);
       
-      // _this.getComponentInfoById(_this.componentId);
       _this.getChildrenProject(_this.entryId);
     };
 
-    // this.getCoopInfo(this.projectId);
     window.__refresh = function() {
-    //   _this.getContentList(_this.moduleId);
       _this.getChildrenProject(_this.entryId);
     };
     _this.getUserInfo();
@@ -147,55 +134,13 @@ export default {
         __funcName: "__getUserInfo4Comp"
       });
       if (window.__isWeb && process.env.BUILD_ENV == "development") {
-        console.log('projectId',this.projectId);
         let param = {
           userToken: 'ED9F3381362641858B2B1F90C92A8050',
         };
         __getUserInfo4Comp(param);
       }
     },
-    // 获取单个模块信息
-    getComponentInfoById(componentId) {
-      let _this = this;
-      let param = {
-        componentId: componentId,
-        token: _this.userInfo.userToken,
-        setEntry: true
-      };
-      this.GET("portal/portalApp/component", param).then(res => {
-        if (res.code == "000000") {
-          _this.attachmentUrl = res.data.imageUrl;
-          _this.projectIntro = res.data.introduce;
-          _this.projectName = res.data.name;
-        }
-      });
-    },
 
-    // 获取单个项目信息
-    getCoopInfo(projectId) {
-      let _this = this;
-      let param = {
-        portalProjectId: projectId,
-        token: _this.userInfo.userToken,
-        setEntry: true
-      };
-      this.GET("portal/portalApp/queryProjectParticulars", param).then(res => {
-        if (res.code == "000000") {
-          // 先设置视频URL再显示视频组件  ------------    BEGIN
-          if (res.data.attachmentType == 2) {
-            _this.videoOptions.mp4 = res.data.attachmentUrl;
-          } else {
-            _this.attachmentUrl = res.data.attachmentUrl;
-          }
-          _this.bannerType = res.data.attachmentType;
-          // 先设置视频URL再显示视频组件  ------------    END
-
-          _this.projectIntro = res.data.projectIntro;
-          _this.projectName = res.data.projectName;
-          _this.pStatus = res.data.status;
-        }
-      });
-    },
     checkToken() {
       let _this = this;
       let param = {