From 1e618d67939489da6225621c12338cbc0ce20d33 Mon Sep 17 00:00:00 2001 From: yvan.ni Date: Mon, 6 Mar 2023 10:15:46 +0800 Subject: [PATCH] 1、OA单 2、日常问题排查 --- components/diy_goodsGroup/diy_goodsGroup.js | 9 ++++++--- packageC/pages/presell/goodsInfo/goodsInfo.js | 9 +++++---- packageE/pages/cart/cart2/cart2.js | 10 +++++++--- pages/user/assistance/task_assistance.js | 53 ++++++++++++++++++++++++++++++++--------------------- pages/user/assistance/task_assistance.wxml | 7 ++++++- 5 files changed, 56 insertions(+), 32 deletions(-) diff --git a/components/diy_goodsGroup/diy_goodsGroup.js b/components/diy_goodsGroup/diy_goodsGroup.js index 93f9bf3..4cf2155 100644 --- a/components/diy_goodsGroup/diy_goodsGroup.js +++ b/components/diy_goodsGroup/diy_goodsGroup.js @@ -242,7 +242,7 @@ Component({ if (!user_id) user_id = 0; r_data.user_id = user_id; - await app.request.promiseGet("/api/weshop/goods/page?isnewwhere=1", { + await app.request.promiseGet("/api/weshop/goods/page", { data: r_data }).then(res => { th.data.loading = 0; @@ -471,7 +471,7 @@ Component({ prom_id = val.prom_id; - var prom_type = val.prom_type; //0普通商品 1秒杀 6拼单 2团购 4积分购 + var prom_type = item.prom_type; //0普通商品 1秒杀 6拼单 2团购 4积分购 var url = ""; @@ -518,7 +518,10 @@ Component({ var prom = null; if (res && res.data) prom = res.data.data; if (prom != null && prom.is_end == 0 && prom.end_time > now && (prom.start_time < now || (prom.show_time && prom.show_time < now))) { - item.prom_price = res.data.data.price; + item.prom_price = res.data.data.price; + console.log(res.data.data) + console.log('11111'); + if (res.data.data.user_price) item.prom_price = res.data.data.user_price; var vNum = res.data.data.virtual_num ? res.data.data.virtual_num : 0; var vNum1 = res.data.data.virtualNum ? res.data.data.virtualNum : 0; diff --git a/packageC/pages/presell/goodsInfo/goodsInfo.js b/packageC/pages/presell/goodsInfo/goodsInfo.js index d7feca2..d044818 100644 --- a/packageC/pages/presell/goodsInfo/goodsInfo.js +++ b/packageC/pages/presell/goodsInfo/goodsInfo.js @@ -589,7 +589,7 @@ Page({ } } } - + let length = fir_quan.length if (length <= 3) { arr = fir_quan @@ -3445,9 +3445,10 @@ Page({ tt(); return false; } - var img_url = ee.data.data.original_img; - //var img_url = ee.data.presellForm.share_img; - //img_url?img_url:ee.data.data.original_img; + + //var img_url = ee.data.data.original_img; + var img_url = ee.data.iurl+ee.data.presellForm.share_img; + img_url?img_url:ee.data.data.original_img; //获取商品是分享图信息 wx.getImageInfo({ diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js index 5b53bb5..aad711f 100644 --- a/packageE/pages/cart/cart2/cart2.js +++ b/packageE/pages/cart/cart2/cart2.js @@ -5502,7 +5502,7 @@ Page({ } } } - console.error('优惠活动1'); + //------------------- return getApp().request.promiseGet("/api/weshop/goods/getDiscount", { data: { @@ -5533,7 +5533,7 @@ Page({ //-- 看是不是有赠品 -- if (get_data.gift_id && parseInt(get_data.zp_mode) != 1 && get_data.zp_num * arr.bs <= get_data.limit_num - && get_data.zp_num * arr.bs <= get_data.gift_storecount + && get_data.zp_num * arr.bs <= get_data.gift_storecount && get_data.goodsinfo ) { arr.gift_id = get_data.gift_id; arr.gift_goods_id = get_data.goods_id; @@ -6016,6 +6016,9 @@ Page({ setexptype2: function (e) { + if(this.data.submit) return false; + this.setData({ submit: 1 }); + if(this.data.all_collocation_list){ var bn_coll= this.selectComponent('#bn_coll'); bn_coll.clear_sele(); @@ -6032,7 +6035,8 @@ Page({ setexptype_w2: function (e) { - + if(this.data.submit) return false; + this.setData({ submit: 1 }); for (let i = 0; i { + + + + var rpxR = 750 / res.screenWidth; + var r_height=res.windowHeight*rpxR; + + console.log(r_height,'11111') + th.setData({ - screenWidth: res.screenWidth + screenWidth: res.screenWidth, + r_heght:r_height }) + } }) }, @@ -761,6 +779,7 @@ Page({ var th = this; if (th.data.is_generate) return; th.data.is_generate = 1; + th.setData({canvasHidden:0}); var scene = this.data.is_user_task.id; ///二微码 @@ -782,7 +801,9 @@ Page({ var iurl = th.data.iurl; //图片地址前缀 const ctx = wx.createCanvasContext('share_id'); //绘图上下文 - var unit = th.data.screenWidth / 750 * 1.35; + var unit = th.data.screenWidth / 750 * (750/445); + + var numsize = 20 * unit; //几人助力字体大小 var head_list_img = th.data.head_pic_arr; var num = th.data.head_pic_arr.length; //已有几位好友助力 @@ -800,7 +821,7 @@ Page({ var left = 74 * unit; //助力人头像跟左边的距离 var spacing = 12 * unit; //助力人图片间距 var images = th.data.images; - ctx.drawImage(images[0], 0, 0, 445 * unit, 700 * unit); //分享的背景图片 + ctx.drawImage(images[0], 0, 0, 445 * unit, 1200 * th.data.screenWidth / 750); //分享的背景图片 ctx.drawImage(images[1], 37 * unit, 185 * unit, 370 * unit, 377 * unit); //分享的背景图片 console.log(111); @@ -926,14 +947,15 @@ Page({ // success: function (res) { //把画板内容绘制成图片，并回调 画板图片路径 ctx.draw(false, function () { + setTimeout(function () { wx.canvasToTempFilePath({ x: 0, y: 0, - width: 300, - height: 500, - destWidth: 400 * 2, - destHeight: 720 * 2, + width: 750, + height: 1200, + destWidth:1.2* 750 * 750 / th.data.screenWidth, + destHeight:1.2 *1200* 750 / th.data.screenWidth, canvasId: 'share_id', success: function (res) { wx.hideLoading(); @@ -945,7 +967,6 @@ Page({ canvasHidden: 1, is_share: 1, is_generate: 0, - canvasHidden: 1 }) if (!res.tempFilePath) { wx.showModal({ @@ -991,17 +1012,7 @@ Page({ is_share: 0 }) }, - syinfo: function () { - var th = this; - //获取用户设备信息，屏幕宽度 - wx.getSystemInfo({ - success: res => { - th.setData({ - screenWidth: res.screenWidth - }) - } - }) - }, + //把固定的图片加载到本地 imageinfo: async function () { diff --git a/pages/user/assistance/task_assistance.wxml b/pages/user/assistance/task_assistance.wxml index d98965e..2568c34 100644 --- a/pages/user/assistance/task_assistance.wxml +++ b/pages/user/assistance/task_assistance.wxml @@ -178,16 +178,21 @@ - + + + + + + -- libgit2 0.21.4