diff --git a/components/diy_video/diy_video.wxml b/components/diy_video/diy_video.wxml
index fc763f0..24b0d05 100644
--- a/components/diy_video/diy_video.wxml
+++ b/components/diy_video/diy_video.wxml
@@ -1,3 +1,3 @@
-
+
\ No newline at end of file
diff --git a/packageA/pages/profile/profile.js b/packageA/pages/profile/profile.js
index e52581b..f332d06 100644
--- a/packageA/pages/profile/profile.js
+++ b/packageA/pages/profile/profile.js
@@ -77,7 +77,7 @@ Page({
lat: null, //维度
lon: null, //经度
loading: 0,
-
+ oldBirtthDayLength:0, //生日日期个数
},
//通过路径跳转到其他页面
goto: function (e) {
@@ -1126,20 +1126,81 @@ Page({
let address = this.getInput(e);
this.data.address = address;
},
-
+ //获取生日
+ getbind(e) {
+ console.log("获取生日222222222");
+ console.log(e);
+ let b = this.getInput(e);
+ let length = b.length;
+ let oldBirtthDayLength=this.data.oldBirtthDayLength
+ if (length > oldBirtthDayLength) {
+ if (b.length==4) {
+ b+='-'
+ }
+ if (b.length==7) {
+ b+='-'
+ }
+ // if (b.length==6 && b[5] >1) {
+ // console.log(b[5]);
+
+ // }
+ }
+ this.setData({
+ datet: b,
+ oldBirtthDayLength:length,
+ });
+ },
//获取生日
bindChange: function (e) {
+ console.log("获取生日11111111");
+ console.log(e);
let strBirthday = e.detail.value;
let age = this.verifyBirthday(strBirthday);
if (age <= 10) {
app.my_warnning("会员年龄不能小于10岁(含10岁)", 0, this);
+ this.setData({
+ datet: '',
+ });
} else if (age >= 70) {
app.my_warnning("会员年龄不能超过70岁(含70岁)", 0, this);
- } else {
this.setData({
- datet: e.detail.value,
- });
+ datet: '',
+ });
+ } else {
+ let value = e.detail.value
+
+ if (value.length==8) {
+ value+='01'
+ }
+ if (value.length==7) {
+ value+='-01'
+ }
+ if (value.length==9) {
+ let ov=value[value.length-1]
+ let nv=value.slice(0,-1)
+ if (ov==0) {
+ nv+='01'
+ }else{
+ nv+='0'+ov
+ }
+ value=nv
+ }
+ // let reg= /^(\d{4})-(\d{2})-(\d{2})$/;
+ let reg= /^[1-9]\d{3}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])$/
+ console.log('日期验证');
+ console.log(value);
+ console.log(reg.test(value));
+ if (reg.test(value)) {
+ this.setData({
+ datet: value,
+ });
+ }else{
+ app.my_warnning("出生日期格式不对", 0, this);
+ this.setData({
+ datet: '',
+ });
+ }
}
},
diff --git a/packageA/pages/profile/profile.wxml b/packageA/pages/profile/profile.wxml
index 97a3374..b243c54 100644
--- a/packageA/pages/profile/profile.wxml
+++ b/packageA/pages/profile/profile.wxml
@@ -90,14 +90,16 @@
出生日期:
-
+
+
+
+
+
+
-
- {{datet?datet:"请选择时间"}}∟
-
diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js
index ef60a0e..665bb41 100644
--- a/packageE/pages/cart/cart2/cart2.js
+++ b/packageE/pages/cart/cart2/cart2.js
@@ -5,7 +5,7 @@ var regeneratorRuntime = require('../../../../utils/runtime.js');
var util_pay = require("../../../../utils/pay.js");
var zh_calc = require("zh_calculate.js");
var ladder_calc = require("ladder_calculate.js");
-// 防抖函数用定时器
+// 防抖函数用定时器
let timer;
Page({
data: {
@@ -137,6 +137,7 @@ Page({
show_duo_gift: 0,
send_gf: {}, //多赠品的计算
send_lb: {},
+ month_lb: {}, //每月礼包数据
dis_config: null,
bn_use_commission: 0, //是不是使用佣金
cart_use_commission: 0,
@@ -198,6 +199,7 @@ Page({
is_by: {},
send_gf: {},
send_lb: {},
+ month_lb: {},
})
},
@@ -1831,6 +1833,7 @@ Page({
},
calc_per: async function (c_arr) {
+
var send_gf = {};
var duo_zp_num_arr = {};
var th = this;
@@ -1856,7 +1859,7 @@ Page({
for (var ii in ob) {
var item_map = ob[ii];
if (item_map.bs == undefined || item_map.bs == null) {
- //等待，获取一下优惠活动的信息
+ //等待，获取一下优惠活动的信息
await getApp().request.promiseGet("/api/weshop/goods/getDiscount", {
data: {
price: parseFloat(item_map.price).toFixed(2), prom_id: item_map.prom_id,
@@ -1875,7 +1878,9 @@ Page({
item_map.s_coupon_num = get_data.coupon_num;
item_map.lbtitle = get_data.lbtitle;
item_map.zxlbtitle = get_data.zxlbtitle;
-
+ //每月礼包
+ item_map.monthlbtitle = get_data.monthlbtitle;
+ //------end-------
if (get_data.gift_id && parseInt(get_data.zp_mode) != 1
&& get_data.zp_num * item_map.bs <= get_data.limit_num
&& get_data.zp_num * item_map.bs <= get_data.gift_storecount
@@ -1901,6 +1906,10 @@ Page({
//专享礼包
item_map.zx_libao = get_data.zxlibao;
item_map.zx_lb_num = get_data.zxlb_num;
+ //每月礼包
+ item_map.monthlibao = get_data.monthlibao;
+ item_map.monthlb_num = get_data.monthlb_num;
+ //------end-------
if (parseInt(get_data.zp_mode) == 1) {
if (!send_gf[pickid]) send_gf[pickid] = [];
@@ -2043,11 +2052,22 @@ Page({
cart_item.g_zxlb_num.push({ 'l_id': item_map.zx_libao, "num": item_map.zx_lb_num, 'zxlbtitle': item_map.zxlbtitle })
}
}
+ //每月礼包
+ if (item_map.monthlibao) {
+ if (!cart_item.monthlibao) {
+ cart_item.monthlibao = item_map.monthlibao + "";
+ cart_item.g_monthlb_num = [{ 'month_id': item_map.monthlibao, "monthnum": item_map.monthlb_num, 'monthlbtitle': item_map.monthlbtitle }];
+ } else {
+ cart_item.monthlibao += "," + item_map.monthlibao;
+ cart_item.g_monthlb_num.push({ 'month_id': item_map.monthlibao, "monthnum": item_map.monthlb_num, 'monthlbtitle': item_map.monthlbtitle })
+ }
+ }
+ //------------end--------
}
}
}
-
+
var arr = Object.keys(send_gf);
var arr2 = Object.keys(th.data.send_gf);
if (arr2.length > 0) return false;
@@ -2062,10 +2082,12 @@ Page({
calclate_lbNum(r_data) {
-
+
if(!r_data) return false;
let send_lb = this.data.send_lb;
+ let month_lb = this.data.month_lb;
+
//g_lb_num我的礼包 g_zxlb_num专享礼包
r_data.forEach(r_d => {
let arr = [];
@@ -2112,9 +2134,35 @@ Page({
send_lb[r_d.pickup_id] = arr;
}
}
+ //每月礼包
+ let monthArr=[]
+ if (r_d.g_monthlb_num) {
+ let g_lb = r_d.g_monthlb_num;
+ for (let i = 0; i < g_lb.length; i++) {
+ let item = g_lb[i];
+ let new_lb = g_lb.filter(lb => {
+ return item.month_id === lb.month_id;
+ });
+ if (new_lb.length == 1) {
+ monthArr.push(item);
+ } else {
+ item.num = new_lb.reduce((pre, next) => {
+ return pre + next.num;
+ }, 0);
+ monthArr.push(item);
+ g_lb = g_lb.filter(ii => {
+ return ii.month_id !== item.month_id;
+ });
+ }
+ month_lb[r_d.pickup_id] = monthArr;
+ }
+ }
+ //-----end--------
+
})
this.setData({
send_lb,
+ month_lb
})
},
@@ -3633,6 +3681,15 @@ Page({
ob = JSON.stringify(ob);
th.setData({ [l_txt]: good.zx_libao, [l_txt1]: ob });
}
+ //每月礼包
+ if (good.month_libao) {
+ var l_txt = "formData.give_monthlb_id";
+ //这个是json格式的
+ var l_txt1 = "formData.g_monthlb_num";
+ var ob = [{ "num": good.month_lb_num, "l_id": good.month_libao }];
+ ob = JSON.stringify(ob);
+ th.setData({ [l_txt]: good.month_libao, [l_txt1]: ob });
+ }
wx.hideLoading();
@@ -3918,6 +3975,12 @@ Page({
order_prom_list.give_zxlb_id = th.data.formData.give_zxlb_id;
order_prom_list.g_zxlb_num = th.data.formData.g_zxlb_num;
}
+ //--- 每月礼包 ---
+ if (th.data.formData.give_monthlb_id > 0) {
+ order_prom_list.give_monthlb_id = th.data.formData.give_monthlb_id;
+ order_prom_list.g_monthlb_num = th.data.formData.g_monthlb_num;
+ // order_prom_list.g_monthlb_num = [{ "num": good.month_lb_num, "l_id": th.data.formData.month_libao_id }];
+ }
item.order_prom_list = order_prom_list;
@@ -4243,6 +4306,23 @@ Page({
order_prom_list.g_zxlb_num = JSON.stringify(t_item.g_zxlb_num);
}
+ //-- 送每月礼包的时候 --
+ if (t_item.monthlibao) {
+ order_prom_list.give_monthlb_id = t_item.monthlibao;
+ let marr=[];
+ if (t_item.g_monthlb_num && t_item.g_monthlb_num.length>0) {
+ t_item.g_monthlb_num.map(ite=>{
+ let obj={
+ num:ite.monthnum,
+ l_id:ite.month_id,
+ monthlbtitle:ite.monthlbtitle
+ }
+ marr.push(obj)
+ })
+ }
+ order_prom_list.g_monthlb_num = JSON.stringify(marr);
+ }
+
if (Object.keys(order_prom_list).length > 0) {
if (order_prom_list.discount_amount)
order_prom_list.discount_amount = parseFloat(order_prom_list.discount_amount).toFixed(2);
@@ -4569,10 +4649,10 @@ Page({
})
// pdata.keyid = th.data.bn_goods.keyid
}
-
+ // debugger
var str = JSON.stringify(pdata);
console.log(str,'aaaaaaaaaaaaaaa');
- //return false;
+ // return false;
wx.showLoading({ title: "加载中" });
th.setData({ submit: 1, })
@@ -5853,6 +5933,7 @@ Page({
}
}).then(res => {
if (res.data.code == 0) {
+
var get_data = res.data.data;
arr.is_bz = prom.is_bz; //是不是倍增
arr.is_xz_yh = arr.is_xz_yh ? arr.is_xz_yh : prom.is_xz_yh; //是不是优惠
@@ -5890,6 +5971,11 @@ Page({
arr.zxlbtitle = get_data.zxlbtitle;
arr.zx_libao = get_data.zxlibao;
arr.zx_lb_num = get_data.zxlb_num;
+ //立即购买，每月礼包
+ arr.monthlbtitle = get_data.monthlbtitle;
+ arr.month_libao = get_data.monthlibao;
+ arr.month_lb_num = get_data.monthlb_num;
+ //----end-------
arr.prom_id = prom_id;
@@ -6087,6 +6173,7 @@ Page({
check_is_youhui: function (r_data, pick_id) {
let send_lb = this.data.send_lb;
let lodash = null;
+
r_data.forEach(item => {
if (send_lb[pick_id]) {
for (let i = 0; i < send_lb[pick_id].length; i++) {
@@ -6226,10 +6313,14 @@ Page({
let id = e.currentTarget.dataset.id; // 获取礼包id
let flag = e.currentTarget.dataset.flag;
let url = '';
- if (flag == 1) { // flag =1 控制跳转到专享礼包
- url = `/pages/giftpack/giftpacklist/giftpacklist?lbId=${id}&flag=1`;
- } else {
+
+ if (flag == 2) { // flag =2 控制跳转到每月礼包
+ // url = `/pages/giftpack/giftpacklist/giftpacklist?lbId=${id}&flag=1`;
+ url = `/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo?isBuy=1&id=${id}&is_act=1`;
+ }else if (flag == 1) {
url = `/packageA/pages/myGiftDetails/myGiftDetails?btn=0&index=0&id=${id}`; // btn=0 控制跳转到的页面不显示按钮
+ } else {
+ url = `/pages/giftpack/giftpacklist/giftpacklist?lbId=${id}&flag=1`;
};
// console.log('myurl', url);
getApp().goto(url);
diff --git a/packageE/pages/cart/cart2/cart2.wxml b/packageE/pages/cart/cart2/cart2.wxml
index 45ff5f7..4144db3 100644
--- a/packageE/pages/cart/cart2/cart2.wxml
+++ b/packageE/pages/cart/cart2/cart2.wxml
@@ -209,7 +209,7 @@
-
+
赠{{send.zxlbtitle?send.zxlbtitle:send.lbtitle}}
@@ -220,6 +220,20 @@
+
+
+
+
+
+ 赠{{send.monthlbtitle}}
+
+
+
+ x{{send.monthnum}}
+
+
+
+
@@ -416,7 +430,7 @@
-
+
赠{{bn_goods.lbtitle}}
@@ -428,7 +442,7 @@
-
+
赠{{bn_goods.zxlbtitle}}
@@ -438,6 +452,18 @@
+
+
+
+
+ 赠{{bn_goods.monthlbtitle}}
+
+
+
+ x{{bn_goods.month_lb_num}}
+
+
+
diff --git a/packageE/pages/user/monthgiftbag/giftpackbuy/giftpackbuy.js b/packageE/pages/user/monthgiftbag/giftpackbuy/giftpackbuy.js
index 752fa44..ff8c348 100644
--- a/packageE/pages/user/monthgiftbag/giftpackbuy/giftpackbuy.js
+++ b/packageE/pages/user/monthgiftbag/giftpackbuy/giftpackbuy.js
@@ -297,7 +297,8 @@ Page({
page: th.data.curpage,
pageSize: th.data.pageSize,
is_end:0,
- timetype:1
+ timetype:1,
+ is_act:0
},
success: function (res) {
if (res.data.code == 0) {
diff --git a/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.js b/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.js
index 2fc2187..47f2922 100644
--- a/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.js
+++ b/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.js
@@ -214,6 +214,43 @@ Page({
url: '/packageE/pages/togoin/togoin',
})
},
+ getListInfo: function (e) {
+ var th = this;
+ getApp().request.get(`/api/weshop/marketing/marketingMonthgiftbagForm/get/${a.stoid}/${th.data.params.id}`, {
+ isShowLoading: true,
+ data: {
+ // store_id: a.stoid, //商家ID
+ // user_id: d.user_id, //用户ID
+ // page: 1,
+ // pageSize: 10,
+ // is_end:0,
+ // timetype:1,
+ // id:th.data.params.id
+ },
+ success: function (res) {
+ if (res.data.code == 0) {
+ // th.data.curpage++;
+ // var arr1 = th.data.wareCard;
+ let obj = res.data.data;
+ let monthgiftbag={
+ remark:obj.remark,
+ cover_img:obj.imageurl,
+ giftTitle:obj.act_name,
+ lbPrice:obj.oldPrice
+ }
+ let remark=monthgiftbag.remark.replace(/\![]()
{
diff --git a/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.wxml b/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.wxml
index 25a24ee..a852b38 100644
--- a/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.wxml
+++ b/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.wxml
@@ -149,7 +149,7 @@
-
+
去凑单>
diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index dd67cc6..a8a19f1 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -481,7 +481,7 @@ Page({
appoint_pick_keyid: json_d.appoint_pick_keyid
});
-
+
//------几人评价-------
//n.init(th, "", "comments");
@@ -3680,7 +3680,7 @@ Page({
th.setData({
all_pick_list: e.data.data.pageData
});
-
+
//--获取线下库存,而且不是新的门店规则, 同时是普通购买的时候，或者同时不能是活动，秒杀，拼团，积分购--
if (!getApp().is_virtual(th.data.sele_g) && th.data.sales_rules >= 2 && !th.data.is_newsales_rules && !th.data.sele_g.whsle_id && ([1,2,4,6,8,9].indexOf(th.data.prom_type)==-1 || is_normal == 1)) {
setTimeout(function () {
@@ -7972,7 +7972,10 @@ Page({
let id = e.currentTarget.dataset.id; // 获取礼包id
let flag = e.currentTarget.dataset.flag;
let url = '';
- if (flag == 1) { // flag =1 控制跳转到专享礼包
+ if (flag == 2) { // flag =1 控制跳转到专享礼包
+ url = `/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo?isBuy=1&id=${id}&is_act=1`;
+ // url = `/pages/giftpack/giftpacklist/giftpacklist?lbId=${id}&flag=1`;
+ } else if (flag == 1) { // flag =1 控制跳转到专享礼包
url = `/pages/giftpack/giftpacklist/giftpacklist?lbId=${id}&flag=1`;
} else {
url = `/packageA/pages/myGiftDetails/myGiftDetails?btn=0&index=0&id=${id}`; // btn=0 控制跳转到的页面不显示按钮
diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index 97d7ee5..3c1ad36 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -3,7 +3,7 @@
-
+
@@ -535,6 +535,7 @@
送{{item.lbtitle}}
送{{item.zxlbtitle}}
+ 送{{item.monthgiftbag_title}}
@@ -1368,6 +1369,7 @@
，送赠品
，送礼包
，送专享礼包
+ ，送每月礼包