wxd / MShopWeApp

Commit e898473c1ce35d83d2b5d11f8d289a5c843500c0

Authored by WXD-SEASON\season
2 parents 0793d39d c8056f5a

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

Inline Side-by-side
Showing 4 changed files with 19 additions and 5 deletions
packageA/pages/goodsInfo/goodsInfo.js
  View file @e898473
... ... @@ -235,6 +235,8 @@ Page({
235 235 room_id = t.room_id,
236 236 room_user_share = t.room_user_share; //如果是会员分享带有room_id的话，那么接下来会员分享就不传room_id
237 237  
  238 + var share_openid= t.share_openid;
  239 +
238 240 //检查测肤
239 241 getApp().check_skin_face(t,1,gid);
240 242  
... ...
packageE/pages/cart/cart2/cart2.js
  View file @e898473
... ... @@ -1960,11 +1960,11 @@ Page({
1960 1960  
1961 1961 //--------循环计算商品是不是包邮，是不是使用优惠券,此时循环是商品从表-----------
1962 1962 for (var j = 0; j < ord_goods.length; j++) {
1963   - if (ord_goods[j].is_gift) continue;
1964 1963 if (ord_goods[j].whsle_id) continue;
1965 1964 if (ord_goods[j].prom_type == 3 && ord_goods[j].prom_id == item_map.prom_id) {
1966 1965 ord_goods[j].is_xz_yh = ord_goods[j].is_xz_yh ? ord_goods[j].is_xz_yh : item_map.is_xz_yh;
1967 1966 ord_goods[j].is_past = item_map.is_past;
  1967 + if (ord_goods[j].is_gift) continue; //赠品不平摊
1968 1968 ord_goods[j].account_fir = th.item_map_get_goods(ord_goods[j].goods_id, item_map).account_fir;
1969 1969 ord_goods[j].account_yu_fir = th.item_map_get_goods(ord_goods[j].goods_id, item_map).account_yu_fir;
1970 1970 ord_goods[j].account = th.item_map_get_goods(ord_goods[j].goods_id, item_map).account;
... ... @@ -6563,6 +6563,14 @@ Page({
6563 6563 is_post_temp:1 //赠品暂时的是要包邮运算， 后面和主商品是不是包邮一样
6564 6564 };
6565 6565  
  6566 + var prom_goods_map=th.data.prom_goods_map[gf_pickup_id];
  6567 + var fd=prom_goods_map[th.data.gf_prom_id];
  6568 +
  6569 + if(fd){
  6570 + newd.is_past=fd.is_past;
  6571 + newd.is_xz_yh=fd.is_xz_yh;
  6572 + }
  6573 +
6566 6574 //-- 如果是代发商品的时候 --
6567 6575 if (gf_item.goodsinfo.whsle_id) {
6568 6576 newd.whsle_id = gf_item.goodsinfo.whsle_id;
... ...
pages/goods/categoryList/categoryList.wxml
  View file @e898473
... ... @@ -131,11 +131,11 @@
131 131 <view class="search-img left">
132 132 <image class="wh100" src="{{iurl}}/miniapp/images/search.png"></image>
133 133 </view>
134   - <input bindfocus="goseach" class="search-cont" placeholder="输入商品关键字" type="text"></input>
  134 + <input bindfocus="goseach" class="search-cont" placeholder="请输入商品关键字" type="text"></input>
135 135 </view> -->
136 136 <!-- 搜索框 -->
137 137 <view class="search-container f1">
138   - <view bindtap="goseach"><text class="iconfont icon-sousuo pdr10"></text>输入商品关键字</view>
  138 + <view bindtap="goseach"><text class="iconfont icon-sousuo pdr10"></text>请输入商品关键字</view>
139 139 </view>
140 140 <view class="pdl30" bindtap="getScancode">
141 141 <image class="scanning_black-img" src="{{iurl}}/miniapp/images/goodscategory/scanning_black.png"></image>
... ...
pages/goods/goodsInfo/goodsInfo.js
  View file @e898473
... ... @@ -284,7 +284,11 @@ Page({
284 284 prom_id = t.prom_id || 0; //活动ID
285 285  
286 286 var share_openid = t.share_openid;
287   - //群id
  287 +
  288 + console.log("gd onload-- 3 --");
  289 + console.log(t);
  290 +
  291 + //群id
288 292 if(t && t.groupchat_id && !t.groupchat_id!='undefined' && !t.groupchat_id!='null'){
289 293 getApp().globalData.groupchat_id=t.groupchat_id
290 294 }
... ... @@ -378,7 +382,7 @@ Page({
378 382 gid: gid
379 383 });
380 384  
381   - console.log("gd onload--2");
  385 + console.log("gd onload-- 2 --");
382 386 console.log(first_leader);
383 387  
384 388 if (first_leader) {
... ...