Merge branch 'CommonTemplate' into dev/new1

src/components/PreInIcss/RotateImg/index.jsx

@@ -99,9 +99,9 @@ class RotateImg extends Component {
       mgTop:-height/2,
       de:0
     },()=>{
-      let overLenL = $("#drugImg").offset().left-$("#previewWrapper").offset().left
-      let overLenT = $("#drugImg").offset().top-$("#previewWrapper").offset().top
-      localStorage.setItem("changeImg",width>height?overLenT:overLenL)
+      let overLenL = $("#drugImg").offset().left-$("#previewWrapper").offset().left;
+      let overLenT = $("#drugImg").offset().top-$("#previewWrapper").offset().top;
+      localStorage.setItem("changeImg",width>height?overLenT:overLenL);
     })
   }
   handlePrev(){
@@ -148,6 +148,9 @@ class RotateImg extends Component {
   }
   handlePlus(){
     const {imgWidth,imgHeight,isMove} = this.state;
+    const { idx,imgLis } = this.props;
+    let width = imgLis[idx].width
+    let height = imgLis[idx].height
     if(this.props.isMove){
       this.setState({
         imgWidth:1.2*imgWidth,
@@ -160,10 +163,6 @@ class RotateImg extends Component {
       imgHeight:1.2*imgHeight,
       mgLeft:-imgWidth*1.2/2,
       mgTop:-imgHeight*1.2/2
-    },()=>{
-      let overLenL = $("#drugImg").offset().left-$("#previewWrapper").offset().left
-      let overLenT = $("#drugImg").offset().top-$("#previewWrapper").offset().top
-      localStorage.setItem("changeImg",width>height?overLenT:overLenL)
     })
   }
   handleReduce(){
@@ -180,10 +179,6 @@ class RotateImg extends Component {
       imgHeight:imgHeight*0.8,
       mgLeft:-imgWidth*0.8/2,
       mgTop:-imgHeight*0.8/2
-    },()=>{
-      let overLenL = $("#drugImg").offset().left-$("#previewWrapper").offset().left
-      let overLenT = $("#drugImg").offset().top-$("#previewWrapper").offset().top
-      localStorage.setItem("changeImg",width>height?overLenT:overLenL)
     })
   }
   handleRotate(flg){

src/utils/drag.js

@@ -228,6 +228,7 @@ function handleMoveImg(event){
     // console.log('bian2：'+tmpValR)
     imgDXS = page.boxLeft - imgXS - imgWXS;//相对于父元素定位
     imgDYS = page.boxTop - imgYS - imgWYS;
+
     if(wrapHeight > wrapWidth){
       drag.css({
         width:wrapWidth+'px',
@@ -248,14 +249,6 @@ function handleMoveImg(event){
         top:imgDYS+(de?tmpVal:0) + 'px'
       })
     }
-    // drag.css({
-    //   width:wrapWidth+'px',
-    //   height:wrapHeight+'px',
-    //   marginLeft:'0px',
-    //   marginTop:'0px',
-    //   left:imgDXS-(de?tmpValR:0) + 'px',
-    //   top:imgDYS+(de?tmpValR:0) + 'px'
-    // })
   }
 }
 module.exports = {