Merge remote-tracking branch 'origin/master'

.env.homebase

@@ -7,8 +7,8 @@ VUE_APP_BASE_API2 = 'http://192.168.5.47'
 # 考试系统地址
 VUE_APP_BASE_API3 = 'http://192.168.5.201:8084'
 # 手机端前台地址
-VUE_APP_BASE_API4 = 'http://192.168.9.39:8001'
+VUE_APP_BASE_API4 = 'http://192.168.6.34:8001'
 # 不走网关的后台地址
 VUE_APP_BASE_API5 = 'http://192.168.5.201:8081'
 # 客户端前端地址
-VUE_APP_BASE_API6 = 'http://192.168.9.39:8080'
+VUE_APP_BASE_API6 = 'http://192.168.6.34:8080'

src/views/CourseDetail/index.vue

@@ -505,6 +505,35 @@ export default {
     })
   },
   methods: {
+    // 如果不是当前触摸点不在input上,那么都失去焦点
+    objBlurFun(sDom, times) {
+      const time = times || 300,
+        isIPHONE = navigator.userAgent.toUpperCase().indexOf('IPHONE') !== -1 // 判断是否为苹果
+      if (isIPHONE) {
+        const obj = document.querySelectorAll(sDom)
+        for (let i = 0; i < obj.length; i++) {
+          this.objBlur(obj[i], time)
+        }
+      }
+    },
+    // 元素失去焦点隐藏iphone的软键盘
+    objBlur(sdom, time) {
+      const docTouchend = function(event) {
+        if (event.target !== sdom) {
+          setTimeout(function() {
+            sdom.blur()
+            document.removeEventListener('touchend', docTouchend, false)
+          }, time)
+        }
+      }
+      if (sdom) {
+        sdom.addEventListener('focus', function() {
+          document.addEventListener('touchend', docTouchend, false)
+        }, false)
+      } else {
+        throw new Error('objBlur()没有找到元素')
+      }
+    },
     // 点击保存保存至我的资料
     async saveChapter() {
       const currentContent = this.chapterList[this.unitIndex].childList[this.unitPartIndex],
@@ -807,6 +836,12 @@ export default {
     },
     tagClick(tag) {
       this.currentTag = tag
+      if (tag === '评论') {
+        const that = this
+        setTimeout(function() {
+          that.objBlurFun('#discussInput')
+        }, 1300)
+      }
     },
     /**
      * @param section 点击的当前节信息对象 (Object)

src/views/OnlineExamination/startExamination.vue

@@ -644,7 +644,6 @@ export default {
       // 判断当前题目是否已答
       for (let i = 0; i < this.fillEmpytList.length - 1; i++) {
         if (this.fillEmpytList[i].fillEmpty.trim() === '') {
-          debugger
           this.subjectList[this.nameIndex].questions[this.subjectIndex].isOk = false
           this.Answer[this.nameIndex].questions[this.subjectIndex].isOk = false
           return
@@ -815,7 +814,6 @@ export default {
     // 判断是否到试卷结束时间
     stopExamination() {
       this.oldDate = new Date(this.item.p_endtime_mobile).getTime() // 考试结束时间 毫秒数
-      debugger
       if (this.newDate > this.oldDate) {
         this.submitPaper()
       } else {

src/views/TrainDetail/index.vue

@@ -823,6 +823,35 @@ export default {
     })
   },
   methods: {
+  // 如果不是当前触摸点不在input上,那么都失去焦点
+    objBlurFun(sDom, times) {
+      const time = times || 300,
+        isIPHONE = navigator.userAgent.toUpperCase().indexOf('IPHONE') !== -1 // 判断是否为苹果
+      if (isIPHONE) {
+        const obj = document.querySelectorAll(sDom)
+        for (let i = 0; i < obj.length; i++) {
+          this.objBlur(obj[i], time)
+        }
+      }
+    },
+    // 元素失去焦点隐藏iphone的软键盘
+    objBlur(sdom, time) {
+      const docTouchend = function(event) {
+        if (event.target !== sdom) {
+          setTimeout(function() {
+            sdom.blur()
+            document.removeEventListener('touchend', docTouchend, false)
+          }, time)
+        }
+      }
+      if (sdom) {
+        sdom.addEventListener('focus', function() {
+          document.addEventListener('touchend', docTouchend, false)
+        }, false)
+      } else {
+        throw new Error('objBlur()没有找到元素')
+      }
+    },
     // 点击保存保存至我的资料
     async saveTrain(itemMessage) {
       const res = await post.postAdd({
@@ -1323,11 +1352,12 @@ export default {
       if (tag === '简介') {
         document.getElementById('navList').classList.remove('fixedList')
       }
-      // if (tag === '评论') {
-      //   document.getElementById('trainCard').style.display = 'none'
-      // } else {
-      //   document.getElementById('trainCard').style.display = 'block'
-      // }
+      if (tag === '评论') {
+        const that = this
+        setTimeout(function() {
+          that.objBlurFun('#discussInput')
+        }, 1300)
+      }
     },
     // 讲师信息
     getCourseAndTeacher() {

src/views/addTrain/index.vue

@@ -467,7 +467,7 @@ export default {
   },
   data() {
     return {
-      title: '编辑培训',
+      title: '新建培训',
       fromName: 'IReleasedTrain',
       slId: '', // 培训ID
       formData: {
@@ -484,7 +484,7 @@ export default {
         trainOverDate: '', // 培训结束时间
         trainAddress: '', // 培训地址
         maxApplyPerson: 0, // 最大报名人数
-        trainSignTime: '', // 培训签到时间（培训开始前 分钟数）
+        trainSignTime: '30', // 培训签到时间（培训开始前 分钟数）
         viewRangePerson: '', // 可见范围
         valueGain: 0, // 获得积分
         trainFileList: [] // 文件类型 2PPT 3PDF 4word 5txt 6zip 7png 8xlsx
@@ -716,7 +716,8 @@ export default {
           trainSignTime: that.formData.trainSignTime,
           trainFileJson: JSON.stringify(this.formData.trainFileList),
           isClient: '1',
-          viewRangePerson: this.formData.viewRangePerson
+          viewRangePerson: this.formData.viewRangePerson,
+          isAccountId: '1' // 可见范围人传入的是 accountId
         }
         if (that.slId === '' || that.slId === undefined) {
           delete tempForm['businessId']
@@ -1132,12 +1133,25 @@ export default {
             this.maxDate = applyOverDate
             // this.currentDate = new Date(this.formData.applyStartDate)
           }
+          // 判断报名开始时间不得晚于培训结束时间
+          if (this.formData.trainOverDate !== '') {
+            this.maxDate = trainOverDate
+            // this.currentDate = new Date(this.formData.applyStartDate)
+          }
+          if (this.formData.trainOverDate !== '' && this.formData.applyOverDate !== '') {
+            this.maxDate = trainOverDate.getTime() > applyOverDate.getTime() ? applyOverDate : trainOverDate
+            // this.currentDate = new Date(this.formData.applyStartDate)
+          }
           break
         // 判断报名结束时间不得早于报名开始时间
         case 'applyOverDate':
           if (this.formData.applyStartDate !== '') {
             this.minDate = applyStartDate
           }
+          // 判断报名结束时间不得大于培训结束时间
+          if (this.formData.trainOverDate !== '') {
+            this.maxDate = trainOverDate
+          }
           break
         // 判断培训开始时间不得晚于培训结束时间
         case 'trainStartDate':