diff --git a/app.json b/app.json
index fcf1cf0..585c097 100644
--- a/app.json
+++ b/app.json
@@ -83,8 +83,7 @@
"pages/user/assistance/assistance_success",
"pages/user/assistance/assistance",
"pages/video/index",
- "pages/template/index",
- "pages/store/index"
+ "pages/template/index"
],
@@ -92,6 +91,7 @@
"root": "packageA/",
"name":"pack1",
"pages": [
+ "pages/store/index",
"pages/prom_list/prom_list",
"pages/quan_list/quan_list",
"pages/quan_pro/quan_pro"
@@ -120,26 +120,26 @@
{
"pagePath": "pages/index/index/index",
"text": "首页",
- "iconPath": "images/bar/index.png",
- "selectedIconPath": "images/bar/index_on.png"
+ "iconPath": "packageA/images/bar/index.png",
+ "selectedIconPath": "packageA/images/bar/index_on.png"
},
{
"pagePath": "pages/goods/categoryList/categoryList",
"text": "分类",
- "iconPath": "images/bar/fl.png",
- "selectedIconPath": "images/bar/fl_on.png"
+ "iconPath": "packageA/images/bar/fl.png",
+ "selectedIconPath": "packageA/images/bar/fl_on.png"
},
{
"pagePath": "pages/cart/cart/cart",
"text": "购物车",
- "iconPath": "images/bar/car.png",
- "selectedIconPath": "images/bar/car_on.png"
+ "iconPath": "packageA/images/bar/car.png",
+ "selectedIconPath": "packageA/images/bar/car_on.png"
},
{
"pagePath": "pages/user/index/index",
"text": "我的",
- "iconPath": "images/bar/user.png",
- "selectedIconPath": "images/bar/user_on.png"
+ "iconPath": "packageA/images/bar/user.png",
+ "selectedIconPath": "packageA/images/bar/user_on.png"
}
]
},
diff --git a/images/bar/car.png b/packageA/images/bar/car.png
index 7fd3ab0..7fd3ab0 100644
--- a/images/bar/car.png
+++ b/packageA/images/bar/car.png
diff --git a/images/bar/car_on.png b/packageA/images/bar/car_on.png
index 27a5d27..27a5d27 100644
--- a/images/bar/car_on.png
+++ b/packageA/images/bar/car_on.png
diff --git a/images/bar/fl.png b/packageA/images/bar/fl.png
index e05a532..e05a532 100644
--- a/images/bar/fl.png
+++ b/packageA/images/bar/fl.png
diff --git a/images/bar/fl_on.png b/packageA/images/bar/fl_on.png
index 8a8016d..8a8016d 100644
--- a/images/bar/fl_on.png
+++ b/packageA/images/bar/fl_on.png
diff --git a/images/bar/fx.png b/packageA/images/bar/fx.png
index bba9649..bba9649 100644
--- a/images/bar/fx.png
+++ b/packageA/images/bar/fx.png
diff --git a/images/bar/fx_on.png b/packageA/images/bar/fx_on.png
index f6adb92..f6adb92 100644
--- a/images/bar/fx_on.png
+++ b/packageA/images/bar/fx_on.png
diff --git a/images/bar/index.png b/packageA/images/bar/index.png
index d6b0303..d6b0303 100644
--- a/images/bar/index.png
+++ b/packageA/images/bar/index.png
diff --git a/images/bar/index_on.png b/packageA/images/bar/index_on.png
index 096cb84..096cb84 100644
--- a/images/bar/index_on.png
+++ b/packageA/images/bar/index_on.png
diff --git a/images/bar/user.png b/packageA/images/bar/user.png
index 86974d9..86974d9 100644
--- a/images/bar/user.png
+++ b/packageA/images/bar/user.png
diff --git a/images/bar/user_on.png b/packageA/images/bar/user_on.png
index 93629ad..93629ad 100644
--- a/images/bar/user_on.png
+++ b/packageA/images/bar/user_on.png
diff --git a/images/share/ct_num.png b/packageA/images/share/ct_num.png
index c6e1ac3..c6e1ac3 100644
--- a/images/share/ct_num.png
+++ b/packageA/images/share/ct_num.png
diff --git a/images/share/default_g_img.gif b/packageA/images/share/default_g_img.gif
index a5369e2..a5369e2 100644
--- a/images/share/default_g_img.gif
+++ b/packageA/images/share/default_g_img.gif
diff --git a/images/share/hui_hear_pic.png b/packageA/images/share/hui_hear_pic.png
index 91144c7..91144c7 100644
--- a/images/share/hui_hear_pic.png
+++ b/packageA/images/share/hui_hear_pic.png
diff --git a/images/share/mackground.png b/packageA/images/share/mackground.png
index 6bcf62e..6bcf62e 100644
--- a/images/share/mackground.png
+++ b/packageA/images/share/mackground.png
diff --git a/images/share/miao_share.png b/packageA/images/share/miao_share.png
index f788197..f788197 100644
--- a/images/share/miao_share.png
+++ b/packageA/images/share/miao_share.png
diff --git a/images/share/q_tj.png b/packageA/images/share/q_tj.png
index 56136e5..56136e5 100644
--- a/images/share/q_tj.png
+++ b/packageA/images/share/q_tj.png
diff --git a/images/share/s_gou.png b/packageA/images/share/s_gou.png
index 5e4e765..5e4e765 100644
--- a/images/share/s_gou.png
+++ b/packageA/images/share/s_gou.png
diff --git a/images/share/share_bg.png b/packageA/images/share/share_bg.png
index a3177c6..a3177c6 100644
--- a/images/share/share_bg.png
+++ b/packageA/images/share/share_bg.png
diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js
index 83bd301..73a41f7 100644
--- a/pages/cart/cart/cart.js
+++ b/pages/cart/cart/cart.js
@@ -1129,7 +1129,14 @@ Page({
map.set(item.prom_id+"",ob);
}
}
+
+ if(item.is_gift==1){
+ var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id;
+ getApp().request.delete(url, {});
+ list.goods.splice(i,1);
+ }
}
+
var map2=new Map();
//请那些是赠品，但是优惠活动并没有被选中的商品要删除，同时满足条件的要放到map2，
for(var i in list.goods){
@@ -1229,17 +1236,9 @@ Page({
}
}
}
- else{
- //---条件不到，删除相应的赠品---
- for(var gi in list.goods){
- var item=list.goods[gi];
- if(item.is_gift==1 && item.prom_id==discount.prom_id){
- var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id;
- getApp().request.delete(url, {});
- list.goods.splice(gi,1);
- }
- }
- }
+
+
+
//-- 获取 --
await getApp().request.promiseGet("/api/weshop/promgoodslist/list",{
data:{prom_id:prom.id}
diff --git a/pages/cart/cart2/cart2.wxml b/pages/cart/cart2/cart2.wxml
index e3b798b..79a0ab8 100644
--- a/pages/cart/cart2/cart2.wxml
+++ b/pages/cart/cart2/cart2.wxml
@@ -311,12 +311,12 @@
优惠活动
- - ￥ {{formData.cut_price}}元
+ - ￥ {{filters.toFix(formData.cut_price,2)}}元
订单优惠
- - ￥ {{formData.order_prom_amount}}元
+ - ￥ {{filters.toFix(formData.order_prom_amount,2)}}元
使用余额
diff --git a/pages/cart/cart2/cart2.wxss b/pages/cart/cart2/cart2.wxss
index cb34f2a..c10b952 100644
--- a/pages/cart/cart2/cart2.wxss
+++ b/pages/cart/cart2/cart2.wxss
@@ -346,7 +346,7 @@ margin:auto;
}
.xc-frame{
width: 100%;
- height:68.9%;
+ height:60%;
}
.xc-frame .list-frame{
@@ -480,11 +480,7 @@ padding-left: 40rpx;
margin-top: 30rpx;
}
-.cx-popup.radius{
-
-height: 650rpx;
-}
.xc-hook {
width: 33rpx;
height: 33rpx;
diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index 117246e..7a5c8b6 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -929,6 +929,11 @@ Page({
sku: o.sku,
};
+ //如果是积分够，is_integral_normal就要有积分购普通购买字段
+ if(o.prom_type==4){
+ newd.is_integral_normal=1;
+ }
+
//-----如果是秒杀，团购，积分购,拼团-----
if (th.data.prom_type == 1) {
newd.goods_price = th.data.prom_price;
diff --git a/pages/user/order_detail/order_detail.js b/pages/user/order_detail/order_detail.js
index 9747020..2ddd364 100644
--- a/pages/user/order_detail/order_detail.js
+++ b/pages/user/order_detail/order_detail.js
@@ -289,7 +289,7 @@ Page({
for(var i in order_goods){
var good=order_goods[i];
//如果不是小程序有的功能，直接提示要去3.0处理
- if(good.prom_type==2 || good.prom_type==3 || good.prom_type==4 || good.prom_type==5){
+ if(good.prom_type==2 || good.prom_type==4){
wx.showModal({
title: '提示',
content: '小程序还未有该活动，请到3.0公众号支付'
@@ -330,8 +330,8 @@ Page({
});
return false;
}
-
- if(good.prom_type==1 || good.prom_type==6){
+
+ if((good.prom_type==1 || good.prom_type==6 || good.prom_type==5 ) && !good.is_gift && !good.is_collocation){
if(gg.prom_type!=good.prom_type) {
wx.showModal({
title: '提示',
@@ -339,6 +339,32 @@ Page({
});
return false;
}
+ if(good.prom_type==3 || good.prom_type==5){
+ await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid+"/"+good.goods_id+"/0", {}).then(res => {
+ }).then(res=>{
+ if(res.data.code==0){
+ var r_data=res.data.data;
+ if(!r_data.collocationPromList && good.prom_type==5){
+ wx.showModal({
+ title: '提示',
+ content: good.goods_name+'未找到活动'
+ });
+ }
+ if(!r_data.promGoodsLists && good.prom_type==3){
+ wx.showModal({
+ title: '提示',
+ content: good.goods_name+'未找到活动'
+ });
+ }
+ }else{
+ wx.showModal({
+ title: '提示',
+ content: good.goods_name+'未找到活动'
+ });
+ return false;
+ }
+ })
+ }
}else{
@@ -374,24 +400,25 @@ Page({
}
}
}
-
-
- var isok=1;
- var card_field=th.data.card_field;
- //如果会员是等级会员,商品有等级价,且不是活动商品
- if(card_field && gg[card_field]>0){
- if (good.goods_price != gg[card_field]) isok = 0;
- }else{
- if (good.goods_price != gg.shop_price) isok = 0;
-
- }
- if(!isok){
- wx.showModal({
- title: '提示',
- content: gg.goods_name+'商品的价格发生了变化'
- });
- return false;
- }
+
+ if(!good.is_gift && !good.is_collocation) {
+ var isok = 1;
+ var card_field = th.data.card_field;
+ //如果会员是等级会员,商品有等级价,且不是活动商品
+ if (card_field && gg[card_field] > 0) {
+ if (good.goods_price != gg[card_field]) isok = 0;
+ } else {
+ if (good.goods_price != gg.shop_price) isok = 0;
+
+ }
+ if (!isok) {
+ wx.showModal({
+ title: '提示',
+ content: gg.goods_name + '商品的价格发生了变化'
+ });
+ return false;
+ }
+ }
//--如果是线下库存的时候--
if(th.data.conf.sales_rules==2){
diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js
index 719f095..7e87bc6 100644
--- a/pages/user/order_list/order_list.js
+++ b/pages/user/order_list/order_list.js
@@ -380,7 +380,7 @@ Page({
for(var i in order_goods){
var good=order_goods[i];
//如果不是小程序有的功能，直接提示要去3.0处理
- if(good.prom_type==2 || good.prom_type==3 || good.prom_type==4 || good.prom_type==5){
+ if(good.prom_type==2 || good.prom_type==4 ){
wx.showModal({
title: '提示',
content: '小程序还未有该活动，请到3.0公众号支付'
@@ -422,10 +422,7 @@ Page({
return false;
}
-
- console.log("-----------------111-------------------");
-
- if(good.prom_type==1 || good.prom_type==6){
+ if((good.prom_type==1 || good.prom_type==6 || good.prom_type==5 ) && !good.is_gift && !good.is_collocation){
if(gg.prom_type!=good.prom_type) {
wx.showModal({
title: '提示',
@@ -433,9 +430,34 @@ Page({
});
return false;
}
-
+ if(good.prom_type==3 || good.prom_type==5){
+ await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid+"/"+good.goods_id+"/0", {}).then(res => {
+ }).then(res=>{
+ if(res.data.code==0){
+ var r_data=res.data.data;
+ if(!r_data.collocationPromList && good.prom_type==5){
+ wx.showModal({
+ title: '提示',
+ content: good.goods_name+'未找到活动'
+ });
+ }
+ if(!r_data.promGoodsLists && good.prom_type==3){
+ wx.showModal({
+ title: '提示',
+ content: good.goods_name+'未找到活动'
+ });
+ }
+ }else{
+ wx.showModal({
+ title: '提示',
+ content: good.goods_name+'未找到活动'
+ });
+ return false;
+ }
+ })
+ }
+
}else{
-
if(gg.prom_type==1 || gg.prom_type==6){
var prom=null;
//---如果是活动的时候---
@@ -468,24 +490,25 @@ Page({
}
}
}
-
-
+ //赠品和搭配购不判断商品金额
var isok=1;
var card_field=th.data.card_field;
//如果会员是等级会员,商品有等级价,且不是活动商品
- if(card_field && gg[card_field]>0){
- if (good.goods_price != gg[card_field]) isok = 0;
- }else{
- if (good.goods_price != gg.shop_price) isok = 0;
-
- }
- if(!isok){
- wx.showModal({
- title: '提示',
- content: gg.goods_name+'商品的价格发生了变化'
- });
- return false;
- }
+ if(!good.is_gift && !good.is_collocation) {
+ if (card_field && gg[card_field] > 0) {
+ if (good.goods_price != gg[card_field]) isok = 0;
+ } else {
+ if (good.goods_price != gg.shop_price) isok = 0;
+
+ }
+ if (!isok) {
+ wx.showModal({
+ title: '提示',
+ content: gg.goods_name + '商品的价格发生了变化'
+ });
+ return false;
+ }
+ }
//--如果是线下库存的时候--
if(th.data.conf.sales_rules==2){
diff --git a/utils/filter.wxs b/utils/filter.wxs
index b71c82d..aa3ba54 100644
--- a/utils/filter.wxs
+++ b/utils/filter.wxs
@@ -1,5 +1,6 @@
var filters = {
toFix:function(val,count){
+ val=parseFloat(val);
return val.toFixed(count)
},
replace_time:function(val){