wxd / MShopWeApp

Commit 740e186ebfee2f8306912a28fa67382c373d2df7

Authored by taiyuan
2 parents fe7bc33a 93d73303

Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

Inline Side-by-side
Showing 3 changed files with 13 additions and 16 deletions
pages/giftpack/festival/festival.js
  View file @740e186
... ... @@ -175,21 +175,20 @@ Page({
175 175 }
176 176 },
177 177 function (res) {
178   -
179 178 }
180   -
181 179 )
182   -
183 180 }
184 181 },
185 182 //获取节日有礼信息
186 183 is_festival: function(e) {
187 184 var th = this;
188 185 var url = "/api/weshop/marketing/holiday/act/judge";
  186 + console.log(th.data.getActId);
189 187 getApp().request.promiseGet(url, {
190 188 data: {
191 189 storeId: a.stoid, //商家ID
192   - userId: d.user_id //用户ID
  190 + userId: d.user_id, //用户ID
  191 + id:th.data.getActId
193 192 }
194 193 }).then(res => {
195 194 if (res.data.code == 0) {
... ... @@ -197,7 +196,6 @@ Page({
197 196 bimg: res.data.data.actImg,
198 197 actFontColor: res.data.data.actFontColor, //字体颜色
199 198 actBgColor: res.data.data.actBgColor, //背景颜色
200   -
201 199 })
202 200 }
203 201 })
... ...
pages/giftpack/festival/festival.wxml
  View file @740e186
1 1 <view style="background-color:{{actBgColor==undefined?'#FFB72D':actBgColor}}">
2 2 <view class="image_box">
3   - <image src="{{iurl+bimg}}" lazy-load="true"></image>
  3 + <image src="{{iurl+bimg?bimg:'/miniapp/images/default_g_img.gif'}}" binderror="bind_bnerr1" data-errorimg="bimg" lazy-load="true"></image>
4 4 </view>
5 5 <block wx:if="{{itemShow}}">
6 6 <view class="top rel">
... ...
pages/goods/goodsInfo/goodsInfo.js
  View file @740e186
... ... @@ -2098,7 +2098,6 @@ Page({
2098 2098 async get_sku(stoid, gd, g_id, is_normal, func) {
2099 2099 var tt = this,arrdata=null;
2100 2100 var now=ut.gettimestamp();
2101   -
2102 2101 await getApp().request.promiseGet("/api/weshop/goods/page", {
2103 2102 data: {
2104 2103 store_id: o.stoid,
... ... @@ -4210,10 +4209,10 @@ Page({
4210 4209 if(th.data.poster){
4211 4210 var erm_x= parseFloat(th.data.poster.ewm_x)*2;
4212 4211 var erm_y= parseFloat(th.data.poster.ewm_y)*2;
4213   - context.drawImage(vpath, erm_x * unit, erm_y * unit, 120 * unit, 120 * unit);
  4212 + context.drawImage(vpath, erm_x * unit, erm_y * unit, 136 * unit, 136 * unit);
4214 4213 }else{
4215 4214 //---二维吗图---
4216   - context.drawImage(vpath, 410 * unit, 726 * unit, 115 * unit, 125 * unit);
  4215 + context.drawImage(vpath, 390 * unit, 726 * unit, 136 * unit, 136 * unit);
4217 4216 }
4218 4217  
4219 4218 break;
... ... @@ -4243,10 +4242,10 @@ Page({
4243 4242 if(th.data.poster){
4244 4243 var erm_x= parseFloat(th.data.poster.ewm_x)*2;
4245 4244 var erm_y= parseFloat(th.data.poster.ewm_y)*2;
4246   - context.drawImage(vpath, erm_x * unit, erm_y * unit, 120 * unit, 120 * unit);
  4245 + context.drawImage(vpath, erm_x * unit, erm_y * unit, 135 * unit, 135 * unit);
4247 4246 }else{
4248 4247 //---二维吗图---
4249   - context.drawImage(vpath, 420 * unit, 726 * unit, 120 * unit, 120 * unit);
  4248 + context.drawImage(vpath, 390 * unit, 726 * unit, 135 * unit, 135 * unit);
4250 4249 }
4251 4250 break;
4252 4251  
... ... @@ -4290,10 +4289,10 @@ Page({
4290 4289 if(th.data.poster){
4291 4290 var erm_x= parseFloat(th.data.poster.ewm_x)*2;
4292 4291 var erm_y= parseFloat(th.data.poster.ewm_y)*2;
4293   - context.drawImage(vpath, erm_x * unit, erm_y * unit, 120 * unit, 120 * unit);
  4292 + context.drawImage(vpath, erm_x * unit, erm_y * unit, 136 * unit, 136 * unit);
4294 4293 }else{
4295 4294 //---二维吗图---
4296   - context.drawImage(vpath, 420 * unit, 726 * unit, 120 * unit, 120 * unit);
  4295 + context.drawImage(vpath, 390 * unit, 726 * unit, 136 * unit, 136 * unit);
4297 4296 }
4298 4297 break
4299 4298 case 3: //阶梯团的展示
... ... @@ -4334,7 +4333,7 @@ Page({
4334 4333 context.setFillStyle("black")
4335 4334 context.fillText("快来和我一起拼团吧！", 40 * unit, 820 * unit);
4336 4335 //context.font = 'normal bold 18px sans-serif';
4337   - context.setFontSize(22 * unit)
  4336 + context.setFontSize(21 * unit)
4338 4337 context.fillText("长按识别二维码，立即参团", 40 * unit, 850 * unit);
4339 4338  
4340 4339  
... ... @@ -4342,10 +4341,10 @@ Page({
4342 4341 if(th.data.poster){
4343 4342 var erm_x= parseFloat(th.data.poster.ewm_x)*2;
4344 4343 var erm_y= parseFloat(th.data.poster.ewm_y)*2;
4345   - context.drawImage(vpath, erm_x * unit, erm_y * unit, 120 * unit, 120 * unit);
  4344 + context.drawImage(vpath, erm_x * unit, erm_y * unit, 136 * unit, 136 * unit);
4346 4345 }else{
4347 4346 //---二维吗图---
4348   - context.drawImage(vpath, 420 * unit, 726 * unit, 120 * unit, 120 * unit);
  4347 + context.drawImage(vpath, 390 * unit, 726 * unit, 136 * unit, 136 * unit);
4349 4348 }
4350 4349 break
4351 4350  
... ...