Commit 1a9785043d44a088e8ac655c7d1ee2dff1c072ce
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
Showing
8 changed files
with
37 additions
and
34 deletions
components/diy_seckill/diy_seckill.js
| ... | ... | @@ -76,9 +76,12 @@ Component({ |
| 76 | 76 | }) |
| 77 | 77 | goodsidlist = ut.sub_last(goodsidlist); |
| 78 | 78 | |
| 79 | + var user_id=getApp().globalData.user_id; | |
| 80 | + if(!user_id){ user_id=0;} | |
| 81 | + | |
| 79 | 82 | //--调用接口,读取秒杀-- |
| 80 | 83 | app.request.promiseGet("/api/ms/flash_sale/getGoodsList?store_id=" |
| 81 | - + os.stoid + "&goodsidlist=" + goodsidlist, {}).then(res => { | |
| 84 | + + os.stoid + "&goodsidlist=" + goodsidlist+"&user_id"+user_id, {}).then(res => { | |
| 82 | 85 | console.log(res); |
| 83 | 86 | //如果秒杀的数组为空的时候 |
| 84 | 87 | var goodslist = res.data.data; |
| ... | ... | @@ -118,6 +121,7 @@ Component({ |
| 118 | 121 | g_id.forEach(function (val, ind) { |
| 119 | 122 | goodslist.forEach(function (vy, indy) { |
| 120 | 123 | if (val.goodsid == vy.goods_id) { |
| 124 | + if(!vy.id) vy.id=vy.prom_id; | |
| 121 | 125 | all_array.push(vy); |
| 122 | 126 | } |
| 123 | 127 | }) | ... | ... |
packageC/pages/presell/goodsInfo/goodsInfo.js
| ... | ... | @@ -3936,7 +3936,7 @@ Page({ |
| 3936 | 3936 | } |
| 3937 | 3937 | |
| 3938 | 3938 | var userInfo = getApp().globalData.userInfo; |
| 3939 | - var pre_data = {store_id: os.stoid, is_end: 0, timetype: 1, isuse: 1, prom_type: 8, prom_id: presell_id}; | |
| 3939 | + var pre_data = {store_id: os.stoid, is_end: 0, timetype: 1, isuse: 1, prom_type: 8, prom_id: presell_id,pageSize:1000}; | |
| 3940 | 3940 | if (userInfo) { |
| 3941 | 3941 | pre_data.user_id = userInfo.user_id; |
| 3942 | 3942 | } | ... | ... |
pages/cart/cart2/cart2.wxml
| ... | ... | @@ -78,8 +78,11 @@ |
| 78 | 78 | </view> |
| 79 | 79 | <view class="order-detail" wx:for="{{item.goods}}" wx:for-index="idx" wx:for-item="items"> |
| 80 | 80 | <!----商品图片-----> |
| 81 | - <view class="goods-img" style="position: relative"> | |
| 81 | + <view class="goods-img" style="position: relative; overflow: hidden"> | |
| 82 | 82 | <image wx:if="{{items.is_gift}}" src="{{imgUrl}}/miniapp/images/giveaway.png" class="gift_image"></image> |
| 83 | + <text class="zuhe" wx:if="{{items.prom_type==7}}">组合购</text> | |
| 84 | + | |
| 85 | + | |
| 83 | 86 | <image class="wh100 bdr14" src="{{items.original_img}}" binderror='cart_set_err' data-err='cartlist[{{pidx}}].goods[{{idx}}].original_img'></image> |
| 84 | 87 | </view> |
| 85 | 88 | <!----商品名称规格----> |
| ... | ... | @@ -89,15 +92,9 @@ |
| 89 | 92 | <view class="flex-vertical fs28 color-gray n_guige"> |
| 90 | 93 | <view class="goods-color"> |
| 91 | 94 | <block><text>{{filters.show_gui_ge(items.goods_spec,items.goods_color)}}</text></block> |
| 92 | - <!--<block wx:if="{{!items.goods_spec && !items.goods_color}}"><text>规格1</text></block>--> | |
| 93 | - <!--<block wx:else>--> | |
| 94 | - <!--<text wx:if="{{items.goods_spec!=''}}">{{items.goods_spec}}<text wx:if="{{items.goods_color}}">/</text></text>--> | |
| 95 | - <!--<text wx:if="{{items.goods_color}}">{{items.goods_color}}</text>--> | |
| 96 | - <!--</block>--> | |
| 97 | 95 | </view> |
| 98 | 96 | </view> |
| 99 | 97 | |
| 100 | - | |
| 101 | 98 | <!-----商品名称规格------> |
| 102 | 99 | <view class="order-num flex-space-between"> |
| 103 | 100 | <view class="co-red">￥<text class="fs36">{{filters.toFix(items.goods_price,2)}}</text></view> | ... | ... |
pages/cart/cart2/cart2.wxss
| ... | ... | @@ -19,9 +19,6 @@ |
| 19 | 19 | box-shadow: 16rpx 0px 12px #e7e9eb; |
| 20 | 20 | } |
| 21 | 21 | |
| 22 | - | |
| 23 | - | |
| 24 | - | |
| 25 | 22 | page { |
| 26 | 23 | /* background-color: #FAFAFA; */ |
| 27 | 24 | background-color: #F0F0F0; |
| ... | ... | @@ -995,3 +992,16 @@ margin-left: 20rpx; |
| 995 | 992 | top:36rpx |
| 996 | 993 | } |
| 997 | 994 | |
| 995 | +.zuhe { | |
| 996 | + width: 140rpx; | |
| 997 | + text-align: center; | |
| 998 | + height:40rpx; | |
| 999 | + position: absolute; | |
| 1000 | + top: 15rpx; | |
| 1001 | + left: -37rpx; | |
| 1002 | + transform: rotate(-45deg); | |
| 1003 | + background-color: rgb(255,0,0); | |
| 1004 | + font-size:22rpx; | |
| 1005 | + color: #fff; | |
| 1006 | + line-height: 37rpx; | |
| 1007 | +} | ... | ... |
pages/cart/cart2/zh_calculate.js
pages/goods/goodsInfo/goodsInfo.wxml
| ... | ... | @@ -289,8 +289,7 @@ |
| 289 | 289 | </view> |
| 290 | 290 | </view> |
| 291 | 291 | <view class="fs32 xc-black3 ai_and carde_frame"> |
| 292 | - <text class="fs26">￥</text> | |
| 293 | - {{g_filters.get_card_price(data,card_list,0)}} | |
| 292 | + <text class="fs26">￥</text>{{g_filters.get_card_price(data,card_list,0)}} | |
| 294 | 293 | </view> |
| 295 | 294 | </view> |
| 296 | 295 | <!-- 等级卡的显示,购买, 等级卡近30天要显示续费 --> |
| ... | ... | @@ -308,10 +307,7 @@ |
| 308 | 307 | <view class="card-effect"> |
| 309 | 308 | <view class="fs24 xc-black3"> |
| 310 | 309 | 成为{{g_filters.get_card_price(data,card_list,1)}}立 |
| 311 | - <text class="co-red"> | |
| 312 | - 省{{filters.toFix(data.shop_price-g_filters.get_card_price(data,card_list,0),2)}} | |
| 313 | - </text> | |
| 314 | - 元 | |
| 310 | + <text class="co-red">省{{filters.toFix(data.shop_price-g_filters.get_card_price(data,card_list,0),2)}}</text>元 | |
| 315 | 311 | </view> |
| 316 | 312 | <view class="fs22 xc-ash">开通会员 尽享更多优惠</view> |
| 317 | 313 | </view> |
| ... | ... | @@ -355,8 +351,8 @@ |
| 355 | 351 | </view> |
| 356 | 352 | </view> |
| 357 | 353 | <view class="goods-num" wx:if="{{prom_type!=1}}"> |
| 358 | - <view class="sales">销量：{{sele_g.sales_sum}}件</view> | |
| 359 | - <view class="stock">折扣：{{sele_g.disc}}折</view> | |
| 354 | + <view class="sales">销量：{{data.sales_sum}}件</view> | |
| 355 | + <view class="stock">折扣：{{data.disc}}折</view> | |
| 360 | 356 | <view class="stock">{{categories3[0].num}}人评价</view> |
| 361 | 357 | </view> |
| 362 | 358 | <view wx:if="{{prom_type==1}}"> |
| ... | ... | @@ -420,10 +416,7 @@ |
| 420 | 416 | <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image> |
| 421 | 417 | <view class="fs30" style="color:black;">选择门店</view> |
| 422 | 418 | </view> |
| 423 | - <view class="red_bb fs26"> | |
| 424 | - 更多门店 | |
| 425 | - <text class="bg_jj"></text> | |
| 426 | - </view> | |
| 419 | + <view class="red_bb fs26">更多门店<text class="bg_jj"></text></view> | |
| 427 | 420 | </view> |
| 428 | 421 | <view wx:if="{{def_pick_store && def_pick_store.pickup_name}}"> |
| 429 | 422 | <view class="flex-space-between address ai_end pdv10"> |
| ... | ... | @@ -1113,10 +1106,7 @@ |
| 1113 | 1106 | <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image> |
| 1114 | 1107 | <view class="fs30" style="color:black;">选择门店</view> |
| 1115 | 1108 | </view> |
| 1116 | - <view class="red-co fs28" bindtap="choice_store"> | |
| 1117 | - 更多门店 | |
| 1118 | - <text class="right-arrow"></text> | |
| 1119 | - </view> | |
| 1109 | + <view class="red-co fs28" bindtap="choice_store">更多门店<text class="right-arrow"></text></view> | |
| 1120 | 1110 | </view> |
| 1121 | 1111 | <view wx:if="{{only_pk && !only_pk.length}}">(库存不足)</view> |
| 1122 | 1112 | <block wx:else> |
| ... | ... | @@ -1384,10 +1374,7 @@ |
| 1384 | 1374 | <icon bindtap="close_popup" class="modal-closes" color="black" size="22" type="cancel"></icon> |
| 1385 | 1375 | </view> |
| 1386 | 1376 | <view class="felx choose_more" bindtap="more_store"> |
| 1387 | - <text class="fs26 red-co" wx:if="{{is_show_sto_cat}}"> | |
| 1388 | - {{choice_sort_store==0?'更多门店':'返回'}} | |
| 1389 | - </text> | |
| 1390 | - <view class="bg_rights" wx:if="{{is_show_sto_cat}}"></view> | |
| 1377 | + <text class="fs26 red-co" wx:if="{{is_show_sto_cat}}">{{choice_sort_store==0?'更多门店':'返回'}}</text> <view class="bg_rights" wx:if="{{is_show_sto_cat}}"></view> | |
| 1391 | 1378 | </view> |
| 1392 | 1379 | </view> |
| 1393 | 1380 | </view> | ... | ... |
pages/goods/goodsInfo/goodsInfo.wxss
pages/user/order_list/order_list.js