react_hsbc_teller 0.6.5 → 0.6.9

package/lib/hsbc.js.LICENSE.txt

@@ -11,27 +11,6 @@
  * @license  MIT
  */
 
-/*!
- * html2canvas 1.4.0 <https://html2canvas.hertzen.com>
- * Copyright (c) 2022 Niklas von Hertzen <https://hertzen.com>
- * Released under MIT License
- */
-
-/*! *****************************************************************************
-    Copyright (c) Microsoft Corporation.
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose with or without fee is hereby granted.
-
-    THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-    REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-    AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-    INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-    LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-    OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-    PERFORMANCE OF THIS SOFTWARE.
-    ***************************************************************************** */
-
 /*! *****************************************************************************
 Copyright (c) Microsoft Corporation.
 

package/package.json

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

package/packages/api/api.js

@@ -1,6 +1,26 @@
 import Server from './server';
 
 class API extends Server{
+  async sendEmail(params = {}){
+    //  return this.axios('get', '/lang/select/2', params); 
+    try{
+      let result = await this.axios('post', '/hsbc/sendEmail', params); 
+      console.log(result)
+      if(result && (result.data instanceof Object) && result.code === 200){
+        return result||[];
+      }else{
+        let err = {
+          tip: '服务异常',
+          response: result,
+          data: params,
+          // url: 'https://api.cangdu.org/shopro/data/products',
+        }
+        throw err;
+      }
+    }catch(err){
+      throw err;
+    }
+  }
   async appGetUsername(params = {}){
     //  return this.axios('get', '/lang/select/2', params); 
     try{

package/packages/pages/foot/foot.jsx

@@ -51,7 +51,7 @@ export default class foot extends Component {
           this.props.inspection()
       }
     render() {
-        const {clickedOcr,clickedFacial,isTranscribing,img,cameraImg,screenName,suspendName,customerList,menus} = this.props
+        const {clickedOcr,clickedFacial,isTranscribing,img,cameraImg,screenName,suspendName,customerList,menus,voiceName} = this.props
         const content = (
             <div>
               {customerList.map((item,index)=>{
@@ -137,7 +137,7 @@ export default class foot extends Component {
                         <div className="one">
                         <img className="imgClass" src={img} alt="" />
                         <div className="text">
-                            静音
+                            {voiceName}
                         </div>
                         </div>
                         

package/packages/pages/foot/foot.less

@@ -1,6 +1,6 @@
 .foot{
     background: #fff;
-height: 60px;
+height: 4rem;
 display: inline-flex;
 width: 100%;
 // margin: 10px 0;
@@ -13,9 +13,10 @@ width: 100%;
     width: 33%;
     height: 100%;
   align-items: center;
-  margin: 10px 0;
+//   margin: 10px 0;
 .one{
-    padding-top: 5px;
+    // padding-top: 5px;
+    padding: 5px 0;
         display: flex;
   line-height: 32px;
   flex-direction: column;
@@ -27,7 +28,7 @@ width: 100%;
       border-radius: 8px;
   }
   .text{
-    margin-top: 10px;
+    margin-top: 8px;
     padding-bottom: 10px;
     text-align: center;
     width: 80px;
@@ -43,7 +44,7 @@ line-height: 11px;
     justify-content: center;
 }
 .totalThree{
-    margin-top: 10px;
+    // margin-top: 10px;
     justify-content: flex-end;
 }
 .buttonClass{

package/packages/pages/index.jsx

@@ -46,8 +46,8 @@ class Main extends Component {
 }
 Main.defaultProps = {
   lang: 'zh',
-  // baseURL: 'https://zuul.uat.dsp.hsbcfts.com.cn/wealth/zuul/api/leimon-counter-api',
-  baseURL:'https://counter-web.leimondata.cn:18082/api/leimon-counter-api',
+  baseURL: 'https://zuul.uat.dsp.hsbcfts.com.cn/wealth/zuul/api/leimon-counter-api',
+  // baseURL:'https://counter-web.leimondata.cn:18082/api/leimon-counter-api',
 
 }
 export default Main

package/packages/pages/video/video.jsx

@@ -22,7 +22,6 @@ import 'antd/lib/spin/style'
 import { Button } from '../../../node_modules/antd/lib/index';
 import CanvasDraw from "react-canvas-draw";
 import { FormattedMessage, injectIntl } from 'react-intl';
-import html2canvas from 'html2canvas';
 import axios from 'axios';
 const LEAVE_TYPE = {
   TELLER_EXIT: 1, // 坐席退出
@@ -54,6 +53,7 @@ class Video extends Component {
     cameraImg: cameraImgOpen,
     voiceStatue: false,
     voiceImg: voiceImgOpen,
+    voiceName: '静音',
     isCustomer: false,
     publishDevic: 1,
     isSharedScreen: false,
@@ -2201,7 +2201,8 @@ class Video extends Component {
       // 静音本地
       this.setState({
         voiceStatue: true,
-        voiceImg: voiceImgCloe
+        voiceImg: voiceImgCloe,
+        voiceName: '解除静音'
       });
       let sid = document.getElementById('publish_video1').name;
       if (!sid) {
@@ -2227,7 +2228,8 @@ class Video extends Component {
       // 打开本地
       this.setState({
         voiceStatue: false,
-        voiceImg: voiceImgOpen
+        voiceImg: voiceImgOpen,
+        voiceName: '静音'
       });
       let sid = document.getElementById('publish_video1').name;
       if (!sid) {
@@ -2387,7 +2389,8 @@ class Video extends Component {
       if (this.state.voiceStatue) {
         // 当前是音频
         this.setState({
-          voiceImg: voiceImgCloe
+          voiceImg: voiceImgCloe,
+          voiceName: '解除静音'
         });
         let sid = document.getElementById('publish_video1').name;
         if (!sid) {
@@ -2399,7 +2402,8 @@ class Video extends Component {
         // 当前是
         this.test_controller.SetLocalAudioEnable(1, parseInt(sid, 10));
         this.setState({
-          voiceImg: voiceImgOpen
+          voiceImg: voiceImgOpen,
+          voiceName: '静音'
         })
       }
       callNimIM('sendCustomCmdMsg', {
@@ -2497,7 +2501,10 @@ class Video extends Component {
   };
   invitationClick = () => {
     this.setState({
-      isModalVisibleInvitation: true
+      isModalVisibleInvitation: true,
+      employeeNumber: '',
+      employeeName: '',
+      employeeError: ''
     })
 
   }
@@ -2507,9 +2514,9 @@ class Video extends Component {
       return
     }
     try {
-      let result = await API.sendLink({
-        sessionId: this.state.sessionId,
-        userId: this.state.employeeNumber
+      let result = await API.sendEmail({
+        staffId: this.state.employeeNumber,
+        activityId: this.props.businessNumber
       });
       if (result.code == 200) {
         this.messageClick('发送成功','success')
@@ -2691,8 +2698,8 @@ class Video extends Component {
       console.log(result)
       if (result.code == 200) {
         this.setState({
-          employeeName: result.data.username,
-          employeeError: '',
+          employeeName: result.data.staffName,
+          employeeError: result.data.staffName ? '' : '查无此人',
         })
       } else {
         this.messageClick('查询失败','error')
@@ -2700,7 +2707,7 @@ class Video extends Component {
     } catch (err) {
       console.log(err)
       this.setState({
-        employeeError: '未搜索到相关信息'
+        employeeError: '查无此人'
       })
     }
   }
@@ -2844,7 +2851,7 @@ class Video extends Component {
       </div>
     )
     const camera = (
-      <div class="cameraAnMicrophone">
+      <div className="cameraAnMicrophone">
         {
           this.state.cameraList.map((item,index) => {
             return <div key={index}>
@@ -2863,7 +2870,7 @@ class Video extends Component {
       <div>
         {
           this.state.microphoneList.map((item,index) => {
-            return <div key={index} class="cameraAnMicrophone">
+            return <div key={index} className="cameraAnMicrophone">
               <label className="radio">
               <input type="radio" name="microphone" value={item.actionid} style={{float: 'left'}} checked={this.state.microphoneValue == item.actionid} onChange={(e) => this.getMicrophoneValue(e)}  /><i></i>
               {item.actionname}
@@ -2878,7 +2885,7 @@ class Video extends Component {
       <div>
         {
           this.state.speakerList.map((item,index) => {
-            return <div key={index} class="cameraAnMicrophone">
+            return <div key={index} className="cameraAnMicrophone">
               {item.actionname}<br />
             </div>
           })
@@ -3344,6 +3351,7 @@ class Video extends Component {
           </div>
           </div>
           <Foot
+          voiceName={this.state.voiceName}
             img={this.state.voiceImg}
             screenName={this.state.screenName}
             suspendName={this.state.suspendName}
@@ -3377,15 +3385,19 @@ class Video extends Component {
               !this.state.isSuspend && <span>确定是否暂停会话？</span>
             }
           </Modal>
-          <Modal  closable={false} centered={true} visible={this.state.isModalVisibleEnd} footer={[
-            <Button className="modelButtonCancel" onClick={this.handleCancelEnd}>取消</Button>,
+          <Modal closable={false} centered={true} visible={this.state.isModalVisibleEnd} footer={[
+            <div key='end'>
+            <Button className="modelButtonCancel" onClick={this.handleCancelEnd}>取消</Button>
             <Button className="modelButtonOk" type="primary" danger onClick={this.handleOkEnd}>确定</Button>
+            </div>
           ]}>
             <div className='endModal'>确定是否结束会话？</div>
           </Modal>
           <Modal title={this.state.titleModal}  closable={false} centered={true} visible={this.state.isModalVisibleFacial} footer={[
-            <Button className="modelButtonCancel" onClick={this.handleCancelFacial}>取消</Button>,
+            <div key='facial'>
+            <Button className="modelButtonCancel" onClick={this.handleCancelFacial}>取消</Button>
             <Button className="modelButtonOk" type="primary" danger onClick={this.handleOkFacial}>确定</Button>
+            </div>
           ]}>
             <div className="faceBody">
               <img className="faceImg" src={this.state.facialImg} alt=""></img>
@@ -3399,17 +3411,19 @@ class Video extends Component {
 
           </Modal> */}
           <Modal className="modelClass" title="新增预约" closable={false} centered={true} visible={this.state.isModalVisibleInvitation} footer={[
-            <Button className="modelButtonCancel" onClick={this.handleCancelInvitation}>取消</Button>,
+             <div key='invitation'>
+            <Button className="modelButtonCancel" onClick={this.handleCancelInvitation}>取消</Button>
             <Button className="modelButtonOk" type="primary" danger onClick={this.handleOkInvitation}>确定</Button>
+            </div>
           ]}>
             <div>
               <div className="invitationDiv">
-                <span class="modalSpan">员工号：</span><input type="number"className="inputClick" placeholder="请输入员工号" value={this.state.employeeNumber} onChange={e => this.handleChange(e)}></input>
+                <span className="modalSpan">员工号：</span><input type="number"className="inputClick" placeholder="请输入员工号" value={this.state.employeeNumber} onChange={e => this.handleChange(e)}></input>
                 {/* <span className="invitationSpan" onClick={this.queryStaff}>查 询</span> */}
                 <Button className="invitationSpan" type="primary" danger onClick={this.queryStaff}>查 询</Button>
               </div>
               <div className="invitationDiv">
-              <span class="modalSpan">&nbsp;&nbsp;&nbsp;姓名：</span><span>{this.state.employeeName}</span>
+              <span className="modalSpan">&nbsp;&nbsp;&nbsp;姓名：</span><span>{this.state.employeeName}</span>
               </div>
             </div>
             {
@@ -3422,7 +3436,9 @@ class Video extends Component {
           </Modal>
           <Modal title="签字白板" closable={false} centered={true} visible={this.state.isModalVisibleSign} footer={
             [
+              <div key='okSign'>
               <Button className="modelButtonOk" type="primary" danger onClick={this.handleOkSign}>确定</Button>
+              </div>
             ]
           }>
             <div className="content">
@@ -3438,10 +3454,12 @@ class Video extends Component {
             </div>
           </Modal>
           <Modal title="设备检测" closable={false} centered={true} visible={this.state.isModalVisibleInspection} footer={[
-            <Button className="modelButtonCancel" onClick={this.handleCancelInspection}>取消</Button>,
+             <div key='inspection'>
+            <Button className="modelButtonCancel" onClick={this.handleCancelInspection}>取消</Button>
             <Button className="modelButtonOk" type="primary" danger onClick={this.handleOkInspection}>确定</Button>
+            </div>
           ]}>
-            <div class="inspection">
+            <div className="inspection">
               <div>摄像头设备：</div>
               {camera}
               <div>麦克风设备：</div>
@@ -3459,11 +3477,11 @@ Video.defaultProps = {
   tellerAccount: 't001',
   businessNumber: '123',
   callbackUrl: 'http://47.102.126.132:8720/hsbc/callback',
-  // roomServerUrl: 'wss://app.uat.dsp.hsbcfts.com.cn/mpaas/mrtc/ws', 
-  roomServerUrl: 'wss://mrtc.mpaas.cn-hangzhou.aliyuncs.com/ws',
+  roomServerUrl: 'wss://app.uat.dsp.hsbcfts.com.cn/mpaas/mrtc/ws', 
+  // roomServerUrl: 'wss://mrtc.mpaas.cn-hangzhou.aliyuncs.com/ws',
 
-  resourcePath: 'https://counter-web.leimondata.cn:7199',
-  // resourcePath: 'https://zuul.uat.dsp.hsbcfts.com.cn/wealth/js/',
+  // resourcePath: 'https://counter-web.leimondata.cn:7199',
+  resourcePath: 'https://zuul.uat.dsp.hsbcfts.com.cn/wealth/js/',
   prohbiitPrompt: '当前无客户',
   voiceColor: '#0AE544',
   titleBackground: 'rgba(0,0,0,0.65)',