diff --git a/app.json b/app.json
index 690151a..ac24f96 100644
--- a/app.json
+++ b/app.json
@@ -1,6 +1,9 @@
{
"pages": [
"pages/index/index/index",
+ "pages/user/assistance/giftpacklist",
+ "pages/user/assistance/task_assistance",
+ "pages/user/share/share",
"pages/giftpack/birthdaygift/birthdaygift",
"pages/user/comment/comment",
"pages/giftpack/evaluategift/evaluategift",
@@ -85,8 +88,7 @@
"pages/user/my_service/tment_order_list",
"pages/user/my_service/beauty_deta",
"pages/user/labels/labels",
- "pages/user/view_comment/view_comment",
- "pages/user/assistance/assistance",
+ "pages/user/view_comment/view_comment"
],
"permission": {
"scope.userLocation": {
diff --git a/pages/user/assistance/giftpacklist.js b/pages/user/assistance/giftpacklist.js
new file mode 100644
index 0000000..dc7ffbb
--- /dev/null
+++ b/pages/user/assistance/giftpacklist.js
@@ -0,0 +1,332 @@
+var e = getApp(),
+ a = e.globalData.setting,
+ os = a,
+ t = e.request,
+ d = e.globalData;
+var ut = require("../../../utils/util.js");
+
+Page({
+ data: {
+ url: a.url, //接口网址
+ iurl: a.imghost, //图片前缀网址
+ isBuy: 0,
+ getGiftID: '', //礼包id
+ giftImage: '',
+ giftTitle: '',
+ giftDate: '',
+ giftPrice: '',
+ giftIntegral: '',
+ giftPosPrice: '',
+ giftQty: '',
+ giftRemark: '',
+ giftType: '',
+ actTitle: '',
+ getUrl: '',
+ wareCard: [],
+ orderSn: "", //订单编号
+ lbId: "",
+ code: "", //核销码
+ c_state: "0", //判断是否已经使用, 0正常 1已使用 2已过期
+ is_lb: 0, //是否有礼包
+ },
+ onLoad: function (options) {
+ var th = this;
+ th.setData({
+ isBuy: options.isBuy,
+ getStorageID: a.stoid,
+ getUserID: d.user_id,
+ getGiftID: options.lbId,
+ orderSn: options.orderSn
+ })
+ if (options.isBuy == 0) {
+ th.GetMyGiftList();
+ } else {
+ th.GetBuyGiftList();
+ }
+ th.setData({
+ giftRemark: th.data.giftRemark.replace(/
![]()
+
+
+
+
+
+ {{giftTitle}}
+
+
+ {{"兑换截至时间:"+giftDate}}
+
+
+
+ {{"¥"+giftPrice}}
+
+
+ /
+
+
+ {{giftIntegral+"积分"}}
+
+
+ {{actTitle}}
+
+
+
+
+
+
+ 礼包内容
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.couponName}}
+
+
+
+
+
+ {{"数量:"+item.num}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 奖励已发放
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/user/assistance/giftpacklist.wxss b/pages/user/assistance/giftpacklist.wxss
new file mode 100644
index 0000000..3d906ad
--- /dev/null
+++ b/pages/user/assistance/giftpacklist.wxss
@@ -0,0 +1,244 @@
+@charset "UTF-8";
+
+/* Author XGQ
+ * 2019-12-12
+ */
+
+.box.data-v-3a5b7e36 {
+ -webkit-align-content: center;
+ align-content: center;
+ background-color: #e85f93;
+}
+
+.box_top.data-v-3a5b7e36 {
+ width: 100%;
+}
+
+.box_top image.data-v-3a5b7e36 {
+ width: 100%;
+ max-height: 540rpx;
+}
+
+.box_title.data-v-3a5b7e36 {
+ margin: 10rpx 20rpx 20rpx 20rpx;
+ padding: 35rpx;
+ background-color: #fff;
+ border-radius: 40rpx;
+}
+
+.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: #fff;
+ border-radius: 40rpx;
+}
+
+.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: 185rpx;
+ height: 190rpx; *//* background-color: rgba(138, 138, 138, 0.63); */
+ border: 2rpx solid #999;
+ width: 120rpx;
+ height: 120rpx;
+}
+
+.box_ware_item.data-v-3a5b7e36 {
+ width: 70%;
+ margin-left: 25rpx;
+ position: relative;
+}
+
+.box_ware_item_title.data-v-3a5b7e36 {
+ font-size: 24rpx;
+ 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: 22rpx;
+ position: absolute;
+ bottom: 15rpx;
+ left: 0;
+}
+
+.box_ware_code.data-v-3a5b7e36 {
+ position: absolute;
+ right: 10rpx;
+ bottom: 10rpx;
+}
+
+.box_ware_code image.data-v-3a5b7e36 {
+ width: 50rpx;
+ height: 50rpx;
+}
+
+.box_ware_code text.data-v-3a5b7e36 {
+ font-size: 20rpx;
+}
+
+.foot_box.data-v-3a5b7e36 {
+ margin: 10rpx 20rpx 50rpx 20rpx;
+ padding: 35rpx;
+ background-color: #fff;
+ border-radius: 40rpx;
+}
+
+.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: #fff;
+ 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: #fff;
+ width: 250rpx;
+ height: 70rpx;
+ font-size: 28rpx;
+ line-height: 70rpx;
+ border-radius: 40rpx;
+}
+
+.foot_button_right.data-v-3a5b7e36 {
+ background: #ffbb42;
+ color: #fff;
+ width: 250rpx;
+ height: 70rpx;
+ font-size: 28rpx;
+ line-height: 70rpx;
+ border-radius: 40rpx;
+}
+
+.foot_button_buy.data-v-3a5b7e36 {
+ background: #e4010c;
+ color: #fff;
+ width: 400rpx;
+ height: 70rpx;
+ font-size: 28rpx;
+ line-height: 70rpx;
+ border-radius: 40rpx;
+}
+
+.foot_button_intalge.data-v-3a5b7e36 {
+ background: #ffbb42;
+ color: #fff;
+ width: 400rpx;
+ height: 70rpx;
+ font-size: 28rpx;
+ line-height: 70rpx;
+ border-radius: 40rpx;
+}
+
+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;
+}
+.overdue.data-v-3a5b7e36{
+ background-color: rgb(153,153,153);
+}
\ No newline at end of file