diff --git a/pages/giftpack/buygiftpack/giftpackbuy.js b/pages/giftpack/buygiftpack/giftpackbuy.js
new file mode 100644
index 0000000..9a43bc9
--- /dev/null
+++ b/pages/giftpack/buygiftpack/giftpackbuy.js
@@ -0,0 +1,170 @@
+Page({
+ data: function data() {
+ return {
+ getStorageID: '',
+ getUserID: '',
+ wareCard: [],
+ page: 0,
+ pageSize: 10,
+ isEmpty: true,
+ loadingType: 0, //定义加载方式 0---contentdown 1---contentrefresh 2---contentnomore
+ contentText: {
+ contentdown: '加载更多',
+ contentrefresh: '加载中...',
+ contentnomore: '已加载全部'
+ }
+ };
+
+
+ },
+ onLoad: function onLoad(options) {
+ this.getStorageID = options.stoid;
+ this.getUserID = options.userid;
+ },
+ onShow: function onShow() {
+ this.page = 1;
+ this.pageSize = 10;
+ this.loadingType = 0;
+ this.getList();
+ },
+ methods: {
+ MyGift: function MyGift() {
+ /*销毁跳转*/
+ uni.reLaunch({
+ url: '/pages/mygiftpack/mygiftpack?stoid=' + this.getStorageID + '&userid=' + this.getUserID
+ });
+
+ },
+ GetGiftPackList: function GetGiftPackList(getId, ojb) {
+ //不销毁调整
+ uni.navigateTo({
+ url: '/pages/mygiftpack/giftpackList?isBuy=1&stoid=' + this.getStorageID + '&userid=' + this.getUserID + '&id=' + getId
+ });
+
+ },
+ GetBuyPrice: function GetBuyPrice(getID, item) {
+ var that = this;
+ 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": '2', //1=积分兑换 2=余额购买
+ "lbId": getID, //礼包Id
+ "storeId": that.getStorageID, //商家Id
+ "userId": that.getUserID, //用户ID
+ "buyFrom": '1'
+ },
+ success: function success(res) {
+ if (res.data.code == 0) {
+ window.location.href = that.$GetInfo.HtmlHttp + '/Mobile/Payment/getPay.html?stoid=' + that.getStorageID + '&order_sn=' + res.data.data.orderSn + '&recharge_type=6';
+
+ } else {
+ console.log(res.data.msg);
+ uni.showToast({
+ icon: 'none',
+ title: res.data.msg
+ });
+
+ }
+ }
+ });
+
+ } else if (res.cancel) {
+ console.log('用户点击取消');
+ }
+ }
+ });
+
+
+ },
+ GetBuyIntegral: function GetBuyIntegral(getID, item) {
+ var that = this;
+ 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": getID, //礼包Id
+ "storeId": that.getStorageID, //商家Id
+ "userId": that.getUserID //用户ID
+ },
+ success: function success(res) {
+ console.log(res.data);
+ if (res.data.code == 0) {
+ console.log(res.data.msg);
+ uni.showToast({
+ icon: 'none',
+ title: '兑换成功！'
+ });
+
+ } else {
+ console.log(res.data.msg);
+ uni.showToast({
+ icon: 'none',
+ title: res.data.msg
+ });
+
+ }
+ }
+ });
+
+ } else if (res.cancel) {
+ console.log('用户点击取消');
+ }
+ }
+ });
+
+
+ },
+ getList: function getList() {
+ var _this = this; //上拉加载
+ var that = this;
+ if (that.loadingType != 0) {
+ return false;
+ }
+ that.loadingType = 1;
+ getApp().request.promiseGet('/api/weshop/marketing/giftbag/page', {
+ data: {
+ "storeId": this.getStorageID, //商家ID
+ "userId": this.getUserID, //用户ID
+ "page": this.page,
+ "pageSize": this.pageSize
+ },
+ success: function success(res) {
+ if (res.data.code == 0) {
+ if (res.data.data.total > 0) {
+ _this.isEmpty = false;
+ } else {
+ _this.isEmpty = true;
+ }
+ if (res.data.data.pageData.length == 0) {
+ _this.loadingType = 2;
+ } else {
+ console.log(_this.wareCard.length);
+ console.log(res.data.data.pageData.length);
+ if (_this.wareCard.length < res.data.data.pageData.length) {
+ for (var i = 0; i < res.data.data.pageData.length; i++) {
+ _this.wareCard.push(res.data.data.pageData[i]);
+ }
+ }
+
+ _this.loadingType = 0;
+ console.log(_this.wareCard);
+ }
+ }
+ }
+ });
+
+ }
+ }
+});
\ No newline at end of file
diff --git a/pages/giftpack/buygiftpack/giftpackbuy.json b/pages/giftpack/buygiftpack/giftpackbuy.json
new file mode 100644
index 0000000..778da93
--- /dev/null
+++ b/pages/giftpack/buygiftpack/giftpackbuy.json
@@ -0,0 +1,7 @@
+{
+ "navigationBarTitleText": "礼包列表",
+ "navigationStyle": "custom",
+ "usingComponents": {
+ "u-li-load-more": "/components/uLi-load-more/uLi-load-more"
+ }
+}
\ No newline at end of file
diff --git a/pages/giftpack/buygiftpack/giftpackbuy.wxml b/pages/giftpack/buygiftpack/giftpackbuy.wxml
new file mode 100644
index 0000000..6ed2300
--- /dev/null
+++ b/pages/giftpack/buygiftpack/giftpackbuy.wxml
@@ -0,0 +1,76 @@
+
+
+
+
+
+
+ 礼包列表
+
+
+
+ 我的礼包
+
+
+
+
+
+
+
+
+
+
+ {{items.giftTitle}}
+
+
+
+ {{"￥"+items.payMoney}}
+
+
+ /
+
+
+ {{items.payIntegral+"积分"}}
+
+
+
+ {{"原价:￥"+items.giftPosPrice}}
+
+
+ {{"活动时间:"+items.endTime}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/giftpack/buygiftpack/giftpackbuy.wxss b/pages/giftpack/buygiftpack/giftpackbuy.wxss
new file mode 100644
index 0000000..b052787
--- /dev/null
+++ b/pages/giftpack/buygiftpack/giftpackbuy.wxss
@@ -0,0 +1,207 @@
+
+/*引用样式路径*/
+@charset "UTF-8";
+/* Author XGQ
+ * 2019-11-12
+ */
+page {
+ background-color: #fb7454;
+}
+.top_img {
+ -webkit-align-content: center;
+ align-content: center;
+}
+.top_img image {
+ width: 100%;
+ height: 660rpx;
+}
+.top_title {
+ display: -webkit-box;
+ display: -webkit-flex;
+ display: flex;
+ background-color: #FFFFFF;
+ height: 85rpx;
+ border-radius: 10rpx 10rpx 0rpx 0rpx;
+ margin: 0rpx 20rpx 0rpx 20rpx;
+ -webkit-align-content: center;
+ align-content: center;
+}
+.top_title_box {
+ width: 49%;
+ -webkit-align-content: center;
+ align-content: center;
+ text-align: center;
+ padding: 15rpx;
+}
+.top_title_box_S {
+ width: 1%;
+ -webkit-align-content: center;
+ align-content: center;
+ text-align: center;
+ margin: 20rpx 0rpx 20rpx 0rpx;
+ border-left: #000000 solid 3rpx;
+}
+.top_title_redtext {
+ font-size: 30rpx;
+ color: #d61b30;
+}
+.top_title_blacktext {
+ font-size: 30rpx;
+ color: #000000;
+}
+.content_box {
+ background-color: #FFFFFF;
+ height: 375rpx;
+ margin: 10rpx 20rpx 0rpx 20rpx;
+ border-radius: 10rpx;
+}
+.content_box_ware {
+ border-bottom: #f5f5f5 solid 2rpx;
+ display: -webkit-box;
+ display: -webkit-flex;
+ display: flex;
+}
+.content_box_img {
+ margin: 20rpx 20rpx 20rpx 25rpx;
+ width: 35%;
+ display: -webkit-box;
+ display: -webkit-flex;
+ display: flex;
+ font-size: 8rpx;
+ position: relative;
+}
+.content_box_img image {
+ width: 100%;
+ height: 230rpx;
+}
+.content_box_title {
+ width: 65%;
+ margin: 25rpx 25rpx 10rpx 0rpx;
+ position: relative;
+}
+.content_ware_title {
+ font-size: 30rpx;
+ 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;
+ /** 隐藏超出的内容 **/
+}
+.content_ware_type {
+ font-size: 28rpx;
+ color: #c61a34;
+ margin-top: 10rpx;
+ position: absolute;
+ left: 0;
+ bottom: 100rpx;
+}
+.content_ware_price {
+ font-size: 20rpx;
+ color: #b9b5b5;
+ margin-top: 2rpx;
+ text-decoration: line-through;
+ position: absolute;
+ left: 0;
+ bottom: 70rpx;
+}
+.content_ware_time {
+ font-size: 25rpx;
+ color: #000000;
+ margin-top: 20rpx;
+ position: absolute;
+ left: 0;
+ bottom: 25rpx;
+}
+.content_box_button {
+ display: -webkit-box;
+ display: -webkit-flex;
+ display: flex;
+ -webkit-box-pack: end;
+ -webkit-justify-content: flex-end;
+ justify-content: flex-end;
+ position: relative;
+}
+.box_button_remark{
+ margin: 15rpx 0rpx 0rpx 30rpx;
+ width: 50%;
+ position: absolute;
+ left: 5rpx;
+ bottom: 15rpx;
+}
+.box_button_remark text{
+ font-size: 28rpx;
+ color: #B9B5B5;
+}
+.box_button_buy{
+ text-align: right;
+ margin: 22rpx 25rpx 0rpx 0rpx;
+}
+.box_button_buy button{
+ display: inline-block;
+ width: 160rpx;
+ height: 50rpx;
+ font-size: 20rpx;
+ background: #d41c34;
+ color: #FFFFFF;
+ line-height: 50rpx;
+}
+.box_button_dui{
+ text-align: right;
+ margin: 22rpx 25rpx 0rpx 0rpx;
+}
+.box_button_dui button{
+ display: inline-block;
+ width: 160rpx;
+ height: 50rpx;
+ font-size: 20rpx;
+ background: #FFFFFF;
+ color: #000000;
+ line-height: 50rpx;
+}
+.foot_box {
+ -webkit-align-content: center;
+ align-content: center;
+ text-align: center;
+ margin-top: 15rpx;
+ margin-bottom: 50rpx;
+}
+.foot_box text {
+ font-size: 25rpx;
+ color: #FFFFFF;
+}
+.foot_empty{
+ background-color: #FFFFFF;
+ height: 375rpx;
+ margin: 10rpx 20rpx 0rpx 20rpx;
+ border-radius: 10rpx;
+ text-align: center;
+ padding: 150rpx 0rpx 300rpx 0rpx;
+ -webkit-box-pack: center;
+ -webkit-justify-content: center;
+ justify-content: center;
+}
+.foot_empty image{
+ width: 400rpx;
+ height: 273rpx;
+}
+.foot_empty text{
+ font-size: 30rpx;
+ color: #999999;
+}
+.foot_empty_button{
+ background: #ff6363;
+ margin: 60rpx 230rpx 0rpx 230rpx;
+ padding: 10rpx;
+ border-radius: 70rpx;
+ line-height: 40rpx;
+}
+.foot_empty_button text{
+ font-size: 28rpx;
+ color: #FFFFFF;
+}
diff --git a/pages/giftpack/giftpacklist/giftpacklist.js b/pages/giftpack/giftpacklist/giftpacklist.js
new file mode 100644
index 0000000..6acb0cb
--- /dev/null
+++ b/pages/giftpack/giftpacklist/giftpacklist.js
@@ -0,0 +1,210 @@
+var t = require("../../utils/common.js"); var os = getApp().globalData.setting;
+Page({
+ data: function data() {
+ return {
+ isBuy: 0,
+ getGiftID: '',
+ giftImage: '',
+ giftTitle: '',
+ giftDate: '',
+ giftPrice: '',
+ giftIntegral: '',
+ giftPosPrice: '',
+ giftQty: '',
+ giftRemark: '',
+ giftType: '',
+ actTitle: '',
+ getUrl: '',
+ wareCard: []
+ };
+
+ },
+ onLoad: function onLoad(options) {
+ this.isBuy = options.isBuy;
+ this.getStorageID = options.stoid;
+ this.getUserID = options.userid;
+ this.getGiftID = options.id;
+
+ console.log(this.isBuy + '||' + this.getStorageID + '||' + this.getUserID + '||' + this.getGiftID);
+ },
+ onShow: function onShow() {
+ if (this.isBuy == 0) {
+ this.GetMyGiftList();
+ } else {
+ this.GetBuyGiftList();
+ }
+
+ this.giftRemark = this.giftRemark.replace(/![]()
+
+
+
+
+
+ {{this.giftTitle}}
+
+
+ {{"兑换截至时间："+this.giftDate}}
+
+
+
+ {{"￥"+this.giftPrice}}
+
+
+ /
+
+
+ {{this.giftIntegral+"积分"}}
+
+
+ {{this.actTitle}}
+
+
+
+
+
+
+ 礼包内容
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.couponName}}
+
+
+
+
+
+ {{"数量:"+item.num}}
+
+
+
+
+
+
+
+
+
+
+
+
+ 已自动到账
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/giftpack/giftpacklist/giftpacklist.wxss b/pages/giftpack/giftpacklist/giftpacklist.wxss
new file mode 100644
index 0000000..1f5ccb2
--- /dev/null
+++ b/pages/giftpack/giftpacklist/giftpacklist.wxss
@@ -0,0 +1,203 @@
+
+@charset "UTF-8";
+/* Author XGQ
+ * 2019-12-12
+ */
+.box.data-v-3a5b7e36 {
+ -webkit-align-content: center;
+ align-content: center;
+}
+.box_top.data-v-3a5b7e36 {
+ width: 100%;
+}
+.box_top image.data-v-3a5b7e36 {
+ width: 100%;
+ height: 540rpx;
+}
+.box_title.data-v-3a5b7e36 {
+ margin: 10rpx 20rpx 20rpx 20rpx;
+ padding: 35rpx;
+ background-color: #FFFFFF;
+ border-radius: 20rpx;
+}
+.top_title.data-v-3a5b7e36 {
+ font-size: 30rpx;
+ margin-bottom: 10rpx;
+}
+.top_time.data-v-3a5b7e36 {
+ font-size: 27rpx;
+ color: #B9B5B5;
+}
+.top_price.data-v-3a5b7e36 {
+ font-size: 35rpx;
+ color: #D61B30;
+ margin-top: 30rpx;
+ margin-bottom: 5rpx;
+}
+.top_foot.data-v-3a5b7e36 {
+ display: -webkit-box;
+ display: -webkit-flex;
+ display: flex;
+}
+.top_foot_price.data-v-3a5b7e36 {
+ font-size: 22rpx;
+ color: #B9B5B5;
+ width: 50%;
+ text-decoration: line-through;
+}
+.top_foot_qty.data-v-3a5b7e36 {
+ font-size: 22rpx;
+ color: #B9B5B5;
+ width: 50%;
+ -webkit-align-content: flex-end;
+ align-content: flex-end;
+ text-align: right;
+}
+.box_ware.data-v-3a5b7e36 {
+ margin: 10rpx 20rpx 20rpx 20rpx;
+ padding: 35rpx;
+ background-color: #FFFFFF;
+ border-radius: 20rpx;
+}
+.box_ware_title.data-v-3a5b7e36 {
+ font-size: 35rpx;
+ margin: 5rpx 0rpx 30rpx 0rpx;
+}
+.box_ware_box.data-v-3a5b7e36 {
+ display: -webkit-box;
+ display: -webkit-flex;
+ display: flex;
+ margin: 10rpx 0rpx 25rpx 0rpx;
+}
+.box_ware_img.data-v-3a5b7e36 {
+ width: 30%;
+ height: 180rpx;
+ border: #999999 solid 1rpx;
+}
+.box_ware_img image.data-v-3a5b7e36 {
+ width: 100%;
+ height: 100%;
+}
+.box_ware_item.data-v-3a5b7e36 {
+ width: 70%;
+ margin-left: 25rpx;
+ position: relative;
+}
+.box_ware_item_title.data-v-3a5b7e36 {
+ font-size: 30rpx;
+ word-break: break-all;
+ text-overflow: ellipsis;
+ display: -webkit-box;
+ -webkit-box-orient: vertical;
+ -webkit-line-clamp: 2;
+ overflow: hidden;
+}
+.box_ware_count.data-v-3a5b7e36 {
+ display: -webkit-box;
+ display: -webkit-flex;
+ display: flex;
+}
+.box_ware_item_price.data-v-3a5b7e36 {
+ font-size: 25rpx;
+ color: #B9B5B5;
+ position: absolute;
+ bottom: 60rpx;
+ left: 0;
+}
+.box_ware_item_qty.data-v-3a5b7e36 {
+ font-size: 25rpx;
+ position: absolute;
+ bottom: 15rpx;
+ left: 0;
+}
+.box_ware_code.data-v-3a5b7e36 {
+ position: absolute;
+ bottom: 10rpx;
+ right: 10rpx;
+}
+.box_ware_code image.data-v-3a5b7e36 {
+ width: 60rpx;
+ height: 60rpx;
+}
+.box_ware_code text.data-v-3a5b7e36 {
+ font-size: 20rpx;
+}
+.foot_box.data-v-3a5b7e36 {
+ margin: 10rpx 20rpx 50rpx 20rpx;
+ padding: 35rpx;
+ background-color: #FFFFFF;
+ border-radius: 20rpx;
+}
+.foot_box_title.data-v-3a5b7e36 {
+ font-size: 35rpx;
+ margin-bottom: 30rpx;
+}
+.foot_box_remark.data-v-3a5b7e36 {
+ font-size: 27rpx;
+ line-height: 40rpx;
+}
+.foot_empty.data-v-3a5b7e36 {
+ height: 90rpx;
+}
+.foot_button.data-v-3a5b7e36 {
+ 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_left.data-v-3a5b7e36 {
+ background: #e4010c;
+ color: #FFFFFF;
+ width: 250rpx;
+ height: 70rpx;
+ font-size: 28rpx;
+ line-height: 70rpx;
+ border-radius: 30rpx 0rpx 0rpx 30rpx;
+}
+.foot_button_right.data-v-3a5b7e36 {
+ background: #ffbb42;
+ color: #FFFFFF;
+ width: 250rpx;
+ height: 70rpx;
+ font-size: 28rpx;
+ line-height: 70rpx;
+ border-radius: 0rpx 30rpx 30rpx 0rpx;
+}
+.foot_button_buy.data-v-3a5b7e36 {
+ background: #e4010c;
+ color: #FFFFFF;
+ width: 400rpx;
+ height: 70rpx;
+ font-size: 28rpx;
+ line-height: 70rpx;
+ border-radius: 30rpx 30rpx 30rpx 30rpx;
+}
+.foot_button_intalge.data-v-3a5b7e36 {
+ background: #ffbb42;
+ color: #FFFFFF;
+ width: 400rpx;
+ height: 70rpx;
+ font-size: 28rpx;
+ line-height: 70rpx;
+ border-radius: 30rpx 30rpx 30rpx 30rpx;
+}
+page.data-v-3a5b7e36 {
+ background-color: #e85f93;
+}
+.foot_box_remark.data-v-3a5b7e36 ._img {
+ width: 100%;
+}
+.foot_box_remark.data-v-3a5b7e36 .img {
+ line-height: 0;
+}
+
diff --git a/pages/giftpack/mygiftpack/mygiftpack.js b/pages/giftpack/mygiftpack/mygiftpack.js
new file mode 100644
index 0000000..8a0be10
--- /dev/null
+++ b/pages/giftpack/mygiftpack/mygiftpack.js
@@ -0,0 +1,111 @@
+var t = require("../../../utils/common.js"); var os = getApp().globalData.setting;
+Page({
+ data: function data() {
+ return {
+ getDate: new Date().getTime(),
+ getStorageID: '',
+ getUserID: '',
+ wareCard: [],
+ pages: 0,
+ pageSize: 10,
+ isEmpty: true,
+ loadingType: 0, //定义加载方式 0---contentdown 1---contentrefresh 2---contentnomore
+ contentText: {
+ contentdown: '加载更多',
+ contentrefresh: '加载中...',
+ contentnomore: '已加载全部'
+ }
+ };
+ },
+
+ onLoad: function onLoad(options) {
+ this.getStorageID = options.stoid;
+ this.getUserID = options.userid;
+ },
+ onShow: function onShow() {
+ this.pages = 1;
+ this.pageSize = 10;
+ this.loadingType = 0;
+ this.getList();
+ },
+ methods: {
+ BuyGift: function BuyGift() {
+ /*销毁跳转*/
+ uni.reLaunch({
+ url: 'pages/giftpack/buygiftpack/giftpackbuy?stoid=' + this.getStorageID + '&userid=' + this.getUserID
+ });
+
+ },
+ GetGiftPackList: function GetGiftPackList(getId, ojb) {
+ //不销毁调整
+ uni.navigateTo({
+ url: 'pages/giftpack/giftpacklist/giftpacklist?isBuy=0&stoid=' + this.getStorageID + '&userid=' + this.getUserID + '&id=' +
+ getId
+ });
+
+ },
+ getList: function getList() {
+ var _this = this; //上拉加载
+ var that = this;
+ if (that.loadingType != 0) {
+ return false;
+ }
+ that.loadingType = 1;
+ getApp().request.get('/api/weshop/marketing/my/giftbag/page',{
+ data: {
+ "storeId": this.getStorageID, //商家ID
+ "userId": this.getUserID, //用户ID
+ "page": this.pages,
+ "pageSize": this.pageSize
+ },
+ success: function success(res) {
+ if (res.data.code == 0) {
+ console.log(res.data.data);
+ if (res.data.data.total > 0) {
+ _this.isEmpty = false;
+ } else {
+ _this.isEmpty = true;
+ }
+ if (res.data.data.pageData.length == 0) {
+ _this.loadingType = 2;
+ } else {
+ console.log(_this.wareCard.length);
+ console.log(res.data.data.pageData.length);
+ if (_this.wareCard.length < res.data.data.pageData.length) {
+ for (var i = 0; i < res.data.data.pageData.length; i++) {
+ _this.wareCard.push(res.data.data.pageData[i]);
+ }
+ }
+
+ _this.loadingType = 0;
+ console.log(_this.wareCard);
+ }
+ } else {
+ console.log(res.data.msg);
+ }
+ }
+ });
+
+ },
+ TimeToDate: function TimeToDate(num) {//时间戳数据处理 是按秒来转换
+ var date = new Date(num * 1000);
+ //时间戳为10位需*1000，时间戳为13位的话不需乘1000
+ var y = date.getFullYear();
+ var MM = date.getMonth() + 1;
+ MM = MM < 10 ? '0' + MM : MM; //月补0
+ var d = date.getDate();
+ d = d < 10 ? '0' + d : d; //天补0
+ var h = date.getHours();
+ h = h < 10 ? '0' + h : h; //小时补0
+ var m = date.getMinutes();
+ m = m < 10 ? '0' + m : m; //分钟补0
+ var s = date.getSeconds();
+ s = s < 10 ? '0' + s : s; //秒补0
+ return y + '-' + MM + '-' + d + ' ' + h + ':' + m + ':' + s;
+ },
+ DateToTime: function DateToTime(TimeNum) {//时间转换成时间戳
+ var Time = new Date(TimeNum);
+ return Time.getTime() / 1000;
+ }
+ }
+});
diff --git a/pages/giftpack/mygiftpack/mygiftpack.json b/pages/giftpack/mygiftpack/mygiftpack.json
new file mode 100644
index 0000000..29437ed
--- /dev/null
+++ b/pages/giftpack/mygiftpack/mygiftpack.json
@@ -0,0 +1,4 @@
+{
+ "navigationBarTitleText": "我的礼包",
+ "enablePullDownRefresh": false
+}
\ No newline at end of file
diff --git a/pages/giftpack/mygiftpack/mygiftpack.wxml b/pages/giftpack/mygiftpack/mygiftpack.wxml
new file mode 100644
index 0000000..7c517f4
--- /dev/null
+++ b/pages/giftpack/mygiftpack/mygiftpack.wxml
@@ -0,0 +1,101 @@
+
+
+
+
+
+
+ 礼包列表
+
+
+
+ 我的礼包
+
+
+
+
+
+
+
+
+
+
+
+ 新人有礼
+
+
+ 评价有礼
+
+
+ 节日营销
+
+
+ 生日营销
+
+
+ 助力礼包
+
+
+
+
+
+
+ {{item.$orig.giftTitle}}
+
+
+
+ {{"￥"+item.$orig.payMoney}}
+
+
+ {{item.$orig.payIntegral+"积分"}}
+
+
+ {{item.$orig.actTitle}}
+
+
+ {{item.$orig.actTitle}}
+
+
+ {{item.$orig.actTitle}}
+
+
+ {{item.$orig.actTitle}}
+
+
+ {{item.$orig.actTitle}}
+
+
+
+ {{"原价:￥"+item.$orig.giftPosPrice}}
+
+
+
+ {{"兑换截至日期:"+item.$orig.endTime}}
+
+
+ {{"距兑换开始时间: "+item.$orig.starTime}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/giftpack/mygiftpack/mygiftpack.wxss b/pages/giftpack/mygiftpack/mygiftpack.wxss
new file mode 100644
index 0000000..089d370
--- /dev/null
+++ b/pages/giftpack/mygiftpack/mygiftpack.wxss
@@ -0,0 +1,206 @@
+
+
+/*引用样式路径*/
+@charset "UTF-8";
+/* Author XGQ
+ * 2019-11-12
+ */
+.top_img {
+ -webkit-align-content: center;
+ align-content: center;
+}
+.top_img image {
+ width: 100%;
+ height: 660rpx;
+}
+.top_title {
+ display: -webkit-box;
+ display: -webkit-flex;
+ display: flex;
+ background-color: #FFFFFF;
+ height: 85rpx;
+ border-radius: 10rpx 10rpx 0rpx 0rpx;
+ margin: 0rpx 20rpx 0rpx 20rpx;
+ -webkit-align-content: center;
+ align-content: center;
+}
+.top_title_box {
+ width: 49%;
+ -webkit-align-content: center;
+ align-content: center;
+ text-align: center;
+ padding: 15rpx;
+}
+.top_title_box_S {
+ width: 1%;
+ -webkit-align-content: center;
+ align-content: center;
+ text-align: center;
+ margin: 20rpx 0rpx 20rpx 0rpx;
+ border-left: #000000 solid 3rpx;
+}
+.top_title_redtext {
+ font-size: 30rpx;
+ color: #d61b30;
+}
+.top_title_blacktext {
+ font-size: 30rpx;
+ color: #000000;
+}
+.content_box {
+ background-color: #FFFFFF;
+ height: 375rpx;
+ margin: 10rpx 20rpx 0rpx 20rpx;
+ border-radius: 10rpx;
+}
+.content_box_ware {
+ border-bottom: #f5f5f5 solid 2rpx;
+ display: -webkit-box;
+ display: -webkit-flex;
+ display: flex;
+}
+.content_box_img {
+ margin: 20rpx 20rpx 20rpx 25rpx;
+ width: 35%;
+ display: -webkit-box;
+ display: -webkit-flex;
+ display: flex;
+ font-size: 8rpx;
+ position: relative;
+}
+.content_box_img image {
+ width: 100%;
+ height: 230rpx;
+}
+.content_box_img_title {
+ position: absolute;
+ background: #D01119;
+ display: -webkit-box;
+ display: -webkit-flex;
+ display: flex;
+ padding: 8rpx;
+ border-radius: 0rpx 0rpx 10rpx 0rpx;
+}
+.content_box_img_ground1{
+ background: #fb6451;
+}
+.content_box_img_ground2{
+ background: #ffb72d;
+}
+.content_box_img_ground3{
+ background: #9be0e5;
+}
+.content_box_img_ground4{
+ background: #4784ef;
+}
+.content_box_img_title image {
+ width: 30rpx;
+ height: 30rpx;
+}
+.content_box_img_title text {
+ font-size: 20rpx;
+ color: #FFFFFF;
+ line-height: 25rpx;
+ padding-top: 5rpx;
+}
+.content_box_title {
+ width: 65%;
+ margin: 25rpx 25rpx 10rpx 0rpx;
+ position: relative;
+}
+.content_ware_title {
+ font-size: 30rpx;
+ 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;
+ /** 隐藏超出的内容 **/
+}
+.content_ware_type {
+ font-size: 28rpx;
+ color: #c61a34;
+ margin-top: 10rpx;
+ position: absolute;
+ left: 0;
+ bottom: 100rpx;
+}
+.content_ware_price {
+ font-size: 20rpx;
+ color: #b9b5b5;
+ margin-top: 2rpx;
+ text-decoration: line-through;
+ position: absolute;
+ left: 0;
+ bottom: 70rpx;
+}
+.content_ware_time {
+ font-size: 25rpx;
+ color: #c61a34;
+ margin-top: 20rpx;
+ position: absolute;
+ left: 0;
+ bottom: 25rpx;
+}
+.content_box_button {
+ text-align: right;
+ margin: 20rpx 25rpx 20rpx 20rpx;
+}
+.content_box_button button {
+ display: inline-block;
+ width: 160rpx;
+ height: 50rpx;
+ font-size: 25rpx;
+ background: #d41c34;
+ color: #FFFFFF;
+ line-height: 50rpx;
+}
+.foot_box {
+ -webkit-align-content: center;
+ align-content: center;
+ text-align: center;
+ margin-top: 15rpx;
+ margin-bottom: 50rpx;
+}
+.foot_box text {
+ font-size: 25rpx;
+ color: #FFFFFF;
+}
+.foot_empty{
+ background-color: #FFFFFF;
+ height: 375rpx;
+ margin: 10rpx 20rpx 0rpx 20rpx;
+ border-radius: 10rpx;
+ text-align: center;
+ padding: 150rpx 0rpx 300rpx 0rpx;
+ -webkit-box-pack: center;
+ -webkit-justify-content: center;
+ justify-content: center;
+}
+.foot_empty image{
+ width: 400rpx;
+ height: 273rpx;
+}
+.foot_empty text{
+ font-size: 30rpx;
+ color: #999999;
+}
+.foot_empty_button{
+ background: #ff6363;
+ margin: 60rpx 230rpx 0rpx 230rpx;
+ padding: 10rpx;
+ border-radius: 70rpx;
+ line-height: 40rpx;
+}
+.foot_empty_button text{
+ font-size: 28rpx;
+ color: #FFFFFF;
+}
+page {
+ background-color: #fb7454;
+}