Merge remote-tracking branch 'origin/master'

src/api/test.js

@@ -50,7 +50,8 @@ const api = {
   deleteCourseDiscuss: '/bdiscuss/delete', // 删除评论
   getMyInfo: '/user/queryMyInfo', // 获取当前登陆人信息 我的智学 个人中心
   learning: '/BLesson/learning', // 判断是正在学该课程 643
-  queryCourse: '/BCourse/queryCourse' // 301 查询课程分类
+  queryCourse: '/BCourse/queryCourse', // 301 查询课程分类
+  imgUpload: process.env.VUE_APP_BASE_API2 + '/api/oss/v1/file/upload' // 美腾方面图片上传接口
 }
 
 export default api
@@ -352,6 +353,14 @@ export const post = {
       method: 'post',
       params: params
     })
+  },
+  // 新建培训  图片上传
+  postImgUpload: (params) => {
+    return axios({
+      url: api.imgUpload,
+      method: 'post',
+      params: params
+    })
   }
 }
 

src/assets/style/resetui.less

@@ -270,6 +270,9 @@
     color: #cccccc;
   }
 }
+.form-data-field:active{
+  background: #ffffff !important;
+}
 .describe-field{
   display: block;
   .van-field__control{

src/components/CourseDiscuss/Coursediscuss.vue

@@ -412,7 +412,9 @@ export default {
   .discussContent{
     padding: 0 16px 15px 20px;
   }
-
+  .discussContent::-webkit-scrollbar{
+    width: 0;
+  }
   .discussBasic{
     width: 100%;
     margin-bottom: 19px;
@@ -449,6 +451,7 @@ export default {
   .Coursediscuss::-webkit-scrollbar {/*滚动条整体样式*/
     width: 0px;     /*高宽分别对应横竖滚动条的尺寸*/
   }
+
   .bubble{
     width: 0;
     height: 0;
@@ -459,3 +462,13 @@ export default {
     left: 20px;
   }
 </style>
+<style lang="less">
+  .Coursediscuss::-webkit-scrollbar{
+    width: 0;
+  }
+  .Coursediscuss{
+    .discussContent::-webkit-scrollbar{
+      width: 0;
+    }
+  }
+</style>

src/components/MyInformation/labelMyInformation.vue

@@ -111,6 +111,18 @@ export default {
       case 'zip':
         this.imgName = require('@assets/images/MyInformation/ZIP.png')
         break
+      case 'docx':
+        this.imgName = require('@assets/images/MyInformation/DOCX.png')
+        break
+      case 'pptx':
+        this.imgName = require('@assets/images/MyInformation/PPTX.png')
+        break
+      case 'xlsx':
+        this.imgName = require('@assets/images/MyInformation/XLSX.png')
+        break
+      case 'rar':
+        this.imgName = require('@assets/images/MyInformation/RAR.png')
+        break
       default:
         this.imgName = require('@assets/images/MyInformation/未知.png')
         break

src/components/NavBar.vue

@@ -77,28 +77,10 @@ export default {
   methods: {
     // 返回按钮
     back() {
-      if (this.$route.name === 'Home') {
-        sendInfoToJava('close')
-      // } else if (this.$route.name === 'CourseDetail' || this.$route.name === 'TrainDetail') {
-      //   if (this.fromName === 'More') {
-      //     this.$router.replace({
-      //       name: this.fromName
-      //       // params: JSON.parse(sessionStorage.getItem('moreObj'))
-      //     })
-      //   } else if (this.fromName === 'ClassificationResult') {
-      //     this.$router.replace({
-      //       name: this.fromName,
-      //       params: JSON.parse(sessionStorage.getItem('classificationResultObj'))
-      //     })
-      //   } else {
-      //     this.$router.replace({
-      //       name: this.fromName
-      //     })
-      //   }
-      //   if (this.fromName === 'Home') {
-      //     return false
-      //   }
-      //   this.$router.go(-1)
+      alert(this.$route.query.goindex)
+      if (this.$route.name === 'Home' || this.$route.query.goindex === 'true') {
+        alert('进入关闭方法')
+        // sendInfoToJava('close')
       } else if (this.$route.name === 'Zcdsh') {
         this.$router.replace({
           name: 'Home'

src/components/addTrain/hSelector.vue

@@ -122,6 +122,7 @@ export default {
       white-space: nowrap;
       overflow: hidden;
       text-overflow: ellipsis;
+      display: none;
     }
     .h-selector-container {
       position: absolute;
@@ -129,6 +130,7 @@ export default {
       left: 0;
       bottom: 0;
       width: 100%;
+      height: 100%;
       background: #fff;
     }
     .h-selector-layer {

src/main.js

@@ -8,7 +8,7 @@ import * as _ from 'lodash'
 import 'vant/lib/icon/local.css'
 import {PullRefresh, Field, Image, Toast, Dialog} from 'vant'
 import wnsdk from '@tjmt/wnsdk'
-import {curriculumTrainRouter} from './utils'
+import {curriculumTrainRouter, setgoindex} from './utils'
 import './assets/style/resetui.less'
 
 // 定义全局过滤器
@@ -30,6 +30,8 @@ Vue.use(PullRefresh)
 Vue.config.productionTip = false
 // 定义线上课程 线下培训 跳转方法
 Vue.prototype.$curriculumTrainRouter = curriculumTrainRouter
+// 判断当前页面的历史记录是不是小于等于1
+Vue.prototype.$setgoindex = setgoindex
 Vue.prototype._ = _
 Vue.prototype.$wnsdk = wnsdk
 

src/utils/index.js

@@ -449,4 +449,16 @@ export function curriculumTrainRouter(lessonType, id, fromName, valueConsume, le
     }
   })
 }
+// 判断首次进入项目 路由路径数量（通知进入页面，点击返回箭头关闭项目）
+export function setgoindex() {
+  console.log(window.history.length)
+  alert(window.history.length)
+  if (window.history.length <= 1) {
+    if (location.href.indexOf('?') === -1) {
+      window.location.href = location.href + '?goindex=true'
+    } else if (location.href.indexOf('?') !== -1 && location.href.indexOf('goindex') === -1) {
+      window.location.href = location.href + '&goindex=true'
+    }
+  }
+}
 

src/views/Home/index.vue

@@ -62,16 +62,6 @@
         </swipe>
         <!--分类-->
         <div class="classification">
-          <router-link
-            v-for="(item,index) in zcdshList"
-            :key="index"
-            :to="{name: 'Zcdsh', params:{url: item.url, title: item.menuName}}"
-          >
-            <div>
-              <img src="~@assets/images/index/01_03.png">
-              <span>{{ item.menuName }}</span>
-            </div>
-          </router-link>
           <router-link :to="{name: 'OnlineExamination', params:{fromName: 'Home'}}">
             <div>
               <img src="~@assets/images/index/02_03.png">
@@ -84,6 +74,16 @@
               <span>我的智学</span>
             </div>
           </router-link>
+          <router-link
+            v-for="(item,index) in zcdshList"
+            :key="index"
+            :to="{name: 'Zcdsh', params:{url: item.url, title: item.menuName}}"
+          >
+            <div>
+              <img src="~@assets/images/index/01_03.png">
+              <span>{{ item.menuName }}</span>
+            </div>
+          </router-link>
         </div>
         <!--企业推荐-->
         <div
@@ -657,6 +657,7 @@ export default {
     this.HomeBLessons(this.tabsName)
     this.queryMenuById()
     window.addEventListener('scroll', this.handleScroll)
+    this.$setgoindex()
   },
   destroyed() {
     window.removeEventListener('scroll', this.handleScroll, false)

src/views/OnlineExamination/startExamination.vue

@@ -838,7 +838,7 @@ export default {
     .nav-box{
       width: 100%;
       height: 80px;
-      margin-top: 12px;
+      margin-top: 10px;
       background: #4498F0;
       border-radius: 4px;
       & > p{

src/views/PersonalCenter/index.vue

@@ -186,6 +186,7 @@ export default {
   },
   mounted() {
     this.myInfo()
+    this.$setgoindex()
   }
 }
 </script>

src/views/TrainDetail/SignCode.vue

@@ -46,9 +46,12 @@ export default {
   methods: {
   },
   mounted() {
+    debugger
     this.businessId = this.$route.query.businessId
     this.title = this.$route.query.title
     this.fromName = this.$route.query.fromName
+    console.log(this.businessId, '22222222222')
+    console.log(this.title, '11111111111')
     QRCode.toCanvas(this.$refs.qRCode, process.env.VUE_APP_BASE_API4 + '/#/TrainSign?MT_ZX_QR_CODE=userCode&businessId=' + this.businessId + '&courseName=' + encodeURI(this.title) + '&corpId=6', {margin: 1}, function(error) {
       console.log(error)
     })