From 9f67351045280603425e3bc5daf8ee670b068909 Mon Sep 17 00:00:00 2001
From: cheng.xu <cheng.xu@meidd.com>
Date: Thu, 7 Nov 2019 21:20:48 +0800
Subject: [PATCH] 名字修改

---
 pages/user/Detailed/Detailed.js | 22 +++++++++-------------
 pages/user/cardinfo/cardinfo.js | 31 ++++++++++++++++---------------
 2 files changed, 25 insertions(+), 28 deletions(-)

diff --git a/pages/user/Detailed/Detailed.js b/pages/user/Detailed/Detailed.js
index 62013dd..0524999 100644
--- a/pages/user/Detailed/Detailed.js
+++ b/pages/user/Detailed/Detailed.js
@@ -187,12 +187,7 @@ Page({
     var unit = th.data.screenWidth / 750 * 1.35;
     var scene = getApp().globalData.user_id;
     var nickname = user.nickname;
-  
-    if (nickname.length>3){
-       nickname=nickname.substr(0, 3);
-
-      nickname = nickname+"..."
-    }
+    var nickname ="说的还是计算急急急";
    
     //---二微码---
     var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" +
@@ -207,17 +202,18 @@ Page({
 			      //开启画布
 			      const ctx = wx.createCanvasContext('myCanvas');
 			      //先画背景
-			      ctx.drawImage("../../../images/share/mackground.png", 0, 0, 554 * unit, 930 * unit);
-			      ctx.setFontSize(26 * unit);
+         ctx.drawImage("../../../images/share/mackground.png", 0, 0, 554 * unit, 899 * unit);
+			      ctx.setFontSize(24 * unit);
 			      ctx.setFillStyle("rgb(0,0,0)");
-			      ctx.fillText(nickname, 155 * unit, 75 * unit, 200 * unit);
-			          
+         ctx.fillText(nickname, 152 * unit, 76 * unit);
+         var width = 24 * nickname.length * unit + 2 * unit;
 			      var tj_path = "../../../images/share/q_tj.png";
-         ctx.drawImage(tj_path, 255 * unit, 50 * unit, 90 * unit, 30 * unit);
+         ctx.drawImage(tj_path, 152 * unit + width, 54 * unit, 95 * unit, 30 * unit);
 			      ctx.setFontSize(18 * unit);
+         ctx.setLineJoin('round'); //交点设置成圆角
 			      ctx.setFillStyle("rgb(255,255,255)");
-         ctx.fillText("强烈推荐", 265 * unit, 72 * unit);
-			      		  
+       //  ctx.fillText("强烈推荐", 265 * unit, 72 * unit);
+         ctx.fillText('强烈推荐', 149 * unit + width + 15 * unit, 76 * unit);   		  
 			      ctx.setStrokeStyle("rgb(255,255,255)");
 			      ctx.setLineDash([5 * unit, 5 * unit], 5 * unit);
 			      ctx.beginPath();
diff --git a/pages/user/cardinfo/cardinfo.js b/pages/user/cardinfo/cardinfo.js
index 99ae452..72f30ef 100644
--- a/pages/user/cardinfo/cardinfo.js
+++ b/pages/user/cardinfo/cardinfo.js
@@ -295,13 +295,6 @@ Page({
     var privilege_o = th.data.privilege_o;//勋章图片
     var img_square=th.data.img_square;
     var nickname = user.nickname;
-   
-    if (nickname.length > 3) {
-      nickname = nickname.substr(0, 3);
-
-      nickname = nickname + "..."
-    }
-   
     var app = getApp();
     var unit = th.data.screenWidth / 750 * 1.35;
     var scene = getApp().globalData.user_id;
@@ -322,17 +315,25 @@ Page({
     const ctx = wx.createCanvasContext('myCanvas');
 
   
-   //先画背景
-    ctx.drawImage("../../../images/share/mackground.png", 0, 0, 554 * unit, 930 * unit);
-    ctx.setFontSize(26 * unit);
+   //先画背景 930
+          ctx.drawImage("../../../images/share/mackground.png", 0, 0, 554 * unit, 899 * unit);
+    ctx.setFontSize(24 * unit);
     ctx.setFillStyle("rgb(0,0,0)");
-    ctx.fillText(nickname, 155 * unit, 75 * unit, 200 * unit);
-
+  //  ctx.fillText(nickname, 152 * unit, 75 * unit, 200 * unit);
+          ctx.fillText(nickname, 152 * unit, 76 * unit);
+    
+         // var width = 24 * nickname.length * unit + 2 * unit;
+          var width = 24 * nickname.length * unit + 2 * unit;
+          console.log("强烈推荐的距离：", "nickname.length", nickname.length, "unit", unit, "width", width);
     var tj_path = "../../../images/share/q_tj.png";
-    ctx.drawImage(tj_path, 255 * unit, 50 * unit, 90 * unit, 30 * unit);
+          // ctx.drawImage(tj_path, 255 * unit + width, 50 * unit, 90 * unit, 30 * unit);
+          ctx.drawImage(tj_path, 152 * unit + width, 54 * unit, 95 * unit, 30 * unit);
+
     ctx.setFontSize(18 * unit);
-    ctx.setFillStyle("rgb(255,255,255)");
-    ctx.fillText("强烈推荐", 265 * unit, 72 * unit);
+          ctx.setLineJoin('round'); //交点设置成圆角
+          ctx.setFillStyle("white");
+          ctx.fillText('强烈推荐', 149 * unit + width + 15 * unit, 76 * unit);
+      //    ctx.fillText("强烈推荐", 265 * unit + width, 72 * unit);
 
     ctx.setStrokeStyle("rgb(255,255,255)");
     ctx.setLineDash([5 * unit, 5 * unit], 5 * unit);
--
libgit2 0.21.4