From a0960568fe4ba6e02157cb31f873f86fc82c2061 Mon Sep 17 00:00:00 2001
From: taiyuan <yvan.ni@yolipai.com>
Date: Wed, 30 Sep 2020 15:51:26 +0800
Subject: [PATCH] 助力活动自定义

---
 pages/goods/goodsInfo/goodsInfo.wxml       |  6 +++---
 pages/user/assistance/assistance.js        | 26 +++++++++++++++++++++++++-
 pages/user/assistance/assistance.wxml      | 67 ++++++++++++++++++++++++++++++++++++++++---------------------------
 pages/user/assistance/assistance.wxss      | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------
 pages/user/assistance/task_assistance.js   | 11 +++++++++++
 pages/user/assistance/task_assistance.wxml | 43 ++++++++++++++++++++++++-------------------
 pages/user/assistance/task_assistance.wxss | 10 +++++-----
 7 files changed, 172 insertions(+), 70 deletions(-)

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 @@
 				       </view>
 			       </view>				   				
 			       <view class="right flex jc-center ai-center" bindtap="go_plus">
-                      <view class="at_once_carde xc-black3 fs28">立即开卡</view>  
-                      <view class="bg_right"></view>
+								<view class="at_once_carde xc-black3 fs28">立即开卡</view>  
+								<view class="bg_right"></view>
 			       </view>
                
                </view>
@@ -480,7 +480,7 @@
 
         <view class="bz_view flex ai-center" wx:if="{{bconfig}}" style="line-height: 36rpx">
           <image class="bzfu_img" src="{{iurl}}/miniapp/images/bzfu_w.png"></image>
-          <view>{{bconfig.service_bz}}</view>
+          <view class="bz-content">{{bconfig.service_bz}}</view>
         </view>
 
 
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(/\<img/gi, '<img style="max-width:100%;height:auto;display：block"');
         th.setData({
           zl_act: help_data,
-          help_id: help_data.id
+          help_id: help_data.id,
+					btn_color: help_data.btn_color,
+					bg_color: help_data.bg_color,
+					font_color: help_data.font_color,
+					imageUrl: help_data.imageUrl,
         });
         if (th.data.help_id != "" && th.data.help_id != null) {
           //我的任务
diff --git a/pages/user/assistance/assistance.wxml b/pages/user/assistance/assistance.wxml
index 996b6e0..e31fd04 100644
--- a/pages/user/assistance/assistance.wxml
+++ b/pages/user/assistance/assistance.wxml
@@ -1,48 +1,61 @@
 <wxs module="filter" src="c_filter.wxs"></wxs>
 <wxs module="filter_s" src="../../../utils/filter.wxs"></wxs>
-<view class="page" bindtap="close">
+<view class="page" bindtap="close" style="background-color:#{{bg_color ? bg_color:'d01119'}};">
   <!-- 背景图片 -->
-  <image class="lumi" src="{{iurl+'miniapp/images/friendhelp/lumi.png'}}" lazy-load="true"></image>
-  <view class="zindex">
+  <image wx:if="{{!(imageUrl)}}" class="lumi" src="{{iurl+'miniapp/images/friendhelp/lumi.png'}}" lazy-load="true"></image>
+	
+  <view class="zindex" style="color:#{{font_color ? font_color:'black'}};background-color:#{{bg_color ? bg_color:'d01119'}};">
     <view class="top">
-      <view class="flex-center">
-        <image class="getgift" src="{{iurl+'miniapp/images/friendhelp/getgift.png'}}" lazy-load="true"></image>
-      </view>
-      <view class="flex-center fs32">
-        <view class="excitation">机会总是留给最有行动力的人</view>
-      </view>
-      <view class="flex-center">
-        <image class="gift" src="{{zl_act.imageUrl==''?iurl+'miniapp/images/friendhelp/gift.png':iurl+zl_act.imageUrl}}" lazy-load="true"></image>
-      </view>
-      <view wx:if="{{zl_act.beginDate && zl_act.endDate}}" class="flex-center fs26 time">
-        <view>活动时间：{{filter_s.format_time(zl_act.beginDate,0)}} 至 {{filter_s.format_time(zl_act.endDate,0)}}</view>
-
-      </view>
-      <view class="flex-center" bindtap="go_task">
-        <view class="flex-center take">
+			<!-- 上传主图的情况 -->
+			<view class="bg-img" wx:if="{{imageUrl}}"></view>
+			<!-- 没有上传主图的情况 -->
+			<block wx:else>
+				<view class="flex-center">
+				  <image class="getgift" src="{{iurl+'miniapp/images/friendhelp/getgift.png'}}" lazy-load="true"></image>
+				</view>
+				<view class="flex-center fs32">
+				  <view class="excitation" style="color:{{font_color ? ('#'+font_color):'white'}};">机会总是留给最有行动力的人</view>
+				</view>
+				<view class="flex-center">
+				  <image class="gift" src="{{zl_act.imageUrl==''?iurl+'miniapp/images/friendhelp/gift.png':iurl+zl_act.imageUrl}}" lazy-load="true"></image>
+				</view>
+				<view wx:if="{{zl_act.beginDate && zl_act.endDate}}" class="flex-center fs26 time">
+				  <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>
+				</view>
+			</block>
+     
+      <view class="flex-center btn-get" bindtap="go_task">
+        <view class="flex-center take" style="color:{{font_color?('#'+font_color):'white'}};background-color: #{{btn_color? btn_color:'FDC107'}};">
           <view>立即领取</view>
         </view>
       </view>
     </view>
+		
+		
 
     <!-- 任务及说明栏 -->
-    <view>
+    <view class="task-container">
       <!-- 标题 -->
-      <view class="flex-vertical-between fs28 padding head">
+      <view class="flex-vertical-between fs28 padding head"
+			 style="color:{{font_color ? ('#'+font_color):'white'}};border-color:{{btn_color ? ('#'+btn_color):'#FDC107'}};">
         <!-- task -->
-        <view class="flex-center lhead {{switch_head==0?'rhead':''}}" bindtap="switch_head" data-index="{{0}}">
+        <view class="flex-center lhead"
+				style="background-color:{{switch_head==0?(btn_color ? ('#'+btn_color):'#FDC107'):'transparent'}};border-color:{{btn_color ? ('#'+btn_color):'#FDC107'}};"
+				bindtap="switch_head" data-index="{{0}}">
           <image class="explain" src="{{iurl+'miniapp/images/friendhelp/task.png'}}" lazy-load="true"></image>
           <view>我的任务</view>
         </view>
-        <view class="flex-center lhead {{switch_head==1?'rhead':''}}" bindtap="switch_head" data-index="{{1}}">
+        <view class="flex-center lhead"
+				 style="background-color:{{switch_head==1?(btn_color ? ('#'+btn_color):'#FDC107'):'transparent'}};border-color:{{btn_color ? ('#'+btn_color):'#FDC107'}};"
+				 bindtap="switch_head" data-index="{{1}}">
           <image class="explain" src="{{iurl+'miniapp/images/friendhelp/explain.png'}}" lazy-load="true"></image>
           <view>活动说明</view>
         </view>
       </view>
 
       <!-- 我的任务 -->
-      <view wx:if="{{switch_head==0}}" class="white">
-        <view class="items">
+      <view wx:if="{{switch_head==0}}" class="task-content">
+        <view class="items" style="color:{{font_color ? ('#'+font_color):'white'}};">
           <view class="tesk_list">
             <view class="item fs26 flex-vertical-between padding" wx:for="{{zl_user_list}}">
               <view class="flex-center width">
@@ -74,10 +87,10 @@
 
 
         <view class="fs30" style="margin-top: 30rpx;">
-          <view class="flex-center nothing" wx:if="{{is_load && zl_user_list.length==0}}">
+          <view class="flex-center nothing" wx:if="{{is_load && zl_user_list.length==0}}" style="color:{{font_color ? ('#'+font_color):'white'}}">
             <view>暂无任务记录</view>
           </view>
-          <view class="flex-center receive" wx:if="{{is_load && s_num}}">
+          <view class="flex-center receive" wx:if="{{is_load && s_num}}" style="color:{{font_color ? ('#'+font_color):'white'}}">
             <view class="flex-center ai-bas">
               <view>该活动已被领取了{{s_num}}次</view>
             </view>
@@ -89,7 +102,7 @@
       <!-- 活动说明 -->
       <view wx:if="{{switch_head}}" class="white">
         <view class="items">
-          <view class="content fs28 padding">
+          <view class="content fs28 padding" style="color:{{font_color ? ('#'+font_color):'white'}}">
             <block wx:if="{{zl_act.remark!=''}}">
               <rich-text nodes="{{zl_act.remark}}" style="word-break:break-all;word-wrap:break-word"></rich-text>
             </block>
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 @@
 <wxs module="filter" src="../../../utils/filter.wxs"></wxs>
-<view class="top-back" style="padding-bottom:80rpx;background-image: url({{iurl}}/miniapp/images/friendhelp/lumi.png)" bindtap="close">
+<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">
+      <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  white">
+    <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>:
@@ -45,17 +45,20 @@
     <text class="white fs24">{{is_user_task.zlHelpNum}}/{{is_user_task.helpNum}}</text>
 
   </view>
-  <view class="task-number fs28   white t-c ">
+  <view class="task-number fs28 t-c" style="color:{{font_color ? ('#'+font_color):'white'}};">
     今天剩余可领{{task_number}}个任务
   </view>
 
-  <view wx:if="{{is_user_task==null}}" class="task_clike fs40 t-c flex-center" data-taskid="{{taskid}}" bindtap="add_onlicke">
+  <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">
+  <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">
+  <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>
 
@@ -66,22 +69,24 @@
 
 </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">
-    <view class="flex-center lhead {{switch_head==0?'rhead':''}}" bindtap="user_task_list_click" data-index="0">
+  <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 {{switch_head==1?'rhead':''}}" bindtap="dismantle_record_click" data-index='1'>
+    <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 class="white">
+  <view style="color:{{font_color ? ('#'+font_color):'white'}}">
 
     <view class="items" wx:if="{{is_task==0}}">
      <view class="tesk_list">
@@ -101,7 +106,7 @@
       </view>
 
       <view class="fs30" wx:if="{{user_task_list==null || user_task_list==''}}">
-        <view class="flex-center nothing white">
+        <view class="flex-center nothing">
           <view>暂无任务记录</view>
         </view>
       </view>
@@ -111,7 +116,7 @@
   </view>
 
 
-  <view class="items" wx:if="{{is_task==1}}">
+  <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">
@@ -133,7 +138,7 @@
     </block>
 
     <view class="fs30" wx:if="{{dismantle==null|| dismantle==''}}">
-      <view class="flex-center nothing white">
+      <view class="flex-center nothing">
         <view>暂无任务记录</view>
       </view>
     </view>
@@ -143,16 +148,16 @@
 
 </view>
 <!-- 加载更多 -->
-<view class="fs32">
+<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  white" bindtap="task_list">点击加载更多</view>
+    <view class="load" bindtap="task_list">点击加载更多</view>
     <view class="line"></view>
   </view>
-  <view class="flex-center white bottom"  wx:if="{{usercount>0}}">
+  <view class="flex-center bottom"  wx:if="{{usercount>0}}">
     <view>该任务已被领取了{{usercount}}次</view>
   </view>
-	<view class="flex-center white bottom"  wx:else>
+	<view class="flex-center bottom"  wx:else>
     <view>暂无领取记录</view>
   </view>
 </view>
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 {
--
libgit2 0.21.4