wxd / MShopWeApp

Commit 7aef3a0c3bad136fa1ac08deb8ea6a9ccb300b84

Authored by yvan.ni
1 parent 0dd9c405

1. 测试返回的16条BUG。 和优化

Inline Side-by-side
Showing 17 changed files with 500 additions and 91 deletions
pages/cart/cart2/cart2.js
  View file @7aef3a0
... ... @@ -500,8 +500,9 @@ Page({
500 500 getApp().globalData.is_card_back=0;
501 501 th.setData({card_cut_price:0});
502 502 }else{
503   - //--- 商品不能是搭配购，商家等级卡开通的情况下, 会员不是等级会员的情况， 商品有设置等级卡价格，同时等级卡价格小于商品的价格
504   - 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){
  503 + //--- 商家等级卡开通的情况下, 会员不是等级会员的情况， 商品有设置等级卡价格，同时等级卡价格小于商品的价格
  504 + //-- 搭配购的商品也可以单独购买，所以此时搭配购的商品要进行计算优惠 --
  505 + 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){
505 506 var cut_p= gg.goods_price-gd[th.data.card_name];
506 507 th.setData({card_cut_price:cut_p});
507 508 }
... ...
pages/cart/cart2_pt/cart2_pt.js
  View file @7aef3a0
1 1 var t = getApp(),app=t, a = t.request, e = require("../../../utils/common.js"),
2 2 s = require("../../../utils/util.js"), o = require("../../../utils/md5.js"), to = getApp();
3   -var oo=t.globalData.setting;
  3 +var oo=t.globalData.setting,os=oo;
4 4 var regeneratorRuntime = require('../../../utils/runtime.js');
5 5 var util_pay = require("../../../utils/pay.js");
6 6  
... ... @@ -58,6 +58,11 @@ Page({
58 58 is_normal:0,
59 59 is_express:0,//选择物流的控制器
60 60 yuer:0,
  61 +
  62 + rank_switch:0, //是不是开同等级卡
  63 + show_card:null, //显示的等级卡
  64 + card_name:'', //显示的卡的名称
  65 + card_cut_price:null,//减价多少钱
61 66 },
62 67 onLoad: function(t) {
63 68 console.log("onLoad_pt_cart");
... ... @@ -75,7 +80,7 @@ Page({
75 80 if(appD.is_pt_tz) th.data.is_pt_tz=appD.is_pt_tz;
76 81 th.data.param=t;
77 82 //先获取物流，再获取用户信息，再展示页面
78   - th.get_wuliu(th.get_info(th.show_page));
  83 + //th.get_wuliu(th.get_info(th.show_page));
79 84 },
80 85 onUnload: function () { this.setData({ isclose: 1 })},
81 86  
... ... @@ -178,6 +183,25 @@ Page({
178 183 t.data.data.prom_id = 0;
179 184 t.data.data.prom_type = 0;
180 185 t.data.data.is_normal=1;
  186 +
  187 + var gd=t.data.data;
  188 + //-- 用商品的手店价来显示 --
  189 + gg.goods_price=gd.shop_price;
  190 + //---是不是购买等级卡成功的返回---等级卡显示的判断---
  191 + var is_card_back=getApp().globalData.is_card_back;
  192 + if(is_card_back){
  193 + gg.goods_price=gd[th.data.card_name];
  194 + t.data.data.shop_price=gg.goods_price;
  195 + getApp().globalData.is_card_back=0;
  196 + th.setData({card_cut_price:0});
  197 + }else{
  198 + //--- 商品不能是搭配购，商家等级卡开通的情况下, 会员不是等级会员的情况， 商品有设置等级卡价格，同时等级卡价格小于商品的价格
  199 + if(th.data.card_name && gd[th.data.card_name]>0 && gg.goods_price>gd[th.data.card_name] && !th.data.userinfo.card_field){
  200 + var cut_p= gg.goods_price-gd[th.data.card_name];
  201 + th.setData({card_cut_price:cut_p});
  202 + }
  203 + }
  204 +
181 205 th.setData({
182 206 bn_goods: t.data.data, bn_pickname: gg.pick_name, bn_exp_type: et,
183 207 bn_pick: gg.pick_id, bn_t_exp_t: distr_t, is_normal:1
... ... @@ -244,6 +268,56 @@ Page({
244 268 getApp().globalData.is_cart2_old=0;
245 269 }
246 270 }
  271 +
  272 + //先获取是否有关闭使用优惠券
  273 + getApp().getConfig2(function (ee) {
  274 + var json_d = JSON.parse(ee.switch_list);
  275 + th.data.ispt_goods=json_d.ispt_goods; //是不是平摊到单品的控制参数赋值
  276 + th.setData({ is_close_quan: json_d.is_close_quan,sales_rules:ee.sales_rules,rank_switch:json_d.rank_switch});
  277 +
  278 + var rank_switch=json_d.rank_switch;
  279 + var max_price=-1;
  280 + var show_card=null;
  281 + var name="";
  282 + //如果有开等级卡的时候,
  283 + //因为都是调接口，要返回在计算
  284 + if(rank_switch==2){
  285 + //-- 获取所有的等级卡, --
  286 + getApp().request.promiseGet("/api/weshop/plus/vip/mem/bership/list?storeId=" + os.stoid,
  287 + {}).then(res => {
  288 + if(res.data.code==0){
  289 + var plusCard = res.data.data;
  290 + //-- 循环判断，拿到最贵的那张卡 --
  291 + for(var ih in plusCard){
  292 + if(plusCard[ih].IsStopBuy == true){ continue; }
  293 + if(max_price<0){
  294 + max_price=plusCard[ih].CardFee;
  295 + name='card'+plusCard[ih]['CorrPrice'];
  296 + show_card=plusCard[ih];
  297 + }else{
  298 + if(max_price<plusCard[ih].CardFee){
  299 + max_price=plusCard[ih].CardFee;
  300 + name='card'+plusCard[ih]['CorrPrice'];
  301 + show_card=plusCard[ih];
  302 + }
  303 + }
  304 + }
  305 +
  306 + if(show_card){
  307 + name=name.toLowerCase();
  308 + th.setData({card_name:name,show_card:show_card})
  309 + }
  310 + }
  311 + //-----先获取物流，再获取用户信息，再展示页面-----
  312 + th.get_wuliu(th.get_info(th.show_page));
  313 + })
  314 + }else{
  315 + //-----先获取物流，再获取用户信息，再展示页面-----
  316 + th.get_wuliu(th.get_info(th.show_page));
  317 + }
  318 + })
  319 +
  320 +
247 321 },
248 322 //---------------检查是否有收货地址-------------------
249 323 checkAddressList: function() {
... ... @@ -762,4 +836,10 @@ Page({
762 836 })
763 837 },
764 838  
  839 +
  840 + //跳转到购买卡
  841 + buycard:function(){
  842 + getApp().goto("/pages/user/plus/plus");
  843 + getApp().globalData.plus_buy_back=1;
  844 + }
765 845 });
... ...
pages/cart/cart2_pt/cart2_pt.wxml
  View file @7aef3a0
... ... @@ -54,6 +54,26 @@
54 54 <view class="goods-num">x{{bn_goods.buynum}}</view>
55 55 </view> -->
56 56 </view>
  57 +
  58 + <!-- 如果是等级卡的商品，会员没有注册，要提醒注册 -->
  59 + <view class="plus_buy fs28" wx:if="{{card_cut_price>0}}">
  60 + <view class="flex">
  61 + <view class="card_bg ellipsis-1" style="margin-right: 10rpx;">
  62 + <image src="{{imgUrl}}/miniapp/images/plus/dj_icon.png"></ image>
  63 + <text class="card_name">{{show_card.CardName}}</text>
  64 + </view>
  65 + <view>立减 <text style="color:#f23030;">{{filters.toFix(card_cut_price,2) }}</text> 元</view>
  66 + </view>
  67 + <view>
  68 + <text style="color: #999;margin-left: 4rpx;">vip超级会员仅需{{show_card.CardFee}}元</text>
  69 + </view>
  70 + <!-- 三角形 -->
  71 + <view class="car_tri_up"></view>
  72 + <!-- 立即开通跳转 -->
  73 + <view bindtap="buycard" class="card_op">立即开通</view>
  74 + </view>
  75 +
  76 +
57 77 <view class="set-mes bdr_b-14">
58 78 <view wx:if="{{order.store_prom}}"><icon color="#f23030" size="16" type="info"></icon>{{order.store_prom}}
59 79 </view>
... ...
pages/cart/cart2_pt/cart2_pt.wxss
  View file @7aef3a0
... ... @@ -899,3 +899,61 @@ margin-left: 20rpx;
899 899 background: none;
900 900 opacity: 1;
901 901 }
  902 +
  903 +.plus_buy{
  904 + background-color: #fff;
  905 + margin:15rpx 0;
  906 + padding: 20rpx 10rpx;
  907 + position: relative;
  908 +}
  909 +
  910 +
  911 +.card_bg {
  912 + box-sizing: border-box;
  913 + padding: 2rpx 10rpx;
  914 + height: 28rpx;
  915 + border-radius: 26rpx;
  916 + font-size: 18rpx;
  917 + line-height: 28rpx;
  918 + max-width: 210rpx;
  919 + background: #333;
  920 + color: #fff;
  921 + margin-left: 8rpx;
  922 + position:relative;
  923 + top:7rpx;
  924 +}
  925 +
  926 +.card_bg image {
  927 + width: 19rpx;
  928 + height: 19rpx;
  929 + margin-right: 8rpx;
  930 +}
  931 +
  932 +/* .card_bg .card_name {
  933 + max-width: 76rpx;
  934 + width: auto;
  935 + overflow: hidden;
  936 + white-space: nowrap;
  937 +} */
  938 +
  939 +.card_name {
  940 + position: relative;
  941 + top: -4rpx;
  942 + margin-left: 6px;
  943 +}
  944 +
  945 +.car_tri_up {
  946 + width: 0;height: 0;
  947 + border-left: 20rpx solid transparent;
  948 + border-right: 20rpx solid transparent;
  949 + border-bottom: 20rpx solid #fff;
  950 + position: absolute;
  951 + right: 20rpx;
  952 + top:-10rpx
  953 +}
  954 +.card_op{
  955 + position: absolute;
  956 + right: 20rpx;
  957 + top:36rpx
  958 +}
  959 +
... ...
pages/goods/categoryList/categoryList.wxml
  View file @7aef3a0
1 1 <!-- <import src="../../tabbar/tabbar.wxml" />
2 2 <template is="tabBar" data="{{tabBar}}" /> -->
  3 +<wxs module="g_filter" src="g_filter.wxs"></wxs>
3 4  
4 5 <!-- 风格1 -->
5 6 <block wx:if="{{is_used_share==0}}">
... ... @@ -419,9 +420,12 @@
419 420 </view>
420 421 </block>
421 422 <block wx:else>
  423 +
422 424 <!-- 商品价格,先判断下是后又等级价-->
423 425 <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}">
424   - <!-- 当会员是等级卡的时候 -->
  426 +
  427 +
  428 + <!-- 当会员是等级卡的时候 -->
425 429 <block wx:if="{{card_field}}">
426 430 <!-- 等级价>0 -->
427 431 <block wx:if="{{item[card_field]>0}}">
... ... @@ -446,7 +450,8 @@
446 450 </block>
447 451 </block>
448 452 <block wx:else>
449   - <block wx:if="{{g_filter.get_card_price(item,card_list,0)}}">
  453 +
  454 + <block wx:if="{{g_filter.get_card_price(item,card_list,0)}}">
450 455 <view class="flex ai-center">
451 456 <view class="price">￥{{item.shop_price}}</view>
452 457 <view class="word-line xc-ash mk_price">￥{{item.market_price}}</view>
... ... @@ -463,6 +468,7 @@
463 468 </view>
464 469 </block>
465 470 <block wx:else>
  471 + 666
466 472 <view class="price">￥{{item.shop_price}}</view>
467 473 <view class="comment flex jc_sb">
468 474 <view class="word-line xc-ash">￥{{item.market_price}}</view>
... ...
pages/goods/categoryList/g_filter.wxs 0 → 100644
  View file @7aef3a0
  1 +var g_filters = {
  2 + //-- 判断是不是有等级价 --
  3 + is_has_rank:function(rank_switch,item){
  4 + if(!rank_switch) return false;
  5 + if(item.cardprice1 || item.cardprice2 || item.cardprice3) {return true}
  6 + return false;
  7 + },
  8 +
  9 + //-- 判断,不是等级会员时候，要显示的最低等级价和名称 --
  10 + get_card_price:function(goods,all_card,type){
  11 + var price1=parseFloat(goods['cardprice1']);
  12 + var price2=parseFloat(goods['cardprice2']);
  13 + var price3=parseFloat(goods['cardprice3']);
  14 + if(!all_card){
  15 + if(type==0) return 0;
  16 + return "";
  17 + }
  18 +
  19 +
  20 + var arr=[];
  21 + var min_price= 0;
  22 + var min_name="";
  23 +
  24 + var min_price=null;
  25 + var min_name=null;
  26 + //---设置对应的价格名字----
  27 + for(var i=0;i<3;i++) {
  28 + var vl=all_card[i];
  29 + if(!vl) continue;
  30 + if(vl['CorrPrice']=="Price1" && price1>0)
  31 + {
  32 +
  33 + if(min_price==null) {
  34 + min_price=price1;min_name=vl['CardName'];
  35 + }
  36 + else if(price1<min_price) {
  37 + min_price=price1;min_name=vl['CardName'];
  38 + }
  39 + }
  40 + if(vl['CorrPrice']=="Price2" && price2>0)
  41 + {
  42 + if(min_price==null) {
  43 + min_price=price2;min_name=vl['CardName'];
  44 + }
  45 + else if(price2<min_price) {
  46 + min_price=price2;min_name=vl['CardName'];
  47 + }
  48 + }
  49 +
  50 + if(vl['CorrPrice']=="Price3" && price3>0)
  51 + {
  52 + if(min_price==null) {
  53 + min_price=price3;min_name=vl['CardName'];
  54 + }
  55 + else if(price3<min_price) {
  56 + min_price=price3;min_name=vl['CardName'];
  57 + }
  58 + }
  59 +
  60 + }
  61 +
  62 +
  63 + if(min_price==null){
  64 + if(type==0) return 0;
  65 + return "";
  66 + }
  67 +
  68 +
  69 + //if(type==0) return arr.length;
  70 + //--进行排序,升序---
  71 + /*---
  72 + arr.sort(function(a,b){
  73 + if (a.price < b.price) {
  74 + return -1;
  75 + } else if (a.fee == b.fee) {
  76 + return 0;
  77 + } else {
  78 + return 1;
  79 + }
  80 + })--*/
  81 + //-- 获取最下价钱，和相应的卡的名称 --
  82 + if(type==0) return min_price.toFixed(2);
  83 +
  84 + if(min_name.length>7) min_name=min_name.substring(0, 8);
  85 + return min_name;
  86 + },
  87 +}
  88 +module.exports = {
  89 + is_has_rank:g_filters.is_has_rank,
  90 + get_card_price:g_filters.get_card_price,
  91 +}
0 92 \ No newline at end of file
... ...
pages/goods/goodsInfo/goodsInfo.js
  View file @7aef3a0
... ... @@ -236,11 +236,12 @@ Page({
236 236 sales_rules:1, //默认是线上销售
237 237  
238 238 wait_for_user_store:null,
239   -
240 239 prom_goods:null, //商品优惠列表
241 240 order_prom:null, //订单优惠
242 241 collocationGoods:null, //搭配购
243   -
  242 +
  243 + poster:null, //自定义海报
  244 + share_b_img:'', //自定义分享的背景
244 245 },
245 246  
246 247 //------初始化加载----------
... ... @@ -254,7 +255,37 @@ Page({
254 255 gid = t.goods_id,
255 256 first_leader=t.first_leader,
256 257 room_id=t.room_id;
257   -
  258 +
  259 + //-- 自定义海报 --
  260 + getApp().request.promiseGet("/api/weshop/goods/poster/page",{
  261 + data:{store_id:os.stoid, type:1, is_user:1 }
  262 + }).then(res=>{
  263 + if(res.data.code==0){
  264 +
  265 + var poster_data=res.data.data.pageData[0];
  266 + var json_str=poster_data.jsonStr;
  267 +
  268 + if(json_str){
  269 + var json_data=JSON.parse(json_str);
  270 + if(json_data.bg_img){
  271 +
  272 + //-- 把图片那到本地 --
  273 + wx.getImageInfo({
  274 + src:json_data.bg_img,
  275 + success: function(res) {
  276 + var path= res.path;
  277 + th.setData({share_b_img:path})
  278 + },
  279 + fail: function(res) {}
  280 + });
  281 + }
  282 +
  283 + th.setData({poster:json_data})
  284 +
  285 + }
  286 + }
  287 + })
  288 +
258 289 //---获取手机地址坐标--
259 290 //--如果tg_id是空的话，分享回来--
260 291 if (gid == undefined || gid == null || gid == "") {
... ... @@ -369,7 +400,7 @@ Page({
369 400 })
370 401 }
371 402 });
372   -
  403 +
373 404 //获取用户的默认门店
374 405 getApp().get_user_store(function(ee) {
375 406  
... ... @@ -449,6 +480,8 @@ Page({
449 480  
450 481 });
451 482  
  483 +
  484 +
452 485 },
453 486  
454 487 //------------程序初始化入口-------------
... ... @@ -3270,7 +3303,7 @@ Page({
3270 3303 })
3271 3304  
3272 3305 var app = getApp();
3273   - var unit = that.data.screenWidth / 750 * 1.35;
  3306 + var unit = that.data.screenWidth / 750 * 1.35; //基础单位，
3274 3307 var path2 = that.data.data.original_img;
3275 3308 var scene = th.data.gid+"";
3276 3309 var user_id=getApp().globalData.user_id?getApp().globalData.user_id:0;
... ... @@ -3294,19 +3327,51 @@ Page({
3294 3327 var context = wx.createCanvasContext('share');
3295 3328 //先画背景
3296 3329 var pg_path = "../../../images/share/share_bg.png";
  3330 +
  3331 + //-- 如果有自定义海报的时候，判断背景的图片 --
  3332 + if(th.data.share_b_img){
  3333 + //pg_path=th.data.share_b_img;
  3334 + }
3297 3335 context.drawImage(pg_path, 0, 0, 554 * unit, 899 * unit);
3298   - //--昵称---
3299   - context.setFontSize(24 * unit)
3300   - context.setFillStyle("black")
3301   - context.fillText(app.globalData.userInfo.nickname, 152 * unit, 76 * unit);
3302   - var width = 24 * app.globalData.userInfo.nickname.length * unit + 2 * unit;
3303   - //强烈推荐 改许程
3304   - var tj_path = "../../../images/share/q_tj.png";
3305   - context.drawImage(tj_path, 152 * unit + width, 54 * unit, 85 * unit, 30 * unit);
3306   - context.setFontSize(16 * unit)
3307   - context.setLineJoin('round'); //交点设置成圆角
3308   - context.setFillStyle("white")
3309   - context.fillText('强烈推荐', 149 * unit + width + 15 * unit, 76 * unit);
  3336 +
  3337 + //-- 是自定义海报的情况下 --
  3338 + if(th.data.poster){
  3339 + //在线上分享人的情况下
  3340 + if(parseInt(th.data.poster.show_headpic)){
  3341 + //获取坐标
  3342 + var x=parseFloat(th.data.poster.head_x)*2;
  3343 + var y=parseFloat(th.data.poster.head_y)*2;
  3344 + var x1=(x+90) *unit;
  3345 + var y1=(y+50) *unit;
  3346 + //--昵称---
  3347 + context.setFontSize(24 * unit)
  3348 + context.setFillStyle("black")
  3349 + context.fillText(app.globalData.userInfo.nickname, x1, y1);
  3350 + var width = 24 * app.globalData.userInfo.nickname.length * unit + 4 * unit;
  3351 + //强烈推荐 改许程
  3352 + var tj_path = "../../../images/share/q_tj.png";
  3353 + context.drawImage(tj_path, x1 + width, y1-22*unit, 85 * unit, 30 * unit);
  3354 + context.setFontSize(16 * unit)
  3355 + context.setLineJoin('round'); //交点设置成圆角
  3356 + context.setFillStyle("white")
  3357 + context.fillText('强烈推荐', x1 + width+8*unit, y1-1*unit);
  3358 + }
  3359 + }else{
  3360 + //--昵称---
  3361 + context.setFontSize(24 * unit)
  3362 + context.setFillStyle("black")
  3363 + context.fillText(app.globalData.userInfo.nickname, 152 * unit, 76 * unit);
  3364 + var width = 24 * app.globalData.userInfo.nickname.length * unit + 2 * unit;
  3365 + //强烈推荐 改许程
  3366 + var tj_path = "../../../images/share/q_tj.png";
  3367 + context.drawImage(tj_path, 152 * unit + width, 54 * unit, 85 * unit, 30 * unit);
  3368 + context.setFontSize(16 * unit)
  3369 + context.setLineJoin('round'); //交点设置成圆角
  3370 + context.setFillStyle("white")
  3371 + context.fillText('强烈推荐', 149 * unit + width + 15 * unit, 76 * unit);
  3372 + }
  3373 +
  3374 +
3310 3375  
3311 3376 //---产品名称---
3312 3377 //文本换行 参数：1、canvas对象，2、文本 3、距离左侧的距离 4、距离顶部的距离 5、6、文本的宽度
... ... @@ -3340,21 +3405,45 @@ Page({
3340 3405 switch (type) {
3341 3406 case 0: //普通商品的展示
3342 3407 //中间的几个字
3343   - var g_path = "../../../images/share/s_gou.png";
3344   - context.drawImage(g_path, 56 * unit, 670 * unit, 22 * unit, 22 * unit);
3345   - context.setFillStyle("red")
3346   - context.setFontSize(18 * unit)
3347   - context.fillText("正品保证", 84 * unit, 690 * unit);
3348   -
3349   - context.drawImage(g_path, 218 * unit, 670 * unit, 22 * unit, 22 * unit);
3350   - context.setFillStyle("red")
3351   - context.setFontSize(18 * unit)
3352   - context.fillText("纯实体店", 246 * unit, 690 * unit);
3353   -
3354   - context.drawImage(g_path, 388 * unit, 670 * unit, 22 * unit, 22 * unit);
3355   - context.setFillStyle("red")
3356   - context.setFontSize(18 * unit)
3357   - context.fillText("官方验证", 420 * unit, 690 * unit);
  3408 + if(th.data.poster ){
  3409 +
  3410 + if(parseInt(th.data.poster.show_quality)){
  3411 + var g_path = "../../../images/share/s_gou.png";
  3412 + context.drawImage(g_path, 56 * unit, 670 * unit, 22 * unit, 22 * unit);
  3413 + context.setFillStyle("red")
  3414 + context.setFontSize(18 * unit)
  3415 + context.fillText("正品保证", 84 * unit, 690 * unit);
  3416 +
  3417 + context.drawImage(g_path, 218 * unit, 670 * unit, 22 * unit, 22 * unit);
  3418 + context.setFillStyle("red")
  3419 + context.setFontSize(18 * unit)
  3420 + context.fillText("纯实体店", 246 * unit, 690 * unit);
  3421 +
  3422 + context.drawImage(g_path, 388 * unit, 670 * unit, 22 * unit, 22 * unit);
  3423 + context.setFillStyle("red")
  3424 + context.setFontSize(18 * unit)
  3425 + context.fillText("官方验证", 420 * unit, 690 * unit);
  3426 + }
  3427 +
  3428 + }else{
  3429 + var g_path = "../../../images/share/s_gou.png";
  3430 + context.drawImage(g_path, 56 * unit, 670 * unit, 22 * unit, 22 * unit);
  3431 + context.setFillStyle("red")
  3432 + context.setFontSize(18 * unit)
  3433 + context.fillText("正品保证", 84 * unit, 690 * unit);
  3434 +
  3435 + context.drawImage(g_path, 218 * unit, 670 * unit, 22 * unit, 22 * unit);
  3436 + context.setFillStyle("red")
  3437 + context.setFontSize(18 * unit)
  3438 + context.fillText("纯实体店", 246 * unit, 690 * unit);
  3439 +
  3440 + context.drawImage(g_path, 388 * unit, 670 * unit, 22 * unit, 22 * unit);
  3441 + context.setFillStyle("red")
  3442 + context.setFontSize(18 * unit)
  3443 + context.fillText("官方验证", 420 * unit, 690 * unit);
  3444 + }
  3445 +
  3446 +
3358 3447 //---画线---
3359 3448 context.setLineWidth(1 * unit)
3360 3449 context.moveTo(32 * unit, 710 * unit)
... ... @@ -3363,15 +3452,21 @@ Page({
3363 3452 //---文字---
3364 3453 context.setFillStyle("black")
3365 3454 context.setFontSize(22 * unit)
3366   - // 原来start --->
3367   - context.fillText("优惠乐翻天，精彩就在你身边", 40 * unit, 776 * unit);
3368   - context.fillText("长按识别二维码，立即开始抢购", 40 * unit, 826 * unit);
3369   - // <--- 原来end
3370   - // context.fillText("优惠乐翻天，精彩就在你身边", 40 * unit, 816 * unit);
3371   - // context.setFontSize(18 * unit)
3372   - // context.fillText("长按识别二维码，立即开始抢购", 40 * unit, 850 * unit);
3373   - //---二维吗图---
3374   - context.drawImage(vpath, 380 * unit, 736 * unit, 120 * unit, 120 * unit);
  3455 + // 原来start --->
  3456 + context.fillText("优惠乐翻天，精彩就在你身边", 40 * unit, 776 * unit);
  3457 + context.fillText("长按识别二维码，立即开始抢购", 40 * unit, 826 * unit);
  3458 +
  3459 + //---二维吗图---
  3460 + //-- 自定义海报 --
  3461 + if(th.data.poster){
  3462 + var erm_x= parseFloat(th.data.poster.ewm_x)*2;
  3463 + var erm_y= parseFloat(th.data.poster.ewm_y)*2;
  3464 + context.drawImage(vpath, erm_x * unit, erm_y * unit, 120 * unit, 120 * unit);
  3465 + }else{
  3466 + //---二维吗图---
  3467 + context.drawImage(vpath, 420 * unit, 726 * unit, 120 * unit, 120 * unit);
  3468 + }
  3469 +
3375 3470 break;
3376 3471 case 1: //秒杀商品的展示
3377 3472 //---画线---
... ... @@ -3390,7 +3485,17 @@ Page({
3390 3485 context.fillText("特惠好物，限时秒杀", 40 * unit, 806 * unit);
3391 3486 context.fillText("长按识别二维码，立即开始抢购", 40 * unit, 846 * unit);
3392 3487 //---二维吗图---
3393   - context.drawImage(vpath, 380 * unit, 736 * unit, 120 * unit, 120 * unit);
  3488 + //-- 自定义海报 --
  3489 + if(th.data.poster){
  3490 + var erm_x= parseFloat(th.data.poster.ewm_x)*2;
  3491 + var erm_y= parseFloat(th.data.poster.ewm_y)*2;
  3492 + context.drawImage(vpath, erm_x * unit, erm_y * unit, 120 * unit, 120 * unit);
  3493 + }else{
  3494 + //---二维吗图---
  3495 + context.drawImage(vpath, 420 * unit, 726 * unit, 120 * unit, 120 * unit);
  3496 + }
  3497 +
  3498 +
3394 3499 break;
3395 3500  
3396 3501 case 2: //会员团和商家团的展示
... ... @@ -3426,7 +3531,15 @@ Page({
3426 3531 context.setFontSize(21.3 * unit)
3427 3532 context.fillText("长按识别二维码，立即参团", 40 * unit, 856 * unit);
3428 3533 //---二维吗图---
3429   - context.drawImage(vpath, 420 * unit, 726 * unit, 120 * unit, 120 * unit);
  3534 + //-- 自定义海报 --
  3535 + if(th.data.poster){
  3536 + var erm_x= parseFloat(th.data.poster.ewm_x)*2;
  3537 + var erm_y= parseFloat(th.data.poster.ewm_y)*2;
  3538 + context.drawImage(vpath, erm_x * unit, erm_y * unit, 120 * unit, 120 * unit);
  3539 + }else{
  3540 + //---二维吗图---
  3541 + context.drawImage(vpath, 420 * unit, 726 * unit, 120 * unit, 120 * unit);
  3542 + }
3430 3543 break
3431 3544 case 3: //阶梯团的展示
3432 3545 //---画线---
... ... @@ -3461,27 +3574,62 @@ Page({
3461 3574 context.font = 'normal bold 18px sans-serif';
3462 3575 context.setFontSize(22 * unit)
3463 3576 context.fillText("长按识别二维码，立即参团", 40 * unit, 860 * unit);
3464   - //---二维吗图---
3465   - context.drawImage(vpath, 420 * unit, 726 * unit, 120 * unit, 120 * unit);
3466   -
  3577 +
  3578 + //-- 自定义海报 --
  3579 + if(th.data.poster){
  3580 + var erm_x= parseFloat(th.data.poster.ewm_x)*2;
  3581 + var erm_y= parseFloat(th.data.poster.ewm_y)*2;
  3582 + context.drawImage(vpath, erm_x * unit, erm_y * unit, 120 * unit, 120 * unit);
  3583 + }else{
  3584 + //---二维吗图---
  3585 + context.drawImage(vpath, 420 * unit, 726 * unit, 120 * unit, 120 * unit);
  3586 + }
3467 3587 break
3468 3588 }
3469   -
3470   - //---绘制圆形要放在最后----
3471   - context.save();
3472   - context.beginPath();
3473   - var h_x = 60 * unit;
3474   - var h_y = 24 * unit;
3475   - var h_r = 40 * unit;
3476   - var cx = h_x + h_r;
3477   - var cy = h_y + h_r;
3478   - context.arc(cx, cy, h_r, 0, Math.PI * 2, false);
3479   - context.closePath();
3480   - context.fill();
3481   - context.clip();
3482   - context.drawImage(th.data.share_head, h_x, h_y, h_r * 2, h_r * 2);
3483   - context.restore();
3484   -
  3589 +
  3590 +
  3591 + //--- 如果是自定义海报的时候 ---
  3592 + if(th.data.poster){
  3593 +
  3594 + //如果显示会员信息的话
  3595 + if(parseInt(th.data.poster.show_headpic)){
  3596 + //获取坐标
  3597 + var x= parseFloat(th.data.poster.head_x)*2;
  3598 + var y=parseFloat(th.data.poster.head_y)*2;
  3599 + //---绘制圆形要放在最后----
  3600 + context.save();
  3601 + context.beginPath();
  3602 + var h_x = x* unit;
  3603 + var h_y = y * unit;
  3604 + var h_r = 40 * unit;
  3605 + var cx = h_x + h_r;
  3606 + var cy = h_y + h_r;
  3607 + context.arc(cx, cy, h_r, 0, Math.PI * 2, false);
  3608 + context.closePath();
  3609 + context.fill();
  3610 + context.clip();
  3611 + context.drawImage(th.data.share_head, h_x, h_y, h_r * 2, h_r * 2);
  3612 + context.restore();
  3613 + }
  3614 +
  3615 + }else{
  3616 + //---绘制圆形要放在最后----
  3617 + context.save();
  3618 + context.beginPath();
  3619 + var h_x = 60 * unit;
  3620 + var h_y = 24 * unit;
  3621 + var h_r = 40 * unit;
  3622 + var cx = h_x + h_r;
  3623 + var cy = h_y + h_r;
  3624 + context.arc(cx, cy, h_r, 0, Math.PI * 2, false);
  3625 + context.closePath();
  3626 + context.fill();
  3627 + context.clip();
  3628 + context.drawImage(th.data.share_head, h_x, h_y, h_r * 2, h_r * 2);
  3629 + context.restore();
  3630 + }
  3631 +
  3632 +
3485 3633 //把画板内容绘制成图片，并回调 画板图片路径
3486 3634 context.draw(false, function() {
3487 3635 setTimeout(function() {
... ... @@ -3613,6 +3761,7 @@ Page({
3613 3761 tt(func);
3614 3762 } else {
3615 3763 path2 = path2.replace("http://thirdwx.qlogo.cn", "https://wx.qlogo.cn");
  3764 + path2 = path2.replace("https://thirdwx.qlogo.cn", "https://wx.qlogo.cn");
3616 3765 wx.getImageInfo({
3617 3766 src: path2,
3618 3767 success: function(res) {
... ...
pages/goods/goodsInfo/goodsInfo.wxml
  View file @7aef3a0
... ... @@ -230,6 +230,7 @@
230 230 </view>
231 231 </view>
232 232  
  233 + <!-- 不是拼团 -->
233 234 <block wx:if="{{prom_type!=6}}">
234 235 <view class="goods-price rel">
235 236 <view class="co-red" style="overflow: hidden" wx:if="{{prom_type==0 || prom_type==3}}">
... ... @@ -258,12 +259,9 @@
258 259 <view class="share-font">分享</view>
259 260 </view>
260 261  
261   -
262   -
263   -
264   - <!-- 等级卡的价格,不是等级卡会员，且商品又有设置等级级价，商家后台有开通升级卡同能 -->
265   -
266   - <view class="flex ai_and" wx:if="{{!card_field && g_filters.is_has_rank(rank_switch,data)}}">
  262 + <!-- 不是秒杀 -->
  263 + <!-- 等级卡的价格,不是等级卡会员，且商品又有设置等级级价，商家后台有开通升级卡同能 -->
  264 + <view class="flex ai_and" wx:if="{{!card_field && g_filters.is_has_rank(rank_switch,data) && prom_type!=1 }}">
267 265  
268 266 <view class="flex ai-center grade-card-frame card-frame" >
269 267 <image class="img" src="{{iurl}}/miniapp/images/userinfo/userinfo/privilege_t.png"></image>
... ... @@ -279,7 +277,8 @@
279 277  
280 278 <block wx:if="{{g_filters.is_has_rank(rank_switch,data)}}">
281 279  
282   - <view wx:if="{{!card_field }}">
  280 + <!-- 不是秒杀，且会员不是等级会员 -->
  281 + <view wx:if="{{!card_field && prom_type!=1 }}">
283 282 <view class="beauty-makeup-frame flex ai-center">
284 283 <view class="left flex ai-center">
285 284 <view class="flex ai-center grade-card-frame card-frame advert-card">
... ... @@ -287,7 +286,7 @@
287 286 <view class="fs24 white view card-name ellipsis-1">{{g_filters.get_card_price(data,card_list,1)}}</view>
288 287 </view>
289 288 <view class="card-effect">
290   - <view class="fs24 xc-black3">成为{{g_filters.get_card_price(data,card_list,1)}}立<text class="co-red">省{{filters.toFix(data.market_price-g_filters.get_card_price(data,card_list,0),2)}}</text>元</view>
  289 + <view class="fs24 xc-black3">成为{{g_filters.get_card_price(data,card_list,1)}}立<text class="co-red">省{{filters.toFix(data.shop_price-g_filters.get_card_price(data,card_list,0),2)}}</text>元</view>
291 290 <view class="fs22 xc-ash"> 开通会员 尽享更多优惠 </view>
292 291 </view>
293 292 </view>
... ...
pages/goods/goodsList/g_filter.wxs
  View file @7aef3a0
... ... @@ -73,9 +73,7 @@ var g_filters = {
73 73 return 1;
74 74 }
75 75 })--*/
76   - //-- 获取最下价钱，和相应的卡的名称 --
77   - min_price=min.price;
78   - min_name=min.name;
  76 + //-- 获取最下价钱，和相应的卡的名称 --
79 77 if(type==0) return min_price.toFixed(2);
80 78  
81 79 if(min_name.length>7) min_name=min_name.substring(0, 8);
... ...
pages/goods/goodsList/goodsList.wxml
  View file @7aef3a0
... ... @@ -52,7 +52,7 @@
52 52 <view class="item-cont">
53 53 <view class="title">{{item.goods_name}}</view>
54 54 <!-- 判断是否有活动价 -->
55   - <block wx:if="{{item.prom_price>0}}">
  55 + <block wx:if="{{item.prom_price>0 && item.prom_type!=2 && item.prom_type!=4}}">
56 56 <!-- 活动价 -->
57 57 <view class="price">￥{{item.prom_price}}</view>
58 58 <view class="comment flex jc_sb">
... ...
pages/goods/search/search.wxml
  View file @7aef3a0
... ... @@ -34,8 +34,8 @@
34 34 </view>
35 35 <view class="item-cont">
36 36 <view class="title ellipsis-2">{{item.goods_name}}</view>
37   - <!-- 判断是否有活动价 -->
38   - <block wx:if="{{item.prom_price>0}}">
  37 + <!-- 判断是否有活动价，小程序没有有团购和拼单 -->
  38 + <block wx:if="{{item.prom_price>0 && item.prom_type!=2 && item.prom_type!=4}}">
39 39 <!-- 活动价 -->
40 40 <view class="price">￥{{item.prom_price}}</view>
41 41 <view class="comment flex jc_sb">
... ...
pages/team/team_success/team_success.js
  View file @7aef3a0
... ... @@ -623,6 +623,7 @@ Page({
623 623 tt(func);
624 624 }else {
625 625 path2=path2.replace("http://thirdwx.qlogo.cn","https://wx.qlogo.cn");
  626 + path2=path2.replace("https://thirdwx.qlogo.cn","https://wx.qlogo.cn");
626 627 wx.getImageInfo({
627 628 src: path2,
628 629 success: function (res) {
... ...
pages/user/Detailed/Detailed.js
  View file @7aef3a0
... ... @@ -407,6 +407,7 @@ Page({
407 407 ee.data.head_pic = "../../../images/share/hui_hear_pic.png";tt();
408 408 } else {
409 409 path2 = path2.replace("http://thirdwx.qlogo.cn", "https://wx.qlogo.cn");
  410 + path2 = path2.replace("https://thirdwx.qlogo.cn", "https://wx.qlogo.cn");
410 411 wx.getImageInfo({
411 412 src: path2,
412 413 success: function (res) {
... ...
pages/user/assistance/task_assistance.js
  View file @7aef3a0
... ... @@ -1003,9 +1003,10 @@ Page({
1003 1003 var block = th.data.block;
1004 1004 if (images) {
1005 1005 th.data.head_pic_arr.length = 0;
1006   - for (var i in images) {
  1006 + for (var i in images) {s
1007 1007 var img_path = images[i].headPic;
1008 1008 img_path=img_path.replace("http://thirdwx.qlogo.cn", "https://wx.qlogo.cn");
  1009 + img_path=img_path.replace("https://thirdwx.qlogo.cn", "https://wx.qlogo.cn");
1009 1010 await getApp().request.promise_downimg(img_path).then(res => {
1010 1011 th.data.head_pic_arr.push(res);
1011 1012 })
... ...
pages/user/cardinfo/cardinfo.js
  View file @7aef3a0
... ... @@ -645,6 +645,7 @@ Page({
645 645 tt(func);
646 646 } else {
647 647 path2 = path2.replace("http://thirdwx.qlogo.cn", "https://wx.qlogo.cn");
  648 + path2 = path2.replace("https://thirdwx.qlogo.cn", "https://wx.qlogo.cn");
648 649 wx.getImageInfo({
649 650 src: path2,
650 651 success: function (res) {
... ...
pages/user/order_detail/order_detail.wxml
  View file @7aef3a0
... ... @@ -162,16 +162,16 @@
162 162 </block>
163 163  
164 164  
165   - <block wx:if="{{order.pay_status==1 || order.order_status==3 }}">
166   - <view style="background-color: #feca53;" class="tips-btn" bindtap="moreOrder" >再来一单</view>
167   - </block>
168   -
169 165 <block wx:if="{{order.order_status==2 && order.is_zsorder!=4}}">
170 166 <navigator wx:if="{{order.order_goods.length>1}}" class="tips-btn"
171 167 url="/pages/user/comment/comment?status=0&order_id={{order.order_id}}">评价</navigator>
172 168 <navigator wx:else class="tips-btn"
173 169 url="/pages/user/add_comment/add_comment?goods_id={{order.order_goods[0].goods_id}}&order_id={{order.order_id}}}">去评价</navigator>
174 170 </block>
  171 + <!-- 积分购 拼团 搭配购没有有再来一单 -->
  172 + <block wx:if="{{ (order.pay_status==1 || order.order_status==3) && order.pt_prom_id<=0 && order.integral<=0 && order.order_goods[0].prom_type!=5}}">
  173 + <view style="background-color: #feca53;" class="tips-btn" bindtap="moreOrder" >再来一单</view>
  174 + </block>
175 175 </view>
176 176 </view>
177 177  
... ...
pages/user/order_list/order_list.wxml
  View file @7aef3a0
... ... @@ -156,10 +156,6 @@
156 156 <view bindtap="confirmOrder" data-zsorder="{{item.is_zsorder}}" class="commodity_To_evaluate flex-level comment_go" data-id="{{item.order_id}}" hidden="{{!(item.order_status==1&&item.pay_status==1&&item.shipping_status==2)}}">确认收货</view>
157 157 </block>
158 158  
159   - <block wx:if="{{item.pay_status==1 || item.order_status==3 }}">
160   - <view bindtap="moreOrder" class="commodity_To_evaluate flex-level comment_go" style="background-color: #feca53;"
161   - data-index="{{index}}" >再来一单</view>
162   - </block>
163 159  
164 160 <block wx:if="{{item.order_status==2 && item.is_zsorder!=4}}">
165 161 <navigator wx:if="{{item.order_goods.length>1}}" class="order-btn white red-b"
... ... @@ -171,6 +167,13 @@
171 167  
172 168 <navigator class="commodity_To_evaluate flex-level comment_go" url="/pages/cart/cart_wk/cart_wk?order_id={{item.order_id}}" data-idx="{{index}}" wx:if="{{item.pt_status==2 && item.pt_tail_money>0}}">支付尾款</navigator>
173 169 <navigator class="commodity_To_evaluate flex-level comment_go" bindtap="jumpToCart4" data-idx="{{index}}" wx:if="{{(item.order_status==0&&item.pay_status==0)}}">立即支付</navigator>
  170 +
  171 + <!-- 积分购 拼团 搭配购没有有再来一单 -->
  172 + <block wx:if="{{(item.pay_status==1 || item.order_status==3) && item.pt_prom_id<=0 && item.integral<=0 && item.order_goods[0].prom_type!=5 }}">
  173 + <view bindtap="moreOrder" class="commodity_To_evaluate flex-level comment_go" style="background-color: #feca53;"
  174 + data-index="{{index}}" >再来一单</view>
  175 + </block>
  176 +
174 177 </view>
175 178 </view>
176 179 </view>
... ...