react_hsbc_teller 0.6.7 → 0.6.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react_hsbc_teller",
-  "version": "0.6.7",
+  "version": "0.6.8",
   "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/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

@@ -2496,7 +2496,10 @@ class Video extends Component {
   };
   invitationClick = () => {
     this.setState({
-      isModalVisibleInvitation: true
+      isModalVisibleInvitation: true,
+      employeeNumber: '',
+      employeeName: '',
+      employeeError: ''
     })
 
   }
@@ -2506,9 +2509,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')
@@ -2690,8 +2693,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')
@@ -2699,7 +2702,7 @@ class Video extends Component {
     } catch (err) {
       console.log(err)
       this.setState({
-        employeeError: '未搜索到相关信息'
+        employeeError: '查无此人'
       })
     }
   }
@@ -3367,7 +3370,7 @@ class Video extends Component {
             switchExternal={this.switchExternal}
             inspection={this.inspection}
           ></Foot>
-          <Modal key={Math.random()}  cancelText="取消" okText="确定" visible={this.state.isModalVisible} onOk={this.handleOk}
+          <Modal cancelText="取消" okText="确定" visible={this.state.isModalVisible} onOk={this.handleOk}
             onCancel={this.handleCancel}>
             {
               this.state.isSuspend && <span>确定是否恢复会话？</span>
@@ -3376,15 +3379,19 @@ class Video extends Component {
               !this.state.isSuspend && <span>确定是否暂停会话？</span>
             }
           </Modal>
-          <Modal key={Math.random()}   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 key={Math.random()}  title={this.state.titleModal}  closable={false} centered={true} visible={this.state.isModalVisibleFacial} footer={[
-            <Button className="modelButtonCancel" onClick={this.handleCancelFacial}>取消</Button>,
+          <Modal title={this.state.titleModal}  closable={false} centered={true} visible={this.state.isModalVisibleFacial} footer={[
+            <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>
@@ -3397,9 +3404,11 @@ class Video extends Component {
             </div>
 
           </Modal> */}
-          <Modal key={Math.random()} className="modelClass" title="新增预约" closable={false} centered={true} visible={this.state.isModalVisibleInvitation} footer={[
-            <Button className="modelButtonCancel" onClick={this.handleCancelInvitation}>取消</Button>,
+          <Modal className="modelClass" title="新增预约" closable={false} centered={true} visible={this.state.isModalVisibleInvitation} footer={[
+             <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">
@@ -3419,9 +3428,11 @@ class Video extends Component {
             }
             
           </Modal>
-          <Modal key={Math.random()}  title="签字白板" closable={false} centered={true} visible={this.state.isModalVisibleSign} footer={
+          <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">
@@ -3436,9 +3447,11 @@ class Video extends Component {
               ></CanvasDraw>
             </div>
           </Modal>
-          <Modal key={Math.random()}  title="设备检测" closable={false} centered={true} visible={this.state.isModalVisibleInspection} footer={[
-            <Button className="modelButtonCancel" onClick={this.handleCancelInspection}>取消</Button>,
+          <Modal title="设备检测" closable={false} centered={true} visible={this.state.isModalVisibleInspection} footer={[
+             <div key='inspection'>
+            <Button className="modelButtonCancel" onClick={this.handleCancelInspection}>取消</Button>
             <Button className="modelButtonOk" type="primary" danger onClick={this.handleOkInspection}>确定</Button>
+            </div>
           ]}>
             <div className="inspection">
               <div>摄像头设备：</div>
@@ -3458,11 +3471,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)',