diff --git a/components/long_warn/long_warn.wxml b/components/long_warn/long_warn.wxml
index 2eef76d..2b61726 100644
--- a/components/long_warn/long_warn.wxml
+++ b/components/long_warn/long_warn.wxml
@@ -1,9 +1,11 @@
 <view class="rim" wx:if="{{is_show}}">
    <view class="content flex-center">
          <view  class="con_view" style="width:{{width>0?width+'rpx':'auto'}}">
-             <view class="con_view_img">
-                 <image wx:if="{{type}}" src="{{iurl}}/miniapp/images/sucess_g.png"></image><!-- 成功 -->
-                 <image wx:else src="{{iurl}}/miniapp/images/gt.png"></image>               <!-- 失败 -->
+             <view class="con_view_img flex ai_c jc-center">
+                 <view wx:if="{{type}}" class="circle-box flex ai_c jc-center">
+                     <text  class="iconfont icon-dagou"></text>
+                 </view><!-- 成功 -->
+                 <text wx:else class="iconfont icon-info" style="font-size: 78rpx"></text>               <!-- 失败 -->
              </view>
              <view class="msg">{{val}}</view>
          </view>
diff --git a/components/long_warn/long_warn.wxss b/components/long_warn/long_warn.wxss
index d1546f4..f2b4b45 100644
--- a/components/long_warn/long_warn.wxss
+++ b/components/long_warn/long_warn.wxss
@@ -1,3 +1,4 @@
+@import '../../app.wxss';
 .cover-layer {
   position: fixed;
   left: 0;
@@ -21,8 +22,15 @@
 .con_view{
   min-width:180rpx; max-width: 720rpx; width: auto; padding: 40rpx 30rpx; background-color: #000; border-radius:22rpx; text-align: center;
 }
-.con_view .con_view_img{ height: 120rpx;}
+.con_view .con_view_img{ height: 120rpx; color: #fff}
 .con_view image{ width: 84rpx; height: 84rpx;}
 .msg{
    color:#fff; font-size: 32rpx
 }
+
+.circle-box{
+   width: 80rpx;
+   height: 80rpx;
+   border: 1rpx solid #fff;
+   border-radius: 50%;
+}
diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js
index 9ad10ab..f33c404 100644
--- a/pages/cart/cart/cart.js
+++ b/pages/cart/cart/cart.js
@@ -2417,6 +2417,16 @@ Page({
 
     //--------------去结算------------
     async checkout() {
+
+        if(getApp().is_sp_hao()){
+            wx.showToast({
+                title: "视频号不支持购物车购买",
+                icon: 'none',
+                duration: 2000
+            });
+            return false;
+        }
+
         if (!this.data.total_num || this.data.total_num <= 0) return false;
         if (!this.data.is_load) return false;
         if (this.data.up_dating) {
diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js
index 4d8099c..58715ff 100644
--- a/pages/cart/cart2/cart2.js
+++ b/pages/cart/cart2/cart2.js
@@ -1234,7 +1234,7 @@ Page({
                                 if(parseInt(get_data.zp_mode)==1){
                                     if(!send_gf[pickid])  send_gf[pickid]=[];
                                     send_gf[pickid].push({
-                                        pickup_id:pickid,giftsinfo:get_data.giftsinfo,zp_num:get_data.zp_num,
+                                        pickup_id:pickid,giftsinfo:get_data.giftsinfo,zp_num:get_data.zp_num*get_data.bs,
                                         gf_pr_name:item_map.name,prom_id:item_map.prom_id});
                                 }
                             }
@@ -4048,10 +4048,13 @@ Page({
                 arr.s_coupon_id = get_data.coupon_id;
                 arr.s_coupon_num = get_data.coupon_num;
                 arr.zp_mode = get_data.zp_mode;
-                arr.zp_num = get_data.zp_num;
+                arr.zp_num = get_data.zp_num?get_data.zp_num:1; //确保默认一个
 
                 //-- 看是不是有赠品 --
-                if (get_data.gift_id && parseInt(get_data.zp_mode)!=1){
+                if (get_data.gift_id && parseInt(get_data.zp_mode)!=1
+                    && get_data.zp_num* arr.bs<=get_data.limit_num
+                    && get_data.zp_num* arr.bs<=get_data.gift_storecount
+                ){
                     arr.gift_id = get_data.gift_id;
                     arr.gift_goods_id = get_data.goods_id;
                     arr.gift_goods_name = get_data.goods_name;
@@ -4078,7 +4081,7 @@ Page({
                 if(parseInt(get_data.zp_mode)==1){
                     if(!send_gf[pickid])  send_gf[pickid]=[];
                     send_gf[pickid].push({
-                        pickup_id:pickid,giftsinfo:get_data.giftsinfo,zp_num:get_data.zp_num,
+                        pickup_id:pickid,giftsinfo:get_data.giftsinfo,zp_num:get_data.zp_num*get_data.bs,
                         gf_pr_name:prom.name,prom_id:prom.prom_id});
                     th.setData({send_gf:send_gf});
                 }
@@ -4471,6 +4474,25 @@ Page({
            }
        },
 
+
+        //输入框输入数量的时候
+    valueToNum:function (e){
+            var th=this;
+            var idx=e.currentTarget.dataset.item;
+            var gift_item=this.data.giftsinfo[idx];
+            var num=parseInt(e.detail.value);
+            var txt="giftsinfo["+idx+"].goods_num";
+            var is_true=th.check_out_num_cart(gift_item,this.data.gift_pkid,num);
+            if(!is_true){
+                th.setData({[txt]:1});
+                return false;
+            }
+            th.setData({[txt]:num});
+
+        },
+
+
+
        addNum:function (e) {
            var th=this;
            var idx=e.currentTarget.dataset.item;
@@ -4548,7 +4570,7 @@ Page({
        // 这里是保证所有的赠品部会超出 --
        if (discount.gift_storecount < all_num ) {
            wx.showToast({
-               title: "礼包库存不足",
+               title: "赠品库存不足",
                icon: 'none',
                duration: 2000
            });
@@ -4662,10 +4684,13 @@ Page({
            var set_data = this.data.send_gf[gf_pickup_id][this.data.send_gf_index];
            set_data.selected = 1;
            var txt9 = "cartlist[" + index + "].goods";
-           var txt1 = "send_gf[" + gf_pickup_id + "][" + this.data.send_gf_index + "]";
-           th.setData({[txt9]: new_pk_list_goods, [txt1]: set_data});
+
+           th.setData({[txt9]: new_pk_list_goods, send_gf: this.data.send_gf});
            this.data.old_cartlist[index].goods = new_pk_list_goods;
 
+
+           console.log(this.data.send_gf,"----");
+
            th.calculatePrice();
        }else{
            var new_pk_list_goods=[];
diff --git a/pages/cart/cart2/cart2.wxml b/pages/cart/cart2/cart2.wxml
index f169230..213583b 100644
--- a/pages/cart/cart2/cart2.wxml
+++ b/pages/cart/cart2/cart2.wxml
@@ -202,7 +202,7 @@
 							  data-pk="{{item.pickup_id}}" data-index="{{index}}"
 							  bindtap="show_sele_gift" >
 						<view class="flex ai_c">
-							<view class="circle">赠</view>{{iter.name}}  可选赠品{{iter.zp_num}}个
+							<view class="circle1">赠</view>{{iter.name}}  可选赠品{{iter.zp_num}}个
 						</view>
 
 						<view class="flex ai_c" wx:if="{{iter.selected}}">
@@ -391,7 +391,7 @@
 						  data-pk="{{bn_pick}}" data-index="{{index}}"
 						  bindtap="show_sele_gift" >
 						<view class="flex ai_c">
-							<view class="circle">赠</view>{{iter.name}}  可选赠品{{iter.zp_num}}个
+							<view class="circle1">赠</view>{{iter.name}}  可选赠品{{iter.zp_num}}个
 						</view>
 
 						<view class="flex ai_c" wx:if="{{iter.selected}}">
@@ -729,6 +729,7 @@
 		{{gf_pr_name}}，可以获赠一下任意{{zp_num}}件商品
 	</view>
 	<!-- 赠品选择 -->
+	<scroll-view scroll-y="{{true}}" style="height:calc(100% - 300rpx);">
 	<view class="order-item"  hidden="{{items.hide_div}}" data-item="{{idx}}" wx:for="{{giftsinfo}}" wx:for-item="items" wx:for-index="idx">
 
 		<view bindtap="check_th_item" class="order-raido flex-vertical " data-check="{{items.selected?items.selected:0}}" data-item="{{idx}}">
@@ -758,13 +759,14 @@
 					<view class="count">
 						<view bindtap="{{items.goods_num <= 1 ? '':'subNum'}}" class="sub fs28 {{items.goods_num <= 1 ? 'active':''}}" data-pitems="{{pidx}}" data-item="{{idx}}">一</view>
 						<input class="goodadd" bindblur="valueToNum"  data-item="{{idx}}"
-							   bindinput="refresh_input" type="number" value="{{items.goods_num}}"></input>
+							   bindinput="refresh_input" data-item="{{idx}}" type="number" value="{{items.goods_num}}"></input>
 						<view class="add" bindtap="addNum"  data-item="{{idx}}">+</view>
 					</view>
 				</view>
 
 		</view>
 	</view>
+	</scroll-view>
     <!-- 确认选择 -->
 	<view class="pay-for flex-vertical-between" style="bottom: 0">
 		<view></view>
diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index c478891..82a693b 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -505,7 +505,7 @@
 								    <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}}">送商品{{tool.repl(item.goods_name)}}</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>
 								    <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>