Merge branch 'liuxin' into develop

src/pages/myInfo/my-info.vue

@@ -556,27 +556,29 @@ export default {
     },
     imgUploadTakePicture (check_id) {
       let vm = this
+      let obj = {
+        pkvalue: check_id,
+        source_type: 'HLS_APP_USER',
+        picture: '',
+        check_id: check_id,
+        filePath: '',
+        attachment_id: '',
+        user_id: 1,
+        fileName: '',
+      }
       let cameraoptions = {
         quality: 100,
       }
       let success = function (imgUrl) {
-        let obj = {
-          pkvalue: check_id,
-          source_type: 'HLS_APP_USER',
-          picture: '',
-          check_id: check_id,
-          filePath: '',
-          attachment_id: '',
-          user_id: 1,
-          fileName: '',
-        }
-        obj.picture = imgUrl
-        obj.filePath = imgUrl
+        obj.picture = imgUrl[0]
+        obj.filePath = imgUrl[0]
         vm.upLoadObj = obj.picture
         // 拍完一张立马执行保存图片逻辑
         vm.save_picture(obj)
       }
-      let error = function () {}
+      let error = function () {
+        hlsPopup.showLongCenter('请选择图片')
+      }
       vm.hlsUtil.takePicture(cameraoptions, success, error)
     },
     openCamera (ocrType, type) {