Merge branch 'master' into newlive_jyh

src/components/plugin/shareCard.vue

@@ -158,7 +158,9 @@ export default {
             
             
                 this.server.live.liveDetail(temp).then(res=>{
-                    let photo=res.data.data.udPhotoFileid
+                    let photo=this.$route.query.headPhoto
+                    // this.$route.query.headPhoto
+                     console.log("当前头像信息",photo)
                     let boxImg=res.data.data.lvrImgLargeUrl
                     
                     // this.headPro=res.data.data.udPhotoFileid//头像图片
@@ -194,7 +196,7 @@ let aca=document.querySelector("#myImage")
         // var image = canvas.toDataURL("image/png").replace("image/png", "image/octet-stream");
         
         
-        console.log("案说法",canvas.toDataURL())
+        console.log("案说法1",canvas.toDataURL())
         this.photoImg=canvas.toDataURL()
         if(this.photoImg){
            this.ifPhoto=true
@@ -219,7 +221,7 @@ let aca=document.querySelector("#myImage")
     img.onload = function() {
       var base64Url = that.getBase64Image(img)
       
-      console.log("的撒发生",base64Url) // 最终拿到的base64值
+      console.log("的撒发生1",base64Url) // 最终拿到的base64值
       
       that.headPro=base64Url
     }
@@ -468,25 +470,25 @@ font-size: 4vw;
     position: absolute;
     top: 10vw;
     z-index: 100;
-    left: 14vw;
+    left: 14.4vw;
     border-radius: 50%;
 }
 .headImgTwo{
-        height: 19vw;
-    width: 19vw;
+        height: 20vw;
+    width: 20vw;
     position: absolute;
     top: 10vw;
     z-index: 100;
-    left: 14.5vw;
+    left: 14vw;
     border-radius: 50%;
 }
 .headImgThree{
-    height: 19vw;
-    width: 19vw;
+    height: 20vw;
+    width: 20vw;
     position: absolute;
     top: 10vw;
     z-index: 100;
-    left: 32.5vw;
+    left: 32.3vw;
     border-radius: 50%;
 }
 .udStyle{