diff --git a/pages/giftpack/buygiftpack/giftpackbuy.js b/pages/giftpack/buygiftpack/giftpackbuy.js
index 4573cdb..51ca204 100644
--- a/pages/giftpack/buygiftpack/giftpackbuy.js
+++ b/pages/giftpack/buygiftpack/giftpackbuy.js
@@ -37,13 +37,7 @@ Page({
th.getList();
},
onShow: function() {
- // var th = this;
- // th.setData({
- // pages: 1,
- // pageSize: 10,
- // loadingType: 0
- // })
- // th.getList();
+
},
GetBuyPrice: function(e) {
@@ -155,6 +149,9 @@ Page({
},
getList: function(e) {
var th = this;
+ wx.showLoading({
+ title: '加载中',
+ });
getApp().request.get('/api/weshop/marketing/giftbag/page', {
data: {
storeId: th.data.getStorageID, //商家ID
diff --git a/pages/giftpack/buygiftpack/giftpackbuy.wxml b/pages/giftpack/buygiftpack/giftpackbuy.wxml
index 925a563..b99e9d7 100644
--- a/pages/giftpack/buygiftpack/giftpackbuy.wxml
+++ b/pages/giftpack/buygiftpack/giftpackbuy.wxml
@@ -39,7 +39,7 @@
{{"原价:￥"+items.giftPosPrice}}
- {{"活动时间:"+items.endTime}}
+ {{"活动结束时间:"+items.endTime}}
diff --git a/pages/giftpack/evaluategift/evaluategift.js b/pages/giftpack/evaluategift/evaluategift.js
index 99d8199..b41121c 100644
--- a/pages/giftpack/evaluategift/evaluategift.js
+++ b/pages/giftpack/evaluategift/evaluategift.js
@@ -34,6 +34,9 @@ Page({
},
GetList: function() {
var th = this;
+ wx.showLoading({
+ title: '加载中',
+ })
var url = "/api/weshop/marketing/giftbag/bound/get";
getApp().request.promiseGet(url, {
data: {
@@ -47,6 +50,7 @@ Page({
"gifbagid": th.data.giftBagId
}
}).then(res => {
+ wx.hideLoading();
if (res.data.code == 0) {
if (res.data.data.lbCoupons.length > 0 && res.data.data.lbCoupons != null) {
//礼包内容--礼券
diff --git a/pages/giftpack/evaluategift/evaluategift.wxml b/pages/giftpack/evaluategift/evaluategift.wxml
index e6c586d..805a33c 100644
--- a/pages/giftpack/evaluategift/evaluategift.wxml
+++ b/pages/giftpack/evaluategift/evaluategift.wxml
@@ -2,166 +2,169 @@
-
-
-
-
- ______
-
-
- 新人专享\n你的美丽我来缔造
-
-
- ______
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 免费领取
-
-
- {{item.fromName}}
-
-
-
-
- {{item.fromName}}
-
-
- {{"新人可免费享受专业"+item.fromName+"，可以享受"+item.num+"次。"}}
-
-
-
-
-
+
+
+
+
+ ______
-
-
-
-
-
+
+ 新人专享\n你的美丽我来缔造
-
-
-
-
-
-
- ———
-
-
- 新人专享优惠券
-
-
- ———
-
-
-
-
-
-
-
- 全场通用
-
-
- 品牌限定
-
-
- 品类限定
-
-
- 用途限定
-
-
- 分类限定
-
-
- {{item.sum+"元券"}}
- {{"满"+item.buySum+"元可以用"}}
-
-
-
-
+
+ ______
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
- ———
-
-
- 新人专享福利
-
-
- ———
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+ 免费领取
+
+
+ {{item.fromName}}
+
-
-
-
-
-
+
+
+
+
+
-
- 本活动最终解释权归公司所有，如果有问题请联系客服
+
+
+
+
+
+
+
+
+ ———
+
+
+ 新人专享优惠券
+
+
+ ———
+
+
+
+
+
+
+
+ 全场通用
+
+
+ 品牌限定
+
+
+ 品类限定
+
+
+ 用途限定
+
+
+ 分类限定
+
+
+ {{item.sum+"元券"}}
+ {{"满"+item.buySum+"元可以用"}}
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+ ———
+
+
+ 新人专享福利
+
+
+ ———
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 本活动最终解释权归公司所有，如果有问题请联系客服
+
+
+
+
diff --git a/pages/giftpack/evaluategift/evaluategift.wxss b/pages/giftpack/evaluategift/evaluategift.wxss
index 858848e..02ad479 100644
--- a/pages/giftpack/evaluategift/evaluategift.wxss
+++ b/pages/giftpack/evaluategift/evaluategift.wxss
@@ -286,7 +286,7 @@
margin: 0 30rpx 40rpx 30rpx;
/* background: #FFFFFF; */
border-radius: 20rpx;
- color: rgb(255, 255, 255);
+ background-color: rgb(255, 255, 255);
}
.foot_box_title {
@@ -345,7 +345,7 @@
}
.foot_button_buy {
- background: #e4010c;
+ background: rgb(71, 132, 239);
color: #fff;
width: 400rpx;
height: 70rpx;
@@ -379,3 +379,22 @@ button::after {
.foot_box_text .img {
line-height: 0;
}
+.num {
+ color: rgb(71, 132, 239);
+}
+
+.lvip {
+ left: 30rpx;
+ bottom: -58rpx;
+ width: 20rpx;
+ height: 90rpx;
+ z-index: 5;
+}
+
+.rvip {
+ right: 30rpx;
+ bottom: -58rpx;
+ width: 20rpx;
+ height: 90rpx;
+ z-index: 5;
+}
diff --git a/pages/giftpack/giftpacklist/giftpacklist.js b/pages/giftpack/giftpacklist/giftpacklist.js
index 113c1dd..74604d0 100644
--- a/pages/giftpack/giftpacklist/giftpacklist.js
+++ b/pages/giftpack/giftpacklist/giftpacklist.js
@@ -4,7 +4,7 @@ var e = getApp(),
t = e.request,
d = e.globalData;
var ut = require("../../../utils/util.js");
-
+
Page({
data: {
url: a.url, //接口网址
@@ -25,8 +25,9 @@ Page({
wareCard: [],
orderSn: "", //订单编号
lbId: "",
- code: "", //核销码
- c_state:"0", //判断是否已经使用, 0正常 1已使用 2已过期
+ code: "", //核销码
+ c_state: "0", //判断是否已经使用, 0正常 1已使用 2已过期
+ is_lb: 0, //是否有礼包
},
onLoad: function(options) {
var th = this;
@@ -179,16 +180,20 @@ Page({
giftRemark: res.data.data.giftRemark
})
}
-
- //---获取日期的时间戳---
- var t_endtime=res.data.data.endTime;
- t_endtime = t_endtime.replace(/-/g,'/');
- var t_date = new Date(t_endtime)/1000;
- var t_now=ut.gettimestamp();
-
- if(res.data.data.goodsUseState) th.setData({c_state:1})
- else if(t_date<=t_now)
- th.setData({c_state:2})
+
+ //---获取日期的时间戳---
+ var t_endtime = res.data.data.endTime;
+ t_endtime = t_endtime.replace(/-/g, '/');
+ var t_date = new Date(t_endtime) / 1000;
+ var t_now = ut.gettimestamp();
+
+ if (res.data.data.goodsUseState) th.setData({
+ c_state: 1
+ })
+ else if (t_date <= t_now)
+ th.setData({
+ c_state: 2
+ })
th.setData({
giftDate: res.data.data.endTime,
@@ -201,6 +206,15 @@ Page({
wareCard: res.data.data.wareCard,
lbId: res.data.data.lbId
})
+ //判断是否有礼包
+ for (var i = 0; i < res.data.data.wareCard.length; i++) {
+ if (res.data.data.wareCard[i].lbType == 1) {
+ th.setData({
+ is_lb: 1
+ })
+ break;
+ }
+ }
} else {
getApp().my_warnning("系统繁忙,请稍后再试", 0, th);
return false;
@@ -301,7 +315,7 @@ Page({
getApp().goto(url);
},
//图片失败，默认图片
- bind_bnerr2: function (e) {
+ bind_bnerr2: function(e) {
var _errImg = e.target.dataset.errorimg;
var _errObj = {};
_errObj[_errImg] = "/public/images/empty.jpg";
@@ -309,7 +323,7 @@ Page({
},
//关闭导航
- close: function () {
+ close: function() {
var th = this;
var nav_b = th.selectComponent("#nav_b"); //组件的id
nav_b.close_box();
diff --git a/pages/giftpack/giftpacklist/giftpacklist.wxml b/pages/giftpack/giftpacklist/giftpacklist.wxml
index 679e63a..394c4e5 100644
--- a/pages/giftpack/giftpacklist/giftpacklist.wxml
+++ b/pages/giftpack/giftpacklist/giftpacklist.wxml
@@ -66,8 +66,15 @@
{{"数量:"+item.num}}
-
-
+
+
+
+
+
+
+
+
+
@@ -118,17 +125,23 @@
diff --git a/pages/user/assistance/assistance_success.js b/pages/user/assistance/assistance_success.js
index 280c870..9603900 100644
--- a/pages/user/assistance/assistance_success.js
+++ b/pages/user/assistance/assistance_success.js
@@ -8,6 +8,8 @@ Page({
*/
data: {
iurl: s.imghost,
+ user:app_d.userInfo,
+ zl_act:null, //助力活动
},
/**
@@ -28,22 +30,22 @@ Page({
* 生命周期函数--监听页面显示
*/
onShow: function () {
-
+ this.init();
},
-
- // 初始化判断微信余额
- async weixin() {
+ // ----初始化----
+ init:function() {
+
var user_id = getApp().globalData.user_id;
var store_id = os.stoid;
- await getApp().request.promiseGet("/api/weshop/marketing/help/act/judge", {
+ var th=this;
+ getApp().request.promiseGet("http://172.20.3.102:8022/api/weshop/zl_act", {
data: {
user_id: user_id,
store_id: store_id
}
}).then(res => {
- console.log("是什么东西", res.data.code);
-
+ if(res.data.code==0) th.setData({zl_act:res.data.data})
})
},
@@ -55,19 +57,6 @@ Page({
},
- /**
- * 生命周期函数--监听页面卸载
- */
- onUnload: function () {
-
- },
-
- /**
- * 页面相关事件处理函数--监听用户下拉动作
- */
- onPullDownRefresh: function () {
-
- },
/**
* 页面上拉触底事件的处理函数
diff --git a/pages/user/assistance/assistance_success.wxml b/pages/user/assistance/assistance_success.wxml
index 173aabc..40188e9 100644
--- a/pages/user/assistance/assistance_success.wxml
+++ b/pages/user/assistance/assistance_success.wxml
@@ -1,38 +1,24 @@
-
- 你好
-
-
- 助力成功，自己也差拆一个吧~
+
+ {{user.nickname}}
+ 助力成功，自己也差拆一个吧~
-
- 活动时间：5月23日-6月15日
-
+
+ 活动时间：{{filter.fm_time(zl_act.beginDate)}}-{{filter.fm_time(zl_act.endDate)}}
+
我也要参加
-已有126人领取礼盒
-
-
+已有{{zl_act.qiang_num}}人领取礼盒
+
diff --git a/pages/user/assistance/friend_assistance.js b/pages/user/assistance/friend_assistance.js
index 7dab41e..4db0560 100644
--- a/pages/user/assistance/friend_assistance.js
+++ b/pages/user/assistance/friend_assistance.js
@@ -9,13 +9,34 @@ Page({
data: {
iurl: s.imghost,
is_show:0,//显示弹框
+ user:app_d.userInfo,
+ zl_act:null, //助力活动
+ task_id:0, //助力任务ID
+ userId:0, //任务用户的ID
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
-
+ var th=this;
+ this.data.task_id=options.options;
+ this.data.userId=options.userId;
+ //任务是不是为空
+ if(this.data.task_id==0 || this.data.task_id==undefined){
+ this.data.task_id= decodeURIComponent(options.scene);
+ if(this.data.task_id){
+ getApp().request.get("http://172.20.3.102:8022/api/weshop/zl_act_user",{
+ data:{},
+ success:function(res){
+ if(res.data.code==0){
+ th.data.userId=res.data.data.user_id;
+ }
+ }
+ })
+
+ }
+ }
},
@@ -25,22 +46,34 @@ Page({
url: '/pages/user/assistance/assistance_success',
})
},
- /**
- * 生命周期函数--监听页面初次渲染完成
- */
- onReady: function () {
-
- },
-
+
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
-
+ this.init();
},
//点击开启礼盒
cklie_button:function(){
- this.setData({ is_show:1});
+ var th=this;
+ var t_user_id=app_d.user_id;
+ var data={id:this.data.task_id,storeId:os.store_id,userId:this.data.user_id, zlUserId:t_user_id};
+ getApp().request.json_post("/api/weshop/marketing/help/help/task/involve/insert",
+ data, //入参
+ function(res){ //成功
+ if(res.data.code==0)
+ this.setData({ is_show:1});
+ else{
+ getApp().my_warnning(res.data.msg,0,th)
+ }
+ },
+ function(){//失败
+
+ }
+ )
+
+
+
},
//点击关闭礼盒
clike_none:function(){
@@ -86,5 +119,22 @@ Page({
*/
onShareAppMessage: function () {
- }
+ },
+
+ // ----初始化----
+ init:function() {
+
+ var user_id = getApp().globalData.user_id;
+ var store_id = os.stoid;
+ var th=this;
+ getApp().request.promiseGet("http://172.20.3.102:8022/api/weshop/zl_act", {
+ data: {
+ user_id: user_id,
+ store_id: store_id
+ }
+ }).then(res => {
+ if(res.data.code==0) th.setData({zl_act:res.data.data})
+ })
+
+ },
})
\ No newline at end of file
diff --git a/pages/user/assistance/friend_assistance.wxml b/pages/user/assistance/friend_assistance.wxml
index a0301c5..3a1d9fc 100644
--- a/pages/user/assistance/friend_assistance.wxml
+++ b/pages/user/assistance/friend_assistance.wxml
@@ -1,24 +1,25 @@
+
-
- 你好
+
+ {{user.nickname}}
拜托拜托，帮我拆礼盒得好礼~
-
+
- 活动时间：5月23日-6月15日
+ 活动时间：{{filter.fm_time(zl_act.begindate)}}-{{filter.fm_time(zl_act.begindate)}}
帮他拆礼盒
-已有126人领取礼盒
+已有{{zl_act.qiang_num}}人领取礼盒
diff --git a/pages/user/assistance/surplus_time.wxs b/pages/user/assistance/surplus_time.wxs
new file mode 100644
index 0000000..2c3fec2
--- /dev/null
+++ b/pages/user/assistance/surplus_time.wxs
@@ -0,0 +1,7 @@
+var filters = {
+
+ sy_time: function (ts) {
+
+ },
+
+}
diff --git a/pages/user/assistance/task_assistance.js b/pages/user/assistance/task_assistance.js
index 8c100df..e0852a8 100644
--- a/pages/user/assistance/task_assistance.js
+++ b/pages/user/assistance/task_assistance.js
@@ -1,6 +1,12 @@
-var auth = require("../../../utils/auth.js"), rq = require("../../../utils/request.js");
-var e = getApp(), app = e, i = require("../../../utils/util.js"),
- ut = i,s = e.globalData.setting, os = s, app_d = e.globalData;
+var auth = require("../../../utils/auth.js"),
+ rq = require("../../../utils/request.js");
+var e = getApp(),
+ app = e,
+ i = require("../../../utils/util.js"),
+ ut = i,
+ s = e.globalData.setting,
+ os = s,
+ app_d = e.globalData;
var regeneratorRuntime = require('../../../utils/runtime.js');
Page({
@@ -8,52 +14,79 @@ Page({
* 页面的初始数据
*/
data: {
- sw_index: 0,//轮播的下标控制
+ sw_index: 0, //轮播的下标控制
+ url: s.url, //接口网址
iurl: s.imghost,
- is_task:0,//判断标题名是任务1还是2
- activity_data:"25:20:59",//活动剩余时间
- task_number:12,//任务数
- is_task:0,//历史记录与任务
- aitem:"",//活动的轮播图
+ is_task: 0, //判断标题名是任务1还是2
+ activity_data: "25:20:59", //活动剩余时间
+ task_number: 12, //任务数
+ is_task: 0, //历史记录与任务
+ aitem: "", //活动的轮播图
switch_head: 0, //0：我的任务，1：记录
+ help_id: "", //活动的id canvasHidden: 0, //分享图片是否已经生成
+ is_share: 0, //是否显示画布
+ shareImgPath: [], //生成的图片
+ screenWidth: "", //用户的屏幕宽度
+ gid: "",
+ images: ["miniapp/images/friendhelp/help.png", "miniapp/images/friendhelp/background.png", "miniapp/images/friendhelp/gift.png", "miniapp/images/friendhelp/no_check.png",
+ "miniapp/images/friendhelp/check.png", "miniapp/images/friendhelp/check.png", "miniapp/images/friendhelp/unfinished.png", "miniapp/images/friendhelp/gift.png"
+ ]
},
/**
* 生命周期函数--监听页面加载
*/
- onLoad: function (options) {
- var help_id=options.help_id;
- console.log("是什么鬼",help_id);
- var th=this;
+ onLoad: function(options) {
+ var help_id = options.help_id;
+ console.log("是什么鬼", help_id);
+ var th = this;
+ th.setData({
+ help_id: help_id
+ });
+ if (options.gid != undefined) {
+ th.setData({
+ gid: options.gid
+ })
+ }
th.close();
+ th.syinfo();
+ th.imageinfo();
},
// 轮播图点击左边
- click_pre:function(){
+ click_pre: function() {
var index = this.data.sw_index;
index--;
if (index < 0) return;
- this.setData({ sw_index: index })
-
+ this.setData({
+ sw_index: index
+ })
+
},
- //轮播图点击右边
- click_next:function(){
+ //轮播图点击右边
+ click_next: function() {
var index = this.data.sw_index;
index++;
if (index >= this.data.aitem.length) return;
- this.setData({ sw_index: index })
+ this.setData({
+ sw_index: index
+ })
},
//任务领取
- onlicke:function(){
- var th=this;
+ onlicke: function() {
+ var th = this;
+ th.shareFrends();
+ th.setData({
+ is_share:1
+ })
getApp().my_warnning("任务领取成功", 1, th);
},
-//我的任务和帮拆记录的替换
- switch_head: function (e) {
+ //我的任务和帮拆记录的替换
+ switch_head: function(e) {
var th = this;
- var index = e.currentTarget.dataset.index;//获取当前选择的是任务还是活动说明
- var switch_head = th.data.switch_head;//0任务，1活动说明
+ var index = e.currentTarget.dataset.index; //获取当前选择的是任务还是活动说明
+ var switch_head = th.data.switch_head; //0任务，1活动说明
if (index != switch_head) {
th.setData({
switch_head: index,
@@ -62,15 +95,15 @@ Page({
}
},
//划动的时候监听
- onSli:function(e){
-
- var ind=e.detail.current ;
+ onSli: function(e) {
+
+ var ind = e.detail.current;
this.setData({
- sw_index:ind
+ sw_index: ind
})
},
//导航球
- close: function () {
+ close: function() {
var th = this;
var nav_b = th.selectComponent("#nav_b"); //组件的id
nav_b.close_box();
@@ -80,55 +113,60 @@ Page({
/**
* 生命周期函数--监听页面初次渲染完成
*/
- onReady: function () {
+ onReady: function() {
},
/**
* 生命周期函数--监听页面显示
*/
- onShow: function () {
- var th=this;
+ onShow: function() {
+ var th = this;
+ var help_id = th.data.help_id;
/*-----统计-----*/
- rq.get("/api/weshop/zl_task", {
- data: { user_id: app_d.user_id,
- strod_id:os.stoid
- },
- success: function (su) {
-
- var data=su.data;
+ rq.get("/api/weshop/marketing/help/help/task/page", {
+ data: {
+ helpId: help_id,
+ storeId: os.stoid
+ },
+ success: function(su) {
+
+ var data = su.data;
console.log('waitlist5555555555' + data.code);
- if (data.code!=0){
- getApp().my_warnning(data.msg,0, th);
+ if (data.code != 0) {
+ getApp().my_warnning(data.msg, 0, th);
return false;
}
- if (data.code==0){
+ if (data.code == 0) {
//轮播图的数据
- var data_aissa=data.data.pageData;
+ var data_aissa = data.data.pageData;
//当前时间戳
var nt = ut.gettimestamp();
- data_aissa.forEach(function (val, ind) {
- console.log(nt, "当前时间","结束时间", val.end_time,"开始时间");
+ data_aissa.forEach(function(val, ind) {
+ console.log(nt, "当前时间", "结束时间", val.end_time, "开始时间");
//已开始
if (val.start_time < nt && val.end_time > nt) data_aissa[ind].status = 0;
//未开始
else if (val.start_time > nt && val.end_time > nt) data_aissa[ind].status = 1;
- //已结束
-
+ //已结束
+
else if (val.start_time < nt && val.end_time < nt) data_aissa[ind].status = 2;
-
+
});
- console.log("是什么东西2222222222",data_aissa);
-
- th.setData({ aitem:data_aissa});
+ th.setData({
+ aitem: data_aissa
+ });
}
-
+
}
})
+ setTimeout(function() {
+ th.shareFrends();
+ }, 1000)
},
//----助力任务-----
@@ -178,41 +216,279 @@ Page({
}
setTimeout(th.countDown, 1000);
-
+
},
/**
* 生命周期函数--监听页面隐藏
*/
- onHide: function () {
+ onHide: function() {
},
/**
* 生命周期函数--监听页面卸载
*/
- onUnload: function () {
+ onUnload: function() {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
- onPullDownRefresh: function () {
+ onPullDownRefresh: function() {
},
/**
* 页面上拉触底事件的处理函数
*/
- onReachBottom: function () {
+ onReachBottom: function() {
},
/**
* 用户点击右上角分享
*/
- onShareAppMessage: function () {
+ onShareAppMessage: function() {
+
+ },
+ shareFrends: function(e) {
+ var th = this;
+ var scene = th.data.gid;
+ ///二微码
+ // var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" +
+ // a.stoid + "?sceneValue=" + scene + "&pageValue=pages/goods/goodsInfo/goodsInfo";
+ var iurl = th.data.iurl; //图片地址前缀
+ const ctx = wx.createCanvasContext('share_id'); //绘图上下文
+ var unit = th.data.screenWidth / 750 * 1.35;
+ var numsize = 20 * unit; //几人助力字体大小
+ var size = 15 * unit;
+ var num = 10;
+ var q_num = 6;
+ var already = num.toString().length + 1; //已有几位好友助力
+ var lack = q_num.toString().length + 1; //还差几位好友助力
+ var imagesize = 40 * unit; //助力人的图片大小
+ var left = 74 * unit; //助力人头像跟左边的距离
+ var spacing = 12 * unit; //助力人图片间距
+ var images = th.data.images;
+ ctx.drawImage(images[0], 0, 0, 445 * unit, 700 * unit); //分享的背景图片
+ ctx.drawImage(images[1], 37 * unit, 185 * unit, 370 * unit, 377 * unit); //分享的背景图片
+ ctx.drawImage(images[2], 90 * unit, 231 * unit, 266 * unit, 160 * unit); //分享的背景图片
+ ctx.setFillStyle("rgb(221,153,116)");
+ ctx.setFontSize(size)
+ ctx.fillText("已有", 77 * unit, 430 * unit);
+ ctx.setFillStyle("#FF4746");
+ ctx.setFontSize(numsize)
+ ctx.fillText(num + "位", 108 * unit, 430 * unit);
+ ctx.setFillStyle("rgb(221,153,116)");
+ ctx.setFontSize(size)
+ ctx.fillText("好友助力，还差", 114 * unit + already * numsize * unit, 430 * unit);
+ ctx.setFillStyle("#FF4746");
+ ctx.setFontSize(numsize);
+ ctx.fillText(q_num + "位", 220 * unit + already * numsize * unit, 430 * unit);
+ ctx.setFillStyle("rgb(221,153,116)");
+ ctx.setFontSize(size);
+ ctx.fillText("达成助力", 248 * unit + lack * numsize * unit + already * numsize - numsize * 2, 430 * unit);
+ var c = q_num / num;
+ ctx.drawImage(images[3], 65 * unit, 445 * unit, 320 * unit, 12 * unit);
+ ctx.drawImage(images[4], 65 * unit, 445 * unit, 320 * unit * c, 12 * unit);
+ for (var i = 0; i < 6; i++) {
+ if (i == 0) {
+ ctx.save();
+ ctx.beginPath(); //开始绘制
+ ctx.arc(left + imagesize / 2, 505 * unit, imagesize/2, 0, 2 * Math.PI);
+ ctx.setLineWidth(4 * unit);
+ ctx.setStrokeStyle('red');
+ ctx.setFillStyle("white");
+ ctx.fill();
+ ctx.clip();
+ ctx.drawImage(images[6], left, 505 * unit - imagesize/2, imagesize, imagesize);
+ ctx.restore(); //恢复之前保存的绘图上下文 恢复之前保存的绘图上下午即状态 还可以继续绘制
+ } else {
+ // 助力人的头像
+ ctx.drawImage(images[6], left, 505 * unit - imagesize / 2, imagesize, imagesize); //分享的背景图片
+ }
+ left += imagesize + spacing;
+ }
+ ctx.setFillStyle("rgb(255,255,255)");
+ ctx.setFontSize(size);
+ ctx.fillText("优惠乐翻天，精彩就在你身边!", 37 * unit, 595 * unit);
+ ctx.setFillStyle("rgb(255,255,255)");
+ ctx.setFontSize(size);
+ ctx.fillText("2019.06.26 - 2019.07.02!", 37 * unit, 620 * unit);
+ ctx.setFillStyle("rgb(255,255,255)");
+ ctx.setFontSize(size);
+ ctx.fillText("长按识别二维码，可帮我助力!", 37 * unit, 660 * unit);
+ ctx.drawImage(images[7], 325 * unit, 595 * unit, 77 * unit, 77 * unit); //分享的背景图片
+ ctx.save();
+ //读取文件成功则OK--
+ // wx.getImageInfo({
+ // src: path3,
+ // success: function (res) {
+ //把画板内容绘制成图片，并回调 画板图片路径
+ ctx.draw(false, function() {
+ setTimeout(function() {
+ wx.canvasToTempFilePath({
+ x: 0,
+ y: 0,
+ width: 300,
+ height: 500,
+ destWidth: 400 * 2,
+ destHeight: 720 * 2,
+ canvasId: 'share_id',
+ success: function(res) {
+ wx.hideLoading();
+ var shareImgPath = th.data.shareImgPath;
+ shareImgPath[0] = res.tempFilePath;
+
+ th.setData({
+ shareImgPath: shareImgPath,
+ canvasHidden: 1,
+ is_share: 1
+ })
+ if (!res.tempFilePath) {
+ wx.showModal({
+ title: '提示',
+ content: '图片绘制中，请稍后重试',
+ showCancel: false
+ })
+ return false;
+ }
+
+ },
+ fail(r) {
+
+ }
+ }, 500)
+ })
+ })
+ // }
+ // })
+ },
+ preview: function() {
+ var th = this;
+ var shareImgPath = th.data.shareImgPath;
+ wx.previewImage({
+ url: shareImgPath[0],
+ urls: shareImgPath
+ })
+ },
+
+ //关闭分享显示
+ close_share: function() {
+ var th = this;
+ th.setData({
+ is_share: 0
+ })
+ },
+ syinfo: function() {
+ var th = this;
+ //获取用户设备信息，屏幕宽度
+ wx.getSystemInfo({
+ success: res => {
+ th.setData({
+ screenWidth: res.screenWidth
+ })
+ }
+ })
+ },
+ imageinfo: function() {
+ var th = this;
+ var images = th.data.images;
+ var iurl = th.data.iurl;
+ wx.getImageInfo({
+ src: iurl + images[0],
+ success: function(res) {
+ console.log(res + i);
+ //res.path是网络图片的本地地址
+ images[0] = res.path;
+ },
+ fail: function(res) {
+ console.log(res.toString() + "" + i);
+ }
+ });
+ wx.getImageInfo({
+ src: iurl + images[1],
+ success: function(res) {
+ console.log(res + i);
+ //res.path是网络图片的本地地址
+ images[1] = res.path;
+ },
+ fail: function(res) {
+ console.log(res.toString() + "" + i);
+ }
+ });
+ wx.getImageInfo({
+ src: iurl + images[2],
+ success: function(res) {
+ console.log(res + i);
+ //res.path是网络图片的本地地址
+ images[2] = res.path;
+ },
+ fail: function(res) {
+ console.log(res.toString() + "" + i);
+ }
+ });
+ wx.getImageInfo({
+ src: iurl + images[3],
+ success: function(res) {
+ console.log(res + i);
+ //res.path是网络图片的本地地址
+ images[3] = res.path;
+ },
+ fail: function(res) {
+ console.log(res.toString() + "" + i);
+ }
+ });
+ wx.getImageInfo({
+ src: iurl + images[4],
+ success: function(res) {
+ console.log(res + i);
+ //res.path是网络图片的本地地址
+ images[4] = res.path;
+ },
+ fail: function(res) {
+ console.log(res.toString() + "" + i);
+ }
+ });
+ wx.getImageInfo({
+ src: iurl + images[5],
+ success: function(res) {
+ console.log(res + i);
+ //res.path是网络图片的本地地址
+ images[5] = res.path;
+ },
+ fail: function(res) {
+ console.log(res.toString() + "" + i);
+ }
+ });
+ wx.getImageInfo({
+ src: iurl + images[6],
+ success: function(res) {
+ console.log(res + i);
+ //res.path是网络图片的本地地址
+ images[6] = res.path;
+ },
+ fail: function(res) {
+ console.log(res.toString() + "" + i);
+ }
+ });
+
+ wx.getImageInfo({
+ src: iurl + images[7],
+ success: function(res) {
+ console.log(res + i);
+ //res.path是网络图片的本地地址
+ images[7] = res.path;
+ },
+ fail: function(res) {
+ console.log(res.toString() + "" + i);
+ }
+ })
+ th.setData({
+ images: images
+ })
}
})
\ No newline at end of file
diff --git a/pages/user/assistance/task_assistance.wxml b/pages/user/assistance/task_assistance.wxml
index 6786641..b3a8a35 100644
--- a/pages/user/assistance/task_assistance.wxml
+++ b/pages/user/assistance/task_assistance.wxml
@@ -1,118 +1,130 @@
-
-
-
- {{aitem[sw_index].tite_name}}
-
-
- 活动剩余时间: {{activity_data}}
-
+
+
+
+ {{aitem[sw_index].tite_name}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ 活动剩余时间: {{activity_data}}
+
+
+
+
+
+
+
+
-
- 今天剩余可领{{task_number}}个任务
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+ 今天剩余可领{{task_number}}个任务
+
+
+
就选它了
-
+
-
-
-
-
-
-
- 我的任务
+
+
+
+
+
+
+ 我的任务
+
+
+
+ 帮拆记录
+
+
+
+
+
+
+
+ 豪华任务一
+
-
-
- 帮拆记录
+
+
+ 进行中
+
+
+
+
-
-
-
-
- 豪华任务一
-
-
-
- 进行中
-
-
+
-
-
-
-
-
-
-
-
-
-
-
- 豪华任务一
-
- 2019-05-12
-
-
-
-
-
-
-
-
- 暂无任务记录
-
-
-
- 已有
- 126
- 人领取了任务
-
-
+
+
+
+
+ 豪华任务一
-
-
-
-
-
-
- 点击加载更多
-
-
-
- 已有
- 126
- 人领取了任务
-
-
-
+ 2019-05-12
+
+
+
+
+
+
+
+
+ 暂无任务记录
+
+
+
+ 已有
+ 126
+ 人领取了任务
+
+
+
+
+
+
+
+
+
+ 点击加载更多
+
+
+
+ 已有
+ 126
+ 人领取了任务
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/user/assistance/task_assistance.wxss b/pages/user/assistance/task_assistance.wxss
index 04c0874..61968ed 100644
--- a/pages/user/assistance/task_assistance.wxss
+++ b/pages/user/assistance/task_assistance.wxss
@@ -129,6 +129,28 @@ border-color: #fff;
}
.user_img{
width: 50rpx;
- height: 50rpx;
-
-}
\ No newline at end of file
+ height: 50rpx;
+}
+.dust {
+ position: fixed;
+ width: 100%;
+ height: 100%;
+ background-color: rgba(206, 184, 188, 0.158);
+ z-index: 10;
+}
+
+.closes {
+ margin-top: 20rpx;
+}
+
+.canvas {
+ position: fixed;
+ z-index: 11;
+ width: 100%;
+ top:20rpx;
+}
+
+.close {
+ width: 70rpx;
+ height: 70rpx;
+}
diff --git a/utils/request.js b/utils/request.js
index 35657e9..f477d13 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -212,5 +212,26 @@ module.exports = {
if(req) req.abort();
},time*1000)
}
+
+ /**
+ * @param {Object} url //url地址
+ * @param {Object} data //data入参
+ * @param {Object} succ //成功的回调
+ * @param {Object} fail //失败的回调
+ */
+ json_post:function(url,data,succ,fail){
+ if(url.indexOf("http")==-1) url=getApp().globalData.setting.url +url;
+ var str = JSON.stringify(pdata);
+ wx.request({
+ url: url,
+ data: str,
+ method: 'POST',
+ header: {
+ 'content-type': 'application/json'
+ },// 设置请求的 header
+ success: function (res) { succ(res); },
+ fail:function(res){fail(res);}
+ })
+ }
};
\ No newline at end of file