Merge branch 'master' of codeup.aliyun.com:6265f483e4166464dc2f9c14/boeu/portal into online

src/components/PdfPreview/view.vue

@@ -1,5 +1,5 @@
 <template><!--pdf连接分页处理-->
-  <div class="pdf-perView" id="pdf-perView">
+  <div class="pdf-perView" id="pdf-perView" v-loading="loading"  element-loading-text="加载中">
     <div class="pdf-box">
       <transition name="progress">
         <el-progress v-if="showProgress" :percentage="Math.floor(loadedRatio * 100)" :text-inside="true" :show-text="false"></el-progress>
@@ -30,16 +30,6 @@
       <!-- <el-button type="primary" @click="clickMore()" >加载更多</el-button> -->
       <span class="pag-text" @click="clickMore()" style="cursor: pointer;">加载更多</span>
     </div>
-    <!-- <div v-if="likeBox" class="xcontent postfixt-bot">
-      <div class="postfixt-bot-box">
-        <div style="display:inline-block">
-           <interactBar  :data="data" :type="3" :comments="false" :shares="true"></interactBar>
-        </div>
-        <div style="display:inline-block;margin: 0 20px;">
-          <el-button type="primary" @click="goTop()">返回顶部</el-button>
-        </div>
-      </div>
-    </div> -->
   </div>
 </template>
 
@@ -64,6 +54,7 @@ export default {
   },
   data() {
     return {
+      loading:false,
       src: "",
       showPages: undefined,
       totalPages:0,
@@ -79,6 +70,7 @@ export default {
   mounted() {
       // /case/demo.pdf
       if(this.filePath){
+        this.loading = true;
         this.loadInitPdf(this.filePath);
       }
       window.addEventListener(
@@ -129,6 +121,7 @@ export default {
         let loadingTask = pdf.createLoadingTask(url);
         this.src=loadingTask;
         loadingTask.promise.then((pdf) =>{
+            this.loading = false;
             this.totalPages=pdf.numPages;
             if(pdf.numPages>this.initNum){
               this.showPages = this.initNum;
@@ -136,6 +129,7 @@ export default {
               this.showPages =pdf.numPages;
             }
           }).catch((err) =>{
+            this.loading = false;
             this.$message.error("加载内容失败,请联系管理员");
           });
     },
@@ -157,15 +151,7 @@ export default {
       if(this.isscroll){
         this.showPages++
         this.moreState = 2;
-          // this.debounce(this.loadInitPdf($this.filePath),5000);
-          //  this.debounce(,200000);
       }
-
-        //  if(scrollTop > 400) {
-        //   document.querySelector('#articleAnking').style.cssText = "position: fixed;top: 0;width:242.5px";
-        // } else {
-        //   document.querySelector('#articleAnking').style.cssText = "position: static";
-        // }
   },
     debounce(func, wait) {// 非立即执行
     let timeout;

src/components/Portal/interactBar.vue

@@ -459,7 +459,6 @@ export default {
         }
     },
     submitShare(){
-
       if(this.shareUsers.length==0){
         this.$message.error('请选择分享人');
         return;
@@ -472,7 +471,7 @@ export default {
       let postData={
         objType:this.type,
         objId:this.data.id,
-        content:'',
+        content:this.data.title,
         isRead:false,
         toAid:'',
         toAname:'',

src/views/Index.vue

@@ -369,7 +369,6 @@ export default {
     };
   },
   mounted() {
-    //console.log(this.$Constants.fileBaseUrl,'fileBaseUrl地址');
     this.getCourseData(1);
     this.getCaseData();
     this.getArticleData();
@@ -380,7 +379,6 @@ export default {
      window.open('https://m.qingxuetang.com/x/?appId=qxtcorp306130','_blank');
     },
     toCourseDetail(item) {
-
       if (item.type == 10) {
         return this.webBaseUrl + '/course/micro?id=' + item.id;
       } else if (item.type == 20) {

src/views/case/ManageList.vue

@@ -351,7 +351,7 @@ export default {
       };
     },
     viewTopic(data) {
-      window.open(this.webBaseUrl+'/case/detail?id='+data.id, '_blank');
+        this.$router.push({path:'/case/detail',query:{id:data.id}})
     }
   }
 };

src/views/course/ManageList.vue

@@ -203,8 +203,8 @@
     <el-dialog title="二维码" center :visible.sync="qrcodeShow" @close="closeCode" width="500px">
       <div style="height:250px;display: flex;flex-direction:column;justify-content: space-evenly;align-items: center;">
         <div id="qrcode" ref="qrcode"></div>
-        <el-input v-model="qrcode"></el-input>
+        <el-input v-model="pcDetailUrl" id="text"></el-input>
-        <el-button type="primary" size="mini">复制链接</el-button>
+        <el-button type="primary" size="mini" @click="myCopy()">复制链接</el-button>
       </div>
 
       <span slot="footer" class="dialog-footer">
@@ -330,6 +330,7 @@ export default {
       manageStudyData: {},
       expandDetails: true,
       qrcode: '',
+      pcDetailUrl:'',
       isExamine: 1,
       auditInfo: {
         pass: true,
@@ -397,6 +398,11 @@ export default {
 
   },
   methods: {
+    myCopy(){
+      var ele = document.getElementById("text");
+      ele.select();
+      document.execCommand("Copy");
+    },
     inputOn() {
       this.$forceUpdate();
     },
@@ -663,9 +669,16 @@ export default {
       this.qrcodeShow = true;
       
       let urlPre=window.location.protocol+'//'+window.location.host;
-      this.qrcode = urlPre+'/mobile/pages/resource/microDetail?id='+row.id;
+      
+      //动态的地址
+      //urlPre=urlPre+'/m?returnUrl='+urlPre+'/mobile/pages/login/loading?returnUrl=';
+      //固定的地址
+      let mobilePre='https://u.boe.com/m?returnUrl=https://u.boe.com/mobile/pages/login/loading?returnUrl=';
+      this.qrcode = mobilePre+'/pages/resource/microDetail?id='+row.id;
+      this.pcDetailUrl=urlPre+this.webBaseUrl+'/course/micro?id='+row.id;
       if(row.type==20){
-        this.qrcode = urlPre+'/mobile/pages/resource/courseDetail?id='+row.id;
+        this.qrcode = mobilePre+'/pages/resource/courseDetail?id='+row.id;
+        this.pcDetailUrl=urlPre+this.webBaseUrl+'/course/detail?id='+row.id;
       }
 
       // 使用$nextTick确保数据渲染

src/views/portal/course/Detail.vue

@@ -231,8 +231,9 @@ export default {
     showQrimage(){
       let urlPre=window.location.protocol+'//'+window.location.host;
       // this.qrcode = this.webBaseUrl+'/mobile/pages/resource/courseDetail?id='+this.courseInfo.id;
-       this.qrcode = urlPre+'/mobile/pages/resource/courseDetail?id='+this.courseInfo.id;
+      urlPre='https://u.boe.com/m?returnUrl=https://u.boe.com/mobile/pages/login/loading?returnUrl=';
-       console.log(this.qrcode,'qrcode');
+       this.qrcode = urlPre+'/pages/resource/courseDetail?id='+this.courseInfo.id;
+       //console.log(this.qrcode,'qrcode');
         this.$nextTick(() => {
           this.crateQrcode();
         });

src/views/portal/course/Micro.vue

@@ -521,7 +521,8 @@ export default {
        let urlPre=window.location.protocol+'//'+window.location.host;
       // https://u.boe.com/mobile/pages/resource/microDetail?id=963456709515939840
       // this.qrcode = this.webBaseUrl+'/mobile/pages/resource/microDetail?id='+this.courseInfo.id;
-        this.qrcode =urlPre+ '/mobile/pages/resource/microDetail?id='+this.courseInfo.id;
+        urlPre='https://u.boe.com/m?returnUrl=https://u.boe.com/mobile/pages/login/loading?returnUrl=';
+        this.qrcode =urlPre+ '/pages/resource/microDetail?id='+this.courseInfo.id;
         //console.log(this.qrcode,'qrcode');
         this.$nextTick(() => {
         this.crateQrcode();

src/views/study/PortalIndex.vue

@@ -364,7 +364,7 @@ export default {
       }else{
         this.blobUrl=process.env.VUE_APP_BASE_API+'/xboe/m/course/cware/resource?sign='+urlSign;
       }
-      console.log(this.blobUrl,'this.blobUrl');
+      //console.log(this.blobUrl,'this.blobUrl');
     },
     widthOpen(url) {
       window.open(url, '_blank');

src/views/user/MyFavorites.vue

@@ -511,6 +511,9 @@ export default {
               return author.aid == item.question.sysCreateAid;
             });
             item = Object.assign(item, obj);
+            if(item.orgInfo){
+             item.orgInfo=cutFullName(obj.orgInfo,1);
+            }
             return item;
           });
         } else {
@@ -597,6 +600,9 @@ export default {
               return author.aid == item.cases.authorId;
             });
             item = Object.assign(item, obj);
+            if(item.orgInfo){
+             item.orgInfo=cutFullName(obj.orgInfo,1);
+            }
             return item;
           });
         } else {
@@ -636,6 +642,9 @@ export default {
               return author.aid == item.sysCreateAid;
             });
             item = Object.assign(item, obj);
+            if(item.orgInfo){
+             item.orgInfo=cutFullName(obj.orgInfo,1);
+            }
             return item;
           });
         } else {