diff --git a/App.vue b/App.vue index dc722102..99145671 100644 --- a/App.vue +++ b/App.vue @@ -71,11 +71,11 @@ // tabbar页面 tabbar_pages: ['/pages/index/index', '/pages/goods-category/goods-category', '/pages/cart/cart', '/pages/user/user'], // 请求地址 - request_url: 'https://new.shopxo.vip/', - // request_url: 'http://shopxo.com/', + // request_url: 'https://new.shopxo.vip/', + request_url: 'http://shopxo.com/', // 静态资源地址(如系统根目录不在public目录下面请在静态地址后面加public目录、如:https://d1.shopxo.vip/public/) - static_url: 'https://new.shopxo.vip/', - // static_url: 'http://shopxo.com/', + // static_url: 'https://new.shopxo.vip/', + static_url: 'http://shopxo.com/', // 系统类型(默认default、如额外独立小程序、可与程序分身插件实现不同主体小程序及支付独立) system_type: 'default', // 基础信息 diff --git a/common/css/page.css b/common/css/page.css index 0c3386f6..d5d3ab9f 100644 --- a/common/css/page.css +++ b/common/css/page.css @@ -948,12 +948,10 @@ button[disabled].bg-grey { * 关键字标签展示 */ .word-list .word-icon { - height: 36rpx; - line-height: 36rpx; border-radius: 4rpx; border: 2rpx solid #FFCAC0; color: #FFCAC0; - padding: 0 16rpx; + padding: 0 12rpx; } .word-list .word-icon:not(:last-child) { diff --git a/components/cart/cart.vue b/components/cart/cart.vue index dc8d741c..4d109c39 100644 --- a/components/cart/cart.vue +++ b/components/cart/cart.vue @@ -80,8 +80,7 @@ 猜你喜欢 - - + @@ -579,6 +578,7 @@ data_list: temp_list, data_list_loding_status: temp_list.length == 0 ? 0 : this.data_list_loding_status, goods_list: new_goods_list, + random_value: Math.random(), }); app.globalData.showToast(type == 'delete' ? '删除成功' : '收藏成功', 'success'); @@ -815,6 +815,7 @@ let new_goods_list = this.goods_list; for (let i = 0; i < new_goods_list.length; i++) { let bool = app.globalData.some_arry(cart_list, new_goods_list[i].id, 'goods_id'); + console.log(bool); if (bool) { // 将购物车中相同商品不同规格的商品数量累加 let new_goods_item = this.cart_item_num(cart_list); diff --git a/pages.json b/pages.json index 64f5d60f..2284b71c 100644 --- a/pages.json +++ b/pages.json @@ -30,6 +30,7 @@ "transparentTitle": "always", "titlePenetrate": "YES", "navigationBarTitleText": "", + "scrollIndicator": "none", // 该页不显示滚动条 // #endif "enablePullDownRefresh": false, // 禁止页面下拉 diff --git a/pages/goods-category/goods-category.css b/pages/goods-category/goods-category.css index 88b815ee..8749bbad 100644 --- a/pages/goods-category/goods-category.css +++ b/pages/goods-category/goods-category.css @@ -113,13 +113,15 @@ .model-one .content-item:nth-child(3n) { border-right: 0; -} -.model-one .content .desc { - min-height: 52rpx; - line-height: 26rpx; -} -.model-one .content { - height: 240rpx; +} + +.model-one .content .desc { + min-height: 52rpx; + line-height: 26rpx; +} + +.model-one .content { + height: 240rpx; } .one-content image { @@ -381,11 +383,24 @@ padding-right: 0; padding-left: 24rpx; } + .cart-content .cart-list .goods-base-content { min-height: 60rpx; } -/* */ +/** + * 无数据 + */ .no-data { z-index: 101; -} \ No newline at end of file +} + +/* + * 隐藏滚动条 + */ +scroll-view ::-webkit-scrollbar { + display: none; + width: 0; + height: 0; + color: transparent; +} diff --git a/pages/goods-category/goods-category.vue b/pages/goods-category/goods-category.vue index 0bb5bb17..bf4e3551 100644 --- a/pages/goods-category/goods-category.vue +++ b/pages/goods-category/goods-category.vue @@ -406,7 +406,7 @@ data_list_loding_status: 1, data_list_loding_msg: '', data_is_loading: 0, - user: null, + user: null, params: null, tabbar_params: null, common_site_type: 0, @@ -461,12 +461,12 @@ componentUserBase, componentNavMore, }, - props: {}, - - onLoad(params) { - this.setData({ - params: params - }); + props: {}, + + onLoad(params) { + this.setData({ + params: params + }); }, onShow() { @@ -1252,6 +1252,6 @@ }, }; - diff --git a/pages/goods-detail/goods-detail.vue b/pages/goods-detail/goods-detail.vue index 7d3b9a33..d12b905c 100644 --- a/pages/goods-detail/goods-detail.vue +++ b/pages/goods-detail/goods-detail.vue @@ -68,18 +68,12 @@ - + - {{ lv.name }} + {{ + lv.name + }} @@ -89,7 +83,7 @@ - + {{ show_field_price_text }} {{ currency_symbol }}{{ goods_spec_base_price }} @@ -204,11 +198,11 @@ - - {{ plugins_wholesale_data.title }} - + + {{ plugins_wholesale_data.title }} + - {{ item.msg }} + {{ item.msg }} @@ -217,11 +211,11 @@ - - 优惠券 - + + 优惠券 + - {{ item.desc || item.name }} + {{ item.desc || item.name }} @@ -229,10 +223,7 @@ - + 规格 {{ goods_spec_selected_text }} @@ -240,12 +231,7 @@ - + {{ item.value }} @@ -271,10 +257,9 @@ - - - 相关门店 - 更多 + + 相关门店 + 更多 @@ -286,11 +271,12 @@ - - - 商品评价 - ({{ goods.comments_count }}) - 好评率 {{ goods.comments_score.rate }}% + + + 商品评价 + ({{ goods.comments_count }}) + + 好评率 {{ goods.comments_score.rate }}% @@ -304,10 +290,12 @@ - - - 问答 - 查看全部回答 + + + 问答 + ({{ goods.comments_count }}) + + 查看全部回答 @@ -360,9 +348,8 @@ - - - 商品详情 + + 商品详情 diff --git a/pages/goods-search/goods-search.vue b/pages/goods-search/goods-search.vue index dbcdc0eb..4b30b9b9 100644 --- a/pages/goods-search/goods-search.vue +++ b/pages/goods-search/goods-search.vue @@ -4,7 +4,7 @@ - diff --git a/pages/index/index.vue b/pages/index/index.vue index 45795d02..8cec33ed 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -4,7 +4,9 @@ - + + + @@ -24,9 +26,11 @@ + - + @onicon="search_icon_event" propIcon="icon-mendian-sousuosm" :propIsIconOnEvent="true" + > @@ -208,14 +212,7 @@ - + diff --git a/pages/plugins/activity/detail/detail.css b/pages/plugins/activity/detail/detail.css index 04f08c1f..51376d26 100644 --- a/pages/plugins/activity/detail/detail.css +++ b/pages/plugins/activity/detail/detail.css @@ -2,15 +2,16 @@ * 基础 */ .base-container { - height: 280rpx; + height: 280rpx; background-size: cover; + background-position: center; } -.base-container .text { - top: 0; - left: 0; - background: rgb(0 0 0 / 35%); +.base-container .text { + top: 0; + left: 0; + background: rgb(0 0 0 / 35%); padding: 100rpx 20rpx 20rpx 20rpx; -} +} .word-content .word-icon:not(:last-child) { margin-right: 20rpx; } \ No newline at end of file diff --git a/pages/plugins/activity/detail/detail.vue b/pages/plugins/activity/detail/detail.vue index d7cbb591..3d3acab7 100644 --- a/pages/plugins/activity/detail/detail.vue +++ b/pages/plugins/activity/detail/detail.vue @@ -18,10 +18,12 @@ - - 活动商品 - {{ data.vice_title }} - 更多活动 + + + 活动商品 + {{ data.vice_title }} + + 更多活动 @@ -41,131 +43,131 @@ diff --git a/pages/plugins/blog/index/index.vue b/pages/plugins/blog/index/index.vue index 91c41636..2b46236a 100644 --- a/pages/plugins/blog/index/index.vue +++ b/pages/plugins/blog/index/index.vue @@ -34,8 +34,10 @@ - 所有{{ blog_main_name }} - 更多 + + 所有{{ blog_main_name }} + 更多 + @@ -54,9 +56,9 @@ - - 热门{{ blog_main_name }} - 更多 + + 热门{{ blog_main_name }} + 更多 @@ -78,9 +80,9 @@ - - 推荐{{ blog_main_name }} - 更多 + + 推荐{{ blog_main_name }} + 更多 @@ -96,9 +98,9 @@ - - 推荐商品 - 更多 + + 推荐商品 + 更多 diff --git a/pages/plugins/membershiplevelvip/member-code/member-code.vue b/pages/plugins/membershiplevelvip/member-code/member-code.vue index e821ce4a..61fa3179 100644 --- a/pages/plugins/membershiplevelvip/member-code/member-code.vue +++ b/pages/plugins/membershiplevelvip/member-code/member-code.vue @@ -17,7 +17,7 @@ 如遇到扫码失败请将屏幕调至最亮重新扫码 - + diff --git a/pages/plugins/wallet/payment-code/payment-code.vue b/pages/plugins/wallet/payment-code/payment-code.vue index 31d8a003..b91520f2 100644 --- a/pages/plugins/wallet/payment-code/payment-code.vue +++ b/pages/plugins/wallet/payment-code/payment-code.vue @@ -20,7 +20,7 @@ ({{ scheduled_value }})秒后自动刷新付款码 - +