diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/buy_pt.wxml b/packageC/pages/luckyGo/luckyGo_goodsInfo/buy_pt.wxml
index 44fbea1..80bc77c 100644
--- a/packageC/pages/luckyGo/luckyGo_goodsInfo/buy_pt.wxml
+++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/buy_pt.wxml
@@ -18,7 +18,7 @@
￥ {{sele_g.shop_price}}
- ￥ {{prom_price}}
+ ￥ {{prom_price || filters.div100(luckGoInfo.group_price)}}
@@ -31,13 +31,13 @@
可售：{{sele_g.store_count}}
-
+
@@ -102,14 +102,23 @@
+
+
+ 购买数量
+
+ -
+
+ +
+
+
-
+
购买数量
-
-
- +
+
+ +
diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
index 2da896e..b96ae3e 100644
--- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
+++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
@@ -435,34 +435,34 @@ Page({
var swithc_list = e.switch_list;
var sw_arr = JSON.parse(swithc_list);
//---如果后台又开等级卡的开关---
- // if (sw_arr.rank_switch && sw_arr.rank_switch == "2") {
- // th.setData({ rank_switch: true });
- // //---回调卡的列表---
- // th.getPlusCardType(function (ob) {
- // th.setData({ card_list: ob.card_list });
- // var ti = setInterval(function () {
- // var user = getApp().globalData.userInfo;
- // if (!user) return false;
- // clearInterval(ti);
-
- // if (user.card_field && user['card_expiredate']) {
- // var str = user['card_expiredate'].replace(/-/g, '/');
- // var end = new Date(str);
- // end = Date.parse(end) / 1000;
- // var now = ut.gettimestamp();
- // //--- 判断是等级会员，且在有效期范围内 ---
- // if (user.card_field && now < end) {
- // var card_name = ob.name_map.get(user.card_field);
- // //if(card_name.length>6) card_name=card_name.substring(0,6);
-
- // var is_near_date = 0;
- // if (end - now < 60 * 60 * 30 * 24) is_near_date = 1; //如果小于30天
- // th.setData({ card_field: user.card_field, card_name: card_name, card_list: ob.card_list, is_near_date: is_near_date });
- // }
- // }
- // }, 500)
- // })
- // }
+ if (sw_arr.rank_switch && sw_arr.rank_switch == "2") {
+ th.setData({ rank_switch: true });
+ //---回调卡的列表---
+ th.getPlusCardType(function (ob) {
+ th.setData({ card_list: ob.card_list });
+ var ti = setInterval(function () {
+ var user = getApp().globalData.userInfo;
+ if (!user) return false;
+ clearInterval(ti);
+
+ if (user.card_field && user['card_expiredate']) {
+ var str = user['card_expiredate'].replace(/-/g, '/');
+ var end = new Date(str);
+ end = Date.parse(end) / 1000;
+ var now = ut.gettimestamp();
+ //--- 判断是等级会员，且在有效期范围内 ---
+ if (user.card_field && now < end) {
+ var card_name = ob.name_map.get(user.card_field);
+ //if(card_name.length>6) card_name=card_name.substring(0,6);
+
+ var is_near_date = 0;
+ if (end - now < 60 * 60 * 30 * 24) is_near_date = 1; //如果小于30天
+ th.setData({ card_field: user.card_field, card_name: card_name, card_list: ob.card_list, is_near_date: is_near_date });
+ }
+ }
+ }, 500)
+ })
+ }
}, 1);
@@ -877,6 +877,7 @@ Page({
e.wxParseAddFullImageUrl(ee, "content");
if(ee.data.prom_type){
+ //999
t.data.data.prom_type=ee.data.prom_type;
t.data.data.prom_id=ee.data.prom_id;
}
@@ -891,17 +892,17 @@ Page({
//获取统一条形码,普通商品和优惠促销的商品
if (ee.data.data.prom_type == 0 || ee.data.data.prom_type == 2 || ee.data.data.prom_type == 3 || ee.data.data.prom_type == 5 || ee.data.data.prom_type == 7) {
//默认门店要拿下门店库存
- if (that.data.sales_rules == 2 && that.data.is_newsales_rules) {
- //获取门店
- ee.get_sto();
+ // if (that.data.sales_rules == 2 && that.data.is_newsales_rules) {
+ // //获取门店
+ // ee.get_sto(1);
- } else {
- //获取门店
- ee.get_sto();
- }
+ // } else {
+ // //获取门店
+ // ee.get_sto();
+ // }
- ee.get_sku(o.stoid, t.data.data, gid);
- ee.check_has_flash();
+ // ee.get_sku(o.stoid, t.data.data, gid);
+ // ee.check_has_flash();
}
else {
@@ -1018,7 +1019,7 @@ Page({
}
}).then(res => {
if (res.data.code == 0) {
- console.log('成团信息=======》', res.data.data);
+ // console.log('成团信息=======》', res.data.data);
th.setData({
luckGoInfo: res.data.data.pageData[0],
team_id: res.data.data.pageData[0].team_id,
@@ -1039,7 +1040,7 @@ Page({
}
}).then(res => {
if (res.data.code == 0) {
- console.log(th.data.team_id,'参团成员===============》', res.data.data.pageData);
+ // console.log(th.data.team_id,'参团成员===============》', res.data.data.pageData);
th.setData({
luckGoMembers: res.data.data.pageData,
});
@@ -1057,19 +1058,22 @@ Page({
},
+ // 暂时无用
+ // enterAddress: function () {
+ // this.data.enterAddressPage = !0, wx.navigateTo({
+ // url: "/pages/user/address_list/address_list?operate=selectAddress"
+ // });
+ // },
- enterAddress: function () {
- this.data.enterAddressPage = !0, wx.navigateTo({
- url: "/pages/user/address_list/address_list?operate=selectAddress"
- });
- },
+ // 页面卸载
onUnload: function () {
for (var i = 1; i < 100; i++) {
clearInterval(i);
}
},
+ // 页面隐藏
onHide: function () {
this.data.is_timer = 0;
for (var i = 1; i < 100; i++) {
@@ -1077,7 +1081,7 @@ Page({
}
},
- //----------三个选项按钮-----------
+ // 点击顶部选项卡
tabClick: function (t) {
var e = t.currentTarget.id;
this.setData({
@@ -1092,6 +1096,8 @@ Page({
// });
// },
+
+ // 点击评价选项卡下的各评价按钮
tabClick3: function (t) {
var e = this;
if (t.currentTarget.id != this.data.activeCategoryId3) {
@@ -1104,6 +1110,7 @@ Page({
}
},
+ // 滚动到顶部
doScrollTop: function () {
wx.pageScrollTo({
scrollTop: 0
@@ -1116,7 +1123,8 @@ Page({
}), this.data.comments || this.requestComments_new();
},
- //商品详情的时候调用
+
+ //商品详情里表格信息：类别、品牌、国别
tabGoodsContent: function () {
var th = this,
i = getApp().request;
@@ -3761,64 +3769,73 @@ Page({
openSpecModal_pt: 1
});
});
+
+ th.setData({
+ is_normal: ind,
+ openSpecModal_pt: 1
+ });
};
th.check_is_youhui(th.data.gid, 1);
- }
-
- else {
-
- //拼单商品从这里进，先判断有没有买过商品，
- getApp().request.get("/api/weshop/order/page", {
- data: {
- pt_prom_id: th.data.prom_act.id,
- user_id: oo.user_id,
- store_id: os.stoid,
- pageSize: 1,
- page: 1
- },
- success: function (e) {
- //--跳转到已经购买的情况--
- if (e.data.data.pageData.length > 0) {
- var odr = e.data.data.pageData[0];
- //还未支付
- if (odr.pt_status == 0 && (odr.order_status == 1 || odr.order_status == 0)) {
- wx.showModal({
- title: "您已经购买了该商品待支付中",
- success: function (a) {
- if (a.confirm) {
- wx.navigateTo({
- url: "/pages/user/order_detail/order_detail?order_id=" + odr.order_id,
- });
- }
- }
- });
- } else if (odr.pt_status == 1 && odr.order_status == 1) {
-
- if (this.data.is_go_to_team_show) return false;
- this.data.is_go_to_team_show = 1;
- wx.showLoading();
-
- /*---
- wx.redirectTo({
- url: "/pages/team/team_success/team_success?ordersn=" + odr.order_sn,
- });--*/
- getApp().goto("/pages/team/team_success/team_success?ordersn=" + odr.order_sn);
+ } else {
- } else {
- th.setData({
- is_normal: ind,
- openSpecModal_pt: 1
- });
- }
+ // //拼单商品从这里进，先判断有没有买过商品，
+ // getApp().request.get("/api/weshop/order/page", {
+ // data: {
+ // // pt_prom_id: th.data.prom_act.id,
+ // user_id: oo.user_id,
+ // store_id: os.stoid,
+ // pageSize: 1,
+ // page: 1
+ // },
+ // success: function (e) {
+ // //--跳转到已经购买的情况--
+ // if (e.data.data.pageData.length > 0) {
+ // var odr = e.data.data.pageData[0];
+ // //还未支付
+ // if (odr.pt_status == 0 && (odr.order_status == 1 || odr.order_status == 0)) {
+ // wx.showModal({
+ // title: "您已经购买了该商品待支付中",
+ // success: function (a) {
+ // if (a.confirm) {
+ // wx.navigateTo({
+ // url: "/pages/user/order_detail/order_detail?order_id=" + odr.order_id,
+ // });
+ // }
+ // }
+ // });
+ // } else if (odr.pt_status == 1 && odr.order_status == 1) {
+
+ // if (this.data.is_go_to_team_show) return false;
+ // this.data.is_go_to_team_show = 1;
+ // wx.showLoading();
+
+ // /*---
+ // wx.redirectTo({
+ // url: "/pages/team/team_success/team_success?ordersn=" + odr.order_sn,
+ // });--*/
+ // getApp().goto("/pages/team/team_success/team_success?ordersn=" + odr.order_sn);
+
+ // } else {
+ // th.setData({
+ // is_normal: ind,
+ // openSpecModal_pt: 1
+ // });
+ // }
- } else {
- th.setData({
- is_normal: ind,
- openSpecModal_pt: 1
- });
- }
- }
- });
+ // } else {
+ // th.setData({
+ // is_normal: ind,
+ // openSpecModal_pt: 1
+ // });
+ // }
+ // }
+ // });
+ th.get_sto(1);
+ th.setData({
+ is_normal: 0,
+ openSpecModal_pt: 1
+ });
+
}
},
diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
index fb6ea24..db350a4 100644
--- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
+++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
@@ -889,7 +889,7 @@
- 立即参团2
+ 立即参团2