diff --git a/App.vue b/App.vue index c3f6a85c..7fef10f5 100644 --- a/App.vue +++ b/App.vue @@ -57,11 +57,23 @@ ], // 公共配置 + // 是否多商户店铺id + plugins_shop_id: null, + + // 是否多门店门店id + plugins_realstore_id: null, + // 是否使用原生菜单（0否, 1是） is_use_native_tabbar: 0, - // 分享及转发使用页面设置的默认图片及系统默认图片（0否, 1是） - is_share_use_image: 1, + // 购物车页面顶部导航强制关闭门店（0否, 1是） + is_cart_header_close_realstore: 1, + + // 购物车底部猜你喜欢是否显示（0否, 1是） + is_cart_bottom_guess_you_like: 1, + + // 购物车底部猜你喜欢是否显示（0否, 1是） + is_goods_detail_bottom_guess_you_like: 1, // 商品详情页底部导航是否开启购物车功能（0否, 1是） is_goods_bottom_opt_cart: 1, @@ -72,6 +84,9 @@ // 全站阻止打开商品详情页面（0否, 1是） is_forbid_to_goods_detail: 0, + // 分享及转发使用页面设置的默认图片及系统默认图片（0否, 1是） + is_share_use_image: 1, + // 开启浮动客服、前提是后台需要开启客服功能（0否, 1是） is_online_service_fixed: 1, diff --git a/components/cart/cart.vue b/components/cart/cart.vue index 430e76cd..0b282be7 100644 --- a/components/cart/cart.vue +++ b/components/cart/cart.vue @@ -584,20 +584,22 @@ this.setData({ plugins_realstore_data: realstore, }); - // 门店为空、还没有初始门店信息，初始门店信息不在当前列表中则 赋值门店初始信息和门店购物车初始化 - if ( - realstore == null || - this.plugins_realstore_info == null || - !realstore - .map(function (v) { - return v.id; - }) - .includes(this.plugins_realstore_info.id) - ) { - this.setData({ - plugins_realstore_info: realstore == null ? null : realstore[0], - }); - this.realstore_cart_data_init(); + // 门店为空、还没有初始门店信息，初始门店信息不在当前列表中则 赋值门店初始信息和门店购物车初始化 + if(app.globalData.data.is_cart_header_close_realstore != 1) { + if( + realstore == null || + this.plugins_realstore_info == null || + !realstore + .map(function (v) { + return v.id; + }) + .includes(this.plugins_realstore_info.id) + ) { + this.setData({ + plugins_realstore_info: realstore == null ? null : realstore[0], + }); + this.realstore_cart_data_init(); + } } // 选择处理 @@ -1078,82 +1080,84 @@ }, // 猜你喜欢 - get_data_list(is_mandatory) { - // 分页是否还有数据 - if ((is_mandatory || 0) == 0) { - if (this.goods_bottom_line_status == true) { + get_data_list(is_mandatory) { + if(app.globalData.data.is_cart_bottom_guess_you_like == 1) { + // 分页是否还有数据 + if ((is_mandatory || 0) == 0) { + if (this.goods_bottom_line_status == true) { + return false; + } + } + + // 是否加载中 + if (this.goods_is_loading == 1) { return false; } - } + this.setData({ + goods_is_loading: 1, + }); - // 是否加载中 - if (this.goods_is_loading == 1) { - return false; - } - this.setData({ - goods_is_loading: 1, - }); + // 获取数据 + uni.request({ + url: app.globalData.get_request_url('datalist', 'search'), + method: 'POST', + data: { + page: this.goods_page, + }, + dataType: 'json', + success: (res) => { + if (res.data.code == 0) { + var data = res.data.data; + if (data.data.length > 0) { + if (this.goods_page <= 1) { + var temp_data_list = data.data; + } else { + var temp_data_list = this.goods_list || []; + var temp_data = data.data; + for (var i in temp_data) { + temp_data_list.push(temp_data[i]); + } + } + this.setData({ + goods_list: temp_data_list, + random_value: Math.random(), + goods_total: data.total, + goods_page_total: data.page_total, + goods_page: this.goods_page + 1, + goods_is_loading: 0, + }); - // 获取数据 - uni.request({ - url: app.globalData.get_request_url('datalist', 'search'), - method: 'POST', - data: { - page: this.goods_page, - }, - dataType: 'json', - success: (res) => { - if (res.data.code == 0) { - var data = res.data.data; - if (data.data.length > 0) { - if (this.goods_page <= 1) { - var temp_data_list = data.data; + // 是否还有数据 + this.setData({ + goods_bottom_line_status: this.goods_page > 1 && this.goods_page > this.goods_page_total, + }); } else { - var temp_data_list = this.goods_list || []; - var temp_data = data.data; - for (var i in temp_data) { - temp_data_list.push(temp_data[i]); + this.setData({ + goods_total: 0, + goods_is_loading: 0, + }); + if (this.goods_page <= 1) { + this.setData({ + goods_list: [], + goods_bottom_line_status: false, + }); } } - this.setData({ - goods_list: temp_data_list, - random_value: Math.random(), - goods_total: data.total, - goods_page_total: data.page_total, - goods_page: this.goods_page + 1, - goods_is_loading: 0, - }); - - // 是否还有数据 - this.setData({ - goods_bottom_line_status: this.goods_page > 1 && this.goods_page > this.goods_page_total, - }); } else { this.setData({ - goods_total: 0, goods_is_loading: 0, }); - if (this.goods_page <= 1) { - this.setData({ - goods_list: [], - goods_bottom_line_status: false, - }); - } + app.globalData.showToast(res.data.msg); } - } else { + }, + fail: () => { this.setData({ goods_is_loading: 0, }); - app.globalData.showToast(res.data.msg); - } - }, - fail: () => { - this.setData({ - goods_is_loading: 0, - }); - app.globalData.showToast(this.$t('common.internet_error_tips')); - }, - }); + app.globalData.showToast(this.$t('common.internet_error_tips')); + }, + }); + } }, // 猜你喜欢加入购物车回调 diff --git a/pages/goods-detail/goods-detail.vue b/pages/goods-detail/goods-detail.vue index e104cbf6..f9eee451 100644 --- a/pages/goods-detail/goods-detail.vue +++ b/pages/goods-detail/goods-detail.vue @@ -931,12 +931,13 @@ // 基础数据 var plugins_seckill_data = data.plugins_seckill_data || null; + var is_guess_you_like = app.globalData.data.is_goods_detail_bottom_guess_you_like; var upd_data = { random_value: Math.random(), data_loading_status: 1, goods_bottom_nav_status: true, goods_bottom_opt_nav_status: true, - guess_you_like: data.guess_you_like || [], + guess_you_like: (is_guess_you_like == 1) ? (data.guess_you_like || []) : [], nav_more_list: data.nav_more_list || [], buy_button: data.buy_button || null, buy_left_nav: data.buy_left_nav || [], diff --git a/pages/plugins/realstore/detail/detail.vue b/pages/plugins/realstore/detail/detail.vue index d9b5e07c..c0e194bc 100644 --- a/pages/plugins/realstore/detail/detail.vue +++ b/pages/plugins/realstore/detail/detail.vue @@ -428,8 +428,14 @@ app.globalData.page_event_onload_handle(params); // 设置参数 + params = app.globalData.launch_params_handle(params); + // 是否指定门店id + var realstore_id = app.globalData.data.plugins_realstore_id || null; + if(realstore_id != null) { + params['id'] = realstore_id; + } this.setData({ - params: app.globalData.launch_params_handle(params), + params: params, }); }, diff --git a/pages/plugins/shop/detail/detail.vue b/pages/plugins/shop/detail/detail.vue index 29a9bcab..7568d3c4 100644 --- a/pages/plugins/shop/detail/detail.vue +++ b/pages/plugins/shop/detail/detail.vue @@ -110,9 +110,15 @@ // 调用公共事件方法 app.globalData.page_event_onload_handle(params); - // 设置参数 + // 设置参数 + params = app.globalData.launch_params_handle(params); + // 是否指定店铺id + var shop_id = app.globalData.data.plugins_shop_id || null; + if(shop_id != null) { + params['id'] = shop_id; + } this.setData({ - params: app.globalData.launch_params_handle(params) + params: params }); },