wxd / MShopWeApp

Commit 303fb7b4ce77db911ac3c711c53b14ffedbbb108

Authored by taiyuan
2 parents 287ec49a dc197526

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

Inline Side-by-side
Showing 7 changed files with 20 additions and 18 deletions
components/diy_seckill/diy_seckill.js
  View file @303fb7b
... ... @@ -132,7 +132,7 @@ Component({
132 132 }
133 133  
134 134 for(let i in all_array){
135   - let item=data[i];
  135 + let item=all_array[i];
136 136 if(item.user_price) item.price=item.user_price;
137 137 }
138 138  
... ...
components/userqy_pop_up/userqy_pop_up.js
  View file @303fb7b
... ... @@ -28,9 +28,4 @@ Component({
28 28 },
29 29  
30 30 },
31   -
32   -
33   -
34   -
35   -
36 31 })
37 32 \ No newline at end of file
... ...
packageB/pages/zuhegou/index/index.js
  View file @303fb7b
... ... @@ -2004,7 +2004,7 @@ Page({
2004 2004 await getApp().request.promiseGet("/api/weshop/ordergoods/getUserBuyGoodsNum", {
2005 2005 data: {
2006 2006 store_id: os.stoid,
2007   - user_id: user_id,
  2007 + user_id: oo.user_id,
2008 2008 goods_id: item_j.goods_id,
2009 2009 prom_type: 7,
2010 2010 prom_id: th.data.act.id
... ...
pages/goods/goodsInfo/goodsInfo.wxml
  View file @303fb7b
... ... @@ -392,7 +392,9 @@
392 392 <view class="goods-num" wx:if="{{prom_type==1}}">
393 393 <block wx:if="prom_st>0">
394 394 <view class="stock">总数量：{{prom_act.goods_num+prom_act.virtual}}件</view>
395   - <view class="stock">限购:{{prom_act.buy_limit}}件</view>
  395 + <view class="stock" wx:if="{{prom_act.buy_limit>0}}">限购:{{prom_act.buy_limit}}件</view>
  396 + <view class="stock" wx:else>限购:不限</view>
  397 +
396 398 <block wx:if="{{prom_st==0}}">
397 399 <view class="sales">已购:0件</view>
398 400 </block>
... ... @@ -402,7 +404,8 @@
402 404 </block>
403 405 <block wx:else>
404 406 <view class="stock">总数量：{{prom_act.goods_num}}件</view>
405   - <view class="stock">限购:{{prom_act.buy_limit}}件</view>
  407 + <view class="stock" wx:if="{{prom_act.buy_limit>0}}">限购:{{prom_act.buy_limit}}件</view>
  408 + <view class="stock" wx:else>限购:不限</view>
406 409 <view class="sales">已购:{{prom_act.buy_num}}件</view>
407 410 </block>
408 411 </view>
... ...
pages/goods/goodsList/g_filter.wxs
  View file @303fb7b
... ... @@ -81,12 +81,13 @@ var g_filters = {
81 81 },
82 82 //跳转的接口
83 83 get_goods_url:function(item){
84   -
85   - console.log(item,111)
86 84 var url1="/pages/goods/goodsInfo/goodsInfo?goods_id="+item.goods_id
87 85 if(item.prom_type==8){
88   - url1="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id="+item.goods_id+"&prom_id="+item.prom_id
89   - }
  86 + url1="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id="+item.goods_id+"&prom_id="+item.prom_id
  87 + }
  88 + if(item.prom_type==1){
  89 + url1="/pages/goods/goodsInfo/goodsInfo?goods_id="+item.goods_id+"&prom_id="+item.prom_id+"&prom_type=1";
  90 + }
90 91 return url1;
91 92 }
92 93 }
... ...
pages/goods/search/g_filter.wxs
  View file @303fb7b
... ... @@ -83,11 +83,14 @@ var g_filters = {
83 83  
84 84  
85 85 get_goods_url:function(item){
86   - console.log(item,111)
  86 +
87 87 var url1="/pages/goods/goodsInfo/goodsInfo?goods_id="+item.goods_id
88 88 if(item.prom_type==8){
89 89 url1="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id="+item.goods_id+"&prom_id="+item.prom_id
90 90 }
  91 + if(item.prom_type==1){
  92 + url1="/pages/goods/goodsInfo/goodsInfo?goods_id="+item.goods_id+"&prom_id="+item.prom_id+"&prom_type=1";
  93 + }
91 94 return url1;
92 95 }
93 96 }
... ...
pages/index/index/index.wxml
  View file @303fb7b
... ... @@ -153,9 +153,9 @@
153 153 </view>
154 154 </navigator>
155 155 <view class="seckill-list">
156   - <swiper class="s_prom" indicator-dots="{{false}}" bindchange="flashSwiperChange" next-margin="105rpx">
157   - <swiper-item wx:for="{{saleGoods}}" wx:key="{{index}}" class="p_swiper" wx:key="saleGoods" style="750rpx !important;">
158   - <navigator class="nav" hover-class="none" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{aitem.goods_id}}&title={{aitem.goods_name}}&prom_type=1&prom_id={{aitem.id}}" wx:for="{{item}}" wx:key="item" wx:for-item="aitem" wx:for-index="aind">
  156 + <swiper class="s_prom" indicator-dots="{{false}}" bindchange="flashSwiperChange">
  157 + <swiper-item wx:for="{{saleGoods}}" wx:key="{{index}}" class="p_swiper" wx:key="saleGoods" style="740rpx !important;padding: 0; margin-left: 10rpx">
  158 + <navigator style="flex-shrink: 0;width: 247rpx" class="nav" hover-class="none" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{aitem.goods_id}}&title={{aitem.goods_name}}&prom_type=1&prom_id={{aitem.id}}" wx:for="{{item}}" wx:key="item" wx:for-item="aitem" wx:for-index="aind">
159 159 <view class="imgview ">
160 160 <image src="{{url+aitem.original_img}}" mode="aspectFill" lazy-load="true" data-errorimg="saleGoods[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3" data-img="{{aitem.original_img}}"></image>
161 161  
... ... @@ -163,7 +163,7 @@
163 163 <image wx:if="{{aitem.status==1}}" class="status_img" src="{{url}}/miniapp/images/miao/going.png"></image>
164 164 <image wx:if="{{aitem.status==2}}" class="status_img" src="{{url}}/miniapp/images/miao/mend.png"></image>
165 165 </view>
166   - <view class="ellipsis-2 mar-top10" style="height: 70rpx;">{{aitem.goods_name}}</view>
  166 + <view class="ellipsis-2 mar-top10" style="height: 76rpx;">{{aitem.goods_name}}</view>
167 167 <!-- <view class="red-co mar-top10 is_seckill_height"> -->
168 168 <view class="co-red mar-top10">
169 169 <text class="fs20">￥</text>{{aitem.price}}
... ...