diff --git a/components/diy_advertising/diy_advertising.wxml b/components/diy_advertising/diy_advertising.wxml
index e2139c6..52ab94d 100644
--- a/components/diy_advertising/diy_advertising.wxml
+++ b/components/diy_advertising/diy_advertising.wxml
@@ -129,11 +129,11 @@
-
+
-
+
200*200
@@ -169,7 +169,7 @@
-
+
200*200
@@ -206,7 +206,7 @@
-
+
diff --git a/components/diy_goodsGroup/diy_goodsGroup.js b/components/diy_goodsGroup/diy_goodsGroup.js
index e8b20a8..9d19b95 100644
--- a/components/diy_goodsGroup/diy_goodsGroup.js
+++ b/components/diy_goodsGroup/diy_goodsGroup.js
@@ -444,8 +444,10 @@ Component({
for (var i in goods) {
var val = goods[i];
var item = {};
- var prom_id = null;
-
+ var prom_id = null;
+
+ item.prom_type = 0;
+ item.prom_id = 0;
var url = "/api/weshop/activitylist/getGoodActInfo";
var req_data = {
store_id: os.stoid, goodsidlist: val.goods_id, is_detail: 1, user_id: user_id
@@ -479,7 +481,6 @@ Component({
prom_id = item.prom_id;
var prom_type = item.prom_type; //0普通商品 1秒杀 6拼单 2团购 4积分购
-
var url = "";
switch (prom_type) {
@@ -489,7 +490,7 @@ Component({
url = "/api/ms/flash_sale/getNew/" + os.stoid + "/" + user_id + "/" + prom_id;
break;
case 2:
- url = "/api/weshop/goods/groupBuy/getActInfo/" + os.stoid + "/" + val.goods_id + "/" + prom_id
+ url = "/api/weshop/goods/groupBuy/getNewActInfo/" + os.stoid + "/" + val.goods_id + "/" + prom_id+"/"+user_id;
break;
case 4:
url = "/api/weshop/integralbuy/get/" + os.stoid + "/" + prom_id;
@@ -541,6 +542,9 @@ Component({
th.data.requestData.push(item);
})
} else {
+ item.prom_type = 0;
+ item.prom_id = 0;
+ item.prom_price = null;
th.data.requestData.push(item);
}
}
diff --git a/components/diy_serviceCard/diy_serviceCard.js b/components/diy_serviceCard/diy_serviceCard.js
index 4049c6f..c243e24 100644
--- a/components/diy_serviceCard/diy_serviceCard.js
+++ b/components/diy_serviceCard/diy_serviceCard.js
@@ -508,6 +508,9 @@ Component({
case 1:
url+="&prom_type=1&prom_id="+arr[0].act_id;
break;
+ case 2:
+ url="/packageG/pages/group_buy/goodsInfo/goodsInfo?goods_id="+gid+"&prom_id="+arr2[0].act_id;
+ break;
case 6:
url = `/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo?goods_id=${gid}&prom_type=${arr2[0].prom_type}&prom_id=${arr[0].act_id}`;
break;
diff --git a/components/show_encourage/show_encourage.js b/components/show_encourage/show_encourage.js
new file mode 100644
index 0000000..1e70c70
--- /dev/null
+++ b/components/show_encourage/show_encourage.js
@@ -0,0 +1,73 @@
+// components/show_encourage/show_encourage.js
+var setting = getApp().globalData.setting
+
+Component({
+ /**
+ * 组件的属性列表
+ */
+ properties: {
+
+ },
+
+ /**
+ * 组件的初始数据
+ */
+ data: {
+ url: setting.imghost,
+ show:false,
+ itemobj:null,
+ },
+ pageLifetimes: {
+ show: function() {
+ // console.error('show');
+ // this.get_encourage()
+ // 页面被展示
+ },
+ hide: function() {
+ // 页面被隐藏
+ },
+ resize: function(size) {
+ // 页面尺寸变化
+ }
+ },
+ /**
+ * 组件的方法列表
+ */
+ methods: {
+ async get_encourage(){
+ let user_id = getApp().globalData.user_id;
+ let store_id= getApp().globalData.setting.stoid
+ console.error('获取大转盘');
+ if (!user_id) {
+ return
+ }
+ await getApp().request.promiseGet(`/api/weshop/marketing/marketingLuckForm/getPayTopLuckInfo/${store_id}/${user_id}`, {}).then(res => {
+ if (res.data.code==0 && res.data.data) {
+ let gd_category = res.data.data;
+ this.setData({
+ itemobj: gd_category,
+ show:true,
+ });
+ }
+ })
+ },
+ close_disgraceful(){
+ this.setData({
+ show:false
+ })
+ },
+ goto(){
+ let item = this.data.itemobj
+ let id = item.id;
+ let title = item.act_name;
+ if (!id) {
+ this.setData({
+ show:false
+ })
+ return
+ }
+ let url = `/packageB/pages/luckactivity/luckinfo/luckinfo?id=${id}&title=${title}`;
+ getApp().goto(url);
+ }
+ }
+})
diff --git a/components/show_encourage/show_encourage.json b/components/show_encourage/show_encourage.json
new file mode 100644
index 0000000..e8cfaaf
--- /dev/null
+++ b/components/show_encourage/show_encourage.json
@@ -0,0 +1,4 @@
+{
+ "component": true,
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/components/show_encourage/show_encourage.wxml b/components/show_encourage/show_encourage.wxml
new file mode 100644
index 0000000..a4f0897
--- /dev/null
+++ b/components/show_encourage/show_encourage.wxml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/components/show_encourage/show_encourage.wxss b/components/show_encourage/show_encourage.wxss
new file mode 100644
index 0000000..4a57bc6
--- /dev/null
+++ b/components/show_encourage/show_encourage.wxss
@@ -0,0 +1,20 @@
+/* components/show_encourage/show_encourage.wxss */
+
+.encourage{
+ position: fixed;
+ top: 0;
+ left: 0;
+ width: 100vw;
+ height: 100vh;
+ z-index: 99999;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ background-color: rgba(0, 0, 0, .3);
+}
+.close {
+ width: 60rpx;
+ height: 60rpx;
+
+}
\ No newline at end of file
diff --git a/packageA/pages/cardList/cardList.js b/packageA/pages/cardList/cardList.js
index 69e7c4d..1a3d5f7 100644
--- a/packageA/pages/cardList/cardList.js
+++ b/packageA/pages/cardList/cardList.js
@@ -57,6 +57,9 @@ Page({
let url = '/api/weshop/serviceCard/page';
let currentQuery = this.data.currentQuery;
if(app.globalData.userInfo) {
+
+ currentQuery.user_id=app.globalData.user_id || 0;
+
if(!this.data.isLogin) {
this.setData({
userInfo: app.globalData.userInfo,
@@ -223,7 +226,7 @@ Page({
var req_d = {
"store_id": app.globalData.setting.stoid,
"goods_id": gid,
- "user_id": getApp().globalData.user_id,
+ "user_id": getApp().globalData.user_id || 0,
"goods_type":1
}
var res= await getApp().request.promiseGet(rurl, {data: req_d});
diff --git a/packageA/pages/distribution/goods/goods.wxml b/packageA/pages/distribution/goods/goods.wxml
index 49b2c1a..97c5478 100644
--- a/packageA/pages/distribution/goods/goods.wxml
+++ b/packageA/pages/distribution/goods/goods.wxml
@@ -70,6 +70,7 @@
+
-
+
{{item.prom_integral}}积分
+
diff --git a/packageA/pages/distribution/shop/shop.js b/packageA/pages/distribution/shop/shop.js
index 02fecd0..6ac4d41 100644
--- a/packageA/pages/distribution/shop/shop.js
+++ b/packageA/pages/distribution/shop/shop.js
@@ -134,6 +134,7 @@ Page({
currentQuery: {
store_id: app.globalData.setting.stoid,
user_id: app.globalData.user_id,
+ isnewwhere:1
},
});
!this.data.is_router&&this.initData();
diff --git a/packageA/pages/distribution/shop/shop.wxml b/packageA/pages/distribution/shop/shop.wxml
index 1fa8aac..9ddfef6 100644
--- a/packageA/pages/distribution/shop/shop.wxml
+++ b/packageA/pages/distribution/shop/shop.wxml
@@ -235,7 +235,7 @@
{{item.goods_name}}
-
+
{{item.prom_integral}}
diff --git a/packageC/pages/group_list/group_list.js b/packageC/pages/group_list/group_list.js
index 2cb2e9b..185fadb 100644
--- a/packageC/pages/group_list/group_list.js
+++ b/packageC/pages/group_list/group_list.js
@@ -73,13 +73,16 @@ Page({
isLogin: true,
});
+ let user_id=getApp().globalData.user_id || 0;
+
let typeVal = this.data.type;
let url = '/api/weshop/goods/groupBuy/page';
let data = {
store_id: app.globalData.setting.stoid,
is_show: 1,
is_end: 0,
- timetype: typeVal
+ timetype: typeVal,
+ user_id:user_id
};
this.setData({
diff --git a/packageC/pages/group_list/group_list.wxml b/packageC/pages/group_list/group_list.wxml
index 8e5c92e..8925dc4 100644
--- a/packageC/pages/group_list/group_list.wxml
+++ b/packageC/pages/group_list/group_list.wxml
@@ -46,6 +46,6 @@
-—— 已经到底啦 ——
+—— 已经到底啦 ——
diff --git a/packageE/pages/togoin/togoin.js b/packageE/pages/togoin/togoin.js
index 35ef6ca..265671c 100644
--- a/packageE/pages/togoin/togoin.js
+++ b/packageE/pages/togoin/togoin.js
@@ -90,6 +90,8 @@ Page({
return app.my_warnning("登录需要授权手机号码！", 0, this);
return false;
}
+ if(this.data.sub) return false;
+ this.setData({ sub: 1 });
var sessionKey = getApp().globalData.sessionKey;
var openid = getApp().globalData.openid;
var r = getApp().globalData.getu;
@@ -389,13 +391,16 @@ Page({
} else {
+ th.setData({ sub: 0 });
return app.my_warnning("授权登入失败,请稍后再试!", 0, that);
}
},
failStatus: function (t) {
+ th.setData({ sub: 0 });
return app.my_warnning("授权登入失败,请稍后再试!", 0, that);
},
fail: function (t) {
+ th.setData({ sub: 0 });
return i.clearAuth(), i.alertLoginErrorAndGoHome(), !1;
}
});
diff --git a/packageE/pages/user/monthgiftbag/payment/payment.js b/packageE/pages/user/monthgiftbag/payment/payment.js
index 63341a7..b989ccb 100644
--- a/packageE/pages/user/monthgiftbag/payment/payment.js
+++ b/packageE/pages/user/monthgiftbag/payment/payment.js
@@ -21,8 +21,22 @@ Page({
});
var money = parseFloat(options.money).toFixed(2), order_sn = options.order_sn;
this.setData({allmoney:money,order_sn:order_sn})
+ // if (money*1 > 0) {
+ // var encourage = this.selectComponent("#encourage"); //组件的id
+ // if (encourage){
+ // encourage.get_encourage();
+ // }
+ // }
+ },
+ onReady(){
+ // console.error(6666);
+ if (this.data.allmoney*1 > 0) {
+ var encourage = this.selectComponent("#encourage"); //组件的id
+ if (encourage){
+ encourage.get_encourage();
+ }
+ }
},
-
goto: function () {
var url = '/pages/index/index/index';
getApp().goto(url)
diff --git a/packageE/pages/user/monthgiftbag/payment/payment.json b/packageE/pages/user/monthgiftbag/payment/payment.json
index 1111654..b8252b8 100644
--- a/packageE/pages/user/monthgiftbag/payment/payment.json
+++ b/packageE/pages/user/monthgiftbag/payment/payment.json
@@ -1,4 +1,6 @@
{
"navigationBarTitleText": "支付成功",
- "usingComponents": {}
+ "usingComponents": {
+ "show_encourage": "/components/show_encourage/show_encourage"
+ }
}
\ No newline at end of file
diff --git a/packageE/pages/user/monthgiftbag/payment/payment.wxml b/packageE/pages/user/monthgiftbag/payment/payment.wxml
index 6ef67f8..3cd7e02 100644
--- a/packageE/pages/user/monthgiftbag/payment/payment.wxml
+++ b/packageE/pages/user/monthgiftbag/payment/payment.wxml
@@ -53,4 +53,8 @@
-
\ No newline at end of file
+
+
+
+
+
\ No newline at end of file
diff --git a/packageG/pages/goods/search/search.js b/packageG/pages/goods/search/search.js
index b5778d4..34574cf 100644
--- a/packageG/pages/goods/search/search.js
+++ b/packageG/pages/goods/search/search.js
@@ -241,7 +241,7 @@ Page({
url = "/api/ms/flash_sale/getNew/" + oo.stoid + "/" + user_id + "/" + prom_id;
break;
case 2:
- url = "/api/weshop/goods/groupBuy/getActInfo/" + oo.stoid + "/" + item.goods_id + "/" + prom_id
+ url = "/api/weshop/goods/groupBuy/getNewActInfo/" + oo.stoid + "/" + item.goods_id + "/" + prom_id+"/"+user_id;
break;
case 4:
url = "/api/weshop/integralbuy/get/" + oo.stoid + "/" + prom_id;
@@ -298,24 +298,24 @@ Page({
var prom = null;
if (res.data.code == 0 && res.data.data) {
prom = res.data.data;
-
- if (prom != null && prom.is_end == 0 && prom.end_time > now && (prom.start_time < now || (prom_type!=2 && prom.show_time && prom.show_time < now))) {
- item.prom_price = res.data.data.price;
- if(prom_type==4){
- item.prom_price= res.data.data.addmoney;
- }
-
- if (res.data.data.user_price) item.prom_price = res.data.data.user_price;
- var vNum = prom.virtual_num ? prom.virtual_num : 0;
- var vNum1 = prom.virtualNum ? prom.virtualNum : 0;
- var vNum2 = prom.virtual ? prom.virtual : 0;
- item.sales_sum = prom.buy_num + (vNum + vNum1 + vNum2);
- } else {
- item.prom_type = 0;
- item.prom_id = 0;
- item.prom_price = null;
+ }
+ if (prom != null && prom.is_end == 0 && prom.end_time > now && (prom.start_time < now || (prom_type!=2 && prom.show_time && prom.show_time < now))) {
+ item.prom_price = res.data.data.price;
+ if(prom_type==4){
+ item.prom_price= res.data.data.addmoney;
}
+
+ if (res.data.data.user_price) item.prom_price = res.data.data.user_price;
+ var vNum = prom.virtual_num ? prom.virtual_num : 0;
+ var vNum1 = prom.virtualNum ? prom.virtualNum : 0;
+ var vNum2 = prom.virtual ? prom.virtual : 0;
+ item.sales_sum = prom.buy_num + (vNum + vNum1 + vNum2);
+ } else {
+ item.prom_type = 0;
+ item.prom_id = 0;
+ item.prom_price = null;
}
+
})
};
if (!th.data.requestData) th.data.requestData = [];
diff --git a/packageG/pages/group_buy/goodsInfo/goodsInfo.js b/packageG/pages/group_buy/goodsInfo/goodsInfo.js
index d44d951..97e2e11 100644
--- a/packageG/pages/group_buy/goodsInfo/goodsInfo.js
+++ b/packageG/pages/group_buy/goodsInfo/goodsInfo.js
@@ -871,60 +871,63 @@ Page({
var boughtNum = 0;
var is_ok = 1;
- // 获取redis当前可以购买的数量
- // 如果数量为0，设置和显示已抢光
- // 否则，进一步判断是否超出限购或超出库存
- await this.getactLen().then(async function (res) {
- redisNums = res;
- let curNum = th.data.goodsInputNum;
- // res: redis可购买数量
- console.log('当前可以购买的数量:', res);
- if (res <= 0) {
- // 可购买数量<=0, 设置和显示已抢光
- th.setData({
- prom_r_null: 1,
- });
- getApp().my_warnning('超出活动库存', 0, self);
- is_ok = 0;
- return false;
- } else {
-
- if(curNum>redisNums){
+ if(this.data.prom_type == 2) {
+
+ // 获取redis当前可以购买的数量
+ // 如果数量为0，设置和显示已抢光
+ // 否则，进一步判断是否超出限购或超出库存
+ await this.getactLen().then(async function (res) {
+ redisNums = res;
+ let curNum = th.data.goodsInputNum;
+ // res: redis可购买数量
+ console.log('当前可以购买的数量:', res);
+ if (res <= 0) {
+ // 可购买数量<=0, 设置和显示已抢光
+ th.setData({
+ prom_r_null: 1,
+ });
getApp().my_warnning('超出活动库存', 0, self);
is_ok = 0;
return false;
- }
- // 可购买数量>0
- // 计算自己还可以购买的数量
- // 自己还可购买的数量c = 每人活动限购数量a - 自己已经购买的数量b
- // 如果限购数量a>redis可购买数量d，当增加数量t>d, 提示超出库存
- // 如果限购数量a<=redis可购买数量d, 当增加数量t>a，提示超出限购
- let actInfo = th.data.sele_g;
- if(actInfo.buy_limit>0){
- await th.get_buy_num2().then(function (data) {
- let limited = actInfo.buy_limit; // 限购数量a
- let promcardbuynum = data.data.data.promcardbuynum;
- let canBuyNum = limited - promcardbuynum; // 自己还可购买的数量c
-
- limitNum = limited;
- boughtNum = promcardbuynum;
+ } else {
- if (canBuyNum <= 0) {
- canBuyNum = 0;
- }
+ if (curNum > redisNums) {
+ getApp().my_warnning('超出活动库存', 0, self);
+ is_ok = 0;
+ return false;
+ }
+ // 可购买数量>0
+ // 计算自己还可以购买的数量
+ // 自己还可购买的数量c = 每人活动限购数量a - 自己已经购买的数量b
+ // 如果限购数量a>redis可购买数量d，当增加数量t>d, 提示超出库存
+ // 如果限购数量a<=redis可购买数量d, 当增加数量t>a，提示超出限购
+ let actInfo = th.data.sele_g;
+ if (actInfo.buy_limit > 0) {
+ await th.get_buy_num2().then(function (data) {
+ let limited = actInfo.buy_limit; // 限购数量a
+ let promcardbuynum = data.data.data.promcardbuynum;
+ let canBuyNum = limited - promcardbuynum; // 自己还可购买的数量c
+
+ limitNum = limited;
+ boughtNum = promcardbuynum;
+
+ if (canBuyNum <= 0) {
+ canBuyNum = 0;
+ }
- if (curNum > canBuyNum) {
- getApp().my_warnning('超出限购数量', 0, self);
- th.setData({
- goodsInputNum: canBuyNum || 1,
- });
- is_ok = 0;
- return false;
- }
- })
+ if (curNum > canBuyNum) {
+ getApp().my_warnning('超出限购数量', 0, self);
+ th.setData({
+ goodsInputNum: canBuyNum || 1,
+ });
+ is_ok = 0;
+ return false;
+ }
+ })
+ }
}
- }
- })
+ })
+ }
if (!is_ok) return false;
@@ -2929,7 +2932,7 @@ Page({
prom_r_null: 1
});
//拿取价格并且判断时间--
- getApp().request.get("/api/weshop/goods/groupBuy/getActInfo/" + os.stoid + "/" + gid + "/" + prom_id, {
+ getApp().request.get("/api/weshop/goods/groupBuy/getNewActInfo/" + os.stoid + "/" + gid + "/" + prom_id+"/"+user_id, {
success: function (t) {
if (t.data.code != 0) {
ee.get_normal(gid);
diff --git a/packageG/pages/payment/pay_success/pay_success.js b/packageG/pages/payment/pay_success/pay_success.js
index 2dfcc15..db8eabb 100644
--- a/packageG/pages/payment/pay_success/pay_success.js
+++ b/packageG/pages/payment/pay_success/pay_success.js
@@ -133,9 +133,13 @@ Page({
};
-
},
-
+ onReady(){
+ var encourage = this.selectComponent("#encourage"); //组件的id
+ if (encourage){
+ encourage.get_encourage();
+ }
+ },
goto: function() {
var url= '/pages/index/index/index';
getApp().goto(url)
diff --git a/packageG/pages/payment/pay_success/pay_success.json b/packageG/pages/payment/pay_success/pay_success.json
index 3d262cb..b8252b8 100644
--- a/packageG/pages/payment/pay_success/pay_success.json
+++ b/packageG/pages/payment/pay_success/pay_success.json
@@ -1,3 +1,6 @@
{
- "navigationBarTitleText": "支付成功"
+ "navigationBarTitleText": "支付成功",
+ "usingComponents": {
+ "show_encourage": "/components/show_encourage/show_encourage"
+ }
}
\ No newline at end of file
diff --git a/packageG/pages/payment/pay_success/pay_success.wxml b/packageG/pages/payment/pay_success/pay_success.wxml
index 671c153..dca1c85 100644
--- a/packageG/pages/payment/pay_success/pay_success.wxml
+++ b/packageG/pages/payment/pay_success/pay_success.wxml
@@ -148,4 +148,8 @@
-
\ No newline at end of file
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/giftpack/payment/payment.js b/pages/giftpack/payment/payment.js
index 6356cee..908a6ed 100644
--- a/pages/giftpack/payment/payment.js
+++ b/pages/giftpack/payment/payment.js
@@ -21,6 +21,18 @@ Page({
});
var money = parseFloat(options.money), order_sn = options.order_sn;
this.setData({allmoney:money,order_sn:order_sn})
+
+
+
+ },
+ onReady(){
+ // console.error(6666);
+ if (this.data.allmoney*1 > 0) {
+ var encourage = this.selectComponent("#encourage"); //组件的id
+ if (encourage){
+ encourage.get_encourage();
+ }
+ }
},
goto: function () {
diff --git a/pages/giftpack/payment/payment.json b/pages/giftpack/payment/payment.json
index 1111654..b8252b8 100644
--- a/pages/giftpack/payment/payment.json
+++ b/pages/giftpack/payment/payment.json
@@ -1,4 +1,6 @@
{
"navigationBarTitleText": "支付成功",
- "usingComponents": {}
+ "usingComponents": {
+ "show_encourage": "/components/show_encourage/show_encourage"
+ }
}
\ No newline at end of file
diff --git a/pages/giftpack/payment/payment.wxml b/pages/giftpack/payment/payment.wxml
index 8a23c10..abf8841 100644
--- a/pages/giftpack/payment/payment.wxml
+++ b/pages/giftpack/payment/payment.wxml
@@ -54,4 +54,8 @@
-
\ No newline at end of file
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/goods/categoryList/categoryList.js b/pages/goods/categoryList/categoryList.js
index 844176f..204cc45 100644
--- a/pages/goods/categoryList/categoryList.js
+++ b/pages/goods/categoryList/categoryList.js
@@ -1068,10 +1068,11 @@ Page({
requestGoodsList: function (t) {
var that = this;
+ var user=getApp().globalData.user_id || 0;
that.data.requestUrl = t;
console.error(666666);
- e.get("/api/weshop/goods/page?1=1", {
- data: { page: that.data.stylePage, cat_id: that.data.cat_id, parent_id: 0, orderField: 'sort', orderType: 'asc', is_mainshow: 1, isonsale: 1, store_id: oo.stoid, is_recommend: 1 },
+ e.get("/api/weshop/goods/page?1=1&isnewwhere=1", {
+ data: { page: that.data.stylePage, cat_id: that.data.cat_id, parent_id: 0, orderField: 'sort', orderType: 'asc', is_mainshow: 1, isonsale: 1, store_id: oo.stoid, is_recommend: 1,user_id:user_id },
success: function (data) {
console.log(data.data.data.pageData)
that.setData({
@@ -1173,8 +1174,9 @@ Page({
console.log("cid:=" + cid)
console.log("cid:=" + this.data.cat_id);
var s = this
- e.get("/api/weshop/goods/page?1=1", {
- data: { page: page, cat_id: cid, parent_id: 0, orderField: 'sort', orderType: 'asc', is_mainshow: 1, isonsale: 1, store_id: oo.stoid, is_recommend: 1 },
+ var user_id=getApp().globalData.user_id || 0;
+ e.get("/api/weshop/goods/page?1=1&isnewwhere=1", {
+ data: { page: page, cat_id: cid, parent_id: 0, orderField: 'sort', orderType: 'asc', is_mainshow: 1, isonsale: 1, store_id: oo.stoid, is_recommend: 1,user_id:user_id },
success: function (e) {
console.log('上拉加载。。。。。。。。。');
console.log(e.data.data.pageData)
diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index 0678602..3b848e5 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -1048,79 +1048,64 @@ Page({
this.wait_for_store_config();
- //先检验一下商品的活动情况
- this.check_gd_prom_new(function () {
- //-- 8是预售 --
- if (ee.data.prom_type == 8) {
- getApp().goto("/packageC/pages/presell/goodsInfo/goodsInfo?goods_id=" + ee.data.gid + "&prom_id=" + ee.data.prom_id);
- return false;
- }
+ setTimeout(()=>{
+ //先检验一下商品的活动情况
+ this.check_gd_prom_new(function () {
- //-- 9是幸运购 --
- if (ee.data.prom_type == 9) {
- var lk_url = "/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id=" + ee.data.gid + "&group_id=" + ee.data.prom_id + "&prom_type=9";
- getApp().goto(lk_url);
- return false;
- }
+ //-- 8是预售 --
+ if (ee.data.prom_type == 8) {
+ getApp().goto("/packageC/pages/presell/goodsInfo/goodsInfo?goods_id=" + ee.data.gid + "&prom_id=" + ee.data.prom_id);
+ return false;
+ }
- i.get("/api/weshop/goods/get/" + o.stoid + "/" + ee.data.gid, {
- failRollback: !0,
- success: function (t) {
- console.log(t);
- // t.data.data.prom_type=0
- if (t.data.code == 0) {
- if (t.data.data && t.data.data.prom_type == 4) {
- if (ee.data.prom_type4 == 1) {
- t.data.data.prom_type = 0
+ //-- 9是幸运购 --
+ if (ee.data.prom_type == 9) {
+ var lk_url = "/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id=" + ee.data.gid + "&group_id=" + ee.data.prom_id + "&prom_type=9";
+ getApp().goto(lk_url);
+ return false;
+ }
+
+ i.get("/api/weshop/goods/get/" + o.stoid + "/" + ee.data.gid, {
+ failRollback: !0,
+ success: function (t) {
+ console.log(t);
+ // t.data.data.prom_type=0
+ if (t.data.code == 0) {
+ if (t.data.data && t.data.data.prom_type == 4) {
+ if (ee.data.prom_type4 == 1) {
+ t.data.data.prom_type = 0
+ }
}
- }
- var p_fail=0;
+ var p_fail=0;
- if (t.data.data.is_on_sale != 1 ) {
- p_fail=1;
- wx.showModal({
- title: '商品已经下架',
- showCancel: !1,
- complete: function () {
+ if (t.data.data.is_on_sale != 1 ) {
+ p_fail=1;
+ wx.showModal({
+ title: '商品已经下架',
+ showCancel: !1,
+ complete: function () {
let pages = getCurrentPages();
if (pages[pages.length - 2]) {
wx.navigateBack();
} else {
getApp().goto('/pages/index/index/index')
}
- }
- });
-
- }
+ }
+ });
- ee.init(gid);
+ }
- var timestamp = Date.parse(new Date());
- timestamp = timestamp / 1000;
- if (t.data.data.on_time > timestamp && !p_fail) {
- wx.showModal({
- title: '商品还未上架',
- showCancel: !1,
- complete: function () {
- let pages = getCurrentPages();
- if (pages[pages.length - 2]) {
- wx.navigateBack();
- } else {
- getApp().goto('/pages/index/index/index')
- }
- }
- });
- }
+ ee.init(gid);
- if (t.data.data.down_time > 0 && !p_fail) {
- if (t.data.data.down_time < timestamp ) {
+ var timestamp = Date.parse(new Date());
+ timestamp = timestamp / 1000;
+ if (t.data.data.on_time > timestamp && !p_fail) {
wx.showModal({
- title: '商品已经到期下架',
+ title: '商品还未上架',
showCancel: !1,
complete: function () {
-
let pages = getCurrentPages();
if (pages[pages.length - 2]) {
wx.navigateBack();
@@ -1130,198 +1115,217 @@ Page({
}
});
}
- }
+ if (t.data.data.down_time > 0 && !p_fail) {
+ if (t.data.data.down_time < timestamp ) {
+ wx.showModal({
+ title: '商品已经到期下架',
+ showCancel: !1,
+ complete: function () {
- //动态获取商品名称
- // wx.setNavigationBarTitle({
- // title: t.data.data.goods_name,
- // });
+ let pages = getCurrentPages();
+ if (pages[pages.length - 2]) {
+ wx.navigateBack();
+ } else {
+ getApp().goto('/pages/index/index/index')
+ }
+ }
+ });
+ }
+ }
- ee.setData({gtitle:t.data.data.goods_name})
+ //动态获取商品名称
+ // wx.setNavigationBarTitle({
+ // title: t.data.data.goods_name,
+ // });
- var p_type = parseInt(ee.data.prom_type ? ee.data.prom_type : 0);
+ ee.setData({gtitle:t.data.data.goods_name})
- //-- 判断是不是组合购活动,必须要登录后才能判断 --
- if (getApp().globalData.userInfo && t.data.data.prom_type == 7 && [1, 2, 4, 6, 8, 9].indexOf(p_type) == -1) {
- //获取活动信息
- var url = "/api/weshop/prom/zhbuy/get/" + os.stoid + "/" +
- t.data.data.prom_id + "/" + getApp().globalData.user_id;
- getApp().request.get(url, {
- success: function (e) {
- if (e.data.code == 0 && e.data.data) {
- if (ut.gettimestamp() < e.data.data.start_time) {
- return false;
- }
- if (e.data.data.is_end == 0 && ut.gettimestamp() < e.data.data.end_time) {
- //-- 获取商品列表 --
- th.setData({
- zh_act: e.data.data
- });
- th.getUserBuyPromNum(e.data.data.id)
- }
+ var p_type = parseInt(ee.data.prom_type ? ee.data.prom_type : 0);
+
+ //-- 判断是不是组合购活动,必须要登录后才能判断 --
+ if (getApp().globalData.userInfo && t.data.data.prom_type == 7 && [1, 2, 4, 6, 8, 9].indexOf(p_type) == -1) {
+ //获取活动信息
+ var url = "/api/weshop/prom/zhbuy/get/" + os.stoid + "/" +
+ t.data.data.prom_id + "/" + getApp().globalData.user_id;
+ getApp().request.get(url, {
+ success: function (e) {
+ if (e.data.code == 0 && e.data.data) {
+ if (ut.gettimestamp() < e.data.data.start_time) {
+ return false;
+ }
+ if (e.data.data.is_end == 0 && ut.gettimestamp() < e.data.data.end_time) {
+ //-- 获取商品列表 --
+ th.setData({
+ zh_act: e.data.data
+ });
+ th.getUserBuyPromNum(e.data.data.id)
+ }
+
+ }
}
- }
- });
- }
+ });
+ }
- //-- 把商品的赋值,同时给活动赋值 --
- ee.data.fir_goods = JSON.parse(JSON.stringify(t.data.data));
- // if (t.data.data.prom_type && t.data.data.prom_id && !ee.data.prom_type) {
- // ee.data.prom_type = t.data.data.prom_type;
- // ee.data.prom_id = t.data.data.prom_id;
- // }
+ //-- 把商品的赋值,同时给活动赋值 --
+ ee.data.fir_goods = JSON.parse(JSON.stringify(t.data.data));
+ // if (t.data.data.prom_type && t.data.data.prom_id && !ee.data.prom_type) {
+ // ee.data.prom_type = t.data.data.prom_type;
+ // ee.data.prom_id = t.data.data.prom_id;
+ // }
-
- t.data.data.on_time = ut.formatTime(t.data.data.on_time, 'yyyy-MM-dd hh:mm:ss');
- var cur_price = t.data.data.shop_price;
- if (getApp().globalData.userInfo && getApp().globalData.userInfo.card_field) {
- var cfile = getApp().globalData.userInfo.card_field;
- if (t.data.data[cfile]) {
- cur_price = t.data.data[cfile];
+ t.data.data.on_time = ut.formatTime(t.data.data.on_time, 'yyyy-MM-dd hh:mm:ss');
+
+ var cur_price = t.data.data.shop_price;
+ if (getApp().globalData.userInfo && getApp().globalData.userInfo.card_field) {
+ var cfile = getApp().globalData.userInfo.card_field;
+ if (t.data.data[cfile]) {
+ cur_price = t.data.data[cfile];
+ }
}
- }
- var txt = (cur_price / t.data.data.market_price * 10).toFixed(2).toString();
- txt = parseFloat(txt);
+ var txt = (cur_price / t.data.data.market_price * 10).toFixed(2).toString();
+ txt = parseFloat(txt);
- t.data.data['disc'] = txt;
+ t.data.data['disc'] = txt;
- if (t.data.data.original_img.indexOf(o.imghost) == -1)
- t.data.data.original_img = o.imghost + t.data.data.original_img;
+ if (t.data.data.original_img.indexOf(o.imghost) == -1)
+ t.data.data.original_img = o.imghost + t.data.data.original_img;
- /* -----商品详情---
- if (t.data.data.goods_content == null) t.data.data.goods_content = "";
- if (!t.data.data.goods_content) t.data.data.goods_content = " ";
- a.wxParse("content", "html", ut.format_content(t.data.data.goods_content), ee, 6);
- e.wxParseAddFullImageUrl(ee, "content");--*/
+ /* -----商品详情---
+ if (t.data.data.goods_content == null) t.data.data.goods_content = "";
+ if (!t.data.data.goods_content) t.data.data.goods_content = " ";
+ a.wxParse("content", "html", ut.format_content(t.data.data.goods_content), ee, 6);
+ e.wxParseAddFullImageUrl(ee, "content");--*/
- getApp().deal_iframe(a,e,'content',t.data.data.goods_content,ee);
+ getApp().deal_iframe(a,e,'content',t.data.data.goods_content,ee);
- //if (ee.data.prom_type) {
- t.data.data.prom_type = ee.data.prom_type;
- t.data.data.prom_id = ee.data.prom_id;
+ //if (ee.data.prom_type) {
+ t.data.data.prom_type = ee.data.prom_type;
+ t.data.data.prom_id = ee.data.prom_id;
- //只有是普通商品的时候，才要给商品赋值指定门店
- if ([1, 2, 4, 6, 8, 9].indexOf(parseInt(ee.data.prom_type))<0 && t.data.data.pick_up_lists && t.data.data.pick_up_lists.length) {
- t.data.data.pickup_ids = t.data.data.pick_up_lists;
- }
- //}
- ee.setData({
- data: t.data.data,
- sele_g: t.data.data,
- userInfo: getApp().globalData.userInfo,
- front_g: ut.deep_cp(t.data.data),
- });
+ //只有是普通商品的时候，才要给商品赋值指定门店
+ if ([1, 2, 4, 6, 8, 9].indexOf(parseInt(ee.data.prom_type))<0 && t.data.data.pick_up_lists && t.data.data.pick_up_lists.length) {
+ t.data.data.pickup_ids = t.data.data.pick_up_lists;
+ }
+ //}
+ ee.setData({
+ data: t.data.data,
+ sele_g: t.data.data,
+ userInfo: getApp().globalData.userInfo,
+ front_g: ut.deep_cp(t.data.data),
+ });
- //一件代发商品不去计算优惠
- //if (!ee.data.fir_goods.whsle_id && ee.data.prom_type != 1 && ee.data.prom_type != 4 && ee.data.prom_type != 6 && ee.data.prom_type != 2) {
- if (!ee.data.fir_goods.whsle_id && ee.data.prom_type != 1 && ee.data.prom_type != 4 && ee.data.prom_type != 6 && ee.data.prom_type != 2) {
+ //一件代发商品不去计算优惠
+ //if (!ee.data.fir_goods.whsle_id && ee.data.prom_type != 1 && ee.data.prom_type != 4 && ee.data.prom_type != 6 && ee.data.prom_type != 2) {
+ if (!ee.data.fir_goods.whsle_id && ee.data.prom_type != 1 && ee.data.prom_type != 4 && ee.data.prom_type != 6 && ee.data.prom_type != 2) {
ee.check_is_youhui(ee.data.gid);
- }
-
- //获取统一条形码,普通商品和优惠促销的商品
- if (ee.data.data.prom_type == 0 || ee.data.data.prom_type == 3 || ee.data.data.prom_type == 5 || ee.data.data.prom_type == 7 || ee.data.data.prom_type == 9 || ee.data.data.prom_type == 10) {
- ee.get_sto();
- ee.get_sku(o.stoid, t.data.data, gid);
- ee.check_has_flash();
-
- } else {
- var gg = "",
- item = t.data.data;
+ }
- if (item.goods_spec == "null" || item.goods_spec == null) item.goods_spec = "";
- if (item.goods_color == "null" || item.goods_color == null) item.goods_color = "";
+ //获取统一条形码,普通商品和优惠促销的商品
+ if (ee.data.data.prom_type == 0 || ee.data.data.prom_type == 3 || ee.data.data.prom_type == 5 || ee.data.data.prom_type == 7 || ee.data.data.prom_type == 9 || ee.data.data.prom_type == 10) {
+ ee.get_sto();
+ ee.get_sku(o.stoid, t.data.data, gid);
+ ee.check_has_flash();
- if (item.goods_spec != "" && item.goods_color != "") {
- gg = item.goods_spec + "/" + item.goods_color;
- } else if (item.goods_spec != "" || item.goods_color != "") {
- gg = item.goods_spec + item.goods_color;
} else {
- gg = "规格1";
+ var gg = "",
+ item = t.data.data;
+
+ if (item.goods_spec == "null" || item.goods_spec == null) item.goods_spec = "";
+ if (item.goods_color == "null" || item.goods_color == null) item.goods_color = "";
+
+ if (item.goods_spec != "" && item.goods_color != "") {
+ gg = item.goods_spec + "/" + item.goods_color;
+ } else if (item.goods_spec != "" || item.goods_color != "") {
+ gg = item.goods_spec + item.goods_color;
+ } else {
+ gg = "规格1";
+ }
+ t.data.data.gg = gg;
+ var uu = [];
+ uu.push(t.data.data);
+ ee.setData({
+ sku_g: uu,
+ });
}
- t.data.data.gg = gg;
- var uu = [];
- uu.push(t.data.data);
- ee.setData({
- sku_g: uu,
- });
- }
- ee.data.g_buy_num = new Map();
+ ee.data.g_buy_num = new Map();
- //再返回的时候，prom_id要以f_prom_act为准
- var c_prom_id=ee.data.data.prom_id;
- if(ee.data.f_prom_act) c_prom_id=ee.data.f_prom_act.id;
+ //再返回的时候，prom_id要以f_prom_act为准
+ var c_prom_id=ee.data.data.prom_id;
+ if(ee.data.f_prom_act) c_prom_id=ee.data.f_prom_act.id;
- //-- 增加相同的活动 --
- ee.check_prom(gid, ee.data.data.prom_type, c_prom_id);
+ //-- 增加相同的活动 --
+ ee.check_prom(gid, ee.data.data.prom_type, c_prom_id);
- var th = ee;
- if (ee.data.cat_name == '') {
- //过去国别，分类，品牌的名称
- i.get("/api/weshop/goodscategory/get/" + o.stoid + "/" + th.data.data.cat_id, {
- success: function (t) {
- var dd = t.data.data;
- if (t.data.code == 0) {
- th.setData({
- cat_name: dd.name
- });
+ var th = ee;
+ if (ee.data.cat_name == '') {
+ //过去国别，分类，品牌的名称
+ i.get("/api/weshop/goodscategory/get/" + o.stoid + "/" + th.data.data.cat_id, {
+ success: function (t) {
+ var dd = t.data.data;
+ if (t.data.code == 0) {
+ th.setData({
+ cat_name: dd.name
+ });
+ }
}
- }
- });
- //过去国别，分类，品牌的名称
- i.get("/api/weshop/brand/get/" + o.stoid + "/" + th.data.data.brand_id, {
- success: function (t) {
- var dd = t.data.data;
- if (t.data.code == 0) {
- th.setData({
- brand_name: dd.name
- });
+ });
+ //过去国别，分类，品牌的名称
+ i.get("/api/weshop/brand/get/" + o.stoid + "/" + th.data.data.brand_id, {
+ success: function (t) {
+ var dd = t.data.data;
+ if (t.data.code == 0) {
+ th.setData({
+ brand_name: dd.name
+ });
+ }
}
- }
- });
- //过去国别，分类，品牌的名称
- i.get("/api/weshop/nation/get/" + o.stoid + "/" + th.data.data.nation_id, {
- success: function (t) {
- var dd = t.data.data;
- if (t.data.code == 0) {
- th.setData({
- nation_name: dd.name
- });
+ });
+ //过去国别，分类，品牌的名称
+ i.get("/api/weshop/nation/get/" + o.stoid + "/" + th.data.data.nation_id, {
+ success: function (t) {
+ var dd = t.data.data;
+ if (t.data.code == 0) {
+ th.setData({
+ nation_name: dd.name
+ });
+ }
}
+ });
+ }
+
+ } else {
+ wx.showModal({
+ title: t.data.msg,
+ showCancel: !1,
+ complete: function () {
+ wx.navigateBack();
}
});
}
- } else {
- wx.showModal({
- title: t.data.msg,
- showCancel: !1,
- complete: function () {
- wx.navigateBack();
- }
- });
- }
-
- console.log('bbbbbbbbbbbbbb');
- console.log(th.data.prom_type);
+ console.log('bbbbbbbbbbbbbb');
+ console.log(th.data.prom_type);
- setTimeout(() => {
- console.log('cccc');
- console.log(th.data.prom_type);
+ setTimeout(() => {
+ console.log('cccc');
+ console.log(th.data.prom_type);
+ console.log(th.data.sele_g);
- }, 500)
+ }, 1500)
- }
- });
- })
+ }
+ });
+ })
+ },1500)
console.log('aaaaaaaaaa');
console.log(this.data.prom_type);
@@ -3295,9 +3299,15 @@ Page({
var goodsinfo = arrdata[i],
prom = null;
+
+
if (goodsinfo.goods_id != g_id) {
+ goodsinfo.prom_type=0;
+ goodsinfo.prom_id=0;
+
+
//要判断一下商品的活动是不是多活动，确定一下商品的prom_type
var url = '/api/weshop/activitylist/listGoodActInfo2New';
var req_d = {
@@ -3355,6 +3365,9 @@ Page({
}else{
+ goodsinfo.prom_type=tt.data.prom_type;
+ goodsinfo.prom_id=tt.data.prom_id;
+
//只有是普通商品的时候，才要给商品赋值指定门店
if ([1, 2, 4, 6, 8, 9].indexOf(parseInt(this.data.prom_type)) <0 || is_normal) {
//如果商品有设置分组
@@ -4761,7 +4774,7 @@ Page({
prom_r_null: 1
});
//拿取价格并且判断时间--
- getApp().request.get("/api/weshop/goods/groupBuy/getActInfo/" + os.stoid + "/" + gid + "/" + prom_id, {
+ getApp().request.get("/api/weshop/goods/groupBuy/getNewActInfo/" + os.stoid + "/" + gid + "/" + prom_id+"/"+user_id, {
success: function (t) {
if (t.data.code != 0) {
ee.get_normal(gid);
@@ -5451,7 +5464,7 @@ Page({
user_id: user_id,
goods_id: gd.goods_id,
prom_type: gd.prom_type,
- prom_id: gd.prom_id, isnew:1
+ prom_id: gd.prom_id, isnew:1,
},
//-----获取-----
success: function (tt) {
@@ -8324,8 +8337,9 @@ Page({
user_id: user_id,
goods_id: gid,
prom_type: 3,
- prom_id: fir_act.prom_id, isnew:1
+ prom_id: fir_act.prom_id, isnew:1,
};
+
var gd_limit_rs=await getApp().promiseGet('/api/weshop/ordergoods/getUserBuyGoodsNum',{data:lrs});
var pro_by_num=0;
if(gd_limit_rs && gd_limit_rs.data.code==0){
@@ -9015,12 +9029,26 @@ Page({
con_weixin: function () {
getApp().con_wx(this);
},
+ customer_chat: function () {
+ var goods_id=this.data.front_g.goods_id;
+ getApp().customer_chat(goods_id);
+ },
get_normal(gid) {
- this.setData({
- prom_type: 0,
- isshow: 1,
- });
+
+ var set_ob={};
+ if (this.data.data.pick_up_lists && this.data.data.pick_up_lists.length) {
+ set_ob={
+ ['data.pickup_ids']:this.data.data.pick_up_lists,
+ ['sele_g.pickup_ids']:this.data.data.pick_up_lists,
+ ['front_g.pickup_ids']:this.data.data.pick_up_lists,
+ }
+ }
+ set_ob.prom_type= 0;
+ set_ob.isshow=1;
+ this.setData(set_ob);
+
+
this.get_sku(os.stoid, this.data.data, gid);
this.get_sto();
if (!this.data.data.whsle_id)
@@ -9073,6 +9101,9 @@ Page({
})
},
+
+
+
//-- 检验商品的活动情况 --
check_gd_prom_new: async function (func) {
@@ -9266,6 +9297,7 @@ Page({
// 0关闭（如果有设置热线电话，则显示拨打热线电话）、
// 1小程序客服、
// 2企业微信客服
+ // 3商城聊天系统
if (this.data.sys_switch) {
let csType = this.data.sys_switch.weapp_customertype;
if (csType == 0) {
diff --git a/pages/goods/goodsList/goodsList.js b/pages/goods/goodsList/goodsList.js
index a65e9c4..1d139b6 100644
--- a/pages/goods/goodsList/goodsList.js
+++ b/pages/goods/goodsList/goodsList.js
@@ -420,14 +420,15 @@ Page({
var prom_id=item.prom_id;
var now=ut.gettimestamp();
var url = "";
+ var user_id=getApp().globalData.user_id;
+ if(!user_id) user_id=0;
+
switch (prom_type){
case 1:
- var user_id=getApp().globalData.user_id;
- if(!user_id) user_id=0;
url = "/api/ms/flash_sale/getNew/" +oo.stoid + "/" +user_id+"/"+ prom_id;
break;
case 2:
- url ="/api/weshop/goods/groupBuy/getActInfo/" +oo.stoid + "/" +item.goods_id+"/"+ prom_id
+ url ="/api/weshop/goods/groupBuy/getNewActInfo/" +oo.stoid + "/" +item.goods_id+"/"+ prom_id+"/"+user_id;
break;
case 4:
url ="/api/weshop/integralbuy/get/"+oo.stoid +"/"+prom_id;
diff --git a/pages/template/index.json b/pages/template/index.json
index 531a4b1..33c2a73 100644
--- a/pages/template/index.json
+++ b/pages/template/index.json
@@ -27,7 +27,8 @@
"floatingWindow": "/components/diy_floatingWindow/diy_floatingWindow",
"floatingBox": "/components/diy_floatingBox/diy_floatingBox",
"div_tab_bar": "/custom-tab-bar/index",
- "presell": "/components/diy_pregoods/diy_pregoods"
+ "presell": "/components/diy_pregoods/diy_pregoods",
+ "serviceCard": "/components/diy_serviceCard/diy_serviceCard"
},
"enablePullDownRefresh": false,
"onReachBottomDistance":300,
diff --git a/pages/template/index.wxml b/pages/template/index.wxml
index 1dc39a4..a054ced 100644
--- a/pages/template/index.wxml
+++ b/pages/template/index.wxml
@@ -177,6 +177,12 @@
+
+
+
+
+
+