diff --git a/packageA/images/1.jpg b/packageA/images/1.jpg
deleted file mode 100644
index 11bbed6..0000000
--- a/packageA/images/1.jpg
+++ /dev/null
diff --git a/packageA/images/cloud.jpg b/packageA/images/cloud.jpg
deleted file mode 100644
index 00742e0..0000000
--- a/packageA/images/cloud.jpg
+++ /dev/null
diff --git a/pages/user/Change_phone/Change_phone.js b/packageB/pages/user/Change_phone/Change_phone.js
index 9f3d054..303f7d0 100644
--- a/pages/user/Change_phone/Change_phone.js
+++ b/packageB/pages/user/Change_phone/Change_phone.js
@@ -2,8 +2,8 @@ var a = getApp(),
o = a.globalData,
r = a.globalData.setting,
t = a.request,
- s = require("../../../utils/common.js"),
- util = require("../../../utils/util.js");
+ s = require("../../../../utils/common.js"),
+ util = require("../../../../utils/util.js");
Page({
/**
diff --git a/pages/user/Change_phone/Change_phone.json b/packageB/pages/user/Change_phone/Change_phone.json
index 8003812..8003812 100644
--- a/pages/user/Change_phone/Change_phone.json
+++ b/packageB/pages/user/Change_phone/Change_phone.json
diff --git a/pages/user/Change_phone/Change_phone.wxml b/packageB/pages/user/Change_phone/Change_phone.wxml
index 465e2e6..465e2e6 100644
--- a/pages/user/Change_phone/Change_phone.wxml
+++ b/packageB/pages/user/Change_phone/Change_phone.wxml
diff --git a/pages/user/Change_phone/Change_phone.wxss b/packageB/pages/user/Change_phone/Change_phone.wxss
index 1f435ff..1f435ff 100644
--- a/pages/user/Change_phone/Change_phone.wxss
+++ b/packageB/pages/user/Change_phone/Change_phone.wxss
diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index 0470959..9015a9f 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -4084,24 +4084,32 @@ Page({
context.setFontSize(21.3 * unit)
th.draw_Text(context, share_title,
38 * unit, 180 * unit, 200 * unit, 279 * unit, unit);
+
//------产品的价格-------
context.setFontSize(23 * unit)
context.setFillStyle("red")
- context.fillText("￥", 416 * unit, 185 * unit);
- context.setFontSize(31 * unit)
+
+
var pri0 = th.data.data.shop_price;
if (th.data.prom_act)
pri0 = th.data.prom_act.price;
pri0 = parseFloat(pri0).toFixed(2);
- context.fillText(pri0, 438 * unit, 185 * unit);
+ var wd1=th.data.screenWidth-ut.measureText(pri0, 31 * unit)-25;
+ context.fillText("￥", wd1-15, 185 * unit);
+ context.setFontSize(31 * unit)
+ context.fillText(pri0, wd1, 185 * unit);
+
//---市场价划掉---
context.setFillStyle("gray")
context.setFontSize(22 * unit)
- context.fillText("￥" + th.data.data.market_price.toFixed(2), 426 * unit, 213 * unit);
+ pri0="￥" + th.data.data.market_price.toFixed(2);
+ var wd2=th.data.screenWidth-ut.measureText(pri0, 22 * unit)-25;
+ context.fillText(pri0, wd2, 213 * unit);
+
context.setStrokeStyle('gray');
context.setLineWidth(1 * unit);
- context.moveTo(426 * unit, 206 * unit);
- context.lineTo(510 * unit, 206 * unit);
+ context.moveTo(wd2-5, 206 * unit);
+ context.lineTo(wd2+ut.measureText(pri0, 22 * unit)+5, 206 * unit);
context.stroke();
}else{
diff --git a/pages/team/team_success/team_success.js b/pages/team/team_success/team_success.js
index b185dda..d7654e5 100644
--- a/pages/team/team_success/team_success.js
+++ b/pages/team/team_success/team_success.js
@@ -484,22 +484,26 @@ Page({
//------产品的价格-------
context.setFontSize(24 * unit)
context.setFillStyle("red")
- context.fillText("￥", 428 * unit, 180 * unit);
- context.setFontSize(31 * unit)
-
+
var pri0 = th.data.teamlist.price;
pri0=parseFloat(pri0).toFixed(2);
- context.fillText(pri0, 456 * unit, 180 * unit);
+ var wd1=th.data.screenWidth-ut.measureText(pri0, 31 * unit)-25;
+ context.fillText("￥", wd1-15, 180 * unit);
+ context.setFontSize(31 * unit)
+ context.fillText(pri0, wd1, 180 * unit);
+
//---市场价划掉---
context.setFillStyle("gray")
context.setFontSize(22 * unit)
- context.fillText("￥" + th.data.goods.market_price, 438 * unit, 210 * unit);
+ pri0= "￥" + parseFloat(th.data.goods.market_price).toFixed(2);
+ var wd2=th.data.screenWidth-ut.measureText(pri0, 22 * unit)-25;
+ context.fillText(pri0, wd2, 210 * unit);
+
context.setStrokeStyle('gray')
context.setLineWidth(1 * unit)
- context.moveTo(438 * unit, 204 * unit)
- context.lineTo(510 * unit, 204 * unit)
+ context.moveTo(wd2-5, 204 * unit)
+ context.lineTo(wd2+ut.measureText(pri0, 22 * unit)+5, 204 * unit)
context.stroke();
-
console.log(th.data.share_img_localpath);
diff --git a/pages/user/userinfo/userinfo.wxml b/pages/user/userinfo/userinfo.wxml
index 9b2188d..6e0aabd 100644
--- a/pages/user/userinfo/userinfo.wxml
+++ b/pages/user/userinfo/userinfo.wxml
@@ -166,7 +166,7 @@
-->
-
+
更换手机
{{phone}}