From 70ad39fb8db9963af8c1a1be8f8b4805eda4b36d Mon Sep 17 00:00:00 2001
From: taiyuan <yvan.ni@yolipai.com>
Date: Sat, 24 Oct 2020 15:20:23 +0800
Subject: [PATCH] 助力活动背景色修改

---
 pages/user/assistance/task_assistance.wxml | 361 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 pages/user/assistance/task_assistance.wxss |   5 ++++-
 2 files changed, 186 insertions(+), 180 deletions(-)

diff --git a/pages/user/assistance/task_assistance.wxml b/pages/user/assistance/task_assistance.wxml
index 8e86552..8bc19e5 100644
--- a/pages/user/assistance/task_assistance.wxml
+++ b/pages/user/assistance/task_assistance.wxml
@@ -1,182 +1,185 @@
 <wxs module="filter" src="../../../utils/filter.wxs"></wxs>
-<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">
-<!-- <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"> -->
-  <!-- 助力活动头部 -->
-  <view class="top-frame">
-    <view class="flex-center">
-      <view class="top-title white fs36 t-c ellipsis-1" style="color:{{font_color ? ('#'+font_color):'white'}};">
-        {{aitem[sw_index].helpTaskName}}
-      </view>
-    </view>
-    <view class="activity-data t-c fs28" style="color:{{font_color ? ('#'+font_color):'white'}};">
-      活动剩余时间:
-      <block wx:if="{{aitem[0].djs.day}}"><text class='tui-conutdown-box'> {{aitem[0].djs.day}}天 </text></block>
-      <text class='tui-conutdown-box'>{{aitem[0].djs.hou}}</text>:
-      <text class='tui-conutdown-box'>{{aitem[0].djs.min}}</text>:
-      <text class='tui-conutdown-box tui-countdown-bg'>{{aitem[0].djs.sec}}</text>
-    </view>
-  </view>
-  <!-- 图片的轮播图 -->
-  <view class="xc-specific-more-frame flex-center" style="height:{{max_sw_height}}px;">
-    <view bindtap="click_pre">
-      <view class="bg_left xc-left bcolor"></view>
-    </view>
-		<!-- <swiper bindanimationfinish="changeGoodsSwip" current="{{sw_index}}" style='width:82.7%; height:100%' bindchange='onSli' indicator-dots="{{false}}" autoplay="{{false}}"> -->
-    <swiper bindanimationfinish="changeGoodsSwip" current="{{sw_index}}" style='' bindchange='onSli' indicator-dots="{{false}}" autoplay="{{false}}" style='width:80%;height:100%;'>
-      <swiper-item class="rel" wx:for="{{aitem}}" wx:for-item="aitem" wx:for-index="pidx">
-
-        <image class="xc-center-img" bindtap="libao_details" data-taskid="{{aitem.id}}"  src="{{aitem.giftBagUrl!=null&&aitem.giftBagUrl!=''?iurl+aitem.giftBagUrl:swpie_img}}" mode="widthFix" bindload='imageLoad' style="width: 100%;display: block;"></image>
-        <view bindtap="libao_details" data-taskid="{{aitem.id}}" class="abs select_details fs26 white">礼包详情</view>
-
-      </swiper-item>
-
-    </swiper>
-
-    <view bindtap="click_next">
-      <view class="bg_right xc-right bcolor mt"></view>
-    </view>
-  </view>
-  <view class="plan-frame flex ai-center" wx:if="{{is_user_task}}">
-    <view class="plan_num rel">
-      <view class="is_plam abs" style="width:{{(is_user_task.zlHelpNum/is_user_task.helpNum)*100}}%"></view>
-    </view>
-
-
-    <text class="white fs24">{{is_user_task.zlHelpNum}}/{{is_user_task.helpNum}}</text>
-
-  </view>
-  <view class="task-number fs28 t-c" style="color:{{font_color ? ('#'+font_color):'white'}};">
-      <text wx:if="{{giftQty}}">今天剩余可领{{task_number}}个任务</text> 
-      <text wx:else>不限任务数量</text> 
-  </view>
-
-  <view wx:if="{{is_user_task==null}}" class="task_clike fs40 t-c flex-center" data-taskid="{{taskid}}" bindtap="add_onlicke"
-	style="background-color:#{{btn_color ? btn_color:'fbda0e'}};color:{{font_color?('#'+font_color):'white'}};">
-    就选它了
-  </view>
-  <view wx:if="{{is_user_task!=null&&is_user_task.status==0}}" class="task_clike fs40 t-c flex-center" bindtap="save_share"
-	style="background-color:#{{btn_color ? btn_color:'fbda0e'}};color:{{font_color?('#'+font_color):'white'}};">
-    好友拆一拆
-  </view>
-  <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"
-	style="background-color:#{{btn_color ? btn_color:'fbda0e'}};color:{{font_color?('#'+font_color):'white'}};">
-   立即兑换
-  </view>
-
-  <!--
- <view class="task_clike fs40 t-c flex-center" bindtap="test">
-  测试专用帮被人拆
- </view>-->
-
+<view class="container" style="background-color:#{{bg_color ? bg_color:'d01119'}}">
+	<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">
+	<!-- <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"> -->
+	  <!-- 助力活动头部 -->
+	  <view class="top-frame">
+	    <view class="flex-center">
+	      <view class="top-title white fs36 t-c ellipsis-1" style="color:{{font_color ? ('#'+font_color):'white'}};">
+	        {{aitem[sw_index].helpTaskName}}
+	      </view>
+	    </view>
+	    <view class="activity-data t-c fs28" style="color:{{font_color ? ('#'+font_color):'white'}};">
+	      活动剩余时间:
+	      <block wx:if="{{aitem[0].djs.day}}"><text class='tui-conutdown-box'> {{aitem[0].djs.day}}天 </text></block>
+	      <text class='tui-conutdown-box'>{{aitem[0].djs.hou}}</text>:
+	      <text class='tui-conutdown-box'>{{aitem[0].djs.min}}</text>:
+	      <text class='tui-conutdown-box tui-countdown-bg'>{{aitem[0].djs.sec}}</text>
+	    </view>
+	  </view>
+	  <!-- 图片的轮播图 -->
+	  <view class="xc-specific-more-frame flex-center" style="height:{{max_sw_height}}px;">
+	    <view bindtap="click_pre">
+	      <view class="bg_left xc-left bcolor"></view>
+	    </view>
+			<!-- <swiper bindanimationfinish="changeGoodsSwip" current="{{sw_index}}" style='width:82.7%; height:100%' bindchange='onSli' indicator-dots="{{false}}" autoplay="{{false}}"> -->
+	    <swiper bindanimationfinish="changeGoodsSwip" current="{{sw_index}}" style='' bindchange='onSli' indicator-dots="{{false}}" autoplay="{{false}}" style='width:80%;height:100%;'>
+	      <swiper-item class="rel" wx:for="{{aitem}}" wx:for-item="aitem" wx:for-index="pidx">
+	
+	        <image class="xc-center-img" bindtap="libao_details" data-taskid="{{aitem.id}}"  src="{{aitem.giftBagUrl!=null&&aitem.giftBagUrl!=''?iurl+aitem.giftBagUrl:swpie_img}}" mode="widthFix" bindload='imageLoad' style="width: 100%;display: block;"></image>
+	        <view bindtap="libao_details" data-taskid="{{aitem.id}}" class="abs select_details fs26 white">礼包详情</view>
+	
+	      </swiper-item>
+	
+	    </swiper>
+	
+	    <view bindtap="click_next">
+	      <view class="bg_right xc-right bcolor mt"></view>
+	    </view>
+	  </view>
+	  <view class="plan-frame flex ai-center" wx:if="{{is_user_task}}">
+	    <view class="plan_num rel">
+	      <view class="is_plam abs" style="width:{{(is_user_task.zlHelpNum/is_user_task.helpNum)*100}}%"></view>
+	    </view>
+	
+	
+	    <text class="white fs24">{{is_user_task.zlHelpNum}}/{{is_user_task.helpNum}}</text>
+	
+	  </view>
+	  <view class="task-number fs28 t-c" style="color:{{font_color ? ('#'+font_color):'white'}};">
+	      <text wx:if="{{giftQty}}">今天剩余可领{{task_number}}个任务</text> 
+	      <text wx:else>不限任务数量</text> 
+	  </view>
+	
+	  <view wx:if="{{is_user_task==null}}" class="task_clike fs40 t-c flex-center" data-taskid="{{taskid}}" bindtap="add_onlicke"
+		style="background-color:#{{btn_color ? btn_color:'fbda0e'}};color:{{font_color?('#'+font_color):'white'}};">
+	    就选它了
+	  </view>
+	  <view wx:if="{{is_user_task!=null&&is_user_task.status==0}}" class="task_clike fs40 t-c flex-center" bindtap="save_share"
+		style="background-color:#{{btn_color ? btn_color:'fbda0e'}};color:{{font_color?('#'+font_color):'white'}};">
+	    好友拆一拆
+	  </view>
+	  <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"
+		style="background-color:#{{btn_color ? btn_color:'fbda0e'}};color:{{font_color?('#'+font_color):'white'}};">
+	   立即兑换
+	  </view>
+	
+	  <!--
+	 <view class="task_clike fs40 t-c flex-center" bindtap="test">
+	  测试专用帮被人拆
+	 </view>-->
+	
+	</view>
+	<!-- 底部列表 -->
+	<view style="background-color:#{{bg_color ? bg_color:'d01119'}}">
+	<!-- <view style="margin-top:{{is_user_task!=null?52:0}}rpx"> -->
+	  <!-- 标题 -->
+	
+	  <view class="flex-vertical-between fs28 padding head" style="color:#{{font_color ? font_color:'white'}};border-color:{{btn_color ? ('#'+btn_color):'#FDC107'}};">
+	    <view class="flex-center lhead" bindtap="user_task_list_click" data-index="0"
+			style="background-color:{{switch_head==0?(btn_color ? ('#'+btn_color):'#FDC107'):'transparent'}};border-color:{{btn_color ? ('#'+btn_color):'#FDC107'}};">
+	      <image class="unfinished" src="{{iurl}}miniapp/images/friendhelp/task.png" lazy-load="true"></image>
+	      <view>我的任务</view>
+	    </view>
+	    <view class="flex-center lhead" bindtap="dismantle_record_click" data-index='1'
+			style="background-color:{{switch_head==1?(btn_color ? ('#'+btn_color):'#FDC107'):'transparent'}};border-color:{{btn_color ? ('#'+btn_color):'#FDC107'}};">
+	      <image class="unfinished" style="margin-top: 5rpx;" src="{{iurl}}miniapp/images/friendhelp/edit.png" lazy-load="true"></image>
+	      <view>帮拆记录</view>
+	    </view>
+	  </view>
+	
+	  <view style="color:{{font_color ? ('#'+font_color):'white'}}">
+	
+	    <view class="items" wx:if="{{is_task==0}}">
+	     <view class="tesk_list">
+	      <view class="item fs26 flex-vertical-between padding" wx:for="{{user_task_list}}" wx:key="*this">
+	        <view class="flex-center width">
+	          <view class="ellipsis-1">{{item.helpTaskName}}
+	          </view>
+	        </view>
+	        <view class="flex-center width state">
+	          <view class="ellipsis-1">
+	            <text wx:if="{{item.status==0}}" bindtap="go_task"  data-taskid="{{item.helpTaskId}}">{{item.zlHelpNum}}/{{item.helpNum}}</text>
+	            <text wx:if="{{item.status==2}}" bindtap="select_libao" data-orderSn="{{item.orderSn}}">查看礼包</text>
+	            <text wx:if="{{item.status==1}}" bindtap="get_libao" data-libaoid="{{item.helpListGiftBagId}}"data-taskingid="{{item.id}}" data-taskid="{{item.helpTaskId}}">领取礼包 </text>
+	          </view>
+	        </view>
+	    </view>
+	      </view>
+	
+	      <view class="fs30" wx:if="{{user_task_list==null || user_task_list==''}}">
+	        <view class="flex-center nothing">
+	          <view>暂无任务记录</view>
+	        </view>
+	      </view>
+	    </view>
+	
+	
+	  </view>
+	
+	
+	  <view class="items" wx:if="{{is_task==1}}" style="color:{{font_color ? ('#'+font_color):'white'}};">
+	    <block wx:if="{{ dismantle!=null|| dismantle!=''}}">
+	
+	  <view class="tesk_list">
+	      <view class="item fs26 flex flex-vertical-between padding" wx:for="{{dismantle}}" wx:for-index="idx">
+	        <view class="flex white is_dismantle_frame" style="justify-content: space-around; width: 90%;margin:auto">
+	          <image class="circle user_img" src="{{item.headPic==null?defaultAvatar:item.headPic}}"></image>
+	          <view class="ellipsis-1 width">{{item.nickName}}
+	          </view>
+	          <view class="ellipsis-1">{{filter.format_time(item.zltime)}}
+	          </view>
+	        </view>
+	      </view>
+	     </view>
+	      <view class="flex-center fs32" wx:if="{{is_bc_show==1&&dismantle!=null&&is_dis_list==1}}">
+	        <view class="line"></view>
+	        <view class="load  white" bindtap="dismantle_record_list">点击加载更多</view>
+	        <view class="line"></view>
+	      </view>
+	    </block>
+	
+	    <view class="fs30" wx:if="{{dismantle==null|| dismantle==''}}">
+	      <view class="flex-center nothing">
+	        <view>暂无任务记录</view>
+	      </view>
+	    </view>
+	
+	  </view>
+	
+	
+	</view>
+	<!-- 加载更多 -->
+	<view class="fs32" style="background-color:#{{bg_color ? bg_color:'d01119'}};color:{{font_color ? ('#'+font_color):'white'}};">
+	  <view class="flex-center" wx:if="{{is_show==1&&is_user_list==0}}">
+	    <view class="line"></view>
+	    <view class="load" bindtap="task_list">点击加载更多</view>
+	    <view class="line"></view>
+	  </view>
+	  <view class="flex-center bottom"  wx:if="{{usercount>0}}">
+	    <view>该任务已被领取了{{usercount}}次</view>
+	  </view>
+		<view class="flex-center bottom"  wx:else>
+	    <view>暂无领取记录</view>
+	  </view>
+	</view>
+	
+	
+	<!--********** 钱巧玲 -->
+	<view wx:if="{{is_share}}">
+	  <view class="dust"></view>
+	  <view class="canvas" style="width:100%;">
+	    <view class="flex-center">
+	      <canvas canvas-id="share_id" style="width:600rpx;height:1000rpx;" bindtap="preview"></canvas>
+	    </view>
+	    <view class="closes flex-center">
+	      <image class="close" src="{{iurl}}/miniapp/images/plus/Close.png" bindtap="close_share"></image>
+	    </view>
+	  </view>
+	</view>
+	<!-- 引入提示组件 -->
+	<warn id="warn"></warn>
+	<!--  制作一个圆球导航  -->
+	<nav_b id="nav_b"></nav_b>
 </view>
-<!-- 底部列表 -->
-<view style="background-color:#{{bg_color ? bg_color:'d01119'}}">
-<!-- <view style="margin-top:{{is_user_task!=null?52:0}}rpx"> -->
-  <!-- 标题 -->
-
-  <view class="flex-vertical-between fs28 padding head" style="color:#{{font_color ? font_color:'white'}};border-color:{{btn_color ? ('#'+btn_color):'#FDC107'}};">
-    <view class="flex-center lhead" bindtap="user_task_list_click" data-index="0"
-		style="background-color:{{switch_head==0?(btn_color ? ('#'+btn_color):'#FDC107'):'transparent'}};border-color:{{btn_color ? ('#'+btn_color):'#FDC107'}};">
-      <image class="unfinished" src="{{iurl}}miniapp/images/friendhelp/task.png" lazy-load="true"></image>
-      <view>我的任务</view>
-    </view>
-    <view class="flex-center lhead" bindtap="dismantle_record_click" data-index='1'
-		style="background-color:{{switch_head==1?(btn_color ? ('#'+btn_color):'#FDC107'):'transparent'}};border-color:{{btn_color ? ('#'+btn_color):'#FDC107'}};">
-      <image class="unfinished" style="margin-top: 5rpx;" src="{{iurl}}miniapp/images/friendhelp/edit.png" lazy-load="true"></image>
-      <view>帮拆记录</view>
-    </view>
-  </view>
-
-  <view style="color:{{font_color ? ('#'+font_color):'white'}}">
-
-    <view class="items" wx:if="{{is_task==0}}">
-     <view class="tesk_list">
-      <view class="item fs26 flex-vertical-between padding" wx:for="{{user_task_list}}" wx:key="*this">
-        <view class="flex-center width">
-          <view class="ellipsis-1">{{item.helpTaskName}}
-          </view>
-        </view>
-        <view class="flex-center width state">
-          <view class="ellipsis-1">
-            <text wx:if="{{item.status==0}}" bindtap="go_task"  data-taskid="{{item.helpTaskId}}">{{item.zlHelpNum}}/{{item.helpNum}}</text>
-            <text wx:if="{{item.status==2}}" bindtap="select_libao" data-orderSn="{{item.orderSn}}">查看礼包</text>
-            <text wx:if="{{item.status==1}}" bindtap="get_libao" data-libaoid="{{item.helpListGiftBagId}}"data-taskingid="{{item.id}}" data-taskid="{{item.helpTaskId}}">领取礼包 </text>
-          </view>
-        </view>
-    </view>
-      </view>
-
-      <view class="fs30" wx:if="{{user_task_list==null || user_task_list==''}}">
-        <view class="flex-center nothing">
-          <view>暂无任务记录</view>
-        </view>
-      </view>
-    </view>
 
-
-  </view>
-
-
-  <view class="items" wx:if="{{is_task==1}}" style="color:{{font_color ? ('#'+font_color):'white'}};">
-    <block wx:if="{{ dismantle!=null|| dismantle!=''}}">
-
-  <view class="tesk_list">
-      <view class="item fs26 flex flex-vertical-between padding" wx:for="{{dismantle}}" wx:for-index="idx">
-        <view class="flex white is_dismantle_frame" style="justify-content: space-around; width: 90%;margin:auto">
-          <image class="circle user_img" src="{{item.headPic==null?defaultAvatar:item.headPic}}"></image>
-          <view class="ellipsis-1 width">{{item.nickName}}
-          </view>
-          <view class="ellipsis-1">{{filter.format_time(item.zltime)}}
-          </view>
-        </view>
-      </view>
-     </view>
-      <view class="flex-center fs32" wx:if="{{is_bc_show==1&&dismantle!=null&&is_dis_list==1}}">
-        <view class="line"></view>
-        <view class="load  white" bindtap="dismantle_record_list">点击加载更多</view>
-        <view class="line"></view>
-      </view>
-    </block>
-
-    <view class="fs30" wx:if="{{dismantle==null|| dismantle==''}}">
-      <view class="flex-center nothing">
-        <view>暂无任务记录</view>
-      </view>
-    </view>
-
-  </view>
-
-
-</view>
-<!-- 加载更多 -->
-<view class="fs32" style="background-color:#{{bg_color ? bg_color:'d01119'}};color:{{font_color ? ('#'+font_color):'white'}};">
-  <view class="flex-center" wx:if="{{is_show==1&&is_user_list==0}}">
-    <view class="line"></view>
-    <view class="load" bindtap="task_list">点击加载更多</view>
-    <view class="line"></view>
-  </view>
-  <view class="flex-center bottom"  wx:if="{{usercount>0}}">
-    <view>该任务已被领取了{{usercount}}次</view>
-  </view>
-	<view class="flex-center bottom"  wx:else>
-    <view>暂无领取记录</view>
-  </view>
-</view>
-
-
-<!--********** 钱巧玲 -->
-<view wx:if="{{is_share}}">
-  <view class="dust"></view>
-  <view class="canvas" style="width:100%;">
-    <view class="flex-center">
-      <canvas canvas-id="share_id" style="width:600rpx;height:1000rpx;" bindtap="preview"></canvas>
-    </view>
-    <view class="closes flex-center">
-      <image class="close" src="{{iurl}}/miniapp/images/plus/Close.png" bindtap="close_share"></image>
-    </view>
-  </view>
-</view>
-<!-- 引入提示组件 -->
-<warn id="warn"></warn>
-<!--  制作一个圆球导航  -->
-<nav_b id="nav_b"></nav_b>
diff --git a/pages/user/assistance/task_assistance.wxss b/pages/user/assistance/task_assistance.wxss
index ed29596..38a52b8 100644
--- a/pages/user/assistance/task_assistance.wxss
+++ b/pages/user/assistance/task_assistance.wxss
@@ -1,8 +1,11 @@
 page {
   /* background: #d01119; */
   width: 100%;
-  height: 100%;
+ height: 100%;
+}
 
+.container {
+	height: 100%;
 }
 
 .tesk_list{
--
libgit2 0.21.4