diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js index 41e6cba..42819a4 100644 --- a/pages/cart/cart2/cart2.js +++ b/pages/cart/cart2/cart2.js @@ -500,8 +500,9 @@ Page({ getApp().globalData.is_card_back=0; th.setData({card_cut_price:0}); }else{ - //--- 商品不能是搭配购，商家等级卡开通的情况下, 会员不是等级会员的情况， 商品有设置等级卡价格，同时等级卡价格小于商品的价格 - if(gd['prom_type']!=5 && gd['prom_type']!=6 && th.data.card_name && gd[th.data.card_name]>0 && gg.goods_price>gd[th.data.card_name] && !th.data.userinfo.card_field){ + //--- 商家等级卡开通的情况下, 会员不是等级会员的情况， 商品有设置等级卡价格，同时等级卡价格小于商品的价格 + //-- 搭配购的商品也可以单独购买，所以此时搭配购的商品要进行计算优惠 -- + if(!gg.collocation_goods && gd['prom_type']!=6 && th.data.card_name && gd[th.data.card_name]>0 && gg.goods_price>gd[th.data.card_name] && !th.data.userinfo.card_field){ var cut_p= gg.goods_price-gd[th.data.card_name]; th.setData({card_cut_price:cut_p}); } diff --git a/pages/cart/cart2_pt/cart2_pt.js b/pages/cart/cart2_pt/cart2_pt.js index f4cbce2..5222fd6 100644 --- a/pages/cart/cart2_pt/cart2_pt.js +++ b/pages/cart/cart2_pt/cart2_pt.js @@ -1,6 +1,6 @@ var t = getApp(),app=t, a = t.request, e = require("../../../utils/common.js"), s = require("../../../utils/util.js"), o = require("../../../utils/md5.js"), to = getApp(); -var oo=t.globalData.setting; +var oo=t.globalData.setting,os=oo; var regeneratorRuntime = require('../../../utils/runtime.js'); var util_pay = require("../../../utils/pay.js"); @@ -58,6 +58,11 @@ Page({ is_normal:0, is_express:0,//选择物流的控制器 yuer:0, + + rank_switch:0, //是不是开同等级卡 + show_card:null, //显示的等级卡 + card_name:'', //显示的卡的名称 + card_cut_price:null,//减价多少钱 }, onLoad: function(t) { console.log("onLoad_pt_cart"); @@ -75,7 +80,7 @@ Page({ if(appD.is_pt_tz) th.data.is_pt_tz=appD.is_pt_tz; th.data.param=t; //先获取物流，再获取用户信息，再展示页面 - th.get_wuliu(th.get_info(th.show_page)); + //th.get_wuliu(th.get_info(th.show_page)); }, onUnload: function () { this.setData({ isclose: 1 })}, @@ -178,6 +183,25 @@ Page({ t.data.data.prom_id = 0; t.data.data.prom_type = 0; t.data.data.is_normal=1; + + var gd=t.data.data; + //-- 用商品的手店价来显示 -- + gg.goods_price=gd.shop_price; + //---是不是购买等级卡成功的返回---等级卡显示的判断--- + var is_card_back=getApp().globalData.is_card_back; + if(is_card_back){ + gg.goods_price=gd[th.data.card_name]; + t.data.data.shop_price=gg.goods_price; + getApp().globalData.is_card_back=0; + th.setData({card_cut_price:0}); + }else{ + //--- 商品不能是搭配购，商家等级卡开通的情况下, 会员不是等级会员的情况， 商品有设置等级卡价格，同时等级卡价格小于商品的价格 + if(th.data.card_name && gd[th.data.card_name]>0 && gg.goods_price>gd[th.data.card_name] && !th.data.userinfo.card_field){ + var cut_p= gg.goods_price-gd[th.data.card_name]; + th.setData({card_cut_price:cut_p}); + } + } + th.setData({ bn_goods: t.data.data, bn_pickname: gg.pick_name, bn_exp_type: et, bn_pick: gg.pick_id, bn_t_exp_t: distr_t, is_normal:1 @@ -244,6 +268,56 @@ Page({ getApp().globalData.is_cart2_old=0; } } + + //先获取是否有关闭使用优惠券 + getApp().getConfig2(function (ee) { + var json_d = JSON.parse(ee.switch_list); + th.data.ispt_goods=json_d.ispt_goods; //是不是平摊到单品的控制参数赋值 + th.setData({ is_close_quan: json_d.is_close_quan,sales_rules:ee.sales_rules,rank_switch:json_d.rank_switch}); + + var rank_switch=json_d.rank_switch; + var max_price=-1; + var show_card=null; + var name=""; + //如果有开等级卡的时候, + //因为都是调接口，要返回在计算 + if(rank_switch==2){ + //-- 获取所有的等级卡, -- + getApp().request.promiseGet("/api/weshop/plus/vip/mem/bership/list?storeId=" + os.stoid, + {}).then(res => { + if(res.data.code==0){ + var plusCard = res.data.data; + //-- 循环判断，拿到最贵的那张卡 -- + for(var ih in plusCard){ + if(plusCard[ih].IsStopBuy == true){ continue; } + if(max_price<0){ + max_price=plusCard[ih].CardFee; + name='card'+plusCard[ih]['CorrPrice']; + show_card=plusCard[ih]; + }else{ + if(max_pricex{{bn_goods.buynum}} --> + + + + + + + {{show_card.CardName}} + + 立减 {{filters.toFix(card_cut_price,2) }} 元 + + + vip超级会员仅需{{show_card.CardFee}}元 + + + + + 立即开通 + + + {{order.store_prom}} diff --git a/pages/cart/cart2_pt/cart2_pt.wxss b/pages/cart/cart2_pt/cart2_pt.wxss index 0da96cd..f427bcd 100644 --- a/pages/cart/cart2_pt/cart2_pt.wxss +++ b/pages/cart/cart2_pt/cart2_pt.wxss @@ -899,3 +899,61 @@ margin-left: 20rpx; background: none; opacity: 1; } + +.plus_buy{ + background-color: #fff; + margin:15rpx 0; + padding: 20rpx 10rpx; + position: relative; +} + + +.card_bg { + box-sizing: border-box; + padding: 2rpx 10rpx; + height: 28rpx; + border-radius: 26rpx; + font-size: 18rpx; + line-height: 28rpx; + max-width: 210rpx; + background: #333; + color: #fff; + margin-left: 8rpx; + position:relative; + top:7rpx; +} + +.card_bg image { + width: 19rpx; + height: 19rpx; + margin-right: 8rpx; +} + +/* .card_bg .card_name { + max-width: 76rpx; + width: auto; + overflow: hidden; + white-space: nowrap; +} */ + +.card_name { + position: relative; + top: -4rpx; + margin-left: 6px; +} + +.car_tri_up { + width: 0;height: 0; + border-left: 20rpx solid transparent; + border-right: 20rpx solid transparent; + border-bottom: 20rpx solid #fff; + position: absolute; + right: 20rpx; + top:-10rpx +} +.card_op{ + position: absolute; + right: 20rpx; + top:36rpx +} + diff --git a/pages/goods/categoryList/categoryList.wxml b/pages/goods/categoryList/categoryList.wxml index bc36e0b..62d4510 100644 --- a/pages/goods/categoryList/categoryList.wxml +++ b/pages/goods/categoryList/categoryList.wxml @@ -1,5 +1,6 @@ + @@ -419,9 +420,12 @@ + - + + + @@ -446,7 +450,8 @@ - + + ￥{{item.shop_price}} ￥{{item.market_price}} @@ -463,6 +468,7 @@ + 666 ￥{{item.shop_price}} ￥{{item.market_price}} diff --git a/pages/goods/categoryList/g_filter.wxs b/pages/goods/categoryList/g_filter.wxs new file mode 100644 index 0000000..e56218e --- /dev/null +++ b/pages/goods/categoryList/g_filter.wxs @@ -0,0 +1,91 @@ +var g_filters = { + //-- 判断是不是有等级价 -- + is_has_rank:function(rank_switch,item){ + if(!rank_switch) return false; + if(item.cardprice1 || item.cardprice2 || item.cardprice3) {return true} + return false; + }, + + //-- 判断,不是等级会员时候，要显示的最低等级价和名称 -- + get_card_price:function(goods,all_card,type){ + var price1=parseFloat(goods['cardprice1']); + var price2=parseFloat(goods['cardprice2']); + var price3=parseFloat(goods['cardprice3']); + if(!all_card){ + if(type==0) return 0; + return ""; + } + + + var arr=[]; + var min_price= 0; + var min_name=""; + + var min_price=null; + var min_name=null; + //---设置对应的价格名字---- + for(var i=0;i<3;i++) { + var vl=all_card[i]; + if(!vl) continue; + if(vl['CorrPrice']=="Price1" && price1>0) + { + + if(min_price==null) { + min_price=price1;min_name=vl['CardName']; + } + else if(price10) + { + if(min_price==null) { + min_price=price2;min_name=vl['CardName']; + } + else if(price20) + { + if(min_price==null) { + min_price=price3;min_name=vl['CardName']; + } + else if(price37) min_name=min_name.substring(0, 8); + return min_name; + }, +} +module.exports = { + is_has_rank:g_filters.is_has_rank, + get_card_price:g_filters.get_card_price, +} \ No newline at end of file diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js index f487420..cfb698b 100644 --- a/pages/goods/goodsInfo/goodsInfo.js +++ b/pages/goods/goodsInfo/goodsInfo.js @@ -236,11 +236,12 @@ Page({ sales_rules:1, //默认是线上销售 wait_for_user_store:null, - prom_goods:null, //商品优惠列表 order_prom:null, //订单优惠 collocationGoods:null, //搭配购 - + + poster:null, //自定义海报 + share_b_img:'', //自定义分享的背景 }, //------初始化加载---------- @@ -254,7 +255,37 @@ Page({ gid = t.goods_id, first_leader=t.first_leader, room_id=t.room_id; - + + //-- 自定义海报 -- + getApp().request.promiseGet("/api/weshop/goods/poster/page",{ + data:{store_id:os.stoid, type:1, is_user:1 } + }).then(res=>{ + if(res.data.code==0){ + + var poster_data=res.data.data.pageData[0]; + var json_str=poster_data.jsonStr; + + if(json_str){ + var json_data=JSON.parse(json_str); + if(json_data.bg_img){ + + //-- 把图片那到本地 -- + wx.getImageInfo({ + src:json_data.bg_img, + success: function(res) { + var path= res.path; + th.setData({share_b_img:path}) + }, + fail: function(res) {} + }); + } + + th.setData({poster:json_data}) + + } + } + }) + //---获取手机地址坐标-- //--如果tg_id是空的话，分享回来-- if (gid == undefined || gid == null || gid == "") { @@ -369,7 +400,7 @@ Page({ }) } }); - + //获取用户的默认门店 getApp().get_user_store(function(ee) { @@ -449,6 +480,8 @@ Page({ }); + + }, //------------程序初始化入口------------- @@ -3270,7 +3303,7 @@ Page({ }) var app = getApp(); - var unit = that.data.screenWidth / 750 * 1.35; + var unit = that.data.screenWidth / 750 * 1.35; //基础单位， var path2 = that.data.data.original_img; var scene = th.data.gid+""; var user_id=getApp().globalData.user_id?getApp().globalData.user_id:0; @@ -3294,19 +3327,51 @@ Page({ var context = wx.createCanvasContext('share'); //先画背景 var pg_path = "../../../images/share/share_bg.png"; + + //-- 如果有自定义海报的时候，判断背景的图片 -- + if(th.data.share_b_img){ + //pg_path=th.data.share_b_img; + } context.drawImage(pg_path, 0, 0, 554 * unit, 899 * unit); - //--昵称--- - context.setFontSize(24 * unit) - context.setFillStyle("black") - context.fillText(app.globalData.userInfo.nickname, 152 * unit, 76 * unit); - var width = 24 * app.globalData.userInfo.nickname.length * unit + 2 * unit; - //强烈推荐 改许程 - var tj_path = "../../../images/share/q_tj.png"; - context.drawImage(tj_path, 152 * unit + width, 54 * unit, 85 * unit, 30 * unit); - context.setFontSize(16 * unit) - context.setLineJoin('round'); //交点设置成圆角 - context.setFillStyle("white") - context.fillText('强烈推荐', 149 * unit + width + 15 * unit, 76 * unit); + + //-- 是自定义海报的情况下 -- + if(th.data.poster){ + //在线上分享人的情况下 + if(parseInt(th.data.poster.show_headpic)){ + //获取坐标 + var x=parseFloat(th.data.poster.head_x)*2; + var y=parseFloat(th.data.poster.head_y)*2; + var x1=(x+90) *unit; + var y1=(y+50) *unit; + //--昵称--- + context.setFontSize(24 * unit) + context.setFillStyle("black") + context.fillText(app.globalData.userInfo.nickname, x1, y1); + var width = 24 * app.globalData.userInfo.nickname.length * unit + 4 * unit; + //强烈推荐 改许程 + var tj_path = "../../../images/share/q_tj.png"; + context.drawImage(tj_path, x1 + width, y1-22*unit, 85 * unit, 30 * unit); + context.setFontSize(16 * unit) + context.setLineJoin('round'); //交点设置成圆角 + context.setFillStyle("white") + context.fillText('强烈推荐', x1 + width+8*unit, y1-1*unit); + } + }else{ + //--昵称--- + context.setFontSize(24 * unit) + context.setFillStyle("black") + context.fillText(app.globalData.userInfo.nickname, 152 * unit, 76 * unit); + var width = 24 * app.globalData.userInfo.nickname.length * unit + 2 * unit; + //强烈推荐 改许程 + var tj_path = "../../../images/share/q_tj.png"; + context.drawImage(tj_path, 152 * unit + width, 54 * unit, 85 * unit, 30 * unit); + context.setFontSize(16 * unit) + context.setLineJoin('round'); //交点设置成圆角 + context.setFillStyle("white") + context.fillText('强烈推荐', 149 * unit + width + 15 * unit, 76 * unit); + } + + //---产品名称--- //文本换行 参数：1、canvas对象，2、文本 3、距离左侧的距离 4、距离顶部的距离 5、6、文本的宽度 @@ -3340,21 +3405,45 @@ Page({ switch (type) { case 0: //普通商品的展示 //中间的几个字 - var g_path = "../../../images/share/s_gou.png"; - context.drawImage(g_path, 56 * unit, 670 * unit, 22 * unit, 22 * unit); - context.setFillStyle("red") - context.setFontSize(18 * unit) - context.fillText("正品保证", 84 * unit, 690 * unit); - - context.drawImage(g_path, 218 * unit, 670 * unit, 22 * unit, 22 * unit); - context.setFillStyle("red") - context.setFontSize(18 * unit) - context.fillText("纯实体店", 246 * unit, 690 * unit); - - context.drawImage(g_path, 388 * unit, 670 * unit, 22 * unit, 22 * unit); - context.setFillStyle("red") - context.setFontSize(18 * unit) - context.fillText("官方验证", 420 * unit, 690 * unit); + if(th.data.poster ){ + + if(parseInt(th.data.poster.show_quality)){ + var g_path = "../../../images/share/s_gou.png"; + context.drawImage(g_path, 56 * unit, 670 * unit, 22 * unit, 22 * unit); + context.setFillStyle("red") + context.setFontSize(18 * unit) + context.fillText("正品保证", 84 * unit, 690 * unit); + + context.drawImage(g_path, 218 * unit, 670 * unit, 22 * unit, 22 * unit); + context.setFillStyle("red") + context.setFontSize(18 * unit) + context.fillText("纯实体店", 246 * unit, 690 * unit); + + context.drawImage(g_path, 388 * unit, 670 * unit, 22 * unit, 22 * unit); + context.setFillStyle("red") + context.setFontSize(18 * unit) + context.fillText("官方验证", 420 * unit, 690 * unit); + } + + }else{ + var g_path = "../../../images/share/s_gou.png"; + context.drawImage(g_path, 56 * unit, 670 * unit, 22 * unit, 22 * unit); + context.setFillStyle("red") + context.setFontSize(18 * unit) + context.fillText("正品保证", 84 * unit, 690 * unit); + + context.drawImage(g_path, 218 * unit, 670 * unit, 22 * unit, 22 * unit); + context.setFillStyle("red") + context.setFontSize(18 * unit) + context.fillText("纯实体店", 246 * unit, 690 * unit); + + context.drawImage(g_path, 388 * unit, 670 * unit, 22 * unit, 22 * unit); + context.setFillStyle("red") + context.setFontSize(18 * unit) + context.fillText("官方验证", 420 * unit, 690 * unit); + } + + //---画线--- context.setLineWidth(1 * unit) context.moveTo(32 * unit, 710 * unit) @@ -3363,15 +3452,21 @@ Page({ //---文字--- context.setFillStyle("black") context.setFontSize(22 * unit) - // 原来start ---> - context.fillText("优惠乐翻天，精彩就在你身边", 40 * unit, 776 * unit); - context.fillText("长按识别二维码，立即开始抢购", 40 * unit, 826 * unit); - // <--- 原来end - // context.fillText("优惠乐翻天，精彩就在你身边", 40 * unit, 816 * unit); - // context.setFontSize(18 * unit) - // context.fillText("长按识别二维码，立即开始抢购", 40 * unit, 850 * unit); - //---二维吗图--- - context.drawImage(vpath, 380 * unit, 736 * unit, 120 * unit, 120 * unit); + // 原来start ---> + context.fillText("优惠乐翻天，精彩就在你身边", 40 * unit, 776 * unit); + context.fillText("长按识别二维码，立即开始抢购", 40 * unit, 826 * unit); + + //---二维吗图--- + //-- 自定义海报 -- + if(th.data.poster){ + var erm_x= parseFloat(th.data.poster.ewm_x)*2; + var erm_y= parseFloat(th.data.poster.ewm_y)*2; + context.drawImage(vpath, erm_x * unit, erm_y * unit, 120 * unit, 120 * unit); + }else{ + //---二维吗图--- + context.drawImage(vpath, 420 * unit, 726 * unit, 120 * unit, 120 * unit); + } + break; case 1: //秒杀商品的展示 //---画线--- @@ -3390,7 +3485,17 @@ Page({ context.fillText("特惠好物，限时秒杀", 40 * unit, 806 * unit); context.fillText("长按识别二维码，立即开始抢购", 40 * unit, 846 * unit); //---二维吗图--- - context.drawImage(vpath, 380 * unit, 736 * unit, 120 * unit, 120 * unit); + //-- 自定义海报 -- + if(th.data.poster){ + var erm_x= parseFloat(th.data.poster.ewm_x)*2; + var erm_y= parseFloat(th.data.poster.ewm_y)*2; + context.drawImage(vpath, erm_x * unit, erm_y * unit, 120 * unit, 120 * unit); + }else{ + //---二维吗图--- + context.drawImage(vpath, 420 * unit, 726 * unit, 120 * unit, 120 * unit); + } + + break; case 2: //会员团和商家团的展示 @@ -3426,7 +3531,15 @@ Page({ context.setFontSize(21.3 * unit) context.fillText("长按识别二维码，立即参团", 40 * unit, 856 * unit); //---二维吗图--- - context.drawImage(vpath, 420 * unit, 726 * unit, 120 * unit, 120 * unit); + //-- 自定义海报 -- + if(th.data.poster){ + var erm_x= parseFloat(th.data.poster.ewm_x)*2; + var erm_y= parseFloat(th.data.poster.ewm_y)*2; + context.drawImage(vpath, erm_x * unit, erm_y * unit, 120 * unit, 120 * unit); + }else{ + //---二维吗图--- + context.drawImage(vpath, 420 * unit, 726 * unit, 120 * unit, 120 * unit); + } break case 3: //阶梯团的展示 //---画线--- @@ -3461,27 +3574,62 @@ Page({ context.font = 'normal bold 18px sans-serif'; context.setFontSize(22 * unit) context.fillText("长按识别二维码，立即参团", 40 * unit, 860 * unit); - //---二维吗图--- - context.drawImage(vpath, 420 * unit, 726 * unit, 120 * unit, 120 * unit); - + + //-- 自定义海报 -- + if(th.data.poster){ + var erm_x= parseFloat(th.data.poster.ewm_x)*2; + var erm_y= parseFloat(th.data.poster.ewm_y)*2; + context.drawImage(vpath, erm_x * unit, erm_y * unit, 120 * unit, 120 * unit); + }else{ + //---二维吗图--- + context.drawImage(vpath, 420 * unit, 726 * unit, 120 * unit, 120 * unit); + } break } - - //---绘制圆形要放在最后---- - context.save(); - context.beginPath(); - var h_x = 60 * unit; - var h_y = 24 * unit; - var h_r = 40 * unit; - var cx = h_x + h_r; - var cy = h_y + h_r; - context.arc(cx, cy, h_r, 0, Math.PI * 2, false); - context.closePath(); - context.fill(); - context.clip(); - context.drawImage(th.data.share_head, h_x, h_y, h_r * 2, h_r * 2); - context.restore(); - + + + //--- 如果是自定义海报的时候 --- + if(th.data.poster){ + + //如果显示会员信息的话 + if(parseInt(th.data.poster.show_headpic)){ + //获取坐标 + var x= parseFloat(th.data.poster.head_x)*2; + var y=parseFloat(th.data.poster.head_y)*2; + //---绘制圆形要放在最后---- + context.save(); + context.beginPath(); + var h_x = x* unit; + var h_y = y * unit; + var h_r = 40 * unit; + var cx = h_x + h_r; + var cy = h_y + h_r; + context.arc(cx, cy, h_r, 0, Math.PI * 2, false); + context.closePath(); + context.fill(); + context.clip(); + context.drawImage(th.data.share_head, h_x, h_y, h_r * 2, h_r * 2); + context.restore(); + } + + }else{ + //---绘制圆形要放在最后---- + context.save(); + context.beginPath(); + var h_x = 60 * unit; + var h_y = 24 * unit; + var h_r = 40 * unit; + var cx = h_x + h_r; + var cy = h_y + h_r; + context.arc(cx, cy, h_r, 0, Math.PI * 2, false); + context.closePath(); + context.fill(); + context.clip(); + context.drawImage(th.data.share_head, h_x, h_y, h_r * 2, h_r * 2); + context.restore(); + } + + //把画板内容绘制成图片，并回调 画板图片路径 context.draw(false, function() { setTimeout(function() { @@ -3613,6 +3761,7 @@ Page({ tt(func); } else { path2 = path2.replace("http://thirdwx.qlogo.cn", "https://wx.qlogo.cn"); + path2 = path2.replace("https://thirdwx.qlogo.cn", "https://wx.qlogo.cn"); wx.getImageInfo({ src: path2, success: function(res) { diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml index 1128d0f..16b2875 100644 --- a/pages/goods/goodsInfo/goodsInfo.wxml +++ b/pages/goods/goodsInfo/goodsInfo.wxml @@ -230,6 +230,7 @@ + @@ -258,12 +259,9 @@ - - - - - - + + + @@ -279,7 +277,8 @@ - + + - 成为{{g_filters.get_card_price(data,card_list,1)}}立省{{filters.toFix(data.market_price-g_filters.get_card_price(data,card_list,0),2)}}元 + 成为{{g_filters.get_card_price(data,card_list,1)}}立省{{filters.toFix(data.shop_price-g_filters.get_card_price(data,card_list,0),2)}}元 开通会员 尽享更多优惠 diff --git a/pages/goods/goodsList/g_filter.wxs b/pages/goods/goodsList/g_filter.wxs index 69fa0de..8aaac6e 100644 --- a/pages/goods/goodsList/g_filter.wxs +++ b/pages/goods/goodsList/g_filter.wxs @@ -73,9 +73,7 @@ var g_filters = { return 1; } })--*/ - //-- 获取最下价钱，和相应的卡的名称 -- - min_price=min.price; - min_name=min.name; + //-- 获取最下价钱，和相应的卡的名称 -- if(type==0) return min_price.toFixed(2); if(min_name.length>7) min_name=min_name.substring(0, 8); diff --git a/pages/goods/goodsList/goodsList.wxml b/pages/goods/goodsList/goodsList.wxml index fdf5099..7f066a6 100644 --- a/pages/goods/goodsList/goodsList.wxml +++ b/pages/goods/goodsList/goodsList.wxml @@ -52,7 +52,7 @@ {{item.goods_name}} - + ￥{{item.prom_price}} diff --git a/pages/goods/search/search.wxml b/pages/goods/search/search.wxml index b20374a..16ab59c 100644 --- a/pages/goods/search/search.wxml +++ b/pages/goods/search/search.wxml @@ -34,8 +34,8 @@ {{item.goods_name}} - - + + ￥{{item.prom_price}} diff --git a/pages/team/team_success/team_success.js b/pages/team/team_success/team_success.js index 000d1bc..36f7ab5 100644 --- a/pages/team/team_success/team_success.js +++ b/pages/team/team_success/team_success.js @@ -623,6 +623,7 @@ Page({ tt(func); }else { path2=path2.replace("http://thirdwx.qlogo.cn","https://wx.qlogo.cn"); + path2=path2.replace("https://thirdwx.qlogo.cn","https://wx.qlogo.cn"); wx.getImageInfo({ src: path2, success: function (res) { diff --git a/pages/user/Detailed/Detailed.js b/pages/user/Detailed/Detailed.js index 1e4274a..341d985 100644 --- a/pages/user/Detailed/Detailed.js +++ b/pages/user/Detailed/Detailed.js @@ -407,6 +407,7 @@ Page({ ee.data.head_pic = "../../../images/share/hui_hear_pic.png";tt(); } else { path2 = path2.replace("http://thirdwx.qlogo.cn", "https://wx.qlogo.cn"); + path2 = path2.replace("https://thirdwx.qlogo.cn", "https://wx.qlogo.cn"); wx.getImageInfo({ src: path2, success: function (res) { diff --git a/pages/user/assistance/task_assistance.js b/pages/user/assistance/task_assistance.js index 3d5b31f..8a40dbc 100644 --- a/pages/user/assistance/task_assistance.js +++ b/pages/user/assistance/task_assistance.js @@ -1003,9 +1003,10 @@ Page({ var block = th.data.block; if (images) { th.data.head_pic_arr.length = 0; - for (var i in images) { + for (var i in images) {s var img_path = images[i].headPic; img_path=img_path.replace("http://thirdwx.qlogo.cn", "https://wx.qlogo.cn"); + img_path=img_path.replace("https://thirdwx.qlogo.cn", "https://wx.qlogo.cn"); await getApp().request.promise_downimg(img_path).then(res => { th.data.head_pic_arr.push(res); }) diff --git a/pages/user/cardinfo/cardinfo.js b/pages/user/cardinfo/cardinfo.js index 6c656af..62e4eb9 100644 --- a/pages/user/cardinfo/cardinfo.js +++ b/pages/user/cardinfo/cardinfo.js @@ -645,6 +645,7 @@ Page({ tt(func); } else { path2 = path2.replace("http://thirdwx.qlogo.cn", "https://wx.qlogo.cn"); + path2 = path2.replace("https://thirdwx.qlogo.cn", "https://wx.qlogo.cn"); wx.getImageInfo({ src: path2, success: function (res) { diff --git a/pages/user/order_detail/order_detail.wxml b/pages/user/order_detail/order_detail.wxml index 9ad5864..050fc96 100644 --- a/pages/user/order_detail/order_detail.wxml +++ b/pages/user/order_detail/order_detail.wxml @@ -162,16 +162,16 @@ - - 再来一单 - - 评价 去评价 + + + 再来一单 + diff --git a/pages/user/order_list/order_list.wxml b/pages/user/order_list/order_list.wxml index 8ccfa69..dc2afc7 100644 --- a/pages/user/order_list/order_list.wxml +++ b/pages/user/order_list/order_list.wxml @@ -156,10 +156,6 @@ - - 再来一单 - 支付尾款 立即支付 + + + + 再来一单 + +