diff --git a/App.vue b/App.vue index a388ebeb..edff031c 100644 --- a/App.vue +++ b/App.vue @@ -35,8 +35,12 @@ is_share_use_image: 1, // 商品详情页底部导航是否开启购物车功能(0 否, 1 是) is_goods_bottom_opt_cart: 1, + // 商品详情页底部导航存在指定返回参数[is_opt_back=1]展示返回按钮(0 否, 1 是) + is_goods_bottom_opt_back: 1, // 门店详情顶部导航返回按钮(0 否, 1 是) is_realstore_top_nav_back: 1, + // 开启浮动客服、前提是后台需要开启客服功能(0 否, 1 是) + is_online_service_fixed: 1, // 分类页面商品列表模式一级分类使用图标类型(0 大图片, 1 icon图标) category_goods_model_icon_type: 0, // tabbar页面 diff --git a/components/online-service/online-service.vue b/components/online-service/online-service.vue index e6789a56..2f133c60 100644 --- a/components/online-service/online-service.vue +++ b/components/online-service/online-service.vue @@ -27,32 +27,34 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + @@ -67,6 +69,7 @@ chat_url: null, common_app_customer_service_tel: null, online_service_status: 0, + is_online_service_fixed: app.globalData.data.is_online_service_fixed, mini_alipay_tnt_inst_id: null, mini_alipay_scene: null, mini_alipay_openid: null, diff --git a/manifest.json b/manifest.json index a3f4ae8f..1a53bd8b 100644 --- a/manifest.json +++ b/manifest.json @@ -49,7 +49,7 @@ }, "quickapp" : {}, "mp-weixin" : { - "appid" : "", + "appid" : "wxda7779770f53e901", "setting" : { "urlCheck" : false, "es6" : true, diff --git a/pages/goods-detail/goods-detail.vue b/pages/goods-detail/goods-detail.vue index 9e40b789..692bdebf 100644 --- a/pages/goods-detail/goods-detail.vue +++ b/pages/goods-detail/goods-detail.vue @@ -327,7 +327,7 @@ - + @@ -342,7 +342,7 @@ - + @@ -644,10 +644,9 @@ is_single_page: app.globalData.is_current_single_page() || 0, // 底部导航业务操作按钮数量 bottom_nav_bus_number: 4, - // 是否开启客服 - online_service_status: 0, // 是否底部导航展示返回按钮 is_opt_back: 0, + is_goods_bottom_opt_back: 0, // 是否开启购物车 is_opt_cart: 1, // 滚动监听值 @@ -722,11 +721,12 @@ // 是否自定义购买事件 buy_event_type: params.opt_buy_event_type || 'buy', // 是否指定开启购买弹窗、默认0否、1是 - popup_status: (parseInt(params.is_opt_buy_status) || 0) == 1, + popup_status: parseInt(params.is_opt_buy_status || 0) == 1, // 是否底部导航展示返回按钮 is_opt_back: parseInt(params.is_opt_back || 0), + is_goods_bottom_opt_back: app.globalData.data.is_goods_bottom_opt_back || 0, // 是否自定义购物车状态 - is_opt_cart: (params.is_opt_cart === undefined) ? (app.globalData.data.is_goods_bottom_opt_cart || 0) : (params.is_opt_cart || 0), + is_opt_cart: (params.is_opt_cart === undefined) ? (app.globalData.data.is_goods_bottom_opt_cart || 0) : parseInt(params.is_opt_cart || 0), }); // 数据加载 @@ -793,11 +793,10 @@ if ((status || false) == true) { this.setData({ currency_symbol: app.globalData.get_config('currency_symbol'), - online_service_status: app.globalData.get_config('config.common_app_is_online_service', 0), + common_app_is_online_service: app.globalData.get_config('config.common_app_is_online_service', 0), common_app_is_use_mobile_detail: app.globalData.get_config('config.common_app_is_use_mobile_detail'), common_is_goods_detail_show_photo: app.globalData.get_config('config.common_is_goods_detail_show_photo'), common_is_show_goods_comments: app.globalData.get_config('config.common_is_show_goods_comments', 1), - common_app_is_online_service: app.globalData.get_config('config.common_app_is_online_service'), common_app_customer_service_tel: app.globalData.get_config('config.common_app_customer_service_tel'), plugins_is_goods_detail_poster: app.globalData.get_config('plugins_base.distribution.data.is_goods_detail_poster'), plugins_intellectstools_config: app.globalData.get_config('plugins_base.intellectstools.data'), @@ -808,7 +807,7 @@ if(this.is_opt_cart != 1) { value--; } - if(this.online_service_status != 1) { + if(this.common_app_is_online_service != 1) { value--; } this.setData({bottom_nav_bus_number: value});