diff --git a/components/diy_store_select/diy_store_select.js b/components/diy_store_select/diy_store_select.js
index c83e633..9fb9018 100644
--- a/components/diy_store_select/diy_store_select.js
+++ b/components/diy_store_select/diy_store_select.js
@@ -218,10 +218,18 @@ Component({
}
e.splice(0, 0, th.data.top_store); //添加
}
-
-
+
+ var ishas_cate=0;
+ for(let i in e){
+ let item=e[i];
+ if(item.category_id>0) {
+ ishas_cate=1;break;
+ }
+ }
+
+
//单总量超出5个的时候
- if (e.length > 5) {
+ if (e.length > 10 && ishas_cate) {
getApp().request.get("/api/weshop/storagecategory/page", {
data: {
store_id: o.stoid,
diff --git a/packageA/pages/goodsInfo/goodsInfo.js b/packageA/pages/goodsInfo/goodsInfo.js
index 069d73a..2189a74 100644
--- a/packageA/pages/goodsInfo/goodsInfo.js
+++ b/packageA/pages/goodsInfo/goodsInfo.js
@@ -893,6 +893,16 @@ Page({
}).then(res => {
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;
@@ -944,7 +954,7 @@ Page({
if(!th.data.data) return false
wx.hideLoading();
//单总量超出5个的时候
- if (e.data.data.total > 5) {
+ if (e.data.data.total > 10 && e.his_cate_num) {
getApp().request.get("/api/weshop/storagecategory/page", {
data: {
store_id: o.stoid,
diff --git a/packageA/pages/profile/profile.js b/packageA/pages/profile/profile.js
index b69427e..2524de5 100644
--- a/packageA/pages/profile/profile.js
+++ b/packageA/pages/profile/profile.js
@@ -70,7 +70,9 @@ Page({
is_lable_set: "", //是否启用我的兴趣标签
check_label: [], //我选择的兴趣标签
fir_guide_id:null, //存储会员详情接口出来的美导ID
- isLunar: 0,
+ isLunar: 0,
+ lat: null, //维度
+ lon: null, //经度
},
//通过路径跳转到其他页面
@@ -258,6 +260,15 @@ Page({
success:function(res){
var e = res;
if (e.data.code == 0 && e.data.data && e.data.data.pageData && e.data.data.pageData.length>0) {
+
+ var ishas_cate=0;
+ for(let i in e){
+ let item=e[i];
+ if(item.category_id>0) {
+ ishas_cate=1;break;
+ }
+ }
+
//-- 如果有默认选择门店的时候，要把默认门店放在第一位 --
if (th.data.def_pick_store) {
for (var k = 0; k < e.data.data.pageData.length; k++) {
@@ -270,7 +281,7 @@ Page({
}
//单总量超出5个的时候
- if (e.data.data.total > 5) {
+ if (e.data.data.total > 10 && ishas_cate) {
i.get("/api/weshop/storagecategory/page", {
data: {
store_id: r.stoid,
@@ -613,6 +624,9 @@ Page({
sto_sele_id: data.pickup_id,
});
}
+ if(!self.data.sto_sele_id){
+ self.get_store_set();
+ }
})
}else{
self.setData({
@@ -622,7 +636,11 @@ Page({
stoname: data.pickup_name,
sto_sele_id: data.pickup_id,
});
- }
+ }
+
+ if(!self.data.sto_sele_id){
+ self.get_store_set();
+ }
};
}
});
@@ -1174,6 +1192,83 @@ Page({
// }
// })
},
+
+
+ get_store_set:function () {
+ var th=this;
+ //如果是扫码进来的
+ if(getApp().globalData.store_number){
+ var dd = {
+ store_id: r.stoid,
+ isstop: 0,
+ pageSize: 1,
+ page:1,
+ pickup_no:getApp().globalData.store_number
+ };
+
+ //获取扫码的门店
+ getApp().request.promiseGet("/api/weshop/pickup/list", {
+ data: dd,
+ }).then(res => {
+ var top_store=res.data.data.pageData[0];
+ th.setData({
+ stoname: top_store.pickup_name,
+ sto_sele_name: top_store.pickup_name,
+ sto_sele_id: top_store.pickup_id,
+ sto_sele_distr: top_store.distr_type,
+ })
+ })
+
+ }else{
+ wx.getLocation({
+ type: 'gcj02',
+ success: function(res) {
+ th.data.lat = res.latitude;
+ th.data.lon = res.longitude;
+ th.set_fir_store_to_def();
+ },
+ fail: function(res) {
+ if(res.errCode == 2) {
+ getApp().confirmBox("请开启GPS定位", null, 25000, !1);
+ }
+ }
+ })
+ }
+ },
+
+
+ //-- 设置最近的店为默认的店,一开始加载的时候 --
+ set_fir_store_to_def(){
+ var th=this;
+ var dd = {
+ store_id: r.stoid,
+ isstop: 0,
+ pageSize: 1,
+ page:1,
+ };
+ dd.lat = th.data.lat;
+ dd.lon = th.data.lon;
+
+ var top_store=getApp().globalData.pk_store;
+ if(top_store){
+ dd.pickup_id=top_store.pickup_id;
+ }
+
+ //----------获取门店,最近的门店----------------
+ getApp().request.promiseGet("/api/weshop/pickup/list", {
+ data: dd,
+ }).then(res => {
+ if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){
+ var top_store=res.data.data.pageData[0];
+ th.setData({
+ stoname: top_store.pickup_name,
+ sto_sele_name: top_store.pickup_name,
+ sto_sele_id: top_store.pickup_id,
+ sto_sele_distr: top_store.distr_type,
+ })
+ }
+ })
+ },
diff --git a/packageA/pages/prom_list/prom_list.js b/packageA/pages/prom_list/prom_list.js
index cb2b603..f97efbd 100644
--- a/packageA/pages/prom_list/prom_list.js
+++ b/packageA/pages/prom_list/prom_list.js
@@ -765,7 +765,15 @@ Page({
data: dd,
}).then(res => {
var e = res;
- if (e.data.code == 0) {
+ 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;
//如果有开启距离的功能，没有设置默认门店，要用最近的门店作为默认门店
if(dd.lat && !th.data.def_pick_store && th.data.bconfig && th.data.bconfig.is_sort_storage){
@@ -811,7 +819,7 @@ Page({
deal_pickup(e){
var th=this;
//单总量超出5个的时候
- if (e.data.data.total > 5) {
+ if (e.data.data.total > 10 && e.his_cate_num ){
getApp().request.get("/api/weshop/storagecategory/page", {
data: {
store_id: o.stoid,
@@ -1024,8 +1032,9 @@ Page({
//数据组装下
var em={};em.data={};em.data.data={};
em.data.data.total=new_list.length;
- em.data.data.pageData=new_list;
-
+ em.data.data.pageData=new_list;
+ em.data.his_cate_num=e.his_cate_num;
+
if(th.data.fir_def_store && !is_find_def_store && th.data.fir_def_store.pickup_id){
th.data.fir_def_store.CanOutQty=0;
//--当选择的门店是客户默认的门店的时候--
diff --git a/packageC/pages/presell/goodsInfo/buy_integral.wxml b/packageC/pages/presell/goodsInfo/buy_integral.wxml
deleted file mode 100644
index 5d268cb..0000000
--- a/packageC/pages/presell/goodsInfo/buy_integral.wxml
+++ /dev/null
@@ -1,125 +0,0 @@
-
-
-
-
-
-
-
- {{data.goods_name}}
-
-
- {{prom_integral}}积分
- +
- {{prom_price}}元
- 0积分
-
-
-
-
-
- 已售：{{prom_act.buy_num}}
- 可售：{{prom_act.limitqty-prom_act.buy_num}}
-
-
-
-
-
-
-
-
- {{def_pick_store.pickup_name}}
-
- 距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}}
-
-
-
-
-
-
-
- 选择门店
-
-
-
- 更多门店
-
-
-
- (库存不足)
-
- (库存不足)
-
- (配送不匹配)
- (库存不足)
-
-
-
- 地址:{{def_pick_store.fulladdress}}
-
-
-
-
- 商品规格
-
-
- {{item.gg}}
-
-
-
-
-
- 购买数量
-
- -
-
- +
-
-
-
-
-
-
-
-
- 配送不匹配
-
-
-
-
-
-
- 库存不足
-
-
-
-
-
- 库存不足
-
-
-
- 库存不足
-
-
-
- 请先选择门店
-
-
-
- 库存不足
-
-
- 立即兑换
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/packageC/pages/presell/goodsInfo/buy_integral_normal.wxml b/packageC/pages/presell/goodsInfo/buy_integral_normal.wxml
deleted file mode 100644
index b57806c..0000000
--- a/packageC/pages/presell/goodsInfo/buy_integral_normal.wxml
+++ /dev/null
@@ -1,145 +0,0 @@
-
-
-
-
-
-
-
- {{sele_g.goods_name}}
-
- ￥
-
- {{sele_g[card_field]}}
- {{sele_g.shop_price}}
-
-
-
- 已售：{{sele_g.sales_sum}}
-
- 可售：{{def_pick_store.CanOutQty}}
- 可售:0
-
- 可售：{{sele_g.store_count}}
-
-
-
-
-
-
-
-
-
- {{def_pick_store.pickup_name}}
-
- 距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}}
-
-
-
-
-
-
-
- 选择门店
-
-
-
- 更多门店
-
-
-
- (库存不足)
-
- (库存不足)
-
- (配送不匹配)
- (库存不足)
-
-
- 地址:{{def_pick_store.fulladdress}}
-
-
-
-
- 商品规格
-
-
- {{item.gg}}
-
-
-
-
-
- 购买数量
-
- -
-
- +
-
-
-
-
-
-
-
- 再买{{hui_condition.need}}
- ，免{{hui_condition.money}}元
- ，打{{hui_condition.sale}}折
- ，包邮
- ，送{{hui_condition.intValue}}积分
- ，送优惠券
- ，送赠品
- ，送礼包
-
-
-
-
-
-
-
-
-
- 配送不匹配
-
-
-
-
- 库存不足
-
-
-
-
-
- 库存不足
-
-
-
- 库存不足
-
-
-
- 请先选择门店
-
-
-
- 库存不足
-
-
-
- 加入购物车
- 立即购买
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/packageC/pages/presell/goodsInfo/buy_pt.wxml b/packageC/pages/presell/goodsInfo/buy_pt.wxml
deleted file mode 100644
index 62168aa..0000000
--- a/packageC/pages/presell/goodsInfo/buy_pt.wxml
+++ /dev/null
@@ -1,213 +0,0 @@
-
-
-
-
-
-
-
-
-
- {{sele_g.goods_name}}
-
-
-
-
- ￥ {{sele_g[card_field]}}
-
-
- ￥ {{sele_g.shop_price}}
-
-
- ￥ {{prom_price}}
-
-
-
-
- 已售：{{sele_g.sales_sum}}
-
- 可售：{{def_pick_store.CanOutQty}}
- 可售:0
-
- 可售：{{sele_g.store_count}}
-
-
-
-
- 已售：{{prom_act.buy_num}}
- 已售：{{prom_act.buy_num}}
- 可售：{{prom_act.goods_num-prom_act.buy_num}}
-
-
-
-
-
-
-
-
-
-
-
-
- {{def_pick_store.pickup_name}}
-
-
-
- 距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}}
-
-
-
-
-
-
-
- 选择门店
-
-
-
- 更多门店
-
-
-
- (配送不匹配)
- (库存不足)
- 地址:{{def_pick_store.fulladdress}}
-
-
-
- 商品规格
-
-
- {{item.gg}}
-
-
-
-
-
-
- {{item.gg}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 购买数量
-
- -
-
- +
-
-
-
-
-
-
- 再买{{hui_condition.need}}
- ，免{{hui_condition.money}}元
- ，打{{hui_condition.sale}}折
- ，包邮
- ，送{{hui_condition.intValue}}积分
- ，送优惠券
- ，送赠品
- ，送礼包
-
-
-
-
-
-
-
- 选择门店
-
-
-
-
- {{item.name}}
-
-
- {{item.pickup_name}}
-
-
-
-
-
- {{sec_sto.name}}
-
- {{item.pickup_name}}
-
-
-
-
-
-
-
-
-
-
-
- 配送不匹配
-
-
-
-
-
- 库存不足
-
-
-
-
-
- 库存不足
-
-
-
- 库存不足
-
-
-
- 请先选择门店
-
-
-
- 库存不足
-
-
- 立即购买
-
-
-
-
-
-
-
-
-
-
-
-
-
- 配送不匹配
-
-
- 确定
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index 546c335..e81aed8 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -309,6 +309,7 @@ Page({
}
}
+
ee.setData({ gid: gid});
if(first_leader){
console.log("log---".first_leader);
@@ -2492,6 +2493,16 @@ Page({
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;
+
+
//如果有开启距离的功能，没有设置默认门店，要用最近的门店作为默认门店
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({
@@ -2542,8 +2553,8 @@ Page({
var g_distr_type=th.data.sele_g.distr_type;
wx.hideLoading();
- //单总量超出5个的时候
- if (e.data.data.total > 5) {
+ //单总量超出10个的时候，同时门店有分类
+ if (e.data.data.total > 10 && e.his_cate_num ) {
getApp().request.get("/api/weshop/storagecategory/page", {
data: {
store_id: o.stoid,
@@ -2559,7 +2570,7 @@ Page({
var def_arr = new Array();
var ishas = 0;
//-- 开始就看5个门店 --
- for (var k = 0; k < 5; k++) {
+ for (var k = 0; k < 10; k++) {
if (k == e.data.data.pageData.length) break;
def_arr.push(e.data.data.pageData[k]);
}
@@ -2766,6 +2777,7 @@ Page({
var em={};em.data={};em.data.data={};
em.data.data.total=new_list.length;
em.data.data.pageData=new_list;
+ em.data.data.pageData=new_list;
//--如果找到默认门店,同时也应该判断配送方式对不对--
if(th.data.fir_def_store && !is_find_def_store && th.data.fir_def_store.pickup_id && (g_distr_type==0 || th.data.fir_def_store.distr_type==0 || th.data.def_pick_store.distr_type==g_distr_type ) ){
@@ -5580,7 +5592,11 @@ Page({
item.act=res.data.data;
func(isok);
})
- }
+ }
+
+
+
+
diff --git a/pages/goods/goodsInfo/goodsInfo.wxss b/pages/goods/goodsInfo/goodsInfo.wxss
index 8a4e258..9f87240 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxss
+++ b/pages/goods/goodsInfo/goodsInfo.wxss
@@ -2731,7 +2731,7 @@ button.custom-service::after{
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
- width: calc(100% - 220rpx);
+ width: calc(100% - 210rpx);
z-index: 1000;
}
.mask {
diff --git a/pages/index/index/index.wxml b/pages/index/index/index.wxml
index 9b02c4f..2611cc5 100644
--- a/pages/index/index/index.wxml
+++ b/pages/index/index/index.wxml
@@ -139,7 +139,7 @@
-
+
@@ -181,7 +181,8 @@
-
+
-
+
+ - -->
diff --git a/pages/team/team_show/team_show.js b/pages/team/team_show/team_show.js
index acb1e89..1dc7344 100644
--- a/pages/team/team_show/team_show.js
+++ b/pages/team/team_show/team_show.js
@@ -1123,6 +1123,15 @@ Page({
}).then(res => {
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;
//如果有开启距离的功能，没有设置默认门店，要用最近的门店作为默认门店
if(dd.lat && !th.data.def_pick_store && th.data.bconfig && th.data.bconfig.is_sort_storage){
@@ -1165,7 +1174,7 @@ Page({
var th=this;
var g_distr_type=th.data.goods.distr_type;
//单总量超出5个的时候
- if (e.data.data.total > 5) {
+ if (e.data.data.total > 10 && e.his_cate_num) {
getApp().request.get("/api/weshop/storagecategory/page", {
data: {
store_id: o.stoid,