diff --git a/app.json b/app.json
index 73cb4fb..fb04943 100644
--- a/app.json
+++ b/app.json
@@ -89,8 +89,12 @@
"pages/giftpack/mygiftpack/mygiftpack",
"pages/user/assistance/giftpacklist",
- "pages/user/assistance/task_assistance"
+ "pages/user/assistance/task_assistance",
+ "pages/user/assistance/friend_assistance",
+ "pages/user/assistance/assistance_success",
+ "pages/user/assistance/assistance",
+ "pages/test/zhuli_test"
],
"permission": {
diff --git a/components/diy_advertising/diy_advertising.js b/components/diy_advertising/diy_advertising.js
index 2ae1a91..a2f3aa1 100644
--- a/components/diy_advertising/diy_advertising.js
+++ b/components/diy_advertising/diy_advertising.js
@@ -12,8 +12,8 @@ Component({
yc:false,
btn: 1,
ad:false,
- autoplay:false,
- interval:5000,
+ autoplay:true,
+ interval:3000,
duration:1000,
someData: {},
max_sw_height:null,
@@ -36,4 +36,4 @@ Component({
if (this.data.max_sw_height < viewHeight) this.setData({ max_sw_height: viewHeight });
}
}
-})
\ No newline at end of file
+})
diff --git a/components/diy_picMax/diy_picMax.wxss b/components/diy_picMax/diy_picMax.wxss
index 170aa45..8886b2d 100644
--- a/components/diy_picMax/diy_picMax.wxss
+++ b/components/diy_picMax/diy_picMax.wxss
@@ -1,5 +1,5 @@
.picMax{width: 100%;position: relative;}
-.pic_item{display: inline-block; top:0;left:0;vertical-align: middle}
+.pic_item{display: block; top:0;left:0;float:left}
.pic_item image{width: 100%; height: 100%}
.width_1{width: 187.5rpx}.width_2{width: 375rpx;}.width_3{width: 562.5rpx}.width_4{width:748rpx;}
/* .height_1{height: 187.5rpx;}.height_2{height: 375rpx;}.height_3{height: 562.5rpx}.height_4{height: 748rpx;} */
diff --git a/pages/cart/cart2_pt/cart2_pt.js b/pages/cart/cart2_pt/cart2_pt.js
index c3ce082..7a5c415 100644
--- a/pages/cart/cart2_pt/cart2_pt.js
+++ b/pages/cart/cart2_pt/cart2_pt.js
@@ -439,7 +439,6 @@ Page({
'content-type': 'application/json'
},// 设置请求的 header
success: function (res) {
-
th.data.is_summit_ing=0; //是否提交中
wx.hideLoading();
if (res.statusCode == 200) {
@@ -469,7 +468,8 @@ Page({
util_pay.pay(data.data, function() {
setTimeout(function () {
wx.navigateTo({
- url: "/pages/payment/pay_success/pay_success?type=1&order_sn="+data.data,
+ //url: "/pages/payment/pay_success/pay_success?type=1&order_sn="+data.data,
+ url: "/pages/team/team_success/team_success?ordersn=" + data.data,
})
},1000)
}, function () {
diff --git a/pages/getphone/getphone.js b/pages/getphone/getphone.js
index 9a6e927..ddf27f8 100644
--- a/pages/getphone/getphone.js
+++ b/pages/getphone/getphone.js
@@ -54,9 +54,11 @@ Page({
//接下来写业务代码登录
//最后，记得返回刚才的页面
if (e.encryptedData==undefined){
+ /*---
wx.navigateTo({
url: '/pages/user/binding_info/binding_info',
- })
+ })--*/
+ return app.my_warnning("登录需要授权手机号码！", 0, that);
return false;
}
var r=getApp().globalData.getu;
@@ -105,6 +107,7 @@ Page({
},
failStatus: function (t) {
+ /*---
return "100" === t.data.result ? (i.goHome(), wx.navigateTo({
url: "/pages/user/binding_info/binding_info?nickName=" + r.nickName + "&userHeadPic=" + r.avatarUrl
}), !1) : (i.clearAuth(), i.alertLoginErrorAndGoHome(t.data.msg), a.request.post("/api/user/logout", {
@@ -115,7 +118,8 @@ Page({
failStatus: function () {
return !1;
}
- }), !1);
+ }), !1);--*/
+ return app.my_warnning("授权登入失败,请稍后再试!", 0, that);
},
fail: function (t) {
return i.clearAuth(), i.alertLoginErrorAndGoHome(), !1;
diff --git a/pages/getphone/getphone.json b/pages/getphone/getphone.json
index 41fff8a..fb13409 100644
--- a/pages/getphone/getphone.json
+++ b/pages/getphone/getphone.json
@@ -1,3 +1,6 @@
{
- "navigationBarTitleText": "绑定手机"
+ "navigationBarTitleText": "绑定手机",
+ "usingComponents": {
+ "warn": "/components/long_warn/long_warn"
+ }
}
diff --git a/pages/getphone/getphone.wxml b/pages/getphone/getphone.wxml
index 8f80327..e511fa5 100644
--- a/pages/getphone/getphone.wxml
+++ b/pages/getphone/getphone.wxml
@@ -6,4 +6,5 @@
暂不绑定
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/pages/giftpack/giftpacklist/giftpacklist.js b/pages/giftpack/giftpacklist/giftpacklist.js
index ec28d16..ef408c7 100644
--- a/pages/giftpack/giftpacklist/giftpacklist.js
+++ b/pages/giftpack/giftpacklist/giftpacklist.js
@@ -315,10 +315,20 @@ Page({
bind_bnerr2: function(e) {
var _errImg = e.target.dataset.errorimg;
var _errObj = {};
- _errObj[_errImg] = "/public/images/empty.jpg";
+ _errObj[_errImg] = "/miniapp/images/giftbag/gift01.png";
this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
+ },
+
+ //图片失败，默认图片
+ bind_bnerr: function (e) {
+ var _errImg = e.target.dataset.errorimg;
+ var _errObj = {};
+ _errObj[_errImg] = this.data.iurl + "miniapp/images/big_back.jpg";
+ this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
+ //this.setData({ giftImage: this.data.iurl + "/miniapp/images/giftbag/gift01.png"});
},
+
//关闭导航
close: function() {
var th = this;
diff --git a/pages/giftpack/giftpacklist/giftpacklist.wxml b/pages/giftpack/giftpacklist/giftpacklist.wxml
index 57c9994..aef38d6 100644
--- a/pages/giftpack/giftpacklist/giftpacklist.wxml
+++ b/pages/giftpack/giftpacklist/giftpacklist.wxml
@@ -1,6 +1,6 @@
-
+
diff --git a/pages/giftpack/giftpacklist/giftpacklist.wxss b/pages/giftpack/giftpacklist/giftpacklist.wxss
index 3d906ad..be61320 100644
--- a/pages/giftpack/giftpacklist/giftpacklist.wxss
+++ b/pages/giftpack/giftpacklist/giftpacklist.wxss
@@ -96,6 +96,7 @@
border: 2rpx solid #999;
width: 120rpx;
height: 120rpx;
+ background-color: #f8f8f8;
}
.box_ware_item.data-v-3a5b7e36 {
@@ -241,4 +242,4 @@ page.data-v-3a5b7e36 {
}
.overdue.data-v-3a5b7e36{
background-color: rgb(153,153,153);
-}
\ No newline at end of file
+}
diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index 35b53a0..3b30bd0 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -2601,6 +2601,14 @@ Page({
//--定义的保存图片方法，分享团---
saveImageToPhotosAlbum: function() {
+ //--先判断会员状态--
+ var user_info = getApp().globalData.userInfo;
+ if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
+ //getApp().my_warnning("请先登录",0,this);
+ wx.navigateTo({ url: '/pages/getphone/getphone', })
+ return false;
+ }
+
//类型 0普通商品 1秒杀商品 2商家和会员团 3阶梯团
var type = this.data.prom_type;
if (type == 6) type = 2;
diff --git a/pages/test/zhuli_test.js b/pages/test/zhuli_test.js
new file mode 100644
index 0000000..452f7cd
--- /dev/null
+++ b/pages/test/zhuli_test.js
@@ -0,0 +1,60 @@
+var e = getApp(),
+ a = e.globalData.setting,
+ os = a;
+var regeneratorRuntime = require('../../utils/runtime.js');
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ iurl: a.imghost, //图片地址前缀\
+ taskId:0,
+ mobile:0,
+ },
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad: function(options) {
+ wx.setNavigationBarTitle({
+ title: "测试帮忙助力",
+ })
+ var th = this;
+ var taskId=options.taskId;
+ this.data.taskId=taskId;
+ },
+
+ getphoneValue:function(e){
+ this.data.mobile=e.detail.value;
+ },
+ //测试正在进行任务
+ bindReg:async function () {
+ var userinfo=null;
+ await getApp().request.promiseGet("/api/weshop/users/page",{
+ data:{mobile:this.data.mobile,store_id:os.stoid}
+ }).then(res=>{
+ userinfo=res.data.data.pageData[0];
+ })
+ if(!userinfo) {
+ getApp().my_warnning("未找到会员",0,this); return false;
+ }
+
+ var task=null;
+ await getApp().request.promiseGet("/api/weshop/marketing/help/help/task/get",{
+ data:{taskId:this.data.taskId,storeId:os.stoid,userId:userinfo.user_id}
+ }).then(res=>{
+ task=res.data.data;
+ })
+ if(!task) {
+ getApp().my_warnning("未找任务",0,this); return false;
+ }
+
+ if(task.status!=0){
+ getApp().my_warnning("任务不是进行中",0,this); return false;
+ }
+ var taking=task.id;
+ getApp().goto("/pages/user/assistance/friend_assistance?tasking=" + taking + "&userId=" + userinfo.user_id);
+ },
+
+
+})
diff --git a/pages/test/zhuli_test.json b/pages/test/zhuli_test.json
new file mode 100644
index 0000000..007d140
--- /dev/null
+++ b/pages/test/zhuli_test.json
@@ -0,0 +1,6 @@
+{
+ "navigationBarTitleText": "助力测试专用",
+ "usingComponents": {
+ "warn": "/components/long_warn/long_warn"
+ }
+}
\ No newline at end of file
diff --git a/pages/test/zhuli_test.wxml b/pages/test/zhuli_test.wxml
new file mode 100644
index 0000000..d86ec97
--- /dev/null
+++ b/pages/test/zhuli_test.wxml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 去帮忙助力
+
+
+
+
+
+
diff --git a/pages/test/zhuli_test.wxss b/pages/test/zhuli_test.wxss
new file mode 100644
index 0000000..11ea42a
--- /dev/null
+++ b/pages/test/zhuli_test.wxss
@@ -0,0 +1,146 @@
+page{
+ border-top: 3rpx solid #EAEAEC;
+}
+.index {
+ position: absolute; width: 100%;
+ z-index: 1;
+}
+
+.logins {
+ width: 100%;
+ padding-top: 60rpx;
+ padding-bottom: 120rpx;
+}
+
+.login_img {
+ width: 192rpx;
+ height: 192rpx;
+ border-radius: 50%
+}
+
+.input_phone {
+ height: 55rpx;
+ line-height: 55rpx;
+ margin-left:10rpx ;
+ position: relative; top:10rpx
+}
+
+.input_code {
+ width: 360rpx;
+ height: 55rpx;
+ line-height: 55rpx;
+ border-radius: 12rpx;
+ margin-right: 20rpx;
+ border: 3rpx solid rgb(230, 230, 230);
+ padding-left: 40rpx;
+ color:#ef8179
+}
+
+.codes {
+ margin-bottom: 65rpx;
+}
+
+.get_code {
+ width: 176rpx;
+ height: 65rpx;
+ line-height: 65rpx;
+ border:1rpx solid rgb(236, 109, 95);
+ color: #ed7067;
+ border-radius: 12rpx;
+ right: 0;
+ top:5rpx;
+}
+
+.userlogin {
+ width: 100%;
+ height: 95rpx;
+ line-height: 95rpx;
+ background-color: #ffc5c0;
+ color: rgb(255, 255, 255);
+ margin-bottom: 30rpx;
+ margin-top: 50rpx
+ }
+
+.userlogin.on{
+ background-color: #eb6359;
+}
+
+.go_index {
+ color: #9d9d9d;
+ margin-bottom: 300rpx;
+}
+
+.sr {
+ width: 90%; margin: 0 auto;
+}
+
+.checkbox {
+ width: 25rpx;
+ height: 25rpx;
+ color: rgb(0, 0, 0);
+ margin-right: 50rpx;
+ margin-bottom: 30rpx
+}
+
+.agrs {
+ padding: 0rpx 65rpx;
+}
+
+.agreement {
+ color: rgb(236, 109, 95);
+ display: initial;
+}
+
+.popup {
+ position: fixed;
+ z-index: 10;
+ background-color: rgba(153, 153, 153, 0.568);
+ height: 100%;
+ width: 100%;
+}
+
+.content {
+ max-height: 800rpx;
+min-height: 100rpx;
+padding: 60rpx 35rpx;
+background-color: rgb(255, 255, 255);
+width: 570rpx;
+margin-bottom: 70rpx;
+overflow-y: scroll;
+border-radius: 15rpx;
+line-height: 50rpx;
+font-size: 26rpx;
+color: #545454;
+
+
+}
+
+.close {
+ width: 65rpx;
+ height: 65rpx;
+}
+
+.xy {
+ display: initial;color: #9c9c9c; line-height: 34rpx
+}
+
+.get_code.on{
+ color: #666;
+}
+.tubiao_set{
+ width: 50rpx; height: 64rpx; margin-right:30rpx; position: relative; top:5rpx;
+}
+.tubiao_set2{
+ width: 46rpx; height: 64rpx; margin-right:34rpx;
+}
+.phone_view{
+ border-bottom:1rpx solid #e8e8e8 ;
+ height: 96rpx; margin-top:50rpx
+
+}
+.phone_view.mt{
+ margin-top:20rpx
+}
+.reg_btn{
+ margin-top:40rpx; margin-bottom: 20rpx
+}
diff --git a/pages/user/assistance/assistance.js b/pages/user/assistance/assistance.js
index 4900b35..2b95357 100644
--- a/pages/user/assistance/assistance.js
+++ b/pages/user/assistance/assistance.js
@@ -20,7 +20,7 @@ Page({
switch_head: 0, //0：我的任务，1：活动说明
zl_act: null, //助力活动
zl_user_list: [], //任务列表
- is_load: 0, //是否已经加载
+ is_load: 0, //是否已经加载
cur_page: 1, //页码
page_num: 5, //每页多少个
is_show_more: 0, //是否加载更多
@@ -37,15 +37,16 @@ Page({
var th = this;
var nav_b = th.selectComponent("#nav_b"); //组件的id
nav_b.set_name("助力", "/pages/user/assistance/assistance");
- // 助力活动
- th.assistance();
+
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function() {
-
+ var th = this;
+ // 助力活动
+ th.assistance();
},
// 助力活动
assistance() {
@@ -80,7 +81,7 @@ Page({
}
return ut.null_promise();
}).then(res => {
- if (res.data.code == 0)
+ if ( res && res.data &&res.data.code == 0)
th.setData({
s_num: res.data.data.countAll
})
@@ -94,7 +95,9 @@ Page({
var th = this;
var page = th.data.page;
+ if(page==1)th.data.zl_user_list=[];
var help_id = this.data.help_id;
+ var r=Math.random()*100;
t.request.get("/api/weshop/marketing/help/help/user/page", {
isShowLoading: true,
data: {
@@ -102,7 +105,8 @@ Page({
storeId: os.stoid,
helpId: help_id,
page: page,
- pageSize: 5
+ pageSize: 5,
+ r:r,
},
success: function(res) {
clearTimeout(th.data.timer);
@@ -113,7 +117,7 @@ Page({
})
if (res.data.code == 0) {
var list = th.data.zl_user_list;
- //连接数组
+ //连接数组
list = list.concat(res.data.data.pageData);
th.setData({
zl_user_list: list,
@@ -131,7 +135,7 @@ Page({
})
}
} else {
- getApp().my_warnning(res.data.msg, 0, th);
+ //getApp().my_warnning(res.data.msg, 0, th);
th.setData({
is_show_more: 1,
page: page
@@ -178,6 +182,13 @@ Page({
select_libao: function(e) {
var orderSn = e.currentTarget.dataset.ordersn; //订单号
getApp().goto("/pages/user/assistance/giftpacklist?orderSn=" + orderSn);
+ },
+
+ //---查看任务---
+ go_to_task:function (e) {
+ var help_id = this.data.help_id;
+ var taskid=e.currentTarget.dataset.taskid;
+ getApp().goto("/pages/user/assistance/task_assistance?help_id=" + help_id+"&taskid="+taskid);
}
-})
\ No newline at end of file
+})
diff --git a/pages/user/assistance/assistance.wxml b/pages/user/assistance/assistance.wxml
index 5db3f19..6a6c89b 100644
--- a/pages/user/assistance/assistance.wxml
+++ b/pages/user/assistance/assistance.wxml
@@ -53,7 +53,7 @@
领取礼包
-
+
{{item.zlHelpNum}}/{{item.helpNum}}
@@ -107,4 +107,4 @@
-
\ No newline at end of file
+
diff --git a/pages/user/assistance/assistance_success.js b/pages/user/assistance/assistance_success.js
index f09db9a..8ffd0dd 100644
--- a/pages/user/assistance/assistance_success.js
+++ b/pages/user/assistance/assistance_success.js
@@ -18,23 +18,25 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
- //var helpid=options.helpid;
- var helpid=23;
+ var helpid=options.helpid;
this.init(helpid);
+ var nav_b = this.selectComponent("#nav_b"); //组件的id
+ nav_b.set_name("助力", "/pages/user/assistance/assistance");
+
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function (e) {
-
+
},
// ----初始化----
- init:function(helpid) {
+ init:function(helpid) {
var user_id = getApp().globalData.user_id;
var store_id = os.stoid;
var th=this;
-
+
//链式调用接口,先获取活动,在获取参与活动的人数
getApp().request.promiseGet("/api/weshop/marketing/help/help/act/get", {
data: {
@@ -49,10 +51,10 @@ Page({
storeId: store_id,
helpId: helpid
}
- })
+ })
}
return ut.null_promise();
-
+
}).then(res=>{
if(res.data.code==0){
th.setData({s_num:res.data.data.countAll});
@@ -70,6 +72,6 @@ Page({
},
cklie_button:function(){
- getApp().goto("/pages/user/assistance/assistance")
+ getApp().goto("/pages/user/assistance/assistance")
}
-})
\ No newline at end of file
+})
diff --git a/pages/user/assistance/friend_assistance.js b/pages/user/assistance/friend_assistance.js
index 42711a4..8701da5 100644
--- a/pages/user/assistance/friend_assistance.js
+++ b/pages/user/assistance/friend_assistance.js
@@ -21,6 +21,7 @@ Page({
userId: 0, //任务用户的ID
s_num: 0, //分享的人数
taskId:0, //活动从表ID
+ helpId:0,
},
/**
@@ -28,64 +29,24 @@ Page({
*/
onLoad: function(options) {
var th = this;
-
+
+ var nav_b = th.selectComponent("#nav_b"); //组件的id
+ nav_b.set_name("助力", "/pages/user/assistance/assistance");
+
if (options.tasking) this.data.tasking = options.tasking;
if (options.userId) this.data.userId = options.userId;
//任务是不是为空
if (this.data.tasking == 0 || this.data.tasking == undefined) {
- this.data.tasking = decodeURIComponent(options.scene);
+ this.data.tasking = decodeURIComponent(options.scene);
}
-
- if (this.data.tasking != null && this.data.tasking != 'undefined' && this.data.tasking != "" && this.data.tasking !=
- 0) {
-
- getApp().request.promiseGet("/api/weshop/marketing/help/help/tasking/get", {
- data: {
- taskingId: th.data.tasking,
- storeId: os.stoid
- }
- }).then(res => {
- if (res.data.code == 0) {
- th.data.userId = res.data.data.userId;
- th.data.taskId = res.data.data.taskId;
- //获取活动的时间
- return getApp().request.promiseGet("/api/weshop/marketing/help/help/act/get", {
- data: {
- helpId: res.data.data.helpFormId,
- storeId: os.stoid
- }
- })
- }
- return ut.null_promise();
- }).then(res => {
- if (res.data.code == 0) {
- th.setData({
- zl_act: res.data.data
- })
- //获取活动的参与的人数
- return getApp().request.promiseGet("/api/weshop/marketing/help/involve/help/act/people/count", {
- data: {
- helpId: res.data.data.id,
- storeId: os.stoid
- }
- })
- }
- return ut.null_promise();
- }).then(res => {
- if (res.data.code == 0) {
- th.setData({
- s_num: res.data.data.countAll
- });
- }
- })
-
- }
+ getApp().getUserFir(function() {});
+
},
// 跳转到助力成功页
participate_activity: function() {
wx.navigateTo({
- url: '/pages/user/assistance/assistance_success',
+ url: '/pages/user/assistance/assistance_success?helpid='+this.data.helpId,
})
},
@@ -93,11 +54,63 @@ Page({
* 生命周期函数--监听页面显示
*/
onShow: function() {
+ if (this.data.tasking != null && this.data.tasking != 'undefined' && this.data.tasking != "" && this.data.tasking !=
+ 0) {
+
+ getApp().request.promiseGet("/api/weshop/marketing/help/help/tasking/get", {
+ data: {
+ taskingId: th.data.tasking,
+ storeId: os.stoid
+ }
+ }).then(res => {
+ if (res.data.code == 0) {
+ th.data.userId = res.data.data.userId;
+ th.data.taskId = res.data.data.taskId;
+ th.data.helpId=res.data.data.helpFormId;
+ //获取活动的时间
+ return getApp().request.promiseGet("/api/weshop/marketing/help/help/act/get", {
+ data: {
+ helpId: res.data.data.helpFormId,
+ storeId: os.stoid
+ }
+ })
+ }
+ return ut.null_promise();
+ }).then(res => {
+ if (res.data.code == 0) {
+ th.setData({
+ zl_act: res.data.data
+ })
+ //获取活动的参与的人数
+ return getApp().request.promiseGet("/api/weshop/marketing/help/involve/help/act/people/count", {
+ data: {
+ helpId: res.data.data.id,
+ storeId: os.stoid
+ }
+ })
+ }
+ return ut.null_promise();
+ }).then(res => {
+ if (res && res.data && res.data.code == 0) {
+ th.setData({
+ s_num: res.data.data.countAll
+ });
+ }
+ })
+ }
},
//点击开启礼盒
cklie_button: function() {
var th = this;
+ //--先判断会员状态--
+ var user_info = getApp().globalData.userInfo;
+ if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
+ wx.navigateTo({
+ url: '/pages/getphone/getphone',
+ })
+ return false;
+ }
var t_user_id = app_d.user_id;
var data = {
id: this.data.tasking,
@@ -126,7 +139,7 @@ Page({
//点击关闭礼盒
clike_none: function() {
this.setData({is_show: 0});
- getApp().goto("/pages/user/assistance/assistance_success");
+ getApp().goto("/pages/user/assistance/assistance_success?helpid="+this.data.helpId);
},
//导航球
close: function() {
diff --git a/pages/user/assistance/giftpacklist.js b/pages/user/assistance/giftpacklist.js
index adf92ba..d033364 100644
--- a/pages/user/assistance/giftpacklist.js
+++ b/pages/user/assistance/giftpacklist.js
@@ -210,7 +210,8 @@ Page({
var json = {
"actId": th.data.id, //活动Id
"actType": 5, //活动类型 1:新人礼、2:评价有礼、3:节日营销、4:生日营销
- "giftBagId": 1, //礼包Id
+ //"giftBagId": 1, //礼包Id
+ "giftBagId": th.giftBagId, //礼包Id
"storeId": a.stoid, //商家Id
"userId": d.user_id //用户ID
};
@@ -334,14 +335,25 @@ Page({
bind_bnerr2: function(e) {
var _errImg = e.target.dataset.errorimg;
var _errObj = {};
- _errObj[_errImg] = "/public/images/empty.jpg";
- this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
+ _errObj[_errImg] ="/miniapp/images/giftbag/gift01.png";
+ this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
},
+
+ //图片失败，默认图片
+ bind_bnerr: function (e) {
+ var _errImg = e.target.dataset.errorimg;
+ var _errObj = {};
+ _errObj[_errImg] = this.data.iurl + "miniapp/images/big_back.jpg";
+ this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
+ //this.setData({ giftImage: this.data.iurl + "/miniapp/images/giftbag/gift01.png"});
+
+ },
+
//关闭导航
close: function() {
var th = this;
var nav_b = th.selectComponent("#nav_b"); //组件的id
nav_b.close_box();
}
-});
\ No newline at end of file
+});
diff --git a/pages/user/assistance/giftpacklist.wxml b/pages/user/assistance/giftpacklist.wxml
index a2311dc..01ac169 100644
--- a/pages/user/assistance/giftpacklist.wxml
+++ b/pages/user/assistance/giftpacklist.wxml
@@ -1,6 +1,6 @@
-
+
@@ -105,9 +105,13 @@
-
-
- 测试专用
-
+
+
@@ -67,20 +67,20 @@
-
+
我的任务
-
+
帮拆记录
-
+
-
+
{{item.helpTaskName}}
@@ -88,11 +88,11 @@
- {{item.zlHelpNum}}/{{item.helpNum}}
+ {{item.zlHelpNum}}/{{item.helpNum}}
查看礼包
领取礼包
-
+
@@ -153,7 +153,6 @@
-
@@ -167,4 +166,4 @@
-
\ No newline at end of file
+
diff --git a/pages/user/assistance/task_assistance.wxss b/pages/user/assistance/task_assistance.wxss
index b84cdcb..3302ba0 100644
--- a/pages/user/assistance/task_assistance.wxss
+++ b/pages/user/assistance/task_assistance.wxss
@@ -174,6 +174,7 @@ page {
width: 86%;
margin: auto;
margin-top: 50rpx;
+ justify-content: center;
}
.plan-frame .plan_num {
diff --git a/pages/user/index/index.js b/pages/user/index/index.js
index 06d59f8..f293086 100644
--- a/pages/user/index/index.js
+++ b/pages/user/index/index.js
@@ -40,6 +40,7 @@ Page({
actId: "", //生日活动的id
actImg: "",
is_assistance: 0, //助力活动
+ ad_img:"",
},
goto_nav: function(e) {
var th = this;
@@ -56,7 +57,18 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad: function(options) {
+ var th=this;
this.birthday();
+ getApp().request.promiseGet("/api/weshop/ad/list?pid=401&store_id=" + os.stoid, {
+ data: {
+ enabled: 1
+ }
+ }).then(res => {
+ if(res.data.code==0 && res.data.data){
+ var item=res.data.data[0];
+ th.setData({ad_img:item.ad_code})
+ }
+ })
},
/**
@@ -551,12 +563,12 @@ Page({
},
// 判断生日营销的页面是不是存在
birthday: function() {
-
+
var th = this;
rq.get("/api/weshop/marketing/birthday/act/judge", {
data: { storeId: os.stoid, userId: app_d.user_id },
success: function (res) {
-
+
var code = res.data.code;
if (code == 0) {
var giftbagid = res.data.data.giftBagId;
@@ -575,7 +587,7 @@ Page({
var th = this;
var actId = th.data.actId;
var giftbagid = th.data.giftbagid;
-
+
if (actId != "" && giftbagid != "") {
getApp().goto("/pages/giftpack/birthdaygift/birthdaygift?actId=" + actId + "&gifbagid=" + giftbagid + "&orderType=" + 3);
@@ -584,7 +596,7 @@ Page({
getApp().showWarning("请稍后重试");
}
},
- // 判断助力活动是不是存在
+ // 判断助力活动是不是存在
is_assistance: function() {
var th = this;
rq.get("/api/weshop/marketing/help/act/judge", {
@@ -607,4 +619,4 @@ Page({
-})
\ No newline at end of file
+})
diff --git a/pages/user/index/index.wxml b/pages/user/index/index.wxml
index 1375433..64a77e8 100644
--- a/pages/user/index/index.wxml
+++ b/pages/user/index/index.wxml
@@ -1,7 +1,7 @@
-
-
+
+
@@ -69,19 +69,19 @@
加入plus会员预计可省3031元
-
+
立即开通
-
+
加入plus会员预计可省3031元
-
+
立即续费
@@ -232,7 +232,7 @@
助力活动
-
+
@@ -262,7 +262,7 @@
-
+
@@ -290,4 +290,4 @@
-
\ No newline at end of file
+
diff --git a/public/static/images/model/bg.jpg b/public/static/images/model/bg.jpg
deleted file mode 100644
index 35849b8..0000000
--- a/public/static/images/model/bg.jpg
+++ /dev/null
diff --git a/public/static/images/model/bg1.jpg b/public/static/images/model/bg1.jpg
deleted file mode 100644
index 3e5f2e1..0000000
--- a/public/static/images/model/bg1.jpg
+++ /dev/null
diff --git a/utils/util.js b/utils/util.js
index 423d6f7..9d8771e 100644
--- a/utils/util.js
+++ b/utils/util.js
@@ -236,13 +236,13 @@ function check_mobile(phoneMobile){
var ob={code:1};
if (phoneMobile.length === 0) {
ob.title='输入的手机号为空';
- ob.code=-1;
+ ob.code=-1;
} else if (phoneMobile.length < 11) {
ob.title ='手机号长度有误！';
- ob.code = -1;
+ ob.code = -1;
} else if (!myreg.test(phoneMobile)) {
ob.title = '手机号格式有误！';
- ob.code = -1;
+ ob.code = -1;
}
return ob;
}
@@ -280,31 +280,31 @@ function draw_randon_rect(ctx,x,y,r,w,h){
// ctx.setStrokeStyle('transparent')
// 左上角
ctx.arc(x + r, y + r, r, Math.PI, Math.PI * 1.5)
-
+
// border-top
ctx.moveTo(x + r, y)
ctx.lineTo(x + w - r, y)
ctx.lineTo(x + w, y + r)
// 右上角
ctx.arc(x + w - r, y + r, r, Math.PI * 1.5, Math.PI * 2)
-
+
// border-right
ctx.lineTo(x + w, y + h - r)
ctx.lineTo(x + w - r, y + h)
// 右下角
ctx.arc(x + w - r, y + h - r, r, 0, Math.PI * 0.5)
-
+
// border-bottom
ctx.lineTo(x + r, y + h)
ctx.lineTo(x, y + h - r)
// 左下角
ctx.arc(x + r, y + h - r, r, Math.PI * 0.5, Math.PI)
-
+
// border-left
ctx.lineTo(x, y + r)
- ctx.lineTo(x + r, y)
+ ctx.lineTo(x + r, y)
// 这里是使用 fill 还是 stroke都可以，二选一即可，但是需要与上面对应
- ctx.fill();
+ ctx.fill();
}
/**
@@ -324,7 +324,7 @@ function get_box_arr(num,x,y,sp,r){
/**
* @param {Object} ctx 画图句柄
- * @param {Object} x x坐标
+ * @param {Object} x x坐标
* @param {Object} y y坐标
* @param {Object} img 画的图片
* @param {Object} color 边框的颜色
@@ -345,7 +345,7 @@ function draw_circle(ctx,x,y,r,img,color,unit){
function null_promise(){
- var promise=new Promise(function(resolve, reject){ var ob={code:-1,data:null}; resolve(ob); }); return promise;
+ var promise=new Promise(function(resolve, reject){ var ob={code:-1,data:null}; resolve(ob); }); return promise;
}
module.exports = {
@@ -371,9 +371,11 @@ module.exports = {
for (var o in n) new RegExp("(" + o + ")").test(r) && (r = r.replace(RegExp.$1, 1 == RegExp.$1.length ? n[o] : ("00" + n[o]).substr(("" + n[o]).length)));
return r;
},
- formar_no_full(e){
+ formar_no_full(e,char){
var t= new Date(1e3 * e);
- return t.getFullYear() +"-"+(t.getMonth() + 1)+"-"+t.getDate();
+ var c="-";
+ if(char) c=char;
+ return t.getFullYear() +c+(t.getMonth() + 1)+c+t.getDate();
},
json2Form: function(e) {
@@ -442,7 +444,7 @@ module.exports = {
sub_last: sub_last,//去掉末尾一个字符
measureText: measureText,//画布需要的函数
check_mobile: check_mobile,//验证手机
- get_rand_item:get_rand_item, //随机获取元素
+ get_rand_item:get_rand_item, //随机获取元素
getDistance:getDistance, //获取俩个经纬网度之间的距离
draw_randon_rect:draw_randon_rect ,//画图画圆角矩形
null_promise:null_promise,//返回空的promise