diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index 16b2875..27e402c 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -291,8 +291,8 @@
- 立即开卡
-
+ 立即开卡
+
@@ -480,7 +480,7 @@
- {{bconfig.service_bz}}
+ {{bconfig.service_bz}}
diff --git a/pages/user/assistance/assistance.js b/pages/user/assistance/assistance.js
index e5ecf67..7e78f41 100644
--- a/pages/user/assistance/assistance.js
+++ b/pages/user/assistance/assistance.js
@@ -28,6 +28,11 @@ Page({
timer: "", //任务列表的定时器
s_num: "", //多少人已经领取任务
page: 1, //我的任务的当前页
+
+ imageUrl:'',
+ btn_color:'',
+ bg_color:'',
+ font_color:'',
},
/**
@@ -57,6 +62,21 @@ Page({
// 助力活动
this.assistance();
},
+
+ print() {
+ var user_id = getApp().globalData.user_id;
+ var store_id = os.stoid;
+
+ getApp().request.promiseGet("/api/weshop/marketing/help/act/judge", {
+ data: {
+ storeId: store_id,
+ userId: user_id
+ }
+ }).then(res => {
+ console.log('res', res);
+ });
+ },
+
// 助力活动
assistance() {
var th = this;
@@ -74,7 +94,11 @@ Page({
help_data.remark = help_data.remark.replace(/\
-
+
-
-
+
+
+
-
-
-
-
- 机会总是留给最有行动力的人
-
-
-
-
-
- 活动时间：{{filter_s.format_time(zl_act.beginDate,0)}} 至 {{filter_s.format_time(zl_act.endDate,0)}}
-
-
-
-
+
+
+
+
+
+
+
+
+ 机会总是留给最有行动力的人
+
+
+
+
+
+ 活动时间：{{filter_s.format_time(zl_act.beginDate,0)}} 至 {{filter_s.format_time(zl_act.endDate,0)}}
+
+
+
+
+
立即领取
+
+
-
+
-
+
-
+
我的任务
-
+
活动说明
-
-
+
+
@@ -74,10 +87,10 @@
-
+
暂无任务记录
-
+
该活动已被领取了{{s_num}}次
@@ -89,7 +102,7 @@
-
+
diff --git a/pages/user/assistance/assistance.wxss b/pages/user/assistance/assistance.wxss
index 7fe3e0e..5054598 100644
--- a/pages/user/assistance/assistance.wxss
+++ b/pages/user/assistance/assistance.wxss
@@ -1,31 +1,57 @@
page {
- background-color: rgb(208, 17, 25);
- width: 100%;
- height: 100%;
+ /* background-color: rgb(208, 17, 25); */
+ /* width: 100%;
+ height: 100%; */
+
+}
+
+.page {
+ height: 100vh;
+}
+
+.bg-img {
+ background: url("https://mshopimg.yolipai.net/public/upload/newpeoplegift/temp/2020/09-26/75640123e5ae953e416527134a6fc477.jpg") no-repeat center center;
+ background-size: 100% 100%;
}
.lumi {
position: absolute;
z-index: 0;
width: 100%;
- height: 1100rpx;
+ height: 800rpx;
}
.zindex {
- position: absolute;
- z-index: 1;
- width: 100%;
+ /* position: absolute; */
+ /* z-index: 1;
+ width: 100%; */
}
.top {
- padding-bottom: 75rpx;
+ box-sizing: border-box;
+ height: 1000rpx;
+ /* padding-bottom: 75rpx; */
+ /* background: url("https://mshopimg.yolipai.net/public/upload/newpeoplegift/temp/2020/09-26/75640123e5ae953e416527134a6fc477.jpg") no-repeat center center;
+ background-size: 100% 100%; */
+ position: relative;
+}
+
+.bg-img {
+ width: 100%;
+ height: 100%;
+}
+
+.btn-get {
+ position: absolute;
+ width: 100%;
+ bottom: 75rpx;
}
.getgift {
- width: 610rpx;
- height: 130rpx;
- padding-top: 70rpx;
+ width: 600rpx;
+ height: 100rpx;
+ padding-top: 60rpx;
}
.excitation {
@@ -42,7 +68,7 @@ page {
.time {
color: rgb(255, 255, 255);
margin-bottom: 55rpx;
- text-decoration: underline;
+ /* text-decoration: underline; */
margin-top: 10rpx;
}
@@ -54,8 +80,20 @@ page {
border-radius: 45rpx;
font-weight: 900;
line-height: 77rpx;
- box-shadow: 0rpx 7rpx 0rpx 0rpx rgb(245, 119, 6);
+ box-shadow: 0rpx 7rpx 0rpx 0rpx rgba(0, 0, 0, .2);
font-size: 38rpx;
+
+ -webkit-animation: free_download 500ms linear alternate infinite;
+ animation: free_download 500ms linear alternate infinite;
+}
+
+@-webkit-keyframes free_download{
+ 0%{-webkit-transform:scale(0.9);}
+ 100%{-webkit-transform:scale(1);}
+}
+@keyframes free_download{
+ 0%{transform:scale(0.9);}
+ 100%{transform:scale(1);}
}
.head {
@@ -69,7 +107,8 @@ page {
border-top: 4rpx solid rgb(253, 193, 7);
border-left: 4rpx solid rgb(253, 193, 7);
border-right: 4rpx solid rgb(253, 193, 7);
- width: 290rpx;
+ /* width: 290rpx; */
+ width: 50%;
height: 50rpx;
line-height: 50rpx;
}
@@ -90,7 +129,7 @@ page {
}
.padding {
- padding: 0rpx 50rpx;
+ /* padding: 0rpx 50rpx; */
}
.content {
@@ -138,4 +177,14 @@ page {
max-height: 335rpx;
overflow: hidden;
overflow-y:auto;
+}
+
+
+.task-container {
+ padding: 40rpx 40rpx 60rpx;
+}
+.task-content {
+ /* background-color: rgba(0,0,0,.3);
+ border-bottom-left-radius: 12rpx;
+ border-bottom-right-radius: 12rpx; */
}
\ No newline at end of file
diff --git a/pages/user/assistance/task_assistance.js b/pages/user/assistance/task_assistance.js
index 8a40dbc..a464e0b 100644
--- a/pages/user/assistance/task_assistance.js
+++ b/pages/user/assistance/task_assistance.js
@@ -66,6 +66,12 @@ Page({
// Hei: 0,
max_sw_height: 0,
+
+
+ imageUrl:'',
+ btn_color:'',
+ bg_color:'',
+ font_color:'',
},
/**
@@ -163,6 +169,11 @@ Page({
var help_data = res.data.data;
th.setData({
endDate: help_data.endDate,
+
+ btn_color: help_data.btn_color,
+ bg_color: help_data.bg_color,
+ font_color: help_data.font_color,
+ imageUrl: help_data.imageUrl,
});
//任务时间 设置全局定时器
diff --git a/pages/user/assistance/task_assistance.wxml b/pages/user/assistance/task_assistance.wxml
index 46af5bc..0f6e384 100644
--- a/pages/user/assistance/task_assistance.wxml
+++ b/pages/user/assistance/task_assistance.wxml
@@ -1,14 +1,14 @@
-
+
-
+
{{aitem[sw_index].helpTaskName}}
-
+
活动剩余时间:
{{aitem[0].djs.day}}天
{{aitem[0].djs.hou}}:
@@ -45,17 +45,20 @@
{{is_user_task.zlHelpNum}}/{{is_user_task.helpNum}}
-
+
今天剩余可领{{task_number}}个任务
-
+
就选它了
-
+
好友拆一拆
-
+
立即兑换
@@ -66,22 +69,24 @@
-
+
-
-
+
+
我的任务
-
+
帮拆记录
-
+
@@ -101,7 +106,7 @@
-
+
暂无任务记录
@@ -111,7 +116,7 @@
-
+
@@ -133,7 +138,7 @@
-
+
暂无任务记录
@@ -143,16 +148,16 @@
-
+
- 点击加载更多
+ 点击加载更多
-
+
该任务已被领取了{{usercount}}次
-
+
暂无领取记录
diff --git a/pages/user/assistance/task_assistance.wxss b/pages/user/assistance/task_assistance.wxss
index f6b50e1..ed29596 100644
--- a/pages/user/assistance/task_assistance.wxss
+++ b/pages/user/assistance/task_assistance.wxss
@@ -1,5 +1,5 @@
page {
- background: #d01119;
+ /* background: #d01119; */
width: 100%;
height: 100%;
@@ -13,7 +13,7 @@ page {
}
.top-back {
width: 100%;
- /* height:65%; */
+ /* height:100vh; */
background-repead: no-repead;
background-size: 100% 100%;
padding-bottom: 50rpx;
@@ -55,7 +55,7 @@ page {
color: #d01119;
line-height: 65rpx;
letter-spacing: 5rpx;
- box-shadow: 0rpx 7rpx 0rpx 0rpx rgb(245, 119, 6);
+ box-shadow: 0rpx 7rpx 0rpx 0rpx rgba(0, 0, 0, .2);
}
/* 底部列表样式 */
@@ -235,8 +235,8 @@ line-height: 48rpx;
}
.bottom{
- margin-bottom: 50rpx;
- margin-top: 20rpx;
+ padding-bottom: 50rpx;
+ padding-top: 20rpx;
}
.rel {