Merge branch 'dev' into 'test'

Dev See merge request !215

Merge branch 'dev' into 'test'
Dev See merge request !215
后端研发-苏明海
2 parents dd31553a 3152bb36
Showing 11 changed files with 430 additions and 369 deletions
components/diy_goodsGroup/diy_goodsGroup.wxss
components/diy_pingd_buy/diy_pingd_buy.wxml
components/diy_pingd_buy/diy_pingd_buy.wxss
components/diy_seckill/diy_seckill.wxml
components/diy_seckill/diy_seckill.wxss
pages/giftpack/buygiftpack/giftpackbuy.js
pages/giftpack/buygiftpack/giftpackbuy.wxml
pages/giftpack/giftpacklist/giftpacklist.js
pages/giftpack/giftpacklist/giftpacklist.wxml
pages/giftpack/mygiftpack/mygiftpack.js
pages/giftpack/mygiftpack/mygiftpack.wxml
@@ -262,6 +262,9 @@
   float: left;
   background: #fff;
   margin-left: 1%;
+  border:1rpx solid rgb(214, 214, 214);
+  border-radius: 25rpx;
+  margin-top: 10rpx;
 }
 .zs_goods_2l {
 <!--pages/wp/wp.wxml-->
 <block wx:if="goods_array.length>0">
   <!--拼单-->
-  <view class='top_p'>
+  <view class='top_p' bindtap="go_to_pindlist">
     <view class="top">
       <view class='t_left_p'></view>
       <view class='t_ms_p'>拼单</view>
     </view>
-    <view class='right_p' bindtap="go_to_pindlist">
+    <view class='right_p'>
       <image src="{{iurl}}/miniapp/images/icon-arrowdown.png" lazy-load="true"></image>
     </view>
   </view>
@@ -2,6 +2,7 @@
 .top{
   display: flex;
   align-items: center;
+  font-size: 32rpx;
 }
 .top_p {
   padding:0rpx 20rpx;
@@ -227,7 +228,7 @@ swiper {
 }
 .o1_right_p .sp_wzi_p {
-  font-size: 36rpx;
+  font-size: 30rpx;
   margin-bottom: 6rpx;
   width: 100%;
   text-align: left;
@@ -240,7 +241,7 @@ swiper {
 .o1_right_p .o1_sj_p {
   height: 60rpx;
-  font-size: 28rpx;
+  font-size: 26rpx;
   line-height: 40rpx;
 }
@@ -254,7 +255,7 @@ swiper {
 .o1_right_p .sp_jg_p {
   color: #c4182e;
-  font-size: 36rpx;
+  font-size: 30rpx;
   overflow: hidden;
   display: inline-block;
   margin-right: 10rpx;
@@ -277,12 +278,12 @@ swiper {
 .o1_right_p .wo_p {
   background-color: #c4182e;
-  width: 160rpx;
-  height: 60rpx;
-  line-height: 60rpx;
+  width: 150rpx;
+  height: 55rpx;
+  line-height: 55rpx;
   color: white;
   text-align: center;
-  font-size: 32rpx;
+  font-size: 30rpx;
   border-radius: 14rpx;
   position: absolute;
   right: 0;
@@ -341,23 +342,24 @@ swiper {
 }
 .o1_sj_p .time_img {
-  width: 40rpx;
-  height: 40rpx;
+  width: 35rpx;
+  height: 35rpx;
   vertical-align: top;
   margin-right: 10rpx;
 }
 .o1_right_p .co-red2 {
-  font-size: 30rpx;
+  font-size: 26rpx;
   color: #999;
 }
 .o1_right_p .co-red2 .yituan_num {
-  font-size: 30rpx;
+  font-size: 26rpx;
   margin-right: 10rpx;
   color: #333;
 }
 .money{
    display: flex;
    align-items: center;
+   margin:5rpx 0rpx;
 }
 \ No newline at end of file
 <block wx:if="goods_array.length>0">
   <!--秒杀-->
-  <view class='top'>
+  <view class='top' bindtap="go_to_skill">
     <view class="flex">
       <view class='t_left'></view>
       <view class='t_ms'>秒杀</view>
-      </view>
-        <view class='right_k' bindtap="go_to_skill">
-          <image src="{{imghost}}/miniapp/images/icon-arrowdown.png" lazy-load="true"></image>
-        </view>
-      </view>
-
-      <!--商品展示-->
-      <swiper class="s_prom" indicator-active-color='red' indicator-dots="false" wx:if="{{object.style==1}}">
-        <view class='sp' wx:if="{{object.style==1}}">
-          <swiper-item class="s_it" wx:for="{{goods_array}}">
-            <block wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind">
-              <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{aitem.goods_id}}" class="s1_gk_a1">
-                <view class='one'>
-                  <view class='sp_top'>
-                    <view class='po'></view>
-                    <block wx:if="{{aitem.start_time>newTime}}">
-                      <span class='s_top_kill' style="background-color: #ffe718;color: #3c3b31;font-weight: bold">即将开始</span>
-                    </block>
-                    <block wx:if="{{aitem.start_time<newTime && aitem.goods_num>aitem.buy_num}}">
-                      <span class='s_top_kill'>火热进行</span>
-                    </block>
-                    <block wx:if="{{aitem.goods_num<=aitem.buy_num}}">
-                      <span class='s_top_kill gray'>已抢光</span>
-                    </block>
-
-                    <view class='clear'></view>
-
-                    <view class='s_img'>
-                      <image src="{{imghost+aitem.original_img}}" data-errorimg="goods_array[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3"></image>
-                    </view>
-
-                    <view class='s_foot_kill'>
-                      <text>{{aitem.djs.day}}天</text>
-                      <text>{{aitem.djs.hou}}时</text>
-                      <text>{{aitem.djs.min}}分</text>
-                      <text>{{aitem.djs.sec}}秒</text>
-                    </view>
-                    <view class='clear'></view>
-
+    </view>
+    <view class='right_k'>
+      <image src="{{imghost}}/miniapp/images/icon-arrowdown.png" lazy-load="true"></image>
+    </view>
+  </view>
+
+  <!--商品展示-->
+  <swiper class="s_prom" indicator-active-color='red' indicator-dots="false" wx:if="{{object.style==1}}">
+    <view class='sp' wx:if="{{object.style==1}}">
+      <swiper-item class="s_it" wx:for="{{goods_array}}">
+        <block wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind">
+          <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{aitem.goods_id}}" class="s1_gk_a1">
+            <view class='one'>
+              <view class='sp_top'>
+                <view class='po'></view>
+                <block wx:if="{{aitem.start_time>newTime}}">
+                  <view class="rob">
+                    <span class='s_top_kill' style="background-color: #ffe718;color: #3c3b31;font-weight: bold">即将开始</span>
                   </view>
-
-                  <view class='sp_wz'>
-                    <view class='sp_wzi'>{{aitem.goods_name}}</view>
-                    <view class='sp_jg'>￥{{aitem.price}}</view>
-                    <view class='sp_jgx'>￥{{aitem.market_price}}</view>
+                </block>
+                <block wx:if="{{aitem.start_time<newTime && aitem.goods_num>aitem.buy_num}}">
+                  <view class="rob">
+                    <span class='s_top_kill'>火热进行</span>
+                  </view>
+                </block>
+                <block wx:if="{{aitem.goods_num<=aitem.buy_num}}">
+                  <view class="rob">
+                    <span class='s_top_kill gray'>已抢光</span>
                   </view>
+                </block>
-                </view>
-              </navigator>
-            </block>
-          </swiper-item>
-        </view>
-      </swiper>
-
-      <view class="sp2" wx:if="{{object.style==2}}">
-        <block wx:for="{{goods_array}}">
-          <block wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind">
-            <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{aitem.goods_id}}" class="s1_gk_a1">
-              <view class='one1'>
-
-                <view class="o1_img">
+                <view class='clear'></view>
+
+                <view class='s_img'>
                   <image src="{{imghost+aitem.original_img}}" data-errorimg="goods_array[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3"></image>
                 </view>
-                <view class="o1_right">
-                  <view class="sp_wzi">{{aitem.goods_name}}</view>
-                  <view class="o1_sj_kill">
-                    <text>{{aitem.djs.day}}</text> 天
-                    <text>{{aitem.djs.hou}}</text> :
-                    <text>{{aitem.djs.min}}</text> :
-                    <text>{{aitem.djs.sec}}</text>
+                <view class='s_foot_kill'>
+                  <text>{{aitem.djs.day}}天</text>
+                  <text>{{aitem.djs.hou}}时</text>
+                  <text>{{aitem.djs.min}}分</text>
+                  <text>{{aitem.djs.sec}}秒</text>
+                </view>
+                <view class='clear'></view>
-                  </view>
-                  <view class="money">
-                    <view class='sp_jg'>￥{{aitem.price}}</view>
-                    <view class='sp_jgx'>￥{{aitem.market_price}}</view>
-                  </view>
-                  <block wx:if="{{aitem.start_time>newTime}}">
-                    <view class="wo" style="background-color: #adadad">正在预热</view>
-                  </block>
-                  <block wx:if="{{aitem.start_time<newTime && aitem.goods_num>aitem.buy_num}}">
-                    <view class="rob">
-                      <view class="wo">我要抢</view>
-                    </view>
-                  </block>
+              </view>
+
+              <view class='sp_wz'>
+                <view class='sp_wzi'>{{aitem.goods_name}}</view>
+                <view class='sp_jg'>￥{{aitem.price}}</view>
+                <view class='sp_jgx'>￥{{aitem.market_price}}</view>
+              </view>
-                  <block wx:if="{{aitem.goods_num<=aitem.buy_num}}">
-                    <view class="wo" style="background-color: #adadad">已抢光</view>
-                  </block>
+            </view>
+          </navigator>
+        </block>
+      </swiper-item>
+    </view>
+  </swiper>
+
+  <view class="sp2" wx:if="{{object.style==2}}">
+    <block wx:for="{{goods_array}}">
+      <block wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind">
+        <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{aitem.goods_id}}" class="s1_gk_a1">
+          <view class='one1'>
+
+            <view class="o1_img">
+              <image src="{{imghost+aitem.original_img}}" data-errorimg="goods_array[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3"></image>
+            </view>
+
+            <view class="o1_right">
+              <view class="sp_wzi">{{aitem.goods_name}}</view>
+              <view class="o1_sj_kill">
+                <text>{{aitem.djs.day}}</text> 天
+                <text>{{aitem.djs.hou}}</text> :
+                <text>{{aitem.djs.min}}</text> :
+                <text>{{aitem.djs.sec}}</text>
+              </view>
+              <view class="money">
+                <view class='sp_jg'>￥{{aitem.price}}</view>
+                <view class='sp_jgx'>￥{{aitem.market_price}}</view>
+              </view>
+              <block wx:if="{{aitem.start_time>newTime}}">
+                <view class="rob">
+                  <view class="wo" style="background-color: #adadad">正在预热</view>
+                </view>
+              </block>
+              <block wx:if="{{aitem.start_time<newTime && aitem.goods_num>aitem.buy_num}}">
+                <view class="rob">
+                  <view class="wo">我要抢</view>
+                </view>
+              </block>
+              <block wx:if="{{aitem.goods_num<=aitem.buy_num}}">
+                <view class="rob">
+                  <view class="wo" style="background-color: #adadad">已抢光</view>
                 </view>
-              </view>
-            </navigator>
-          </block>
-        </block>
+              </block>
+
+
+            </view>
+          </view>
+        </navigator>
+      </block>
+    </block>
-      </view>
-      <view class='clear'></view>
+  </view>
+  <view class='clear'></view>
 </block>
 \ No newline at end of file
@@ -11,6 +11,7 @@
   padding:0rpx 20rpx;
   display: flex;
   justify-content: space-between;
+  font-size: 32rpx;
 }
 .s_it {
@@ -220,7 +221,7 @@ swiper {
 }
 .o1_right .sp_wzi {
-  font-size: 36rpx;
+  font-size: 30rpx;
   margin-bottom: 6rpx;
   text-align: left;
   padding: 4rpx 0;
@@ -233,6 +234,7 @@ swiper {
 .o1_right .o1_sj_kill {
   height: 60rpx;
   margin-bottom: 10rpx;
+  font-size: 28rpx;
 }
 .o1_right .o1_sj_kill text {
@@ -245,7 +247,7 @@ swiper {
 .o1_right .sp_jg {
   color: #c4182e;
-  font-size: 36rpx;
+  font-size: 30rpx;
   overflow: hidden;
   display: inline-block;
   margin-right: 10rpx;
@@ -268,17 +270,18 @@ swiper {
 }
 .o1_right .wo {
   background-color: #c4182e;
-  width: 160rpx;
-  height: 60rpx;
-  line-height: 60rpx;
+  width: 150rpx;
+  height: 50rpx;
+  line-height: 50rpx;
   color: white;
   text-align: center;
-  font-size: 32rpx;
+  font-size: 30rpx;
   border-radius: 14rpx;
 }
 .rob{
   display: flex;
   justify-content: flex-end;
+  font-size: 30rpx;
 }
 .money{
    display: flex;
@@ -27,18 +27,22 @@ Page({
     my_confirm.open_cancel(0);
     th.setData({
       getStorageID: a.stoid,
-      getUserID: d.user_id
-    })
-  },
-  onShow: function() {
-    var th = this;
-    th.setData({
+      getUserID: d.user_id,
       pages: 1,
       pageSize: 10,
       loadingType: 0
     })
     th.getList();
   },
+  onShow: function() {
+    // var th = this;
+    // th.setData({
+    //   pages: 1,
+    //   pageSize: 10,
+    //   loadingType: 0
+    // })
+    // th.getList();
+  },
   GetBuyPrice: function(e) {
     var that = this.data;
 <view class="top_img">
-    <view class="top_img">
-        <image src="{{iurl+'/miniapp/images/giftbag/gift00.jpg'}}" lazy-load="true"></image>
+  <view class="top_img">
+    <image src="{{iurl+'/miniapp/images/giftbag/gift00.jpg'}}" lazy-load="true"></image>
+  </view>
+  <view class="top_title">
+    <view class="top_title_box">
+      <text class="top_title_redtext">礼包列表</text>
     </view>
-    <view class="top_title">
-        <view class="top_title_box">
-            <text class="top_title_redtext">礼包列表</text>
-        </view>
-        <view class="top_title_box_S"></view>
-        <view class="top_title_box">
-            <a class="top_title_blacktext" bindtap="redirectTo" data-url="/pages/giftpack/mygiftpack/mygiftpack">我的礼包</a>
-        </view>
+    <view class="top_title_box_S"></view>
+    <view class="top_title_box">
+      <a class="top_title_blacktext" bindtap="redirectTo" data-url="/pages/giftpack/mygiftpack/mygiftpack">我的礼包</a>
     </view>
-    <block wx:for="{{wareCard}}" wx:for-item="items" wx:for-index="index" wx:key="index">
-        <view class="content_box">
-            <view class="content_box_ware" bindtap="navigateTo" data-url="/pages/giftpack/giftpacklist/giftpacklist?isBuy=1&lbId={{items.lbId}}&orderSn={{items.orderSn}}">
-                <view class="content_box_img">
-                    <image src="{{iurl+items.lbUrl}}" lazy-load="true"></image>
-                </view>
-                <view class="content_box_title">
-                    <view class="content_ware_title">
-                        <text bindtap="__e">{{items.giftTitle}}</text>
-                    </view>
-                    <view class="content_ware_type">
-                        <block wx:if="{{items.payMoney>0}}">
-                            <text>{{"￥"+items.payMoney}}</text>
-                        </block>
-                        <block wx:if="{{items.payMoney>0&&items.payIntegral>0}}">
-                            <text>/</text>
-                        </block>
-                        <block wx:if="{{items.payIntegral>0}}">
-                            <text>{{items.payIntegral+"积分"}}</text>
-                        </block>
-                    </view>
-                    <view class="content_ware_price">
-                        <text>{{"原价:￥"+items.giftPosPrice}}</text>
-                    </view>
-                    <view class="content_ware_time">
-                        <text>{{"活动时间:"+items.endTime}}</text>
-                    </view>
-                </view>
+  </view>
+  <block wx:for="{{wareCard}}" wx:for-item="items" wx:for-index="index" wx:key="index">
+    <view class="content_box">
+      <view class="content_box_ware" bindtap="navigateTo" data-url="/pages/giftpack/giftpacklist/giftpacklist?isBuy=1&lbId={{items.lbId}}&orderSn={{items.orderSn}}">
+        <view class="content_box_img">
+          <image src="{{iurl+items.lbUrl}}" lazy-load="true"></image>
+        </view>
+        <view class="content_box_title">
+          <view class="content_ware_title">
+            <text bindtap="__e">{{items.giftTitle}}</text>
+          </view>
+          <view class="content_ware_type">
+            <block wx:if="{{items.payMoney>0}}">
+              <text>{{"￥"+items.payMoney}}</text>
+            </block>
+            <block wx:if="{{items.payMoney>0&&items.payIntegral>0}}">
+              <text>/</text>
+            </block>
+            <block wx:if="{{items.payIntegral>0}}">
+              <view class="flex">
+                <text class="ellipsis-1">{{items.payIntegral}}</text>
+                <view>积分</view>
+              </view>
+            </block>
             </view>
-            <view class="content_box_button">
-                <view class="box_button_remark">
-                    <text>{{"已售:"+items.giftQty+"件"}}</text>
-                </view>
-                <block wx:if="{{items.payMoney>0}}">
-                    <view class="box_button_buy" bindtap="GetBuyPrice"  data-id="{{items.lbId}}">
-                        <button>立即购买</button>
-                    </view>
-                </block>
-                <block wx:if="{{items.payIntegral>0}}">
-                    <view class="box_button_dui" bindtap="GetBuyIntegral"  data-id="{{items.lbId}}">
-                        <button>立即兑换</button>
-                    </view>
-                </block>
+            <view class="content_ware_price">
+              <text class="ellipsis-1">{{"原价:￥"+items.giftPosPrice}}</text>
             </view>
-        </view>
-    </block>
-    <block wx:if="{{isEmpty==true && wareCard.length<2}}">
-        <view class="foot_empty">
-            <view>
-                <image src="{{iurl+'/miniapp/images/giftbag/gift07.png'}}" lazy-load="true"></image>
+            <view class="content_ware_time">
+              <text class="ellipsis-1">{{"活动时间:"+items.endTime}}</text>
             </view>
-            <view>
-                <text>当前暂无礼包</text>
+          </view>
+        </view>
+        <view class="content_box_button">
+          <view class="box_button_remark">
+            <text>{{"已售:"+items.giftQty+"件"}}</text>
+          </view>
+          <block wx:if="{{items.payMoney>0}}">
+            <view class="box_button_buy" bindtap="GetBuyPrice" data-id="{{items.lbId}}">
+              <button>立即购买</button>
             </view>
-            <view class="foot_empty_button">
-                <text bindtap="__e">去获取</text>
+          </block>
+          <block wx:if="{{items.payIntegral>0}}">
+            <view class="box_button_dui" bindtap="GetBuyIntegral" data-id="{{items.lbId}}">
+              <button>立即兑换</button>
             </view>
+          </block>
         </view>
-    </block>
-    <view wx:if="{{is_read}}" class="foot_box">
-        <text>———— 到底了 ————</text>
+      </view>
+  </block>
+  <block wx:if="{{isEmpty==true && wareCard.length<2}}">
+    <view class="foot_empty">
+      <view>
+        <image src="{{iurl+'/miniapp/images/giftbag/gift07.png'}}" lazy-load="true"></image>
+      </view>
+      <view>
+        <text>当前暂无礼包</text>
+      </view>
+      <view class="foot_empty_button">
+        <text bindtap="__e">去获取</text>
+      </view>
     </view>
-</view>
-<!-- 引入提示组件 -->
-<warn id="warn"></warn>
-<my_confirm id="my_confirm"></my_confirm>
 \ No newline at end of file
+  </block>
+  <view wx:if="{{is_read}}" class="foot_box">
+    <text>———— 到底了 ————</text>
+  </view>
+  </view>
+  <!-- 引入提示组件 -->
+  <warn id="warn"></warn>
+  <my_confirm id="my_confirm"></my_confirm>
 \ No newline at end of file
@@ -22,6 +22,7 @@ Page({
     getUrl: '',
     wareCard: [],
     orderSn: "", //订单编号
+    lbId:""
   },
   onLoad: function(options) {
     var th = this;
@@ -46,79 +47,109 @@ Page({
       giftRemark: th.data.giftRemark.replace(/<p><img/gi, "<p class='img'><img")
     })
   },
-  GetBuyPrice: function() {
-    var that = this;
-    var th = this.data;
-    uni.showModal({
-      title: '',
-      content: '是否确定购买该礼包',
-      success: function success(res) {
-        if (res.confirm) {
-          getApp().request.post('/api/weshop/marketing/buy/receive/gift/record/insert', {
-            data: {
-              "actId": '', //活动Id
-              "actType": '', //活动类型 1:新人礼、2:评价有礼、3:节日营销、4:生日营销
-              "buyType": '2', //1=积分兑换 2=余额购买
-              "lbId": th.getGiftID, //礼包Id
-              "storeId": th.getStorageID, //商家Id
-              "userId": th.getUserID //用户ID
-            },
-            success: function success(res) {
-              if (res.data.code == 0) {
-                getApp().my_warnning("购买成功！", 0, that);
-
-              } else {
-                getApp().my_warnning(res.data.msg, 0, that);
-              }
-            }
-          });
+  GetBuyPrice: function (e) {
+    var that = this.data;
+    var th = this;
+    // var id = e.currentTarget.dataset.id;//活动id
+    var my_confirm = th.selectComponent("#my_confirm"); //组件的id
+    my_confirm.open(
+      "是否确定购买该礼包",
+      "取消",
+      "确定",
+      function () {
+        my_confirm.open_cancel(0);
+      },
+      function () {
+        my_confirm.open_cancel(0);
+        var json = {
+          "actId": '', //活动Id
+          "actType": '', //活动类型 1:新人礼、2:评价有礼、3:节日营销、4:生日营销
+          "buyType": '2', //1=积分兑换 2=余额购买
+          "lbId": that.getGiftID, //礼包Id
+          "storeId": that.getStorageID, //商家Id
+          "userId": that.getUserID, //用户ID
+          "buyFrom": 2
+        };
+        var data = JSON.stringify(json);
+        var url = that.url + "/api/weshop/marketing/buy/receive/gift/record/insert";
+        wx.request({
+          url: url,
+          data: data,
+          method: 'post',
+          header: {
+            'content-type': 'application/json'
+          }, // 设置请求的 header
+          success: function (res) {
+            if (res.data.code == 0) {
+              res = res.data.data;
+              wx.requestPayment({
+                timeStamp: String(res.timeStamp),
+                nonceStr: res.nonceStr,
+                package: res.packageValue,
+                signType: res.signType,
+                paySign: res.paySign,
+                success: function (n) {
-        } else if (res.cancel) {
+                },
+                fail: function (n) {
+
+                }
+              });
+            } else {
+              getApp().my_warnning(res.data.msg, 0, th);
+            }
+          }
+        })
-        }
       }
-    });
+
+
+    )
   },
-  GetBuyIntegral: function() {
+  GetBuyIntegral: function (e) {
     var that = this.data;
-    uni.showModal({
-      title: '',
-      content: '是否确定兑换该礼包',
-      success: function success(res) {
-        if (res.confirm) {
-          getApp().request.promisepost('/api/weshop/marketing/buy/receive/gift/record/insert', {
-            data: {
-              "actId": '', //活动Id
-              "actType": '', //活动类型 1:新人礼、2:评价有礼、3:节日营销、4:生日营销
-              "buyType": '1', //1=积分兑换 2=余额购买
-              "lbId": that.getGiftID, //礼包Id
-              "storeId": that.getStorageID, //商家Id
-              "userId": that.getUserID //用户ID
-            },
-            success: function success(res) {
-              if (res.data.code == 0) {
-                // uni.showToast({
-                //   icon: 'none',
-                //   title: '兑换成功！'
-                // });
-                getApp().my_warnning("兑换成功！");
-
-              } else {
-                uni.showToast({
-                  icon: 'none',
-                  title: res.data.msg
-                });
-
-              }
+    var th = this;
+    // var id = e.currentTarget.dataset.id;//活动id
+    var my_confirm = th.selectComponent("#my_confirm"); //组件的id
+    my_confirm.open(
+      "是否确定兑换该礼包",
+      "取消",
+      "确定",
+      function () {
+        my_confirm.open_cancel(0);
+      },
+      function () {
+        my_confirm.open_cancel(0);
+        var json = {
+          "actId": '', //活动Id
+          "actType": '', //活动类型 1:新人礼、2:评价有礼、3:节日营销、4:生日营销
+          "buyType": '1', //1=积分兑换 2=余额购买
+          "lbId": that.getGiftID, //礼包Id
+          "storeId": that.getStorageID, //商家Id
+          "userId": that.getUserID //用户ID
+        };
+        var data = JSON.stringify(json);
+        var url = that.url + "/api/weshop/marketing/buy/receive/gift/record/insert";
+        wx.request({
+          url: url,
+          data: data,
+          method: 'post',
+          header: {
+            'content-type': 'application/json'
+          }, // 设置请求的 header
+          success: function (res) {
+            if (res.data.code == 0) {
+              getApp().my_warnning("兑换成功！", 1, th);
+            } else {
+              getApp().my_warnning(res.data.msg, 0, th);
             }
-          });
+          }
+        })
+      })
-        } else if (res.cancel) {}
-      }
-    });
   },
   GetMyGiftList: function() {
@@ -154,7 +185,8 @@ Page({
             giftPrice: res.data.data.payMoney,
             giftType: res.data.data.actType,
             actTitle: res.data.data.actTitle,
-            wareCard: res.data.data.wareCard
+            wareCard: res.data.data.wareCard,
+            lbId: res.data.data.lbId
           })
         } else {
           getApp().my_warnning("系统繁忙,请稍后再试", 0, th);
@@ -198,7 +230,7 @@ Page({
             giftPrice: res.data.data.payMoney,
             giftType: res.data.data.actType,
             actTitle: res.data.data.actTitle,
-            wareCard: res.data.data.wareCard
+            wareCard: res.data.data.wareCard,
           })
         } else {
           getApp().my_warnning("系统繁忙,请稍后再试", 0, _this2);
 <view class="box data-v-3a5b7e36">
-    <view class="box_top data-v-3a5b7e36">
-        <image src="{{giftImage}}" class="data-v-3a5b7e36" lazy-load="true"></image>
+  <view class="box_top data-v-3a5b7e36">
+    <image src="{{giftImage}}" class="data-v-3a5b7e36" lazy-load="true"></image>
+  </view>
+  <view class="box_title data-v-3a5b7e36">
+    <view class="top_title data-v-3a5b7e36">
+      <text class="data-v-3a5b7e36 ellipsis-2">{{giftTitle}}</text>
     </view>
-    <view class="box_title data-v-3a5b7e36">
-        <view class="top_title data-v-3a5b7e36">
-            <text class="data-v-3a5b7e36 ellipsis-2">{{giftTitle}}</text>
-        </view>
-        <view class="top_time data-v-3a5b7e36">
-            <text class="data-v-3a5b7e36">{{"兑换截至时间："+giftDate}}</text>
+    <view class="top_time data-v-3a5b7e36">
+      <text class="data-v-3a5b7e36">{{"兑换截至时间："+giftDate}}</text>
+    </view>
+    <view class="top_price data-v-3a5b7e36">
+      <block wx:if="{{giftPrice>0}}">
+        <text class="data-v-3a5b7e36">{{"￥"+giftPrice}}</text>
+      </block>
+      <block wx:if="{{giftPrice>0 && giftIntegral>0}}">
+        <text class="data-v-3a5b7e36">/</text>
+      </block>
+      <block wx:if="{{giftIntegral>0}}">
+        <text class="data-v-3a5b7e36">{{giftIntegral+"积分"}}</text>
+      </block>
+      <block wx:if="{{giftType>0}}">
+        <text class="data-v-3a5b7e36">{{actTitle}}</text>
+      </block>
+    </view>
+    <view class="top_foot data-v-3a5b7e36">
+      <view class="top_foot_price data-v-3a5b7e36">
+        <text class="data-v-3a5b7e36">{{"原价:"+giftPosPrice+"元"}}</text>
+      </view>
+      <view class="top_foot_qty data-v-3a5b7e36">
+        <text class="data-v-3a5b7e36">{{"已售:"+giftQty+"件"}}</text>
+      </view>
+    </view>
+  </view>
+  <view class="box_ware data-v-3a5b7e36">
+    <view class="box_ware_title data-v-3a5b7e36">
+      <text class="data-v-3a5b7e36">礼包内容</text>
+    </view>
+    <block wx:for="{{wareCard}}" wx:for-item="item" wx:for-index="index" wx:key="index">
+      <view class="box_ware_box data-v-3a5b7e36">
+        <view class="box_ware_img data-v-3a5b7e36">
+          <block wx:if="{{item.lbType==1}}">
+            <image src="{{item.wareImage==''?iurl+'/miniapp/images/giftbag/gift01.png':iurl+item.wareImage}}" class="data-v-3a5b7e36" lazy-load="true"></image>
+          </block>
+          <block wx:if="{{item.lbType==2}}">
+            <image src="{{iurl+'/miniapp/images/giftbag/gift05.png'}}" class="data-v-3a5b7e36" lazy-load="true"></image>
+          </block>
+          <block wx:if="{{item.lbType==3}}">
+            <image src="{{iurl+'/miniapp/images/giftbag/gift02.png'}}" class="data-v-3a5b7e36" lazy-load="true"></image>
+          </block>
+          <block wx:if="{{item.lbType==4}}">
+            <image src="{{iurl+'/miniapp/images/giftbag/gift03.png'}}" class="data-v-3a5b7e36" lazy-load="true"></image>
+          </block>
+          <block wx:if="{{item.lbType==5}}">
+            <image src="{{iurl+'/miniapp/images/giftbag/gift04.png'}}" class="data-v-3a5b7e36" lazy-load="true"></image>
+          </block>
         </view>
-        <view class="top_price data-v-3a5b7e36">
-            <block wx:if="{{giftPrice>0}}">
-                <text class="data-v-3a5b7e36">{{"￥"+giftPrice}}</text>
+        <view class="box_ware_item data-v-3a5b7e36">
+          <view class="box_ware_item_title data-v-3a5b7e36">
+            <text class="data-v-3a5b7e36">{{item.couponName}}</text>
+          </view>
+          <view class="box_ware_item_price data-v-3a5b7e36">
+            <text class="data-v-3a5b7e36"></text>
+          </view>
+          <view class="box_ware_item_qty data-v-3a5b7e36">
+            <text class="data-v-3a5b7e36">{{"数量:"+item.num}}</text>
+          </view>
+          <view class="box_ware_code data-v-3a5b7e36">
+            <block wx:if="{{isBuy==0&item.lbType==1}}">
+              <image src="{{iurl+'/miniapp/images/giftbag/gift06.png'}}" lazy-load="true" bindtap="__e" class="data-v-3a5b7e36"></image>
             </block>
-            <block wx:if="{{giftPrice>0 && giftIntegral>0}}">
-                <text class="data-v-3a5b7e36">/</text>
+            <block wx:if="{{isBuy==0&item.lbType==2}}">
+              <image src="{{iurl+'/miniapp/images/giftbag/gift06.png'}}" bindtap="__e" class="data-v-3a5b7e36" lazy-load="true"></image>
             </block>
-            <block wx:if="{{giftIntegral>0}}">
-                <text class="data-v-3a5b7e36">{{giftIntegral+"积分"}}</text>
+            <block wx:if="{{isBuy==0&item.lbType==3}}">
+              <image src="{{iurl+'/miniapp/images/giftbag/gift06.png'}}" bindtap="__e" class="data-v-3a5b7e36" lazy-load="true"></image>
             </block>
-            <block wx:if="{{giftType>0}}">
-                <text class="data-v-3a5b7e36">{{actTitle}}</text>
+            <block wx:if="{{isBuy==0&item.lbType>3}}">
+              <text class="data-v-3a5b7e36">已自动到账</text>
             </block>
+          </view>
         </view>
-        <view class="top_foot data-v-3a5b7e36">
-            <view class="top_foot_price data-v-3a5b7e36">
-                <text class="data-v-3a5b7e36">{{"原价:"+giftPosPrice+"元"}}</text>
-            </view>
-            <view class="top_foot_qty data-v-3a5b7e36">
-                <text class="data-v-3a5b7e36">{{"已售:"+giftQty+"件"}}</text>
-            </view>
-        </view>
+      </view>
+    </block>
+  </view>
+  <view class="foot_box data-v-3a5b7e36">
+    <view class="foot_box_title data-v-3a5b7e36">
+      <text class="data-v-3a5b7e36">活动说明</text>
     </view>
-    <view class="box_ware data-v-3a5b7e36">
-        <view class="box_ware_title data-v-3a5b7e36">
-            <text class="data-v-3a5b7e36">礼包内容</text>
-        </view>
-        <block wx:for="{{wareCard}}" wx:for-item="item" wx:for-index="index" wx:key="index">
-            <view class="box_ware_box data-v-3a5b7e36">
-                <view class="box_ware_img data-v-3a5b7e36">
-                    <block wx:if="{{item.lbType==1}}">
-                        <image src="{{item.wareImage==''?iurl+'/miniapp/images/giftbag/gift01.png':iurl+item.wareImage}}" class="data-v-3a5b7e36" lazy-load="true"></image>
-                    </block>
-                    <block wx:if="{{item.lbType==2}}">
-                        <image src="{{iurl+'/miniapp/images/giftbag/gift05.png'}}" class="data-v-3a5b7e36" lazy-load="true"></image>
-                    </block>
-                    <block wx:if="{{item.lbType==3}}">
-                        <image src="{{iurl+'/miniapp/images/giftbag/gift02.png'}}" class="data-v-3a5b7e36" lazy-load="true"></image>
-                    </block>
-                    <block wx:if="{{item.lbType==4}}">
-                        <image src="{{iurl+'/miniapp/images/giftbag/gift03.png'}}" class="data-v-3a5b7e36" lazy-load="true"></image>
-                    </block>
-                    <block wx:if="{{item.lbType==5}}">
-                        <image src="{{iurl+'/miniapp/images/giftbag/gift04.png'}}" class="data-v-3a5b7e36" lazy-load="true"></image>
-                    </block>
-                </view>
-                <view class="box_ware_item data-v-3a5b7e36">
-                    <view class="box_ware_item_title data-v-3a5b7e36">
-                        <text class="data-v-3a5b7e36">{{item.couponName}}</text>
-                    </view>
-                    <view class="box_ware_item_price data-v-3a5b7e36">
-                        <text class="data-v-3a5b7e36"></text>
-                    </view>
-                    <view class="box_ware_item_qty data-v-3a5b7e36">
-                        <text class="data-v-3a5b7e36">{{"数量:"+item.num}}</text>
-                    </view>
-                    <view class="box_ware_code data-v-3a5b7e36">
-                        <block wx:if="{{isBuy==0&item.lbType==1}}">
-                            <image src="{{iurl+'/miniapp/images/giftbag/gift06.png'}}" lazy-load="true" bindtap="__e" class="data-v-3a5b7e36"></image>
-                        </block>
-                        <block wx:if="{{isBuy==0&item.lbType==2}}">
-                            <image src="{{iurl+'/miniapp/images/giftbag/gift06.png'}}"  bindtap="__e" class="data-v-3a5b7e36" lazy-load="true"></image>
-                        </block>
-                        <block wx:if="{{isBuy==0&item.lbType==3}}">
-                            <image src="{{iurl+'/miniapp/images/giftbag/gift06.png'}}"  bindtap="__e" class="data-v-3a5b7e36" lazy-load="true"></image>
-                        </block>
-                        <block wx:if="{{isBuy==0&item.lbType>3}}">
-                            <text class="data-v-3a5b7e36">已自动到账</text>
-                        </block>
-                    </view>
-                </view>
-            </view>
-        </block>
+    <view class="foot_box_remark data-v-3a5b7e36">
+      <rich-text nodes="{{giftRemark}}"></rich-text>
     </view>
-    <view class="foot_box data-v-3a5b7e36">
-        <view class="foot_box_title data-v-3a5b7e36">
-            <text class="data-v-3a5b7e36">活动说明</text>
+  </view>
+  <view class="foot_empty data-v-3a5b7e36"></view>
+  <block wx:if="{{isBuy==1}}">
+    <view class="foot_button data-v-3a5b7e36">
+      <block wx:if="{{giftPrice>0&&giftIntegral>0}}">
+        <view class="foot_button_left data-v-3a5b7e36">
+          <text bindtap="GetBuyPrice" class="data-v-3a5b7e36" data-id="{{lbId}}">立即购买</text>
         </view>
-        <view class="foot_box_remark data-v-3a5b7e36">
-            <rich-text nodes="{{giftRemark}}"></rich-text>
+      </block>
+      <block wx:if="{{giftPrice>0 && giftIntegral>0}}">
+        <view class="foot_button_right data-v-3a5b7e36">
+          <text bindtap="GetBuyIntegral" class="data-v-3a5b7e36" data-id="{{lbId}}">立即兑换</text>
         </view>
-    </view>
-    <view class="foot_empty data-v-3a5b7e36"></view>
-    <block wx:if="{{isBuy==1}}">
-        <view class="foot_button data-v-3a5b7e36">
-            <block wx:if="{{giftPrice>0&&giftIntegral>0}}">
-                <view class="foot_button_left data-v-3a5b7e36">
-                    <text  bindtap="__e" class="data-v-3a5b7e36">立即购买</text>
-                </view>
-            </block>
-            <block wx:if="{{giftPrice>0 && giftIntegral>0}}">
-                <view class="foot_button_right data-v-3a5b7e36">
-                    <text bindtap="__e" class="data-v-3a5b7e36">立即兑换</text>
-                </view>
-            </block>
-            <block wx:if="{{giftPrice>0 && giftIntegral<=0}}">
-                <view class="foot_button_buy data-v-3a5b7e36">
-                    <text bindtap="__e" class="data-v-3a5b7e36">立即购买</text>
-                </view>
-            </block>
-            <block wx:if="{{giftPrice<=0 && giftIntegral>0}}">
-                <view class="foot_button_intalge data-v-3a5b7e36">
-                    <text bindtap="__e" class="data-v-3a5b7e36">立即兑换</text>
-                </view>
-            </block>
+      </block>
+      <block wx:if="{{giftPrice>0 && giftIntegral<=0}}">
+        <view class="foot_button_buy data-v-3a5b7e36">
+          <text bindtap="GetBuyPrice" class="data-v-3a5b7e36" data-id="{{lbId}}">立即购买</text>
         </view>
-    </block>
-    <block wx:if="{{isBuy==0}}">
-        <view class="foot_button data-v-3a5b7e36">
-            <view class="foot_button_buy data-v-3a5b7e36">
-                <text bindtap="__e" class="data-v-3a5b7e36">立即使用</text>
-            </view>
+      </block>
+      <block wx:if="{{giftPrice<=0 && giftIntegral>0}}">
+        <view class="foot_button_intalge data-v-3a5b7e36">
+          <text bindtap="GetBuyIntegral" class="data-v-3a5b7e36" data-id="{{lbId}}">立即兑换</text>
         </view>
-    </block>
+      </block>
+    </view>
+  </block>
+  <block wx:if="{{isBuy==0}}">
+    <view class="foot_button data-v-3a5b7e36">
+      <view class="foot_button_buy data-v-3a5b7e36">
+        <text bindtap="__e" class="data-v-3a5b7e36">立即使用</text>
+      </view>
+    </view>
+  </block>
 </view>
 <!-- 引入提示组件 -->
 <warn id="warn"></warn>
@@ -28,21 +28,25 @@ Page({
     var th = this;
     th.setData({
       getStorageID: a.stoid,
-      getUserID: d.user_id
+      getUserID: d.user_id,
+      pages: 1,
+      pageSize: 10,
+      loadingType: 0
     })
+    th.getList();
   },
   onShow: function() {
     // this.pages = 1;
     // this.pageSize = 10;
     // this.loadingType = 0;
     // this.getList();
-    var th = this;
-    th.setData({
-      pages: 1,
-      pageSize: 10,
-      loadingType: 0
-    })
-    th.getList();
+    // var th = this;
+    // th.setData({
+    //   pages: 1,
+    //   pageSize: 10,
+    //   loadingType: 0
+    // })
+    // th.getList();
   },
   // methods: {  
   //   BuyGift: function BuyGift() {
@@ -14,7 +14,7 @@
   </view>
   <block wx:for="{{wareCard}}" wx:for-item="item" wx:for-index="index" wx:key="index">
     <view class="content_box">
-      <view class="content_box_ware" bindtap="navigateTo" data-url="/pages/giftpack/giftpacklist/giftpacklist?isBuy=1&lbId={{item.lbId}}&orderSn={{item.orderSn}}">
+      <view class="content_box_ware" bindtap="navigateTo" data-url="/pages/giftpack/giftpacklist/giftpacklist?isBuy=0&lbId={{item.lbId}}&orderSn={{item.orderSn}}">
         <view class="content_box_img">
           <!-- <image src="{{$GetInfo.imgHttp+item.$orig.lbUrl}}"></image> -->
           <image src="{{iurl+item.lbUrl}}" lazy-load="true"></image>
@@ -81,8 +81,8 @@
           </view>
         </view>
       </view>
-      <view class="content_box_button">
-        <button bindtap="__e">立即使用</button>
+      <view class="content_box_button" bindtap="navigateTo" data-url="/pages/giftpack/giftpacklist/giftpacklist?isBuy=0&lbId={{item.lbId}}&orderSn={{item.orderSn}}">
+        <button>立即使用</button>
       </view>
     </view>
   </block>