wxd / MShopWeApp

Commit 131e92945bdfcfa2ccb3b4f752cc05be97b11cd9

Authored by 后端研发-苏明海
2 parents 15c455fe f8f77f42

Merge branch 'dev' into 'test' 

Dev

See merge request !790
Inline Side-by-side
Showing 6 changed files with 91 additions and 89 deletions
packageA/pages/liveStream/liveStream.js
  View file @131e929
... ... @@ -245,7 +245,7 @@ Page({
245 245 pageSize: 100,
246 246 }).then((res) => {
247 247 self.setData({
248   - living11: self.data.list,
  248 + living: self.data.list,
249 249 });
250 250  
251 251 //直播中列表请求完后，请求即将开始列表
... ...
packageA/pages/liveStream/liveStream.wxml
  View file @131e929
... ... @@ -26,10 +26,10 @@
26 26  
27 27  
28 28 <!-- 直播中 -->
29   - <block wx:if="{{living11.pageData.length > 0}}">
  29 + <block wx:if="{{living.pageData.length > 0}}">
30 30 <view class="title">直播中</view>
31 31 <view class="list">
32   - <block wx:for="{{living11.pageData}}" wx:key="item">
  32 + <block wx:for="{{liveing.pageData}}" wx:key="item">
33 33 <view class="list-item" catchtap="clickItem" data-id="{{item.id}}" data-live="ing">
34 34 <view class="list-item-left">
35 35 <image src="{{item.share_img}}" class="item-pic" mode="aspectFit"></image>
... ...
packageC/pages/presell/cart/cart.js
  View file @131e929
... ... @@ -492,23 +492,34 @@ Page({
492 492 }
493 493 }
494 494  
495   -
496   - var g_url="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id="+order_goods.goods_id+"&pre_id="+pre_arr.id;
497   - if(act.is_end || th.data.act.end_time<ut.gettimestamp()) {
498   - g_url="/pages/goods/goodsInfo/goodsInfo?goods_id="+order_goods.goods_id;
499   - getApp().request.put("/api/weshop/goods/update",
500   - { data:{goods_id:order_goods.goods_id,store_id:os.stoid,prom_id:0,prom_type:0},
501   - success: function(e) {}
502   - });
503   - }
504   -
505   -
506 495 //---获取商品---
507 496 await getApp().request.promiseGet("/api/weshop/goods/get/" + oo.stoid + "/" + order_goods.goods_id, {}).then(res => {
508 497 goods = res.data.data;
509 498 order.market_price = goods.market_price;
510 499 order.show_img = oo.imghost + goods.original_img;
511 500 });
  501 +
  502 +
  503 + var g_url="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id="+order_goods.goods_id+"&pre_id="+pre_arr.id;
  504 + if(act.is_end || th.data.act.end_time<ut.gettimestamp()) {
  505 +
  506 + if(goods.prom_type==8 && goods.prom_id==act.id){
  507 + g_url="/pages/goods/goodsInfo/goodsInfo?goods_id="+order_goods.goods_id;
  508 + getApp().request.put("/api/weshop/goods/update",
  509 + { data:{goods_id:order_goods.goods_id,store_id:os.stoid,prom_id:0,prom_type:0},
  510 + success: function(e) {}
  511 + });
  512 + }else{
  513 + g_url="/pages/goods/goodsInfo/goodsInfo?goods_id="+order_goods.goods_id;
  514 + if(goods.prom_type==8){
  515 + g_url="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id="+order_goods.goods_id+"&prom_id="+goods.prom_id;
  516 + }
  517 +
  518 + }
  519 +
  520 + }
  521 +
  522 +
512 523 //判断使用优惠券的接口需要
513 524 th.data.check_quan_ware_list = goods.erpwareid;
514 525 //---获取门店---
... ... @@ -646,9 +657,9 @@ Page({
646 657 }
647 658  
648 659 if(quan_price>0){
649   - if (quan_price < o_condition) th.setData({quan_price: quan_price})
  660 + if (quan_price < th.data.tail_pay) th.setData({quan_price: quan_price})
650 661 else {
651   - th.setData({quan_price: o_condition})
  662 + th.setData({quan_price: th.data.tail_pay})
652 663 }
653 664 o_condition=o_condition-quan_price;
654 665  
... ... @@ -659,21 +670,22 @@ Page({
659 670  
660 671 //如果同意参与订单优惠
661 672 if (o_condition > 0 && this.data.pre_arr.is_useorderyh) {
662   - th.check_is_order_prom(o_condition, function () {
  673 + th.check_is_order_prom(o_condition, function (ord_price) {
663 674 var bn_pick=th.data.pickup.pickup_id
664 675 var order_prom_amount = 0;
665 676 var order_prom_id = 0;
  677 + var o_condition1=0;
666 678 if (th.data.order_prom[bn_pick]) {
667 679 var ord_prom = th.data.order_prom[bn_pick];
668 680 order_prom_id = ord_prom['id'];
669 681 switch (ord_prom['type']) {
670 682 case 0:
671 683 var all_1=o_condition;
672   - o_condition = Math.round(o_condition * ord_prom['expression']) / 100;//满额打折
673   - order_prom_amount = (all_1 - o_condition).toFixed(2);
  684 + o_condition1 = Math.round(ord_price * ord_prom['expression']) / 100;//满额打折
  685 + order_prom_amount = (all_1 - o_condition1).toFixed(2);
674 686 break;
675 687 case 1:
676   - o_condition = o_condition - ord_prom['expression'];//满额优惠金额
  688 + o_condition1 = ord_price - ord_prom['expression'];//满额优惠金额
677 689 order_prom_amount = ord_prom['expression'];
678 690 break;
679 691 }
... ... @@ -684,9 +696,12 @@ Page({
684 696 var order_prom_txt2 = "order_prom_amount";
685 697 th.setData({[order_prom_txt1]: order_prom_id, [order_prom_txt2]: order_prom_amount})
686 698 }
687   - th.setData({ exp_price: 0, order_m: o_condition })
  699 +
  700 + o_condition1=parseFloat(o_condition1)-parseFloat(th.data.presell.presell_deposit);
  701 + th.setData({ exp_price: 0, order_m: o_condition1 })
688 702 })
689 703 }else{
  704 + o_condition=parseFloat(o_condition)-parseFloat(th.data.presell.presell_deposit);
690 705 th.setData({ exp_price: 0, order_m: o_condition })
691 706 }
692 707 }
... ... @@ -1679,8 +1694,10 @@ Page({
1679 1694 if (res.data.code == 0) {
1680 1695 var data = res.data.data;
1681 1696 th.data.order_prom[pick] = data;
1682   - }
1683   - func();
  1697 + }else{
  1698 + th.data.order_prom[pick] = null;
  1699 + }
  1700 + func(condition);
1684 1701 })
1685 1702 },
1686 1703  
... ... @@ -1872,9 +1889,10 @@ Page({
1872 1889 })
1873 1890  
1874 1891 if(quan_price>0) {
1875   - if (quan_price < allpice) th.setData({quan_price: quan_price})
  1892 + if (quan_price <th.data.tail_pay) th.setData({quan_price:quan_price})
1876 1893 else {
1877   - th.setData({quan_price: allpice})
  1894 + th.setData({quan_price: th.data.tail_pay})
  1895 + quan_price=th.data.tail_pay;
1878 1896 }
1879 1897 }else{
1880 1898 th.setData({quan_price: 0})
... ... @@ -1957,7 +1975,7 @@ Page({
1957 1975 if(o_condition<0) o_condition=0;
1958 1976 //如果同意参与订单优惠
1959 1977 if (o_condition > 0 && this.data.pre_arr.is_useorderyh) {
1960   - th.check_is_order_prom(o_condition, function () {
  1978 + th.check_is_order_prom(o_condition, function (ord_price) {
1961 1979 var bn_pick=th.data.pickup.pickup_id
1962 1980 var order_prom_amount = 0;
1963 1981 var order_prom_id = 0;
... ... @@ -1967,15 +1985,15 @@ Page({
1967 1985 order_prom_id = ord_prom['id'];
1968 1986 switch (ord_prom['type']) {
1969 1987 case 0:
1970   - order_m = Math.round(o_condition * ord_prom['expression']) / 100;//满额打折
1971   - order_prom_amount = (o_condition - order_m).toFixed(2);
  1988 + order_m = Math.round(ord_price * ord_prom['expression']) / 100;//满额打折
  1989 + order_prom_amount = (ord_price - order_m).toFixed(2);
1972 1990 break;
1973 1991 case 1:
1974   - order_m = o_condition - ord_prom['expression'];//满额优惠金额
  1992 + order_m = ord_price - ord_prom['expression'];//满额优惠金额
1975 1993 order_prom_amount = ord_prom['expression'];
1976 1994 break;
1977 1995 }
1978   - o_condition=order_m;
  1996 + ord_price=order_m;
1979 1997 }
1980 1998  
1981 1999 //--订单优惠的显示--
... ... @@ -1983,13 +2001,21 @@ Page({
1983 2001 var order_prom_txt1 = "order_prom_id";
1984 2002 var order_prom_txt2 = "order_prom_amount";
1985 2003 th.setData({[order_prom_txt1]: order_prom_id, [order_prom_txt2]: order_prom_amount})
1986   - }
1987   -
1988   - th.setData({ exp_price: exp_price, order_m: parseFloat(o_condition) +parseFloat(exp_price) })
  2004 + }else{
  2005 + var order_prom_txt1 = "order_prom_id";
  2006 + var order_prom_txt2 = "order_prom_amount";
  2007 + th.setData({[order_prom_txt1]: 0, [order_prom_txt2]: 0})
  2008 + }
  2009 +
  2010 +
  2011 + ord_price=parseFloat(ord_price)-parseFloat(th.data.presell.presell_deposit);
  2012 + th.setData({ exp_price: exp_price, order_m: ord_price +parseFloat(exp_price) })
1989 2013  
1990 2014 })
1991 2015 }else{
1992   - th.setData({ exp_price: exp_price, order_m: parseFloat(o_condition)+parseFloat(exp_price) })
  2016 +
  2017 + var o_condition1=parseFloat(o_condition)-parseFloat(th.data.presell.presell_deposit);
  2018 + th.setData({ exp_price: exp_price, order_m: parseFloat(o_condition1)+parseFloat(exp_price) })
1993 2019 }
1994 2020 },
1995 2021  
... ... @@ -2110,7 +2136,7 @@ Page({
2110 2136 if(th.data.user_note){
2111 2137 dd.user_note=th.data.user_note;
2112 2138 }
2113   - dd.order_amount= parseFloat(th.data.order_m-th.data.presell.presell_deposit).toFixed(2);
  2139 + dd.order_amount= parseFloat(th.data.order_m).toFixed(2);
2114 2140  
2115 2141 console.log(JSON.stringify(dd));
2116 2142 wx.request({
... ...
packageC/pages/presell/cart/cart.wxml
  View file @131e929
... ... @@ -337,7 +337,7 @@
337 337 <view class="btn-wrap">
338 338 <view class="pay-amount">
339 339 <view class="payable">应付金额：
340   - <text class="co-red"> <text class="fs24">￥</text>{{filters.toFix(order_m-presell.presell_deposit,2)}}</text>
  340 + <text class="co-red"> <text class="fs24">￥</text>{{filters.toFix(order_m,2)}}</text>
341 341 </view>
342 342 </view>
343 343 <button wx:if="{{no_start || is_end || is_complete}}" class="tips-btn gray">提交订单</button>
... ...
packageC/pages/presell/goodsInfo/goodsInfo.js
  View file @131e929
... ... @@ -1538,7 +1538,7 @@ Page({
1538 1538  
1539 1539  
1540 1540  
1541   - var url = "/packageC/pages/presell/goodsInfo/goodsInfo?goods_id=" + th.data.gid;
  1541 + var url = "/packageC/pages/presell/goodsInfo/goodsInfo?goods_id=" + th.data.gid+"&pre_id="+th.data.pre_arr.id;
1542 1542 if (getApp().globalData.user_id) {
1543 1543 url += "&first_leader=" + getApp().globalData.user_id;
1544 1544 }
... ... @@ -1558,6 +1558,9 @@ Page({
1558 1558 };
1559 1559  
1560 1560 ob.title += '\n' + th.data.presellForm.share_remark;
  1561 +
  1562 +
  1563 + console.log(ob,888);
1561 1564  
1562 1565  
1563 1566 return ob;
... ... @@ -2688,7 +2691,8 @@ Page({
2688 2691 var app = getApp();
2689 2692 var unit = that.data.screenWidth / 750 * 1.35; //基础单位，
2690 2693 var path2 = that.data.data.original_img;
2691   - var scene = th.data.gid + "";
  2694 +
  2695 + var scene = th.data.gid + "_"+th.data.pre_arr.id;
2692 2696 var user_id = getApp().globalData.user_id ? getApp().globalData.user_id : 0;
2693 2697 if (user_id > 0) {
2694 2698 scene += "_" + user_id;
... ... @@ -2699,8 +2703,10 @@ Page({
2699 2703 if (!user_id) scene += "_0";
2700 2704 scene += "_" + getApp().globalData.room_id;
2701 2705 }
  2706 +
2702 2707 ///二微码
2703 2708 var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" +
  2709 + //os.stoid + "?sceneValue=" + scene + "&pageValue=packageC/pages/presell/goodsInfo/goodsInfo";
2704 2710 os.stoid + "?sceneValue=" + scene + "&pageValue=pages/goods/goodsInfo/goodsInfo";
2705 2711  
2706 2712 console.log(path3);
... ... @@ -2796,14 +2802,20 @@ Page({
2796 2802 context.setFontSize(22 * unit)
2797 2803 pri0 = "￥" + th.data.data.market_price.toFixed(2);
2798 2804 var wd2 = th.data.screenWidth - ut.measureText(pri0, 22 * unit) - 25;
2799   - context.fillText('定金', wd2, 213 * unit);
2800   -
2801   - // context.setStrokeStyle('gray');
2802   - // context.setLineWidth(1 * unit);
2803   - // context.moveTo(wd2 - 5, 206 * unit);
2804   - // context.lineTo(wd2 + ut.measureText(pri0, 22 * unit) + 5, 206 * unit);
2805   - // context.stroke();
2806   -
  2805 +
  2806 + if(th.data.presellForm.presell_type==1){
  2807 + context.setStrokeStyle('gray');
  2808 + context.fillText(pri0, wd2, 213 * unit);
  2809 + context.setLineWidth(1 * unit);
  2810 + context.moveTo(wd2 - 5, 206 * unit);
  2811 + context.lineTo(wd2 + ut.measureText(pri0, 22 * unit) + 5, 206 * unit);
  2812 + context.stroke();
  2813 + }else{
  2814 + context.fillText('定金', wd2, 213 * unit);
  2815 + }
  2816 +
  2817 +
  2818 +
2807 2819 } else {
2808 2820 context.setFillStyle("black");
2809 2821 context.setFontSize(21.3 * unit)
... ... @@ -2829,43 +2841,7 @@ Page({
2829 2841 //---中间大图---
2830 2842 context.drawImage(th.data.share_goods_img, 70 * unit, 250 * unit, 408 * unit, 408 * unit);
2831 2843  
2832   - //预售
2833   - /* if (th.data.poster && parseInt(th.data.poster.style) == 2) {
2834   - if (parseInt(th.data.poster.show_quality)) {
2835   - var g_path = "../../../../images/share/s_gou.png";
2836   - context.drawImage(g_path, 56 * unit, 670 * unit, 22 * unit, 22 * unit);
2837   - context.setFillStyle("red")
2838   - context.setFontSize(18 * unit)
2839   - context.fillText("正品保证", 84 * unit, 690 * unit);
2840   -
2841   - context.drawImage(g_path, 218 * unit, 670 * unit, 22 * unit, 22 * unit);
2842   - context.setFillStyle("red")
2843   - context.setFontSize(18 * unit)
2844   - context.fillText("纯实体店", 246 * unit, 690 * unit);
2845   -
2846   - context.drawImage(g_path, 388 * unit, 670 * unit, 22 * unit, 22 * unit);
2847   - context.setFillStyle("red")
2848   - context.setFontSize(18 * unit)
2849   - context.fillText("官方验证", 420 * unit, 690 * unit);
2850   - }
2851   - } else {
2852   - var g_path = "../../../../images/share/s_gou.png";
2853   - context.drawImage(g_path, 56 * unit, 670 * unit, 22 * unit, 22 * unit);
2854   - context.setFillStyle("red")
2855   - context.setFontSize(18 * unit)
2856   - context.fillText("正品保证", 84 * unit, 690 * unit);
2857   -
2858   - context.drawImage(g_path, 218 * unit, 670 * unit, 22 * unit, 22 * unit);
2859   - context.setFillStyle("red")
2860   - context.setFontSize(18 * unit)
2861   - context.fillText("纯实体店", 246 * unit, 690 * unit);
2862   -
2863   - context.drawImage(g_path, 388 * unit, 670 * unit, 22 * unit, 22 * unit);
2864   - context.setFillStyle("red")
2865   - context.setFontSize(18 * unit)
2866   - context.fillText("官方验证", 420 * unit, 690 * unit);
2867   - } */
2868   -
  2844 +
2869 2845 //---画线---
2870 2846 context.setLineWidth(1 * unit)
2871 2847 context.moveTo(32 * unit, 665 * unit)
... ... @@ -2876,14 +2852,14 @@ Page({
2876 2852 context.setFillStyle("black")
2877 2853 // context.setFontSize(22 * unit)
2878 2854 context.setFontSize(24 * unit)
2879   - context.fillText(th.data.sto_sele_name_1, 40 * unit, 766 * unit);
  2855 + context.fillText(th.data.sto_sele_name_1, 40 * unit, 730 * unit);
2880 2856 context.setFillStyle("red")
2881 2857 context.setFontSize(20 * unit)
2882 2858 var presell_price = `预售价：${th.data.presellList.presell_price}`
2883   - context.fillText(presell_price, 40 * unit, 801 * unit);
  2859 + context.fillText(presell_price, 40 * unit, 780 * unit);
2884 2860 context.setFillStyle("black")
2885 2861 context.setFontSize(22 * unit)
2886   - context.fillText("特惠好物，限时预售", 40 * unit, 836 * unit);
  2862 + context.fillText("特惠好物，限时预售", 40 * unit, 826 * unit);
2887 2863 context.fillText("长按识别二维码，立即开始抢购", 40 * unit, 866 * unit);
2888 2864  
2889 2865 //---二维吗图---
... ... @@ -2894,7 +2870,7 @@ Page({
2894 2870 context.drawImage(vpath, erm_x * unit, erm_y * unit, 136 * unit, 136 * unit);
2895 2871 } else {
2896 2872 //---二维吗图---
2897   - context.drawImage(vpath, 390 * unit, 756 * unit, 130 * unit, 116 * unit);
  2873 + context.drawImage(vpath, 390 * unit, 746 * unit, 130 * unit, 116 * unit);
2898 2874 }
2899 2875  
2900 2876  
... ... @@ -3966,7 +3942,7 @@ Page({
3966 3942 }
3967 3943 })
3968 3944 if (!pre_arr) {
3969   - wx.showToast({title: "当前会员身份不符，无法参与", icon: 'none', duration: 3000});
  3945 + wx.showToast({title: "当前会员身份不符或者时间已过期，无法参与", icon: 'none', duration: 3000});
3970 3946 setTimeout(function () {
3971 3947 ut.wx_back();
3972 3948 }, 2000)
... ...
pages/index/index/index.wxml
  View file @131e929
... ... @@ -203,7 +203,7 @@
203 203 <view class="imgview presell">
204 204 <image src="{{url+aitem.original_img}}" mode="aspectFill" lazy-load="true" data-errorimg="preGoods[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3" data-img="{{aitem.original_img}}"></image>
205 205 </view>
206   - <view class="ellipsis-2 mar-top10" style="height: 75rpx; width: 200rpx">{{aitem.goods_name}}</view>
  206 + <view class="ellipsis-2 mar-top10" style="height: 75rpx; width: 200rpx">{{aitem.act_name}}</view>
207 207 <view class="co-red mar-top10 flex jc_sb ali-c">
208 208 <view>
209 209 <text><text class="fs20">￥</text>{{aitem.presell_price}}</text>
... ...