react_hsbc_teller 1.6.9 → 1.7.0

package/package.json

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

package/packages/pages/video/video.jsx

@@ -44,16 +44,17 @@ let messageValue = ''
 let beautyNum = 0  // 0-关闭  1--弱  2--中 5---高
 let rateList = []
 let beautyDiv = {};
-const CanvasHome = styled.div`
+let CanvasHome = styled.div`
   position: fixed;
   width: 76vw;
   height: 74vh;
   top: 3vh;
   left: 1.5vw;
-  z-index:999;
+  z-index: ${props=>props.zIndexNum};
 
   .canvas{
     width:100%;
+    
     height:100%;
     box-shadow: 0 0 5px 0 #06a;
     display:none;
@@ -63,8 +64,8 @@ const OpreateDiv = styled.div`
   display: inline-block;
   margin-left: 10vw;
   padding: 0 6px;
-  height: 4vh;
-  line-height: 4vh;
+  height: 40px;
+  line-height: 40px;
   border-radius: 5px;
   background: #fff;
   font-size: 16px;
@@ -250,11 +251,14 @@ class Video extends Component {
     operateShow: false,
     drawConfig: {
       curryControl: 'pen', // 工具类型
-    }
+    },
+    zIndexNum: -1,
+    selectSpan: 'pen'
   };
   // eslint-disable-next-line no-undef
   test_controller = '';
   
+  
   /**
    * 创建房间成功后回调后台
    * @param  {JSON} data 数据类型
@@ -3334,7 +3338,7 @@ userType:'1'
       let result = await API.videoRecordCallback({
         activityId: this.props.businessNumber,
         sessionId: this.state.sessionId,
-        roomId: this.state.channelId,
+        roomId: this.state.channelId + '',
         type: type,
         status: status
       });
@@ -3530,7 +3534,6 @@ userType:'1'
 
       this.props.resourcePath + "/eruda.js",
       this.props.resourcePath + "/iconfont.js",
-      this.props.resourcePath + "/dialogue.css",
       
 
         
@@ -4516,7 +4519,7 @@ userType:'1'
       type
     });
 
-    this.setState({ drawConfig });
+    this.setState({ drawConfig,selectSpan: type });
   }
 
   setOpreate(type) {
@@ -4539,11 +4542,17 @@ userType:'1'
   }
   graffiti=()=>{
     if(!this.state.operateShow) {
+      this.setState({
+        zIndexNum: 999
+      })
       this.change(true)
     }
 
   }
   closeGraffiti=()=>{
+    this.setState({
+      zIndexNum: -1
+    })
     this.change(false)
   }
   change(val) {
@@ -4924,11 +4933,11 @@ userType:'1'
             {tabTitleList}
             {/* <img style={sectionStyle} src={require("../../assets/img/placeholder_bg.png").default} alt="" /> */}
             <div id="whiteboardDIV" style={{height: 'calc(100% - 33px)'}}>
-            <CanvasHome>
+            <CanvasHome zIndexNum={this.state.zIndexNum} style={{width: this.state.whiteboardWidth,height: this.state.whiteboardHeight}}>
           {this.state.operateShow &&
             <OpreateDiv id="operate">
-              <span onClick={() => this.setTool('pen')}>铅笔</span>
-              <span onClick={() => this.setTool('eraser')}>橡皮</span>
+              <span style={{color: this.state.selectSpan == 'pen' ?  '#1890ff' : '#333'}} onClick={() => this.setTool('pen')}>铅笔</span>
+              <span style={{color: this.state.selectSpan == 'eraser' ?  '#1890ff' : '#333'}} onClick={() =>  this.setTool('eraser')}>橡皮</span>
               <span onClick={() => this.setOpreate('undo')}>撤销</span>
               <span onClick={() => this.setOpreate('redo')}>恢复</span>
               <span onClick={() => this.setOpreate('clear')}>清除</span>