diff --git a/app.json b/app.json
index ab2d141..df3ae1a 100644
--- a/app.json
+++ b/app.json
@@ -230,7 +230,8 @@
"name": "pack6",
"pages": [
"pages/wuliu/wuliu",
- "pages/free_delivery/free_delivery"
+ "pages/free_delivery/free_delivery",
+ "pages/xcxServiceChat/xcxServiceChat"
]
}
diff --git a/components/diy_public/diy_public.js b/components/diy_public/diy_public.js
index 343b329..2eadc60 100644
--- a/components/diy_public/diy_public.js
+++ b/components/diy_public/diy_public.js
@@ -1,7 +1,7 @@
// var e = function(e) {
// return e && e.__esModule ? e : {
// default: e
-// };
+// };
// }(require("../../utils/LoadMore3.js")),
// n = new e.default(),
var t = getApp(),
@@ -48,7 +48,8 @@ Component({
imgobj:{
'1':"/miniapp/images/component/seckill.png",
'2':"/miniapp/images/component/pingd/pingd.png",
- '6':"/miniapp/images/component/pingd/pingd.png"
+ '6':"/miniapp/images/component/pingd/pingd.png",
+ '8':"/miniapp/images/component/presale.png",
},
nav1:'/packageA/pages/goodsInfo/goodsInfo?',
nav2:'/pages/goods/goodsInfo/goodsInfo?',
@@ -99,6 +100,13 @@ Component({
nav2:'/pages/goods/goodsInfo/goodsInfo?'
})
}
+ if (this.data.prom_type==8) { //预售
+ this.setData({
+ prom_text:'已售',
+ nav1:'/packageC/pages/presell/goodsInfo/goodsInfo?',
+ nav2:'/packageC/pages/presell/goodsInfo/goodsInfo?'
+ })
+ }
var g_id = this.data.object;
this.init(g_id);
@@ -153,12 +161,21 @@ Component({
+os.stoid+"&aidlist="+goodsidlist + "&user_id="+user_id;
}
+ if (th.data.prom_type==8) { //预售
+ gUrl="/api/weshop/marketing/marketingPresellList/page?store_id="
+ +os.stoid+"&goodsidlist="+goodsidlist + "&user_id="+user_id+'&is_end=0&timetype=3&isuse=1';
+ }
- app.request.promiseGet(gUrl, {}).then(res => {
+ app.request.promiseGet(gUrl, {}).then(res => {
+
//如果秒杀的数组为空的时候
var goodslist = res.data.data;
+ if (th.data.prom_type==8) { //预售
+ goodslist = res.data.data ? res.data.data.pageData : []
+ }
+
//就算是添加的活动已经过期，就要用最新的进行中活动
if (goodslist && goodslist.length > 0) {
th.set_goods_list(g_id.data, goodslist);
@@ -197,6 +214,18 @@ Component({
timetype: 2,
}
}
+ if (this.data.prom_type==8) { //预售
+ gUrl="/api/weshop/marketing/marketingPresellList/page?page=1&pageSize=9"
+ req={
+ store_id:os.stoid,
+ is_end:0,
+ timetype:3,
+ isuse:1,
+ page:1,
+ user_id:user_id,
+ pageSize:9
+ }
+ }
getApp().request.promiseGet(gUrl,
{ isShowLoading: 1, data:req }
@@ -211,6 +240,7 @@ Component({
//就算是添加的活动已经过期，就要用最新的活动
set_goods_list(g_id, goodslist) {
+
let prom_type=this.data.prom_type
goodslist.forEach(function (vy, indy) {
if(!vy.id) vy.id=vy.prom_id;
@@ -240,29 +270,30 @@ Component({
let item=all_array[i];
if(item.user_price) item.price=item.user_price;
if(item.start_time > newTime) {
- item.status = 0;
+ item.status = 0; //活动没开始
} else if(item.end_time > newTime) {
- item.status = 1;
+ item.status = 1; // 活动进行中
};
}
- var promisies = [];
- for (const key in all_array) {
- if (Object.hasOwnProperty.call(all_array, key)) {
- const val = all_array[key];
-
- promisies[key] = getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" +
- os.stoid + "/"+prom_type+"/" + val.id,
- {}
- ).then(res => {
- if (res.data.code == 0) {
- if (res.data.data <= 0) all_array[key].status = 2;
- };
- });
- }
- }
+ var promisies = [];
+ if (th.data.prom_type !=8) {
+ for (const key in all_array) {
+ if (Object.hasOwnProperty.call(all_array, key)) {
+ const val = all_array[key];
+ promisies[key] = getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" +
+ os.stoid + "/"+prom_type+"/" + val.id,
+ {}
+ ).then(res => {
+ if (res.data.code == 0) {
+ if (res.data.data <= 0) all_array[key].status = 2;//已售完
+ };
+ });
+ }
+ }
+ }
Promise.all(promisies).then(() => {
@@ -271,10 +302,24 @@ Component({
for(let i in all_array){
let item=all_array[i];
if(newTime > item.end_time) {
- all_array[i].status = 3;
+ all_array[i].status = 3; //活动结束
};
// let price=all_array[i].price.toFixed(2)
let price=all_array[i].price + ''
+ if (th.data.prom_type==8) { //预售
+ price = all_array[i].presell_price + ''
+ if (all_array[i].status ===0) {
+ all_array[i].goods_num=all_array[i].presell_sumqty*1 + all_array[i].virtual_qty*1
+ all_array[i].buy_num=all_array[i].buy_goodnum
+ }else{
+ all_array[i].goods_num=all_array[i].presell_sumqty*1 + all_array[i].virtual_qty*1
+ all_array[i].buy_num=all_array[i].buy_goodnum + all_array[i].virtual_qty*1
+ }
+
+
+ }
+
+
if (price && price.indexOf('.') > -1) {
let priceArr = price.split(".")
all_array[i].price_n = priceArr[0]
@@ -416,6 +461,9 @@ Component({
if (this.data.prom_type==2) { //团购
url="/packageC/pages/group_list/group_list";
}
+ if (this.data.prom_type==8) { //预售
+ url="/packageC/pages/presell/list/list";
+ }
wx.navigateTo({
url
diff --git a/components/diy_public/diy_public.wxml b/components/diy_public/diy_public.wxml
index aa9b237..bbadfc0 100644
--- a/components/diy_public/diy_public.wxml
+++ b/components/diy_public/diy_public.wxml
@@ -16,7 +16,7 @@
-
+
@@ -43,7 +43,7 @@
- {{aitem.goods_name}}
+ {{aitem.group_num}}人团{{aitem.goods_name}}
{{aitem.ct_num}}人团
{{kttypeArr[aitem.kttype]}}团
@@ -57,7 +57,7 @@
￥{{aitem.price_n}}.{{aitem.price_xs}}
- ￥{{aitem.shop_price || aitem.market_price}}
+ ￥{{aitem.market_price || aitem.shop_price }}
@@ -76,7 +76,7 @@
-
+
@@ -97,7 +97,7 @@
- {{aitem.goods_name}}
+ {{aitem.group_num}}人团{{aitem.goods_name}}
{{aitem.ct_num}}人团
{{kttypeArr[aitem.kttype]}}团
@@ -112,7 +112,7 @@
￥{{aitem.price_n}}.{{aitem.price_xs}}
- ￥{{aitem.shop_price || aitem.market_price}}
+ ￥{{aitem.market_price || aitem.shop_price }}
@@ -130,7 +130,7 @@
-
+
@@ -151,7 +151,7 @@
- {{aitem.goods_name}}
+ {{aitem.group_num}}人团{{aitem.goods_name}}
{{prom_text}}{{aitem.buy_num}}件
剩{{aitem.residue}}件
@@ -160,7 +160,7 @@
￥{{aitem.price_n}}.{{aitem.price_xs}}
- ￥{{aitem.shop_price || aitem.market_price}}
+ ￥{{aitem.market_price || aitem.shop_price }}
@@ -178,7 +178,7 @@
-
+
@@ -198,7 +198,7 @@
- {{aitem.goods_name}}
+ {{aitem.group_num}}人团{{aitem.goods_name}}
- 配送不匹配
+ 该店不可售
@@ -182,14 +183,16 @@
-
- 配送不匹配
-
-
+ 该店不可售
+
+
+ 该店不可售
+
+
确定
diff --git a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js
index d4856aa..0ebda43 100644
--- a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js
+++ b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js
@@ -354,17 +354,17 @@ Page({
if(getApp().globalData.is_dj_pk) th.setData({has_def:1})
var ee = JSON.parse(JSON.stringify(e));
//--定时器推迟一下--
- setTimeout(function () {
- if (!th.data.data) return false;
- var ser_card = th.data.data;
- //--如果默认门店不在等级卡的默认们店以内
- if (ser_card.storageId != null && ser_card.storageId != "" && ser_card.storageId.indexOf(ee.keyid) == -1) {
- ee.is_no_dis = 1;
- }
var appd = getApp().globalData;
var w_time = setInterval(function () {
if (that.data.is_get_local_ok == 0) return false;
+ if (!th.data.data) return false;
+ var ser_card = th.data.data;
+ //--如果默认门店不在等级卡的默认们店以内
+ if (ser_card.storageId != null && ser_card.storageId != "" && ser_card.storageId.indexOf(ee.keyid) == -1) {
+ ee.is_no_dis = 1;
+ }
+
clearInterval(w_time);
var distance = null;
var e = JSON.parse(JSON.stringify(ee));
@@ -429,7 +429,7 @@ Page({
}
}
}, 500)
- }, 700)
+
});
@@ -992,9 +992,6 @@ Page({
}
-
-
-
},
@@ -1003,6 +1000,7 @@ Page({
openSpecModal: !1,
openSpecModal_pt: !1,
openSpecModal_flash_normal: !1,
+ is_normal:0
});
},
@@ -1216,9 +1214,23 @@ Page({
//---------拿出门店分类和门店------------
get_sto(e) {
+ var is_normal=e;
var th = this, that = this;
+
+ if (e == 1) {
+ th.setData({
+ is_normal: 1
+ })
+ } else {
+ th.setData({
+ is_normal: 0
+ })
+ }
+
var timer_get = setInterval(function () {
if (th.data.is_get_local_ok == 0) return false;
+ if (!th.data.fir_def_store) return false;
+
var i = getApp().request;
if (!th.data.data) return false;
var dd = {
@@ -1240,7 +1252,8 @@ Page({
}
wx.showLoading({
- title: '加载中.'
+ title: '加载中.',
+ mask:true
});
//----------获取门店----------------
getApp().request.promiseGet("/api/weshop/pickup/list", {
@@ -1249,16 +1262,6 @@ Page({
var e = res;
if (e.data.code == 0 && e.data.data && e.data.data.pageData && e.data.data.pageData.length > 0) {
- var his_cate_num = 0;
- for (let i in e.data.data.pageData) {
- let item = e.data.data.pageData[i];
- if (item.category_id > 0) {
- his_cate_num = 1;
- break;
- }
- }
- e.his_cate_num = his_cate_num;
-
//--普通门店排版,服务卡项有指定门店才能使用，所以要筛选一下--
setTimeout(function () {
var sto_list = th.data.data.storageId;
@@ -1272,31 +1275,80 @@ Page({
}
}
- //如果有开启距离的功能，没有设置默认门店，要用最近的门店作为默认门店
- if (dd.lat && (!th.data.def_pick_store || JSON.stringify(th.data.def_pick_store) == '{}') && th.data.bconfig && th.data.bconfig.is_sort_storage) {
- th.setData({
- def_pick_store: e.data.data.pageData[0],
- sto_sele_name: e.data.data.pageData[0].pickup_name,
- sto_sele_id: e.data.data.pageData[0].pickup_id,
- sto_sele_distr: e.data.data.pageData[0].distr_type,
- sto_sele_keyid: e.data.data.pageData[0].keyid,
- });
- th.data.fir_def_store = e.data.data.pageData[0];
+ //如果有秒杀的指定门店
+ if(th.data.prom_type==6 && th.data.prom_act && th.data.prom_act.pick_up_lists && e.data.data.pageData.length && !is_normal){
+ var pick_up_lists=th.data.prom_act.pick_up_lists;
+ for (var kq = 0; kq < e.data.data.pageData.length; kq++) {
+ var it0=e.data.data.pageData[kq];
+ var idx0=pick_up_lists.findIndex(function (e){
+ return e.pickup_id==it0.pickup_id;
+ })
+ if (idx0<0) {
+ //删除
+ e.data.data.pageData.splice(kq--, 1);
+ }
+ }
+
+ if (th.data.def_pick_store && JSON.stringify(th.data.def_pick_store)!='{}'){
+ //-- 查找一下门店有没有在 --
+ var idx1=pick_up_lists.findIndex(function (e){
+ return e.pickup_id==th.data.def_pick_store.pickup_id;
+ })
+ if(idx1<0){
+ //如果是秒杀的指定门店，就要设置秒杀的
+ th.data.def_pick_store.is_no_dis_act=1;
+ that.setData({
+ def_pick_store: th.data.def_pick_store
+ })
+ }
+ }
+
}
- //-- 如果有默认选择门店的时候，要把默认门店放在第一位，修改不要配送方式的判断 --
- if (th.data.def_pick_store && JSON.stringify(th.data.def_pick_store) != '{}') {
- for (var k = 0; k < e.data.data.pageData.length; k++) {
- if (e.data.data.pageData[k].pickup_id == th.data.def_pick_store.pickup_id) {
- e.data.data.pageData.splice(k, 1); //删除
+ //-- 如果门店过滤后，还会是数量 --
+ if(e.data.data.pageData.length) {
+
+ var his_cate_num = 0;
+ for (let i in e.data.data.pageData) {
+ let item = e.data.data.pageData[i];
+ if (item.category_id > 0) {
+ his_cate_num = 1;
break;
}
}
- e.data.data.pageData.splice(0, 0, th.data.def_pick_store); //添加
- }
+ e.his_cate_num = his_cate_num;
+
+
+ //如果有开启距离的功能，没有设置默认门店，要用最近的门店作为默认门店
+ if (dd.lat && (!th.data.def_pick_store || JSON.stringify(th.data.def_pick_store) == '{}') && th.data.bconfig && th.data.bconfig.is_sort_storage) {
+ th.setData({
+ def_pick_store: e.data.data.pageData[0],
+ sto_sele_name: e.data.data.pageData[0].pickup_name,
+ sto_sele_id: e.data.data.pageData[0].pickup_id,
+ sto_sele_distr: e.data.data.pageData[0].distr_type,
+ sto_sele_keyid: e.data.data.pageData[0].keyid,
+ });
+ th.data.fir_def_store = e.data.data.pageData[0];
+ }
+
+ //-- 如果有默认选择门店的时候，要把默认门店放在第一位，修改不要配送方式的判断 --
+ if (th.data.def_pick_store && JSON.stringify(th.data.def_pick_store) != '{}') {
+ for (var k = 0; k < e.data.data.pageData.length; k++) {
+ if (e.data.data.pageData[k].pickup_id == th.data.def_pick_store.pickup_id) {
+ e.data.data.pageData.splice(k, 1); //删除
+ break;
+ }
+ }
+ e.data.data.pageData.splice(0, 0, th.data.def_pick_store); //添加
+ }
- th.setData({all_pick_list: e.data.data.pageData});
- th.deal_pickup(e);
+ th.setData({all_pick_list: e.data.data.pageData});
+ th.deal_pickup(e);
+ }else{
+ th.setData({all_pick_list: null, only_pk:null,def_pickpu_list:null });
+
+ wx.hideLoading();
+ }
}, 800)
}
@@ -3366,15 +3418,17 @@ Page({
getApp().goto("/pages/team/team_success/team_success?ordersn=" + odr.order_sn);
} else {
+ th.get_sto();
th.setData({
- is_normal: ind,
+ is_normal: 0,
openSpecModal_pt: 1
});
}
}
else {
+ th.get_sto();
th.setData({
- is_normal: ind,
+ is_normal: 0,
openSpecModal_pt: 1
});
}
diff --git a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxml b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxml
index 3eb917e..4e33079 100644
--- a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxml
+++ b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxml
@@ -224,7 +224,8 @@
(未找到门店)
- (配送不匹配)
+ (该店不可售)
+ (该店不可售)
@@ -670,8 +671,9 @@
{{item.pickup_name}}
- (配送不匹配)
+ (该店不可售)
+ (该店不可售)
@@ -700,8 +702,9 @@
{{item.pickup_name}}
- (配送不匹配)
+ (该店不可售)
+ (该店不可售)
@@ -732,8 +735,9 @@
{{item.pickup_name}}
- (配送不匹配)
+ (该店不可售)
+ (该店不可售)
diff --git a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxss b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxss
index e4a323a..af8db1e 100644
--- a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxss
+++ b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxss
@@ -2525,6 +2525,7 @@ margin-left: 17rpx;
}
.address_name{
margin-right: 10rpx;
+ max-width: 370rpx;
}
.address-val{
diff --git a/packageA/pages/serviceCard_pd/team_show/team_show.js b/packageA/pages/serviceCard_pd/team_show/team_show.js
index c7727cd..e2f1254 100644
--- a/packageA/pages/serviceCard_pd/team_show/team_show.js
+++ b/packageA/pages/serviceCard_pd/team_show/team_show.js
@@ -608,6 +608,12 @@ Page({
// if(ee.distr_type!=0 && g_distr_type!=0 && ee.distr_type!=g_distr_type ){
// ee.is_no_dis=1;
// }
+ var ser_card = th.data.goods;
+ //--如果默认门店不在等级卡的默认们店以内
+ if (ser_card.storageId != null && ser_card.storageId != "" && ser_card.storageId.indexOf(ee.keyid) == -1) {
+ ee.is_no_dis = 1;
+ }
+
var appd=getApp().globalData;
var w_time = setInterval(function() {
@@ -1153,7 +1159,9 @@ Page({
var timer_get = setInterval(function() {
if (th.data.is_get_local_ok == 0) return false;
if (!th.data.goods) return false;
- var dd = null, i = getApp().request;
+ if (!th.data.fir_def_store) return false;
+
+ var dd = null, i = getApp().request;
var g_distr_type = th.data.goods.distr_type;
dd = {
@@ -1179,45 +1187,87 @@ Page({
var e = res;
if (e.data.code == 0 && e.data.data && e.data.data.pageData && e.data.data.pageData.length>0) {
- var his_cate_num=0;
- for(let i in e.data.data.pageData){
+ var sto_list = th.data.goods.storageId;
+ if (sto_list) {
+ for (var k = 0; k < e.data.data.pageData.length; k++) {
+ var it = e.data.data.pageData[k];
+ if (sto_list.indexOf(it.keyid) == -1) {
+ //删除
+ e.data.data.pageData.splice(k--, 1);
+ }
+ }
+ }
+
+ //如果有秒杀的指定门店
+ if( th.data.teamlist && th.data.teamlist.pick_up_lists && e.data.data.pageData.length){
+ var pick_up_lists=th.data.teamlist.pick_up_lists;
+ for (var kq = 0; kq < e.data.data.pageData.length; kq++) {
+ var it0=e.data.data.pageData[kq];
+ var idx0=pick_up_lists.findIndex(function (e){
+ return e.pickup_id==it0.pickup_id;
+ })
+ if (idx0<0) {
+ //删除
+ e.data.data.pageData.splice(kq--, 1);
+ }
+ }
+
+ if (th.data.def_pick_store && JSON.stringify(th.data.def_pick_store)!='{}'){
+ //-- 查找一下门店有没有在 --
+ var idx1=pick_up_lists.findIndex(function (e){
+ return e.pickup_id==th.data.def_pick_store.pickup_id;
+ })
+ if(idx1<0){
+ //如果是秒杀的指定门店，就要设置秒杀的
+ th.data.def_pick_store.is_no_dis_act=1;
+ that.setData({
+ def_pick_store: th.data.def_pick_store
+ })
+ }
+ }
+
+ }
+
+ if(e.data.data.pageData.length){
+ var his_cate_num=0;
+ for(let i in e.data.data.pageData){
let item=e.data.data.pageData[i];
if(item.category_id>0){
- his_cate_num=1;break;
+ his_cate_num=1;break;
+ }
+ }
+ e.his_cate_num=his_cate_num;
+
+ //如果有开启距离的功能，没有设置默认门店，要用最近的门店作为默认门店
+ if(dd.lat && !th.data.def_pick_store && th.data.bconfig && th.data.bconfig.is_sort_storage){
+ th.setData({
+ def_pick_store:e.data.data.pageData[0],
+ sto_sele_name: e.data.data.pageData[0].pickup_name,
+ sto_sele_id: e.data.data.pageData[0].pickup_id,
+ sto_sele_distr: e.data.data.pageData[0].distr_type
+ });
+ th.data.fir_def_store=e.data.data.pageData[0];
+ }
+
+ //-- 如果有默认选择门店的时候，要把默认门店放在第一位 --
+ if (th.data.def_pick_store && JSON.stringify(th.data.def_pick_store)!='{}'){
+ for (var k = 0; k < e.data.data.pageData.length; k++) {
+ if (e.data.data.pageData[k].pickup_id == th.data.def_pick_store.pickup_id) {
+ e.data.data.pageData.splice(k, 1); //删除
+ break;
+ }
}
+ e.data.data.pageData.splice(0, 0, th.data.def_pick_store); //添加
+ }
+
+
+ th.setData({all_pick_list:e.data.data.pageData});
+
+ setTimeout(function(){
+ th.deal_pickup(e); //--普通门店排版--
+ },800)
}
- e.his_cate_num=his_cate_num;
-
- //如果有开启距离的功能，没有设置默认门店，要用最近的门店作为默认门店
- if(dd.lat && !th.data.def_pick_store && th.data.bconfig && th.data.bconfig.is_sort_storage){
- th.setData({
- def_pick_store:e.data.data.pageData[0],
- sto_sele_name: e.data.data.pageData[0].pickup_name,
- sto_sele_id: e.data.data.pageData[0].pickup_id,
- sto_sele_distr: e.data.data.pageData[0].distr_type
- });
- th.data.fir_def_store=e.data.data.pageData[0];
- }
-
- //-- 如果有默认选择门店的时候，要把默认门店放在第一位 --
- if (th.data.def_pick_store && JSON.stringify(th.data.def_pick_store)!='{}'){
- for (var k = 0; k < e.data.data.pageData.length; k++) {
- if (e.data.data.pageData[k].pickup_id == th.data.def_pick_store.pickup_id) {
- e.data.data.pageData.splice(k, 1); //删除
- break;
- }
- }
- e.data.data.pageData.splice(0, 0, th.data.def_pick_store); //添加
- }
-
-
- th.setData({all_pick_list:e.data.data.pageData});
-
-
- setTimeout(function(){
- th.deal_pickup(e); //--普通门店排版--
- },800)
-
+
}
})
}, 200)
diff --git a/packageA/pages/serviceCard_pd/team_show/team_show.wxml b/packageA/pages/serviceCard_pd/team_show/team_show.wxml
index 75de01b..e473387 100644
--- a/packageA/pages/serviceCard_pd/team_show/team_show.wxml
+++ b/packageA/pages/serviceCard_pd/team_show/team_show.wxml
@@ -227,6 +227,7 @@
(配送不匹配)
+ (该店不可售)
地址:{{def_pick_store.fulladdress}}
@@ -247,7 +248,8 @@
- 确定
+ 配送不匹配
+ 该店不可售
确定
@@ -292,7 +294,10 @@
- {{item.pickup_name}}
+ {{item.pickup_name}}
+ (配送不匹配)
+ (该店不可售)
+
@@ -318,7 +323,10 @@
- {{item.pickup_name}}
+ {{item.pickup_name}}
+ (配送不匹配)
+ (该店不可售)
+
- {{item.pickup_name}}
+ {{item.pickup_name}}
+ (配送不匹配)
+ (该店不可售)
+
diff --git a/packageA/pages/serviceCard_pd/team_show/team_show.wxss b/packageA/pages/serviceCard_pd/team_show/team_show.wxss
index 34fe160..eaad7ee 100644
--- a/packageA/pages/serviceCard_pd/team_show/team_show.wxss
+++ b/packageA/pages/serviceCard_pd/team_show/team_show.wxss
@@ -2197,3 +2197,4 @@ page {
/* background-color: #ddd; */
color: #ccc;
}
+.c-red22{ color:#d60021; }
diff --git a/packageF/pages/xcxServiceChat/xcxServiceChat.js b/packageF/pages/xcxServiceChat/xcxServiceChat.js
new file mode 100644
index 0000000..e60a7d9
--- /dev/null
+++ b/packageF/pages/xcxServiceChat/xcxServiceChat.js
@@ -0,0 +1,129 @@
+// packageF/pages/xcxServiceChat/xcxServiceChat.js
+var t = getApp(),
+a = t.request,
+o = t.globalData.setting
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ url: o.imghost,
+ imgUrl:'',
+ userinfo:{},
+ window_info:{},
+ imgBoxOffw:true,
+ imgBoxOffh:true,
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad(options) {
+ let window_info = wx.getWindowInfo()
+ console.error(window_info);
+ console.log(window_info);
+ this.getad()
+ wx.setNavigationBarTitle({
+ title: '联系客服'
+ })
+ this.setData({
+ userinfo: getApp().globalData.userInfo,
+ window_info,
+ });
+
+ },
+ //获取客服广告
+ async getad(){
+ //---首页广告-------
+ await getApp().request.promiseGet("/api/weshop/ad/page?pids=1209&store_id=" + o.stoid, {
+ data: {}
+ }).then(res => {
+ if (res.data.code == 0 && res.data.data.pageData && res.data.data.pageData.length > 0) {
+ let a = res.data.data.pageData[0];
+ let imgUrl = this.data.url + a.ad_code
+ wx.getImageInfo({
+ src: imgUrl,
+ success: res=>{
+ let imgBoxOffw = true
+ let imgBoxOffh = true
+ if (res.width > this.data.window_info.screenWidth) {
+ imgBoxOffw = false
+ }
+ if (res.height > this.data.window_info.screenWidth) {
+ imgBoxOffh = false
+ }
+
+ this.setData({
+ imgUrl,
+ imgBoxOffw,
+ imgBoxOffh
+ })
+ }
+ })
+
+ }
+ })
+ },
+ //联系客服
+ con_weixin () {
+ console.log(123456);
+ console.log(this.data.sys_switch);
+ // getApp().con_wx(this);
+ var url=this.data.sys_switch.weapp_customertype_url;
+ var id=this.data.sys_switch.weapp_customertype_appid;
+ wx.openCustomerServiceChat({
+ extInfo: {url: url},
+ corpId: id,
+ success(res) {}
+ })
+ },
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload() {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh() {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom() {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage() {
+
+ }
+})
\ No newline at end of file
diff --git a/packageF/pages/xcxServiceChat/xcxServiceChat.json b/packageF/pages/xcxServiceChat/xcxServiceChat.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/packageF/pages/xcxServiceChat/xcxServiceChat.json
@@ -0,0 +1,3 @@
+{
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/packageF/pages/xcxServiceChat/xcxServiceChat.wxml b/packageF/pages/xcxServiceChat/xcxServiceChat.wxml
new file mode 100644
index 0000000..9c37cca
--- /dev/null
+++ b/packageF/pages/xcxServiceChat/xcxServiceChat.wxml
@@ -0,0 +1,4 @@
+
+
diff --git a/packageF/pages/xcxServiceChat/xcxServiceChat.wxss b/packageF/pages/xcxServiceChat/xcxServiceChat.wxss
new file mode 100644
index 0000000..cb765fb
--- /dev/null
+++ b/packageF/pages/xcxServiceChat/xcxServiceChat.wxss
@@ -0,0 +1,25 @@
+/* packageF/pages/xcxServiceChat/xcxServiceChat.wxss */
+
+.mainBox{
+ width: 100vw;
+ height: 100vh;
+ position: absolute;
+ left: 0;
+ right: 0;
+ top: 0;
+ bottom: 0;
+}
+.imgBox{
+ height: 100vh;
+ width: 100vw;
+ background-position: 50%;
+ background-repeat: no-repeat;
+ background-attachment: fixed;
+ position: relative;
+ /* object-fit: contain; */
+
+ /* object-fit: cover; */
+}
+image{
+ margin: auto;
+}
\ No newline at end of file
diff --git a/pages/activity/seckill_list/seckill_list.wxml b/pages/activity/seckill_list/seckill_list.wxml
index 4a156b0..1bc8153 100644
--- a/pages/activity/seckill_list/seckill_list.wxml
+++ b/pages/activity/seckill_list/seckill_list.wxml
@@ -46,9 +46,9 @@
-
+
- 剩余{{type==1?filters.toFix(100-(item.buy_num+item.virtual)/(item.goods_num+item.virtual)*100,0):'100'}}%
+ 剩余{{type==1?filters.toFix(100-(item.buy_num+item.virtual)/((item.is_virtual_count ? item.goods_num : item.goods_num+item.virtual))*100,0):'100'}}%
diff --git a/pages/goods/goodsInfo/buy_com_pop.wxml b/pages/goods/goodsInfo/buy_com_pop.wxml
index ec0a0b0..0018476 100644
--- a/pages/goods/goodsInfo/buy_com_pop.wxml
+++ b/pages/goods/goodsInfo/buy_com_pop.wxml
@@ -129,7 +129,7 @@
-
+
库存不足
diff --git a/pages/goods/goodsInfo/buy_integral.wxml b/pages/goods/goodsInfo/buy_integral.wxml
index a15a554..b413b66 100644
--- a/pages/goods/goodsInfo/buy_integral.wxml
+++ b/pages/goods/goodsInfo/buy_integral.wxml
@@ -93,7 +93,7 @@
-
+
库存不足
diff --git a/pages/goods/goodsInfo/buy_pt.wxml b/pages/goods/goodsInfo/buy_pt.wxml
index eaf853f..6046921 100644
--- a/pages/goods/goodsInfo/buy_pt.wxml
+++ b/pages/goods/goodsInfo/buy_pt.wxml
@@ -73,6 +73,7 @@
(配送不匹配)
(该店不可售)
+ (该店不可售)
(库存不足)
@@ -173,7 +174,7 @@
-
+
库存不足
@@ -220,7 +221,10 @@
配送不匹配
-
+
+
+ 该店不可售
+
确定
diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index 99bbd02..0a5aa9d 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -2598,9 +2598,7 @@ Page({
sele_g: this.data.data,
gid: this.data.data.goods_id
})
-
- this.sele_spec_chech_activity();
-
+ this.sele_spec_chech_activity(1);
}
this.setData({
@@ -3517,6 +3515,16 @@ Page({
prom_id: prom.id
})
+ var pro_null=null;
+ if(goodsinfo.prom_type==1){
+ var rs= await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" + os.stoid + "/1/" + prom.id, {});
+ if(rs && rs.data.code == 0 && rs.data.data <= 0 ){
+ pro_null=1;
+ }
+ }
+ th.setData({pro_null});
+
+
//却换图片
th.init(goodsinfo.goods_id);
var newTime = ut.gettimestamp();
@@ -3635,9 +3643,11 @@ Page({
if(!is_normal && th.data.prom_type>0){
pickup_ids=null;
}
-
+
+
+
//指定门店判断， 不是普通购买的时候，秒杀的时候，秒杀有指定门店
- if(!is_normal && th.data.prom_type==1 && th.data.prom_act.pick_up_lists){
+ if(!is_normal && (th.data.prom_type==1 || th.data.prom_type==6) && th.data.prom_act.pick_up_lists){
pickup_ids=th.data.prom_act.pick_up_lists
}
@@ -3658,7 +3668,6 @@ Page({
//判断会员的默认的门店是不是匹配指定的门店
if (th.data.def_pick_store && JSON.stringify(th.data.def_pick_store) != '{}'){
-
//-- 查找一下门店有没有在 --
var idx1=pickup_ids.findIndex(function (e){
return e.pickup_id==th.data.def_pick_store.pickup_id;
@@ -3666,12 +3675,11 @@ Page({
if(idx1<0){
//如果是秒杀的指定门店，就要设置秒杀的
- if(!is_normal && th.data.prom_type==1){
+ if(!is_normal && (th.data.prom_type==1 || th.data.prom_type==6) ){
th.data.def_pick_store.is_no_dis_act=1;
}else{
th.data.def_pick_store.is_no_dis_nor=1;
}
-
}else{
th.data.def_pick_store.is_no_dis_nor=0;
th.data.def_pick_store.is_no_dis_act=0;
@@ -3682,80 +3690,84 @@ Page({
})
}
-
-
e.data.data.pageData=ok_arr; //数组重新赋值
e.data.data.total=ok_arr.length; //数组的长度
}
else{
//-- 多规格指定门店优化 --
if (th.data.def_pick_store && JSON.stringify(th.data.def_pick_store) != '{}'){
- th.data.def_pick_store.is_no_dis_nor=0;
- th.data.def_pick_store.is_no_dis_act=0;
- that.setData({
- def_pick_store: th.data.def_pick_store
- })
- }
+ th.data.def_pick_store.is_no_dis_nor=0;
+ th.data.def_pick_store.is_no_dis_act=0;
+ that.setData({
+ def_pick_store: th.data.def_pick_store
+ })
+ }
}
- var his_cate_num = 0;
- for (let i in e.data.data.pageData) {
- let item = e.data.data.pageData[i];
- if (item.category_id > 0) {
- his_cate_num = 1;
- }
- if (getApp().is_virtual(th.data.sele_g) && th.data.sales_rules >= 2) {
- e.data.data.pageData[i].CanOutQty = 100000;
+ //过滤后门店数量还是要大于0
+ if(e.data.data.pageData.length > 0) {
+
+ var his_cate_num = 0;
+ for (let i in e.data.data.pageData) {
+ let item = e.data.data.pageData[i];
+ if (item.category_id > 0) {
+ his_cate_num = 1;
+ }
+ if (getApp().is_virtual(th.data.sele_g) && th.data.sales_rules >= 2) {
+ e.data.data.pageData[i].CanOutQty = 100000;
+ }
}
- }
- e.his_cate_num = his_cate_num;
+ e.his_cate_num = his_cate_num;
- if (th.data.def_pick_store && JSON.stringify(th.data.def_pick_store) != '{}' &&
- getApp().is_virtual(th.data.sele_g) && th.data.sales_rules >= 2) {
- th.setData({
- 'def_pick_store.CanOutQty': 100000
- })
- }
+ if (th.data.def_pick_store && JSON.stringify(th.data.def_pick_store) != '{}' &&
+ getApp().is_virtual(th.data.sele_g) && th.data.sales_rules >= 2) {
+ th.setData({
+ 'def_pick_store.CanOutQty': 100000
+ })
+ }
- //如果有开启距离的功能，没有设置默认门店，要用最近的门店作为默认门店
- if (dd.lat && (!th.data.def_pick_store || JSON.stringify(th.data.def_pick_store) == '{}') && th.data.bconfig && th.data.bconfig.is_sort_storage) {
- th.setData({
- def_pick_store: e.data.data.pageData[0],
- sto_sele_name: e.data.data.pageData[0].pickup_name,
- sto_sele_id: e.data.data.pageData[0].pickup_id,
- sto_sele_distr: e.data.data.pageData[0].distr_type
- });
- th.data.fir_def_store = e.data.data.pageData[0];
- }
+ //如果有开启距离的功能，没有设置默认门店，要用最近的门店作为默认门店
+ if (dd.lat && (!th.data.def_pick_store || JSON.stringify(th.data.def_pick_store) == '{}') && th.data.bconfig && th.data.bconfig.is_sort_storage) {
+ th.setData({
+ def_pick_store: e.data.data.pageData[0],
+ sto_sele_name: e.data.data.pageData[0].pickup_name,
+ sto_sele_id: e.data.data.pageData[0].pickup_id,
+ sto_sele_distr: e.data.data.pageData[0].distr_type
+ });
+ th.data.fir_def_store = e.data.data.pageData[0];
+ }
- //-- 如果有默认选择门店的时候，要把默认门店放在第一位，修改不要配送方式的判断 --
- if (th.data.def_pick_store && JSON.stringify(th.data.def_pick_store) != '{}') {
- for (var k = 0; k < e.data.data.pageData.length; k++) {
- if (e.data.data.pageData[k].pickup_id == th.data.def_pick_store.pickup_id) {
- e.data.data.pageData.splice(k, 1); //删除
- break;
+ //-- 如果有默认选择门店的时候，要把默认门店放在第一位，修改不要配送方式的判断 --
+ if (th.data.def_pick_store && JSON.stringify(th.data.def_pick_store) != '{}') {
+ for (var k = 0; k < e.data.data.pageData.length; k++) {
+ if (e.data.data.pageData[k].pickup_id == th.data.def_pick_store.pickup_id) {
+ e.data.data.pageData.splice(k, 1); //删除
+ break;
+ }
}
+ e.data.data.pageData.splice(0, 0, th.data.def_pick_store); //添加
}
- e.data.data.pageData.splice(0, 0, th.data.def_pick_store); //添加
- }
- th.setData({
- all_pick_list: e.data.data.pageData
- });
+ 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 () {
- th.deal_pickup_dline(e);
- }, 800)
- } else {
- setTimeout(function () {
- th.deal_pickup(e); //--普通门店排版--
- }, 800)
+ //--获取线下库存,而且不是新的门店规则, 同时是普通购买的时候，或者同时不能是活动，秒杀，拼团，积分购--
+ 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 () {
+ th.deal_pickup_dline(e);
+ }, 800)
+ } else {
+ setTimeout(function () {
+ th.deal_pickup(e); //--普通门店排版--
+ }, 800)
+ }
+ }else{
+ wx.hideLoading();
}
} else {
wx.hideLoading();
@@ -4535,7 +4547,7 @@ Page({
if (em.data.code == 0) {
if (em.data.data <= 0) ee.setData({
- prom_r_null: 1
+ prom_r_null: 1,pro_null:1
});
//拿取价格并且判断时间--
getApp().request.get("/api/ms/flash_sale/getNew/" + os.stoid + "/" + user_id + "/" + prom_id, {
@@ -4643,6 +4655,7 @@ Page({
ee.setData({
sku_g: list,
+ is_more_flash:1
});
}
@@ -8574,11 +8587,19 @@ Page({
if (arr.length == 1) {
th.data.prom_type = arr[0].prom_type;
th.data.prom_id = arr[0].act_id;
+ //-- 基础的活动类型 --
+ th.data.base_nor_prom_type = arr[0].prom_type;
+ th.data.base_nor_prom_id = arr[0].act_id;
+
}
//-- 如果只有一个进行中的活动的话 --
else if (arr2.length == 1) {
th.data.prom_type = arr2[0].prom_type;
th.data.prom_id = arr2[0].act_id;
+
+ //-- 基础的活动类型 --
+ th.data.base_nor_prom_type = arr[0].prom_type;
+ th.data.base_nor_prom_id = arr[0].act_id;
}
if (arr4.length > 0) {
diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index e1337e7..4a8445f 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -456,7 +456,7 @@
- 总数量：{{prom_act.goods_num+prom_act.virtual}}件
+ 总数量：{{prom_act.is_virtual_count ? prom_act.goods_num : (prom_act.goods_num+prom_act.virtual)}}件
限购:{{prom_act.buy_limit}}件
限购:不限
@@ -1115,19 +1115,40 @@
+
+
+
+
+
+ 单独购买
+ 立即抢购
+
+
+ 加入购物车
+ 立即抢购
+
+
+
+
+ 单独购买
+ 已抢光
+
+
+ 已抢光
+
+
+
-
- 单独购买
- 已抢光
+
已抢光
+
单独购买
活动已经结束
-
活动已经结束
@@ -1266,8 +1287,8 @@
券后￥
{{sele_g.offline_price}}
-
+
已售：{{sele_g.sales_sum}}
@@ -1295,7 +1316,7 @@
已售：{{prom_act.buy_num+prom_act.virtual}}
已售：{{prom_act.buy_num}}
- 可售：{{prom_act.goods_num-prom_act.buy_num}}
+ 可售：{{(prom_act.is_virtual_count && prom_act.virtual) ? (prom_act.goods_num - prom_act.buy_num - prom_act.virtual) : (prom_act.goods_num-prom_act.buy_num)}}
@@ -1405,7 +1426,7 @@
-
+
库存不足
@@ -1424,8 +1445,6 @@
-
-
@@ -1445,7 +1464,13 @@
-
+
+
+
+ 已抢光
+
+
+
库存不足
diff --git a/pages/index/index/index.js b/pages/index/index/index.js
index 88aae79..1083a83 100644
--- a/pages/index/index/index.js
+++ b/pages/index/index/index.js
@@ -208,8 +208,9 @@ Page({
getApp().request.promiseGet('/api/weshop/redmoney/redConfig/get/' + getApp().globalData.setting.stoid, {
data: {}
}).then(function (data) {
- let code = data.data.code;
- if (code == 0) {
+ let code = data.data.code;
+ let resdata = data.data.data;
+ if (code == 0 && resdata.is_index) {
th.setData({
showHongbao: true,
diff --git a/pages/index/index/index.wxml b/pages/index/index/index.wxml
index 28bb6eb..15aa246 100644
--- a/pages/index/index/index.wxml
+++ b/pages/index/index/index.wxml
@@ -516,6 +516,9 @@
+
+
+
diff --git a/pages/team/team_ping/team_ping.js b/pages/team/team_ping/team_ping.js
index fdf5ece..acbbd3b 100644
--- a/pages/team/team_ping/team_ping.js
+++ b/pages/team/team_ping/team_ping.js
@@ -104,6 +104,8 @@ Page({
if(order && order.length){
for (i = 0; i < order.length; i++) {
+ //编号空，就进入下个循环
+ if(!order[i].pt_listno) continue;
//获取teamgroup中的值
await getApp().request.promiseGet("/api/weshop/teamgroup/page", {
data: { store_id: os.stoid, listno: order[i].pt_listno,pageSize:1,page:1}
diff --git a/pages/team/team_show/team_show.js b/pages/team/team_show/team_show.js
index ea894dd..9202e8f 100644
--- a/pages/team/team_show/team_show.js
+++ b/pages/team/team_show/team_show.js
@@ -433,6 +433,12 @@ Page({
}
})
+ if(!teamgroup || !teamgroup.listno){
+ ut.m_toast('未找到团号');
+ th.go_back();
+ return false;
+ }
+
//判断是不是要继续的开关
var is_ok=1;
@@ -609,27 +615,28 @@ Page({
//-- 获取用户的默认门店 --
getApp().get_user_store(function(ee) {
- if(!ee) {
- th.data.fir_def_store={}; //赋值空对象
- return false;
- }
-
- if(getApp().globalData.is_dj_pk) th.setData({has_def:1})
- //--定时器推迟一下--
- setTimeout(function () {
- if(!th.data.goods) return false;
- var g_distr_type=th.data.goods.distr_type;
- //--如果默认门店的配送方式不对，就不能被选择--
- if(ee.distr_type!=0 && g_distr_type!=0 && ee.distr_type!=g_distr_type ){
- //th.data.fir_def_store={}; //赋值空对象
- //return false;
- ee.is_no_dis=1;
+ if(!ee) {
+ th.data.fir_def_store={}; //赋值空对象
+ return false;
}
+ if(getApp().globalData.is_dj_pk) th.setData({has_def:1})
+ //--定时器推迟一下--
+
var appd=getApp().globalData;
var w_time = setInterval(function() {
if (that.data.is_get_local_ok == 0) return false;
+ if(!th.data.goods) return false;
+ var g_distr_type=th.data.goods.distr_type;
+ //--如果默认门店的配送方式不对，就不能被选择--
+ if(ee.distr_type!=0 && g_distr_type!=0 && ee.distr_type!=g_distr_type ){
+ //th.data.fir_def_store={}; //赋值空对象
+ //return false;
+ ee.is_no_dis=1;
+ }
+
clearInterval(w_time);
+
var distance = null;
var e=JSON.parse(JSON.stringify(ee));
@@ -684,7 +691,7 @@ Page({
}
}, 500)
- },1000)
+
});
//获取下redis长度，如果团已经弄完，或者拼单已经卖完
@@ -1192,6 +1199,59 @@ Page({
var e = res;
if (e.data.code == 0 && e.data.data && e.data.data.pageData && e.data.data.pageData.length>0) {
+ var pickup_ids=null;
+ //指定门店判断， 不是普通购买的时候，秒杀的时候，秒杀有指定门店
+ if( th.data.teamlist.pick_up_lists){
+ pickup_ids=th.data.teamlist.pick_up_lists
+ }
+
+ //-- 如果有指定门店的时候 --
+ if(pickup_ids){
+ var ok_arr=[];
+ for (let i in e.data.data.pageData) {
+ let ite = e.data.data.pageData[i];
+ //-- 查找一下门店有没有在 --
+ var idx=pickup_ids.findIndex(function (e){
+ return e.pickup_id==ite.pickup_id;
+ })
+ if(idx>-1){
+ ok_arr.push(ite)
+ }
+ }
+
+ //判断会员的默认的门店是不是匹配指定的门店
+ if (th.data.def_pick_store && JSON.stringify(th.data.def_pick_store) != '{}'){
+ //-- 查找一下门店有没有在 --
+ var idx1=pickup_ids.findIndex(function (e){
+ return e.pickup_id==th.data.def_pick_store.pickup_id;
+ })
+
+ if(idx1<0){
+ th.data.def_pick_store.is_no_dis_act=1;
+ }else{
+ th.data.def_pick_store.is_no_dis_act=0;
+ }
+
+ that.setData({
+ def_pick_store: th.data.def_pick_store
+ })
+
+ }
+ e.data.data.pageData=ok_arr; //数组重新赋值
+ e.data.data.total=ok_arr.length; //数组的长度
+ }
+ else{
+ //-- 多规格指定门店优化 --
+ if (th.data.def_pick_store && JSON.stringify(th.data.def_pick_store) != '{}'){
+ th.data.def_pick_store.is_no_dis_act=0;
+ that.setData({
+ def_pick_store: th.data.def_pick_store
+ })
+ }
+ }
+
+
+
var his_cate_num=0;
for(let i in e.data.data.pageData){
let item=e.data.data.pageData[i];
diff --git a/pages/team/team_show/team_show.wxml b/pages/team/team_show/team_show.wxml
index 2adbc63..b5bc562 100644
--- a/pages/team/team_show/team_show.wxml
+++ b/pages/team/team_show/team_show.wxml
@@ -234,6 +234,7 @@
(配送不匹配)
+ (该店不可售)
地址:{{def_pick_store.fulladdress}}
@@ -266,7 +267,8 @@
- 确定
+ 配送不匹配
+ 该店不可售
确定
@@ -312,7 +314,10 @@
- {{item.pickup_name}}
+ {{item.pickup_name}}
+ (配送不匹配)
+ (该店不可售)
+
@@ -338,7 +343,10 @@
- {{item.pickup_name}}
+ {{item.pickup_name}}
+ (配送不匹配)
+ (该店不可售)
+
- {{item.pickup_name}}
+ {{item.pickup_name}}
+ (配送不匹配)
+ (该店不可售)
+
diff --git a/pages/team/team_show/team_show.wxss b/pages/team/team_show/team_show.wxss
index 34fe160..cbff3ff 100644
--- a/pages/team/team_show/team_show.wxss
+++ b/pages/team/team_show/team_show.wxss
@@ -2197,3 +2197,5 @@ page {
/* background-color: #ddd; */
color: #ccc;
}
+
+.c-red22{ color:#d60021; }
diff --git a/pages/team/team_success/team_success.js b/pages/team/team_success/team_success.js
index cff77c5..68053c5 100644
--- a/pages/team/team_success/team_success.js
+++ b/pages/team/team_success/team_success.js
@@ -171,6 +171,8 @@ Page({
pt_listno = order.pt_listno;
})
+
+
if (this.data.payf || order.pt_status == 3) p_status = 3; //失败
if (order.pt_status == 2 || order.pt_status == 4 || order.pt_status == 5)
p_status = 2; //成功
@@ -178,21 +180,22 @@ Page({
p_status = 1; //正在进行
if ( order.pt_status == 6) p_status = 4; //支付尾款失败
- //多少人参团头像
- await getApp().request.promiseGet("/api/weshop/order/pagePtList", {
- data: { store_id: o.stoid, pt_listno: pt_listno, }
- }).then(res => {
- ordertx = res.data.data.pageData;
- })
-
var team_g=null;
- //获取teamgroup中的值
- await getApp().request.promiseGet("/api/weshop/teamgroup/page", {
- data: { store_id: os.stoid, listno: pt_listno,pageSize:1,page:1}
- }).then(res => {
- team_g = res.data.data.pageData[0]
-
- })
+ if(pt_listno) {
+ //多少人参团头像
+ await getApp().request.promiseGet("/api/weshop/order/pagePtList", {
+ data: {store_id: o.stoid, pt_listno: pt_listno,}
+ }).then(res => {
+ ordertx = res.data.data.pageData;
+ })
+
+ //获取teamgroup中的值
+ await getApp().request.promiseGet("/api/weshop/teamgroup/page", {
+ data: { store_id: os.stoid, listno: pt_listno,pageSize:1,page:1}
+ }).then(res => {
+ team_g = res.data.data.pageData[0]
+ })
+ }
var min_price=0;
@@ -239,21 +242,25 @@ Page({
})
- //只装5个
- var ordertx2=[],sf_num=0,ct_nun=teamlist.ct_num;
- if(max_num && !team_g.is_xuni_ct){
- ct_nun=parseInt(max_num);
- if (ct_nun < ordertx.length) ct_nun = ordertx.length;
- }
+ if(ordertx && ordertx.length){
+ //只装5个
+ var ordertx2=[],sf_num=0,ct_nun=teamlist.ct_num;
+ if(max_num && !team_g.is_xuni_ct){
+ ct_nun=parseInt(max_num);
+ if (ct_nun < ordertx.length) ct_nun = ordertx.length;
+ }
- if(ct_nun>5) ct_nun=5;
- for(var i=0;i= ordertx.length) sf_num++
- else
- ordertx2.push(ordertx[i]);
+ if(ct_nun>5) ct_nun=5;
+ for(var i=0;i= ordertx.length) sf_num++
+ else
+ ordertx2.push(ordertx[i]);
+ }
}
+
+
var head=[];
if(team_g.is_xuni_ct) {
head=team_g.xuni_head_id.split(",");
@@ -287,8 +294,8 @@ Page({
})
- var ct_price = 0,
- num_0 = ordertx.length;
+ var ct_price = 0;
+ var num_0 = ordertx?ordertx.length:0;
if (teamlist.kttype == 3){
var js_data = JSON.parse(teamlist.ct_rylist);
js_data.forEach(function (val,ind) {
diff --git a/pages/template/index.wxml b/pages/template/index.wxml
index f5ca734..4071247 100644
--- a/pages/template/index.wxml
+++ b/pages/template/index.wxml
@@ -69,6 +69,9 @@
+
+
+
diff --git a/pages/user/order_detail/order_detail.js b/pages/user/order_detail/order_detail.js
index f14dad6..61a235a 100644
--- a/pages/user/order_detail/order_detail.js
+++ b/pages/user/order_detail/order_detail.js
@@ -978,14 +978,19 @@ Page({
}
//----------如果有活动，并且在进行中，就不计算线下库存---------------
if (prom) {
-
+ let c_type=parseInt(goodsinfo.prom_type+'');
+ var act_type='';
+ switch (c_type){
+ case 1:act_type='秒杀';break;
+ case 6:act_type='拼团';break;
+ }
//指定门店的控制
- if (goodsinfo.prom_type == 1 && prom.pick_up_lists) {
+ if ([1,6].indexOf(c_type)>-1 && prom.pick_up_lists) {
var idx0=prom.pick_up_lists.findIndex(function (e){
return e.pickup_id==order.pickup_id;
})
if(idx0<0){
- getApp().confirmBox(goodsinfo.goods_name + "秒杀活动的门店不可售");
+ getApp().confirmBox(goodsinfo.goods_name +act_type+"活动的门店不可售");
th.setData({ paying: 0 });
return false;
}
diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js
index 0b79ea3..1437fd0 100644
--- a/pages/user/order_list/order_list.js
+++ b/pages/user/order_list/order_list.js
@@ -1031,8 +1031,7 @@ Page({
}
if (prom) {
var t_now = ut.gettimestamp();
- if (prom.is_end == 0 && prom.start_time < t_now && prom.end_time > t_now) {
-
+ if (prom.is_end == 0 && prom.start_time < t_now && prom.end_time > t_now ) {
var content = gg.goods_name + '商品的活动发生了变化,请取消订单重新购买';
th.toast(content);
th.setData({ paying: 0 });
@@ -1292,20 +1291,25 @@ Page({
}
//----------如果有活动，并且在进行中，就不计算线下库存---------------
if (prom) {
+ let c_type=parseInt(goodsinfo.prom_type+'');
+ var act_type='';
+ switch (c_type){
+ case 1:act_type='秒杀';break;
+ case 6:act_type='拼团';break;
+ }
//指定门店的控制
- if (goodsinfo.prom_type == 1 && prom.pick_up_lists) {
+ if ([1,6].indexOf(c_type)>-1 && prom.pick_up_lists) {
var idx0=prom.pick_up_lists.findIndex(function (e){
return e.pickup_id==order.pickup_id;
})
if(idx0<0){
- getApp().confirmBox(goodsinfo.goods_name + "秒杀活动的门店不可售");
+ getApp().confirmBox(goodsinfo.goods_name +act_type+ "活动的门店不可售");
th.setData({ paying: 0 });
return false;
}
}
-
var now = ut.gettimestamp();
if (prom.is_end == 1 && prom.end_time < now) {
var content = goodsinfo.goods_name + '商品的活动已经结束,请取消订单'
@@ -2951,6 +2955,21 @@ Page({
flag = false;
return false;
}
+
+ //指定门店的控制
+ if (act_details.pick_up_lists) {
+ var idx0=act_details.pick_up_lists.findIndex(function (e){
+ return e.pickup_id==it.pickup_id;
+ })
+ if(idx0<0){
+ getApp().confirmBox(it.service_name + "拼团活动的门店不可售");
+ th.setData({ paying: 0 });
+ flag = false;
+ return false;
+ }
+ }
+
+
}
});