react_hsbc_teller 1.9.2 → 1.9.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react_hsbc_teller",
-  "version": "1.9.2",
+  "version": "1.9.3",
   "description": "React",
   "private": false,
   "main": "lib/hsbc.js",

package/packages/pages/video/video.jsx

@@ -351,7 +351,7 @@ class Video extends Component {
   saveLog = (val) => {
     axios({
       method: 'get',
-      baseURL: this.props.logUrl + '&message=' + encodeURIComponent(val) + '&react_hsbc_teller=1.9.2&logTime=' + Date.now() + '&mtoken=' + encodeURIComponent(this.state.rtoken) + '&roomId=' + encodeURIComponent(this.state.channelId) + '&sessionId=' + encodeURIComponent(this.state.sessionId) + '&appointmentID=' + this.props.businessNumber,
+      baseURL: this.props.logUrl + '&message=' + encodeURIComponent(val) + '&react_hsbc_teller=1.9.3&logTime=' + Date.now() + '&mtoken=' + encodeURIComponent(this.state.rtoken) + '&roomId=' + encodeURIComponent(this.state.channelId) + '&sessionId=' + encodeURIComponent(this.state.sessionId) + '&appointmentID=' + this.props.businessNumber,
 
     }).then(res => {
 
@@ -799,6 +799,8 @@ class Video extends Component {
   contrastFaceVerify = async () => {
     try {
       let result = await API.contrastFaceVerify({
+        idCardNumber: this.state.idCardNumberFace,
+        idCardName: this.state.idCardNameFace,
         staffId: this.props.tellerAccount,
         activityId: this.props.businessNumber,
         appAccount: this.state.faceCustomerUid,
@@ -2776,24 +2778,6 @@ class Video extends Component {
     this.test_controller.OnNewJoinerIn = (participant) => {
       console.log('新加⼊房间者', participant);
       this.state.isCustomer = true
-      
-      if (this.props.isOpenSound) {
-        this.appGetUsernameClick(participant).then((res) => {
-          if (res.userType == 1) {
-            let src = autod
-            let audio = new Audio(src)
-            audio.play()
-          } else if (res.userType == 2) {
-            let src = internalJoin
-            let audio = new Audio(src)
-            audio.play()
-          }
-        })
-      }
-
-      // let src = autod
-      // let audio = new Audio(src)
-      // audio.play()
     };
     // 推送“有新发布”给与会者
     this.test_controller.OnNewPublish = (feed) => {
@@ -3866,7 +3850,7 @@ class Video extends Component {
     }
   }
   componentWillMount() {
-    console.log('hsbc_teller_sdk', '1.9.2')
+    console.log('hsbc_teller_sdk', '1.9.3')
     if (this.props.sessionId) {
       this.getRoomStatus({
         sessionId: this.props.sessionId
@@ -4731,19 +4715,32 @@ class Video extends Component {
       console.log(result)
       let data
       let typeIntranet
+      let userSide
       if (result.code == 200) {
         data = result.data.username ? result.data.username : ''
         typeIntranet = result.data.userType ? result.data.userType : ''
+        userSide =  result.data.userSide ? result.data.userSide : ''
       } else {
         this.messageClick('查询失败', 'error')
       }
+      if (this.props.isOpenSound && sid != document.getElementById('publish_video1').name) {
+          if (result.data.userType == 1) {
+            let src = autod
+            let audio = new Audio(src)
+            audio.play()
+          } else if (result.data.userType == 2) {
+            let src = internalJoin
+            let audio = new Audio(src)
+            audio.play()
+          }
+      }
       if (document.getElementById('publish_video1').name == sid) {
         this.setState({
           titleNameRm: data
         })
       }
       if (document.getElementById('video1').name == sid) {
-        if (typeIntranet && typeIntranet == 2) {
+        if ((typeIntranet && typeIntranet == 2) || (userSide && userSide == 2)) {
           this.state.isPIBIntranet[0].type = true
         }
         this.setState({
@@ -4753,7 +4750,7 @@ class Video extends Component {
         })
       }
       if (document.getElementById('video2').name == sid) {
-        if (typeIntranet && typeIntranet == 2) {
+        if ((typeIntranet && typeIntranet == 2) || (userSide && userSide == 2)) {
           this.state.isPIBIntranet[1].type = true
         }
         this.setState({
@@ -4762,7 +4759,7 @@ class Video extends Component {
           this.videoListClick()
         })
       } if (document.getElementById('video3').name == sid) {
-        if (typeIntranet && typeIntranet == 2) {
+        if ((typeIntranet && typeIntranet == 2) || (userSide && userSide == 2)) {
           this.state.isPIBIntranet[2].type = true
         }
         this.setState({
@@ -4771,7 +4768,7 @@ class Video extends Component {
           this.videoListClick()
         })
       } if (document.getElementById('video4').name == sid) {
-        if (typeIntranet && typeIntranet == 2) {
+        if ((typeIntranet && typeIntranet == 2) || (userSide && userSide == 2)) {
           this.state.isPIBIntranet[3].type = true
         }
         this.setState({
@@ -4780,7 +4777,7 @@ class Video extends Component {
           this.videoListClick()
         })
       } if (document.getElementById('video5').name == sid) {
-        if (typeIntranet && typeIntranet == 2) {
+        if ((typeIntranet && typeIntranet == 2) || (userSide && userSide == 2)) {
           this.state.isPIBIntranet[4].type = true
         }
         this.setState({
@@ -4789,7 +4786,7 @@ class Video extends Component {
           this.videoListClick()
         })
       } if (document.getElementById('video6').name == sid) {
-        if (typeIntranet && typeIntranet == 2) {
+        if ((typeIntranet && typeIntranet == 2) || (userSide && userSide == 2)) {
           this.state.isPIBIntranet[5].type = true
         }
         this.setState({
@@ -4799,7 +4796,7 @@ class Video extends Component {
         })
       }
       if (document.getElementById('video7').name == sid) {
-        if (typeIntranet && typeIntranet == 2) {
+        if ((typeIntranet && typeIntranet == 2) || (userSide && userSide == 2)) {
           this.state.isPIBIntranet[6].type = true
         }
         this.setState({
@@ -4808,7 +4805,7 @@ class Video extends Component {
           this.videoListClick()
         })
       } if (document.getElementById('video8').name == sid) {
-        if (typeIntranet && typeIntranet == 2) {
+        if ((typeIntranet && typeIntranet == 2) || (userSide && userSide == 2)) {
           this.state.isPIBIntranet[7].type = true
         }
         this.setState({
@@ -4817,7 +4814,7 @@ class Video extends Component {
           this.videoListClick()
         })
       } if (document.getElementById('video9').name == sid) {
-        if (typeIntranet && typeIntranet == 2) {
+        if ((typeIntranet && typeIntranet == 2) || (userSide && userSide == 2)) {
           this.state.isPIBIntranet[8].type = true
         }
         this.setState({
@@ -4826,7 +4823,7 @@ class Video extends Component {
           this.videoListClick()
         })
       } if (document.getElementById('video10').name == sid) {
-        if (typeIntranet && typeIntranet == 2) {
+        if ((typeIntranet && typeIntranet == 2) || (userSide && userSide == 2)) {
           this.state.isPIBIntranet[9].type = true
         }
         this.setState({
@@ -4835,7 +4832,7 @@ class Video extends Component {
           this.videoListClick()
         })
       } if (document.getElementById('video11').name == sid) {
-        if (typeIntranet && typeIntranet == 2) {
+        if ((typeIntranet && typeIntranet == 2) || (userSide && userSide == 2)) {
           this.state.isPIBIntranet[10].type = true
         }
         this.setState({
@@ -4844,7 +4841,7 @@ class Video extends Component {
           this.videoListClick()
         })
       } if (document.getElementById('video12').name == sid) {
-        if (typeIntranet && typeIntranet == 2) {
+        if ((typeIntranet && typeIntranet == 2) || (userSide && userSide == 2)) {
           this.state.isPIBIntranet[11].type = true
         }
         this.setState({
@@ -6232,13 +6229,14 @@ class Video extends Component {
 
             </div>,
             this.state.cardResuly == '' && this.state.faceResuly != ''  &&<div key='facial'>
+              <Button className="modelButtonCancel" onClick={this.handleCancelFacial}>完成</Button>
               {
                 this.state.faceResuly == 'fail' && <Button className="modelButtonOk" type="primary" danger onClick={this.ReIdentification}>重新识别</Button>
               }
               {
                 this.state.faceResuly == 'success' && <Button className="modelButtonNo" type="primary" danger>重新识别</Button>
               }
-            <Button className="modelButtonCancel" onClick={this.handleCancelFacial}>完成</Button>
+            
 
           </div>,
             this.state.cardResuly == 'success' && <div key='facial'>
@@ -6246,7 +6244,7 @@ class Video extends Component {
                 this.state.disabledIdCard && <Button className="modelButtonFaceOk" danger onClick={(e) => this.updateConfirm('noFace')}>修改</Button>
               }
               {
-                this.state.documentType == 'ID_CARD' && <Button className="modelButtonFaceOk" danger onClick={(e) => this.confirmCallback('face')}>完成并发起人脸识别</Button>
+                this.state.documentType == 'ID_CARD' && <Button className="modelButtonFaceOkColor" danger onClick={(e) => this.confirmCallback('face')}>完成并发起人脸识别</Button>
               }
               {
                 this.state.documentType != 'ID_CARD' && <Button className="modelButtonOk" type="primary" danger onClick={(e) => this.confirmCallback('noFace')}>完成</Button>
@@ -6255,7 +6253,7 @@ class Video extends Component {
             </div>,
             this.state.cardResuly == 'fail' && <div key='facial'>
               <Button className="modelButtonCancel" onClick={this.handleCancelFacial}>取消</Button>
-              <Button className="modelButtonOk" type="primary" danger onClick={this.newFaceClick}>返回重试</Button>
+              <Button className="modelButtonOk" type="primary" danger onClick={this.newFaceClick}>返回重拍</Button>
             </div>
           ]}>
             <Spin spinning={this.state.loadingFace} tip="识别中...">
@@ -6302,9 +6300,12 @@ class Video extends Component {
                     }
                     <div className='imgDIV'>
                       <img className="faceImgCard" src={this.state.facialImgFront} alt=""></img>
-                      <img className="faceImgCard" src={this.state.facialImgBack} alt=""></img>
+                      {
+                        this.state.documentType != 'PASSPORT_CARD' && <img className="faceImgCard faceImgCardTwo" src={this.state.facialImgBack} alt=""></img>
+                      }
+                      
                     </div>
-                    <div>证件信息确认</div>
+                    <div style={{margin: '0 20px'}}>证件信息确认</div>
                     <div><span>客户姓名</span>  <input disabled={this.state.disabledIdCard} type="text" value={this.state.idCardName} onChange={this.handleChangeIdCardName} /></div>
                     <div><span>证件号码</span>  <input disabled={this.state.disabledIdCard} type="text" value={this.state.idCardNumber} onChange={this.handleChangeIdCardNumber} /></div>
                     <div><span>有效期</span>  <input disabled={this.state.disabledIdCard} type="text" value={this.state.certificateValidity} onChange={this.handleChangeCertificateValidity} /></div>

package/packages/pages/video/video.less

@@ -152,6 +152,7 @@
 }
 .faceImg{
   width: 60%;
+  margin-bottom: 20Px;
 }
 .faceBody{
   text-align: center;
@@ -163,14 +164,14 @@
     text-align: -webkit-left;
     padding: 0Px 2Px;
     div{
-      font-size: 16Px;
+      font-size: 13Px;
       color: #646464;
       margin: 10Px 20Px;
       input{
         border: #DCDCDC 1px solid;
         width: 15rem;
-        height: 2.5rem;
-        line-height: 2.5rem;
+        height: 2rem;
+        line-height: 2rem;
         margin-left: 15px;
       }
       span{
@@ -331,7 +332,7 @@
   margin: 10px 20px;
 }
 .ant-modal-header{
-  padding: 36px 30px 30px 30px !important;
+  // padding: 36px 30px 30px 30px !important;
   border-bottom: none !important;
 }
 .ant-modal-body{
@@ -342,8 +343,8 @@
   color: #333333 !important;
 }
 .ant-modal-footer {
-  margin-top: 50px!important;
-  padding: 20px 30px 30px!important;
+  margin-top: 0px!important;
+  // padding: 0px 0px 0px!important;
 }
 
 .modelButtonCancel{
@@ -403,6 +404,15 @@
   background: #fff!important;
   border-spacing: 20px!important;
 }
+.modelButtonFaceOkColor{
+  width: 170px!important;
+  height: 40px!important;
+  font-size: 16px!important;
+  color: #ffffff!important;
+  border: 1px #DB0011 solid!important;
+  background: #DB0011!important;
+  border-spacing: 20px!important;
+}
 .endModal{
   font-size: 16px;
     padding: 56px 30px 0px 30px;
@@ -563,11 +573,15 @@
 }
 .selectCustomer{
   font-size: 16px;
-margin: 0 40px;
+margin: 20Px 40px;
 }    
 .faceImgCard{
   width: 25rem;
   margin-bottom: 10px;
+  height: 13.5rem;
+}
+.faceImgCardTwo{
+  margin-bottom: 0px !important;
 }
 .titleDiv{
   font-size: 1.4rem;