diff --git a/App.vue b/App.vue index bf4f4215..28bf600d 100644 --- a/App.vue +++ b/App.vue @@ -67,11 +67,11 @@ // tabbar页面 tabbar_pages: ['/pages/index/index', '/pages/goods-category/goods-category', '/pages/cart/cart', '/pages/user/user'], // 请求地址 - // request_url: 'https://d1.shopxo.vip/', - request_url: 'https://new.shopxo.vip/', + // request_url: 'https://new.shopxo.vip/', + request_url: 'http://shopxo.com/', // 静态资源地址(如系统根目录不在public目录下面请在静态地址后面加public目录、如:https://d1.shopxo.vip/public/) - // static_url: 'https://d1.shopxo.vip/', - static_url: 'https://new.shopxo.vip/', + // static_url: 'https://new.shopxo.vip/', + static_url: 'http://shopxo.com/', // 系统类型(默认default、如额外独立小程序、可与程序分身插件实现不同主体小程序及支付独立) system_type: 'default', // 基础信息 diff --git a/components/cart/cart.vue b/components/cart/cart.vue index 23dd6bea..e2fc710e 100644 --- a/components/cart/cart.vue +++ b/components/cart/cart.vue @@ -3,7 +3,7 @@ - + @@ -77,10 +77,10 @@ - + 猜你喜欢 - + @@ -857,6 +857,9 @@ /** * 商品列表 */ + .cart-page { + margin-bottom: 40rpx; + } .scroll-box.active { height: calc(100vh - 125rpx); /* 125rpx */ diff --git a/components/search/search.vue b/components/search/search.vue index 2b02bcf7..d409dca0 100644 --- a/components/search/search.vue +++ b/components/search/search.vue @@ -1,7 +1,7 @@ diff --git a/pages/index/index.vue b/pages/index/index.vue index 7fa8d384..9be453c1 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -57,7 +57,9 @@ - + + + 最新资讯 diff --git a/pages/plugins/delivery/logistics/logistics.vue b/pages/plugins/delivery/logistics/logistics.vue index 95a30cb0..dfa30ad3 100644 --- a/pages/plugins/delivery/logistics/logistics.vue +++ b/pages/plugins/delivery/logistics/logistics.vue @@ -11,7 +11,6 @@ :scale="scale" :markers="markers" :polyline="polyline" - @markertap="marker_tap_event" > @@ -160,40 +159,7 @@ // 文本事件 text_event(e) { app.globalData.text_event_handle(e); - }, - - // 打开url事件 - url_event(e) { - app.globalData.url_event(e); - }, - - // 地图查看 - address_map_event(e) { - var index = e.currentTarget.dataset.index; - var type = e.currentTarget.dataset.type || null; - if(type == 'map') { - this.address_map_handle(this.markers_active_data[index]['address_data']); - } else { - var temp_data = this.data_list; - if ((temp_data[index] || null) == null || (temp_data[index]["address_data"] || null) == null) { - app.globalData.showToast("地址有误"); - return false; - } - this.address_map_handle(temp_data[index]["address_data"]); - } - }, - - // 地址打开地图 - address_map_handle(ads) { - var name = ads.alias || ads.name || ""; - app.globalData.open_location(ads.lng, ads.lat, name, ads.address_info); - }, - - // 点击标记点事件 - marker_tap_event(e) { - var index = e.detail.markerId; - console.log(index) - }, + } }, }; diff --git a/pages/plugins/membershiplevelvip/user/user.vue b/pages/plugins/membershiplevelvip/user/user.vue index ec597067..4a5427c2 100644 --- a/pages/plugins/membershiplevelvip/user/user.vue +++ b/pages/plugins/membershiplevelvip/user/user.vue @@ -104,7 +104,7 @@ - + @@ -165,7 +165,7 @@ - + diff --git a/pages/plugins/realstore/detail/detail.vue b/pages/plugins/realstore/detail/detail.vue index c87bd369..ad923d50 100644 --- a/pages/plugins/realstore/detail/detail.vue +++ b/pages/plugins/realstore/detail/detail.vue @@ -1,6 +1,6 @@