diff --git a/pages/cart/cart.vue b/pages/cart/cart.vue index e5bd2bd4..cccc7e56 100644 --- a/pages/cart/cart.vue +++ b/pages/cart/cart.vue @@ -14,7 +14,7 @@ - + @@ -26,7 +26,7 @@ - + {{item.title}} diff --git a/pages/goods-detail/goods-detail.vue b/pages/goods-detail/goods-detail.vue index 908ff58f..a0cb7b23 100644 --- a/pages/goods-detail/goods-detail.vue +++ b/pages/goods-detail/goods-detail.vue @@ -340,19 +340,19 @@ {{nav_home_button_info.text}} - - - - - - - - - - 购物车 - - + + + + + + + + + + 购物车 + + @@ -788,15 +788,11 @@ // 底部业务导航按钮数量处理 var value = 4; - if(this.is_opt_back == 1) { - value = 2; - } else { - if(this.is_opt_cart != 1) { - value--; - } - if(this.online_service_status != 1) { - value--; - } + if(this.is_opt_cart != 1) { + value--; + } + if(this.online_service_status != 1) { + value--; } this.setData({bottom_nav_bus_number: value}); } else { @@ -1044,6 +1040,14 @@ buy_event_type: type }); break; + // url事件 + case 'url': + if(value == null) { + app.globalData.showToast('url事件为空'); + return false; + } + app.globalData.url_open(value); + break; // 门店 case 'plugins-realstore' : var temp_data_list = this.plugins_realstore_data; diff --git a/pages/goods-search/goods-search.vue b/pages/goods-search/goods-search.vue index 58f81230..a857d5a4 100644 --- a/pages/goods-search/goods-search.vue +++ b/pages/goods-search/goods-search.vue @@ -18,7 +18,7 @@ - + {{item.title}} diff --git a/pages/index/index.vue b/pages/index/index.vue index 0db009be..cb785b8f 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -164,7 +164,7 @@ - + {{goods.title}} @@ -214,7 +214,7 @@ -{{item.user.province}} - + {{item.title}} diff --git a/pages/plugins/activity/detail/detail.vue b/pages/plugins/activity/detail/detail.vue index e18b123f..25b4c925 100644 --- a/pages/plugins/activity/detail/detail.vue +++ b/pages/plugins/activity/detail/detail.vue @@ -26,7 +26,7 @@ - + {{item.title}} diff --git a/pages/plugins/blog/detail/detail.vue b/pages/plugins/blog/detail/detail.vue index 46243bfe..57c515e1 100644 --- a/pages/plugins/blog/detail/detail.vue +++ b/pages/plugins/blog/detail/detail.vue @@ -69,7 +69,7 @@ - + {{item.title}} diff --git a/pages/plugins/blog/index/index.vue b/pages/plugins/blog/index/index.vue index ec8c6c9c..c86b8a66 100644 --- a/pages/plugins/blog/index/index.vue +++ b/pages/plugins/blog/index/index.vue @@ -83,7 +83,7 @@ - + {{item.title}} diff --git a/pages/plugins/label/detail/detail.vue b/pages/plugins/label/detail/detail.vue index a73b0fce..68c295aa 100644 --- a/pages/plugins/label/detail/detail.vue +++ b/pages/plugins/label/detail/detail.vue @@ -23,7 +23,7 @@ - + {{item.title}} diff --git a/pages/plugins/points/index/index.vue b/pages/plugins/points/index/index.vue index ba413549..b7ebedf1 100644 --- a/pages/plugins/points/index/index.vue +++ b/pages/plugins/points/index/index.vue @@ -39,7 +39,7 @@ - + {{item.goods.title}} diff --git a/pages/plugins/realstore/detail/detail.vue b/pages/plugins/realstore/detail/detail.vue index bdc43d80..3963b9bc 100644 --- a/pages/plugins/realstore/detail/detail.vue +++ b/pages/plugins/realstore/detail/detail.vue @@ -149,9 +149,13 @@ - + 已选商品 + + 没有已加购的商品? + 切换下单类型 + @@ -192,6 +196,10 @@ + + 没有已加购的商品? + 切换下单类型 + @@ -382,9 +390,9 @@ // 获取数据、仅首次调用 // 获取列表接口和购物车 if(this.is_first == 1) { - this.setData({is_first: 0}); this.get_data_list(); - this.get_cart_data(); + this.get_cart_data(this.is_first); + this.setData({is_first: 0}); } else { // 非首次赋值购物车数据 this.setData({ @@ -415,7 +423,7 @@ }); }, - // 获取数据-获取数据 + // 获取数据-商品列表 get_data_list(is_mandatory) { // 分页是否还有数据 if ((is_mandatory || 0) == 0) { @@ -839,8 +847,8 @@ }); }, - // 获取购物车数据 - get_cart_data() { + // 获取购物车数据、参数是否首次请求 + get_cart_data(is_first = 0) { uni.request({ url: app.globalData.get_request_url("cartdata", "detail", "realstore"), method: 'POST', @@ -854,6 +862,13 @@ cart: res.data.data }); this.cart_data_list_handle(); + + // 首次判断是否需要开启购物车 + if(is_first == 1 && (this.params.is_show_cart || 0) == 1) { + this.setData({ + cart_status: true + }); + } } else { app.globalData.showToast('请求失败,请重试!'); } diff --git a/pages/plugins/realstore/orderallot-detail/orderallot-detail.vue b/pages/plugins/realstore/orderallot-detail/orderallot-detail.vue index c3e5a022..4d761808 100644 --- a/pages/plugins/realstore/orderallot-detail/orderallot-detail.vue +++ b/pages/plugins/realstore/orderallot-detail/orderallot-detail.vue @@ -23,7 +23,7 @@ 商品信息 - + {{item.title}} diff --git a/pages/plugins/seckill/index/index.vue b/pages/plugins/seckill/index/index.vue index c1a47a7e..5422259b 100644 --- a/pages/plugins/seckill/index/index.vue +++ b/pages/plugins/seckill/index/index.vue @@ -26,7 +26,7 @@ - + {{item.title}} diff --git a/pages/plugins/shop/detail/detail.vue b/pages/plugins/shop/detail/detail.vue index 8a36b8a1..bb40fca6 100644 --- a/pages/plugins/shop/detail/detail.vue +++ b/pages/plugins/shop/detail/detail.vue @@ -116,7 +116,7 @@ - + {{item.title}} diff --git a/pages/plugins/shop/search/search.vue b/pages/plugins/shop/search/search.vue index a4465453..c2634348 100644 --- a/pages/plugins/shop/search/search.vue +++ b/pages/plugins/shop/search/search.vue @@ -17,7 +17,7 @@ - + {{item.title}} diff --git a/pages/plugins/signin/index-detail/index-detail.vue b/pages/plugins/signin/index-detail/index-detail.vue index 4c79b8ef..d078a6a4 100644 --- a/pages/plugins/signin/index-detail/index-detail.vue +++ b/pages/plugins/signin/index-detail/index-detail.vue @@ -56,7 +56,7 @@ - + {{item.title}} diff --git a/pages/user-favor/user-favor.vue b/pages/user-favor/user-favor.vue index eb32dfad..c4a54053 100644 --- a/pages/user-favor/user-favor.vue +++ b/pages/user-favor/user-favor.vue @@ -3,7 +3,7 @@ - + {{item.title}} diff --git a/pages/user-goods-browse/user-goods-browse.vue b/pages/user-goods-browse/user-goods-browse.vue index e2fc2bb5..61750f2d 100644 --- a/pages/user-goods-browse/user-goods-browse.vue +++ b/pages/user-goods-browse/user-goods-browse.vue @@ -3,7 +3,7 @@ - + {{item.title}} diff --git a/pages/user-order-comments/user-order-comments.vue b/pages/user-order-comments/user-order-comments.vue index ae39fa44..f72d32e1 100644 --- a/pages/user-order-comments/user-order-comments.vue +++ b/pages/user-order-comments/user-order-comments.vue @@ -5,7 +5,7 @@
- + diff --git a/pages/user-order-detail/user-order-detail.vue b/pages/user-order-detail/user-order-detail.vue index c801baf8..867c4cf6 100644 --- a/pages/user-order-detail/user-order-detail.vue +++ b/pages/user-order-detail/user-order-detail.vue @@ -23,7 +23,7 @@ 商品信息 - + {{item.title}} diff --git a/pages/user-orderaftersale-detail/user-orderaftersale-detail.vue b/pages/user-orderaftersale-detail/user-orderaftersale-detail.vue index 9cb3a3b5..868ff87d 100644 --- a/pages/user-orderaftersale-detail/user-orderaftersale-detail.vue +++ b/pages/user-orderaftersale-detail/user-orderaftersale-detail.vue @@ -4,7 +4,7 @@ - + {{order_data.items.title}}