Commit 826ea4560f6f9275ede3cf1c06251d2ee3dcdf8b

Authored by 后端研发-苏泰源
1 parent 13998654

活动分享

packageA/pages/activity_share/activity_share.js
... ... @@ -7,7 +7,7 @@ Page({
7 7 */
8 8 data: {
9 9 // tab
10   - tab: ['秒杀','拼单','促销','专享礼包'],
  10 + tab: ['秒杀','拼单','促销','专享礼包','预售','团购','组合购'],
11 11 currentIndex: 0,
12 12 //促销页tab
13 13 tab2: ['订单促销','搭配促销','优惠促销'],
... ... @@ -56,7 +56,7 @@ Page({
56 56 var th=this;
57 57 //接受有没有导购的参数
58 58 var first_leader=options.first_leader;
59   - var StaffId=options.StaffId;
  59 + var StaffId=options.StaffId;
60 60 var StorageId=options.StorageId;
61 61 if(first_leader){
62 62 //-- user_id代过来免登录 --
... ... @@ -142,9 +142,10 @@ Page({
142 142 * 用户点击右上角分享
143 143 */
144 144 onShareAppMessage: function () {
  145 + console.log('abc');
145 146 var th = this;
146 147 //礼包的转发
147   - if(th.data.currentIndex==3){
  148 + if(th.data.currentIndex==3) {
148 149 var lbid=th.data.hui_active.lbId;
149 150 var url="/pages/giftpack/giftpacklist/giftpacklist?lbId="+lbid+"&isBuy=1";
150 151 if(getApp().globalData.user_id){
... ... @@ -161,26 +162,71 @@ Page({
161 162 th.setData({share_hidden:1});
162 163 th.insert_act_share(title,lbid,6,null,th.data.hui_active.payMoney);
163 164 return ob;
164   - }else{
165   - //---秒杀,拼团,促销---
  165 + }else if(th.data.currentIndex==4) {
  166 + let item = this.data.hui_active;
  167 + let pre_id = item.id;
  168 + let goods_id = item.goods_id;
  169 + let price = item.presell_money;
  170 + let url = `packageC/pages/presell/goodsInfo/goodsInfo?goods_id=${goods_id}&pre_id=${pre_id}`;
  171 + let title = item.goods_name;
  172 + let img = this.data.url + item.original_img;
  173 +
  174 + // console.log('preselll=======>>>>>', item, url);
  175 +
  176 + if(getApp().globalData.user_id){
  177 + url += "&first_leader=" + getApp().globalData.user_id;
  178 + }
  179 + th.setData({share_hidden:1,share_good:null});
  180 + return {
  181 + title: price + "元 " +title,
  182 + path: url,
  183 + imageUrl: img,
  184 + };
  185 + } else if(th.data.currentIndex==6) {
  186 + let item = this.data.hui_active;
  187 + let id = item.id;
  188 + let title = item.name;
  189 + let price = item.zhprice;
  190 + let url = `/packageB/pages/zuhegou/index/index?id=${id}&title=${title}`;
  191 + let img = this.data.url + item.img_url;
  192 +
  193 + console.log('zuhebuy=======>>>>>', item, url);
  194 +
  195 + if(getApp().globalData.user_id){
  196 + url += "&first_leader=" + getApp().globalData.user_id;
  197 + }
  198 + th.setData({share_hidden:1});
  199 + return {
  200 + title: price + "元 " +title,
  201 + path: url,
  202 + imageUrl: img,
  203 + };
  204 +
  205 + } else {
  206 + //---秒杀,拼团,促销, 团购---
166 207 var item=this.data.share_good;
  208 +
167 209 if(item){
168 210 var price = item.price;
169 211 if(!price) price=item.shop_price;
170 212 switch(th.data.currentIndex){
171 213 case 0: item.prom_type=1;break;
172 214 case 1: item.prom_type=6;break;
173   - case 2:
174   - if(th.data.currentIndex2==1) item.prom_type = 5;
175   - if(th.data.currentIndex2==2) {
176   - item.prom_type = 3;
177   - item.id=item.prom_id;
178   - }
179   - break;
  215 + case 2:
  216 + if(th.data.currentIndex2==1) item.prom_type = 5;
  217 + if(th.data.currentIndex2==2) {
  218 + item.prom_type = 3;
  219 + item.id=item.prom_id;
  220 + };
  221 + break;
  222 + case 5:
  223 + item.prom_type = 2;
  224 + break;
180 225 }
181   - item.prom_id=item.id;
  226 +
  227 + item.prom_id=item.id;
182 228  
183   - var title= item.goods_name;
  229 + var title= item.goods_name;
184 230 var img=this.data.url+item.original_img;
185 231 var url="/pages/goods/goodsInfo/goodsInfo?goods_id=" + item.goods_id+"&prom_type="+item.prom_type+"&prom_id="+item.prom_id;
186 232 if(getApp().globalData.user_id){
... ... @@ -200,6 +246,8 @@ Page({
200 246 ind=4;//拼团
201 247 }else if(th.data.currentIndex==2){
202 248 ind=5;//促销
  249 + }else if(th.data.currentIndex==5){
  250 + ind=8;//团购
203 251 }
204 252  
205 253 //插入活动
... ... @@ -284,6 +332,7 @@ Page({
284 332 this.requestGoodsList();
285 333 }
286 334 },
  335 +
287 336 // 关闭弹出层
288 337 closePopup() {
289 338 this.setData({
... ... @@ -363,7 +412,7 @@ Page({
363 412 },
364 413  
365 414 //-- -------获取商品列表--------
366   - requestGoodsList:function(){
  415 + requestGoodsList:function() {
367 416 var th=this;
368 417 if(th.data.is_load) return false; //-- 正在加载
369 418 if(th.data.is_no_data) return false; //-- 没有数据
... ... @@ -430,7 +479,42 @@ Page({
430 479 if(th.data.key_str && th.data.key_str.trim()){
431 480 req_data.key_str=th.data.key_str.trim();
432 481 }
433   - break;
  482 + break;
  483 +
  484 + case 4: //预售
  485 + url = '/api/weshop/marketing/marketingPresellList/page';
  486 + req_data.is_end = 0;
  487 + req_data.pageSize = 10;
  488 + req_data.timetype = 1;
  489 + req_data.isuse = 1;
  490 + req_data.user_id = user_id;
  491 +
  492 + if(th.data.key_str && th.data.key_str.trim()){
  493 + req_data.key_str=th.data.key_str.trim();
  494 + }
  495 + break;
  496 +
  497 + case 5: //团购
  498 + url = '/api/weshop/goods/groupBuy/page';
  499 + req_data.is_show = 1;
  500 + req_data.is_end = 0;
  501 + req_data.timetype = 1;
  502 + if(th.data.key_str && th.data.key_str.trim()){
  503 + req_data.key_str = th.data.key_str.trim();
  504 + }
  505 + break;
  506 +
  507 + case 6: //组合购
  508 + // "/api/weshop/prom/zhbuy/page?is_end=0&timetype=1&page=" + e.data.currentPage
  509 + url = '/api/weshop/prom/zhbuy/page';
  510 + req_data.user_id = user_id;
  511 + req_data.is_end = 0;
  512 + req_data.timetype = 1;
  513 + // req_data.page = 20;
  514 + if(th.data.key_str && th.data.key_str.trim()){
  515 + req_data.key_str = th.data.key_str.trim();
  516 + }
  517 + break;
434 518 }
435 519  
436 520 if(this.data.key_str && this.data.key_str.trim()){
... ... @@ -454,6 +538,7 @@ Page({
454 538 if(res.data.data.page*10>res.data.data.total){th.setData({is_no_more:1});}
455 539 var list=th.data.list;
456 540 list=list.concat(data);
  541 + console.log('list------>>>>', data)
457 542 th.setData({list:list});
458 543 }else{
459 544 if(th.data.currentPage==1){
... ... @@ -1174,6 +1259,8 @@ Page({
1174 1259 if(th.data.currentIndex2==1) item.prom_type = 5;
1175 1260 if(th.data.currentIndex2==2) item.prom_type = 3;
1176 1261 break;
  1262 + case 5:
  1263 + item.prom_type = 2;break;
1177 1264 }
1178 1265  
1179 1266 item.prom_id = item.id;
... ... @@ -1202,7 +1289,7 @@ Page({
1202 1289 var url="/api/weshop/sharetypeList/save";
1203 1290 var req_data={
1204 1291 shareActId:actid,
1205   - shareActName:title,
  1292 + shareActName:title,
1206 1293 shareType:ind,
1207 1294 shareUserId:th.data.first_leader,
1208 1295 shareStaffId:th.data.StaffId,
... ...
packageA/pages/activity_share/activity_share.wxml
  1 +<wxs module="filters" src="../../../utils/filter.wxs"></wxs>
1 2 <wxs module="g_filter" src="g_filter.wxs"></wxs>
2 3 <view class="container">
3 4 <!-- 搜索框 -->
... ... @@ -9,11 +10,11 @@
9 10 <!-- 列表 -->
10 11 <view class="list-container">
11 12 <!-- 标题 -->
12   - <view class="title" >
13   - <block wx:for="{{tab}}">
14   - <view class="title-item {{currentIndex == index ? 'active':''}}" data-index="{{index}}" bindtap="clickTab">{{item}}</view>
15   - </block>
16   - </view>
  13 + <scroll-view class="title" scroll-x="true">
  14 + <!-- <block> -->
  15 + <view wx:for="{{tab}}" class="title-item {{currentIndex == index ? 'active':''}}" data-index="{{index}}" bindtap="clickTab">{{item}}</view>
  16 + <!-- </block> -->
  17 + </scroll-view>
17 18 <!-- 促销页标题 -->
18 19 <view class="subTab-title flex" wx:if="{{currentIndex == 2}}">
19 20 <block wx:for="{{tab2}}">
... ... @@ -22,7 +23,7 @@
22 23 </view>
23 24 <!-- 列表项 -->
24 25 <scroll-view
25   - class="list {{currentIndex == 2?'active1':''}} {{currentIndex == 3?'active2':''}}"
  26 + class="list {{currentIndex == 2?'active1':''}} {{(currentIndex == 3 || currentIndex == 4 || currentIndex == 5 || currentIndex == 6)?'active2':''}}"
26 27 scroll-y="true"
27 28 bindscrolltolower="refresh"
28 29 scroll-anchoring
... ... @@ -129,6 +130,101 @@
129 130 </view>
130 131 </block>
131 132  
  133 + <!-- 预售 -->
  134 + <block wx:if="{{currentIndex == 4}}">
  135 + <view class="kill-item">
  136 + <navigator class="kill-pic rel" url="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&pre_id={{item.id}}">
  137 + <image class="wh100" src="{{url+item.original_img}}" data-val="{{item.original_img}}"
  138 + data-errorimg="goodlist[{{index}}].original_img" binderror="bind_bnerr2" lazy-load="true"></image>
  139 + </navigator>
  140 + <view class="kill-cont">
  141 + <navigator class="goods-name ellipsis-2"
  142 + url="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&pre_id={{item.id}}">{{item.goods_name}}</navigator>
  143 + <view class="flex-vertical xc-strip-frame">
  144 + <view class="xc-strip-blank rel">
  145 +
  146 + <view class="flex-vertical rel total">
  147 + <view class="t-c abs xc-fill" style="width:{{215*(item.buy_goodnum+item.virtual_qty)/(item.presell_sumqty+item.virtual_qty)}}rpx;background:#e4374d;"></view>
  148 + <text class="fs20 white abs xc-fill-text">已预售{{filters.toFix((item.buy_goodnum+item.virtual_qty)/(item.presell_sumqty+item.virtual_qty)*100,0)}}%</text>
  149 + </view>
  150 +
  151 + </view>
  152 + <view class=" ml10 fs20">库存还剩{{item.presell_sumqty-item.buy_goodnum}}件</view>
  153 + </view>
  154 +
  155 +
  156 + <view class="goods-num">
  157 + <view>
  158 + <view class="{{type==1?'xc-wc':'blue_c'}}"></view>
  159 + <view class="fs40 flex xc-buttom-money {{type==1?'xc-wc':'blue_c'}}" >
  160 + <view class="fs28" style="line-height: 16px;">¥{{item.presell_price}}</view>
  161 + <text>{{item.price}}</text>
  162 + <span class="underline fs20">零售价¥{{item.market_price}}</span></view>
  163 +
  164 + </view>
  165 + <view class="btn-share fs26" catchtap="share_index" data-index="{{index}}">分享</view>
  166 + </view>
  167 + </view>
  168 + </view>
  169 + </block>
  170 +
  171 + <!-- 团购 -->
  172 + <block wx:if="{{currentIndex == 5}}">
  173 + <view class="list-item" bindtap="go_goods" data-index="{{index}}">
  174 + <view class="img-container">
  175 + <image class="img-block" src="{{url + item.original_img}}" data-val="{{item.original_img}}"
  176 + data-errorimg="list[{{index}}].original_img" binderror="bind_bnerr2" lazy-load="true"></image>
  177 + </view>
  178 + <view class="mgl20 flex fdc f1 jc_sb">
  179 + <view>
  180 + <view class="fs30">{{item.title}}</view>
  181 + <view class="flex ai_c">
  182 + <view class="fs26 tag">{{item.rebate}}折</view>
  183 + <view class="rmb c-red fs30">{{item.price}}</view>
  184 + <view class="rmb del fs24 c-7b pdl10">{{item.market_price}}</view>
  185 + </view>
  186 + </view>
  187 + <view class="flex jc_sb ai-center c-7b pdt20">
  188 + <view class="fs24">
  189 + <view>已售{{item.buy_num+item.virtual_num}}件</view>
  190 + <view class=""><text class="iconfont icon-shizhong fs24"></text>{{item.djs.day}}天{{item.djs.hou}}时{{item.djs.min}}分{{item.djs.sec}}秒</view>
  191 + </view>
  192 + <view class="btn" catchtap="share_good" data-index="{{index}}">分享</view>
  193 + </view>
  194 + </view>
  195 + </view>
  196 + </block>
  197 +
  198 + <!-- 组合购 -->
  199 + <block wx:if="{{currentIndex == 6}}">
  200 + <view class="kill-item">
  201 + <navigator class="kill-pic rel zhbuy" url="/packageB/pages/zuhegou/index/index?id={{item.id}}&title={{item.name}}" hover-class="none">
  202 + <image class="wh100" src="{{url+item.img_url}}" data-val="{{item.img_url}}"
  203 + data-errorimg="list[{{index}}].img_url" binderror="bind_bnerr2" lazy-load="true"></image>
  204 + </navigator>
  205 + <view class="kill-cont">
  206 + <navigator class="goods-name" url="/packageB/pages/zuhegou/index/index?id={{item.id}}&title={{item.name}}" hover-class="none" style="height: auto !important;">
  207 + {{item.name}}
  208 + <view class="goods-num zhbuy">
  209 + <!-- <view> -->
  210 + <view>组合数量: {{item.zhbuyqty}}</view>
  211 + <view>活动时间: {{filters.format_time(item.start_time) + '至' + filters.format_time(item.end_time)}}</view>
  212 + <view class="flex jc_sb ai-center pdt10">
  213 + <view class="fs40 flex xc-buttom-money {{type==1?'xc-wc':'blue_c'}}" >
  214 + <view class="fs28" style="line-height: 16px;">¥</view>
  215 + <text>{{item.zhprice}}</text>
  216 + </view>
  217 + <view class="btn-share" catchtap="share_index" data-index="{{index}}">分享</view>
  218 + </view>
  219 +
  220 +
  221 + <!-- </view> -->
  222 + </view>
  223 + </navigator>
  224 + </view>
  225 + </view>
  226 + </block>
  227 +
132 228 </block><!--for的闭合 -->
133 229 <view style="height: 1rpx;"></view>
134 230 <nodata wx:if="{{list.length==0}}" nodataContainer="nodata">暂无数据</nodata>
... ...
packageA/pages/activity_share/activity_share.wxss
... ... @@ -49,7 +49,7 @@ page {
49 49 border-radius: 0 6rpx 6rpx 0;
50 50 }
51 51 .title {
52   - display: flex;
  52 + white-space: nowrap;
53 53 font-size: 30rpx;
54 54 border-bottom: 2rpx solid #f8f8f8;
55 55 }
... ... @@ -59,10 +59,11 @@ page {
59 59 margin-left: 8rpx;
60 60 }
61 61 .title-item {
62   - width: 25%;
  62 + /* width: 25%; */
  63 + display: inline-block;
63 64 box-sizing: border-box;
64 65 text-align: center;
65   - padding: 20rpx;
  66 + padding: 20rpx 30rpx;
66 67 position: relative;
67 68 }
68 69 .title-item.active {
... ... @@ -105,7 +106,7 @@ page {
105 106 .img-container {
106 107 background-color: #f0f0f0;
107 108 width: 280rpx;
108   - height: 248rpx;
  109 + /* height: 248rpx; */
109 110 display: flex;
110 111 align-items: center;
111 112 justify-content: center;
... ... @@ -392,3 +393,172 @@ radio .wx-radio-input.wx-radio-input-checked::before{
392 393 }
393 394  
394 395  
  396 +
  397 +
  398 +.kill-time {
  399 + text-align: center;
  400 + justify-content: space-around;
  401 + align-items: center;
  402 + /* height: 101rpx; */
  403 + border-bottom: 1px solid #ddd;
  404 + border-top: 1px solid #ddd;
  405 + background-color: #f6f6f6;
  406 +}
  407 +.kill-time .theader{
  408 + display: flex; margin: 0 auto; align-items: center;
  409 + height: 100rpx;
  410 +
  411 +}
  412 +.kill-time .theader .timeac {
  413 + font-size: 32rpx; height:100%; width: 50%;
  414 + color: #333; background-color: #fff;
  415 +
  416 +}
  417 +
  418 +.kill-time .theader .timeac.active{color: #c4182e}
  419 +
  420 +.kill-item {
  421 + display: flex;
  422 + justify-content: space-between;
  423 + background-color: #fff;
  424 + padding: 20rpx;
  425 + /* margin-bottom: 10rpx; */
  426 + border-radius: 10rpx;
  427 + /* height: 249rpx; */
  428 + align-items: center;
  429 + /* margin-top: 20rpx; */
  430 +}
  431 +
  432 +.kill-pic {
  433 + width: 215rpx;
  434 + height: 215rpx;
  435 +}
  436 +
  437 +/* .kill-pic.zhbuy::before {
  438 + content: none;
  439 +}
  440 +
  441 +.kill-pic::before {
  442 + position: absolute;
  443 + content: '预售';
  444 + left: 0;
  445 + top: 0;
  446 + background-color: #e23245;
  447 + color: white;
  448 + font-size: 22rpx;
  449 + padding: 0 10rpx;
  450 + border-radius: 4rpx 4rpx 4rpx 0;
  451 +} */
  452 +
  453 +.kill-cont {
  454 + /* width: 465rpx;
  455 + margin-left:20rpx;
  456 + margin-right: 5rpx; */
  457 + padding-left: 20rpx;
  458 + flex: 1;
  459 +}
  460 +
  461 +.goods-name {
  462 + height: 60rpx;
  463 + font-size: 27rpx;
  464 + color: #555;
  465 + line-height: 30rpx;
  466 +
  467 +}
  468 +
  469 +.goods-num {
  470 + padding-top: 30rpx;
  471 + display: flex;
  472 + align-items: center;
  473 + justify-content: space-between;
  474 + line-height: 42rpx;
  475 + font-size: 24rpx;
  476 + color: #999;
  477 +}
  478 +
  479 +.goods-num .co-red {
  480 + font-size: 30rpx;
  481 + font-weight: bold;
  482 +}
  483 +
  484 +.underline {
  485 + text-decoration: line-through;
  486 + color:#999999; font-size: 20rpx;
  487 + margin-left: 10rpx;
  488 + line-height: 30rpx;
  489 +}
  490 +
  491 +.kill-btn {
  492 + text-align: right;
  493 + display: flex;
  494 +height: 100%;
  495 +align-items: flex-end;
  496 +padding-top: 4rpx;
  497 +
  498 +}
  499 +
  500 +.kill-btn>navigator {
  501 + padding: 0 20rpx;
  502 + background: #e23245;
  503 + color: #fff;
  504 + border-radius: 20rpx;
  505 + /* margin-top: 37px; */
  506 +
  507 +}
  508 +
  509 +.kill-btn .gray {
  510 + background-color: #555;
  511 +}
  512 +
  513 +.total{
  514 + width:215rpx;height:26rpx;border-radius:20rpx;
  515 + background: #aaa;
  516 +}
  517 +
  518 +.xc-fill-text{
  519 + left:34%;
  520 + line-height: 26rpx;
  521 +}
  522 +
  523 +.rmb {
  524 + position: relative;
  525 +}
  526 +
  527 +.rmb::before {
  528 + content: '¥';
  529 + font-size: 24rpx;
  530 +}
  531 +
  532 +.del {
  533 + text-decoration: line-through;
  534 +}
  535 +
  536 +.btn {
  537 + background-color: #ff6768;
  538 + color: white;
  539 + padding: 10rpx 30rpx;
  540 + border-radius: 6rpx;
  541 + font-size: 26rpx;
  542 +}
  543 +
  544 +.tag {
  545 + background-color: #ff6768;
  546 + color: white;
  547 + font-size: 24rpx;
  548 + padding-left: 10rpx;
  549 + padding-right: 10rpx;
  550 +}
  551 +
  552 +.xc-fill{
  553 + border-radius:20rpx;height:26rpx;
  554 +}
  555 +
  556 +.ml10 {
  557 + margin-left: 10rpx;
  558 +}
  559 +
  560 +.goods-num.zhbuy {
  561 + display: block;
  562 + padding-top: 20rpx;
  563 +}
  564 +
... ...