diff --git a/pages/giftpack/birthdaygift/birthdaygift.js b/pages/giftpack/birthdaygift/birthdaygift.js
new file mode 100644
index 0000000..0e38f48
--- /dev/null
+++ b/pages/giftpack/birthdaygift/birthdaygift.js
@@ -0,0 +1,212 @@
+var _default =
+{
+  data: function data() {
+    return {
+      itemShow: false, //项目栏目是否显示
+      cardShow: false, //代金券栏目是否显示
+      packShow: false, //福利栏目是否显示
+      textShow: false, //规则是否显示
+      integralShow: true, //积分领取是否显示
+      growUpShow: true, //成长值领取是否显示
+      itemButton: '',
+      cardButton: '',
+      getActId: '',
+      getActType: '',
+      giftID: '',
+      getUserID: '',
+      getStorageID: '',
+      receiveState: '已领取',
+      integralTitle: '已领取',
+      growUpTitle: '已领取',
+      textTitle: '',
+      getUrl: '',
+      noShow: false,
+      //判断中间的连接线是否显示
+      itemShows: function itemShows() {
+        if (this.itemShow) {
+          if (this.cardShow) {
+            return true;
+          } else {
+            return false;
+          }
+        } else {
+          if (this.cardShow) {
+            return false;
+          } else {
+            return false;
+          }
+
+        }
+      },
+      //判断中间的连接线是否显示
+      cardShows: function cardShows() {
+        if (this.cardShow) {
+          if (this.packShow) {
+            return true;
+          } else {
+            return false;
+          }
+        } else {
+          if (this.packShow) {
+            return false;
+          } else {
+            return false;
+          }
+
+        }
+      },
+      cards: [],
+      itemWare: []
+    };
+
+
+
+  },
+  onLoad: function onLoad(options) {
+
+    // 获取url对应的参数
+    // this.getActId = this.GetQueryString('actId'); //活动id
+    // this.getActType = this.GetQueryString('actType'); //活动类型 1新人礼 2评价有礼 3节日营销 4生日营销
+    // this.giftID = this.GetQueryString('giftID'); //礼包ID
+    // this.getStorageID = this.GetQueryString('storageID'); //商家ID
+    // this.getUserID = this.GetQueryString('userID'); //用户ID
+
+    this.getActId = options.actId; //活动id
+    this.getActType = options.actType; //活动类型 1新人礼 2评价有礼 3节日营销 4生日营销
+    this.giftID = options.giftBagId; //礼包ID
+    this.getStorageID = options.storeId; //商家ID
+    this.getUserID = options.userId; //用户ID      
+
+    this.GetList();
+
+  },
+  onShow: function onShow() {
+    if (this.textTitle == '') {
+      this.textTitle = '暂无详情......';
+    } else {
+      this.textTitle = this.textTitle.replace(/<p><img/gi, "<p class='img'><img");
+    }
+  },
+  methods: {
+
+    getQueryString: function getQueryString(name) {
+      var reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)', 'i');
+      var r = window.location.search.substr(1).match(reg);
+      if (r != null) {
+        return unescape(r[2]);
+      }
+      return null;
+    },
+
+    GetList: function GetList() {
+      var _this = this;
+      uni.request({
+        url: this.$GetInfo.ApiHttp + '/api/weshop/marketing/giftbag/bound/get',
+        data: {
+          "actId": this.getActId, //活动id
+          "actType": this.getActType, //活动类型 1新人礼 2评价有礼 3节日营销 4生日营销
+          "giftBagId": this.giftID, //礼包ID
+          "storeId": this.getStorageID, //商家ID
+          "userId": this.getUserID //用户ID
+        },
+        method: 'GET',
+        header: {
+          'Content-Type': 'application/x-www-form-urlencoded' //自定义请求头信息
+        },
+        success: function success(res) {
+          console.log(res.data);
+          if (res.data.code == 0) {
+            if (res.data.data.lbCoupons != null) {
+              _this.cardShow = true;
+              _this.cards = res.data.data.lbCoupons;
+            }
+            if (res.data.data.lbSM != null) {
+              _this.itemShow = true;
+              _this.itemWare = res.data.data.lbSM;
+            }
+            if (res.data.data.lbIntegral <= 0) {
+              if (res.data.data.lbGrowthValue <= 0) {
+                _this.packShow = false;
+              } else {
+                _this.packShow = true;
+                _this.integralShow = false;
+                _this.growUpShow = true;
+              }
+
+            } else {
+              if (res.data.data.lbGrowthValue > 0) {
+                _this.packShow = true;
+              } else {
+                _this.packShow = true;
+                _this.integralShow = true;
+                _this.growUpShow = false;
+              }
+            }
+
+            _this.integralTitle = '领取' + res.data.data.lbIntegral + '积分';
+            _this.growUpTitle = '领取' + res.data.data.lbGrowthValue + '积分';
+            if (res.data.data.receiveState == 0) {
+              _this.receiveState = '一键全部领取';
+            } else {
+              _this.receiveState = '已领取';
+            }
+
+
+            if (res.data.data.actIntro != '') {
+              _this.textShow = true;
+              _this.textTitle = res.data.data.actIntro;
+            }
+
+          } else {
+            console.log(res.data.msg);
+          }
+        }
+      });
+
+    },
+    GetWebHttp: function GetWebHttp() {
+      this.getUrl = this.$GetInfo.HtmlHttp + '/mobile/index/index/stoid/' + this.getStorageID + '.html';
+      window.location.href = this.getUrl;
+    },
+    GetReceive: function GetReceive() {
+      var that = this;
+      if (that.receiveState == '已领取') {
+        return false;
+      }
+      uni.request({
+        url: that.$GetInfo.ApiHttp + '/api/weshop/marketing/free/receive/gift/record/insert',
+        data: {
+          "actId": that.getActId, //活动Id
+          "actType": '4', //活动类型 1:新人礼、2:评价有礼、3:节日营销、4:生日营销
+          "lbId": that.giftID, //礼包Id
+          "storeId": that.getStorageID, //商家Id
+          "userId": that.getUserID //用户ID
+        },
+        method: 'POST',
+        header: {
+          'Content-Type': 'application/json' //自定义请求头信息
+        },
+        success: function success(res) {
+          console.log(res.data);
+          if (res.data.code == 0) {
+            console.log(res.data.msg);
+            that.receiveState = '已领取';
+            uni.showToast({
+              icon: 'none',
+              title: '领取成功！'
+            });
+
+          } else {
+            console.log(res.data.msg);
+            uni.showToast({
+              icon: 'none',
+              title: res.data.msg
+            });
+
+          }
+        }
+      });
+
+    }
+  }
+};
\ No newline at end of file
diff --git a/pages/giftpack/birthdaygift/birthdaygift.json b/pages/giftpack/birthdaygift/birthdaygift.json
new file mode 100644
index 0000000..ccd8ba1
--- /dev/null
+++ b/pages/giftpack/birthdaygift/birthdaygift.json
@@ -0,0 +1,5 @@
+{
+  "navigationBarTitleText": "生日礼包",
+  "navigationStyle": "custom",
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/pages/giftpack/birthdaygift/birthdaygift.wxml b/pages/giftpack/birthdaygift/birthdaygift.wxml
new file mode 100644
index 0000000..9355fb9
--- /dev/null
+++ b/pages/giftpack/birthdaygift/birthdaygift.wxml
@@ -0,0 +1,165 @@
+<view >
+    <view class="image_box ">
+        <image src="{{$GetInfo.imgHttp+'/miniapp/images/giftbag/birth00.png'}}" ></image>
+    </view>
+    <block wx:if="{{this.itemShow}}">
+        <view class="top ">
+            <view class="top_box ">
+                <view class="top_box_text ">
+                    <text >______</text>
+                </view>
+                <view class="top_box_text ">
+                    <text >新人专享\n你的美丽我来缔造</text>
+                </view>
+                <view class="top_box_text ">
+                    <text >______</text>
+                </view>
+            </view>
+            <block wx:for="{{itemWare}}" wx:for-item="item" wx:for-index="index" wx:key="index">
+                <view class="top_item ">
+                    <block wx:if="{{item.lbType==3}}">
+                        <view class="top_item_img ">
+                            <image src="{{$GetInfo.imgHttp+'/miniapp/images/giftbag/gift02.png'}}" ></image>
+                        </view>
+                    </block>
+                    <block wx:if="{{item.lbType==1}}">
+                        <view class="top_item_img ">
+                            <image src="{{item.fromImage==''?$GetInfo.imgHttp+'/miniapp/images/giftbag/empty.jpg':$GetInfo.imgHttp+item.fromImage}}" ></image>
+                        </view>
+                    </block>
+                    <view class="top_item_center ">
+                        <view class="top_item_center_title ">
+                            <block wx:if="{{item.lbType==1}}">
+                                <text >免费领取</text>
+                            </block>
+                            <block wx:if="{{item.lbType==3}}">
+                                <text >{{item.fromName}}</text>
+                            </block>
+                        </view>
+                        <view class="top_item_center_ramke ">
+                            <block wx:if="{{item.lbType==1}}">
+                                <text >{{item.fromName}}</text>
+                            </block>
+                            <block wx:if="{{item.lbType==3}}">
+                                <text >{{"新人可免费享受专业"+item.fromName+"，可以享受"+item.num+"次。"}}</text>
+                            </block>
+                        </view>
+                    </view>
+                </view>
+            </block>
+        </view>
+    </block>
+    <block wx:if="{{$root.g0}}">
+        <view >
+            <image style="width:10px;height:47px;float:left;top:-38px;left:55px;" src="{{this.$GetInfo.imgHttp+'/miniapp/images/giftbag/birth01.png'}}" ></image>
+            <image style="width:10px;height:47px;float:right;top:-38px;right:55px;" src="{{this.$GetInfo.imgHttp+'/miniapp/images/giftbag/birth01.png'}}" ></image>
+        </view>
+    </block>
+    <block wx:if="{{this.cardShow}}">
+        <view >
+            <view class="top ">
+                <view class="top_box ">
+                    <view class="top_box_text ">
+                        <text >———</text>
+                    </view>
+                    <view class="top_box_text ">
+                        <text >新人专享优惠券</text>
+                    </view>
+                    <view class="top_box_text ">
+                        <text >———</text>
+                    </view>
+                </view>
+                <block wx:for="{{cards}}" wx:for-item="item" wx:for-index="index" wx:key="index">
+                    <view class="top_card ">
+                        <view class="{{['',item.useObjectType==1?'top_card_box img1':item.useObjectType==2?'top_card_box img2':'top_card_box img3']}}">
+                            <view class="top_card_tite_box ">
+                                <block wx:if="{{item.useObjectType==0}}">
+                                    <view class="top_card_tite_a ">全场通用</view>
+                                </block>
+                                <block wx:if="{{item.useObjectType==1}}">
+                                    <view class="top_card_tite_b ">品牌限定</view>
+                                </block>
+                                <block wx:if="{{item.useObjectType==2}}">
+                                    <view class="top_card_tite_c ">品类限定</view>
+                                </block>
+                                <block wx:if="{{item.useObjectType==11}}">
+                                    <view class="top_card_tite_a ">用途限定</view>
+                                </block>
+                                <block wx:if="{{item.useObjectType==12}}">
+                                    <view class="top_card_tite_a ">分类1限定</view>
+                                </block>
+                            </view>
+                            <view class="top_card_counte ">{{item.sum+"元券"}}</view>
+                            <view class="top_card_remak ">{{"满"+item.buySum+"元可以用"}}</view>
+                        </view>
+                    </view>
+                </block>
+            </view>
+        </view>
+    </block>
+    <block wx:if="{{$root.g1}}">
+        <view >
+            <view >
+                <image style="width:10px;height:47px;float:left;top:-38px;left:55px;" src="{{this.$GetInfo.imgHttp+'/miniapp/images/giftbag/birth01.png'}}" ></image>
+                <image style="width:10px;height:47px;float:right;top:-38px;right:55px;" src="{{this.$GetInfo.imgHttp+'/miniapp/images/giftbag/birth01.png'}}" ></image>
+            </view>
+        </view>
+    </block>
+    <block wx:if="{{this.packShow}}">
+        <view >
+            <view class="top ">
+                <view class="top_box ">
+                    <view class="top_box_text ">
+                        <text >———</text>
+                    </view>
+                    <view class="top_box_text ">
+                        <text >新人专享福利</text>
+                    </view>
+                    <view class="top_box_text ">
+                        <text >———</text>
+                    </view>
+                </view>
+                <block wx:if="{{this.integralShow}}">
+                    <view >
+                        <view class="top_box_image ">
+                            <image src="{{this.$GetInfo.imgHttp+'/miniapp/images/giftbag/vip06.jpg'}}" ></image>
+                            <button >{{this.integralTitle}}</button>
+                        </view>
+                    </view>
+                </block>
+                <block wx:if="{{this.growUpShow}}">
+                    <view >
+                        <view class="top_box_image ">
+                            <image src="{{this.$GetInfo.imgHttp+'/miniapp/images/giftbag/vip07.jpg'}}" ></image>
+                            <button >{{this.growUpTitle}}</button>
+                        </view>
+                    </view>
+                </block>
+            </view>
+        </view>
+    </block>
+    <block wx:if="{{this.textShow}}">
+        <view class="foot_box ">
+            <view class="foot_box_title ">
+                <text >活动规则:</text>
+            </view>
+            <view class="foot_box_text ">
+                <rich-text nodes="{{this.textTitle}}"></rich-text>
+            </view>
+        </view>
+    </block>
+    <view class="button_box ">
+        <view >
+            <button data-event-opts="{{[['tap',[['GetWebHttp',['$event']]]]]}}" class="button " bindtap="__e">进入商城购物</button>
+        </view>
+        <view class="button_text ">
+            <text >本活动最终解释权归公司所有，如果有问题请联系客服</text>
+        </view>
+    </view>
+    <view class="foot_empty "></view>
+    <view class="foot_button ">
+        <view class="{{['',this.receiveState=='已领取'?'foot_button_notbuy':'foot_button_buy']}}">
+            <text data-event-opts="{{[['tap',[['GetReceive',['$event']]]]]}}" bindtap="__e" >{{this.receiveState}}</text>
+        </view>
+    </view>
+</view>
\ No newline at end of file
diff --git a/pages/giftpack/birthdaygift/birthdaygift.wxss b/pages/giftpack/birthdaygift/birthdaygift.wxss
new file mode 100644
index 0000000..86b115d
--- /dev/null
+++ b/pages/giftpack/birthdaygift/birthdaygift.wxss
@@ -0,0 +1,339 @@
+@charset "UTF-8";
+/* Author XGQ
+ * 2019-10-27
+ */
+.image_box {
+	-webkit-box-pack: center;
+	-webkit-justify-content: center;
+	        justify-content: center;
+}
+.image_box image {
+	width: 100%;
+	height: 690rpx;
+}
+.top {
+	margin: -20rpx 28rpx 45rpx 28rpx;
+	padding: 10rpx 10rpx 70rpx 10rpx;
+	background-color: #FFFFFF;
+	border-radius: 0rpx 0rpx 15rpx 15rpx;
+}
+.top_box {
+	display: -webkit-box;
+	display: -webkit-flex;
+	display: flex;
+	text-align: center;
+	-webkit-box-pack: center;
+	-webkit-justify-content: center;
+	        justify-content: center;
+}
+.top_box_text {
+	-webkit-box-pack: center;
+	-webkit-justify-content: center;
+	        justify-content: center;
+	margin: 50rpx 15rpx 20rpx 15rpx;
+}
+.top_box_text text {
+	color: #FB6451;
+	font-size: 40rpx;
+}
+.top_item {
+	display: -webkit-box;
+	display: -webkit-flex;
+	display: flex;
+	width: 100%;
+	margin: 60rpx 0 0 0;
+}
+.top_item_img {
+	float: left;
+	width: 28%;
+	margin: 0rpx 10rpx 0rpx 20rpx;
+}
+.top_item_img image {
+	width: 150rpx;
+	height: 150rpx;
+	border-radius: 50%;
+	border: #F96865 solid 3rpx;
+}
+.top_item_center {
+	float: left;
+	width: 50%;
+}
+.top_item_center_title {
+	font-size: 35rpx;
+	color: #FB6451;
+	-webkit-box-pack: start;
+	-webkit-justify-content: flex-start;
+	        justify-content: flex-start;
+	padding: 0 10rpx 15rpx 0rpx;
+	word-break: break-all;
+	/*属性规定自动换行的处理方法。normal(使用浏览器默认的换行规则。),break-all(允许在单词内换行。),keep-all(只能在半角空格或连字符处换行。)*/
+	text-overflow: ellipsis;
+	display: -webkit-box;
+	/** 对象作为伸缩盒子模型显示 **/
+	-webkit-box-orient: vertical;
+	/** 设置或检索伸缩盒对象的子元素的排列方式 **/
+	-webkit-line-clamp: 2;
+	/** 显示的行数 **/
+	overflow: hidden;
+	/** 隐藏超出的内容 **/
+}
+.top_item_center_ramke {
+	font-size: 25rpx;
+	-webkit-box-pack: start;
+	-webkit-justify-content: flex-start;
+	        justify-content: flex-start;
+	line-height: 35rpx;
+	letter-spacing: 0.5rpx;
+	word-break: break-all;
+	/*属性规定自动换行的处理方法。normal(使用浏览器默认的换行规则。),break-all(允许在单词内换行。),keep-all(只能在半角空格或连字符处换行。)*/
+	text-overflow: ellipsis;
+	display: -webkit-box;
+	/** 对象作为伸缩盒子模型显示 **/
+	-webkit-box-orient: vertical;
+	/** 设置或检索伸缩盒对象的子元素的排列方式 **/
+	-webkit-line-clamp: 2;
+	/** 显示的行数 **/
+	overflow: hidden;
+	/** 隐藏超出的内容 **/
+}
+.top_item_button {
+	float: right;
+	width: 22%;
+	padding: 65rpx 20rpx 0 1rpx;
+}
+.top_item_button button {
+	font-size: 25rpx;
+	background: #fd6969;
+	color: #FFFFFF;
+	border-radius: 50rpx;
+	height: 45rpx;
+	line-height: 45rpx;
+}
+.top_card {
+	width: calc(50% - 30rpx);
+	display: inline-block;
+	margin: 15rpx;
+}
+.top_card_box {
+	background-size: cover;
+	background-position: center;
+	background-repeat: no-repeat;
+	border-radius: 20rpx;
+	height: 250rpx;
+	margin: 5rpx;
+}
+.img1 {
+	background-image: url(https://mshopimg.yolipai.net/miniapp/images/giftbag/vip01.png);
+}
+.img2 {
+	background-image: url(https://mshopimg.yolipai.net/miniapp/images/giftbag/vip02.png);
+}
+.img3 {
+	background-image: url(https://mshopimg.yolipai.net/miniapp/images/giftbag/vip03.png);
+}
+.top_card_tite_box {
+	width: 100%;
+	display: -webkit-box;
+	display: -webkit-flex;
+	display: flex;
+	-webkit-box-pack: end;
+	-webkit-justify-content: flex-end;
+	        justify-content: flex-end;
+}
+.top_card_tite_a {
+	padding: 5rpx 25rpx 5rpx 25rpx;
+	line-height: 29rpx;
+	font-size: 25rpx;
+	color: #FFFFFF;
+	background: #ffa7c0;
+	border-radius: 0rpx 20rpx 0rpx 6rpx;
+}
+.top_card_tite_b {
+	padding: 5rpx 25rpx 5rpx 25rpx;
+	line-height: 29rpx;
+	font-size: 25rpx;
+	color: #FFFFFF;
+	background: #50dfdb;
+	border-radius: 0rpx 20rpx 0rpx 6rpx;
+}
+.top_card_tite_c {
+	padding: 5rpx 25rpx 5rpx 25rpx;
+	line-height: 29rpx;
+	font-size: 25rpx;
+	color: #FFFFFF;
+	background: #92cbff;
+	border-radius: 0rpx 20rpx 0rpx 6rpx;
+}
+.top_card_tite_d {
+	padding: 5rpx 25rpx 5rpx 25rpx;
+	line-height: 29rpx;
+	font-size: 25rpx;
+	color: #FFFFFF;
+	border-radius: 0rpx 20rpx 0rpx 6rpx;
+}
+.top_card_counte {
+	padding: 40rpx 20rpx 0 0;
+	text-align: center;
+	display: -webkit-box;
+	display: -webkit-flex;
+	display: flex;
+	-webkit-box-pack: center;
+	-webkit-justify-content: center;
+	        justify-content: center;
+	-webkit-box-align: center;
+	-webkit-align-items: center;
+	        align-items: center;
+	color: #FFFFFF;
+	font-size: 40rpx;
+}
+.top_card_remak {
+	padding: 20rpx 0 40rpx 0;
+	text-align: center;
+	display: -webkit-box;
+	display: -webkit-flex;
+	display: flex;
+	-webkit-box-pack: center;
+	-webkit-justify-content: center;
+	        justify-content: center;
+	-webkit-box-align: center;
+	-webkit-align-items: center;
+	        align-items: center;
+	font-size: 20rpx;
+	color: #FFFFFF;
+}
+.top_card_button_a button {
+	margin: 0 85rpx;
+	background: #ffa6bc;
+	border-radius: 50rpx;
+	line-height: 40rpx;
+	height: 40rpx;
+	color: white;
+	font-size: 25rpx;
+}
+.top_card_button_b button {
+	margin: 0 85rpx;
+	background: #50dfdb;
+	border-radius: 50rpx;
+	line-height: 40rpx;
+	height: 40rpx;
+	color: white;
+	font-size: 25rpx;
+}
+.top_card_button_c button {
+	margin: 0 85rpx;
+	background: #75bcfc;
+	border-radius: 50rpx;
+	line-height: 40rpx;
+	height: 40rpx;
+	color: white;
+	font-size: 25rpx;
+}
+.top_card_button_d button {
+	margin: 0 85rpx;
+	border-radius: 50rpx;
+	line-height: 40rpx;
+	height: 40rpx;
+	color: white;
+	font-size: 25rpx;
+}
+.top_box_image {
+	padding: 20rpx 20rpx 20rpx 20rpx;
+}
+.top_box_image image {
+	height: 216rpx;
+	width: 100%;
+}
+.top_box_image button {
+	margin: 15rpx 95rpx 0rpx 95rpx;
+	background: #fe6a6a;
+	border-radius: 50rpx;
+	line-height: 60rpx;
+	height: 60rpx;
+	color: white;
+	font-size: 30rpx;
+}
+.foot_box {
+	margin: 0 30rpx 40rpx 30rpx;
+	background: #FFFFFF;
+	border-radius: 20rpx;
+}
+.foot_box_title {
+	font-size: 43rpx;
+	color: #000000;
+	padding: 20rpx 30rpx 20rpx 30rpx;
+}
+.foot_box_text {
+	font-size: 30rpx;
+	color: #000000;
+	line-height: 48rpx;
+	padding: 20rpx 35rpx 50rpx 30rpx;
+}
+.button_box {
+	margin: 50rpx 50rpx 50rpx 50rpx;
+	text-align: center;
+}
+.button {
+	margin: 0 30rpx;
+	background: #61d3dd;
+	border-radius: 50rpx;
+	line-height: 80rpx;
+	height: 80rpx;
+	color: white;
+	font-size: 35rpx;
+}
+.button_text {
+	padding-top: 20rpx;
+	font-size: 20rpx;
+	color: white;
+	height: 100rpx;
+}
+.foot_empty {
+	height: 90rpx;
+}
+.foot_button {
+	display: -webkit-box;
+	display: -webkit-flex;
+	display: flex;
+	margin: 20rpx 0rpx 0rpx 0rpx;
+	padding: 25rpx 0rpx;
+	background: #FFFFFF;
+	text-align: center;
+	-webkit-box-pack: center;
+	-webkit-justify-content: center;
+	        justify-content: center;
+	position: fixed;
+	bottom: 0;
+	left: 0;
+	width: 100%;
+}
+.foot_button_buy {
+	background: #e4010c;
+	color: #FFFFFF;
+	width: 400rpx;
+	height: 70rpx;
+	font-size: 28rpx;
+	line-height: 70rpx;
+	border-radius: 30rpx 30rpx 30rpx 30rpx;
+}
+.foot_button_notbuy{
+	background: #999999;
+	color: #FFFFFF;
+	width: 400rpx;
+	height: 70rpx;
+	font-size: 28rpx;
+	line-height: 70rpx;
+	border-radius: 30rpx 30rpx 30rpx 30rpx;
+}
+page {
+  background-color: #9be0e5;
+}
+button::after {
+  border: none;
+}
+.foot_box_text ._img {
+  width: 100%;
+}
+.foot_box_text .img {
+  line-height: 0;
+}
+
diff --git a/pages/giftpack/evaluategift/evaluategift.js b/pages/giftpack/evaluategift/evaluategift.js
new file mode 100644
index 0000000..518c9a6
--- /dev/null
+++ b/pages/giftpack/evaluategift/evaluategift.js
@@ -0,0 +1,208 @@
+var _default =
+{
+  data: function data() {
+    return {
+      itemShow: false, //项目栏目是否显示
+      cardShow: false, //代金券栏目是否显示
+      packShow: false, //福利栏目是否显示
+      textShow: false, //规则是否显示
+      integralShow: true, //积分领取是否显示
+      growUpShow: true, //成长值领取是否显示
+      itemButton: '',
+      cardButton: '',
+      getActId: '',
+      getActType: '',
+      giftID: '',
+      getUserID: '',
+      getStorageID: '',
+      receiveState: '已领取',
+      integralTitle: '已领取',
+      growUpTitle: '已领取',
+      textTitle: '',
+      getUrl: '',
+      noShow: false,
+      //判断中间的连接线是否显示
+      itemShows: function itemShows() {
+        if (this.itemShow) {
+          if (this.cardShow) {
+            return true;
+          } else {
+            return false;
+          }
+        } else {
+          if (this.cardShow) {
+            return false;
+          } else {
+            return false;
+          }
+
+        }
+      },
+      //判断中间的连接线是否显示
+      cardShows: function cardShows() {
+        if (this.cardShow) {
+          if (this.packShow) {
+            return true;
+          } else {
+            return false;
+          }
+        } else {
+          if (this.packShow) {
+            return false;
+          } else {
+            return false;
+          }
+
+        }
+      },
+      cards: [],
+      itemWare: []
+    };
+
+
+
+  },
+  onLoad: function onLoad(options) {
+
+    // 获取url对应的参数
+    // this.getActId = this.GetQueryString('actId'); //活动id
+    // this.getActType = this.GetQueryString('actType'); //活动类型 1新人礼 2评价有礼 3节日营销 4生日营销
+    // this.giftID = this.GetQueryString('giftID'); //礼包ID
+    // this.getStorageID = this.GetQueryString('storageID'); //商家ID
+    // this.getUserID = this.GetQueryString('userID'); //用户ID
+
+    this.getActId = options.actId; //活动id
+    this.getActType = options.actType; //活动类型 1新人礼 2评价有礼 3节日营销 4生日营销
+    this.giftID = options.giftBagId; //礼包ID
+    this.getStorageID = options.storeId; //商家ID
+    this.getUserID = options.userId; //用户ID      
+
+    this.GetList();
+
+  },
+  onShow: function onShow() {
+    this.textTitle = this.textTitle.replace(/<p><img/gi, "<p class='img'><img");
+  },
+  methods: {
+
+    getQueryString: function getQueryString(name) {
+      var reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)', 'i');
+      var r = window.location.search.substr(1).match(reg);
+      if (r != null) {
+        return unescape(r[2]);
+      }
+      return null;
+    },
+
+    GetList: function GetList() {
+      var _this = this;
+      uni.request({
+        url: this.$GetInfo.ApiHttp + '/api/weshop/marketing/giftbag/bound/get',
+        data: {
+          "actId": this.getActId, //活动id
+          "actType": this.getActType, //活动类型 1新人礼 2评价有礼 3节日营销 4生日营销
+          "giftBagId": this.giftID, //礼包ID
+          "storeId": this.getStorageID, //商家ID
+          "userId": this.getUserID //用户ID
+        },
+        method: 'GET',
+        header: {
+          'Content-Type': 'application/x-www-form-urlencoded' //自定义请求头信息
+        },
+        success: function success(res) {
+          console.log(res.data);
+          if (res.data.code == 0) {
+            if (res.data.data.lbCoupons != null) {
+              _this.cardShow = true;
+              _this.cards = res.data.data.lbCoupons;
+            }
+            if (res.data.data.lbSM != null) {
+              _this.itemShow = true;
+              _this.itemWare = res.data.data.lbSM;
+            }
+            if (res.data.data.lbIntegral <= 0) {
+              if (res.data.data.lbGrowthValue <= 0) {
+                _this.packShow = false;
+              } else {
+                _this.packShow = true;
+                _this.integralShow = false;
+                _this.growUpShow = true;
+              }
+
+            } else {
+              if (res.data.data.lbGrowthValue > 0) {
+                _this.packShow = true;
+              } else {
+                _this.packShow = true;
+                _this.integralShow = true;
+                _this.growUpShow = false;
+              }
+            }
+
+            _this.integralTitle = '领取' + res.data.data.lbIntegral + '积分';
+            _this.growUpTitle = '领取' + res.data.data.lbGrowthValue + '积分';
+            if (res.data.data.receiveState == 0) {
+              _this.receiveState = '一键全部领取';
+            } else {
+              _this.receiveState = '已领取';
+            }
+
+
+            if (res.data.data.actIntro != '') {
+              _this.textShow = true;
+              _this.textTitle = res.data.data.actIntro;
+            }
+
+          } else {
+            console.log(res.data.msg);
+          }
+        }
+      });
+
+    },
+    GetWebHttp: function GetWebHttp() {
+      this.getUrl = this.$GetInfo.HtmlHttp + '/mobile/index/index/stoid/' + this.getStorageID + '.html';
+      window.location.href = this.getUrl;
+    },
+    GetReceive: function GetReceive() {
+      var that = this;
+      if (that.receiveState == '已领取') {
+        return false;
+      }
+      uni.request({
+        url: that.$GetInfo.ApiHttp + '/api/weshop/marketing/free/receive/gift/record/insert',
+        data: {
+          "actId": that.getActId, //活动Id
+          "actType": '2', //活动类型 1:新人礼、2:评价有礼、3:节日营销、4:生日营销
+          "lbId": that.giftID, //礼包Id
+          "storeId": that.getStorageID, //商家Id
+          "userId": that.getUserID //用户ID
+        },
+        method: 'POST',
+        header: {
+          'Content-Type': 'application/json' //自定义请求头信息
+        },
+        success: function success(res) {
+          console.log(res.data);
+          if (res.data.code == 0) {
+            console.log(res.data.msg);
+            that.receiveState = '已领取';
+            uni.showToast({
+              icon: 'none',
+              title: '领取成功！'
+            });
+
+          } else {
+            console.log(res.data.msg);
+            uni.showToast({
+              icon: 'none',
+              title: res.data.msg
+            });
+
+          }
+        }
+      });
+
+    }
+  }
+};
\ No newline at end of file
diff --git a/pages/giftpack/evaluategift/evaluategift.json b/pages/giftpack/evaluategift/evaluategift.json
new file mode 100644
index 0000000..3ad8f9f
--- /dev/null
+++ b/pages/giftpack/evaluategift/evaluategift.json
@@ -0,0 +1,5 @@
+{
+  "navigationBarTitleText": "评价有礼",
+  "navigationStyle": "custom",
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/pages/giftpack/evaluategift/evaluategift.wxml b/pages/giftpack/evaluategift/evaluategift.wxml
new file mode 100644
index 0000000..785e09f
--- /dev/null
+++ b/pages/giftpack/evaluategift/evaluategift.wxml
@@ -0,0 +1,165 @@
+<view >
+    <view class="image_box">
+        <image src="{{$GetInfo.imgHttp+'/miniapp/images/giftbag/eval00.png'}}" ></image>
+    </view>
+    <block wx:if="{{this.itemShow}}">
+        <view class="top">
+            <view class="top_box">
+                <view class="top_box_text">
+                    <text >______</text>
+                </view>
+                <view class="top_box_text">
+                    <text >新人专享\n你的美丽我来缔造</text>
+                </view>
+                <view class="top_box_text">
+                    <text >______</text>
+                </view>
+            </view>
+            <block wx:for="{{itemWare}}" wx:for-item="item" wx:for-index="index" wx:key="index">
+                <view class="top_item">
+                    <block wx:if="{{item.lbType==3}}">
+                        <view class="top_item_img">
+                            <image src="{{$GetInfo.imgHttp+'/miniapp/images/giftbag/gift02.png'}}" ></image>
+                        </view>
+                    </block>
+                    <block wx:if="{{item.lbType==1}}">
+                        <view class="top_item_img">
+                            <image src="{{item.fromImage==''?$GetInfo.imgHttp+'/miniapp/images/giftbag/empty.jpg':$GetInfo.imgHttp+item.fromImage}}" ></image>
+                        </view>
+                    </block>
+                    <view class="top_item_center">
+                        <view class="top_item_center_title">
+                            <block wx:if="{{item.lbType==1}}">
+                                <text >免费领取</text>
+                            </block>
+                            <block wx:if="{{item.lbType==3}}">
+                                <text >{{item.fromName}}</text>
+                            </block>
+                        </view>
+                        <view class="top_item_center_ramke">
+                            <block wx:if="{{item.lbType==1}}">
+                                <text >{{item.fromName}}</text>
+                            </block>
+                            <block wx:if="{{item.lbType==3}}">
+                                <text >{{"新人可免费享受专业"+item.fromName+"，可以享受"+item.num+"次。"}}</text>
+                            </block>
+                        </view>
+                    </view>
+                </view>
+            </block>
+        </view>
+    </block>
+    <block wx:if="{{$root.g0}}">
+        <view >
+            <image style="width:10px;height:47px;float:left;top:-38px;left:55px;" src="{{this.$GetInfo.imgHttp+'/miniapp/images/giftbag/eval01.png'}}" ></image>
+            <image style="width:10px;height:47px;float:right;top:-38px;right:55px;" src="{{this.$GetInfo.imgHttp+'/miniapp/images/giftbag/eval01.png'}}" ></image>
+        </view>
+    </block>
+    <block wx:if="{{this.cardShow}}">
+        <view >
+            <view class="top">
+                <view class="top_box">
+                    <view class="top_box_text">
+                        <text >———</text>
+                    </view>
+                    <view class="top_box_text">
+                        <text >新人专享优惠券</text>
+                    </view>
+                    <view class="top_box_text">
+                        <text >———</text>
+                    </view>
+                </view>
+                <block wx:for="{{cards}}" wx:for-item="item" wx:for-index="index" wx:key="index">
+                    <view class="top_card">
+                        <view class="{{['data-v-903fed06',item.useObjectType==1?'top_card_box img1':item.useObjectType==2?'top_card_box img2':'top_card_box img3']}}">
+                            <view class="top_card_tite_box">
+                                <block wx:if="{{item.useObjectType==0}}">
+                                    <view class="top_card_tite_a">全场通用</view>
+                                </block>
+                                <block wx:if="{{item.useObjectType==1}}">
+                                    <view class="top_card_tite_b">品牌限定</view>
+                                </block>
+                                <block wx:if="{{item.useObjectType==2}}">
+                                    <view class="top_card_tite_c">品类限定</view>
+                                </block>
+                                <block wx:if="{{item.useObjectType==11}}">
+                                    <view class="top_card_tite_a">用途限定</view>
+                                </block>
+                                <block wx:if="{{item.useObjectType==12}}">
+                                    <view class="top_card_tite_a">分类1限定</view>
+                                </block>
+                            </view>
+                            <view class="top_card_counte">{{item.sum+"元券"}}</view>
+                            <view class="top_card_remak">{{"满"+item.buySum+"元可以用"}}</view>
+                        </view>
+                    </view>
+                </block>
+            </view>
+        </view>
+    </block>
+    <block wx:if="{{$root.g1}}">
+        <view >
+            <view >
+                <image style="width:10px;height:47px;float:left;top:-38px;left:55px;" src="{{this.$GetInfo.imgHttp+'/miniapp/images/giftbag/eval01.png'}}" ></image>
+                <image style="width:10px;height:47px;float:right;top:-38px;right:55px;" src="{{this.$GetInfo.imgHttp+'/miniapp/images/giftbag/eval01.png'}}" ></image>
+            </view>
+        </view>
+    </block>
+    <block wx:if="{{this.packShow}}">
+        <view >
+            <view class="top">
+                <view class="top_box">
+                    <view class="top_box_text">
+                        <text >———</text>
+                    </view>
+                    <view class="top_box_text">
+                        <text >新人专享福利</text>
+                    </view>
+                    <view class="top_box_text">
+                        <text >———</text>
+                    </view>
+                </view>
+                <block wx:if="{{this.integralShow}}">
+                    <view >
+                        <view class="top_box_image">
+                            <image src="{{this.$GetInfo.imgHttp+'/miniapp/images/giftbag/vip06.jpg'}}" ></image>
+                            <button >{{this.integralTitle}}</button>
+                        </view>
+                    </view>
+                </block>
+                <block wx:if="{{this.growUpShow}}">
+                    <view >
+                        <view class="top_box_image">
+                            <image src="{{this.$GetInfo.imgHttp+'/miniapp/images/giftbag/vip07.jpg'}}" ></image>
+                            <button >{{this.growUpTitle}}</button>
+                        </view>
+                    </view>
+                </block>
+            </view>
+        </view>
+    </block>
+    <block wx:if="{{this.textShow}}">
+        <view class="foot_box">
+            <view class="foot_box_title">
+                <text >活动规则:</text>
+            </view>
+            <view class="foot_box_text">
+                <rich-text nodes="{{this.textTitle}}"></rich-text>
+            </view>
+        </view>
+    </block>
+    <view class="button_box">
+        <view >
+            <button data-event-opts="{{[['tap',[['GetWebHttp',['$event']]]]]}}" class="button" bindtap="__e">进入商城购物</button>
+        </view>
+        <view class="button_text">
+            <text >本活动最终解释权归公司所有，如果有问题请联系客服</text>
+        </view>
+    </view>
+    <view class="foot_empty"></view>
+    <view class="foot_button">
+        <view class="{{['data-v-903fed06',this.receiveState=='已领取'?'foot_button_notbuy':'foot_button_buy']}}">
+            <text data-event-opts="{{[['tap',[['GetReceive',['$event']]]]]}}" bindtap="__e" >{{this.receiveState}}</text>
+        </view>
+    </view>
+</view>
\ No newline at end of file
diff --git a/pages/giftpack/evaluategift/evaluategift.wxss b/pages/giftpack/evaluategift/evaluategift.wxss
new file mode 100644
index 0000000..c5ac6fa
--- /dev/null
+++ b/pages/giftpack/evaluategift/evaluategift.wxss
@@ -0,0 +1,339 @@
+@charset "UTF-8";
+/* Author XGQ
+ * 2019-10-27
+ */
+.image_box {
+	-webkit-box-pack: center;
+	-webkit-justify-content: center;
+	        justify-content: center;
+}
+.image_box image {
+	width: 100%;
+	height: 690rpx;
+}
+.top {
+	margin: -20rpx 28rpx 45rpx 28rpx;
+	padding: 10rpx 10rpx 70rpx 10rpx;
+	background-color: #FFFFFF;
+	border-radius: 0rpx 0rpx 15rpx 15rpx;
+}
+.top_box {
+	display: -webkit-box;
+	display: -webkit-flex;
+	display: flex;
+	text-align: center;
+	-webkit-box-pack: center;
+	-webkit-justify-content: center;
+	        justify-content: center;
+}
+.top_box_text {
+	-webkit-box-pack: center;
+	-webkit-justify-content: center;
+	        justify-content: center;
+	margin: 50rpx 15rpx 20rpx 15rpx;
+}
+.top_box_text text {
+	color: #FB6451;
+	font-size: 40rpx;
+}
+.top_item {
+	display: -webkit-box;
+	display: -webkit-flex;
+	display: flex;
+	width: 100%;
+	margin: 60rpx 0 0 0;
+}
+.top_item_img {
+	float: left;
+	width: 28%;
+	margin: 0rpx 10rpx 0rpx 20rpx;
+}
+.top_item_img image {
+	width: 150rpx;
+	height: 150rpx;
+	border-radius: 50%;
+	border: #F96865 solid 3rpx;
+}
+.top_item_center {
+	float: left;
+	width: 50%;
+}
+.top_item_center_title {
+	font-size: 35rpx;
+	color: #FB6451;
+	-webkit-box-pack: start;
+	-webkit-justify-content: flex-start;
+	        justify-content: flex-start;
+	padding: 0 10rpx 15rpx 0rpx;
+	word-break: break-all;
+	/*属性规定自动换行的处理方法。normal(使用浏览器默认的换行规则。),break-all(允许在单词内换行。),keep-all(只能在半角空格或连字符处换行。)*/
+	text-overflow: ellipsis;
+	display: -webkit-box;
+	/** 对象作为伸缩盒子模型显示 **/
+	-webkit-box-orient: vertical;
+	/** 设置或检索伸缩盒对象的子元素的排列方式 **/
+	-webkit-line-clamp: 2;
+	/** 显示的行数 **/
+	overflow: hidden;
+	/** 隐藏超出的内容 **/
+}
+.top_item_center_ramke {
+	font-size: 25rpx;
+	-webkit-box-pack: start;
+	-webkit-justify-content: flex-start;
+	        justify-content: flex-start;
+	line-height: 35rpx;
+	letter-spacing: 0.5rpx;
+	word-break: break-all;
+	/*属性规定自动换行的处理方法。normal(使用浏览器默认的换行规则。),break-all(允许在单词内换行。),keep-all(只能在半角空格或连字符处换行。)*/
+	text-overflow: ellipsis;
+	display: -webkit-box;
+	/** 对象作为伸缩盒子模型显示 **/
+	-webkit-box-orient: vertical;
+	/** 设置或检索伸缩盒对象的子元素的排列方式 **/
+	-webkit-line-clamp: 2;
+	/** 显示的行数 **/
+	overflow: hidden;
+	/** 隐藏超出的内容 **/
+}
+.top_item_button {
+	float: right;
+	width: 22%;
+	padding: 65rpx 20rpx 0 1rpx;
+}
+.top_item_button button {
+	font-size: 25rpx;
+	background: #fd6969;
+	color: #FFFFFF;
+	border-radius: 50rpx;
+	height: 45rpx;
+	line-height: 45rpx;
+}
+.top_card {
+	width: calc(50% - 30rpx);
+	display: inline-block;
+	margin: 15rpx;
+}
+.top_card_box {
+	background-size: cover;
+	background-position: center;
+	background-repeat: no-repeat;
+	border-radius: 20rpx;
+	height: 250rpx;
+	margin: 5rpx;
+}
+.img1 {
+	background-image: url(https://mshopimg.yolipai.net/miniapp/images/giftbag/vip01.png);
+}
+.img2 {
+	background-image: url(https://mshopimg.yolipai.net/miniapp/images/giftbag/vip02.png);
+}
+.img3 {
+	background-image: url(https://mshopimg.yolipai.net/miniapp/images/giftbag/vip03.png);
+}
+.top_card_tite_box {
+	width: 100%;
+	display: -webkit-box;
+	display: -webkit-flex;
+	display: flex;
+	-webkit-box-pack: end;
+	-webkit-justify-content: flex-end;
+	        justify-content: flex-end;
+}
+.top_card_tite_a {
+	padding: 5rpx 25rpx 5rpx 25rpx;
+	line-height: 29rpx;
+	font-size: 25rpx;
+	color: #FFFFFF;
+	background: #ffa7c0;
+	border-radius: 0rpx 20rpx 0rpx 6rpx;
+}
+.top_card_tite_b {
+	padding: 5rpx 25rpx 5rpx 25rpx;
+	line-height: 29rpx;
+	font-size: 25rpx;
+	color: #FFFFFF;
+	background: #50dfdb;
+	border-radius: 0rpx 20rpx 0rpx 6rpx;
+}
+.top_card_tite_c {
+	padding: 5rpx 25rpx 5rpx 25rpx;
+	line-height: 29rpx;
+	font-size: 25rpx;
+	color: #FFFFFF;
+	background: #92cbff;
+	border-radius: 0rpx 20rpx 0rpx 6rpx;
+}
+.top_card_tite_d {
+	padding: 5rpx 25rpx 5rpx 25rpx;
+	line-height: 29rpx;
+	font-size: 25rpx;
+	color: #FFFFFF;
+	border-radius: 0rpx 20rpx 0rpx 6rpx;
+}
+.top_card_counte {
+	padding: 40rpx 20rpx 0 0;
+	text-align: center;
+	display: -webkit-box;
+	display: -webkit-flex;
+	display: flex;
+	-webkit-box-pack: center;
+	-webkit-justify-content: center;
+	        justify-content: center;
+	-webkit-box-align: center;
+	-webkit-align-items: center;
+	        align-items: center;
+	color: #FFFFFF;
+	font-size: 40rpx;
+}
+.top_card_remak {
+	padding: 20rpx 0 40rpx 0;
+	text-align: center;
+	display: -webkit-box;
+	display: -webkit-flex;
+	display: flex;
+	-webkit-box-pack: center;
+	-webkit-justify-content: center;
+	        justify-content: center;
+	-webkit-box-align: center;
+	-webkit-align-items: center;
+	        align-items: center;
+	font-size: 20rpx;
+	color: #FFFFFF;
+}
+.top_card_button_a button {
+	margin: 0 85rpx;
+	background: #ffa6bc;
+	border-radius: 50rpx;
+	line-height: 40rpx;
+	height: 40rpx;
+	color: white;
+	font-size: 25rpx;
+}
+.top_card_button_b button {
+	margin: 0 85rpx;
+	background: #50dfdb;
+	border-radius: 50rpx;
+	line-height: 40rpx;
+	height: 40rpx;
+	color: white;
+	font-size: 25rpx;
+}
+.top_card_button_c button {
+	margin: 0 85rpx;
+	background: #75bcfc;
+	border-radius: 50rpx;
+	line-height: 40rpx;
+	height: 40rpx;
+	color: white;
+	font-size: 25rpx;
+}
+.top_card_button_d button {
+	margin: 0 85rpx;
+	border-radius: 50rpx;
+	line-height: 40rpx;
+	height: 40rpx;
+	color: white;
+	font-size: 25rpx;
+}
+.top_box_image {
+	padding: 20rpx 20rpx 20rpx 20rpx;
+}
+.top_box_image image {
+	height: 216rpx;
+	width: 100%;
+}
+.top_box_image button {
+	margin: 15rpx 95rpx 0rpx 95rpx;
+	background: #fe6a6a;
+	border-radius: 50rpx;
+	line-height: 60rpx;
+	height: 60rpx;
+	color: white;
+	font-size: 30rpx;
+}
+.foot_box {
+	margin: 0 30rpx 40rpx 30rpx;
+	background: #FFFFFF;
+	border-radius: 20rpx;
+}
+.foot_box_title {
+	font-size: 43rpx;
+	color: #000000;
+	padding: 20rpx 30rpx 20rpx 30rpx;
+}
+.foot_box_text {
+	font-size: 30rpx;
+	color: #000000;
+	line-height: 48rpx;
+	padding: 20rpx 35rpx 50rpx 30rpx;
+}
+.button_box {
+	margin: 50rpx 50rpx 50rpx 50rpx;
+	text-align: center;
+}
+.button {
+	margin: 0 30rpx;
+	background: #5d93f5;
+	border-radius: 50rpx;
+	line-height: 80rpx;
+	height: 80rpx;
+	color: white;
+	font-size: 35rpx;
+}
+.button_text {
+	padding-top: 20rpx;
+	font-size: 20rpx;
+	color: white;
+	height: 100rpx;
+}
+.foot_empty {
+	height: 90rpx;
+}
+.foot_button {
+	display: -webkit-box;
+	display: -webkit-flex;
+	display: flex;
+	margin: 20rpx 0rpx 0rpx 0rpx;
+	padding: 25rpx 0rpx;
+	background: #FFFFFF;
+	text-align: center;
+	-webkit-box-pack: center;
+	-webkit-justify-content: center;
+	        justify-content: center;
+	position: fixed;
+	bottom: 0;
+	left: 0;
+	width: 100%;
+}
+.foot_button_buy {
+	background: #e4010c;
+	color: #FFFFFF;
+	width: 400rpx;
+	height: 70rpx;
+	font-size: 28rpx;
+	line-height: 70rpx;
+	border-radius: 30rpx 30rpx 30rpx 30rpx;
+}
+.foot_button_notbuy{
+	background: #999999;
+	color: #FFFFFF;
+	width: 400rpx;
+	height: 70rpx;
+	font-size: 28rpx;
+	line-height: 70rpx;
+	border-radius: 30rpx 30rpx 30rpx 30rpx;
+}
+page {
+  background-color: #4784ef;
+}
+button::after {
+  border: none;
+}
+.foot_box_text ._img {
+  width: 100%;
+}
+.foot_box_text .img {
+  line-height: 0;
+}
+
diff --git a/pages/giftpack/newvipgift/newvipgift.js b/pages/giftpack/newvipgift/newvipgift.js
new file mode 100644
index 0000000..1c09a82
--- /dev/null
+++ b/pages/giftpack/newvipgift/newvipgift.js
@@ -0,0 +1,209 @@
+var _default =
+{
+  data: function data() {
+    return {
+      itemShow: false, //项目栏目是否显示
+      cardShow: false, //代金券栏目是否显示
+      packShow: false, //福利栏目是否显示
+      textShow: false, //规则是否显示
+      integralShow: true, //积分领取是否显示
+      growUpShow: true, //成长值领取是否显示
+      itemButton: '',
+      cardButton: '',
+      getActId: '',
+      getActType: '',
+      giftID: '',
+      getUserID: '',
+      getStorageID: '',
+      receiveState: '已领取',
+      integralTitle: '已领取',
+      growUpTitle: '已领取',
+      textTitle: '',
+      getUrl: '',
+      noShow: false,
+      //判断中间的连接线是否显示
+      itemShows: function itemShows() {
+        if (this.itemShow) {
+          if (this.cardShow) {
+            return true;
+          } else {
+            return false;
+          }
+        } else {
+          if (this.cardShow) {
+            return false;
+          } else {
+            return false;
+          }
+
+        }
+      },
+      //判断中间的连接线是否显示
+      cardShows: function cardShows() {
+        if (this.cardShow) {
+          if (this.packShow) {
+            return true;
+          } else {
+            return false;
+          }
+        } else {
+          if (this.packShow) {
+            return false;
+          } else {
+            return false;
+          }
+
+        }
+      },
+      cards: [],
+      itemWare: []
+    };
+
+
+
+  },
+  onLoad: function onLoad(options) {
+
+    // 获取url对应的参数
+    // this.getActId = this.GetQueryString('actId'); //活动id
+    // this.getActType = this.GetQueryString('actType'); //活动类型 1新人礼 2评价有礼 3节日营销 4生日营销
+    // this.giftID = this.GetQueryString('giftID'); //礼包ID
+    // this.getStorageID = this.GetQueryString('storageID'); //商家ID
+    // this.getUserID = this.GetQueryString('userID'); //用户ID
+
+    this.getActId = options.actId; //活动id
+    this.getActType = options.actType; //活动类型 1新人礼 2评价有礼 3节日营销 4生日营销
+    this.giftID = options.giftBagId; //礼包ID
+    this.getStorageID = options.storeId; //商家ID
+    this.getUserID = options.userId; //用户ID      
+
+    this.GetList();
+
+  },
+  onShow: function onShow() {
+    this.textTitle = this.textTitle.replace(/<p><img/gi, "<p class='img'><img");
+  },
+  methods: {
+
+    getQueryString: function getQueryString(name) {
+      var reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)', 'i');
+      var r = window.location.search.substr(1).match(reg);
+      if (r != null) {
+        return unescape(r[2]);
+      }
+      return null;
+    },
+
+    GetList: function GetList() {
+      var _this = this;
+      uni.request({
+        url: this.$GetInfo.ApiHttp + '/api/weshop/marketing/giftbag/bound/get',
+        data: {
+          "actId": this.getActId, //活动id
+          "actType": this.getActType, //活动类型 1新人礼 2评价有礼 3节日营销 4生日营销
+          "giftBagId": this.giftID, //礼包ID
+          "storeId": this.getStorageID, //商家ID
+          "userId": this.getUserID //用户ID
+        },
+        method: 'GET',
+        header: {
+          'Content-Type': 'application/x-www-form-urlencoded' //自定义请求头信息
+        },
+        success: function success(res) {
+          console.log(res.data);
+          if (res.data.code == 0) {
+            if (res.data.data.lbCoupons != null) {
+              _this.cardShow = true;
+              _this.cards = res.data.data.lbCoupons;
+            }
+            if (res.data.data.lbSM != null) {
+              _this.itemShow = true;
+              _this.itemWare = res.data.data.lbSM;
+            }
+            if (res.data.data.lbIntegral <= 0) {
+              if (res.data.data.lbGrowthValue <= 0) {
+                _this.packShow = false;
+              } else {
+                _this.packShow = true;
+                _this.integralShow = false;
+                _this.growUpShow = true;
+              }
+
+            } else {
+              if (res.data.data.lbGrowthValue > 0) {
+                _this.packShow = true;
+              } else {
+                _this.packShow = true;
+                _this.integralShow = true;
+                _this.growUpShow = false;
+              }
+            }
+
+            _this.integralTitle = '领取' + res.data.data.lbIntegral + '积分';
+            _this.growUpTitle = '领取' + res.data.data.lbGrowthValue + '积分';
+            if (res.data.data.receiveState == 0) {
+              _this.receiveState = '一键全部领取';
+            } else {
+              _this.receiveState = '已领取';
+            }
+
+
+            if (res.data.data.actIntro != '') {
+              _this.textShow = true;
+              console.log(res.data.data.actIntro);
+              _this.textTitle = res.data.data.actIntro;
+            }
+
+          } else {
+            console.log(res.data.msg);
+          }
+        }
+      });
+
+    },
+    GetWebHttp: function GetWebHttp() {
+      this.getUrl = this.$GetInfo.HtmlHttp + '/mobile/index/index/stoid/' + this.getStorageID + '.html';
+      window.location.href = this.getUrl;
+    },
+    GetReceive: function GetReceive() {
+      var that = this;
+      if (that.receiveState == '已领取') {
+        return false;
+      }
+      uni.request({
+        url: that.$GetInfo.ApiHttp + '/api/weshop/marketing/free/receive/gift/record/insert',
+        data: {
+          "actId": that.getActId, //活动Id
+          "actType": '1', //活动类型 1:新人礼、2:评价有礼、3:节日营销、4:生日营销
+          "lbId": that.giftID, //礼包Id
+          "storeId": that.getStorageID, //商家Id
+          "userId": that.getUserID //用户ID
+        },
+        method: 'POST',
+        header: {
+          'Content-Type': 'application/json' //自定义请求头信息
+        },
+        success: function success(res) {
+          console.log(res.data);
+          if (res.data.code == 0) {
+            console.log(res.data.msg);
+            that.receiveState = '已领取';
+            uni.showToast({
+              icon: 'none',
+              title: '领取成功！'
+            });
+
+          } else {
+            console.log(res.data.msg);
+            uni.showToast({
+              icon: 'none',
+              title: res.data.msg
+            });
+
+          }
+        }
+      });
+
+    }
+  }
+};
\ No newline at end of file
diff --git a/pages/giftpack/newvipgift/newvipgift.json b/pages/giftpack/newvipgift/newvipgift.json
new file mode 100644
index 0000000..b818239
--- /dev/null
+++ b/pages/giftpack/newvipgift/newvipgift.json
@@ -0,0 +1,5 @@
+{
+  "navigationBarTitleText": "新人礼",
+  "navigationStyle": "custom",
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/pages/giftpack/newvipgift/newvipgift.wxml b/pages/giftpack/newvipgift/newvipgift.wxml
new file mode 100644
index 0000000..6233d10
--- /dev/null
+++ b/pages/giftpack/newvipgift/newvipgift.wxml
@@ -0,0 +1,165 @@
+<view>
+    <view class="image_box">
+        <image src="{{$GetInfo.imgHttp+'/miniapp/images/giftbag/vip00.png'}}" ></image>
+    </view>
+    <block wx:if="{{this.itemShow}}">
+        <view class="top">
+            <view class="top_box">
+                <view class="top_box_text">
+                    <text>______</text>
+                </view>
+                <view class="top_box_text">
+                    <text >新人专享\n你的美丽我来缔造</text>
+                </view>
+                <view class="top_box_text">
+                    <text >______</text>
+                </view>
+            </view>
+            <block wx:for="{{itemWare}}" wx:for-item="item" wx:for-index="index" wx:key="index">
+                <view class="top_item ">
+                    <block wx:if="{{item.lbType==3}}">
+                        <view class="top_item_img ">
+                            <image src="{{$GetInfo.imgHttp+'/miniapp/images/giftbag/gift02.png'}}" ></image>
+                        </view>
+                    </block>
+                    <block wx:if="{{item.lbType==1}}">
+                        <view class="top_item_img ">
+                            <image src="{{item.fromImage==''?$GetInfo.imgHttp+'/miniapp/images/giftbag/empty.jpg':$GetInfo.imgHttp+item.fromImage}}" ></image>
+                        </view>
+                    </block>
+                    <view class="top_item_center ">
+                        <view class="top_item_center_title ">
+                            <block wx:if="{{item.lbType==1}}">
+                                <text >免费领取</text>
+                            </block>
+                            <block wx:if="{{item.lbType==3}}">
+                                <text >{{item.fromName}}</text>
+                            </block>
+                        </view>
+                        <view class="top_item_center_ramke ">
+                            <block wx:if="{{item.lbType==1}}">
+                                <text >{{item.fromName}}</text>
+                            </block>
+                            <block wx:if="{{item.lbType==3}}">
+                                <text >{{"新人可免费享受专业"+item.fromName+"，可以享受"+item.num+"次。"}}</text>
+                            </block>
+                        </view>
+                    </view>
+                </view>
+            </block>
+        </view>
+    </block>
+    <block wx:if="{{$root.g0}}">
+        <view >
+            <image style="width:10px;height:47px;float:left;top:-38px;left:55px;" src="{{this.$GetInfo.imgHttp+'/miniapp/images/giftbag/vip05.png'}}" ></image>
+            <image style="width:10px;height:47px;float:right;top:-38px;right:55px;" src="{{this.$GetInfo.imgHttp+'/miniapp/images/giftbag/vip05.png'}}" ></image>
+        </view>
+    </block>
+    <block wx:if="{{this.cardShow}}">
+        <view >
+            <view class="top ">
+                <view class="top_box ">
+                    <view class="top_box_text ">
+                        <text >———</text>
+                    </view>
+                    <view class="top_box_text ">
+                        <text >新人专享优惠券</text>
+                    </view>
+                    <view class="top_box_text ">
+                        <text >———</text>
+                    </view>
+                </view>
+                <block wx:for="{{cards}}" wx:for-item="item" wx:for-index="index" wx:key="index">
+                    <view class="top_card ">
+                        <view class="{{['',item.useObjectType==1?'top_card_box img1':item.useObjectType==2?'top_card_box img2':'top_card_box img3']}}">
+                            <view class="top_card_tite_box ">
+                                <block wx:if="{{item.useObjectType==0}}">
+                                    <view class="top_card_tite_a ">全场通用</view>
+                                </block>
+                                <block wx:if="{{item.useObjectType==1}}">
+                                    <view class="top_card_tite_b ">品牌限定</view>
+                                </block>
+                                <block wx:if="{{item.useObjectType==2}}">
+                                    <view class="top_card_tite_c ">品类限定</view>
+                                </block>
+                                <block wx:if="{{item.useObjectType==11}}">
+                                    <view class="top_card_tite_a ">用途限定</view>
+                                </block>
+                                <block wx:if="{{item.useObjectType==12}}">
+                                    <view class="top_card_tite_a ">分类1限定</view>
+                                </block>
+                            </view>
+                            <view class="top_card_counte ">{{item.sum+"元券"}}</view>
+                            <view class="top_card_remak ">{{"满"+item.buySum+"元可以用"}}</view>
+                        </view>
+                    </view>
+                </block>
+            </view>
+        </view>
+    </block>
+    <block wx:if="{{$root.g1}}">
+        <view >
+            <view >
+                <image style="width:10px;height:47px;float:left;top:-38px;left:55px;" src="{{this.$GetInfo.imgHttp+'/miniapp/images/giftbag/vip05.png'}}" ></image>
+                <image style="width:10px;height:47px;float:right;top:-38px;right:55px;" src="{{this.$GetInfo.imgHttp+'/miniapp/images/giftbag/vip05.png'}}" ></image>
+            </view>
+        </view>
+    </block>
+    <block wx:if="{{this.packShow}}">
+        <view >
+            <view class="top ">
+                <view class="top_box ">
+                    <view class="top_box_text ">
+                        <text >———</text>
+                    </view>
+                    <view class="top_box_text ">
+                        <text >新人专享福利</text>
+                    </view>
+                    <view class="top_box_text ">
+                        <text >———</text>
+                    </view>
+                </view>
+                <block wx:if="{{this.integralShow}}">
+                    <view >
+                        <view class="top_box_image ">
+                            <image src="{{this.$GetInfo.imgHttp+'/miniapp/images/giftbag/vip06.jpg'}}" ></image>
+                            <button >{{this.integralTitle}}</button>
+                        </view>
+                    </view>
+                </block>
+                <block wx:if="{{this.growUpShow}}">
+                    <view >
+                        <view class="top_box_image ">
+                            <image src="{{this.$GetInfo.imgHttp+'/miniapp/images/giftbag/vip07.jpg'}}" ></image>
+                            <button >{{this.growUpTitle}}</button>
+                        </view>
+                    </view>
+                </block>
+            </view>
+        </view>
+    </block>
+    <block wx:if="{{this.textShow}}">
+        <view class="foot_box ">
+            <view class="foot_box_title ">
+                <text >活动规则:</text>
+            </view>
+            <view class="foot_box_text ">
+                <rich-text nodes="{{this.textTitle}}"></rich-text>
+            </view>
+        </view>
+    </block>
+    <view class="button_box ">
+        <view >
+            <button data-event-opts="{{[['tap',[['GetWebHttp',['$event']]]]]}}" class="button " bindtap="__e">进入商城购物</button>
+        </view>
+        <view class="button_text ">
+            <text >本活动最终解释权归公司所有，如果有问题请联系客服</text>
+        </view>
+    </view>
+    <view class="foot_empty "></view>
+    <view class="foot_button ">
+        <view class="{{['',this.receiveState=='已领取'?'foot_button_notbuy':'foot_button_buy']}}">
+            <text data-event-opts="{{[['tap',[['GetReceive',['$event']]]]]}}" bindtap="__e" >{{this.receiveState}}</text>
+        </view>
+    </view>
+</view>
\ No newline at end of file
diff --git a/pages/giftpack/newvipgift/newvipgift.wxss b/pages/giftpack/newvipgift/newvipgift.wxss
new file mode 100644
index 0000000..7a4b82a
--- /dev/null
+++ b/pages/giftpack/newvipgift/newvipgift.wxss
@@ -0,0 +1,339 @@
+@charset "UTF-8";
+/* Author XGQ
+ * 2019-10-27
+ */
+.image_box {
+	-webkit-box-pack: center;
+	-webkit-justify-content: center;
+	        justify-content: center;
+}
+.image_box image {
+	width: 100%;
+	height: 690rpx;
+}
+.top {
+	margin: -20rpx 28rpx 45rpx 28rpx;
+	padding: 10rpx 10rpx 70rpx 10rpx;
+	background-color: #FFFFFF;
+	border-radius: 0rpx 0rpx 15rpx 15rpx;
+}
+.top_box {
+	display: -webkit-box;
+	display: -webkit-flex;
+	display: flex;
+	text-align: center;
+	-webkit-box-pack: center;
+	-webkit-justify-content: center;
+	        justify-content: center;
+}
+.top_box_text {
+	-webkit-box-pack: center;
+	-webkit-justify-content: center;
+	        justify-content: center;
+	margin: 50rpx 15rpx 20rpx 15rpx;
+}
+.top_box_text text {
+	color: #FB6451;
+	font-size: 40rpx;
+}
+.top_item {
+	display: -webkit-box;
+	display: -webkit-flex;
+	display: flex;
+	width: 100%;
+	margin: 60rpx 0 0 0;
+}
+.top_item_img {
+	float: left;
+	width: 28%;
+	margin: 0rpx 10rpx 0rpx 20rpx;
+}
+.top_item_img image {
+	width: 150rpx;
+	height: 150rpx;
+	border-radius: 50%;
+	border: #F96865 solid 3rpx;
+}
+.top_item_center {
+	float: left;
+	width: 50%;
+}
+.top_item_center_title {
+	font-size: 35rpx;
+	color: #FB6451;
+	-webkit-box-pack: start;
+	-webkit-justify-content: flex-start;
+	        justify-content: flex-start;
+	padding: 0 10rpx 15rpx 0rpx;
+	word-break: break-all;
+	/*属性规定自动换行的处理方法。normal(使用浏览器默认的换行规则。),break-all(允许在单词内换行。),keep-all(只能在半角空格或连字符处换行。)*/
+	text-overflow: ellipsis;
+	display: -webkit-box;
+	/** 对象作为伸缩盒子模型显示 **/
+	-webkit-box-orient: vertical;
+	/** 设置或检索伸缩盒对象的子元素的排列方式 **/
+	-webkit-line-clamp: 2;
+	/** 显示的行数 **/
+	overflow: hidden;
+	/** 隐藏超出的内容 **/
+}
+.top_item_center_ramke {
+	font-size: 25rpx;
+	-webkit-box-pack: start;
+	-webkit-justify-content: flex-start;
+	        justify-content: flex-start;
+	line-height: 35rpx;
+	letter-spacing: 0.5rpx;
+	word-break: break-all;
+	/*属性规定自动换行的处理方法。normal(使用浏览器默认的换行规则。),break-all(允许在单词内换行。),keep-all(只能在半角空格或连字符处换行。)*/
+	text-overflow: ellipsis;
+	display: -webkit-box;
+	/** 对象作为伸缩盒子模型显示 **/
+	-webkit-box-orient: vertical;
+	/** 设置或检索伸缩盒对象的子元素的排列方式 **/
+	-webkit-line-clamp: 2;
+	/** 显示的行数 **/
+	overflow: hidden;
+	/** 隐藏超出的内容 **/
+}
+.top_item_button {
+	float: right;
+	width: 22%;
+	padding: 65rpx 20rpx 0 1rpx;
+}
+.top_item_button button {
+	font-size: 25rpx;
+	background: #fd6969;
+	color: #FFFFFF;
+	border-radius: 50rpx;
+	height: 45rpx;
+	line-height: 45rpx;
+}
+.top_card {
+	width: calc(50% - 30rpx);
+	display: inline-block;
+	margin: 15rpx;
+}
+.top_card_box {
+	background-size: cover;
+	background-position: center;
+	background-repeat: no-repeat;
+	border-radius: 20rpx;
+	height: 250rpx;
+	margin: 5rpx;
+}
+.img1 {
+	background-image: url(https://mshopimg.yolipai.net/miniapp/images/giftbag/vip01.png);
+}
+.img2 {
+	background-image: url(https://mshopimg.yolipai.net/miniapp/images/giftbag/vip02.png);
+}
+.img3 {
+	background-image: url(https://mshopimg.yolipai.net/miniapp/images/giftbag/vip03.png);
+}
+.top_card_tite_box {
+	width: 100%;
+	display: -webkit-box;
+	display: -webkit-flex;
+	display: flex;
+	-webkit-box-pack: end;
+	-webkit-justify-content: flex-end;
+	        justify-content: flex-end;
+}
+.top_card_tite_a {
+	padding: 5rpx 25rpx 5rpx 25rpx;
+	line-height: 29rpx;
+	font-size: 25rpx;
+	color: #FFFFFF;
+	background: #ffa7c0;
+	border-radius: 0rpx 20rpx 0rpx 6rpx;
+}
+.top_card_tite_b {
+	padding: 5rpx 25rpx 5rpx 25rpx;
+	line-height: 29rpx;
+	font-size: 25rpx;
+	color: #FFFFFF;
+	background: #50dfdb;
+	border-radius: 0rpx 20rpx 0rpx 6rpx;
+}
+.top_card_tite_c {
+	padding: 5rpx 25rpx 5rpx 25rpx;
+	line-height: 29rpx;
+	font-size: 25rpx;
+	color: #FFFFFF;
+	background: #92cbff;
+	border-radius: 0rpx 20rpx 0rpx 6rpx;
+}
+.top_card_tite_d {
+	padding: 5rpx 25rpx 5rpx 25rpx;
+	line-height: 29rpx;
+	font-size: 25rpx;
+	color: #FFFFFF;
+	border-radius: 0rpx 20rpx 0rpx 6rpx;
+}
+.top_card_counte {
+	padding: 40rpx 20rpx 0 0;
+	text-align: center;
+	display: -webkit-box;
+	display: -webkit-flex;
+	display: flex;
+	-webkit-box-pack: center;
+	-webkit-justify-content: center;
+	        justify-content: center;
+	-webkit-box-align: center;
+	-webkit-align-items: center;
+	        align-items: center;
+	color: #FFFFFF;
+	font-size: 40rpx;
+}
+.top_card_remak {
+	padding: 20rpx 0 40rpx 0;
+	text-align: center;
+	display: -webkit-box;
+	display: -webkit-flex;
+	display: flex;
+	-webkit-box-pack: center;
+	-webkit-justify-content: center;
+	        justify-content: center;
+	-webkit-box-align: center;
+	-webkit-align-items: center;
+	        align-items: center;
+	font-size: 20rpx;
+	color: #FFFFFF;
+}
+.top_card_button_a button {
+	margin: 0 85rpx;
+	background: #ffa6bc;
+	border-radius: 50rpx;
+	line-height: 40rpx;
+	height: 40rpx;
+	color: white;
+	font-size: 25rpx;
+}
+.top_card_button_b button {
+	margin: 0 85rpx;
+	background: #50dfdb;
+	border-radius: 50rpx;
+	line-height: 40rpx;
+	height: 40rpx;
+	color: white;
+	font-size: 25rpx;
+}
+.top_card_button_c button {
+	margin: 0 85rpx;
+	background: #75bcfc;
+	border-radius: 50rpx;
+	line-height: 40rpx;
+	height: 40rpx;
+	color: white;
+	font-size: 25rpx;
+}
+.top_card_button_d button {
+	margin: 0 85rpx;
+	border-radius: 50rpx;
+	line-height: 40rpx;
+	height: 40rpx;
+	color: white;
+	font-size: 25rpx;
+}
+.top_box_image {
+	padding: 20rpx 20rpx 20rpx 20rpx;
+}
+.top_box_image image {
+	height: 216rpx;
+	width: 100%;
+}
+.top_box_image button {
+	margin: 15rpx 95rpx 0rpx 95rpx;
+	background: #fe6a6a;
+	border-radius: 50rpx;
+	line-height: 60rpx;
+	height: 60rpx;
+	color: white;
+	font-size: 30rpx;
+}
+.foot_box {
+	margin: 0 30rpx 40rpx 30rpx;
+	background: #FFFFFF;
+	border-radius: 20rpx;
+}
+.foot_box_title {
+	font-size: 43rpx;
+	color: #000000;
+	padding: 20rpx 30rpx 20rpx 30rpx;
+}
+.foot_box_text {
+	font-size: 30rpx;
+	color: #000000;
+	line-height: 48rpx;
+	padding: 20rpx 35rpx 50rpx 30rpx;
+}
+.button_box {
+	margin: 50rpx 50rpx 50rpx 50rpx;
+	text-align: center;
+}
+.button {
+	margin: 0 30rpx;
+	background: #ff9a8c;
+	border-radius: 50rpx;
+	line-height: 80rpx;
+	height: 80rpx;
+	color: white;
+	font-size: 35rpx;
+}
+.button_text {
+	padding-top: 20rpx;
+	font-size: 20rpx;
+	color: white;
+	height: 100rpx;
+}
+.foot_empty {
+	height: 90rpx;
+}
+.foot_button {
+	display: -webkit-box;
+	display: -webkit-flex;
+	display: flex;
+	margin: 20rpx 0rpx 0rpx 0rpx;
+	padding: 25rpx 0rpx;
+	background: #FFFFFF;
+	text-align: center;
+	-webkit-box-pack: center;
+	-webkit-justify-content: center;
+	        justify-content: center;
+	position: fixed;
+	bottom: 0;
+	left: 0;
+	width: 100%;
+}
+.foot_button_buy {
+	background: #e4010c;
+	color: #FFFFFF;
+	width: 400rpx;
+	height: 70rpx;
+	font-size: 28rpx;
+	line-height: 70rpx;
+	border-radius: 30rpx 30rpx 30rpx 30rpx;
+}
+.foot_button_notbuy{
+	background: #999999;
+	color: #FFFFFF;
+	width: 400rpx;
+	height: 70rpx;
+	font-size: 28rpx;
+	line-height: 70rpx;
+	border-radius: 30rpx 30rpx 30rpx 30rpx;
+}
+page {
+  background-color: #fb6451;
+}
+button::after {
+  border: none;
+}
+.foot_box_text ._img {
+  width: 100%;
+}
+.foot_box_text .img {
+  line-height: 0;
+}
+