后端研发-苏明海 · 后端研发-苏明海 · 后端研发-苏明海 · 后端研发-苏明海 · 后端研发-苏明海 · 后端研发-苏明海
Showing 9 changed files
app.json
packageD/pages/gift/gift.js
packageD/pages/gift/gift.json
packageD/pages/gift/gift.wxml
packageD/pages/gift/gift.wxss
pages/cart/cart2/cart2.js
pages/goods/goodsInfo/g_filter.wxs
pages/goods/goodsInfo/goodsInfo.js
pages/goods/goodsInfo/goodsInfo.wxml
@@ -122,8 +122,11 @@
                 "pages/details_serviceCard/details_serviceCard",
 								"pages/serviceCard_pd/goodsInfo/goodsInfo",
 								"pages/serviceCard_pd/team_show/team_show",
-								"pages/serviceCard_pd/cart/cart"
-            ]
+								"pages/serviceCard_pd/cart/cart",
+               "pages/serviceCard_pd/team_success/team_success"
+            ],
+
+            "plugins":{"live-player-plugin":{"version":"1.3.2","provider":"wx2b03c6e691cd7370"}}
         },
         {
             "root": "packageB/",
@@ -197,7 +200,8 @@
                 "pages/user/member/bring/msg/msg",
                 "pages/user/member/account/account",
                 "pages/user/member/account_unable/account_unable",
-                "pages/user/member/cash_record/cash_record"
+                "pages/user/member/cash_record/cash_record",
+                "pages/gift/gift"
             ]
         }
@@ -268,4 +272,5 @@
         "uploadFile":15000,
         "connectSocket":15000
     }
+
 }
 \ No newline at end of file
+var  os = getApp().globalData.setting,ut = require("../../../utils/util.js");
+var regeneratorRuntime = require('../../../utils/runtime.js');
+
+
+Page({
+  data: {
+      iurl:os.imghost
+  },
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad:async function (options) {
+      wx.showLoading();
+      var prom=null;
+      var prom_list=null;
+      //-- 获取活动 --
+      var url="/api/weshop/promgoods/get/"+os.stoid+"/"+options.prom_id;
+      await getApp().promiseGet(url,{}).then(res=>{
+          if(res.data.code==0){
+            prom=res.data.data;
+          }
+      })
+      //-- 获取活动列表 --
+      var url1="/api/weshop/promgoodslist/list";
+      var req_data={
+          prom_id:options.prom_id
+      }
+      await getApp().promiseGet(url1,{data:req_data}).then(res=>{
+          if(res.data.code==0){
+              prom_list=res.data.data;
+          }
+      })
+
+      var list=prom_list[options.index];
+      var rule=JSON.parse(list.preferential_type);
+
+      var gift_id=rule.gift;
+      var g_arr=gift_id.split(",");
+      var gift_goods=[];
+      for(let i in g_arr){
+      	   let item=g_arr[i];
+      	   var gift=null;
+      	   var good=null;
+      	   var url2="/api/weshop/prom/gift/page?store_id="+os.stoid+"&id="+item;
+           await getApp().promiseGet(url2,{}).then(res=>{
+              if(ut.ajax_ok(res)){
+                  gift=res.data.data.pageData[0];
+              }
+           })
+
+          var url3="/api/weshop/goods/get/"+os.stoid+"/"+gift.goods_id;
+          await getApp().promiseGet(url3,{}).then(res=>{
+              if(res.data.code==0){
+                  good=res.data.data;
+              }
+          })
+          gift_goods.push(good)
+      }
+
+      this.setData({
+          prom:prom,list:list,gift_goods:gift_goods,zp_num:rule.zp_num
+      })
+      wx.hideLoading();
+
+  },
+  /*** 生命周期函数--监听页面显示 */
+  onShow:function () {
+
+  },
+	
+
+	
+	
+
+  
+})
 \ No newline at end of file
+{
+	"enablePullDownRefresh": false,
+	"navigationBarTitleText": "赠品列表"
+}
 \ No newline at end of file
+<!-- 多赠品 -->
+<view class="duo_gift_sele">
+    <!-- top act_name -->
+    <view class="flex gift_top_v ai_c fs30" style="padding-left: 30rpx; margin: 20rpx 0">
+        {{prom.name}}，满{{list.condition}}{{list.prom_type==1?'件':'元'}},可任选{{zp_num}}件商品为赠品
+    </view>
+
+    <view class="gd_content">
+    <!-- 赠品选择 -->
+    <view class="order-item"   wx:for="{{gift_goods}}" wx:for-item="items" wx:for-index="idx">
+            <navigator class="goods-img rel" bindtap="go_gd" data-gd="{{items.goods_id}}">
+                <image class="wh100" src="{{iurl+items.original_img}}" binderror="bind_bnerr2" data-errorimg="gift_goods[{{idx}}].original_img"></image>
+            </navigator>
+            <view class="goods-cont">
+                <view class="goods-name">
+                    <navigator bindtap="go_gd" class="ellipsis-2 fs30" data-gd="{{items.goods_id}}">{{items.goods_name}}</navigator>
+                </view>
+                <view class="specifications  ellipsis-1">
+                    <view  wx:if="{{items.goods_color || items.goods_spec}}">
+                        {{items.goods_color}}{{items.goods_color?"/":''}}{{items.goods_spec}}</view>
+                    <view  wx:else>规格1</view>
+                </view>
+
+                <view class="flex ai_c">
+                    <view class="goods-price co-red  ellipsis-1">
+                        <view class="fs30">￥{{items.shop_price}}</view>
+                    </view>
+
+                    <view class="line_th fs22" style="color: #999; margin-left: 10rpx">￥{{items.market_price}}</view>
+                </view>
+
+            </view>
+        </view>
+    </view>
+
+</view>
+page{ background-color:#f0f0f0 }
+.gd_content{
+    background-color: #fff; border-top-left-radius: 20rpx; border-top-right-radius: 20rpx;
+}
+
+.order-item {
+    display: flex;
+    height: 246rpx;
+    border-top: 3rpx solid rgb(245, 245, 245);
+    align-items: center;
+    padding-right: 30rpx;
+}
+
+.goods-img {
+    float: left;
+    width: 200rpx;
+    height: 200rpx;
+    margin: 0 20rpx;
+}
+.goods-cont {
+    width: 420rpx;
+    height: 165rpx;
+    font-size: 28rpx;
+    margin-left: 35rpx;
+    padding-top: 7rpx;
+    padding-bottom: 5rpx;
+}
+.goods-name{
+    max-height: 60rpx;
+    line-height: 30rpx;
+    margin-bottom: 16rpx;
+    font-size:26rpx;
+    width: 490rpx;
+    display: -webkit-box;
+    word-break: break-all;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp:1;
+    overflow: hidden;
+    text-overflow:ellipsis;
+    height: 30rpx;
+    color: #1d1d1d;
+}
+.specifications {
+    padding: 3rpx 8rpx;
+    margin-top: 8rpx;
+    font-size: 22rpx;
+    max-width: 356rpx;
+    width: auto;
+    height: 30rpx;
+    line-height: 29rpx;
+    background-color: rgb(236, 236, 236);
+    border-radius: 8rpx;
+    white-space: nowrap;
+    color: rgb(63, 63, 63);
+    display: inline-block;
+}
+
+.line_th {
+    text-decoration: line-through;
+}
+
@@ -2428,11 +2428,11 @@ Page({
                 'shipping_code': th.data.bn_exp_type == 1 ? 0 : th.data.wu_arr[th.data.index].code,
                 'shipping_name': th.data.bn_exp_type == 1 ? '' : th.data.wu_arr[th.data.index].name,
                 'invoice_title': '',
-                'goods_price': th.data.formData.all_price,           //商品总价
-                'shipping_price': th.data.formData.shipping_price, //物流金额
-                'user_money': th.data.formData.user_money,         //使用余额
-                'total_amount': th.data.formData.total_amount,     //订单总价
-                'order_amount': th.data.formData.order_amount,     //应付
+                'goods_price': parseFloat(th.data.formData.all_price).toFixed(2),           //商品总价
+                'shipping_price': parseFloat(th.data.formData.shipping_price).toFixed(2), //物流金额
+                'user_money': parseFloat(th.data.formData.user_money).toFixed(2),         //使用余额
+                'total_amount': parseFloat(th.data.formData.total_amount).toFixed(2),     //订单总价
+                'order_amount': parseFloat(th.data.formData.order_amount).toFixed(2),     //应付
                 'user_note': th.data.user_note['0'] ? th.data.user_note['0'] : 0,             //用户备注
                 'store_id': oo.stoid,                //商家
                 'pickup_id': th.data.bn_pick,       //门店
@@ -2687,11 +2687,11 @@ Page({
                     'shipping_code': th.data.is_all_zt == 1 ? 0 : th.data.wu_arr[t_item.wind].code,
                     'shipping_name': th.data.is_all_zt == 1 ? '' : th.data.wu_arr[t_item.wind].name,
                     'invoice_title': '',
-                    'goods_price': t_item.goods_price,       //商品总价
-                    'shipping_price': t_item.shipping_price, //物流金额
-                    'user_money': t_item.user_money,         //使用余额
-                    'total_amount': t_item.total_amount,     //订单总价
-                    'order_amount': t_item.order_amount,     //应付
+                    'goods_price': parseFloat(t_item.goods_price).toFixed(2),       //商品总价
+                    'shipping_price': parseFloat(t_item.shipping_price).toFixed(2), //物流金额
+                    'user_money': parseFloat(t_item.user_money).toFixed(2),         //使用余额
+                    'total_amount': parseFloat(t_item.total_amount).toFixed(2),     //订单总价
+                    'order_amount': parseFloat(t_item.order_amount).toFixed(2),     //应付
                     'user_note': val_arr[i], //用户备注
                     'store_id': oo.stoid,                //商家
                     'pickup_id': t_item.pickup_id,       //门店
@@ -98,10 +98,17 @@ var g_filters = {
 			} else {
 				return value.toFixed(0);
 			};
-		}, 
+		},
+
+		is_more_gift:function(str){
+            var arr=str.split(",");
+            return arr.length;
+		}
+
 }
 module.exports = {
 	  is_has_rank:g_filters.is_has_rank,
 	  get_card_price:g_filters.get_card_price,
 		num:g_filters.num,
+		is_more_gift:g_filters.is_more_gift
 }
 \ No newline at end of file
@@ -6994,12 +6994,14 @@ Page({
 				hiddenCS: true,
 			});
 		},
-		
-		
-		
-		
-		
-		
+
+        //显示多赠品
+        show_zp:function (e) {
+            var prom_id=e.currentTarget.dataset.prom;
+            var index=e.currentTarget.dataset.index;
+            getApp().goto("/packageD/pages/gift/gift?prom_id="+prom_id+"&index="+index);
+        }
+
 })
@@ -505,8 +505,16 @@
 								    <text class="tick lh2 pdr20" wx:if="{{item.past==1}}">包邮</text>
 								    <text class="tick lh2 pdr20" wx:if="{{item.intValue>0}}">送{{item.intValue}}积分</text>
 								    <view class="tick lh2 pdr20" wx:if="{{item.couponId>0}}">送{{item.couponMoney}}元优惠券</view>
-								    <view class="tick ellipsis-1x lh2" wx:if="{{item.gift_id}}">送赠品</view>
-								    <view class="tick ellipsis-1x lh2 details pdr40" wx:if="{{item.lb_id>0}}" data-id="{{item.lb_id}}" bindtap="viewLbDetails">送{{item.lbtitle}}</view>
+
+                                    <block wx:if="{{item.gift_id}}">
+								       <view class="tick ellipsis-1x lh2 details pdr40" bindtap="show_zp" data-index="{{index}}"  data-prom="{{item.prom_id}}"
+                                             wx:if="{{g_filters.is_more_gift(item.gift_id)>1}}" >送赠品</view>
+								       <view class="tick ellipsis-1x lh2" wx:else >送{{item.goods_name}}</view>
+                                    </block>
+
+
+
+                                      <view class="tick ellipsis-1x lh2 details pdr40" wx:if="{{item.lb_id>0}}" data-id="{{item.lb_id}}" bindtap="viewLbDetails">送{{item.lbtitle}}</view>
 								    <view class="tick ellipsis-1x lh2 details pdr40" wx:if="{{item.zxlb_id>0}}" data-id="{{item.zxlb_id}}" data-flag="1" bindtap="viewLbDetails">送{{item.zxlbtitle}}</view>
 								  </view>
 								</view>
@@ -1282,7 +1290,7 @@
         <text wx:if="{{hui_condition.past==1}}">，包邮</text>
         <text wx:if="{{hui_condition.intValue>0}}">，送{{hui_condition.intValue}}积分</text>
         <text wx:if="{{hui_condition.couponId>0}}">，送优惠券</text>
-        <text wx:if="{{hui_condition.gift_id>0}}">，送赠品</text>
+        <text wx:if="{{hui_condition.gift_id}}">，送赠品</text>
         <text wx:if="{{hui_condition.lb_id>0}}">，送礼包</text>
         <text wx:if="{{hui_condition.zxlb_id>0}}">，送专享礼包</text>
       </view>