Commit a0960568fe4ba6e02157cb31f873f86fc82c2061

Authored by 后端研发-倪永富
1 parent 1886bf45

助力活动自定义

pages/goods/goodsInfo/goodsInfo.wxml
@@ -291,8 +291,8 @@ @@ -291,8 +291,8 @@
291 </view> 291 </view>
292 </view> 292 </view>
293 <view class="right flex jc-center ai-center" bindtap="go_plus"> 293 <view class="right flex jc-center ai-center" bindtap="go_plus">
294 - <view class="at_once_carde xc-black3 fs28">立即开卡</view>  
295 - <view class="bg_right"></view> 294 + <view class="at_once_carde xc-black3 fs28">立即开卡</view>
  295 + <view class="bg_right"></view>
296 </view> 296 </view>
297 297
298 </view> 298 </view>
@@ -480,7 +480,7 @@ @@ -480,7 +480,7 @@
480 480
481 <view class="bz_view flex ai-center" wx:if="{{bconfig}}" style="line-height: 36rpx"> 481 <view class="bz_view flex ai-center" wx:if="{{bconfig}}" style="line-height: 36rpx">
482 <image class="bzfu_img" src="{{iurl}}/miniapp/images/bzfu_w.png"></image> 482 <image class="bzfu_img" src="{{iurl}}/miniapp/images/bzfu_w.png"></image>
483 - <view>{{bconfig.service_bz}}</view> 483 + <view class="bz-content">{{bconfig.service_bz}}</view>
484 </view> 484 </view>
485 485
486 486
pages/user/assistance/assistance.js
@@ -28,6 +28,11 @@ Page({ @@ -28,6 +28,11 @@ Page({
28 timer: "", //任务列表的定时器 28 timer: "", //任务列表的定时器
29 s_num: "", //多少人已经领取任务 29 s_num: "", //多少人已经领取任务
30 page: 1, //我的任务的当前页 30 page: 1, //我的任务的当前页
  31 +
  32 + imageUrl:'',
  33 + btn_color:'',
  34 + bg_color:'',
  35 + font_color:'',
31 }, 36 },
32 37
33 /** 38 /**
@@ -57,6 +62,21 @@ Page({ @@ -57,6 +62,21 @@ Page({
57 // 助力活动 62 // 助力活动
58 this.assistance(); 63 this.assistance();
59 }, 64 },
  65 +
  66 + print() {
  67 + var user_id = getApp().globalData.user_id;
  68 + var store_id = os.stoid;
  69 +
  70 + getApp().request.promiseGet("/api/weshop/marketing/help/act/judge", {
  71 + data: {
  72 + storeId: store_id,
  73 + userId: user_id
  74 + }
  75 + }).then(res => {
  76 + console.log('res', res);
  77 + });
  78 + },
  79 +
60 // 助力活动 80 // 助力活动
61 assistance() { 81 assistance() {
62 var th = this; 82 var th = this;
@@ -74,7 +94,11 @@ Page({ @@ -74,7 +94,11 @@ Page({
74 help_data.remark = help_data.remark.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display:block"'); 94 help_data.remark = help_data.remark.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display:block"');
75 th.setData({ 95 th.setData({
76 zl_act: help_data, 96 zl_act: help_data,
77 - help_id: help_data.id 97 + help_id: help_data.id,
  98 + btn_color: help_data.btn_color,
  99 + bg_color: help_data.bg_color,
  100 + font_color: help_data.font_color,
  101 + imageUrl: help_data.imageUrl,
78 }); 102 });
79 if (th.data.help_id != "" && th.data.help_id != null) { 103 if (th.data.help_id != "" && th.data.help_id != null) {
80 //我的任务 104 //我的任务
pages/user/assistance/assistance.wxml
1 <wxs module="filter" src="c_filter.wxs"></wxs> 1 <wxs module="filter" src="c_filter.wxs"></wxs>
2 <wxs module="filter_s" src="../../../utils/filter.wxs"></wxs> 2 <wxs module="filter_s" src="../../../utils/filter.wxs"></wxs>
3 -<view class="page" bindtap="close"> 3 +<view class="page" bindtap="close" style="background-color:#{{bg_color ? bg_color:'d01119'}};">
4 <!-- 背景图片 --> 4 <!-- 背景图片 -->
5 - <image class="lumi" src="{{iurl+'miniapp/images/friendhelp/lumi.png'}}" lazy-load="true"></image>  
6 - <view class="zindex"> 5 + <image wx:if="{{!(imageUrl)}}" class="lumi" src="{{iurl+'miniapp/images/friendhelp/lumi.png'}}" lazy-load="true"></image>
  6 +
  7 + <view class="zindex" style="color:#{{font_color ? font_color:'black'}};background-color:#{{bg_color ? bg_color:'d01119'}};">
7 <view class="top"> 8 <view class="top">
8 - <view class="flex-center">  
9 - <image class="getgift" src="{{iurl+'miniapp/images/friendhelp/getgift.png'}}" lazy-load="true"></image>  
10 - </view>  
11 - <view class="flex-center fs32">  
12 - <view class="excitation">机会总是留给最有行动力的人</view>  
13 - </view>  
14 - <view class="flex-center">  
15 - <image class="gift" src="{{zl_act.imageUrl==''?iurl+'miniapp/images/friendhelp/gift.png':iurl+zl_act.imageUrl}}" lazy-load="true"></image>  
16 - </view>  
17 - <view wx:if="{{zl_act.beginDate && zl_act.endDate}}" class="flex-center fs26 time">  
18 - <view>活动时间:{{filter_s.format_time(zl_act.beginDate,0)}} 至 {{filter_s.format_time(zl_act.endDate,0)}}</view>  
19 -  
20 - </view>  
21 - <view class="flex-center" bindtap="go_task">  
22 - <view class="flex-center take"> 9 + <!-- 上传主图的情况 -->
  10 + <view class="bg-img" wx:if="{{imageUrl}}"></view>
  11 + <!-- 没有上传主图的情况 -->
  12 + <block wx:else>
  13 + <view class="flex-center">
  14 + <image class="getgift" src="{{iurl+'miniapp/images/friendhelp/getgift.png'}}" lazy-load="true"></image>
  15 + </view>
  16 + <view class="flex-center fs32">
  17 + <view class="excitation" style="color:{{font_color ? ('#'+font_color):'white'}};">机会总是留给最有行动力的人</view>
  18 + </view>
  19 + <view class="flex-center">
  20 + <image class="gift" src="{{zl_act.imageUrl==''?iurl+'miniapp/images/friendhelp/gift.png':iurl+zl_act.imageUrl}}" lazy-load="true"></image>
  21 + </view>
  22 + <view wx:if="{{zl_act.beginDate && zl_act.endDate}}" class="flex-center fs26 time">
  23 + <view style="color:{{font_color ? ('#'+font_color):'white'}};">活动时间:{{filter_s.format_time(zl_act.beginDate,0)}} 至 {{filter_s.format_time(zl_act.endDate,0)}}</view>
  24 + </view>
  25 + </block>
  26 +
  27 + <view class="flex-center btn-get" bindtap="go_task">
  28 + <view class="flex-center take" style="color:{{font_color?('#'+font_color):'white'}};background-color: #{{btn_color? btn_color:'FDC107'}};">
23 <view>立即领取</view> 29 <view>立即领取</view>
24 </view> 30 </view>
25 </view> 31 </view>
26 </view> 32 </view>
  33 +
  34 +
27 35
28 <!-- 任务及说明栏 --> 36 <!-- 任务及说明栏 -->
29 - <view> 37 + <view class="task-container">
30 <!-- 标题 --> 38 <!-- 标题 -->
31 - <view class="flex-vertical-between fs28 padding head"> 39 + <view class="flex-vertical-between fs28 padding head"
  40 + style="color:{{font_color ? ('#'+font_color):'white'}};border-color:{{btn_color ? ('#'+btn_color):'#FDC107'}};">
32 <!-- task --> 41 <!-- task -->
33 - <view class="flex-center lhead {{switch_head==0?'rhead':''}}" bindtap="switch_head" data-index="{{0}}"> 42 + <view class="flex-center lhead"
  43 + style="background-color:{{switch_head==0?(btn_color ? ('#'+btn_color):'#FDC107'):'transparent'}};border-color:{{btn_color ? ('#'+btn_color):'#FDC107'}};"
  44 + bindtap="switch_head" data-index="{{0}}">
34 <image class="explain" src="{{iurl+'miniapp/images/friendhelp/task.png'}}" lazy-load="true"></image> 45 <image class="explain" src="{{iurl+'miniapp/images/friendhelp/task.png'}}" lazy-load="true"></image>
35 <view>我的任务</view> 46 <view>我的任务</view>
36 </view> 47 </view>
37 - <view class="flex-center lhead {{switch_head==1?'rhead':''}}" bindtap="switch_head" data-index="{{1}}"> 48 + <view class="flex-center lhead"
  49 + style="background-color:{{switch_head==1?(btn_color ? ('#'+btn_color):'#FDC107'):'transparent'}};border-color:{{btn_color ? ('#'+btn_color):'#FDC107'}};"
  50 + bindtap="switch_head" data-index="{{1}}">
38 <image class="explain" src="{{iurl+'miniapp/images/friendhelp/explain.png'}}" lazy-load="true"></image> 51 <image class="explain" src="{{iurl+'miniapp/images/friendhelp/explain.png'}}" lazy-load="true"></image>
39 <view>活动说明</view> 52 <view>活动说明</view>
40 </view> 53 </view>
41 </view> 54 </view>
42 55
43 <!-- 我的任务 --> 56 <!-- 我的任务 -->
44 - <view wx:if="{{switch_head==0}}" class="white">  
45 - <view class="items"> 57 + <view wx:if="{{switch_head==0}}" class="task-content">
  58 + <view class="items" style="color:{{font_color ? ('#'+font_color):'white'}};">
46 <view class="tesk_list"> 59 <view class="tesk_list">
47 <view class="item fs26 flex-vertical-between padding" wx:for="{{zl_user_list}}"> 60 <view class="item fs26 flex-vertical-between padding" wx:for="{{zl_user_list}}">
48 <view class="flex-center width"> 61 <view class="flex-center width">
@@ -74,10 +87,10 @@ @@ -74,10 +87,10 @@
74 87
75 88
76 <view class="fs30" style="margin-top: 30rpx;"> 89 <view class="fs30" style="margin-top: 30rpx;">
77 - <view class="flex-center nothing" wx:if="{{is_load && zl_user_list.length==0}}"> 90 + <view class="flex-center nothing" wx:if="{{is_load && zl_user_list.length==0}}" style="color:{{font_color ? ('#'+font_color):'white'}}">
78 <view>暂无任务记录</view> 91 <view>暂无任务记录</view>
79 </view> 92 </view>
80 - <view class="flex-center receive" wx:if="{{is_load && s_num}}"> 93 + <view class="flex-center receive" wx:if="{{is_load && s_num}}" style="color:{{font_color ? ('#'+font_color):'white'}}">
81 <view class="flex-center ai-bas"> 94 <view class="flex-center ai-bas">
82 <view>该活动已被领取了{{s_num}}次</view> 95 <view>该活动已被领取了{{s_num}}次</view>
83 </view> 96 </view>
@@ -89,7 +102,7 @@ @@ -89,7 +102,7 @@
89 <!-- 活动说明 --> 102 <!-- 活动说明 -->
90 <view wx:if="{{switch_head}}" class="white"> 103 <view wx:if="{{switch_head}}" class="white">
91 <view class="items"> 104 <view class="items">
92 - <view class="content fs28 padding"> 105 + <view class="content fs28 padding" style="color:{{font_color ? ('#'+font_color):'white'}}">
93 <block wx:if="{{zl_act.remark!=''}}"> 106 <block wx:if="{{zl_act.remark!=''}}">
94 <rich-text nodes="{{zl_act.remark}}" style="word-break:break-all;word-wrap:break-word"></rich-text> 107 <rich-text nodes="{{zl_act.remark}}" style="word-break:break-all;word-wrap:break-word"></rich-text>
95 </block> 108 </block>
pages/user/assistance/assistance.wxss
1 page { 1 page {
2 - background-color: rgb(208, 17, 25);  
3 - width: 100%;  
4 - height: 100%; 2 + /* background-color: rgb(208, 17, 25); */
  3 + /* width: 100%;
  4 + height: 100%; */
  5 +
  6 +}
  7 +
  8 +.page {
  9 + height: 100vh;
  10 +}
  11 +
5 12
  13 +.bg-img {
  14 + background: url("https://mshopimg.yolipai.net/public/upload/newpeoplegift/temp/2020/09-26/75640123e5ae953e416527134a6fc477.jpg") no-repeat center center;
  15 + background-size: 100% 100%;
6 } 16 }
7 17
8 .lumi { 18 .lumi {
9 position: absolute; 19 position: absolute;
10 z-index: 0; 20 z-index: 0;
11 width: 100%; 21 width: 100%;
12 - height: 1100rpx; 22 + height: 800rpx;
13 } 23 }
14 24
15 .zindex { 25 .zindex {
16 - position: absolute;  
17 - z-index: 1;  
18 - width: 100%; 26 + /* position: absolute; */
  27 + /* z-index: 1;
  28 + width: 100%; */
19 } 29 }
20 30
21 .top { 31 .top {
22 - padding-bottom: 75rpx; 32 + box-sizing: border-box;
  33 + height: 1000rpx;
  34 + /* padding-bottom: 75rpx; */
  35 + /* background: url("https://mshopimg.yolipai.net/public/upload/newpeoplegift/temp/2020/09-26/75640123e5ae953e416527134a6fc477.jpg") no-repeat center center;
  36 + background-size: 100% 100%; */
  37 + position: relative;
  38 +}
  39 +
  40 +.bg-img {
  41 + width: 100%;
  42 + height: 100%;
  43 +}
  44 +
  45 +.btn-get {
  46 + position: absolute;
  47 + width: 100%;
  48 + bottom: 75rpx;
23 } 49 }
24 50
25 .getgift { 51 .getgift {
26 - width: 610rpx;  
27 - height: 130rpx;  
28 - padding-top: 70rpx; 52 + width: 600rpx;
  53 + height: 100rpx;
  54 + padding-top: 60rpx;
29 } 55 }
30 56
31 .excitation { 57 .excitation {
@@ -42,7 +68,7 @@ page { @@ -42,7 +68,7 @@ page {
42 .time { 68 .time {
43 color: rgb(255, 255, 255); 69 color: rgb(255, 255, 255);
44 margin-bottom: 55rpx; 70 margin-bottom: 55rpx;
45 - text-decoration: underline; 71 + /* text-decoration: underline; */
46 margin-top: 10rpx; 72 margin-top: 10rpx;
47 } 73 }
48 74
@@ -54,8 +80,20 @@ page { @@ -54,8 +80,20 @@ page {
54 border-radius: 45rpx; 80 border-radius: 45rpx;
55 font-weight: 900; 81 font-weight: 900;
56 line-height: 77rpx; 82 line-height: 77rpx;
57 - box-shadow: 0rpx 7rpx 0rpx 0rpx rgb(245, 119, 6); 83 + box-shadow: 0rpx 7rpx 0rpx 0rpx rgba(0, 0, 0, .2);
58 font-size: 38rpx; 84 font-size: 38rpx;
  85 +
  86 + -webkit-animation: free_download 500ms linear alternate infinite;
  87 + animation: free_download 500ms linear alternate infinite;
  88 +}
  89 +
  90 +@-webkit-keyframes free_download{
  91 + 0%{-webkit-transform:scale(0.9);}
  92 + 100%{-webkit-transform:scale(1);}
  93 +}
  94 +@keyframes free_download{
  95 + 0%{transform:scale(0.9);}
  96 + 100%{transform:scale(1);}
59 } 97 }
60 98
61 .head { 99 .head {
@@ -69,7 +107,8 @@ page { @@ -69,7 +107,8 @@ page {
69 border-top: 4rpx solid rgb(253, 193, 7); 107 border-top: 4rpx solid rgb(253, 193, 7);
70 border-left: 4rpx solid rgb(253, 193, 7); 108 border-left: 4rpx solid rgb(253, 193, 7);
71 border-right: 4rpx solid rgb(253, 193, 7); 109 border-right: 4rpx solid rgb(253, 193, 7);
72 - width: 290rpx; 110 + /* width: 290rpx; */
  111 + width: 50%;
73 height: 50rpx; 112 height: 50rpx;
74 line-height: 50rpx; 113 line-height: 50rpx;
75 } 114 }
@@ -90,7 +129,7 @@ page { @@ -90,7 +129,7 @@ page {
90 } 129 }
91 130
92 .padding { 131 .padding {
93 - padding: 0rpx 50rpx; 132 + /* padding: 0rpx 50rpx; */
94 } 133 }
95 134
96 .content { 135 .content {
@@ -138,4 +177,14 @@ page { @@ -138,4 +177,14 @@ page {
138 max-height: 335rpx; 177 max-height: 335rpx;
139 overflow: hidden; 178 overflow: hidden;
140 overflow-y:auto; 179 overflow-y:auto;
  180 +}
  181 +
  182 +
  183 +.task-container {
  184 + padding: 40rpx 40rpx 60rpx;
  185 +}
  186 +.task-content {
  187 + /* background-color: rgba(0,0,0,.3);
  188 + border-bottom-left-radius: 12rpx;
  189 + border-bottom-right-radius: 12rpx; */
141 } 190 }
142 \ No newline at end of file 191 \ No newline at end of file
pages/user/assistance/task_assistance.js
@@ -66,6 +66,12 @@ Page({ @@ -66,6 +66,12 @@ Page({
66 66
67 // Hei: 0, 67 // Hei: 0,
68 max_sw_height: 0, 68 max_sw_height: 0,
  69 +
  70 +
  71 + imageUrl:'',
  72 + btn_color:'',
  73 + bg_color:'',
  74 + font_color:'',
69 }, 75 },
70 76
71 /** 77 /**
@@ -163,6 +169,11 @@ Page({ @@ -163,6 +169,11 @@ Page({
163 var help_data = res.data.data; 169 var help_data = res.data.data;
164 th.setData({ 170 th.setData({
165 endDate: help_data.endDate, 171 endDate: help_data.endDate,
  172 +
  173 + btn_color: help_data.btn_color,
  174 + bg_color: help_data.bg_color,
  175 + font_color: help_data.font_color,
  176 + imageUrl: help_data.imageUrl,
166 }); 177 });
167 178
168 //任务时间 设置全局定时器 179 //任务时间 设置全局定时器
pages/user/assistance/task_assistance.wxml
1 <wxs module="filter" src="../../../utils/filter.wxs"></wxs> 1 <wxs module="filter" src="../../../utils/filter.wxs"></wxs>
2 -<view class="top-back" style="padding-bottom:80rpx;background-image: url({{iurl}}/miniapp/images/friendhelp/lumi.png)" bindtap="close"> 2 +<view class="top-back" style="background-color:#{{bg_color ? bg_color:'d01119'}};padding-bottom:80rpx;background-image: url({{iurl}}/miniapp/images/friendhelp/lumi.png)" bindtap="close">
3 <!-- <view class="top-back" style="padding-bottom:{{is_user_task!=null&&is_user_task.status==0?50:0}}rpx;background-image: url({{iurl}}/miniapp/images/friendhelp/lumi.png)" bindtap="close"> --> 3 <!-- <view class="top-back" style="padding-bottom:{{is_user_task!=null&&is_user_task.status==0?50:0}}rpx;background-image: url({{iurl}}/miniapp/images/friendhelp/lumi.png)" bindtap="close"> -->
4 <!-- 助力活动头部 --> 4 <!-- 助力活动头部 -->
5 <view class="top-frame"> 5 <view class="top-frame">
6 <view class="flex-center"> 6 <view class="flex-center">
7 - <view class="top-title white fs36 t-c ellipsis-1"> 7 + <view class="top-title white fs36 t-c ellipsis-1" style="color:{{font_color ? ('#'+font_color):'white'}};">
8 {{aitem[sw_index].helpTaskName}} 8 {{aitem[sw_index].helpTaskName}}
9 </view> 9 </view>
10 </view> 10 </view>
11 - <view class="activity-data t-c fs28 white"> 11 + <view class="activity-data t-c fs28" style="color:{{font_color ? ('#'+font_color):'white'}};">
12 活动剩余时间: 12 活动剩余时间:
13 <block wx:if="{{aitem[0].djs.day}}"><text class='tui-conutdown-box'> {{aitem[0].djs.day}}天 </text></block> 13 <block wx:if="{{aitem[0].djs.day}}"><text class='tui-conutdown-box'> {{aitem[0].djs.day}}天 </text></block>
14 <text class='tui-conutdown-box'>{{aitem[0].djs.hou}}</text>: 14 <text class='tui-conutdown-box'>{{aitem[0].djs.hou}}</text>:
@@ -45,17 +45,20 @@ @@ -45,17 +45,20 @@
45 <text class="white fs24">{{is_user_task.zlHelpNum}}/{{is_user_task.helpNum}}</text> 45 <text class="white fs24">{{is_user_task.zlHelpNum}}/{{is_user_task.helpNum}}</text>
46 46
47 </view> 47 </view>
48 - <view class="task-number fs28 white t-c "> 48 + <view class="task-number fs28 t-c" style="color:{{font_color ? ('#'+font_color):'white'}};">
49 今天剩余可领{{task_number}}个任务 49 今天剩余可领{{task_number}}个任务
50 </view> 50 </view>
51 51
52 - <view wx:if="{{is_user_task==null}}" class="task_clike fs40 t-c flex-center" data-taskid="{{taskid}}" bindtap="add_onlicke"> 52 + <view wx:if="{{is_user_task==null}}" class="task_clike fs40 t-c flex-center" data-taskid="{{taskid}}" bindtap="add_onlicke"
  53 + style="background-color:#{{btn_color ? btn_color:'fbda0e'}};color:{{font_color?('#'+font_color):'white'}};">
53 就选它了 54 就选它了
54 </view> 55 </view>
55 - <view wx:if="{{is_user_task!=null&&is_user_task.status==0}}" class="task_clike fs40 t-c flex-center" bindtap="save_share"> 56 + <view wx:if="{{is_user_task!=null&&is_user_task.status==0}}" class="task_clike fs40 t-c flex-center" bindtap="save_share"
  57 + style="background-color:#{{btn_color ? btn_color:'fbda0e'}};color:{{font_color?('#'+font_color):'white'}};">
56 好友拆一拆 58 好友拆一拆
57 </view> 59 </view>
58 - <view wx:if="{{is_user_task!=null&&is_user_task.status==1}}" class="task_clike fs40 t-c flex-center" data-libaoid="{{is_user_task.helpListGiftBagId}}"data-taskingid="{{is_user_task.id}}" bindtap="redeem_now"> 60 + <view wx:if="{{is_user_task!=null&&is_user_task.status==1}}" class="task_clike fs40 t-c flex-center" data-libaoid="{{is_user_task.helpListGiftBagId}}"data-taskingid="{{is_user_task.id}}" bindtap="redeem_now"
  61 + style="background-color:#{{btn_color ? btn_color:'fbda0e'}};color:{{font_color?('#'+font_color):'white'}};">
59 立即兑换 62 立即兑换
60 </view> 63 </view>
61 64
@@ -66,22 +69,24 @@ @@ -66,22 +69,24 @@
66 69
67 </view> 70 </view>
68 <!-- 底部列表 --> 71 <!-- 底部列表 -->
69 -<view> 72 +<view style="background-color:#{{bg_color ? bg_color:'d01119'}}">
70 <!-- <view style="margin-top:{{is_user_task!=null?52:0}}rpx"> --> 73 <!-- <view style="margin-top:{{is_user_task!=null?52:0}}rpx"> -->
71 <!-- 标题 --> 74 <!-- 标题 -->
72 75
73 - <view class="flex-vertical-between fs28 padding head">  
74 - <view class="flex-center lhead {{switch_head==0?'rhead':''}}" bindtap="user_task_list_click" data-index="0"> 76 + <view class="flex-vertical-between fs28 padding head" style="color:#{{font_color ? font_color:'white'}};border-color:{{btn_color ? ('#'+btn_color):'#FDC107'}};">
  77 + <view class="flex-center lhead" bindtap="user_task_list_click" data-index="0"
  78 + style="background-color:{{switch_head==0?(btn_color ? ('#'+btn_color):'#FDC107'):'transparent'}};border-color:{{btn_color ? ('#'+btn_color):'#FDC107'}};">
75 <image class="unfinished" src="{{iurl}}miniapp/images/friendhelp/task.png" lazy-load="true"></image> 79 <image class="unfinished" src="{{iurl}}miniapp/images/friendhelp/task.png" lazy-load="true"></image>
76 <view>我的任务</view> 80 <view>我的任务</view>
77 </view> 81 </view>
78 - <view class="flex-center lhead {{switch_head==1?'rhead':''}}" bindtap="dismantle_record_click" data-index='1'> 82 + <view class="flex-center lhead" bindtap="dismantle_record_click" data-index='1'
  83 + style="background-color:{{switch_head==1?(btn_color ? ('#'+btn_color):'#FDC107'):'transparent'}};border-color:{{btn_color ? ('#'+btn_color):'#FDC107'}};">
79 <image class="unfinished" style="margin-top: 5rpx;" src="{{iurl}}miniapp/images/friendhelp/edit.png" lazy-load="true"></image> 84 <image class="unfinished" style="margin-top: 5rpx;" src="{{iurl}}miniapp/images/friendhelp/edit.png" lazy-load="true"></image>
80 <view>帮拆记录</view> 85 <view>帮拆记录</view>
81 </view> 86 </view>
82 </view> 87 </view>
83 88
84 - <view class="white"> 89 + <view style="color:{{font_color ? ('#'+font_color):'white'}}">
85 90
86 <view class="items" wx:if="{{is_task==0}}"> 91 <view class="items" wx:if="{{is_task==0}}">
87 <view class="tesk_list"> 92 <view class="tesk_list">
@@ -101,7 +106,7 @@ @@ -101,7 +106,7 @@
101 </view> 106 </view>
102 107
103 <view class="fs30" wx:if="{{user_task_list==null || user_task_list==''}}"> 108 <view class="fs30" wx:if="{{user_task_list==null || user_task_list==''}}">
104 - <view class="flex-center nothing white"> 109 + <view class="flex-center nothing">
105 <view>暂无任务记录</view> 110 <view>暂无任务记录</view>
106 </view> 111 </view>
107 </view> 112 </view>
@@ -111,7 +116,7 @@ @@ -111,7 +116,7 @@
111 </view> 116 </view>
112 117
113 118
114 - <view class="items" wx:if="{{is_task==1}}"> 119 + <view class="items" wx:if="{{is_task==1}}" style="color:{{font_color ? ('#'+font_color):'white'}};">
115 <block wx:if="{{ dismantle!=null|| dismantle!=''}}"> 120 <block wx:if="{{ dismantle!=null|| dismantle!=''}}">
116 121
117 <view class="tesk_list"> 122 <view class="tesk_list">
@@ -133,7 +138,7 @@ @@ -133,7 +138,7 @@
133 </block> 138 </block>
134 139
135 <view class="fs30" wx:if="{{dismantle==null|| dismantle==''}}"> 140 <view class="fs30" wx:if="{{dismantle==null|| dismantle==''}}">
136 - <view class="flex-center nothing white"> 141 + <view class="flex-center nothing">
137 <view>暂无任务记录</view> 142 <view>暂无任务记录</view>
138 </view> 143 </view>
139 </view> 144 </view>
@@ -143,16 +148,16 @@ @@ -143,16 +148,16 @@
143 148
144 </view> 149 </view>
145 <!-- 加载更多 --> 150 <!-- 加载更多 -->
146 -<view class="fs32"> 151 +<view class="fs32" style="background-color:#{{bg_color ? bg_color:'d01119'}};color:{{font_color ? ('#'+font_color):'white'}};">
147 <view class="flex-center" wx:if="{{is_show==1&&is_user_list==0}}"> 152 <view class="flex-center" wx:if="{{is_show==1&&is_user_list==0}}">
148 <view class="line"></view> 153 <view class="line"></view>
149 - <view class="load white" bindtap="task_list">点击加载更多</view> 154 + <view class="load" bindtap="task_list">点击加载更多</view>
150 <view class="line"></view> 155 <view class="line"></view>
151 </view> 156 </view>
152 - <view class="flex-center white bottom" wx:if="{{usercount>0}}"> 157 + <view class="flex-center bottom" wx:if="{{usercount>0}}">
153 <view>该任务已被领取了{{usercount}}次</view> 158 <view>该任务已被领取了{{usercount}}次</view>
154 </view> 159 </view>
155 - <view class="flex-center white bottom" wx:else> 160 + <view class="flex-center bottom" wx:else>
156 <view>暂无领取记录</view> 161 <view>暂无领取记录</view>
157 </view> 162 </view>
158 </view> 163 </view>
pages/user/assistance/task_assistance.wxss
1 page { 1 page {
2 - background: #d01119; 2 + /* background: #d01119; */
3 width: 100%; 3 width: 100%;
4 height: 100%; 4 height: 100%;
5 5
@@ -13,7 +13,7 @@ page { @@ -13,7 +13,7 @@ page {
13 } 13 }
14 .top-back { 14 .top-back {
15 width: 100%; 15 width: 100%;
16 - /* height:65%; */ 16 + /* height:100vh; */
17 background-repead: no-repead; 17 background-repead: no-repead;
18 background-size: 100% 100%; 18 background-size: 100% 100%;
19 padding-bottom: 50rpx; 19 padding-bottom: 50rpx;
@@ -55,7 +55,7 @@ page { @@ -55,7 +55,7 @@ page {
55 color: #d01119; 55 color: #d01119;
56 line-height: 65rpx; 56 line-height: 65rpx;
57 letter-spacing: 5rpx; 57 letter-spacing: 5rpx;
58 - box-shadow: 0rpx 7rpx 0rpx 0rpx rgb(245, 119, 6); 58 + box-shadow: 0rpx 7rpx 0rpx 0rpx rgba(0, 0, 0, .2);
59 } 59 }
60 60
61 /* 底部列表样式 */ 61 /* 底部列表样式 */
@@ -235,8 +235,8 @@ line-height: 48rpx; @@ -235,8 +235,8 @@ line-height: 48rpx;
235 235
236 } 236 }
237 .bottom{ 237 .bottom{
238 - margin-bottom: 50rpx;  
239 - margin-top: 20rpx; 238 + padding-bottom: 50rpx;
  239 + padding-top: 20rpx;
240 } 240 }
241 241
242 .rel { 242 .rel {