Commit f82bcb0f22c5b9fe9e5da5d74bfb004a82ee66ba

Authored by yvan.ni
1 parent f4bb8a7e

自定义模板的跳转问题的优化

components/diy_serviceCard/diy_serviceCard.js
@@ -482,7 +482,46 @@ Component({ @@ -482,7 +482,46 @@ Component({
482 if (this.data.object.goodscount * this.data.page < this.data.total) { 482 if (this.data.object.goodscount * this.data.page < this.data.total) {
483 this.setLoading() 483 this.setLoading()
484 } 484 }
485 - } 485 + },
  486 +
  487 + go_goods:async function(e) {
  488 + var gid = e.currentTarget.dataset.gid;
  489 + var rurl = '/api/weshop/activitylist/listGoodActInfo2New';
  490 + var req_d = {
  491 + "store_id": getApp().globalData.setting.stoid,
  492 + "goods_id": gid,
  493 + "user_id": getApp().globalData.user_id,
  494 + "goods_type":1
  495 + }
  496 + var res= await getApp().request.promiseGet(rurl, {data: req_d});
  497 +
  498 + var url = "/packageA/pages/goodsInfo/goodsInfo?goods_id=" + gid;
  499 + if (res.data.code == 0 && res.data.data && res.data.data.length > 0) {
  500 + var arr = res.data.data;
  501 + let times = new Date().getTime();
  502 + //-- 预热也要计算 --
  503 + var arr2 = arr.filter(function (e) {
  504 + return e.s_time < ut.gettimestamp() || (e.warm_uptime && e.warm_uptime < ut.gettimestamp())
  505 + })
  506 + if(arr2.length==1) {
  507 + switch(arr2[0].prom_type){
  508 + case 1:
  509 + url+="&prom_type=1&prom_id="+arr[0].act_id;
  510 + break;
  511 + case 6:
  512 + url = `/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo?goods_id=${gid}&prom_type=${arr2[0].prom_type}&prom_id=${arr[0].act_id}`;
  513 + break;
  514 + case 8:
  515 + url = `/packageC/pages/presell/cardInfo/goodsInfo?goods_id=${gid}&prom_id=${arr[0].act_id}`;
  516 + break;
  517 + }
  518 + }
  519 +
  520 + }
  521 +
  522 +
  523 + getApp().goto(url);
  524 + },
486 525
487 526
488 527
components/diy_serviceCard/diy_serviceCard.wxml
@@ -52,7 +52,7 @@ @@ -52,7 +52,7 @@
52 <block wx:for="{{goods_array}}"> 52 <block wx:for="{{goods_array}}">
53 <view class='zs_goods {{g_filter.get_border_type(object.big_order_type)}}'> 53 <view class='zs_goods {{g_filter.get_border_type(object.big_order_type)}}'>
54 <!-- <navigator url="{{g_filter.get_url_by_type(item)}}" class="s1_gk_a1"> --> 54 <!-- <navigator url="{{g_filter.get_url_by_type(item)}}" class="s1_gk_a1"> -->
55 - <navigator url="/packageA/pages/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1"> 55 + <navigator catchtap="go_goods" data-gid="{{item.goods_id}}" class="s1_gk_a1">
56 <view class='zs_top rel'> 56 <view class='zs_top rel'>
57 57
58 <block wx:if="{{object.big_order_type==3}}"> 58 <block wx:if="{{object.big_order_type==3}}">
@@ -207,7 +207,7 @@ @@ -207,7 +207,7 @@
207 <view class="flex flex-wrap" wx:if="{{object.column==2}}" style="padding: 0 10rpx 20rpx 10rpx;"> 207 <view class="flex flex-wrap" wx:if="{{object.column==2}}" style="padding: 0 10rpx 20rpx 10rpx;">
208 <block wx:for="{{goods_array}}" > 208 <block wx:for="{{goods_array}}" >
209 <view class="nav-container"> 209 <view class="nav-container">
210 - <navigator url="/packageA/pages/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1 {{g_filter.get_border_type(object.big_order_type)}}"> 210 + <navigator catchtap="go_goods" data-gid="{{item.goods_id}}" class="s1_gk_a1 {{g_filter.get_border_type(object.big_order_type)}}">
211 <view class="zs_goods_wai_ban"> 211 <view class="zs_goods_wai_ban">
212 <!-- <view class="zs_goods_ban"> --> 212 <!-- <view class="zs_goods_ban"> -->
213 <!-- <view class='zs_goods_2l'> --> 213 <!-- <view class='zs_goods_2l'> -->
@@ -369,7 +369,7 @@ @@ -369,7 +369,7 @@
369 <view class="flex wrap pdh10"> 369 <view class="flex wrap pdh10">
370 <block wx:for="{{goods_array}}" > 370 <block wx:for="{{goods_array}}" >
371 <view class="nav-box"> 371 <view class="nav-box">
372 - <navigator url="/packageA/pages/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1"> 372 + <navigator catchtap="go_goods" data-gid="{{item.goods_id}}" class="s1_gk_a1">
373 <view class="zs_goods_wai_san {{g_filter.get_border_type(object.big_order_type)}}" > 373 <view class="zs_goods_wai_san {{g_filter.get_border_type(object.big_order_type)}}" >
374 <view class="zs_goods_san"> 374 <view class="zs_goods_san">
375 <view class='zs_goods_3l'> 375 <view class='zs_goods_3l'>
@@ -528,7 +528,7 @@ @@ -528,7 +528,7 @@
528 <!-- 列表显示 --> 528 <!-- 列表显示 -->
529 <view class="zs_goods_xiao_wai" wx:if='{{object.column==4}}'> 529 <view class="zs_goods_xiao_wai" wx:if='{{object.column==4}}'>
530 <block wx:for="{{goods_array}}" > 530 <block wx:for="{{goods_array}}" >
531 - <navigator url="/packageA/pages/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1"> 531 + <navigator catchtap="go_goods" data-gid="{{item.goods_id}}" class="s1_gk_a1">
532 <view class="{{object.noboder==0?'zs_goods_xiao_bottom':'zs_goods_xiao'}}" > 532 <view class="{{object.noboder==0?'zs_goods_xiao_bottom':'zs_goods_xiao'}}" >
533 <view class='zs_top_x'> 533 <view class='zs_top_x'>
534 <block wx:if="{{object.big_order_type==3}}"> 534 <block wx:if="{{object.big_order_type==3}}">
@@ -711,7 +711,7 @@ @@ -711,7 +711,7 @@
711 <view class="sp"> 711 <view class="sp">
712 <swiper-item class="s_it" wx:for="{{goods_array}}"> 712 <swiper-item class="s_it" wx:for="{{goods_array}}">
713 <block wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind"> 713 <block wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind">
714 - <navigator url="/packageA/pages/goodsInfo/goodsInfo?goods_id={{aitem.goods_id}}" style="width: 32%" > 714 + <navigator catchtap="go_goods" data-gid="{{aitem.goods_id}}" style="width: 32%" >
715 <view class="one {{object.big_order_type==0?'zj':''}}{{object.big_order_type==1?'yj':''}}"> 715 <view class="one {{object.big_order_type==0?'zj':''}}{{object.big_order_type==1?'yj':''}}">
716 <view class='sp_top'> 716 <view class='sp_top'>
717 <view class='s_img' style="position: relative; width: 100%"> 717 <view class='s_img' style="position: relative; width: 100%">