diff --git a/App.vue b/App.vue index c243689e..cc6cfdb4 100644 --- a/App.vue +++ b/App.vue @@ -60,15 +60,6 @@ // 全站阻止打开商品详情页面(0 否, 1 是) is_forbid_to_goods_detail: 0, - // 门店详情顶部导航返回按钮(0 否, 1 是) - is_realstore_top_nav_back: 1, - - // 门店详情搜索框内扫码加购(0否, 1是) - is_realstore_top_search_scan: 1, - - // 门店详情阻止跳转到商品详情页面去(0否, 1是) - is_realstore_forbid_to_goods_detail: 0, - // 开启浮动客服、前提是后台需要开启客服功能(0 否, 1 是) is_online_service_fixed: 1, @@ -99,10 +90,22 @@ // 强制使用文字作为logo(默认当前指定logo->后台站点设置手机端图片logo->后台手机管理小程序配置名称->站点设置中的站点名称) is_home_logo_use_text: 0, - + // 首页开启地理位置选择(0否, 1是)优先级高于logo展示 is_home_location_choice: 1, + // 门店详情顶部导航返回按钮(0 否, 1 是) + is_realstore_top_nav_back: 1, + + // 门店详情搜索框内扫码加购(0否, 1是) + is_realstore_top_search_scan: 1, + + // 门店详情阻止跳转到商品详情页面去(0否, 1是) + is_realstore_forbid_to_goods_detail: 0, + + // 钱包插件货币符号使用当前 currency_symbol 数据的固定值(0否, 1是) + is_wallet_use_fixed_currency_symbol: 0, + // tabbar页面 tabbar_pages: ['/pages/index/index', '/pages/goods-category/goods-category', '/pages/cart/cart', '/pages/user/user'], diff --git a/components/realstore-cart/realstore-cart.vue b/components/realstore-cart/realstore-cart.vue index 8864dd77..a6ab7d47 100644 --- a/components/realstore-cart/realstore-cart.vue +++ b/components/realstore-cart/realstore-cart.vue @@ -256,18 +256,18 @@ if(this.info.status_info.status != 1) { btn_status = false; btn_text = this.info.status_info.msg; - } - - // 购物车是否存在商品 - if((this.cart || null) == null || parseInt(this.cart.buy_number || 0) == 0) { - btn_status = false; - btn_text = '未加购'; } else { - // 起步价 - var msg = this.starting_price_handle(); - if(msg !== null) { + // 购物车是否存在商品 + if((this.cart || null) == null || parseInt(this.cart.buy_number || 0) == 0) { btn_status = false; - btn_text = msg; + btn_text = '未加购'; + } else { + // 起步价 + var msg = this.starting_price_handle(); + if(msg !== null) { + btn_status = false; + btn_text = msg; + } } } diff --git a/components/realstore-list/realstore-list.vue b/components/realstore-list/realstore-list.vue index 96ff19b7..affdd34d 100644 --- a/components/realstore-list/realstore-list.vue +++ b/components/realstore-list/realstore-list.vue @@ -2,7 +2,7 @@ - + @@ -72,6 +72,10 @@ export default { type: Array, default: () => [], }, + propRealstoreDetailQuery: { + type: String, + default: '', + }, }, // 属性值改变监听 watch: { diff --git a/components/search/search.vue b/components/search/search.vue index 605b5420..90a20205 100644 --- a/components/search/search.vue +++ b/components/search/search.vue @@ -217,6 +217,18 @@ z-index: 2; } + .search-content.sm .search-icon { + padding-top: 16rpx; + } + .search-content.sm .input { + height: 60rpx; + line-height: 60rpx; + } + .search-content.sm .search-btn { + height: 50rpx; + line-height: 50rpx; + } + .search-content.md .search-icon { padding-top: 20rpx; } diff --git a/pages/goods-detail/goods-detail.vue b/pages/goods-detail/goods-detail.vue index 8e4f5cb9..939b9e6f 100644 --- a/pages/goods-detail/goods-detail.vue +++ b/pages/goods-detail/goods-detail.vue @@ -540,7 +540,7 @@ - + 无相关门店信息 diff --git a/pages/index/index.css b/pages/index/index.css index 617f4f6e..cb53e336 100644 --- a/pages/index/index.css +++ b/pages/index/index.css @@ -50,15 +50,15 @@ * 搜索 */ .search-fixed-seat { - padding-top: 72rpx; + padding-top: 78rpx; /* #ifdef MP-TOUTIAO */ - padding-top: 50rpx; + padding-top: 58rpx; /* #endif */ } .search-fixed-seat.nav-enable-search { - padding-top: 140rpx; + padding-top: 146rpx; /* #ifdef MP-TOUTIAO */ - padding-top: 82rpx; + padding-top: 88rpx; /* #endif */ } .search-content-fixed { diff --git a/pages/index/index.vue b/pages/index/index.vue index a57904d4..e20e1bc8 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -51,14 +51,14 @@ - @onicon="search_icon_event" propIcon="icon-mendian-sousuosm" :propIsIconOnEvent="true" > - + diff --git a/pages/plugins/realstore/detail/detail.css b/pages/plugins/realstore/detail/detail.css index a20adeb3..786d3fa6 100644 --- a/pages/plugins/realstore/detail/detail.css +++ b/pages/plugins/realstore/detail/detail.css @@ -130,6 +130,10 @@ page { .goods-list .goods-base .buy-number { min-width: 32rpx; } +.goods-list .goods-item.item-highlight { + box-shadow: 0rpx 9rpx 20rpx 0px rgba(0, 0, 0, 0.1); + background: #F7FBF6 !important; +} /** * 客服弹窗 diff --git a/pages/plugins/realstore/detail/detail.vue b/pages/plugins/realstore/detail/detail.vue index cc2828ea..f7fd4b27 100644 --- a/pages/plugins/realstore/detail/detail.vue +++ b/pages/plugins/realstore/detail/detail.vue @@ -162,41 +162,43 @@ - - - - - - - {{ item.title }} - {{ item.simple_desc }} - - - - {{ currency_symbol }} - {{ item.min_price }} + + + + + + + + {{ item.title }} + {{ item.simple_desc }} - - - - - - - {{ item.buy_number }} - - - - - - - {{ item.is_error_msg }} - + + + {{ currency_symbol }} + {{ item.min_price }} + + + + + + + + {{ item.buy_number }} + + + + + + + {{ item.is_error_msg }} + + - + @@ -350,6 +352,7 @@ onPullDownRefresh() { this.setData({ data_page: 1, + data_list_loding_status: (this.data_list_loding_status == 2) ? 1 : this.data_list_loding_status }); this.reset_scroll(); this.get_detail_init(); @@ -500,6 +503,10 @@ var temp_search_nav_sort = this.search_nav_sort_list; post_data['order_by_type'] = temp_search_nav_sort[temp_index]['sort'] == 'desc' ? 'asc' : 'desc'; post_data['order_by_field'] = temp_search_nav_sort[temp_index]['field']; + // 指定商品 + if((this.params.source_goods_id || null) != null) { + post_data['source_goods_id'] = this.params.source_goods_id; + } // 获取数据 uni.request({ @@ -511,6 +518,16 @@ uni.stopPullDownRefresh(); if (res.data.code == 0) { var data = res.data.data; + // 存在参数指定来源商品id则清空 + if((this.params.source_goods_id || null) != null) { + var temp_params = this.params; + delete temp_params['source_goods_id']; + this.setData({ + params: temp_params + }); + } + + // 列表数据处理 if (data.data.length > 0) { if (this.data_page <= 1) { var temp_data_list = data.data; diff --git a/pages/plugins/wallet/recharge/recharge.vue b/pages/plugins/wallet/recharge/recharge.vue index 244a7b2a..cea54d4f 100644 --- a/pages/plugins/wallet/recharge/recharge.vue +++ b/pages/plugins/wallet/recharge/recharge.vue @@ -53,7 +53,8 @@ -