wxd / MShopWeApp

Commit a1639a56472c1e8287d0ab97efafede3af1a0e11

Authored by 后端研发-苏明海
2 parents e2656260 0494ee53

Merge branch 'test' into 'qa' 

Test

See merge request !690
Inline Side-by-side
Showing 9 changed files with 29 additions and 17 deletions
packageA/images/1.jpg deleted
View file @e265626

181 KB
packageA/images/cloud.jpg deleted
View file @e265626

12 KB
pages/user/Change_phone/Change_phone.js renamed to packageB/pages/user/Change_phone/Change_phone.js
  View file @a1639a5
@@ -2,8 +2,8 @@ var a = getApp(), @@ -2,8 +2,8 @@ var a = getApp(),
2 o = a.globalData, 2 o = a.globalData,
3 r = a.globalData.setting, 3 r = a.globalData.setting,
4 t = a.request, 4 t = a.request,
5 - s = require("../../../utils/common.js"),  
6 - util = require("../../../utils/util.js"); 5 + s = require("../../../../utils/common.js"),
  6 + util = require("../../../../utils/util.js");
7 Page({ 7 Page({
8 8
9 /** 9 /**
pages/user/Change_phone/Change_phone.json renamed to packageB/pages/user/Change_phone/Change_phone.json
  View file @a1639a5
pages/user/Change_phone/Change_phone.wxml renamed to packageB/pages/user/Change_phone/Change_phone.wxml
  View file @a1639a5
pages/user/Change_phone/Change_phone.wxss renamed to packageB/pages/user/Change_phone/Change_phone.wxss
  View file @a1639a5
pages/goods/goodsInfo/goodsInfo.js
  View file @a1639a5
@@ -4084,24 +4084,32 @@ Page({ @@ -4084,24 +4084,32 @@ Page({
4084 context.setFontSize(21.3 * unit) 4084 context.setFontSize(21.3 * unit)
4085 th.draw_Text(context, share_title, 4085 th.draw_Text(context, share_title,
4086 38 * unit, 180 * unit, 200 * unit, 279 * unit, unit); 4086 38 * unit, 180 * unit, 200 * unit, 279 * unit, unit);
  4087 +
4087 //------产品的价格------- 4088 //------产品的价格-------
4088 context.setFontSize(23 * unit) 4089 context.setFontSize(23 * unit)
4089 context.setFillStyle("red") 4090 context.setFillStyle("red")
4090 - context.fillText("￥", 416 * unit, 185 * unit);  
4091 - context.setFontSize(31 * unit) 4091 +
  4092 +
4092 var pri0 = th.data.data.shop_price; 4093 var pri0 = th.data.data.shop_price;
4093 if (th.data.prom_act) 4094 if (th.data.prom_act)
4094 pri0 = th.data.prom_act.price; 4095 pri0 = th.data.prom_act.price;
4095 pri0 = parseFloat(pri0).toFixed(2); 4096 pri0 = parseFloat(pri0).toFixed(2);
4096 - context.fillText(pri0, 438 * unit, 185 * unit); 4097 + var wd1=th.data.screenWidth-ut.measureText(pri0, 31 * unit)-25;
  4098 + context.fillText("￥", wd1-15, 185 * unit);
  4099 + context.setFontSize(31 * unit)
  4100 + context.fillText(pri0, wd1, 185 * unit);
  4101 +
4097 //---市场价划掉--- 4102 //---市场价划掉---
4098 context.setFillStyle("gray") 4103 context.setFillStyle("gray")
4099 context.setFontSize(22 * unit) 4104 context.setFontSize(22 * unit)
4100 - context.fillText("￥" + th.data.data.market_price.toFixed(2), 426 * unit, 213 * unit); 4105 + pri0="￥" + th.data.data.market_price.toFixed(2);
  4106 + var wd2=th.data.screenWidth-ut.measureText(pri0, 22 * unit)-25;
  4107 + context.fillText(pri0, wd2, 213 * unit);
  4108 +
4101 context.setStrokeStyle('gray'); 4109 context.setStrokeStyle('gray');
4102 context.setLineWidth(1 * unit); 4110 context.setLineWidth(1 * unit);
4103 - context.moveTo(426 * unit, 206 * unit);  
4104 - context.lineTo(510 * unit, 206 * unit); 4111 + context.moveTo(wd2-5, 206 * unit);
  4112 + context.lineTo(wd2+ut.measureText(pri0, 22 * unit)+5, 206 * unit);
4105 context.stroke(); 4113 context.stroke();
4106 4114
4107 }else{ 4115 }else{
pages/team/team_success/team_success.js
  View file @a1639a5
@@ -484,22 +484,26 @@ Page({ @@ -484,22 +484,26 @@ Page({
484 //------产品的价格------- 484 //------产品的价格-------
485 context.setFontSize(24 * unit) 485 context.setFontSize(24 * unit)
486 context.setFillStyle("red") 486 context.setFillStyle("red")
487 - context.fillText("￥", 428 * unit, 180 * unit);  
488 - context.setFontSize(31 * unit)  
489 - 487 +
490 var pri0 = th.data.teamlist.price; 488 var pri0 = th.data.teamlist.price;
491 pri0=parseFloat(pri0).toFixed(2); 489 pri0=parseFloat(pri0).toFixed(2);
492 - context.fillText(pri0, 456 * unit, 180 * unit); 490 + var wd1=th.data.screenWidth-ut.measureText(pri0, 31 * unit)-25;
  491 + context.fillText("￥", wd1-15, 180 * unit);
  492 + context.setFontSize(31 * unit)
  493 + context.fillText(pri0, wd1, 180 * unit);
  494 +
493 //---市场价划掉--- 495 //---市场价划掉---
494 context.setFillStyle("gray") 496 context.setFillStyle("gray")
495 context.setFontSize(22 * unit) 497 context.setFontSize(22 * unit)
496 - context.fillText("￥" + th.data.goods.market_price, 438 * unit, 210 * unit); 498 + pri0= "￥" + parseFloat(th.data.goods.market_price).toFixed(2);
  499 + var wd2=th.data.screenWidth-ut.measureText(pri0, 22 * unit)-25;
  500 + context.fillText(pri0, wd2, 210 * unit);
  501 +
497 context.setStrokeStyle('gray') 502 context.setStrokeStyle('gray')
498 context.setLineWidth(1 * unit) 503 context.setLineWidth(1 * unit)
499 - context.moveTo(438 * unit, 204 * unit)  
500 - context.lineTo(510 * unit, 204 * unit) 504 + context.moveTo(wd2-5, 204 * unit)
  505 + context.lineTo(wd2+ut.measureText(pri0, 22 * unit)+5, 204 * unit)
501 context.stroke(); 506 context.stroke();
502 -  
503 console.log(th.data.share_img_localpath); 507 console.log(th.data.share_img_localpath);
504 508
505 509
pages/user/userinfo/userinfo.wxml
  View file @a1639a5
@@ -166,7 +166,7 @@ @@ -166,7 +166,7 @@
166 <input class="user-txt-right" bindblur="IdentityIDCard" value="" type="idcard" maxlength="18" placeholder="*身份证" /> 166 <input class="user-txt-right" bindblur="IdentityIDCard" value="" type="idcard" maxlength="18" placeholder="*身份证" />
167 </block> --> 167 </block> -->
168 </view> 168 </view>
169 - <view data-url="/pages/user/Change_phone/Change_phone" bindtap="go_phone" class="user-name flex-vertical-between" data-type="mobile"> 169 + <view data-url="/packageB/pages/user/Change_phone/Change_phone" bindtap="go_phone" class="user-name flex-vertical-between" data-type="mobile">
170 <view class="user-name-txt">更换手机</view> 170 <view class="user-name-txt">更换手机</view>
171 <view class="flex-center user-txt-right"> 171 <view class="flex-center user-txt-right">
172 <view class="flex">{{phone}}</view> 172 <view class="flex">{{phone}}</view>