Merge branch 'dev-advert-0629' into 'release'

cme项目添加广告位 code reviewer：李祎



See merge request !13

config/index.js

@@ -23,7 +23,7 @@ module.exports = {
             NODE_ENV: '"development"',
             BUILD_ENV: '"' + process.env.BUILD_ENV + '"'
         },
-        port: 8009,
+        port: 8020,
         assetsSubDirectory: 'static',
         assetsPublicPath: '/',
         // proxyTable: {
@@ -35,7 +35,7 @@ module.exports = {
         context: [ //代理路径
             '/test'
         ],
-        proxypath: 'http://localhost:9000',
+        proxypath: 'http://localhost:9009',
         cssSourceMap: true
     }
 }
\ No newline at end of file

src/components/business/cell-list-detail.vue

@@ -64,8 +64,8 @@
       <!-- <div v-if="index+1 < projectComponent.length" class="line-component"></div> -->
     </div>
     <!-- <NoMoreContent v-if="detailNum > 9" /> -->
-    <NoMoreContent />
-    <div v-if="detailNum <= 9" class="no-more-bottom"></div>
+    <!-- <NoMoreContent />
+    <div v-if="detailNum <= 9" class="no-more-bottom"></div> -->
     <van-dialog
       v-model="dialogState"
       title="标题"

src/components/common/common-advert-img.vue

+<template>
+  <div class="common-adert-wrapper">
+    <img :class="{'margin-top-20': needPadTop}" v-if="showInfo.imageUrl" @click="jumpPage" :src="showInfo.imageUrl" alt="">
+  </div>
+</template>
+<script>
+import { EMLINK } from 'constants';
+export default {
+  name: 'common-title',
+  data() {
+    return {
+      showInfo: {
+        imageUrl: '',
+        jumpUrl: ''
+      }
+    };
+  },
+  props: {
+    advertInfoList: {
+      type: Array,
+      default: () => []
+    },
+    position: {
+      type: String | Number,
+      default: 0
+    },
+    needPadTop: {
+      type: Boolean,
+      default: false
+    }
+  },
+  watch: {
+    advertInfoList: {
+      handler (list) {
+        list.forEach(element => {
+          if(element.position == this.position) {
+            this.showInfo = element;
+          }
+        });
+      },
+      deep: true
+    }
+  },
+  created() {},
+  mounted() {
+
+  },
+  computed: {
+    
+  },
+  methods: {
+
+    // 广告位跳转
+    jumpPage() {
+      let paramList = [
+        {
+          key: "pageUrl",
+          value: this.showInfo.jumpUrl,
+          type: 4,
+          seqNo: 1
+        }
+      ]
+      rocNative.dispatchEventByModuleCode({
+        modeCode: "M300",
+        jsonString: paramList
+      });      
+    }
+  }
+};
+</script>
+<style lang="scss" scoped>
+@import "../../style/mixin";
+.common-adert-wrapper {
+  img {
+    width: 100%;
+    // padding: px2rem(10px) 0;
+    // height: px2rem(60px);
+  }
+  .margin-top-20 {
+    margin-top: px2rem(20px);
+  }
+}
+</style>

src/views/merge-detail.vue

@@ -31,6 +31,10 @@
         :studyNum="project.studyNum"
         :subject="project.subject"
       />
+      <CommonAdertImg
+        :advertInfoList="advertInfoList"
+        position="0"
+      />
       <!-- 步骤条 -->
       <div v-if="project.cmeType != 2">
         <CmeStep
@@ -90,6 +94,15 @@
           />
         </div>
       </div>
+
+      <CommonAdertImg
+        needPadTop
+        :advertInfoList="advertInfoList"
+        position="1"
+      />
+      <NoMoreContent />
+      <div v-if="detailNum <= 9" class="no-more-bottom"></div>
+
     </div>
     <!-- 弹框 -->
     <CommonDialog
@@ -140,6 +153,8 @@ import TeacterIntro from "@/components/cme/teacter-intro";
 import CommonDialog from "@/components/cme/common-dialog";
 import ExjumperDialog from "@/components/cme/exjumper-dialog";
 import ExjumperButton from "@/components/cme/exjumper-button";
+import NoMoreContent from "@/components/business/no-more-content";
+import CommonAdertImg from "@/components/common/common-advert-img";
 
 import { getWebPageUrl, gotoPage } from "@/utils/index";
 import { mapGetters, mapActions } from "vuex";
@@ -241,6 +256,7 @@ export default {
       cardInfo: {
         id: 0
       },
+      advertInfoList: [],
     };
   },
   components: {
@@ -259,7 +275,9 @@ export default {
     CommonDialog,
     ExjumperButton,
     ExjumperDialog,
-    CardPopup
+    CardPopup,
+    CommonAdertImg,
+    NoMoreContent
   },
 
   computed: {
@@ -270,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
@@ -305,6 +325,9 @@ export default {
       param.setEntry = true;
       _this.getProvinceIdByPosition(param);
     }
+
+    // 调用广告位接口
+    this.getAdvertInfoList();
   },
   mounted() {
     window.addEventListener("scroll", this.scrollFun);
@@ -316,6 +339,19 @@ export default {
   methods: {
     ...mapActions(["setUserInfo"]),
 
+    // 查询教培项目广告位配置信息
+    getAdvertInfoList() {
+      let param = {
+        setEntry: true
+      };
+      this.GET(`portal/jump/${this.projectId}/1`, param).then(res => {
+        if (res.code == "000000") {
+          this.advertInfoList = res.data && res.data.list || [];
+          console.log('advertInfoList', this.advertInfoList);
+        }
+      });
+    },
+
     // 点击弹层
     clickOverlay() {
       console.log('clickOverlay');
@@ -757,21 +793,25 @@ export default {
 
           // TODO    Add by Anndy Yang
           if (_this.project.currentProgress == 2) {
-            this.$nextTick(() => {
+            _this.$nextTick(() => {
               window.scrollTo(0, 0);
             });
           }
 
+          _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;
@@ -957,4 +997,9 @@ export default {
     }
   }
 }
+.no-more-bottom {
+  position: relative;
+  width: 100%;
+  height: px2rem(40px);
+}
 </style>

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 = {