From 991ee837b9cef4903017940d713bbb73b7c8ce4d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Sat, 15 Aug 2020 16:59:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=9A=E4=B8=BB=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../property/addOwner/addOwner.html           |  65 +++++++++++-------
 .../components/property/addOwner/addOwner.js  |  11 ++-
 public/img/noPhoto.jpg                        | Bin 0 -> 2351 bytes
 3 files changed, 49 insertions(+), 27 deletions(-)
 create mode 100644 public/img/noPhoto.jpg

diff --git a/public/components/property/addOwner/addOwner.html b/public/components/property/addOwner/addOwner.html
index 6640971e8..42e4ce658 100644
--- a/public/components/property/addOwner/addOwner.html
+++ b/public/components/property/addOwner/addOwner.html
@@ -1,27 +1,16 @@
 <div id="addOwnerModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel"
-     aria-hidden="true">
+    aria-hidden="true">
     <div class="modal-dialog modal-lg">
         <div class="modal-content">
             <div class="modal-body">
                 <h3 class="m-t-none m-b ">添加{{addOwnerInfo.componentTitle}}</h3>
                 <div class="ibox-content">
                     <div class="row">
-                        <div class="col-sm-6" style="text-align:center">
-                            <video id="ownerPhoto" style="width: 100%;"></video>
-                            <canvas id="canvas" style="display:none;"></canvas>
-                            <div style="margin-top:20px">
-                                <button class="btn btn-primary" type="button" v-on:click="_takePhoto()"><span class="glyphicon glyphicon-camera"></span> 拍照</button>
-                                <span class="btn btn-default btn-file" v-on:click="_uploadPhoto($event)">
-                                    <span class="fileinput-new" >上传照片</span>
-                                </span>
-                                <input type="file" class="file" accept="images/*" id="uploadOwnerPhoto" hidden v-on:change="_choosePhoto($event)">
-                            </div>
-                        </div>
                         <div class="col-sm-6">
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label">姓名</label>
                                 <div class="col-sm-10"><input v-model="addOwnerInfo.name" type="text"
-                                                              placeholder="必填，请填写姓名" class="form-control"></div>
+                                        placeholder="必填，请填写姓名" class="form-control"></div>
                             </div>
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label">性别</label>
@@ -36,7 +25,7 @@
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label">年龄</label>
                                 <div class="col-sm-10"><input v-model="addOwnerInfo.age" type="number"
-                                                              placeholder="可选，请填写年龄" class="form-control"></div>
+                                        placeholder="可选，请填写年龄" class="form-control"></div>
                             </div>
                             <div class="form-group row" v-if="addOwnerInfo.componentTitle == '成员'">
                                 <label class="col-sm-2 col-form-label">类型</label>
@@ -51,32 +40,60 @@
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label">身份证</label>
                                 <div class="col-sm-10"><input v-model="addOwnerInfo.idCard" type="text"
-                                                              placeholder="必填，请填写身份证" class="form-control"></div>
+                                        placeholder="必填，请填写身份证" class="form-control"></div>
                             </div>
+                        </div>
+                        <div class="col-sm-6" style="text-align:center">
+                            <div class="form-group row">
+                                <div v-if="addOwnerInfo.ownerPhoto != ''">
+                                    <img width="80%" height="150rem" v-bind:src="addOwnerInfo.ownerPhoto" alt="业主照片">
+                                </div>
+                                <div style="width: 100%;" v-else>
+                                    <div v-if="addOwnerInfo.videoPlaying == true">
+                                        <video id="ownerPhoto" style="width: 100%;"></video>
+                                        <canvas id="canvas" style="display:none;"></canvas>
+                                    </div>
+                                    <div>
+                                        <img width="80%" height="150rem" src="/img/noPhoto.jpg" alt="业主照片">
+                                    </div>
+                                </div>
+                                <div style="margin: 10px auto 0px auto;" class="text-center">
+
+                                    <button class="btn btn-primary" type="button" v-if="addOwnerInfo.videoPlaying == true && addOwnerInfo.ownerPhoto != ''" v-on:click="_reOpenVedio()"><span
+                                        class="glyphicon glyphicon-camera"></span>摄像头</button>
+                                    <button class="btn btn-primary" type="button" v-if="addOwnerInfo.videoPlaying == true" v-on:click="_takePhoto()"><span
+                                            class="glyphicon glyphicon-camera"></span> 拍照</button>
+                                    <span class="btn btn-default btn-file" v-on:click="_uploadPhoto($event)">
+                                        <span class="fileinput-new">上传照片</span>
+                                    </span>
+                                    <input type="file" class="file" accept="images/*" id="uploadOwnerPhoto" hidden
+                                        v-on:change="_choosePhoto($event)">
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row" style="margin-top: -15px;">
+                        <div class="col-sm-6">
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label">手机</label>
                                 <div class="col-sm-10"><input v-model="addOwnerInfo.link" type="number"
-                                                              placeholder="必填，请填写联系方式" class="form-control"></div>
+                                        placeholder="必填，请填写联系方式" class="form-control"></div>
                             </div>
+                        </div>
+                        <div class="col-sm-6">
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label">备注</label>
                                 <div class="col-sm-10"><input v-model="addOwnerInfo.remark" type="tel"
-                                                              placeholder="可填，请填写备注" class="form-control"></div>
-                            </div>
-                            <div class="form-group row">
-                                <label class="col-sm-2 col-form-label">照片</label>
-                                <div class="col-sm-10"><img width="100%" height="100%"
-                                                            v-bind:src="addOwnerInfo.ownerPhoto" alt="业主照片"></div>
+                                        placeholder="可填，请填写备注" class="form-control"></div>
                             </div>
                         </div>
-
                     </div>
                     <div class="ibox-content">
                         <button class="btn btn-primary float-right" type="button" v-on:click="saveOwnerInfo()">
                             <i class="fa fa-check"></i>&nbsp;保存
                         </button>
                         <button type="button" class="btn btn-warning float-right" style="margin-right:20px;"
-                                data-dismiss="modal">取消
+                            data-dismiss="modal">取消
                         </button>
                     </div>
                 </div>
diff --git a/public/components/property/addOwner/addOwner.js b/public/components/property/addOwner/addOwner.js
index 8818a0629..3f1bde616 100644
--- a/public/components/property/addOwner/addOwner.js
+++ b/public/components/property/addOwner/addOwner.js
@@ -17,7 +17,7 @@
                 ownerId: '',
                 ownerPhoto: '',
                 idCard: '',
-                videoPlaying: false
+                videoPlaying: false,
             }
         },
         _initMethod: function () {
@@ -149,7 +149,7 @@
                     ownerId: '',
                     ownerPhoto: '',
                     idCard: '',
-                    videoPlaying: false
+                    videoPlaying: false,
                 };
             },
             _addUserMedia: function () {
@@ -168,7 +168,6 @@
                     var video = document.getElementById('ownerPhoto');
                     var media = navigator.getUserMedia(constraints, function (stream) {
                         var url = window.URL || window.webkitURL;
-                        //video.src = url ? url.createObjectURL(stream) : stream;
                         try {
                             video.src = url ? url.createObjectURL(stream) : stream;
                         } catch (error) {
@@ -177,6 +176,7 @@
                         video.play();
                         vc.component.addOwnerInfo.videoPlaying = true;
                     }, function (error) {
+                        vc.component.addOwnerInfo.videoPlaying = false;
                         console.log("ERROR");
                         console.log(error);
                     });
@@ -194,6 +194,8 @@
                     var data = canvas.toDataURL('image/jpeg', 1.0);
                     vc.component.addOwnerInfo.ownerPhoto = data;
                     //document.getElementById('photo').setAttribute('src', data);
+                }else{
+                    vc.toast('未检测到摄像头');
                 }
             },
             _uploadPhoto: function (event) {
@@ -216,6 +218,9 @@
                     }
                 }
             },
+            _reOpenVedio:function(){
+                vc.component.addOwnerInfo.ownerPhoto="";
+            }
         }
     });
 
diff --git a/public/img/noPhoto.jpg b/public/img/noPhoto.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..d3671693b346acfed400e26df81843062d4e0212
GIT binary patch
literal 2351
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

literal 0
HcmV?d00001