wxd / MShopWeApp

Commit f34e33342b4a1dab3cbab15f4ebf5c8049dba163

Authored by 后端研发-苏泰源
2 parents c43e6db6 682f2146

Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

Inline Side-by-side
Showing 10 changed files with 359 additions and 893 deletions
@@ -70,6 +70,7 @@ App({ @@ -70,6 +70,7 @@ App({
70 room_id: null, //直播间分享的房间ID 70 room_id: null, //直播间分享的房间ID
71 room_goods_id: null, //直播间分享的商品ID 71 room_goods_id: null, //直播间分享的商品ID
72 fail_url: new Map(), 72 fail_url: new Map(),
  73 + sp_scene:"1175,1176,1177"
73 }, 74 },
74 auth: o, 75 auth: o,
75 request: a, 76 request: a,
@@ -975,5 +976,12 @@ App({ @@ -975,5 +976,12 @@ App({
975 } 976 }
976 }).then(res=>{}) 977 }).then(res=>{})
977 } 978 }
  979 + },
  980 + //判段是不是视频号
  981 + is_sp_hao:function () {
  982 + if(!this.globalData.scene) return false;
  983 + if(this.globalData.sp_scene.indexOf(this.globalData.scene)==-1) return false;
  984 + return true;
978 } 985 }
  986 +
979 }); 987 });
packageA/pages/goodsInfo/goodsInfo.js
  View file @f34e333
@@ -814,9 +814,22 @@ Page({ @@ -814,9 +814,22 @@ Page({
814 var th = this; 814 var th = this;
815 var ind = t.currentTarget.dataset.openSpecModal_ind; 815 var ind = t.currentTarget.dataset.openSpecModal_ind;
816 var action= t.currentTarget.dataset.action; 816 var action= t.currentTarget.dataset.action;
  817 +
  818 +
  819 +
  820 + if(getApp().is_sp_hao() && action=='add'){
  821 + wx.showToast({
  822 + title: "视频号商品不允许加入购物车",
  823 + icon: 'none',
  824 + duration: 2000
  825 + });
  826 + return false;
  827 + }
  828 +
  829 +
817 if(!ind) ind = t.currentTarget.dataset.openspecmodal_ind; 830 if(!ind) ind = t.currentTarget.dataset.openspecmodal_ind;
818 831
819 - th.setData({ 832 + th.setData({
820 open_ind_store: ind 833 open_ind_store: ind
821 }); 834 });
822 835
@@ -1276,7 +1289,18 @@ Page({ @@ -1276,7 +1289,18 @@ Page({
1276 openSpecModel: function(t) { 1289 openSpecModel: function(t) {
1277 var th=this; 1290 var th=this;
1278 var open_store = t.currentTarget.dataset.ind; 1291 var open_store = t.currentTarget.dataset.ind;
1279 - this.setData({ 1292 +
  1293 + if(getApp().is_sp_hao() && open_store==1){
  1294 + wx.showToast({
  1295 + title: "视频号商品不允许加入购物车",
  1296 + icon: 'none',
  1297 + duration: 2000
  1298 + });
  1299 + return false;
  1300 + }
  1301 +
  1302 +
  1303 + this.setData({
1280 store: 0, 1304 store: 0,
1281 choice_sort_store: 0, 1305 choice_sort_store: 0,
1282 sort_store: 0, 1306 sort_store: 0,
packageA/pages/serviceCard_pd/goodsInfo/buy_flash_normal.wxml deleted
View file @c43e6db
1 -<view bindtap="closeSpecModal_flash_normal" class="cover-layer"></view>  
2 - <view class="spec-model">  
3 - <view class="pding">  
4 - <icon bindtap="closeSpecModal_flash_normal" class="modal-close" color="black" size="22" type="cancel"></icon>  
5 - <view class="spec-goods">  
6 - <image class="wh100 spec-img xc-distance-bottom" bindtap="previewImage" src="{{sele_g.original_img}}" binderror="pop_err_img" data-errorimg="data.original_img"></image>  
7 - <view class="spec-goods-info">  
8 - <view class="spec-goods-name ellipsis-2">{{sele_g.goods_name}}</view>  
9 - <view class="flex ai_end xc-val-money">  
10 - <text class="fs20">￥</text>  
11 - <!-- 如果是等级会员，且有等级价 -->  
12 - <block wx:if="{{card_field && sele_g[card_field]>0}}">{{sele_g[card_field]}} </block>  
13 - <block wx:else>{{sele_g.shop_price}}</block>  
14 - </view>  
15 -  
16 - <view class="flex">  
17 - <view class="spec-goods-stock">已售：{{sele_g.sales_sum}}</view>  
18 - <block wx:if="{{sales_rules==2}}">  
19 - <view class="spec-goods-stock" wx:if="{{def_pick_store && def_pick_store.CanOutQty}}">可售：{{def_pick_store.CanOutQty}}</view>  
20 - <view class="spec-goods-stock" wx:else>可售:0</view>  
21 - </block>  
22 - <block wx:else><view class="spec-goods-stock">可售：{{sele_g.store_count}}</view></block>  
23 - </view>  
24 -  
25 -  
26 - </view>  
27 -  
28 - <!-- 选择门店模块 -->  
29 - <view class="flex-space-between address ai_end xc-width ">  
30 -  
31 - <view class="flex ai_end" wx:if="{{def_pick_store && def_pick_store.pickup_name}}">  
32 - <text class="fs30 xc-black3 shop_name">{{def_pick_store.pickup_name}}</text>  
33 - <view class="distance fs24 xc-ash"wx:if="{{def_pick_store.distance!=null}}">  
34 - 距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}}  
35 -  
36 - </view>  
37 - </view>  
38 -  
39 - <!-- 没有门店的时候 -->  
40 - <view class="flex" bindtap="choice_store" wx:else>  
41 - <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image>  
42 - <view class="fs30" style="color:black;">选择门店</view>  
43 - </view>  
44 -  
45 - <view class="red-co fs28" bindtap="choice_store" >更多门店<text class="right-arrow"></text></view>  
46 - </view>  
47 - <view wx:if="{{only_pk && !only_pk.length}}">(库存不足)</view>  
48 - <block wx:else>  
49 - <view wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">(库存不足)</view>  
50 - <block wx:else>  
51 - <view class="no_store" wx:if="{{def_pick_store.is_no_dis}}">(配送不匹配)</view>  
52 - <view wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && sales_rules==2 && prom_type==0}}">(库存不足)</view>  
53 - </block>  
54 - </block>  
55 - <view class="fs24 xc-ash-9f xc-distance-top "wx:if="{{def_pick_store && def_pick_store.fulladdress}}">地址:{{def_pick_store.fulladdress}}</view>  
56 -  
57 -  
58 - <!--商品的属性项目-->  
59 - <view class="xc-goods-attribute">  
60 - <view hidden="{{ismend==1}}" class="spec-name">商品规格</view>  
61 - <view hidden="{{ismend==1}}" style="max-height: 120rpx;overflow-y: auto;">  
62 - <view class="spec_bt {{gid==item.goods_id?'act':''}}" bindtap="sele_spec" data-nor="1" data-gid='{{item.goods_id}}' wx:for="{{sku_g_pt}}" wx:key="sku_g">  
63 - {{item.gg}}  
64 - </view>  
65 - </view>  
66 - </view>  
67 -  
68 - <view class="b_num">  
69 - <view>购买数量</view>  
70 - <view class="count">  
71 - <view bindtap="{{goodsInputNum <= 1 ? '':'subCartNum'}}" class="sub {{goodsInputNum <= 1 ? 'active':''}}">-</view>  
72 - <input bindblur="inputCartNum" type="number" value="{{goodsInputNum}}"></input>  
73 - <view bindtap="addCartNum" class="add">+</view>  
74 - </view>  
75 - </view>  
76 - </view>  
77 -  
78 -  
79 - <!-- 提示再买多少优惠 -->  
80 - <view style="margin-top: 35rpx;color:#333;font-size:28rpx;" wx:if="{{hui_condition}}">  
81 - 再买{{hui_condition.need}}  
82 - <text wx:if="{{hui_condition.money}}">，免{{hui_condition.money}}元</text>  
83 - <text wx:if="{{hui_condition.sale}}">，打{{hui_condition.sale}}折</text>  
84 - <text wx:if="{{hui_condition.past==1}}">，包邮</text>  
85 - <text wx:if="{{hui_condition.intValue>0}}">，送{{hui_condition.intValue}}积分</text>  
86 - <text wx:if="{{hui_condition.couponId>0}}">，送优惠券</text>  
87 - <text wx:if="{{hui_condition.gift_id>0}}">，送赠品</text>  
88 - <text wx:if="{{hui_condition.lb_id>0}}">，送礼包</text>  
89 - <text wx:if="{{hui_condition.zxlb_id>0}}">，送专享礼包</text>  
90 - </view>  
91 -  
92 -  
93 - <!-- 按钮部分 -->  
94 - <view class="spec-cart-btns">  
95 -  
96 - <!-- 根本就找不到门店 -->  
97 - <block wx:if="{{def_pick_store && def_pick_store.is_no_dis}}">  
98 - <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">配送不匹配</view>  
99 - </block>  
100 - <block wx:else>  
101 - <!-- 根本就找不到门店 -->  
102 - <block wx:if="{{!only_pk && !def_pickpu_list}}">  
103 - <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">库存不足</view>  
104 - </block>  
105 - <block wx:else>  
106 -  
107 -  
108 - <block wx:if="{{only_pk.length && !only_pk.length}}">  
109 - <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">库存不足</view>  
110 - </block>  
111 - <block wx:else>  
112 - <block wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">  
113 - <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">库存不足</view>  
114 - </block>  
115 - <block wx:else>  
116 - <block wx:if="{{!def_pick_store}}">  
117 - <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">请先选择门店</view>  
118 - </block>  
119 - <block wx:else>  
120 - <block wx:if="{{data.store_count<=0}}">  
121 - <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">库存不足</view>  
122 - </block>  
123 - <block wx:else>  
124 - <view class="flex jc_sb">  
125 - <view class="spec-cart-btn spec-buy w40" bindtap="addCart"  
126 - data-action="add" style="background-color: #ffb03f;">加入购物车</view>  
127 - <view class="spec-cart-btn spec-buy w40" bindtap="addCart"  
128 - data-action="buy">立即购买</view>  
129 - </view>  
130 - </block>  
131 -  
132 - </block>  
133 - </block>  
134 - </block>  
135 - </block>  
136 - </block>  
137 - </view>  
138 -  
139 - </view>  
140 - </view>  
141 - <view class="clear"></view>  
142 \ No newline at end of file 0 \ No newline at end of file
packageA/pages/serviceCard_pd/goodsInfo/buy_integral.wxml deleted
View file @c43e6db
1 -<view bindtap="closeSpecModal_inte" class="cover-layer"></view>  
2 - <view class="spec-model">  
3 - <view class="pding">  
4 - <icon bindtap="closeSpecModal_inte" class="modal-close" color="black" size="22" type="cancel"></icon>  
5 - <view class="spec-goods">  
6 - <image class="wh100 spec-img xc-distance-bottom" bindtap="previewImage" src="{{data.original_img}}" binderror="pop_err_img" data-errorimg="data.original_img"></image>  
7 - <view class="spec-goods-info">  
8 - <view class="spec-goods-name ellipsis-2">{{data.goods_name}}</view>  
9 - <view class="flex ai_end xc-val-money">  
10 - <view class="spec-goods-price">  
11 - <text wx:if="{{prom_integral}}">{{prom_integral}}积分</text>  
12 - <text wx:if="{{prom_integral && prom_price}}">+</text>  
13 - <text wx:if="{{prom_price}}">{{prom_price}}元</text>  
14 - <text wx:if="{{!prom_integral && !prom_price}}">0积分</text>  
15 - </view>  
16 - </view>  
17 -  
18 -  
19 - <view class="flex">  
20 - <view class="spec-goods-stock">已售：{{prom_act.buy_num+prom_act.virtual}}</view>  
21 - <view class="spec-goods-stock">可售：{{prom_act.limitqty-prom_act.buy_num}}</view>  
22 - </view>  
23 -  
24 - </view>  
25 -  
26 - <!-- 选择门店模块 -->  
27 - <view class="flex-space-between address ai_end xc-width ">  
28 -  
29 - <view class="flex ai_end" wx:if="{{def_pick_store && def_pick_store.pickup_name}}">  
30 - <text class="fs30 xc-black3 shop_name">{{def_pick_store.pickup_name}}</text>  
31 - <view class="distance fs24 xc-ash"wx:if="{{def_pick_store.distance!=null}}">  
32 - 距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}}  
33 -  
34 - </view>  
35 - </view>  
36 -  
37 - <!-- 没有门店的时候 -->  
38 - <view class="flex" bindtap="choice_store" wx:else>  
39 - <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image>  
40 - <view class="fs30" style="color:black;">选择门店</view>  
41 - </view>  
42 -  
43 - <view class="red-co fs28" bindtap="choice_store">更多门店<text class="right-arrow"></text></view>  
44 - </view>  
45 - <view wx:if="{{only_pk && !only_pk.length}}">(库存不足)</view>  
46 - <block wx:else>  
47 - <view wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">(库存不足)</view>  
48 - <block wx:else>  
49 - <view class="no_store" wx:if="{{def_pick_store.is_no_dis}}">(配送不匹配)</view>  
50 - <view wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && sales_rules==2 && prom_type==0}}">(库存不足)</view>  
51 - </block>  
52 - </block>  
53 -  
54 - <view class="fs24 xc-ash-9f xc-distance-top "wx:if="{{def_pick_store && def_pick_store.fulladdress}}">地址:{{def_pick_store.fulladdress}}</view>  
55 -  
56 -  
57 - <!--商品的属性项目-->  
58 - <view class="xc-goods-attribute">  
59 - <view hidden="{{ismend==1}}" class="spec-name">商品规格</view>  
60 - <view hidden="{{ismend==1}}" style="max-height: 120rpx;overflow-y: auto;">  
61 - <view class="spec_bt {{gid==item.goods_id?'act':''}}" bindtap="sele_spec" data-gid='{{item.goods_id}}' wx:for="{{sku_g}}" wx:key="sku_g">  
62 - {{item.gg}}  
63 - </view>  
64 - </view>  
65 - </view>  
66 -  
67 - <view class="b_num">  
68 - <view>购买数量</view>  
69 - <view class="count">  
70 - <view bindtap="{{goodsInputNum <= 1 ? '':'subCartNum_inte'}}" class="sub {{goodsInputNum <= 1 ? 'active':''}}">-</view>  
71 - <input bindblur="inputCartNum_inte" type="number" value="{{goodsInputNum}}"></input>  
72 - <view bindtap="addCartNum_inte" class="add">+</view>  
73 - </view>  
74 - </view>  
75 - </view>  
76 -  
77 - <!-- 按钮部分 -->  
78 - <view class="spec-cart-btns">  
79 - <!-- 根本就找不到门店 -->  
80 - <block wx:if="{{def_pick_store && def_pick_store.is_no_dis}}">  
81 - <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">配送不匹配</view>  
82 - </block>  
83 -  
84 - <block wx:else>  
85 -  
86 - <!-- 根本就找不到门店 -->  
87 - <block wx:if="{{!only_pk && !def_pickpu_list}}">  
88 - <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">库存不足</view>  
89 - </block>  
90 - <block wx:else>  
91 -  
92 -  
93 - <block wx:if="{{only_pk.length && !only_pk.length}}">  
94 - <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">库存不足</view>  
95 - </block>  
96 - <block wx:else>  
97 - <block wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">  
98 - <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">库存不足</view>  
99 - </block>  
100 - <block wx:else>  
101 - <block wx:if="{{!def_pick_store}}">  
102 - <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">请先选择门店</view>  
103 - </block>  
104 - <block wx:else>  
105 - <block wx:if="{{data.store_count<=0}}">  
106 - <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">库存不足</view>  
107 - </block>  
108 - <block wx:else>  
109 - <view bindtap="addCart_inte" class="spec-cart-btn spec-buy" data-action="buy">立即兑换</view>  
110 - </block>  
111 -  
112 - </block>  
113 - </block>  
114 - </block>  
115 - </block>  
116 - </block>  
117 - </view>  
118 -  
119 -  
120 - </view>  
121 - </view>  
122 - <view class="clear"></view>  
123 \ No newline at end of file 0 \ No newline at end of file
packageA/pages/serviceCard_pd/goodsInfo/buy_integral_normal.wxml deleted
View file @c43e6db
1 -<view bindtap="closeSpecModal_inte_normal" class="cover-layer"></view>  
2 - <view class="spec-model">  
3 - <view class="pding">  
4 - <icon bindtap="closeSpecModal_inte_normal" class="modal-close" color="black" size="22" type="cancel"></icon>  
5 - <view class="spec-goods">  
6 - <image class="wh100 spec-img xc-distance-bottom" bindtap="previewImage" src="{{sele_g.original_img}}" binderror="pop_err_img" data-errorimg="data.original_img"></image>  
7 - <view class="spec-goods-info">  
8 - <view class="spec-goods-name ellipsis-2">{{sele_g.goods_name}}</view>  
9 - <view class="flex ai_end xc-val-money">  
10 - <text class="fs20">￥</text>  
11 - <!-- 如果是等级会员，且有等级价 -->  
12 - <block wx:if="{{card_field && sele_g[card_field]>0}}">{{sele_g[card_field]}} </block>  
13 - <block wx:else>{{sele_g.shop_price}}</block>  
14 - </view>  
15 -  
16 - <view class="flex">  
17 - <view class="spec-goods-stock">已售：{{sele_g.sales_sum}}</view>  
18 - <block wx:if="{{sales_rules==2}}">  
19 - <view class="spec-goods-stock" wx:if="{{def_pick_store && def_pick_store.CanOutQty}}">可售：{{def_pick_store.CanOutQty}}</view>  
20 - <view class="spec-goods-stock" wx:else>可售:0</view>  
21 - </block>  
22 - <block wx:else><view class="spec-goods-stock">可售：{{sele_g.store_count}}</view></block>  
23 - </view>  
24 -  
25 -  
26 - </view>  
27 -  
28 - <!-- 选择门店模块 -->  
29 - <view class="flex-space-between address ai_end xc-width ">  
30 -  
31 - <view class="flex ai_end" wx:if="{{def_pick_store && def_pick_store.pickup_name}}">  
32 - <text class="fs30 xc-black3 shop_name">{{def_pick_store.pickup_name}}</text>  
33 - <view class="distance fs24 xc-ash"wx:if="{{def_pick_store.distance!=null}}">  
34 - 距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}}  
35 -  
36 - </view>  
37 - </view>  
38 -  
39 - <!-- 没有门店的时候 -->  
40 - <view class="flex" bindtap="choice_store" wx:else>  
41 - <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image>  
42 - <view class="fs30" style="color:black;">选择门店</view>  
43 - </view>  
44 -  
45 - <view class="red-co fs28" bindtap="choice_store" >更多门店<text class="right-arrow"></text></view>  
46 - </view>  
47 - <view wx:if="{{only_pk && !only_pk.length}}">(库存不足)</view>  
48 - <block wx:else>  
49 - <view wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">(库存不足)</view>  
50 - <block wx:else>  
51 - <view class="no_store" wx:if="{{def_pick_store.is_no_dis}}">(配送不匹配)</view>  
52 - <view wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && sales_rules==2 && prom_type==0}}">(库存不足)</view>  
53 - </block>  
54 - </block>  
55 - <view class="fs24 xc-ash-9f xc-distance-top "wx:if="{{def_pick_store && def_pick_store.fulladdress}}">地址:{{def_pick_store.fulladdress}}</view>  
56 -  
57 -  
58 - <!--商品的属性项目-->  
59 - <view class="xc-goods-attribute">  
60 - <view hidden="{{ismend==1}}" class="spec-name">商品规格</view>  
61 - <view hidden="{{ismend==1}}" style="max-height: 120rpx;overflow-y: auto;">  
62 - <view class="spec_bt {{gid==item.goods_id?'act':''}}" bindtap="sele_spec" data-nor="1" data-gid='{{item.goods_id}}' wx:for="{{sku_g_pt}}" wx:key="sku_g">  
63 - {{item.gg}}  
64 - </view>  
65 - </view>  
66 - </view>  
67 -  
68 - <view class="b_num">  
69 - <view>购买数量</view>  
70 - <view class="count">  
71 - <view bindtap="{{goodsInputNum <= 1 ? '':'subCartNum'}}" class="sub {{goodsInputNum <= 1 ? 'active':''}}">-</view>  
72 - <input bindblur="inputCartNum" type="number" value="{{goodsInputNum}}"></input>  
73 - <view bindtap="addCartNum" class="add">+</view>  
74 - </view>  
75 - </view>  
76 - </view>  
77 -  
78 -  
79 - <!-- 提示再买多少优惠 -->  
80 - <view style="margin-top: 35rpx;color:#333;font-size:28rpx;" wx:if="{{hui_condition}}">  
81 - 再买{{hui_condition.need}}  
82 - <text wx:if="{{hui_condition.money}}">，免{{hui_condition.money}}元</text>  
83 - <text wx:if="{{hui_condition.sale}}">，打{{hui_condition.sale}}折</text>  
84 - <text wx:if="{{hui_condition.past==1}}">，包邮</text>  
85 - <text wx:if="{{hui_condition.intValue>0}}">，送{{hui_condition.intValue}}积分</text>  
86 - <text wx:if="{{hui_condition.couponId>0}}">，送优惠券</text>  
87 - <text wx:if="{{hui_condition.gift_id>0}}">，送赠品</text>  
88 - <text wx:if="{{hui_condition.lb_id>0}}">，送礼包</text>  
89 - <text wx:if="{{hui_condition.zxlb_id>0}}">，送专享礼包</text>  
90 - </view>  
91 -  
92 -  
93 - <!-- 按钮部分 -->  
94 - <view class="spec-cart-btns">  
95 -  
96 -  
97 - <!-- 根本就找不到门店 -->  
98 - <block wx:if="{{def_pick_store && def_pick_store.is_no_dis}}">  
99 - <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">配送不匹配</view>  
100 - </block>  
101 - <block wx:else>  
102 - <!-- 根本就找不到门店 -->  
103 - <block wx:if="{{!only_pk && !def_pickpu_list}}">  
104 - <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">库存不足</view>  
105 - </block>  
106 - <block wx:else>  
107 -  
108 -  
109 - <block wx:if="{{only_pk.length && !only_pk.length}}">  
110 - <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">库存不足</view>  
111 - </block>  
112 - <block wx:else>  
113 - <block wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">  
114 - <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">库存不足</view>  
115 - </block>  
116 - <block wx:else>  
117 - <block wx:if="{{!def_pick_store}}">  
118 - <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">请先选择门店</view>  
119 - </block>  
120 - <block wx:else>  
121 - <block wx:if="{{data.store_count<=0}}">  
122 - <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">库存不足</view>  
123 - </block>  
124 - <block wx:else>  
125 - <view class="flex jc_sb">  
126 - <view class="spec-cart-btn spec-buy w40" bindtap="addCart"  
127 - data-action="add" style="background-color: #ffb03f;">加入购物车</view>  
128 - <view class="spec-cart-btn spec-buy w40" bindtap="addCart"  
129 - data-action="buy">立即购买</view>  
130 - </view>  
131 - </block>  
132 -  
133 - </block>  
134 - </block>  
135 - </block>  
136 - </block>  
137 - </block>  
138 - </view>  
139 -  
140 -  
141 - </view>  
142 - </view>  
143 - <view class="clear"></view>  
144 \ No newline at end of file 0 \ No newline at end of file
packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js
  View file @f34e333
1 -var t = require("../../../../utils/util.js"),  
2 - ut = t,  
3 - e = require("../../../../utils/common.js"), 1 +var ut = require("../../../../utils/util.js"),
4 a = require("../../../../utils/wxParse/wxParse.js"), 2 a = require("../../../../utils/wxParse/wxParse.js"),
5 - s = getApp(),  
6 - i = s.request,  
7 - rq = i,  
8 - oo = s.globalData,  
9 - o = s.globalData.setting,  
10 - os = o;  
11 -  
12 -let self = null;  
13 - 3 + e = require("../../../../utils/common.js"),
  4 + oo = getApp().globalData,
  5 + os = oo.setting;
14 //评价加载更多 6 //评价加载更多
15 var more = function(e) { 7 var more = function(e) {
16 return e && e.__esModule ? e : { 8 return e && e.__esModule ? e : {
@@ -18,7 +10,6 @@ var more = function(e) { @@ -18,7 +10,6 @@ var more = function(e) {
18 }; 10 };
19 }(require("../../../../utils/LoadMore.js")), 11 }(require("../../../../utils/LoadMore.js")),
20 n = new more.default(); 12 n = new more.default();
21 -var utils = require('../../../../utils/util.js');  
22 var regeneratorRuntime = require('../../../../utils/runtime.js'); 13 var regeneratorRuntime = require('../../../../utils/runtime.js');
23 14
24 Page({ 15 Page({
@@ -27,14 +18,12 @@ Page({ @@ -27,14 +18,12 @@ Page({
27 color_type: 0, //线条控制 18 color_type: 0, //线条控制
28 color_type_one: 0, 19 color_type_one: 0,
29 color_type_two: 1, 20 color_type_two: 1,
30 -  
31 gid: "", 21 gid: "",
32 - stoid: o.stoid,  
33 - url: o.url,  
34 - resourceUrl: o.h5_url, //公众号那边的图片文件域名  
35 - iurl: o.imghost,  
36 - defaultAvatar: o.resourceUrl + "/static/images/user68.jpg",  
37 - 22 + stoid: os.stoid,
  23 + url: os.url,
  24 + resourceUrl: os.h5_url, //公众号那边的图片文件域名
  25 + iurl: os.imghost,
  26 +
38 data: null, 27 data: null,
39 content: "", //商品详情 28 content: "", //商品详情
40 29
@@ -114,7 +103,7 @@ Page({ @@ -114,7 +103,7 @@ Page({
114 is_sec_mend: 0, 103 is_sec_mend: 0,
115 sto_sele_name: "", //选中的门店名称 104 sto_sele_name: "", //选中的门店名称
116 sto_sele_id: "", //选中的门店id 105 sto_sele_id: "", //选中的门店id
117 - sto_sele_keyid:'', //选中的门店线下 106 + sto_sele_keyid:'', //选中的门店线下
118 sto_sele_distr: "", //选择的门店的配送方式 107 sto_sele_distr: "", //选择的门店的配送方式
119 is_show_sto_cat: 1, //是否显示门店分类 108 is_show_sto_cat: 1, //是否显示门店分类
120 only_pk: null, 109 only_pk: null,
@@ -130,7 +119,6 @@ Page({ @@ -130,7 +119,6 @@ Page({
130 mobile: '', 119 mobile: '',
131 //商品的活动类型 0普通 1秒杀 2团购 3优惠 4 积分购 6拼单 120 //商品的活动类型 0普通 1秒杀 2团购 3优惠 4 积分购 6拼单
132 timer: [], 121 timer: [],
133 -  
134 //商品的购买次数 122 //商品的购买次数
135 prom_buy_num: -1, 123 prom_buy_num: -1,
136 g_buy_num: null, 124 g_buy_num: null,
@@ -199,7 +187,7 @@ Page({ @@ -199,7 +187,7 @@ Page({
199 is_newsales_rules:0, //是否开启最新的门店规则,此时会新读门店,当点击选择门店时会触发读取线下库存 187 is_newsales_rules:0, //是否开启最新的门店规则,此时会新读门店,当点击选择门店时会触发读取线下库存
200 sales_rules:1, //默认是线上销售 188 sales_rules:1, //默认是线上销售
201 189
202 - wait_for_user_store:null, 190 + wait_for_user_store:null,
203 poster:null, //自定义海报 191 poster:null, //自定义海报
204 share_b_img:'', //自定义分享的背景 192 share_b_img:'', //自定义分享的背景
205 showPoster: false, 193 showPoster: false,
@@ -209,19 +197,14 @@ Page({ @@ -209,19 +197,14 @@ Page({
209 // 秒杀 197 // 秒杀
210 prom_st: null, 198 prom_st: null,
211 prom_r_null: 0, 199 prom_r_null: 0,
212 -  
213 hiddenCS: true, //控制客服操作菜单显示和控制 200 hiddenCS: true, //控制客服操作菜单显示和控制
214 -  
215 openSpecModal_flash_normal: 0, 201 openSpecModal_flash_normal: 0,
216 }, 202 },
217 203
218 //------初始化加载---------- 204 //------初始化加载----------
219 onLoad: function(t) { 205 onLoad: function(t) {
220 self = this; 206 self = this;
221 -  
222 - this.setData({  
223 - options: t,  
224 - }); 207 + this.setData({ options: t,});
225 208
226 var ee = this, 209 var ee = this,
227 that = ee, 210 that = ee,
@@ -265,11 +248,11 @@ Page({ @@ -265,11 +248,11 @@ Page({
265 if(gid_str.length>1){ 248 if(gid_str.length>1){
266 first_leader=gid_str[1]; 249 first_leader=gid_str[1];
267 } 250 }
268 - //-- 如果有room_id的获取 --  
269 - if(gid_str.length>2 && gid_str[2]) {  
270 - room_id=gid_str[2];  
271 - room_user_share=1;  
272 - }; 251 + //-- 如果有room_id的获取 --
  252 + if(gid_str.length>2 && gid_str[2]) {
  253 + room_id=gid_str[2];
  254 + room_user_share=1;
  255 + };
273 }; 256 };
274 257
275 ee.setData({ gid: gid}); 258 ee.setData({ gid: gid});
@@ -315,7 +298,7 @@ Page({ @@ -315,7 +298,7 @@ Page({
315 is_show_gb: 1 298 is_show_gb: 1
316 }); 299 });
317 } 300 }
318 - // console.log(e); 301 +
319 var json_d = JSON.parse(e.switch_list); 302 var json_d = JSON.parse(e.switch_list);
320 ee.setData({ 303 ee.setData({
321 store_config: e, 304 store_config: e,
@@ -331,38 +314,7 @@ Page({ @@ -331,38 +314,7 @@ Page({
331 th.requestCardNum(), wx.pageScrollTo && th.setData({ 314 th.requestCardNum(), wx.pageScrollTo && th.setData({
332 supportPageScroll: !0 315 supportPageScroll: !0
333 }); 316 });
334 -  
335 - //计算等级价相关  
336 - // var swithc_list = e.switch_list;  
337 - // var sw_arr = JSON.parse(swithc_list);  
338 - // //---如果后台又开等级卡的开关---  
339 - // if (sw_arr.rank_switch && sw_arr.rank_switch == "2") {  
340 - // th.setData({ rank_switch: true });  
341 - // //---回调卡的列表---  
342 - // th.getPlusCardType(function (ob) {  
343 - // th.setData({ card_list: ob.card_list });  
344 - // var ti = setInterval(function () {  
345 - // var user = getApp().globalData.userInfo;  
346 - // if (!user) return false;  
347 - // clearInterval(ti);  
348 - // if (user.card_field && user['card_expiredate']) {  
349 - // var str = user['card_expiredate'].replace(/-/g, '/');  
350 - // var end = new Date(str);  
351 - // end = Date.parse(end) / 1000;  
352 - // var now = ut.gettimestamp();  
353 - // //--- 判断是等级会员，且在有效期范围内 ---  
354 - // if (user.card_field && now < end) {  
355 - // var card_name = ob.name_map.get(user.card_field);  
356 - // //if(card_name.length>6) card_name=card_name.substring(0,6);  
357 -  
358 - // var is_near_date = 0;  
359 - // if (end - now < 60 * 60 * 30 * 24) is_near_date = 1; //如果小于30天  
360 - // th.setData({ card_field: user.card_field, card_name: card_name, card_list: ob.card_list, is_near_date: is_near_date });  
361 - // }  
362 - // }  
363 - // }, 500)  
364 - // })  
365 - // } 317 +
366 318
367 }, 1); 319 }, 1);
368 320
@@ -637,24 +589,8 @@ Page({ @@ -637,24 +589,8 @@ Page({
637 } 589 }
638 }; 590 };
639 591
640 - this.getTaohe();  
641 -  
642 - // if (th.data.is_closecoupon != 1 && (!th.data.fir_quan || th.data.fir_quan.length<=0)) {  
643 - // //----获取详情页的券的数量----  
644 - // await getApp().request.promiseGet("/api/weshop/prom/coupon/pageCouponList", {  
645 - // data: {  
646 - // store_id: os.stoid,  
647 - // type: 1,  
648 - // pageSize: 3,  
649 - // page: 1,  
650 - // is_share: 0,  
651 - // },  
652 - // }).then(res1 => {  
653 - // fir_quan = res1.data.data.pageData;  
654 - // })  
655 - // }  
656 -  
657 - 592 + this.getTaohe();
  593 +
658 //this.getHistoryBuy(); //获取历史购买 594 //this.getHistoryBuy(); //获取历史购买
659 ee.setData({ 595 ee.setData({
660 is_collect: is_collect, 596 is_collect: is_collect,
@@ -671,17 +607,16 @@ Page({ @@ -671,17 +607,16 @@ Page({
671 // gid 在onload阶段已经保存在this.data中 607 // gid 在onload阶段已经保存在this.data中
672 onShow: function() { 608 onShow: function() {
673 609
674 - getApp().check_can_share();  
675 - 610 + getApp().check_can_share();
676 var that=this; 611 var that=this;
677 var ee = this,gid = this.data.gid, i = getApp().request; 612 var ee = this,gid = this.data.gid, i = getApp().request;
678 this.data.is_timer = 1; 613 this.data.is_timer = 1;
679 - this.wait_for_store_config(); 614 + this.wait_for_store_config();
680 615
681 616
682 617
683 618
684 - i.get("/api/weshop/serviceCard/get/" + o.stoid + "/" + ee.data.gid, { 619 + i.get("/api/weshop/serviceCard/get/" + os.stoid + "/" + ee.data.gid, {
685 failRollback: !0, 620 failRollback: !0,
686 success: function(t) { 621 success: function(t) {
687 if (t.data.code == 0) { 622 if (t.data.code == 0) {
@@ -733,7 +668,7 @@ Page({ @@ -733,7 +668,7 @@ Page({
733 668
734 //获取重表 669 //获取重表
735 getApp().promiseGet("/api/weshop/serviceItem/list",{ 670 getApp().promiseGet("/api/weshop/serviceItem/list",{
736 - data:{store_id:o.stoid,service_id:t.data.data.id} 671 + data:{store_id:os.stoid,service_id:t.data.data.id}
737 }).then(res=>{ 672 }).then(res=>{
738 if(res.data.code==0){ 673 if(res.data.code==0){
739 var list=res.data.data; 674 var list=res.data.data;
@@ -1256,33 +1191,6 @@ Page({ @@ -1256,33 +1191,6 @@ Page({
1256 1191
1257 1192
1258 }; 1193 };
1259 -  
1260 -  
1261 -  
1262 -  
1263 -  
1264 -  
1265 -  
1266 -  
1267 -  
1268 -  
1269 -  
1270 - // var e = th.data.sele_g.goods_num;  
1271 - // var p_type = th.data.prom_type; //&& p_type!=1 && p_type!=4  
1272 - // if (th.data.sales_rules == 2 && (p_type != 1 && p_type != 4 && p_type != 6 || th.data.openSpecModal_inte_normal == 1 || th.data.is_normal == 1)) {  
1273 - // if (!th.data.def_pick_store) {  
1274 - // wx.showModal({title: '请选择门店',});  
1275 - // return false;  
1276 - // } else {  
1277 - // e = th.data.def_pick_store.CanOutQty;  
1278 - // }  
1279 - // }  
1280 -  
1281 -  
1282 - // th.setData({goodsInputNum: t});  
1283 -  
1284 - // });  
1285 -  
1286 1194
1287 }, 1195 },
1288 1196
@@ -1335,7 +1243,7 @@ Page({ @@ -1335,7 +1243,7 @@ Page({
1335 t.data.is_collect_load=1; 1243 t.data.is_collect_load=1;
1336 1244
1337 if (t.data.is_collect == 1) { //删除收藏 1245 if (t.data.is_collect == 1) { //删除收藏
1338 - i.delete("/api/weshop/goodscollect/del/" + o.stoid + "/" + t.data.collect_id, { 1246 + i.delete("/api/weshop/goodscollect/del/" + os.stoid + "/" + t.data.collect_id, {
1339 success: function(e) { 1247 success: function(e) {
1340 t.data.is_collect_load=0; 1248 t.data.is_collect_load=0;
1341 if (e.data.code == 0) { 1249 if (e.data.code == 0) {
@@ -1352,7 +1260,7 @@ Page({ @@ -1352,7 +1260,7 @@ Page({
1352 var d = { 1260 var d = {
1353 goods_id: t.data.data.goods_id, 1261 goods_id: t.data.data.goods_id,
1354 user_id: s.globalData.user_id, 1262 user_id: s.globalData.user_id,
1355 - store_id: o.stoid, 1263 + store_id: os.stoid,
1356 add_time: timestamp, 1264 add_time: timestamp,
1357 type: 1, 1265 type: 1,
1358 }; 1266 };
@@ -1432,27 +1340,21 @@ Page({ @@ -1432,27 +1340,21 @@ Page({
1432 var t = this; 1340 var t = this;
1433 getApp().request.get("/api/weshop/cart/page", { 1341 getApp().request.get("/api/weshop/cart/page", {
1434 data: { 1342 data: {
1435 - store_id: o.stoid,  
1436 - user_id: s.globalData.user_id, 1343 + store_id: os.stoid,
  1344 + user_id: getApp().globalData.user_id,
1437 state:0, 1345 state:0,
1438 is_gift:0 1346 is_gift:0
1439 }, 1347 },
1440 success: function(e) { 1348 success: function(e) {
1441 - var num = 0;  
1442 - for (var i = 0; i < e.data.data.pageData.length; i++) {  
1443 - num += e.data.data.pageData[i].goods_num;  
1444 - }  
1445 -  
1446 - /*--  
1447 - t.setData({  
1448 - cartGoodsNum: num  
1449 - });--*/  
1450 - 1349 + var num = 0;
  1350 + for (var i = 0; i < e.data.data.pageData.length; i++) {
  1351 + num += e.data.data.pageData[i].goods_num;
  1352 + }
1451 //-- 读取服务卡的数量 -- 1353 //-- 读取服务卡的数量 --
1452 getApp().promiseGet("/api/weshop/cartService/page",{ 1354 getApp().promiseGet("/api/weshop/cartService/page",{
1453 data:{ 1355 data:{
1454 - store_id: s.globalData.setting.stoid,  
1455 - user_id: s.globalData.user_id, 1356 + store_id: os.stoid,
  1357 + user_id: getApp().globalData.user_id,
1456 } 1358 }
1457 }).then(res=>{ 1359 }).then(res=>{
1458 for (var i = 0; i < res.data.data.pageData.length; i++) { 1360 for (var i = 0; i < res.data.data.pageData.length; i++) {
@@ -1547,7 +1449,7 @@ Page({ @@ -1547,7 +1449,7 @@ Page({
1547 var i = getApp().request; 1449 var i = getApp().request;
1548 if (!th.data.data) return false; 1450 if (!th.data.data) return false;
1549 var dd= { 1451 var dd= {
1550 - store_id: o.stoid, 1452 + store_id: os.stoid,
1551 isstop: 0, 1453 isstop: 0,
1552 is_pos: 1, 1454 is_pos: 1,
1553 pageSize: 2000 1455 pageSize: 2000
@@ -1637,7 +1539,7 @@ Page({ @@ -1637,7 +1539,7 @@ Page({
1637 if (e.data.data.total > 10 && e.his_cate_num) { 1539 if (e.data.data.total > 10 && e.his_cate_num) {
1638 getApp().request.get("/api/weshop/storagecategory/page", { 1540 getApp().request.get("/api/weshop/storagecategory/page", {
1639 data: { 1541 data: {
1640 - store_id: o.stoid, 1542 + store_id: os.stoid,
1641 pageSize: 1000, 1543 pageSize: 1000,
1642 orderField:"sort", 1544 orderField:"sort",
1643 orderType:'asc', 1545 orderType:'asc',
@@ -2693,7 +2595,7 @@ Page({ @@ -2693,7 +2595,7 @@ Page({
2693 2595
2694 2596
2695 2597
2696 - var store_id = o.stoid; 2598 + var store_id = os.stoid;
2697 var user_id = getApp().globalData.user_id; 2599 var user_id = getApp().globalData.user_id;
2698 var def_pickup_id = item.pickup_id; 2600 var def_pickup_id = item.pickup_id;
2699 2601
@@ -2958,7 +2860,7 @@ Page({ @@ -2958,7 +2860,7 @@ Page({
2958 2860
2959 wx.showLoading(); 2861 wx.showLoading();
2960 var req_where = { 2862 var req_where = {
2961 - store_id: o.stoid, pageSize: 5, is_show: 1, 2863 + store_id: os.stoid, pageSize: 5, is_show: 1,
2962 parent_id: 0, goods_id: th.data.gid, commenttype: tp, 2864 parent_id: 0, goods_id: th.data.gid, commenttype: tp,
2963 service_id: this.data.gid, 2865 service_id: this.data.gid,
2964 } 2866 }
@@ -3003,7 +2905,7 @@ Page({ @@ -3003,7 +2905,7 @@ Page({
3003 2905
3004 await getApp().request.promiseGet("/api/weshop/serviceComment/pageComment", { 2906 await getApp().request.promiseGet("/api/weshop/serviceComment/pageComment", {
3005 data: { 2907 data: {
3006 - store_id: o.stoid, 2908 + store_id: os.stoid,
3007 parent_id: ep.comment_id, 2909 parent_id: ep.comment_id,
3008 service_id: this.data.gid, 2910 service_id: this.data.gid,
3009 } 2911 }
@@ -3044,7 +2946,7 @@ Page({ @@ -3044,7 +2946,7 @@ Page({
3044 2946
3045 app.request.post("/api/weshop/serviceCommentZan/save", { 2947 app.request.post("/api/weshop/serviceCommentZan/save", {
3046 data: { 2948 data: {
3047 - store_id: o.stoid, 2949 + store_id: os.stoid,
3048 user_id: app.globalData.user_id, 2950 user_id: app.globalData.user_id,
3049 goods_id: th.data.gid, 2951 goods_id: th.data.gid,
3050 service_id: th.data.gid, 2952 service_id: th.data.gid,
@@ -3187,15 +3089,11 @@ Page({ @@ -3187,15 +3089,11 @@ Page({
3187 }; 3089 };
3188 }); 3090 });
3189 }, 3091 },
3190 -  
3191 -  
3192 -  
3193 - 3092 +
3194 //---小于10的格式化函数---- 3093 //---小于10的格式化函数----
3195 - // timeFormat(param) {  
3196 - // return param < 10 ? '0' + param : param;  
3197 - // },  
3198 - 3094 + timeFormat(param) {
  3095 + return param < 10 ? '0' + param : param;
  3096 + },
3199 //----倒计时函数----- 3097 //----倒计时函数-----
3200 countDown(time, prom_st) { 3098 countDown(time, prom_st) {
3201 if (!this.data.is_timer) return false; 3099 if (!this.data.is_timer) return false;
@@ -3265,13 +3163,12 @@ Page({ @@ -3265,13 +3163,12 @@ Page({
3265 prom_type: 0, 3163 prom_type: 0,
3266 isshow: 1, 3164 isshow: 1,
3267 }); 3165 });
3268 - // this.get_sku(os.stoid, this.data.data, gid); 3166 + this.get_sku(os.stoid, this.data.data, gid);
3269 this.get_sto(); 3167 this.get_sto();
3270 - // this.check_is_youhui(gid, 1); 3168 + this.check_is_youhui(gid, 1);
3271 this.data.is_normal = 1; 3169 this.data.is_normal = 1;
3272 }, 3170 },
3273 -  
3274 - 3171 +
3275 //获取redis中的数量 3172 //获取redis中的数量
3276 async getactLen() { 3173 async getactLen() {
3277 let prom_type = this.data.options.prom_type; 3174 let prom_type = this.data.options.prom_type;
@@ -3286,167 +3183,199 @@ Page({ @@ -3286,167 +3183,199 @@ Page({
3286 }; 3183 };
3287 }) 3184 })
3288 }, 3185 },
3289 -  
3290 -  
3291 -  
3292 -  
3293 - //--------检查是否活动，活动是否开始，或者是否结束-------  
3294 - async check_prom(gid, prom_type, prom_id) {  
3295 - var ee = this, th = ee;  
3296 - var user_id = getApp().globalData.user_id;  
3297 - if (!user_id) user_id = 0;  
3298 -  
3299 - if (prom_type == 1 && prom_id == 0) {  
3300 - this.setData({  
3301 - prom_type: 0, isshow: 1,  
3302 - });  
3303 -  
3304 - //获取门店  
3305 - this.get_sto();  
3306 - // this.get_sku(o.stoid, this.data.data, gid);  
3307 - this.check_has_flash();  
3308 - this.data.is_normal = 1;  
3309 - // this.check_is_youhui(gid, 1);  
3310 - return false;  
3311 - }  
3312 -  
3313 - //---判断秒杀----  
3314 - if (prom_type == 1 && prom_id > 0) {  
3315 - //-------判断活动是否抢光---------  
3316 - await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" + os.stoid + "/" + prom_type + "/" + prom_id, {  
3317 - 1: 1  
3318 - }).then(res => {  
3319 - var em = res;  
3320 - if (em.data.code == 0) {  
3321 -  
3322 - if (em.data.data <= 0) {  
3323 - th.setData({  
3324 - prom_r_null: 1,  
3325 - goodsInputNum: res.data.data,  
3326 - });  
3327 -  
3328 - // th.setData({goodsInputNum: redis_num})  
3329 - };  
3330 - //拿取价格并且判断时间--  
3331 - getApp().request.get("/api/ms/flash_sale/getNew/" + os.stoid + "/" + user_id + "/" + prom_id, {  
3332 - success: function (t) {  
3333 - th.setData({  
3334 - sele_g: t.data.data,  
3335 - });  
3336 -  
3337 - if (t.data.code != 0) {  
3338 - ee.get_normal(gid);  
3339 - return false;  
3340 - }  
3341 - //----已经结束-----  
3342 - if (t.data.data.is_end == 1) {  
3343 - ee.get_normal(gid);  
3344 - return false;  
3345 - }  
3346 - //----已经过期-----  
3347 - var now = ut.gettimestamp();  
3348 - if (t.data.data.end_time < now) {  
3349 - ee.get_normal(gid);  
3350 - return false;  
3351 - }  
3352 - /*-- 还没有开始预热的也不显示 --*/  
3353 - if (t.data.data.show_time > now) {  
3354 - ee.get_normal(gid);  
3355 - return false;  
3356 - }  
3357 -  
3358 - var t_gd = ee.data.data;  
3359 - var prom_end_time = ut.formatTime(t.data.data.end_time, "yyyy-MM-dd hh:mm:ss");  
3360 - var prom_start_time = ut.formatTime(t.data.data.start_time, "yyyy-MM-dd hh:mm:ss");  
3361 -  
3362 - ee.setData({  
3363 - prom_price: t.data.data.user_price,  
3364 - prom_type: 1,  
3365 - prom_id: prom_id,  
3366 - prom_buy_limit: t.data.data.buy_limit,  
3367 - prom_act: t.data.data,  
3368 - prom_end_time: prom_end_time,  
3369 - prom_start_time: prom_start_time,  
3370 - isshow: 1,  
3371 - });  
3372 -  
3373 - ee.get_sto();  
3374 - var newTime = ut.gettimestamp();  
3375 - var endTime2 = t.data.data.end_time;  
3376 - var endTime1 = t.data.data.start_time;  
3377 - if (endTime1 > newTime) {  
3378 - ee.setData({  
3379 - prom_time_text: '距秒杀开始还有',  
3380 - prom_st: 0,  
3381 - })  
3382 - ee.countDown(endTime1, 0);  
3383 - } else {  
3384 - if (endTime2 > newTime) {  
3385 - ee.setData({  
3386 - prom_time_text: '距秒杀结束还有',  
3387 - prom_st: 1  
3388 - })  
3389 - ee.countDown(endTime2);  
3390 - }  
3391 - }  
3392 -  
3393 - //如果是进行中的话  
3394 - if (endTime1 < newTime) {  
3395 - //-- 获取秒杀活动的多少规格 --  
3396 - ee.get_more_flash(function (list) {  
3397 - if (list && list.length > 1) {  
3398 -  
3399 - var n_item = list[0];  
3400 - var ind = list.findIndex(function (ele) {  
3401 - return ele.goods_id == ee.data.data.goods_id;  
3402 - })  
3403 - if (ind < 0) return false;  
3404 - if (ind > 0) {  
3405 - n_item = JSON.parse(JSON.stringify(list[ind]));  
3406 - list.splice(ind, 1);  
3407 - list.unshift(n_item);  
3408 - }  
3409 -  
3410 - ee.data.sele_g.viplimited = n_item.viplimited;  
3411 - ee.data.data.viplimited = n_item.viplimited;  
3412 -  
3413 - var gb = 1;  
3414 - //-- 显示多规格 --  
3415 - for (let i in list) {  
3416 - let item = list[i];  
3417 - var gg = "";  
3418 - if (item.goods_spec == "null" || item.goods_spec == null) item.goods_spec = "";  
3419 - if (item.goods_color == "null" || item.goods_color == null) item.goods_color = "";  
3420 -  
3421 - if (item.goods_spec != "" && item.goods_color != "") {  
3422 - gg = item.goods_spec + "/" + item.goods_color;  
3423 - } else if (item.goods_spec != "" || item.goods_color != "") {  
3424 - gg = item.goods_spec + item.goods_color;  
3425 - } else {  
3426 - gg = "规格" + gb;  
3427 - gb++;  
3428 - }  
3429 - item.gg = gg;  
3430 - item.prom_id = item.prom_id;  
3431 - item.prom_type = 1;  
3432 - }  
3433 -  
3434 - ee.setData({  
3435 - sku_g: list,  
3436 - });  
3437 -  
3438 - }  
3439 - })  
3440 - }  
3441 -  
3442 - }  
3443 - });  
3444 - }  
3445 - })  
3446 - }  
3447 -  
3448 - },  
3449 - 3186 +
  3187 +
  3188 +
  3189 + //--------检查是否活动，活动是否开始，或者是否结束-------
  3190 + async check_prom(gid, prom_type, prom_id) {
  3191 + var ee = this, th = ee;
  3192 + var user_id = getApp().globalData.user_id;
  3193 + if (!user_id) user_id = 0;
  3194 + //-------判断活动是否抢光---------
  3195 + await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" + os.stoid + "/6/" + prom_id, {
  3196 + 1: 1
  3197 + }).then(res => {
  3198 + var em = res;
  3199 + var flag = null;
  3200 + if (em.data.code == 0) {
  3201 + if (em.data.data <= 0) ee.setData({
  3202 + prom_r_null: 1
  3203 + });
  3204 + //拿取价格并且判断时间--
  3205 + getApp().request.get("/api/weshop/teamlist/get/" +
  3206 + os.stoid + "/" + prom_id, {
  3207 + success: async function (t) {
  3208 + if (t.data.code != 0) {
  3209 + ee.get_normal(gid);
  3210 + return false;
  3211 + }
  3212 + //----已经结束-----
  3213 + if (t.data.data.is_end == 1) {
  3214 + ee.get_normal(gid);
  3215 + return false;
  3216 + }
  3217 + //----已经过期-----
  3218 + var now = ut.gettimestamp();
  3219 + if (t.data.data.end_time < now) {
  3220 + ee.get_normal(gid);
  3221 + return false;
  3222 + }
  3223 +
  3224 + /*-- 还没有开始预热的也不显示 --*/
  3225 + if (t.data.data.show_time > now) {
  3226 + ee.get_normal(gid);
  3227 + return false;
  3228 + }
  3229 +
  3230 + /*-- 判断拼单是否启用 --*/
  3231 + if (!t.data.data.is_show) {
  3232 + console.log('没启用');
  3233 + wx.setNavigationBarTitle({
  3234 + title: '系统提示',
  3235 + });
  3236 + wx.showToast({
  3237 + title: '此商品暂时没有拼单活动',
  3238 + icon: 'none',
  3239 + success(){
  3240 + setTimeout(() => {
  3241 + wx.navigateBack()
  3242 + }, 2000)
  3243 + }
  3244 + });
  3245 + return false
  3246 + }
  3247 +
  3248 + //判断拼团的---会员身份--
  3249 + await getApp().request.promiseGet("/api/weshop/teamlist/pageteam/2", {
  3250 + data: {
  3251 + store_id: os.stoid,
  3252 + is_end: 0,
  3253 + is_show: 1,
  3254 + user_id: getApp().globalData.user_id,
  3255 + pageSize: 1000
  3256 + }
  3257 + }).then(res => {
  3258 + let pd_list = res.data.data.pageData;
  3259 + if (res.data.code == 0 && pd_list.length > 0) {
  3260 + flag = pd_list.some(pd => {
  3261 + return pd.goods_id == gid
  3262 + })
  3263 + }
  3264 + })
  3265 + if (!flag) {
  3266 + ee.get_normal(gid);
  3267 + return false;
  3268 +
  3269 + }
  3270 + //-------查看自己是不是有买过该团的商品，并还为支付，或者在进行中-------
  3271 + await getApp().request.promiseGet("/api/weshop/order/page", {
  3272 + data: {
  3273 + pt_prom_id: prom_id,
  3274 + user_id: oo.user_id,
  3275 + store_id: os.stoid,
  3276 + pageSize: 1,
  3277 + page: 1
  3278 + }
  3279 + }).then(e => {
  3280 + if (e.data.code == 0 && e.data.data.pageData.length > 0) {
  3281 + var odr = e.data.data.pageData[0];
  3282 + th.data.buy_order = odr;
  3283 + if (odr.pt_status == 0 && odr.order_status == 1) {
  3284 + th.setData({
  3285 + user_order_pt_state: 1
  3286 + });
  3287 + }
  3288 + if (odr.pt_status == 1 && odr.order_status == 1) {
  3289 + if (odr.is_zsorder == 4) {
  3290 + getApp().request.promiseGet("/api/weshop/teamgroup/page/", {
  3291 + data: {
  3292 + store_id: os.stoid,
  3293 + team_id: odr.pt_prom_id,
  3294 + listno: odr.pt_listno
  3295 + }
  3296 + }).then(res => {
  3297 + var now = ut.gettimestamp();
  3298 + if (res.data.code == 0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length > 0) {
  3299 + var tgr = res.data.data.pageData[0];
  3300 + //如果团的时间已经到了
  3301 + if (now >= tgr.kt_end_time) {
  3302 + th.update_jiti(tgr.id);
  3303 + } else {
  3304 + th.setData({
  3305 + user_order_pt_state: 2
  3306 + });
  3307 + }
  3308 + }
  3309 + })
  3310 +
  3311 + } else {
  3312 + th.setData({
  3313 + user_order_pt_state: 2
  3314 + });
  3315 + }
  3316 + }
  3317 +
  3318 + if (odr.pt_status == 2 && odr.is_zsorder == 4) {
  3319 + th.setData({
  3320 + user_order_pt_state: 3,
  3321 + });
  3322 + th.data.wk_order_id = odr.order_id;
  3323 + }
  3324 + }
  3325 + })
  3326 +
  3327 + //----------查看阶梯团------------
  3328 + if (t.data.data.ct_rylist != "null" && t.data.data.ct_rylist != "" && t.data.data.ct_rylist != null && t.data.data.ct_rylist != undefined) {
  3329 + t.data.data.ct_rylist = JSON.parse(t.data.data.ct_rylist);
  3330 + var max_num = 0;
  3331 + t.data.data.ct_rylist.forEach(function (val, ind) {
  3332 + if (parseInt(val.rynum) > max_num) max_num = parseInt(val.rynum);
  3333 + })
  3334 + t.data.data.max_ct_num = max_num;
  3335 + }
  3336 +
  3337 + var prom_end_time = ut.formatTime(t.data.data.end_time, "yyyy-MM-dd hh:mm:ss");
  3338 + var prom_start_time = ut.formatTime(t.data.data.start_time, "yyyy-MM-dd hh:mm:ss");
  3339 +
  3340 + ee.setData({
  3341 + prom_price: t.data.data.price,
  3342 + prom_type: 6,
  3343 + prom_id: prom_id,
  3344 + prom_buy_limit: t.data.data.buy_limit,
  3345 + prom_act: t.data.data,
  3346 + prom_end_time: prom_end_time,
  3347 + prom_start_time: prom_start_time,
  3348 + isshow: 1,
  3349 + });
  3350 +
  3351 + ee.get_sto();
  3352 +
  3353 + var newTime = now;
  3354 + var endTime2 = t.data.data.end_time;
  3355 + var endTime1 = t.data.data.start_time;
  3356 +
  3357 + if (endTime1 > newTime) {
  3358 + ee.setData({
  3359 + prom_time_text: '距拼单开始还剩:'
  3360 + })
  3361 + ee.countDown(endTime1, 0);
  3362 + } else {
  3363 + if (endTime2 > newTime) {
  3364 + ee.setData({
  3365 + prom_time_text: '距拼单结束还剩:',
  3366 + prom_st: 1
  3367 + })
  3368 + ee.countDown(endTime2);
  3369 + }
  3370 + }
  3371 + //-------查看有多少人在开这个团-------
  3372 + th.get_team_group(prom_id);
  3373 + }
  3374 + });
  3375 + }
  3376 + })
  3377 +
  3378 + },
3450 3379
3451 3380
3452 viewFlash(e) { 3381 viewFlash(e) {
@@ -3657,7 +3586,7 @@ Page({ @@ -3657,7 +3586,7 @@ Page({
3657 // this.setData({openSpecModal_flash_normal: 1}); 3586 // this.setData({openSpecModal_flash_normal: 1});
3658 // } else { 3587 // } else {
3659 // th.get_sto(1); 3588 // th.get_sto(1);
3660 - // th.get_sku(o.stoid, th.data.data, th.data.gid, 1, function () { 3589 + // th.get_sku(os.stoid, th.data.data, th.data.gid, 1, function () {
3661 // th.setData({ 3590 // th.setData({
3662 // openSpecModal_flash_normal: 1 3591 // openSpecModal_flash_normal: 1
3663 // }); 3592 // });
@@ -4057,8 +3986,7 @@ Page({ @@ -4057,8 +3986,7 @@ Page({
4057 } 3986 }
4058 } 3987 }
4059 } 3988 }
4060 -  
4061 - //if (this.data.data.goods.is_virtual) return this.buyVirtualGoods(d); 3989 +
4062 if ("add" == t.currentTarget.dataset.action) { 3990 if ("add" == t.currentTarget.dataset.action) {
4063 3991
4064 if (th.data.prom_goods) { 3992 if (th.data.prom_goods) {
@@ -4203,8 +4131,7 @@ Page({ @@ -4203,8 +4131,7 @@ Page({
4203 th.buyNow(newd); 4131 th.buyNow(newd);
4204 } 4132 }
4205 }, 4133 },
4206 -  
4207 - 4134 +
4208 click_contact:function () { 4135 click_contact:function () {
4209 getApp().globalData.no_clear=1; 4136 getApp().globalData.no_clear=1;
4210 }, 4137 },
@@ -4236,9 +4163,7 @@ Page({ @@ -4236,9 +4163,7 @@ Page({
4236 hiddenCS: true, 4163 hiddenCS: true,
4237 }); 4164 });
4238 }, 4165 },
4239 -  
4240 -  
4241 - 4166 +
4242 //--点击弹起拼单-- 4167 //--点击弹起拼单--
4243 openSpecModel_pt: function (e) { 4168 openSpecModel_pt: function (e) {
4244 4169
@@ -4274,7 +4199,7 @@ Page({ @@ -4274,7 +4199,7 @@ Page({
4274 }); 4199 });
4275 } else { 4200 } else {
4276 th.get_sto(1); 4201 th.get_sto(1);
4277 - th.get_sku(o.stoid, th.data.data, th.data.gid, 1, function () { 4202 + th.get_sku(os.stoid, th.data.data, th.data.gid, 1, function () {
4278 th.setData({ 4203 th.setData({
4279 is_normal: ind, 4204 is_normal: ind,
4280 openSpecModal_pt: 1 4205 openSpecModal_pt: 1
@@ -4342,22 +4267,63 @@ Page({ @@ -4342,22 +4267,63 @@ Page({
4342 }) 4267 })
4343 } 4268 }
4344 }, 4269 },
4345 -  
4346 -  
4347 -  
4348 -  
4349 -  
4350 -  
4351 4270
4352 -  
4353 -  
4354 - 4271 + //--获取有多少人在开团--
  4272 + async get_team_group(prom_id) {
  4273 + var teamgroup = [],
  4274 + th = this,
  4275 + grounp_tatal = 0;
  4276 + //如果活动是开团不是商家团
  4277 + if (this.data.prom_act.kttype > 1) {
4355 4278
4356 -  
4357 -  
4358 - 4279 + var req_data = {
  4280 + store_id: os.stoid,
  4281 + pageSize: 3,
  4282 + page: 1,
  4283 + state: 2,
  4284 + team_id: prom_id,
  4285 + ordernum: 1
  4286 + };
  4287 +
  4288 + if (this.data.prom_act.kttype == 3 && this.data.prom_act.max_ct_num) {
  4289 + req_data.max_num = this.data.prom_act.max_ct_num;
  4290 + }
  4291 +
  4292 + //获取活动从表信息team_id
  4293 + await getApp().request.promiseGet("/api/weshop/teamgroup/page", {
  4294 + data: req_data
  4295 + }).then(res => {
  4296 + teamgroup = res.data.data.pageData;
  4297 + grounp_tatal = res.data.data.total;
  4298 + })
  4299 + //获取订单的总数这个接口不能用
  4300 + for (i = 0; i < teamgroup.length; i++) {
  4301 + await getApp().request.promiseGet("/api/weshop/order/page", {
  4302 + data: {
  4303 + store_id: os.stoid,
  4304 + pt_status: 1,
  4305 + pt_listno: teamgroup[i].listno
  4306 + }
  4307 + }).then(res => {
  4308 + var order = res.data.data.pageData;
  4309 + teamgroup[i].open_num = order.length;
  4310 + })
  4311 + await getApp().request.promiseGet("/api/weshop/users/get/" + os.stoid + "/" + teamgroup[i].openvipid, {}).then(res => {
  4312 + var user = res.data.data;
  4313 + teamgroup[i].user = user;
  4314 + })
  4315 + }
  4316 +
  4317 + if (teamgroup.length > 0) {
  4318 + th.setData({
  4319 + teamgroup: teamgroup,
  4320 + grounp_tatal: grounp_tatal
  4321 + });
  4322 + th.countDown2();
  4323 + }
  4324 + }
  4325 + },
4359 4326
4360 -  
4361 }); 4327 });
4362 4328
4363 4329
packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxml
  View file @f34e333
@@ -751,154 +751,6 @@ @@ -751,154 +751,6 @@
751 <nav_box></nav_box> 751 <nav_box></nav_box>
752 </block> 752 </block>
753 753
754 -<!-- 弹起来,选择规格数量,普通商品购买和秒杀 -->  
755 -<view hidden="{{!openSpecModal}}">  
756 - <view bindtap="closeSpecModal" class="cover-layer"></view>  
757 - <view class="spec-model">  
758 - <view class="pding">  
759 -  
760 - <icon bindtap="closeSpecModal" class="modal-close" color="black" size="22" type="cancel"></icon>  
761 -  
762 -  
763 - <view class="spec-goods">  
764 - <image class="wh100 spec-img" src="{{iurl}}{{data.image_url?data.image_url:'miniapp/images/default_g_img.gif'}}"  
765 - binderror="pop_err_img" data-errorimg="data.image_url" />  
766 - <view class="spec-goods-info">  
767 - <view class="spec-goods-name ellipsis-2">{{data.goods_name}}</view>  
768 - <view class="flex ai_end xc-val-money">  
769 - <view class="spec-goods-price">  
770 - <text class="fs20">￥</text>  
771 - <block wx:if="{{options.prom_type == 1}}">{{prom_price}}</block>  
772 - <block wx:else>{{data.shop_price}}</block>  
773 - </view>  
774 - </view>  
775 - </view>  
776 - </view>  
777 -  
778 -  
779 -  
780 - <!-- 选择门店模块 -->  
781 - <view class="flex-space-between address ai_end xc-width" style="padding-top: 30rpx;">  
782 - <view class="flex ai_end" wx:if="{{def_pick_store && def_pick_store.pickup_name}}">  
783 - <text class="fs30 xc-black3 shop_name">{{def_pick_store.pickup_name}}</text>  
784 - <view class="distance fs24 xc-ash" wx:if="{{def_pick_store.distance!=null}}">  
785 - 距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}}</view>  
786 - </view>  
787 -  
788 - <!-- 没有门店的时候 -->  
789 - <view class="flex" bindtap="choice_store" wx:else>  
790 - <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image>  
791 - <view class="fs30" style="color:black;">选择门店</view>  
792 - </view>  
793 -  
794 - <view class="red-co fs28" bindtap="choice_store">更多门店<text class="right-arrow"></text></view>  
795 - </view>  
796 -  
797 -  
798 -  
799 - <view wx:if="{{only_pk && !only_pk.length}}">(库存不足)</view>  
800 - <block wx:else>  
801 - <view wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">(库存不足)</view>  
802 - <block wx:else>  
803 - <view class="no_store" wx:if="{{def_pick_store.is_no_dis}}">(配送不匹配)</view>  
804 - <view wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && sales_rules==2 && prom_type==0}}">(库存不足)</view>  
805 - </block>  
806 - </block>  
807 -  
808 - <view class="fs24 xc-ash-9f xc-distance-top " wx:if="{{def_pick_store && def_pick_store.fulladdress}}">地址:{{def_pick_store.fulladdress}}</view>  
809 - </view>  
810 -  
811 -  
812 -  
813 - <view class="b_num">  
814 - <view>购买数量</view>  
815 - <view class="count">  
816 - <view class="sub {{goodsInputNum <= 1 ? 'active':''}}" wx:if="{{goodsInputNum <= 1}}">-</view>  
817 - <view bindtap="subCartNum" class="sub" wx:else>-</view>  
818 - <input bindblur="inputCartNum" type="number" value="{{goodsInputNum}}"></input>  
819 - <view bindtap="addCartNum" class="add">+</view>  
820 - </view>  
821 - </view>  
822 -  
823 -  
824 -  
825 - <view class="spec-cart-btns">  
826 - <view wx:if="{{def_pick_store && def_pick_store.is_no_dis}}" class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">配送不匹配</view>  
827 - <block wx:else>  
828 -  
829 - <!-- 根本就找不到门店 -->  
830 - <block wx:if="{{!only_pk && !def_pickpu_list}}">  
831 - <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">库存不足</view>  
832 - </block>  
833 - <block wx:else>  
834 -  
835 -  
836 - <block wx:if="{{only_pk.length && !only_pk.length}}">  
837 - <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">库存不足</view>  
838 - </block>  
839 - <block wx:else>  
840 - <block wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">  
841 - <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">库存不足</view>  
842 - </block>  
843 - <block wx:else>  
844 - <block wx:if="{{!def_pick_store}}">  
845 - <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">请先选择门店</view>  
846 - </block>  
847 - <block wx:else>  
848 - <!-- 如果是线下库存购买的时候,且是普通商品购买的时候 -->  
849 - <block wx:if="{{sales_rules==2 && prom_type==0}}">  
850 - <block wx:if="{{!def_pick_store.CanOutQty}}">  
851 - <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">库存不足</view>  
852 - </block>  
853 - <block wx:else>  
854 - <view wx:if="{{openSpecModal_ind==1}}" bindtap="addCart" data-openSpecModal_ind="{{openSpecModal_ind}}" class="spec-cart-btn yellow fs32" data-action="add">加入购物车</view>  
855 - <view wx:if="{{openSpecModal_ind==2}}" bindtap="addCart" data-openSpecModal_ind="{{openSpecModal_ind}}" class="spec-cart-btn spec-buy" data-action="buy">  
856 - {{sele_g.offline_price?"券后购买":"立即购买"}}  
857 - </view>  
858 - </block>  
859 - </block>  
860 - <!-- 线上销售 -->  
861 - <block wx:else>  
862 - <block wx:if="{{sele_g.store_count<=0}}">  
863 - <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">库存不足</view>  
864 - </block>  
865 - <block wx:else>  
866 - <view wx:if="{{openSpecModal_ind==1}}" bindtap="addCart" data-openSpecModal_ind="{{openSpecModal_ind}}" class="spec-cart-btn yellow fs32 {{!sto_sele_name?'gray':''}}"  
867 - data-action="add">加入购物车</view>  
868 - <!-- 秒杀 -->  
869 - <block wx:if="{{options.prom_type == 1}}">  
870 - <view wx:if="{{openSpecModal_ind==2}}" bindtap="addCart" data-openSpecModal_ind="{{openSpecModal_ind}}" class="spec-cart-btn spec-buy {{!sto_sele_name?'gray':''}}"  
871 - data-action="buy" data-promtype="{{options.prom_type}}" data-promid="{{options.prom_id}}">  
872 - {{sele_g.offline_price?"券后购买":"立即购买"}}  
873 - </view>  
874 - </block>  
875 -  
876 - <!-- 普通商品 -->  
877 - <block wx:else>  
878 - <view wx:if="{{openSpecModal_ind==2}}" bindtap="addCart" data-openSpecModal_ind="{{openSpecModal_ind}}" class="spec-cart-btn spec-buy {{!sto_sele_name?'gray':''}}"  
879 - data-action="buy">  
880 - {{sele_g.offline_price?"券后购买":"立即购买"}}  
881 - </view>  
882 - </block>  
883 -  
884 - </block>  
885 - </block>  
886 - </block>  
887 - </block>  
888 - </block>  
889 - </block>  
890 -  
891 - </block>  
892 - </view>  
893 -  
894 -  
895 -  
896 - <view class="clear"></view>  
897 -  
898 - </view>  
899 -</view>  
900 -  
901 -  
902 754
903 <!-- 选择门店的弹框，1.1版最新的 --> 755 <!-- 选择门店的弹框，1.1版最新的 -->
904 <block wx:if="{{store==1}}"> 756 <block wx:if="{{store==1}}">
packageD/pages/AI-test-skin/success_result/success_result.js
  View file @f34e333
@@ -451,7 +451,7 @@ Page({ @@ -451,7 +451,7 @@ Page({
451 //--- 判断是等级会员，且在有效期范围内 --- 451 //--- 判断是等级会员，且在有效期范围内 ---
452 if (user.card_field && now < end) { 452 if (user.card_field && now < end) {
453 var card_name = ob.name_map.get(user.card_field); 453 var card_name = ob.name_map.get(user.card_field);
454 - if (card_name.length > 4) card_name = card_name.substring(0, 8); 454 + if ( card_name && card_name.length > 4) card_name = card_name.substring(0, 8);
455 th.setData({ 455 th.setData({
456 card_field: user.card_field, 456 card_field: user.card_field,
457 card_name: card_name, 457 card_name: card_name,
@@ -1164,7 +1164,8 @@ Page({ @@ -1164,7 +1164,8 @@ Page({
1164 'uid': getApp().globalData.user_id, 1164 'uid': getApp().globalData.user_id,
1165 'cid': cid, 1165 'cid': cid,
1166 'store_id': setting.stoid, 1166 'store_id': setting.stoid,
1167 - 'type': 5 1167 + 'type': 5,
  1168 + 'skinface_id':this.data.id
1168 }; 1169 };
1169 1170
1170 //-- 导购ID -- 1171 //-- 导购ID --
pages/cart/cart2/cart2.wxss
  View file @f34e333
@@ -1133,7 +1133,7 @@ margin-left: 20rpx; @@ -1133,7 +1133,7 @@ margin-left: 20rpx;
1133 padding-bottom: 5rpx; 1133 padding-bottom: 5rpx;
1134 } 1134 }
1135 1135
1136 -.circle{ width: 50rpx;height: 50rpx; border-radius: 50%; margin-right: 10rpx; 1136 +.circle1{ width: 50rpx;height: 50rpx; border-radius: 50%; margin-right: 10rpx;
1137 border: 3rpx solid #c8162c;color: #c8162c;text-align: center; line-height: 50rpx} 1137 border: 3rpx solid #c8162c;color: #c8162c;text-align: center; line-height: 50rpx}
1138 1138
1139 .sear_box::before{ 1139 .sear_box::before{
pages/goods/goodsInfo/goodsInfo.js
  View file @f34e333
@@ -1148,6 +1148,17 @@ Page({ @@ -1148,6 +1148,17 @@ Page({
1148 }); 1148 });
1149 1149
1150 1150
  1151 + if ("add" == t.currentTarget.dataset.action && getApp().is_sp_hao()) {
  1152 + wx.showToast({
  1153 + title: "视频号商品不允许加入购物车",
  1154 + icon: 'none',
  1155 + duration: 2000
  1156 + });
  1157 + return false;
  1158 + }
  1159 +
  1160 +
  1161 +
1151 //如果是秒杀的话，要看redis够不够 1162 //如果是秒杀的话，要看redis够不够
1152 if (this.data.prom_type == 1 || this.data.prom_type == 2) { 1163 if (this.data.prom_type == 1 || this.data.prom_type == 2) {
1153 1164
@@ -2053,6 +2064,16 @@ Page({ @@ -2053,6 +2064,16 @@ Page({
2053 openSpecModel: function (t) { 2064 openSpecModel: function (t) {
2054 var th = this; 2065 var th = this;
2055 var open_store = t.currentTarget.dataset.ind; 2066 var open_store = t.currentTarget.dataset.ind;
  2067 +
  2068 + if(getApp().is_sp_hao() && open_store==1){
  2069 + wx.showToast({
  2070 + title: "视频号商品不允许加入购物车",
  2071 + icon: 'none',
  2072 + duration: 2000
  2073 + });
  2074 + return false;
  2075 + }
  2076 +
2056 this.setData({ 2077 this.setData({
2057 store: 0, 2078 store: 0,
2058 choice_sort_store: 0, 2079 choice_sort_store: 0,