diff --git a/pages/giftpack/birthdaygift/birthdaygift.js b/pages/giftpack/birthdaygift/birthdaygift.js
index 8843921..3a695eb 100644
--- a/pages/giftpack/birthdaygift/birthdaygift.js
+++ b/pages/giftpack/birthdaygift/birthdaygift.js
@@ -84,8 +84,8 @@ Page({
}
}
th.setData({
- integralTitle: '领取' + res.data.data.lbIntegral + '积分',
- growUpTitle: '领取' + res.data.data.lbGrowthValue + '成长值'
+ integralTitle: '价值' + res.data.data.lbIntegral + '积分',
+ growUpTitle: '价值' + res.data.data.lbGrowthValue + '成长值'
})
if (res.data.data.receiveState == 0) {
th.setData({
diff --git a/pages/giftpack/buygiftpack/giftpackbuy.wxml b/pages/giftpack/buygiftpack/giftpackbuy.wxml
index caa3f98..f557394 100644
--- a/pages/giftpack/buygiftpack/giftpackbuy.wxml
+++ b/pages/giftpack/buygiftpack/giftpackbuy.wxml
@@ -50,7 +50,7 @@
-
+
diff --git a/pages/giftpack/evaluategift/evaluategift.js b/pages/giftpack/evaluategift/evaluategift.js
index ecf4354..9499c47 100644
--- a/pages/giftpack/evaluategift/evaluategift.js
+++ b/pages/giftpack/evaluategift/evaluategift.js
@@ -89,8 +89,8 @@ Page({
}
}
th.setData({
- integralTitle: '领取' + res.data.data.lbIntegral + '积分',
- growUpTitle: '领取' + res.data.data.lbGrowthValue + '成长值'
+ integralTitle: '价值' + res.data.data.lbIntegral + '积分',
+ growUpTitle: '价值' + res.data.data.lbGrowthValue + '成长值'
})
if (res.data.data.receiveState == 0) {
th.setData({
diff --git a/pages/giftpack/giftpacklist/giftpacklist.wxml b/pages/giftpack/giftpacklist/giftpacklist.wxml
index f1ea307..9e6d57e 100644
--- a/pages/giftpack/giftpacklist/giftpacklist.wxml
+++ b/pages/giftpack/giftpacklist/giftpacklist.wxml
@@ -1,6 +1,6 @@
-
+
@@ -40,19 +40,19 @@
-
+
-
+
-
+
-
+
-
+
@@ -70,8 +70,8 @@
-
-
+
+
@@ -118,9 +118,12 @@
diff --git a/pages/giftpack/giftpacklist/giftpacklist.wxss b/pages/giftpack/giftpacklist/giftpacklist.wxss
index 4e9ef50..b0fe519 100644
--- a/pages/giftpack/giftpacklist/giftpacklist.wxss
+++ b/pages/giftpack/giftpacklist/giftpacklist.wxss
@@ -1,207 +1,244 @@
-
@charset "UTF-8";
+
/* Author XGQ
* 2019-12-12
*/
+
.box.data-v-3a5b7e36 {
- -webkit-align-content: center;
- align-content: center;
+ -webkit-align-content: center;
+ align-content: center;
+ background-color: #e85f93;
}
+
.box_top.data-v-3a5b7e36 {
- width: 100%;
+ width: 100%;
}
+
.box_top image.data-v-3a5b7e36 {
- width: 100%;
- height: 540rpx;
+ width: 100%;
+ height: 540rpx;
}
+
.box_title.data-v-3a5b7e36 {
- margin: 10rpx 20rpx 20rpx 20rpx;
- padding: 35rpx;
- background-color: #FFFFFF;
- border-radius: 40rpx;
+ margin: 10rpx 20rpx 20rpx 20rpx;
+ padding: 35rpx;
+ background-color: #fff;
+ border-radius: 40rpx;
}
+
.top_title.data-v-3a5b7e36 {
- font-size: 30rpx;
- margin-bottom: 10rpx;
+ font-size: 30rpx;
+ margin-bottom: 10rpx;
}
+
.top_time.data-v-3a5b7e36 {
- font-size: 27rpx;
- color: #B9B5B5;
+ font-size: 27rpx;
+ color: #b9b5b5;
}
+
.top_price.data-v-3a5b7e36 {
- font-size: 35rpx;
- color: #D61B30;
- margin-top: 30rpx;
- margin-bottom: 5rpx;
+ font-size: 35rpx;
+ color: #d61b30;
+ margin-top: 30rpx;
+ margin-bottom: 5rpx;
}
+
.top_foot.data-v-3a5b7e36 {
- display: -webkit-box;
- display: -webkit-flex;
- display: flex;
+ 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;
+ 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;
+ 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: 40rpx;
+ 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;
+ 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;
+ 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 #999999;
+ /* width: 185rpx;
+ height: 190rpx; *//* background-color: rgba(138, 138, 138, 0.63); */
+ border: 2rpx solid #999;
width: 120rpx;
- height: 120rpx;
+ height: 120rpx;
}
+
.box_ware_item.data-v-3a5b7e36 {
- width: 70%;
- margin-left: 25rpx;
- position: relative;
+ 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;
+ 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;
+ 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;
+ 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;
+ font-size: 22rpx;
+ position: absolute;
+ bottom: 15rpx;
+ left: 0;
}
+
.box_ware_code.data-v-3a5b7e36 {
- position: absolute;
- right: 10rpx;
- bottom:10rpx;
+ position: absolute;
+ right: 10rpx;
+ bottom: 10rpx;
}
+
.box_ware_code image.data-v-3a5b7e36 {
- width: 50rpx;
- height: 50rpx;
+ width: 50rpx;
+ height: 50rpx;
}
+
.box_ware_code text.data-v-3a5b7e36 {
- font-size: 20rpx;
+ font-size: 20rpx;
}
+
.foot_box.data-v-3a5b7e36 {
- margin: 10rpx 20rpx 50rpx 20rpx;
- padding: 35rpx;
- background-color: #FFFFFF;
- border-radius: 40rpx;
+ 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;
+ font-size: 35rpx;
+ margin-bottom: 30rpx;
}
+
.foot_box_remark.data-v-3a5b7e36 {
- font-size: 27rpx;
- line-height: 40rpx;
+ font-size: 27rpx;
+ line-height: 40rpx;
}
+
.foot_empty.data-v-3a5b7e36 {
- height: 90rpx;
+ 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%;
+ 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: #FFFFFF;
- width: 250rpx;
- height: 70rpx;
- font-size: 28rpx;
- line-height: 70rpx;
- border-radius: 40rpx;
+ 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: #FFFFFF;
- width: 250rpx;
- height: 70rpx;
- font-size: 28rpx;
- line-height: 70rpx;
- border-radius: 40rpx;
+ 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: #FFFFFF;
- width: 400rpx;
- height: 70rpx;
- font-size: 28rpx;
- line-height: 70rpx;
- border-radius: 40rpx;
+ 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: #FFFFFF;
- width: 400rpx;
- height: 70rpx;
- font-size: 28rpx;
- line-height: 70rpx;
- border-radius: 40rpx;
+ 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
diff --git a/pages/giftpack/newvipgift/newvipgift.js b/pages/giftpack/newvipgift/newvipgift.js
index 319b7d1..0bd4206 100644
--- a/pages/giftpack/newvipgift/newvipgift.js
+++ b/pages/giftpack/newvipgift/newvipgift.js
@@ -84,8 +84,8 @@ Page({
}
}
th.setData({
- integralTitle: '领取' + res.data.data.lbIntegral + '积分',
- growUpTitle: '领取' + res.data.data.lbGrowthValue + '成长值'
+ integralTitle: '价值' + res.data.data.lbIntegral + '积分',
+ growUpTitle: '价值' + res.data.data.lbGrowthValue + '成长值'
})
if (res.data.data.receiveState == 0) {
th.setData({
@@ -120,7 +120,7 @@ Page({
},
onShow: function() {
var th = this;
- var textTitle = th.data.textTitle.replace(/
![]()
![]()