wxd / MShopWeApp

Commit 5ad4bd372c1c481bd4bfc4e7117e8d7168fbebdc

Authored by yvan.ni
1 parent 98a8234b

拼团的优化

Inline Side-by-side
Showing 4 changed files with 140 additions and 222 deletions
packageA/pages/serviceCard_pd/team_show/team_show.js
  View file @5ad4bd3
1   -var t = require("../../../../utils/util.js"),
2   - ut = t,
3   - e = require("../../../../utils/common.js"),
4   - a = require("../../../../utils/wxParse/wxParse.js"),
  1 +var ut = require("../../../../utils/util.js"),
5 2 s = getApp(),
6 3 i = s.request,
7   - rq = i,
8 4 oo = s.globalData,
9 5 o = s.globalData.setting,
10 6 os = o;
... ... @@ -95,15 +91,13 @@ Page({
95 91 },
96 92 onLoad: function(options) {
97 93 wx.setNavigationBarTitle({ title: "拼团订单",})
98   - //var postdata=getApp().globalData.to_group;
  94 +
99 95 var postdata=options;
100 96 var tg_id = postdata.tg_id, first_leader=options.first_leader,goods_id=options.goods_id;
101 97 //如果tg_id是空的话
102 98 if(tg_id==null ||goods_id==null){
103 99 var tg_id_str=decodeURIComponent(postdata.scene);
104 100 tg_id_str=tg_id_str.split("_");
105   - console.log(tg_id_str.length);
106   - //tg_id_str[0] teamgroup.id tg_id_str[1] user_id tg_id_str[2] goods_id
107 101 switch(tg_id_str.length){
108 102 case 1:
109 103 tg_id=tg_id_str[0];
... ... @@ -126,6 +120,7 @@ Page({
126 120 getApp().request.promiseGet("/api/weshop/shoppingGuide/get/"+os.stoid+"/"+first_leader,{}).then(res=>{
127 121 if(res.data.code==0){
128 122 getApp().globalData.guide_id=res.data.data.id;
  123 + getApp().globalData.guide_pick_id= res.data.data.pickup_id
129 124 }
130 125 })
131 126 }
... ... @@ -134,7 +129,9 @@ Page({
134 129  
135 130 var th=this;
136 131 getApp().getConfig2(function(e) {
137   - th.setData({ bconfig: e,});
  132 +
  133 + var json_d = JSON.parse(e.switch_list);
  134 + th.setData({ bconfig: e,sys_switch:json_d});
138 135 th.wait_for_store_config(); //获取默认的门店
139 136 })
140 137  
... ... @@ -293,37 +290,28 @@ Page({
293 290 var gd=this.data.goods;
294 291 var th=this;
295 292 var user_id=getApp().globalData.user_id;
296   - var promgoodsbuynum=0;
  293 + var promcardbuynum=0;
297 294 var goodsbuynum=0;
298   - getApp().request.promiseGet("/api/weshop/ordergoods/getUserBuyGoodsNum", {
  295 + await getApp().request.promiseGet("/api/weshop/rechargeServicelist/getUserBuyGoodsNum", {
299 296 data: {
300 297 store_id: os.stoid,
301 298 user_id: user_id,
302   - goods_id: gd.goods_id,
303   - prom_type: gd.prom_type,
  299 + card_id: gd.id,
  300 + prom_type: 6,
304 301 prom_id: gd.prom_id
305 302  
306 303 },
307 304 }).then(res=>{
308 305 var buy_num_data=res.data.data;
309   - if(buy_num_data.promgoodsbuynum) promgoodsbuynum=buy_num_data.promgoodsbuynum;
310   - goodsbuynum=buy_num_data.goodsbuynum;
  306 + if(buy_num_data.promcardbuynum) promcardbuynum=buy_num_data.promcardbuynum;
  307 + goodsbuynum=buy_num_data.cardbuynum;
311 308 })
312 309  
313   - //先判断限购
314   - if (num+goodsbuynum>gd.viplimited && gd.viplimited>0) {
315   - getApp().confirmBox("超出商品限购");
316   - return false;
317   - }
318   - if (num+promgoodsbuynum>th.data.teamlist.buy_limit && th.data.teamlist.buy_limit>0) {
  310 + if (num+promcardbuynum>th.data.teamlist.buy_limit && th.data.teamlist.buy_limit>0) {
319 311 getApp().confirmBox("超出活动限购");
320 312 return false;
321 313 }
322   - //判断库存
323   - if ( num>gd.store_count) {
324   - getApp().confirmBox("超出商品库存");
325   - return false;
326   - }
  314 +
327 315 var r_num=0;
328 316 await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" + os.stoid + "/6/" + th.data.teamlist.id, {
329 317 1: 1
... ... @@ -344,6 +332,8 @@ Page({
344 332 minusStatus: minusStatus,
345 333 })
346 334  
  335 + return true;
  336 +
347 337 },
348 338  
349 339 /*输入框事件*/
... ... @@ -370,22 +360,22 @@ Page({
370 360 min_price = 0,
371 361 th=this,
372 362 that=th,
373   - flag=null;
  363 + flag=null,
  364 + odr=null;
374 365 await getApp().request.promiseGet("/api/weshop/teamlist/pageteam/2",{
375 366 data:{
376 367 store_id: os.stoid,
377 368 is_end: 0,
378 369 is_show: 1,
379 370 user_id: getApp().globalData.user_id,
380   - pageSize:1000
  371 + pageSize:1000,
  372 + goods_id:th.data.goods_id
381 373 }
382 374 }).then(res=>{
383 375 let pd_list=res.data.data.pageData;
384 376 if(res.data.code==0 && pd_list.length>0){
385   - flag =pd_list.some(pd=>{
386   - // if(th.data.goods_id){
387   - return pd.goods_id==th.data.goods_id;
388   - // }
  377 + flag =pd_list.find(pd=>{
  378 + return pd.goods_type==1;
389 379 })
390 380 }
391 381 })
... ... @@ -435,9 +425,10 @@ Page({
435 425 var is_ok=1;
436 426  
437 427 //要先读取订单，看自己有没有买过该团的商品
438   - await getApp().request.promiseGet("/api/weshop/order/page", {
  428 + await getApp().request.promiseGet("/api/weshop/rechargeServicelist/page", {
439 429 data: {
440   - pt_prom_id:teamgroup.team_id,
  430 + prom_id:teamgroup.team_id,
  431 + prom_type:6,
441 432 user_id: oo.user_id,
442 433 store_id: os.stoid,
443 434 pageSize: 1,
... ... @@ -453,18 +444,15 @@ Page({
453 444 }
454 445 //--跳转到已经购买的情况--
455 446 if (e.data.data.pageData.length > 0) {
456   - var odr = e.data.data.pageData[0];
  447 + odr = e.data.data.pageData[0];
457 448 //还未支付
458 449 if (odr.pt_status == 0 && odr.order_status == 1) {
459   - wx.navigateTo({
460   - url: "/pages/user/order_detail/order_detail?order_id=" + odr.order_id,
461   - });
462   - is_ok=0;
  450 +
  451 + getApp().goto("/packageA/pages/details_serviceCard/details_serviceCard?order_id=" + odr.order_id)
  452 + is_ok=0;
463 453 }else if (odr.pt_status == 1 && odr.order_status == 1){
464   - wx.navigateTo({
465   - url: "/pages/team/team_success/team_success?ordersn=" + odr.order_sn,
466   - });
467   - is_ok=0;
  454 + getApp().goto( "/pages/team/team_success/team_success?ordersn=" + odr.order_sn);
  455 + is_ok=0;
468 456 }
469 457 }
470 458 })
... ... @@ -512,7 +500,7 @@ Page({
512 500 }
513 501  
514 502 //多少人参团头像
515   - await getApp().request.promiseGet("/api/weshop/order/pagePtList", {
  503 + await getApp().request.promiseGet("/api/weshop/rechargeServicelist/pagePtList", {
516 504 data: {
517 505 store_id: o.stoid,
518 506 pt_listno: teamgroup.listno,
... ... @@ -522,37 +510,31 @@ Page({
522 510 })
523 511  
524 512 //获取商品信息
525   - await getApp().request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + goods_id, {
  513 + await getApp().request.promiseGet("/api/weshop/serviceCard/get/" + os.stoid + "/" + goods_id, {
526 514 }).then(res => {
527   - //商品地址
528   - original_img = ee.data.imageurl + res.data.data.original_img,
529   - goods = res.data.data
  515 + //商品地址
  516 + original_img = ee.data.imageurl + res.data.data.original_img,
  517 + goods = res.data.data
530 518 })
531   -
532   - //显示商品规格
533   - var gg = "";
534   - if(goods.goods_spec=="null" || goods.goods_spec==null ) goods.goods_spec="";
535   - if(goods.goods_color=="null" || goods.goods_color==null) goods.goods_color="";
536   -
537   - if (goods.goods_spec != "" && goods.goods_color != "") {
538   - gg = goods.goods_spec + "/" + goods.goods_color;
539   - } else if (goods.goods_spec != "" || goods.goods_color != "") {
540   - gg = goods.goods_spec + goods.goods_color;
541   - } else {
542   - gg = "规格1";
543   - }
544   - goods.gg = gg;
545   -
  519 +
  520 + if(!goods){
  521 + getApp().showWarning("拼单活动商品未找到");
  522 + th.go_back();
  523 + return false;
  524 + }
  525 + goods.prom_id=teamgroup.team_id;
  526 +
  527 +
546 528 //只装5个
547 529 var ordertx2 = [], sf_num = 0, ct_nun = teamlist.ct_num;
548 530 if (max_num) {
549 531 ct_nun = parseInt(max_num);
550   - if (ct_nun < ordertx.length) ct_nun = ordertx.length;
  532 + if (ordertx && ct_nun < ordertx.length) ct_nun = ordertx.length;
551 533 }
552 534  
553 535 if (ct_nun > 5) ct_nun = 5;
554 536 for (var i = 0; i < ct_nun; i++) {
555   - if (i >= ordertx.length) sf_num++
  537 + if (!ordertx || i >= ordertx.length) sf_num++
556 538 else
557 539 ordertx2.push(ordertx[i]);
558 540 }
... ... @@ -566,9 +548,7 @@ Page({
566 548  
567 549 if(th.data.is_group_end==1 || th.data.is_group_end==2 ){
568 550 getApp().confirmBox(th.data.end_text);
569   - wx.redirectTo({
570   - url: "/pages/goods/goodsInfo/goodsInfo?goods_id=" + goods.goods_id,
571   - });
  551 + getApp().goto("/packageA/pages/goodsInfo/goodsInfo?goods_id=" + goods.card_id)
572 552 return false;
573 553 }
574 554  
... ... @@ -611,22 +591,21 @@ Page({
611 591 th.data.fir_def_store={}; //赋值空对象
612 592 return false;
613 593 }
  594 +
  595 + if(getApp().globalData.is_dj_pk) th.setData({has_def:1})
614 596 //--定时器推迟一下--
615 597 setTimeout(function () {
616 598 if(!th.data.goods) return false;
617 599 var g_distr_type=th.data.goods.distr_type;
618 600 //--如果默认门店的配送方式不对，就不能被选择--
619   - if(ee.distr_type!=0 && g_distr_type!=0 && ee.distr_type!=g_distr_type ){
620   - //th.data.fir_def_store={}; //赋值空对象
621   - //return false;
622   - ee.is_no_dis=1;
623   - }
  601 + // if(ee.distr_type!=0 && g_distr_type!=0 && ee.distr_type!=g_distr_type ){
  602 + // ee.is_no_dis=1;
  603 + // }
624 604  
625 605 var appd=getApp().globalData;
626 606 var w_time = setInterval(function() {
627 607 if (that.data.is_get_local_ok == 0) return false;
628 608 clearInterval(w_time);
629   - var distance = null;
630 609 var e=JSON.parse(JSON.stringify(ee));
631 610  
632 611 //如果有开启近距离的话,同时距离优不一样了
... ... @@ -710,9 +689,8 @@ Page({
710 689 if(getCurrentPages()>1)
711 690 wx.navigateBack({delta: 1})
712 691 else
713   - wx.navigateTo({
714   - url: "/pages/index/index/index"
715   - });
  692 + getApp().goto("/pages/index/index/index");
  693 +
716 694 },
717 695 //---小于10的格式化函数----
718 696 timeFormat(param) {
... ... @@ -757,7 +735,7 @@ Page({
757 735 },
758 736  
759 737 //------去支付，购买-------
760   - go_pay:function () {
  738 + go_pay:async function () {
761 739 var th=this;
762 740 var def_pick_store=this.data.def_pick_store;
763 741 if(def_pick_store && def_pick_store.pickup_id) {
... ... @@ -773,6 +751,14 @@ Page({
773 751 getApp().confirmBox("拼团商品至少要买"+qnum+"件!");
774 752 return false;
775 753 }
  754 +
  755 +
  756 + var minusStatus = th.data.num > 1 ? 'normal' : 'disable';
  757 + //判断限购
  758 + var f=await this.check_num(th.data.num,minusStatus);
  759 + if(!f) return false;
  760 +
  761 +
776 762 //先判断团的redis数量
777 763 this.buy_check_redis(function () {
778 764 var arr=th.data.redis_arr;
... ... @@ -789,15 +775,18 @@ Page({
789 775 return false;
790 776 }
791 777  
  778 +
  779 +
792 780 //--------------此时操作的数据------------
793 781 var newd = {
794   - goods_id: th.data.goods.goods_id,
  782 + id: th.data.goods.id,
795 783 goods_num: th.data.num,
796 784 pick_id: th.data.pick_id,
  785 + keyid: th.data.def_pick_store.keyid,
797 786 user_id: oo.user_id,
798   - store_id: th.data.stoid,
799   - goods_name: th.data.goods.goods_name,
800   - goods_sn: th.data.goods.goods_sn,
  787 + store_id: os.stoid,
  788 + goods_name: th.data.goods.service_name,
  789 + goods_sn: th.data.goods.service_sn,
801 790 };
802 791  
803 792 //---是不是从收藏夹出来的---
... ... @@ -846,7 +835,7 @@ Page({
846 835  
847 836 s.set_b_now(newd);
848 837 wx.navigateTo({
849   - url: "/pages/cart/cart2_pt/cart2_pt?is_bnow=1&goods_id=" + th.data.goods.goods_id,
  838 + url: "/packageA/pages/serviceCard_pd/cart/cart?is_bnow=1&goods_id=" + th.data.goods.card_id,
850 839 });
851 840 });
852 841 },
... ... @@ -940,11 +929,16 @@ Page({
940 929 })
941 930 },
942 931  
943   - go_goodsinfo:function (e) {
944   - var gid=e.currentTarget.dataset.gid;
945   - var url="/pages/goods/goodsInfo/goodsInfo?goods_id="+gid;
946   - wx.navigateTo({ url: url, }) //跳到非tabbar页
947   - },
  932 + go_goodsinfo:function (e) {
  933 + var index=e.currentTarget.dataset.index;
  934 + var item=this.data.pageteam[index];
  935 + var gid=item.goods_id;
  936 + var url="/pages/goods/goodsInfo/goodsInfo?goods_id="+gid+"&prom_id="+item.id+"&prom_type=6";
  937 + if(item.goods_type==1){
  938 + url="/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo?goods_id="+gid+"&prom_id="+item.id+"&prom_type=6";
  939 + }
  940 + getApp().goto(url); //跳到非tabbar页
  941 + },
948 942  
949 943 gohome:function(){
950 944 getApp().goto("/pages/index/index/index");
... ... @@ -960,7 +954,7 @@ Page({
960 954  
961 955 //------ 分享配置 --------
962 956 onShareAppMessage: function (e) {
963   - getApp().globalData.no_clear=1;
  957 + getApp().globalData.no_clear=1;
964 958 var curPage=this;
965 959 var pagePath = curPage.route; //当前页面url
966 960 if (pagePath.indexOf('/') != 0) {
... ... @@ -969,7 +963,7 @@ Page({
969 963 var url=pagePath;
970 964  
971 965 //--分享图片--
972   - img=th.data.iurl+th.data.teamlist.share_imgurl;
  966 + var img=this.data.iurl+this.data.teamlist.share_imgurl;
973 967 //--把会员分享出去--
974 968 if(getApp().globalData.user_id){
975 969 if(url.indexOf("?")>0)
... ... @@ -1005,9 +999,25 @@ Page({
1005 999  
1006 1000 //-- 选择门店。此时的门店选择与门店有关系 --
1007 1001 choice_store: function(ee) {
  1002 +
  1003 + //--先判断会员状态--
  1004 + var user_info = getApp().globalData.userInfo;
  1005 + if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
  1006 + wx.navigateTo({
  1007 + url: '/packageE/pages/togoin/togoin',
  1008 + })
  1009 + return false;
  1010 + }
  1011 +
1008 1012  
1009 1013 var th = this;
1010   - var bconfig = th.data.bconfig;
  1014 + var bconfig = th.data.bconfig;
  1015 +
  1016 + //如果开启了，则不在选择门店
  1017 + if(this.data.sys_switch.is_pricing_open_store && getApp().globalData.pk_store){
  1018 + return false;
  1019 + }
  1020 +
1011 1021 if(!th.data.only_pk && !th.data.def_pickpu_list){
1012 1022 getApp().confirmBox("门店库存不足", null, 25000, !1);
1013 1023 return false;
... ... @@ -1020,6 +1030,9 @@ Page({
1020 1030 getApp().confirmBox("门店库存不足", null, 25000, !1);
1021 1031 return false;
1022 1032 }
  1033 +
  1034 +
  1035 +
1023 1036  
1024 1037 if ( bconfig && bconfig.is_sort_storage) {
1025 1038 wx.getLocation({
... ... @@ -1127,25 +1140,13 @@ Page({
1127 1140 var timer_get = setInterval(function() {
1128 1141 if (th.data.is_get_local_ok == 0) return false;
1129 1142 if (!th.data.goods) return false;
1130   - var dd = null,
1131   - i = getApp().request;
  1143 + var dd = null, i = getApp().request;
1132 1144 var g_distr_type = th.data.goods.distr_type;
1133   - if (g_distr_type != 0) {
1134   - dd = {
1135   - store_id: o.stoid,
1136   - distr_type: g_distr_type,
1137   - isstop: 0,
1138   - is_pos: 1,
1139   - pageSize: 2000
1140   - }
1141   - } else {
  1145 +
1142 1146 dd = {
1143   - store_id: o.stoid,
1144   - isstop: 0,
1145   - is_pos: 1,
1146   - pageSize: 2000
  1147 + store_id: o.stoid,isstop: 0,is_pos: 1, pageSize: 2000
1147 1148 }
1148   - }
  1149 +
1149 1150 //如果有距离的话
1150 1151 if (th.data.lat != null) {
1151 1152 dd.lat = th.data.lat;
... ... @@ -1439,7 +1440,7 @@ Page({
1439 1440 if (th.data.is_show_sto_cat == 1) {
1440 1441 item = th.data.def_pickpu_list[index];
1441 1442 } else {
1442   - item = th.data.only_pk[index]; //当没有门店分类的时候
  1443 + item = th.data.only_pk?th.data.only_pk[index]:null; //当没有门店分类的时候
1443 1444 }
1444 1445  
1445 1446 } else {
... ... @@ -1481,12 +1482,14 @@ Page({
1481 1482 if (th.data.is_show_sto_cat == 1) {
1482 1483 item = th.data.def_pickpu_list[index];
1483 1484 } else {
1484   - item = th.data.only_pk[index]; //当没有门店分类的时候
  1485 + item = th.data.only_pk?th.data.only_pk[index]:null; //当没有门店分类的时候
1485 1486 }
1486 1487 } else {
1487 1488 var index = th.data.sec_pick_index;
1488 1489 item = th.data.sec_sto.s_arr[index];
1489 1490 }
  1491 +
  1492 + if(!item) return false;
1490 1493  
1491 1494  
1492 1495 var store_id = o.stoid;
... ... @@ -1544,6 +1547,12 @@ Page({
1544 1547 })
1545 1548  
1546 1549 },
  1550 +
  1551 +
  1552 + go_to:function (e) {
  1553 + var url=e.currentTarget.dataset.url;
  1554 + getApp().goto(url);
  1555 + }
1547 1556  
1548 1557  
1549 1558  
... ...
packageA/pages/serviceCard_pd/team_show/team_show.wxml
  View file @5ad4bd3
... ... @@ -3,7 +3,7 @@
3 3 <view wx:if="{{is_show}}">
4 4  
5 5 <!--图片区域-->
6   - <view class='center'>
  6 + <view class='center' bindtap="go_to" data-url="/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo?goods_id={{goods.card_id}}&prom_type=6&prom_id={{teamlist.id}}">
7 7 <view class='cenleft'>
8 8 <image src='{{image}}' binderror='bind_bnerr' data-errorimg='image'></image>
9 9 </view>
... ... @@ -11,7 +11,7 @@
11 11 <view class='cenrt'>
12 12  
13 13 <view class='xc-goods-details ellipsis-2 fs28'>
14   - <span>{{goods.goods_name}}</span>
  14 + <span>{{goods.service_name}}</span>
15 15 </view>
16 16 </view>
17 17 <view class='cenrcen flex-vertical-between'>
... ... @@ -19,7 +19,7 @@
19 19 <view class="fs40 xc-wc" style='font-size:40rpx'>
20 20 <span class="fs28" style="font-weight:500;">￥</span>{{teamlist.price}}</view>
21 21 <view class="fs22 word-line xc-wc">
22   - 零售价￥{{goods.market_price}}
  22 + 零售价￥{{goods.show_price}}
23 23 </view>
24 24 </view>
25 25 <view class="xc-wc fs24">
... ... @@ -153,11 +153,7 @@
153 153 </view>
154 154 </view>
155 155 </view>
156   - <!----//拼团玩法---->
157   - <!-- <view class='pintuan' bindtap="cpd">
158   - <view class='pintuanzhou'>拼团玩法</view>
159   - <view class='pintuanyou'>开团/参团＞邀请参团＞人满成团</view>
160   - </view> -->
  156 +
161 157 <!--大家都在团-->
162 158 <view class='goodslist'>
163 159 <view class='goodslisttop'>
... ... @@ -165,7 +161,7 @@
165 161 <view class='goodslisttopright'></view>
166 162 </view>
167 163 <view class="changxin">
168   - <view class='onegoods' wx:for='{{pageteam}}' wx:key="{{index}}" bindtap="go_goodsinfo" data-gid="{{item.goods_id}}">
  164 + <view class='onegoods' wx:for='{{pageteam}}' wx:key="{{index}}" bindtap="go_goodsinfo" data-index="{{index}}">
169 165 <view class='onegoodsimg'>
170 166 <image src="{{imageurl+item.share_imgurl}}"></image>
171 167 </view>
... ... @@ -187,9 +183,6 @@
187 183 <view class="pop_up" wx:if="{{yijian}}">
188 184 <view>
189 185  
190   - <!----弹起来,选择规格数量,拼单商品购买------>
191   - <!-- <view> -->
192   - <!-- <view hidden="{{!openSpecModal_pt}}"> -->
193 186 <view bindtap="closeSpecModal" class="cover-layer"></view>
194 187 <view class="spec-model">
195 188 <view class="pding">
... ... @@ -198,7 +191,7 @@
198 191 <view class="spec-goods">
199 192 <image class="wh100 spec-img xc-distance-bottom" src="{{image}}" binderror="pop_err_img" data-errorimg="data.original_img"></image>
200 193 <view class="spec-goods-info">
201   - <view class="spec-goods-name ellipsis-1">{{goods.goods_name}}商品名称</view>
  194 + <view class="spec-goods-name ellipsis-1">{{goods.service_name}}商品名称</view>
202 195 <view class="flex ai_end xc-val-money">
203 196 <view class="spec-goods-price">
204 197 <span class='t1'>¥</span><text class='t2'>{{teamlist.kttype==3?teamlist.yf_price:teamlist.price}}</text>
... ... @@ -229,7 +222,7 @@
229 222 <view class="fs28 xc-ash-9f">选择门店</view>
230 223 </view>
231 224  
232   - <view class="red-co fs28" bindtap="choice_store">更多门店<text class="right-arrow"></text></view>
  225 + <view hidden="{{has_def && sys_switch.is_pricing_open_store}}" class="red-co fs28" bindtap="choice_store">更多门店<text class="right-arrow"></text></view>
233 226  
234 227  
235 228 </view>
... ... @@ -237,17 +230,6 @@
237 230 <view class="fs24 xc-ash-9f xc-distance-top " wx:elif="{{def_pick_store && def_pick_store.fulladdress}}">地址:{{def_pick_store.fulladdress}}</view>
238 231  
239 232 </view>
240   - <!-- 商品的属性项目 -->
241   - <view>
242   - <view hidden="{{ismend==1}}" class="spec-name">商品规格</view>
243   - <block>
244   - <view hidden="{{ismend==1}}" class="flex">
245   - <view class="spec_bt act" >{{goods.gg}}
246   - </view>
247   - </view>
248   - </block>
249   - <view class="clear"></view>
250   - </view>
251 233  
252 234 <view>
253 235 <view class="b_num" hidden="{{ismend==1}}" style="margin-top: 20rpx">
... ... @@ -260,7 +242,6 @@
260 242 </view>
261 243 </view>
262 244  
263   - <!-- <view class="clear"></view> -->
264 245  
265 246 </view>
266 247 </view>
... ... @@ -271,7 +252,6 @@
271 252 </view>
272 253  
273 254 </view>
274   - <!-- </view> -->
275 255  
276 256 </view>
277 257 </view>
... ... @@ -416,83 +396,6 @@
416 396 </view>
417 397 </block>
418 398  
419   -
420   -
421   -
422   -
423   -
424   -<!-- <view class='buy-option'> -->
425   -<!--头部图片-->
426   -<!-- <view class='buy-top'>
427   - <view class='buy-image mimg'>
428   - <image src='{{image}}'></image>
429   - <view>
430   - <view>
431   - <span class='t1'>¥</span><text class='t2'>{{teamlist.kttype==3?teamlist.yf_price:teamlist.price}}</text>
432   - </view>
433   - <view class="ellipsis-2">
434   - {{goods.goods_name}}
435   - </view>
436   - </view>
437   -
438   - </view>
439   -
440   - <view class='buy-cou' bindtap='cbcou'>⊗</view>
441   - <view class='clear'></view>
442   - </view> -->
443   -
444   -<!--取货门店-->
445   -<!-- <view class='quhuo' wx:if="{{qh}}" bindtap='cqh'> -->
446   -<!--当ii==0请选择门店显示，ii==1最后名字显示-->
447   -<!-- <text>取货门店</text><view class='end_name' wx:if="{{ii==1 }}">({{end_name}})</view><view wx:if="{{ii==0 }}" class='ttxz'>(请选择门店)</view>
448   - </view> -->
449   -<!--选择门店-->
450   -<!-- <view class='xuanze1' wx:if="{{xz}}" bindtap='cxz'>
451   - <text decode='true'>&lt; 选择门店</text>
452   - </view>
453   - <view class='x-z'> -->
454   -<!--第一层-->
455   -<!-- <block wx:if="{{one}}">
456   - <view class="fir_view">
457   - <view>
458   - <view class='xuanze' bindtap='setchild' data-bindex='{{bindex}}' data-bname='{{item.name}}' wx:for-index="bindex" wx:for="{{ssl}}" wx:key>
459   - <text decode='true'>{{item.name}}</text>
460   - </view>
461   - </view>
462   - </view>
463   - </block> -->
464   -<!--选择的-->
465   -<!-- <view class='xuanze1' wx:if="{{se}}" bindtap='sel'><text decode='true'>&lt;</text> {{sele_dl_name}}</view> -->
466   -<!--第二层list-->
467   -<!-- <block wx:if="{{list}}">
468   - <scroll-view scroll-y="true" style="max-height: 460rpx">
469   - <view class='xuanze' wx:for="{{ssl_child}}" wx:key bindtap='clist'
470   - data-pick_dis="{{item.distr_type}}"
471   - data-end='{{item.pickup_name}}' data-pick_id='{{item.pickup_id}}'>
472   - <text decode='true'>{{item.pickup_name}}</text>
473   - </view>
474   - </scroll-view>
475   - </block>
476   - </view> -->
477   -
478   -<!--数量-->
479   -<!-- <view class='buy-button' wx:if="{{qh}}">
480   - <text>数量</text>
481   - <view class='stepper sum'>
482   - <text class='{{minusStatus}}' type='number' bindtap='bindMinus' class="jiajian">-</text>
483   - <input bindinput='bindManual' value='{{num}}'></input>
484   - <text bindtap='bindPlus' class="jiajian">+</text>
485   - </view>
486   - <view class='clear'></view>
487   - </view> -->
488   -
489   -<!-- <view class="clear"></view>
490   - </view> -->
491   -<!--支付-->
492   -<!-- <view class='btn' bindtap="go_pay">立即支付</view> -->
493   -<!-- </view>
494   -</view> -->
495   -
496 399 <!--mask吐司内容-->
497 400 <view class="toast_mask" wx:if="{{isShowToast}}"></view>
498 401  
... ...
packageA/pages/serviceCard_pd/team_success/team_success.js
  View file @5ad4bd3
... ... @@ -84,7 +84,7 @@ Page({
84 84 })
85 85 },
86 86 onShow:function () {
87   - getApp().check_can_share();
  87 + getApp().check_can_share(this);
88 88 },
89 89  
90 90 //关闭展开列表
... ... @@ -151,7 +151,7 @@ Page({
151 151 p_status=1;
152 152  
153 153 //--如果商家团的时候,这个要改---
154   - await getApp().request.promisePost("/api/weshop/order/pay/vipAutoTuan", {
  154 + await getApp().request.promisePost("/api/weshop/rechargeServicelist/vipAutoTuan", {
155 155 data: {orderSn:order_sn,storeId:os.stoid }
156 156 })
157 157  
... ... @@ -229,6 +229,7 @@ Page({
229 229  
230 230 //只装5个
231 231 var ordertx2=[],sf_num=0,ct_nun=teamlist.ct_num;
  232 +
232 233 if(max_num){
233 234 ct_nun=parseInt(max_num);
234 235 if (ordertx && ct_nun < ordertx.length) ct_nun = ordertx.length;
... ... @@ -284,8 +285,7 @@ Page({
284 285  
285 286 //--当是成团的时候的操作--
286 287 if(order.pt_status==2 || order.pt_status==4 || order.pt_status==5){
287   - //设置值
288   -
  288 + //-- 设置值 --
289 289 ee.setData({
290 290 ordertx2: ordertx2, ordertx: ordertx, teamlist: teamlist, teamgroup: teamgroup, min_price: min_price,
291 291 order: order, share_img: share_img,max_num:max_num,
... ... @@ -804,8 +804,14 @@ Page({
804 804 tt();
805 805 },
806 806 fail: function (res) {
807   - ee.data.share_img_localpath= "../../../images/share/default_g_img.gif"; //分享的图片不能用网络的
808   - tt();
  807 + //获取默认空白图
  808 + wx.getImageInfo({
  809 + src:os.imghost+'/miniapp/images/default_g_img.gif',
  810 + success: function(res) {
  811 + ee.data.share_img_localpath = res.path; //分享的图片不能用网络的
  812 + tt();
  813 + }
  814 + })
809 815 }
810 816 });
811 817 },
... ...
packageA/pages/serviceCard_pd/team_success/team_success.wxml
  View file @5ad4bd3
... ... @@ -164,8 +164,8 @@
164 164 <!----/ // // // //按钮---->
165 165  
166 166 <view wx:if="{{teamlist.kttype==3}}" class='bodybutton'>
167   - <!-- 阶梯团 -->
168   - <button wx:if="{{p_status==1}}" bindtap="clickShare" style='background-color:#fab55a; color:#fff'>
  167 + <!-- 阶梯团wx:if="{{isLogin}}" -->
  168 + <button wx:if="{{p_status==1 && isLogin}}" bindtap="clickShare" style='background-color:#fab55a; color:#fff'>
169 169 <!-- <button wx:if="{{p_status==1}}" bindtap="clickShare" bindtap='cmeng' style='background-color:#fab55a; color:#fff'> -->
170 170 邀请好友参团
171 171 </button>
... ... @@ -176,7 +176,7 @@
176 176  
177 177 <!--会员团 商家团-->
178 178 <button class="bodybutton" style='background-color:#fab55a; color:#fff' bindtap='clickShare'
179   - wx:if="{{(teamlist.kttype==2||teamlist.kttype==1)&&p_status==1}}">邀请好友参团</button>
  179 + wx:if="{{(teamlist.kttype==2||teamlist.kttype==1)&&p_status==1}}">邀请好友参团{{isLogin}}</button>
180 180  
181 181 <view class="xc-home-page-frame">
182 182 <button class="xc-home-page" bindtap='gohome'> 返回首页</button>
... ...