Commit 7cdb1ea489a626a4ed57af8dc8437169deccee7b
Merge branch 'test' of http://git.vipzhuang.cn/wxd/MShopWeApp into qa
Showing
12 changed files
with
136 additions
and
47 deletions
components/diy_goodsGroup/diy_goodsGroup.js
| ... | ... | @@ -242,7 +242,7 @@ Component({ |
| 242 | 242 | if (!user_id) user_id = 0; |
| 243 | 243 | r_data.user_id = user_id; |
| 244 | 244 | |
| 245 | - await app.request.promiseGet("/api/weshop/goods/page?isnewwhere=1", { | |
| 245 | + await app.request.promiseGet("/api/weshop/goods/page", { | |
| 246 | 246 | data: r_data |
| 247 | 247 | }).then(res => { |
| 248 | 248 | th.data.loading = 0; |
| ... | ... | @@ -471,7 +471,7 @@ Component({ |
| 471 | 471 | |
| 472 | 472 | prom_id = val.prom_id; |
| 473 | 473 | |
| 474 | - var prom_type = val.prom_type; //0普通商品 1秒杀 6拼单 2团购 4积分购 | |
| 474 | + var prom_type = item.prom_type; //0普通商品 1秒杀 6拼单 2团购 4积分购 | |
| 475 | 475 | |
| 476 | 476 | var url = ""; |
| 477 | 477 | |
| ... | ... | @@ -518,7 +518,10 @@ Component({ |
| 518 | 518 | var prom = null; |
| 519 | 519 | if (res && res.data) prom = res.data.data; |
| 520 | 520 | if (prom != null && prom.is_end == 0 && prom.end_time > now && (prom.start_time < now || (prom.show_time && prom.show_time < now))) { |
| 521 | - item.prom_price = res.data.data.price; | |
| 521 | + item.prom_price = res.data.data.price; | |
| 522 | + console.log(res.data.data) | |
| 523 | + console.log('11111'); | |
| 524 | + | |
| 522 | 525 | if (res.data.data.user_price) item.prom_price = res.data.data.user_price; |
| 523 | 526 | var vNum = res.data.data.virtual_num ? res.data.data.virtual_num : 0; |
| 524 | 527 | var vNum1 = res.data.data.virtualNum ? res.data.data.virtualNum : 0; | ... | ... |
packageC/pages/presell/goodsInfo/goodsInfo.js
| ... | ... | @@ -589,7 +589,7 @@ Page({ |
| 589 | 589 | } |
| 590 | 590 | } |
| 591 | 591 | } |
| 592 | - | |
| 592 | + | |
| 593 | 593 | let length = fir_quan.length |
| 594 | 594 | if (length <= 3) { |
| 595 | 595 | arr = fir_quan |
| ... | ... | @@ -3445,9 +3445,10 @@ Page({ |
| 3445 | 3445 | tt(); |
| 3446 | 3446 | return false; |
| 3447 | 3447 | } |
| 3448 | - var img_url = ee.data.data.original_img; | |
| 3449 | - //var img_url = ee.data.presellForm.share_img; | |
| 3450 | - //img_url?img_url:ee.data.data.original_img; | |
| 3448 | + | |
| 3449 | + //var img_url = ee.data.data.original_img; | |
| 3450 | + var img_url = ee.data.iurl+ee.data.presellForm.share_img; | |
| 3451 | + img_url?img_url:ee.data.data.original_img; | |
| 3451 | 3452 | |
| 3452 | 3453 | //获取商品是分享图信息 |
| 3453 | 3454 | wx.getImageInfo({ | ... | ... |
packageE/pages/cart/cart2/cart2.js
| ... | ... | @@ -2189,7 +2189,7 @@ Page({ |
| 2189 | 2189 | |
| 2190 | 2190 | //--- 秒杀, 团购的时候，判断有没有订单优惠和包邮模板的叠加 --- |
| 2191 | 2191 | if( [1,2,6].indexOf(item[jc].prom_type)>-1){ |
| 2192 | - if(!item[jc].is_order_yh){ | |
| 2192 | + if(!item[jc].is_order_yh && !item[jc].whsle_id){ | |
| 2193 | 2193 | no_order_yh+=item[jc].goods_price * item[jc].goods_num; |
| 2194 | 2194 | if(item[jc].quan_num) no_order_yh-=item[jc].quan_num; //券要把他补回去 |
| 2195 | 2195 | |
| ... | ... | @@ -2948,7 +2948,7 @@ Page({ |
| 2948 | 2948 | var ord_prom = null; |
| 2949 | 2949 | var is_ord_prom_post = 0; |
| 2950 | 2950 | |
| 2951 | - if (condition > 0 && th.data.bn_is_order_yh) { | |
| 2951 | + if (condition > 0 && th.data.bn_is_order_yh && !th.data.bn_goods.whsle_id) { | |
| 2952 | 2952 | await getApp().request.promiseGet("/api/weshop/promorder/getOrderPromotion", { |
| 2953 | 2953 | data: { store_id: os.stoid, orderAmount: condition, user_id: getApp().globalData.user_id } |
| 2954 | 2954 | }).then(res => { |
| ... | ... | @@ -5502,7 +5502,7 @@ Page({ |
| 5502 | 5502 | } |
| 5503 | 5503 | } |
| 5504 | 5504 | } |
| 5505 | - console.error('优惠活动1'); | |
| 5505 | + | |
| 5506 | 5506 | //------------------- |
| 5507 | 5507 | return getApp().request.promiseGet("/api/weshop/goods/getDiscount", { |
| 5508 | 5508 | data: { |
| ... | ... | @@ -5533,7 +5533,7 @@ Page({ |
| 5533 | 5533 | //-- 看是不是有赠品 -- |
| 5534 | 5534 | if (get_data.gift_id && parseInt(get_data.zp_mode) != 1 |
| 5535 | 5535 | && get_data.zp_num * arr.bs <= get_data.limit_num |
| 5536 | - && get_data.zp_num * arr.bs <= get_data.gift_storecount | |
| 5536 | + && get_data.zp_num * arr.bs <= get_data.gift_storecount && get_data.goodsinfo | |
| 5537 | 5537 | ) { |
| 5538 | 5538 | arr.gift_id = get_data.gift_id; |
| 5539 | 5539 | arr.gift_goods_id = get_data.goods_id; |
| ... | ... | @@ -6016,6 +6016,9 @@ Page({ |
| 6016 | 6016 | |
| 6017 | 6017 | setexptype2: function (e) { |
| 6018 | 6018 | |
| 6019 | + if(this.data.submit) return false; | |
| 6020 | + this.setData({ submit: 1 }); | |
| 6021 | + | |
| 6019 | 6022 | if(this.data.all_collocation_list){ |
| 6020 | 6023 | var bn_coll= this.selectComponent('#bn_coll'); |
| 6021 | 6024 | bn_coll.clear_sele(); |
| ... | ... | @@ -6032,7 +6035,8 @@ Page({ |
| 6032 | 6035 | |
| 6033 | 6036 | setexptype_w2: function (e) { |
| 6034 | 6037 | |
| 6035 | - | |
| 6038 | + if(this.data.submit) return false; | |
| 6039 | + this.setData({ submit: 1 }); | |
| 6036 | 6040 | |
| 6037 | 6041 | for (let i = 0; i <this.data.cartlist.length ; i++) { |
| 6038 | 6042 | ... | ... |
pages/giftpack/giftpacklist/giftpacklist.wxml
| ... | ... | @@ -106,13 +106,13 @@ |
| 106 | 106 | <text class="data-v-3a5b7e36 ellipsis-1"> |
| 107 | 107 | {{"数量:"+item.num}} |
| 108 | 108 | </text> |
| 109 | - <block wx:if="{{isBuy==0 && !flag}}"> | |
| 110 | - <text style="margin-left:10rpx" wx:if="{{item.useState}}"> | |
| 111 | - 已核销 | |
| 112 | - </text> | |
| 113 | - <text style="margin-left:10rpx" wx:else> | |
| 114 | - 未核销 | |
| 115 | - </text> | |
| 109 | + <block wx:if="{{isBuy==0 && !flag && item.lbType==1}}"> | |
| 110 | + <text style="margin-left:10rpx" wx:if="{{item.useState}}"> | |
| 111 | + 已核销 | |
| 112 | + </text> | |
| 113 | + <text style="margin-left:10rpx" wx:else> | |
| 114 | + 未核销 | |
| 115 | + </text> | |
| 116 | 116 | </block> |
| 117 | 117 | </view> |
| 118 | 118 | ... | ... |
pages/goods/goodsInfo/goodsInfo.wxml
| ... | ... | @@ -88,7 +88,7 @@ |
| 88 | 88 | {{djs.min}} |
| 89 | 89 | </view> |
| 90 | 90 | <view class="time" style="color: {{prom_st==1?'#d40022':'#0097e0'}}">分</view> |
| 91 | - <view class='time-val white t-c' style=";background:{{prom_st==1?'#d40022':'#0097e0'}}"> | |
| 91 | + <view class='time-val white t-c' style="background:{{prom_st==1?'#d40022':'#0097e0'}}"> | |
| 92 | 92 | {{djs.sec}} |
| 93 | 93 | </view> |
| 94 | 94 | <view class="time" style="color: {{prom_st==1?'#d40022':'#0097e0'}}">秒</view> | ... | ... |
pages/goods/goodsList/goodsList.js
| ... | ... | @@ -291,10 +291,10 @@ Page({ |
| 291 | 291 | if(!user_id) user_id=0; |
| 292 | 292 | |
| 293 | 293 | //不是商品分组的，不是默认排序的 |
| 294 | - if(t.indexOf("group_id")==-1 ){ | |
| 294 | + // if(t.indexOf("group_id")==-1 ){ | |
| 295 | 295 | t += "&orderField=" + e.data.tabname; |
| 296 | 296 | t += "&orderType=" + e.data.adname; |
| 297 | - } | |
| 297 | + // } | |
| 298 | 298 | |
| 299 | 299 | t +="&page=" + e.data.currentPage; |
| 300 | 300 | wx.showLoading({}); |
| ... | ... | @@ -498,8 +498,8 @@ Page({ |
| 498 | 498 | |
| 499 | 499 | go_url:function (e) { |
| 500 | 500 | var url = e.currentTarget.dataset.url; |
| 501 | - //var rq_data = JSON.stringify(this.data.rq_data); | |
| 502 | - //url += `&o=${rq_data}`; | |
| 501 | + var rq_data = JSON.stringify(this.data.rq_data); | |
| 502 | + url += `&o=${rq_data}`; | |
| 503 | 503 | // console.log('url!!!=======<<<<', url); |
| 504 | 504 | getApp().goto(url); |
| 505 | 505 | }, | ... | ... |
pages/goods/search/search.js
| ... | ... | @@ -44,9 +44,23 @@ Page({ |
| 44 | 44 | |
| 45 | 45 | onLoad: function (t) { |
| 46 | 46 | this.data.rq_data = t; |
| 47 | + | |
| 47 | 48 | if (t.o) { |
| 48 | 49 | this.data.rq_data.o = JSON.parse(t.o); |
| 49 | 50 | }; |
| 51 | + var req = t.o; | |
| 52 | + if(req.cat_id){ | |
| 53 | + var baseUrl= "/api/weshop/goods/page?isnewwhere=1&cat_id="+req.cat_id | |
| 54 | + this.setData({ baseUrl: baseUrl }); | |
| 55 | + } | |
| 56 | + if(req.nation_id){ | |
| 57 | + var baseUrl= "/api/weshop/goods/page?isnewwhere=1&nation_id="+req.nation_id | |
| 58 | + this.setData({ baseUrl: baseUrl }); | |
| 59 | + } | |
| 60 | + if(req.brand_id){ | |
| 61 | + var baseUrl= "/api/weshop/goods/page?isnewwhere=1&brand_id="+req.brand_id | |
| 62 | + this.setData({ baseUrl: baseUrl }); | |
| 63 | + } | |
| 50 | 64 | |
| 51 | 65 | |
| 52 | 66 | //接受有没有导购的参数 | ... | ... |
pages/index/index/index.js
| ... | ... | @@ -84,7 +84,7 @@ Page({ |
| 84 | 84 | full_ad: null, //全屏广告 |
| 85 | 85 | full_screen: 0, //全屏广告 |
| 86 | 86 | is_ok_h5: 0, //判断要不要显示关注二维码 |
| 87 | - | |
| 87 | + mb_banner:{},//首页广告 | |
| 88 | 88 | container: null, |
| 89 | 89 | is_retail_price:0, |
| 90 | 90 | }, |
| ... | ... | @@ -669,6 +669,36 @@ Page({ |
| 669 | 669 | }) |
| 670 | 670 | let user_id = getApp().globalData.user_id; |
| 671 | 671 | |
| 672 | + //---首页广告------- | |
| 673 | + await getApp().request.promiseGet("/api/weshop/ad/page?pids=300,301,302,303,304&store_id=" + o.stoid, { | |
| 674 | + data: { | |
| 675 | + enabled: 1 | |
| 676 | + } | |
| 677 | + }).then(res => { | |
| 678 | + console.log('首页广告--------------------------'); | |
| 679 | + console.log(res); | |
| 680 | + if (res.data.code == 0 && res.data.data.pageData && res.data.data.pageData.length > 0) { | |
| 681 | + var a = res.data.data.pageData; | |
| 682 | + var obj = {}; | |
| 683 | + for (var i = 0; i < a.length; i++) { | |
| 684 | + var tt = { | |
| 685 | + 'ad_code': o.imghost + a[i].ad_code, | |
| 686 | + 'media_link': '', | |
| 687 | + 'ad_weapplink': a[i].ad_weapplink, | |
| 688 | + 'pid':a[i].pid | |
| 689 | + }; | |
| 690 | + // arr.push(tt); | |
| 691 | + obj[a[i].pid]=tt | |
| 692 | + } | |
| 693 | + if (a.length > 0) e.setData({ | |
| 694 | + mb_banner: obj, | |
| 695 | + }); | |
| 696 | + | |
| 697 | + wx.stopPullDownRefresh(); | |
| 698 | + } | |
| 699 | + }) | |
| 700 | + | |
| 701 | + | |
| 672 | 702 | //----拼单----- |
| 673 | 703 | await getApp().request.promiseGet("/api/weshop/teamlist/pageteam/2", { |
| 674 | 704 | data: { |
| ... | ... | @@ -1092,6 +1122,11 @@ Page({ |
| 1092 | 1122 | } |
| 1093 | 1123 | }) |
| 1094 | 1124 | }, |
| 1125 | + //广告跳转 | |
| 1126 | + go_mb(e){ | |
| 1127 | + let url=e.currentTarget.dataset.url | |
| 1128 | + getApp().goto(url); | |
| 1129 | + }, | |
| 1095 | 1130 | |
| 1096 | 1131 | //跳转到分类 |
| 1097 | 1132 | go_cate: function () { | ... | ... |
pages/index/index/index.wxss
| ... | ... | @@ -1234,3 +1234,18 @@ page { |
| 1234 | 1234 | align-items: center; |
| 1235 | 1235 | justify-items: center; |
| 1236 | 1236 | } |
| 1237 | +/* 商城首页 */ | |
| 1238 | +.mb_box{ | |
| 1239 | + width: 100%; | |
| 1240 | +} | |
| 1241 | +.mb_top,.mb_bottom{ | |
| 1242 | + width: 100%; | |
| 1243 | + display: flex; | |
| 1244 | + | |
| 1245 | +} | |
| 1246 | +.mb_top .mb_top_item{ | |
| 1247 | + width: 50%; | |
| 1248 | +} | |
| 1249 | +.mb_bottom>view{ | |
| 1250 | + width: 50%; | |
| 1251 | +} | ... | ... |
pages/user/assistance/task_assistance.js
| ... | ... | @@ -47,7 +47,7 @@ Page({ |
| 47 | 47 | is_user_list: 0,//我的任务点击加载更多的后 |
| 48 | 48 | |
| 49 | 49 | //*********************************************start钱 |
| 50 | - canvasHidden: 0, //分享图片是否已经生成 | |
| 50 | + canvasHidden: 1, //分享图片是否已经生成 | |
| 51 | 51 | is_share: 0, //是否显示画布 |
| 52 | 52 | shareImgPath: [], //生成的图片 |
| 53 | 53 | screenWidth: "", //用户的屏幕宽度 |
| ... | ... | @@ -83,6 +83,10 @@ Page({ |
| 83 | 83 | btn_color:'', |
| 84 | 84 | bg_color:'', |
| 85 | 85 | font_color:'', |
| 86 | + | |
| 87 | + //-- 屏幕实际的高度 -- | |
| 88 | + r_heght:'' | |
| 89 | + | |
| 86 | 90 | }, |
| 87 | 91 | |
| 88 | 92 | /** |
| ... | ... | @@ -107,8 +111,9 @@ Page({ |
| 107 | 111 | th.setData({taskid:options.taskid}) |
| 108 | 112 | } |
| 109 | 113 | |
| 110 | - th.close(); | |
| 114 | + console.log('aaaa'); | |
| 111 | 115 | th.syinfo(); |
| 116 | + th.close(); | |
| 112 | 117 | th.imageinfo(); |
| 113 | 118 | |
| 114 | 119 | }, |
| ... | ... | @@ -743,13 +748,26 @@ Page({ |
| 743 | 748 | }) |
| 744 | 749 | }, |
| 745 | 750 | syinfo: function () { |
| 751 | + | |
| 752 | + console.log('bbb----------'); | |
| 753 | + | |
| 746 | 754 | var th = this; |
| 747 | 755 | //获取用户设备信息，屏幕宽度 |
| 748 | 756 | wx.getSystemInfo({ |
| 749 | 757 | success: res => { |
| 758 | + | |
| 759 | + | |
| 760 | + | |
| 761 | + var rpxR = 750 / res.screenWidth; | |
| 762 | + var r_height=res.windowHeight*rpxR; | |
| 763 | + | |
| 764 | + console.log(r_height,'11111') | |
| 765 | + | |
| 750 | 766 | th.setData({ |
| 751 | - screenWidth: res.screenWidth | |
| 767 | + screenWidth: res.screenWidth, | |
| 768 | + r_heght:r_height | |
| 752 | 769 | }) |
| 770 | + | |
| 753 | 771 | } |
| 754 | 772 | }) |
| 755 | 773 | }, |
| ... | ... | @@ -761,6 +779,7 @@ Page({ |
| 761 | 779 | var th = this; |
| 762 | 780 | if (th.data.is_generate) return; |
| 763 | 781 | th.data.is_generate = 1; |
| 782 | + th.setData({canvasHidden:0}); | |
| 764 | 783 | |
| 765 | 784 | var scene = this.data.is_user_task.id; |
| 766 | 785 | ///二微码 |
| ... | ... | @@ -782,7 +801,9 @@ Page({ |
| 782 | 801 | |
| 783 | 802 | var iurl = th.data.iurl; //图片地址前缀 |
| 784 | 803 | const ctx = wx.createCanvasContext('share_id'); //绘图上下文 |
| 785 | - var unit = th.data.screenWidth / 750 * 1.35; | |
| 804 | + var unit = th.data.screenWidth / 750 * (750/445); | |
| 805 | + | |
| 806 | + | |
| 786 | 807 | var numsize = 20 * unit; //几人助力字体大小 |
| 787 | 808 | var head_list_img = th.data.head_pic_arr; |
| 788 | 809 | var num = th.data.head_pic_arr.length; //已有几位好友助力 |
| ... | ... | @@ -800,7 +821,7 @@ Page({ |
| 800 | 821 | var left = 74 * unit; //助力人头像跟左边的距离 |
| 801 | 822 | var spacing = 12 * unit; //助力人图片间距 |
| 802 | 823 | var images = th.data.images; |
| 803 | - ctx.drawImage(images[0], 0, 0, 445 * unit, 700 * unit); //分享的背景图片 | |
| 824 | + ctx.drawImage(images[0], 0, 0, 445 * unit, 1200 * th.data.screenWidth / 750); //分享的背景图片 | |
| 804 | 825 | ctx.drawImage(images[1], 37 * unit, 185 * unit, 370 * unit, 377 * unit); //分享的背景图片 |
| 805 | 826 | |
| 806 | 827 | console.log(111); |
| ... | ... | @@ -926,14 +947,15 @@ Page({ |
| 926 | 947 | // success: function (res) { |
| 927 | 948 | //把画板内容绘制成图片，并回调 画板图片路径 |
| 928 | 949 | ctx.draw(false, function () { |
| 950 | + | |
| 929 | 951 | setTimeout(function () { |
| 930 | 952 | wx.canvasToTempFilePath({ |
| 931 | 953 | x: 0, |
| 932 | 954 | y: 0, |
| 933 | - width: 300, | |
| 934 | - height: 500, | |
| 935 | - destWidth: 400 * 2, | |
| 936 | - destHeight: 720 * 2, | |
| 955 | + width: 750, | |
| 956 | + height: 1200, | |
| 957 | + destWidth:1.2* 750 * 750 / th.data.screenWidth, | |
| 958 | + destHeight:1.2 *1200* 750 / th.data.screenWidth, | |
| 937 | 959 | canvasId: 'share_id', |
| 938 | 960 | success: function (res) { |
| 939 | 961 | wx.hideLoading(); |
| ... | ... | @@ -945,7 +967,6 @@ Page({ |
| 945 | 967 | canvasHidden: 1, |
| 946 | 968 | is_share: 1, |
| 947 | 969 | is_generate: 0, |
| 948 | - canvasHidden: 1 | |
| 949 | 970 | }) |
| 950 | 971 | if (!res.tempFilePath) { |
| 951 | 972 | wx.showModal({ |
| ... | ... | @@ -991,17 +1012,7 @@ Page({ |
| 991 | 1012 | is_share: 0 |
| 992 | 1013 | }) |
| 993 | 1014 | }, |
| 994 | - syinfo: function () { | |
| 995 | - var th = this; | |
| 996 | - //获取用户设备信息，屏幕宽度 | |
| 997 | - wx.getSystemInfo({ | |
| 998 | - success: res => { | |
| 999 | - th.setData({ | |
| 1000 | - screenWidth: res.screenWidth | |
| 1001 | - }) | |
| 1002 | - } | |
| 1003 | - }) | |
| 1004 | - }, | |
| 1015 | + | |
| 1005 | 1016 | |
| 1006 | 1017 | //把固定的图片加载到本地 |
| 1007 | 1018 | imageinfo: async function () { | ... | ... |
pages/user/assistance/task_assistance.wxml
| ... | ... | @@ -178,16 +178,21 @@ |
| 178 | 178 | <view class="dust"></view> |
| 179 | 179 | <view class="canvas" style="width:100%;"> |
| 180 | 180 | <view class="flex-center"> |
| 181 | - <canvas canvas-id="share_id" style="width:600rpx;height:1000rpx;" bindtap="preview"></canvas> | |
| 181 | +<!-- <canvas canvas-id="share_id" style="width:750rpx;height:{{r_heght}}rpx;" bindtap="preview"></canvas>--> | |
| 182 | + <image style="width:600rpx; height:960rpx" src="{{shareImgPath}}" bindtap="preview"></image> | |
| 182 | 183 | </view> |
| 183 | 184 | <view class="closes flex-center"> |
| 184 | 185 | <image class="close" src="{{iurl}}/miniapp/images/plus/Close.png" bindtap="close_share"></image> |
| 185 | 186 | </view> |
| 186 | 187 | </view> |
| 187 | 188 | </view> |
| 189 | + | |
| 188 | 190 | <!-- 引入提示组件 --> |
| 189 | 191 | <warn id="warn"></warn> |
| 190 | 192 | <!-- 制作一个圆球导航 --> |
| 191 | 193 | <nav_b id="nav_b"></nav_b> |
| 192 | 194 | </view> |
| 193 | 195 | |
| 196 | +<!-- 二维码显示页面 --> | |
| 197 | +<canvas canvas-id='share_id' style='width:750rpx;height:1200rpx;background-color:white;' wx:if="{{!canvasHidden}}"></canvas> | |
| 198 | + | ... | ... |