Merge branch 'develop' of https://hel.hand-china.com/xugong/hls-xcmg-vue-app into develop

src/pages/help/feedback.vue

@@ -62,6 +62,7 @@ export default {
     next(vm => {
       if (from.name === 'HelpList') {
         vm.question_desc = ''
+        vm.upload_list = []
       }
     })
   },
@@ -104,14 +105,14 @@ export default {
     imgUploadOpenCamera (check_id) {
       let vm = this
       let obj = {
-        'pkvalue': check_id,
-        'source_type': 'HLS_APP_QUESTION',
-        'picture': '',
-        'check_id': check_id,
-        'filePath': '',
-        'attachment_id': '',
-        'user_id': 1,
-        'fileName': '',
+        pkvalue: check_id,
+        source_type: 'HLS_APP_QUESTION',
+        picture: '',
+        check_id: check_id,
+        filePath: '',
+        attachment_id: '',
+        user_id: 1,
+        fileName: '',
       }
       let cameraoptions = {
         quality: 100,
@@ -119,6 +120,7 @@ export default {
       let success = function (imgdata) {
         obj.picture = imgdata
         obj.filePath = imgdata
+        // vm.faceListUpload.push(obj)
         let list = []
         list.push(obj)
         // vm.upload_list.push(obj)
@@ -205,12 +207,13 @@ export default {
             clearInterval(recordUploadInterval)
             /* hlsPopup.hideLoading()
             hlsPopup.showLongCenter('图片上传成功') */
+            hlsPopup.showLongCenter('上传成功')
           }
         }, 500)
         for (var i = 0; i < list.length; i++) {
           let uploadSuccess = function (res) {
             if (res.result === 'S') {
-              hlsPopup.showLongCenter('上传成功')
+              // hlsPopup.showLongCenter('上传成功')
               alreadyUploadNum++
               for (var j = 0; j < list.length; j++) {
                 if (list[j].filePath === res.response.filePath) {

src/pages/videoSign/video-list.vue

@@ -39,7 +39,7 @@
                 <span class="number">{{ dateConverse(item.apply_date) }}</span>
               </li>
               <li>
-                <p v-if="item.interview_status ==='待面签'" class="to-unSign" @click="toSign">
+                <p v-if="item.interview_status ==='APPROVING'" class="to-unSign" @click="toSign">
                   <img src="@/assets/videoSign/unSign.png" >&nbsp;视频面签
                 </p>
               </li>
@@ -199,7 +199,7 @@ export default {
           pagesize: 10,
           searchInput: vm.searchInput,
           pagenum: vm.submitPagenum,
-          interview_status: '待面签',
+          interview_status: 'APPROVING',
           user_phone: window.localStorage.getItem('user_phone'),
         }
         hlsPopup.showLoading('请稍候')
@@ -222,7 +222,7 @@ export default {
           pagesize: 10,
           searchInput: vm.searchInput,
           pagenum: vm.approvedPagenum,
-          interview_status: '已面签',
+          interview_status: 'RESERVED',
           user_phone: window.localStorage.getItem('user_phone'),
         }
         hlsPopup.showLoading('请稍候')