diff --git a/components/diy_picMax/diy_picMax.js b/components/diy_picMax/diy_picMax.js
index fd3bb0e..0be7da0 100644
--- a/components/diy_picMax/diy_picMax.js
+++ b/components/diy_picMax/diy_picMax.js
@@ -1,3 +1,4 @@
+var ut = require("../../utils/util.js");
Component({
properties: {
object: {
@@ -10,7 +11,8 @@ Component({
// 这里是一些组件内部数据
someData: {},
pic_height: 0,//图片组合的高度
- is_yspan: 0, //是否要严格按照比例来实现
+ is_yspan: 0, //是否要严格按照比例来实现
+ is_time_show:0
},
ready: function () {
//-- console.log(this.data.object.data) --
@@ -25,6 +27,26 @@ Component({
})
this.setData({ pic_height: height, is_yspan: is_yspan })
+
+
+ var start_time=this.properties.object.start_time;
+ var end_time=this.properties.object.end_time;
+
+ if(start_time && end_time) {
+
+ var start_time = Date.parse(new Date(start_time.replace(/-/g, '/'))) / 1000;
+ var end_time = Date.parse(new Date(end_time.replace(/-/g, '/'))) / 1000;
+ var now = ut.gettimestamp();
+
+
+ if (start_time < now && end_time > now) {
+ this.setData({is_time_show: 1});
+ }
+ }else{
+ this.setData({is_time_show: 1});
+ }
+
+
},
methods: {
//-- 智能跳转到页面 --
diff --git a/components/diy_picMax/diy_picMax.wxml b/components/diy_picMax/diy_picMax.wxml
index a6b21a2..77af1e4 100644
--- a/components/diy_picMax/diy_picMax.wxml
+++ b/components/diy_picMax/diy_picMax.wxml
@@ -1,4 +1,5 @@
+
@@ -49,4 +50,5 @@
+
\ No newline at end of file
diff --git a/packageA/pages/checkin/checkin.wxml b/packageA/pages/checkin/checkin.wxml
index 14445d3..40dafdb 100644
--- a/packageA/pages/checkin/checkin.wxml
+++ b/packageA/pages/checkin/checkin.wxml
@@ -79,7 +79,7 @@
-
+
{{item.num}}
@@ -93,17 +93,17 @@
-
+
-
-
+
+
-
-
+
+
diff --git a/packageA/pages/checkin/checkin.wxss b/packageA/pages/checkin/checkin.wxss
index ab477ff..94836dd 100644
--- a/packageA/pages/checkin/checkin.wxss
+++ b/packageA/pages/checkin/checkin.wxss
@@ -192,7 +192,7 @@ page,
.jfbuy-container {
- padding: 60rpx 40rpx 40rpx;
+ padding: 60rpx 25rpx 40rpx;
}
.jfbuy {
/* border: 2rpx solid black; */
@@ -394,4 +394,17 @@ page,
}
.pop_up_no .close_img{
width:60rpx; height:60rpx;position:absolute; right:-15px; top:-15rpx;
- }
\ No newline at end of file
+ }
+ .swiper {
+ width: 700rpx;
+ height: 300rpx;
+ /* background: #cccc; */
+ }
+ .swiper-item {
+ display: flex;
+ align-items: center;
+ }
+ .slide-image {
+ width: 100%;
+ height: 100%;
+ }
diff --git a/packageA/pages/myGiftDetails/myGiftDetails.js b/packageA/pages/myGiftDetails/myGiftDetails.js
index 07fdcff..6fef320 100644
--- a/packageA/pages/myGiftDetails/myGiftDetails.js
+++ b/packageA/pages/myGiftDetails/myGiftDetails.js
@@ -38,6 +38,14 @@ Page({
showBtn: showBtn,
})
+ getApp().getConfig2(function (e) {
+ var json_d = JSON.parse(e.switch_list);
+ self.setData({
+ bconfig: e,
+ is_retail_price: json_d.is_retail_price || 0
+ });
+ })
+
// console.log('options', options);
app.isLogin().then(function(data) {//进入页面前已经授权登录成功
self.setData({
diff --git a/packageA/pages/myGiftDetails/myGiftDetails.wxml b/packageA/pages/myGiftDetails/myGiftDetails.wxml
index b87ba86..2275dbe 100644
--- a/packageA/pages/myGiftDetails/myGiftDetails.wxml
+++ b/packageA/pages/myGiftDetails/myGiftDetails.wxml
@@ -36,7 +36,7 @@
- {{filter.toFix(details.oldprice,2)}}
+ {{is_retail_price?'零售价：':''}}{{filter.toFix(details.oldprice,2)}}
已售{{details.salenum+details.virtualsales}}件
diff --git a/packageA/pages/profile/profile.js b/packageA/pages/profile/profile.js
index cb444f8..8253aea 100644
--- a/packageA/pages/profile/profile.js
+++ b/packageA/pages/profile/profile.js
@@ -1144,7 +1144,13 @@ Page({
//-- 需要推荐人 --
if(this.data.reg_info.introducer_state){
- let tjrname = this.data.referee || this.data.fir_user.mobile;
+
+ var tj= this.data.fir_user?this.data.fir_user.mobile:'';
+ if(!tj){
+ tj=this.data.user['fromuser_id']?this.data.user['fromuser_id']:'';
+ }
+
+ let tjrname = this.data.referee || tj;
if (tjrname == "" || tjrname == null) {
//app.my_warnning("请输入推荐人", 0, this);
//return false;
diff --git a/packageA/pages/profile/profile.wxml b/packageA/pages/profile/profile.wxml
index d1ce6fb..147ab81 100644
--- a/packageA/pages/profile/profile.wxml
+++ b/packageA/pages/profile/profile.wxml
@@ -34,7 +34,7 @@
class="user-txt-right f1 pdl20 t-r" />
-
+
diff --git a/packageB/pages/user/collect_list/collect_list.js b/packageB/pages/user/collect_list/collect_list.js
index b1fbd36..75e2aa4 100644
--- a/packageB/pages/user/collect_list/collect_list.js
+++ b/packageB/pages/user/collect_list/collect_list.js
@@ -26,12 +26,28 @@ Page({
total_collects: 0,
is_goods: 0,
pageSize: 8, //分页数量
- isdelete: 0
+ isdelete: 0,
+
+ is_retail_price:0
},
onLoad: function() {
+ var th=this;
+
o.init(this, "", "collects"),
this.requestCollectList();
+
+
+ getApp().getConfig2(function(rs){
+ //计算等级价相关
+ var swithc_list=rs.switch_list;
+ var sw_arr=JSON.parse(swithc_list);
+ if(sw_arr.is_retail_price){
+ th.setData({is_retail_price:1});
+ }
+
+ });
+
},
requestCollectList: function() {
var th = this;
diff --git a/packageB/pages/user/collect_list/collect_list.wxml b/packageB/pages/user/collect_list/collect_list.wxml
index d5dfeec..5859518 100644
--- a/packageB/pages/user/collect_list/collect_list.wxml
+++ b/packageB/pages/user/collect_list/collect_list.wxml
@@ -49,10 +49,10 @@
{{item.prom_price?item.prom_price:item.final_price}}
-
-
-
-
+
+ 零售价:
+ ￥{{item.market_price}}
+
diff --git a/packageC/pages/presell/goodsInfo/goodsInfo.js b/packageC/pages/presell/goodsInfo/goodsInfo.js
index 0b018ba..bfac070 100644
--- a/packageC/pages/presell/goodsInfo/goodsInfo.js
+++ b/packageC/pages/presell/goodsInfo/goodsInfo.js
@@ -311,7 +311,7 @@ Page({
}
//-- 如果有room_id的获取 --
if (gid_str.length > 2 && gid_str[3]) {
- room_id = gid_str[2];
+ room_id = gid_str[3];
room_user_share = 1;
}
}
@@ -379,7 +379,7 @@ Page({
is_closecoupon: json_d.is_closecoupon,
is_newsales_rules: json_d.is_newsales_rules
});
- ee.init(gid);
+ // ee.init(gid);
//------几人评价-------
//n.init(th, "", "comments");
@@ -569,12 +569,16 @@ Page({
is_share: 0,
},
}).then(res1 => {
+ console.log('优惠券+++++++++++++++++');
+ console.log(res1);
fir_quan = res1.data.data.pageData;
})
}
//过滤不是本商品的单品优惠券-------------------
if (fir_quan.length > 0) {
- let goodInfo = ee.data.data || {}
+ let goodInfo = th.data.data || {}
+ console.log('商品++++++++++++++++++++++');
+ console.log(goodInfo);
for (let index = fir_quan.length - 1; index >= 0; index--) {
if (fir_quan[index].useobjecttype == 20) { //判断是单品优惠券
if (fir_quan[index].useobjectno != goodInfo.goods_sn) {
@@ -583,6 +587,7 @@ Page({
}
}
}
+
let arr = []
let length = fir_quan.length
if (length <= 3) {
@@ -787,7 +792,7 @@ Page({
sele_g: t.data.data,
userInfo: getApp().globalData.userInfo,
});
-
+ ee.init(gid);
//获取门店
ee.get_sto();
ee.get_sku(o.stoid, t.data.data, gid);
@@ -846,7 +851,7 @@ Page({
ee.data.enterAddressPage && (this.data.enterAddressPage = !1);
})
-
+
},
enterAddress: function () {
@@ -2769,6 +2774,7 @@ Page({
this.saveImageToPhotosAlbumDef()
}
},
+
//--定义的保存图片方法，分享团---
saveImageToPhotosAlbum: function () {
//--先判断会员状态--
@@ -3133,19 +3139,18 @@ Page({
var app = getApp();
var unit = that.data.screenWidth / 750 * 1.35; //基础单位，
var path2 = that.data.data.original_img;
- var scene = th.data.gid + "";
- scene += "." + th.data.sele_g.prom_type + "." + th.data.sele_g.prom_id;
- var user_id = getApp().globalData.user_id ? getApp().globalData.user_id : 0;
- if (user_id > 0) {
- scene += "_" + user_id;
- }
- //-- 如果不是会员分享过来的要分享给别人 --
- if (getApp().globalData.room_id && th.data.data.goods_id == getApp().globalData.room_goods_id && !getApp().globalData.room_user_share) {
- //固定房间是第3个字符
- if (!user_id) scene += "_0";
- scene += "_" + getApp().globalData.room_id;
- }
+ var scene = th.data.gid + "_"+th.data.presellList.id;
+ var user_id = getApp().globalData.user_id ? getApp().globalData.user_id : 0;
+ if (user_id > 0) {
+ scene += "_" + user_id;
+ }
+ //-- 如果不是会员分享过来的要分享给别人 --
+ if (getApp().globalData.room_id && th.data.data.goods_id == getApp().globalData.room_goods_id && !getApp().globalData.room_user_share) {
+ //固定房间是第3个字符
+ if (!user_id) scene += "_0";
+ scene += "_" + getApp().globalData.room_id;
+ }
///二微码
var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" +
@@ -4837,20 +4842,24 @@ Page({
}
})
+ // console.log('是否继续查询', gnext)
if (!gnext) {
return false;
}
+ // console.log('继续查询')
var userInfo = getApp().globalData.userInfo;
- var pre_data = { store_id: os.stoid, is_end: 0, timetype: 1, isuse: 1, prom_type: 8, prom_id: presell_id, pageSize: 1000 };
+ // timetype: 1,
+ var pre_data = { store_id: os.stoid, is_end: 0, isuse: 1, prom_type: 8, prom_id: presell_id, pageSize: 1000 };
if (userInfo) {
pre_data.user_id = userInfo.user_id;
}
await getApp().request.promiseGet("/api/weshop/marketing/marketingPresellList/page", {
data: pre_data,
}).then(e => {
+ // console.log('查询marketingPresellList', e)
if (e.data.code == 0 && e.data.data.pageData && e.data.data.pageData.length > 0) {
-
+ // console.log('匹配resellList')
th.data.all_pre_goods = e.data.data.pageData;
var idx = e.data.data.pageData.findIndex(function (ele) {
return ele.id == th.data.presellList.id;
diff --git a/packageC/pages/presell/goodsInfo/goodsInfo.wxml b/packageC/pages/presell/goodsInfo/goodsInfo.wxml
index fda086f..197d3f2 100644
--- a/packageC/pages/presell/goodsInfo/goodsInfo.wxml
+++ b/packageC/pages/presell/goodsInfo/goodsInfo.wxml
@@ -83,7 +83,7 @@
￥{{presellList.presell_price}}
-
+
@@ -148,6 +148,24 @@
{{prom_act.remark}}
+
+
+
+ 领券
+
+
+
+
+ 满{{item.condition}}减{{item.money}}
+
+
+
+
+
+
+
+
+
diff --git a/pages/activity/seckill_list/seckill_list.js b/pages/activity/seckill_list/seckill_list.js
index 749e997..8ad5dbe 100644
--- a/pages/activity/seckill_list/seckill_list.js
+++ b/pages/activity/seckill_list/seckill_list.js
@@ -84,9 +84,9 @@ Page({
onShow: function (t) {
- getApp().check_can_share();
+ getApp().check_can_share();
this.data.is_timer = 1;
- this.data.currentPage = 1;
+ //this.data.currentPage = 1;不能清空未1
var th = this;
//设置全局定时器
th.data.timer = setInterval(function () {
diff --git a/pages/activity/seckill_list/seckill_list.wxml b/pages/activity/seckill_list/seckill_list.wxml
index 376c93b..5bceb1e 100644
--- a/pages/activity/seckill_list/seckill_list.wxml
+++ b/pages/activity/seckill_list/seckill_list.wxml
@@ -68,7 +68,7 @@
￥
- {{item.price}}--{{is_retail_price}}--
+ {{item.price}}
零售价￥{{item.market_price}}
diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js
index 618c1c6..8298329 100644
--- a/pages/cart/cart/cart.js
+++ b/pages/cart/cart/cart.js
@@ -566,7 +566,7 @@ Page({
})
}else{
- if(prom && !item.is_integral_normal && !item.is_pd_normal){
+ if(prom && !item.is_integral_normal && !item.is_pd_normal && prom[0].prom_type!=5){
th.disInvalid(item);
continue;
}
diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js
index ea8f07f..c0089ad 100644
--- a/pages/cart/cart2/cart2.js
+++ b/pages/cart/cart2/cart2.js
@@ -440,7 +440,7 @@ Page({
}).then(res1 => {
if(res1.data.code==0){
- get_gd=res.data.data;
+ get_gd=res1.data.data;
}
})
distr_t=pick.distr_type || get_gd.distr_type;
@@ -669,7 +669,8 @@ Page({
}
}
//-- 判断一下，获取搭配购的消息 --
- if(item1.prom_type==0 || item1.prom_type==5){
+ if((item1.prom_type==0 || item1.prom_type==5) && (!carr[i].collocationList || !carr[i].collocationList.length)) {
+
await th.set_collection(item1,carr,i);
}
}
@@ -1088,7 +1089,7 @@ Page({
}
//-- 判断是不是可以收藏 --
- if(gd.prom_type ==5){
+ if(gd.prom_type ==5 && !th.data.all_collocation_list.length){
await th.set_collection(gd);
}
@@ -5632,6 +5633,8 @@ Page({
item.goods_num=1;
item.goods_price=item.price;
item.is_collocation=1;
+ item.prom_type=5;
+
var coll_arr=[];
if(this.data.collocation_goods && this.data.collocation_goods.length){
diff --git a/pages/giftpack/giftpacklist/giftpacklist.js b/pages/giftpack/giftpacklist/giftpacklist.js
index 162bacf..853bdcd 100644
--- a/pages/giftpack/giftpacklist/giftpacklist.js
+++ b/pages/giftpack/giftpacklist/giftpacklist.js
@@ -92,7 +92,8 @@ Page({
var json_d = JSON.parse(e.switch_list);
th.setData({
bconfig: e,
- sys_switch: json_d
+ sys_switch: json_d,
+ is_retail_price: json_d.is_retail_price || 0
});
})
diff --git a/pages/giftpack/giftpacklist/giftpacklist.wxml b/pages/giftpack/giftpacklist/giftpacklist.wxml
index 504c821..3056247 100644
--- a/pages/giftpack/giftpacklist/giftpacklist.wxml
+++ b/pages/giftpack/giftpacklist/giftpacklist.wxml
@@ -64,7 +64,7 @@