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

taiyuan
2 parents 961b4330 bc61693e
Showing 8 changed files with 37 additions and 34 deletions
components/diy_seckill/diy_seckill.js
packageC/pages/presell/goodsInfo/goodsInfo.js
pages/cart/cart2/cart2.wxml
pages/cart/cart2/cart2.wxss
pages/cart/cart2/zh_calculate.js
pages/goods/goodsInfo/goodsInfo.wxml
pages/goods/goodsInfo/goodsInfo.wxss
pages/user/order_list/order_list.js
@@ -76,9 +76,12 @@ Component({
           })
           goodsidlist = ut.sub_last(goodsidlist);
+          var user_id=getApp().globalData.user_id;
+          if(!user_id){ user_id=0;}
+
           //--调用接口,读取秒杀--
           app.request.promiseGet("/api/ms/flash_sale/getGoodsList?store_id="
-            + os.stoid + "&goodsidlist=" + goodsidlist, {}).then(res => {
+            + os.stoid + "&goodsidlist=" + goodsidlist+"&user_id"+user_id, {}).then(res => {
               console.log(res);
               //如果秒杀的数组为空的时候    
               var goodslist = res.data.data;
@@ -118,6 +121,7 @@ Component({
         g_id.forEach(function (val, ind) {
           goodslist.forEach(function (vy, indy) {
             if (val.goodsid == vy.goods_id) {
+              if(!vy.id) vy.id=vy.prom_id;
               all_array.push(vy);
             }
           })
@@ -3936,7 +3936,7 @@ Page({
         }
         var userInfo = getApp().globalData.userInfo;
-        var pre_data = {store_id: os.stoid, is_end: 0, timetype: 1, isuse: 1, prom_type: 8, prom_id: presell_id};
+        var pre_data = {store_id: os.stoid, is_end: 0, timetype: 1, isuse: 1, prom_type: 8, prom_id: presell_id,pageSize:1000};
         if (userInfo) {
             pre_data.user_id = userInfo.user_id;
         }
@@ -78,8 +78,11 @@
 				</view>
 				<view class="order-detail" wx:for="{{item.goods}}" wx:for-index="idx" wx:for-item="items">
 					<!----商品图片----->
-					<view class="goods-img" style="position: relative">
+					<view class="goods-img" style="position: relative; overflow: hidden">
 						<image wx:if="{{items.is_gift}}" src="{{imgUrl}}/miniapp/images/giveaway.png" class="gift_image"></image>
+						<text class="zuhe" wx:if="{{items.prom_type==7}}">组合购</text>
+
+
 						<image class="wh100 bdr14" src="{{items.original_img}}" binderror='cart_set_err' data-err='cartlist[{{pidx}}].goods[{{idx}}].original_img'></image>
 					</view>
 					<!----商品名称规格---->
@@ -89,15 +92,9 @@
 						<view class="flex-vertical fs28 color-gray n_guige">
 							<view class="goods-color">
 								<block><text>{{filters.show_gui_ge(items.goods_spec,items.goods_color)}}</text></block>
-								<!--<block wx:if="{{!items.goods_spec && !items.goods_color}}"><text>规格1</text></block>-->
-								<!--<block wx:else>-->
-								<!--<text wx:if="{{items.goods_spec!=''}}">{{items.goods_spec}}<text wx:if="{{items.goods_color}}">/</text></text>-->
-								<!--<text wx:if="{{items.goods_color}}">{{items.goods_color}}</text>-->
-								<!--</block>-->
 							</view>
 						</view>
-
 						<!-----商品名称规格------>
 						<view class="order-num flex-space-between">
 							<view class="co-red">￥<text class="fs36">{{filters.toFix(items.goods_price,2)}}</text></view>
@@ -19,9 +19,6 @@
 	box-shadow: 16rpx 0px 12px #e7e9eb;
 }
-
-
-
 page {
 	/* background-color: #FAFAFA; */
 	background-color: #F0F0F0;
@@ -995,3 +992,16 @@ margin-left: 20rpx;
   top:36rpx
 }
+.zuhe {
+    width: 140rpx;
+    text-align: center;
+    height:40rpx;
+    position: absolute;
+    top: 15rpx;
+    left: -37rpx;
+    transform: rotate(-45deg);
+    background-color: rgb(255,0,0);
+    font-size:22rpx;
+    color: #fff;
+    line-height: 37rpx;
+}
@@ -193,6 +193,11 @@ module.exports = {
                         new_g.prom_type = 0;
                         new_g.prom_id = 0;
                         goods.push(new_g);
+
+                        //如果商品的数量已经为空了
+                        if(goods[idx].goods_num<=0){
+                            goods.splice(idx,1);
+                        }
                     }
                 }
@@ -289,8 +289,7 @@
                 </view>
               </view>
               <view class="fs32 xc-black3 ai_and carde_frame">
-                <text class="fs26">￥</text>
-                {{g_filters.get_card_price(data,card_list,0)}}
+                <text class="fs26">￥</text>{{g_filters.get_card_price(data,card_list,0)}}
               </view>
             </view>
             <!-- 等级卡的显示,购买, 等级卡近30天要显示续费 -->
@@ -308,10 +307,7 @@
                     <view class="card-effect">
                       <view class="fs24 xc-black3">
                         成为{{g_filters.get_card_price(data,card_list,1)}}立
-                        <text class="co-red">
-                          省{{filters.toFix(data.shop_price-g_filters.get_card_price(data,card_list,0),2)}}
-                        </text>
-                        元
+                        <text class="co-red">省{{filters.toFix(data.shop_price-g_filters.get_card_price(data,card_list,0),2)}}</text>元
                       </view>
                       <view class="fs22 xc-ash">开通会员 尽享更多优惠</view>
                     </view>
@@ -355,8 +351,8 @@
               </view>
             </view>
             <view class="goods-num" wx:if="{{prom_type!=1}}">
-              <view class="sales">销量：{{sele_g.sales_sum}}件</view>
-              <view class="stock">折扣：{{sele_g.disc}}折</view>
+              <view class="sales">销量：{{data.sales_sum}}件</view>
+              <view class="stock">折扣：{{data.disc}}折</view>
               <view class="stock">{{categories3[0].num}}人评价</view>
             </view>
             <view wx:if="{{prom_type==1}}">
@@ -420,10 +416,7 @@
                 <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image>
                 <view class="fs30" style="color:black;">选择门店</view>
               </view>
-              <view class="red_bb fs26">
-                更多门店
-                <text class="bg_jj"></text>
-              </view>
+              <view class="red_bb fs26">更多门店<text class="bg_jj"></text></view>
             </view>
             <view wx:if="{{def_pick_store && def_pick_store.pickup_name}}">
               <view class="flex-space-between address ai_end pdv10">
@@ -1113,10 +1106,7 @@
             <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image>
             <view class="fs30" style="color:black;">选择门店</view>
           </view>
-          <view class="red-co fs28" bindtap="choice_store">
-            更多门店
-            <text class="right-arrow"></text>
-          </view>
+          <view class="red-co fs28" bindtap="choice_store">更多门店<text class="right-arrow"></text></view>
         </view>
         <view wx:if="{{only_pk && !only_pk.length}}">(库存不足)</view>
         <block wx:else>
@@ -1384,10 +1374,7 @@
             <icon bindtap="close_popup" class="modal-closes" color="black" size="22" type="cancel"></icon>
           </view>
           <view class="felx choose_more" bindtap="more_store">
-            <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>
+            <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>
           </view>
         </view>
       </view>
@@ -2690,7 +2690,7 @@ border-radius: 55rpx;
 }
 .carde_frame{
   height: 50rpx;
-  line-height: 18rpx
+  /* line-height: 18rpx */
 }
 button.custom-service { line-height: normal; border: 0;}
@@ -1205,7 +1205,7 @@ Page({
                                     b_item.prom_type = 7;
                                     b_item.prom_id = res.data.data.id;
                                     good.prom_type = 7;
-                                    good.prom_id = prom.b_item.prom_id;
+                                    good.prom_id = b_item.prom_id;
                                 }
                             }