diff --git a/App.vue b/App.vue index 06ae2cd6..1c5f4efe 100644 --- a/App.vue +++ b/App.vue @@ -6,13 +6,13 @@ // 基础配置 // 数据接口请求地址 // request_url: 'https://new.shopxo.vip/', - // request_url: 'https://d1.shopxo.vip/', - request_url: 'http://shopxo.com/', + request_url: 'https://d1.shopxo.vip/', + // request_url: 'http://shopxo.com/', // 静态资源地址(如系统根目录不在public目录下面请在静态地址后面加public目录、如:https://d1.shopxo.vip/public/) // static_url: 'https://new.shopxo.vip/', - // static_url: 'https://d1.shopxo.vip/', - static_url: 'http://shopxo.com/', + static_url: 'https://d1.shopxo.vip/', + // static_url: 'http://shopxo.com/', // 系统类型(默认default、如额外独立小程序、可与程序分身插件实现不同主体小程序及支付独立) system_type: 'default', diff --git a/components/realstore-cart/realstore-cart.vue b/components/realstore-cart/realstore-cart.vue index fd4d5560..11ca1a69 100644 --- a/components/realstore-cart/realstore-cart.vue +++ b/components/realstore-cart/realstore-cart.vue @@ -152,8 +152,15 @@ // 店铺状态正常、是否指定商品、如果不存在操作按钮、不可以加入购物车则置空 var realstore_goods_data = params.realstore_goods_data || null; var realstore_goods_data_cart_status = false; - if(realstore_goods_data != null && (realstore_goods_data.buy_button || null) != null && (realstore_goods_data.buy_button.is_cart || 0) == 1) { - realstore_goods_data_cart_status = true; + if(realstore_goods_data != null && (realstore_goods_data.buy_button || null) != null && realstore_goods_data.buy_button.data.length > 0) { + var buy_button = realstore_goods_data.buy_button.data; + var arr = ['cart', 'buy', 'plugins-batchbuy-button-cart', 'plugins-batchbuy-button-buy']; + for(var i in buy_button) { + if(arr.indexOf(buy_button[i]['type']) != -1) { + realstore_goods_data_cart_status = true; + break; + } + } } this.setData({ params: params || {}, diff --git a/pages/extraction-address/extraction-address.vue b/pages/extraction-address/extraction-address.vue index 7d99d1f7..c89d63dc 100644 --- a/pages/extraction-address/extraction-address.vue +++ b/pages/extraction-address/extraction-address.vue @@ -20,8 +20,8 @@ - - 距离 + + 距您 {{ item.distance_value }} {{ item.distance_unit }} diff --git a/pages/index/index.vue b/pages/index/index.vue index b49be7f6..a57904d4 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -16,9 +16,9 @@ - + - {{user_location.text || ''}} + {{user_location.text || ''}} diff --git a/pages/plugins/realstore/index/index.vue b/pages/plugins/realstore/index/index.vue index 125578ad..99fc0c17 100644 --- a/pages/plugins/realstore/index/index.vue +++ b/pages/plugins/realstore/index/index.vue @@ -8,9 +8,9 @@ - + - {{user_location.text || ''}} + {{user_location.text || ''}} diff --git a/pages/plugins/realstore/search/search.vue b/pages/plugins/realstore/search/search.vue index 94269e7d..28140f19 100644 --- a/pages/plugins/realstore/search/search.vue +++ b/pages/plugins/realstore/search/search.vue @@ -6,9 +6,9 @@ - + - {{user_location.text || ''}} + {{user_location.text || ''}}