diff --git a/components/shopro-auth-modal/shopro-auth-modal.vue b/components/shopro-auth-modal/shopro-auth-modal.vue index 8499167..1429f78 100644 --- a/components/shopro-auth-modal/shopro-auth-modal.vue +++ b/components/shopro-auth-modal/shopro-auth-modal.vue @@ -974,7 +974,8 @@ export default { .save-btn { width: 690rpx; line-height: 70rpx; - background: linear-gradient(90deg, #e9b461, #eecc89); + background-color: #F45F77; + // background: linear-gradient(90deg, #e9b461, #eecc89); border-radius: 35rpx; font-size: 28rpx; font-weight: 500; diff --git a/components/shopro-goods-card/shopro-goods-card.vue b/components/shopro-goods-card/shopro-goods-card.vue index 2aa27ca..222a145 100644 --- a/components/shopro-goods-card/shopro-goods-card.vue +++ b/components/shopro-goods-card/shopro-goods-card.vue @@ -181,7 +181,7 @@ cartGoodId = this.cartList.filter(item => item.goods_id === that.detail.id)[0].id; uni.showModal({ title: '删除提示', - confirmColor: '#f0c785', + confirmColor: '#F45F77', content: `是否确认从购物车中删除此商品?`, success: res => { res.confirm && this.changeCartList({ ids: [cartGoodId], art: 'delete' }); diff --git a/components/shopro-mini-card/shopro-mini-card.vue b/components/shopro-mini-card/shopro-mini-card.vue index ab6ba0b..f91158c 100644 --- a/components/shopro-mini-card/shopro-mini-card.vue +++ b/components/shopro-mini-card/shopro-mini-card.vue @@ -2,8 +2,8 @@ - - {{ title }} + + {{ title }} {{ subtitle }} @@ -91,22 +91,22 @@ export default { } } .goods_img{ - width: 180rpx; - height: 180rpx; + width: 160rpx; + height: 160rpx; border-radius: 6rpx; } .goods-title { font-size: 28rpx; font-weight: 500; color: rgba(51, 51, 51, 1); - width: 450rpx; + width: 100%; line-height: 40rpx; } .describe-text { font-size: 24rpx; - width: 450rpx; - color: #a8700d; + width: 100%; + color: #F45F77; } .price { diff --git a/components/shopro-share/shopro-share.vue b/components/shopro-share/shopro-share.vue index c451b25..b1cb0e0 100644 --- a/components/shopro-share/shopro-share.vue +++ b/components/shopro-share/shopro-share.vue @@ -510,7 +510,8 @@ export default { width: 300rpx; height: 70rpx; line-height: 70rpx; - background: linear-gradient(90deg, #e9b461, #eecc89); + background-color: #F45F77; + // background: linear-gradient(90deg, #e9b461, #eecc89); border-radius: 35rpx; font-size: 28rpx; font-weight: 500; diff --git a/components/shopro-sku/shopro-sku.vue b/components/shopro-sku/shopro-sku.vue index 14044c9..4831d0c 100644 --- a/components/shopro-sku/shopro-sku.vue +++ b/components/shopro-sku/shopro-sku.vue @@ -567,7 +567,8 @@ .save-btn { width: 710rpx; height: 70rpx; - background: linear-gradient(90deg, rgba(233, 180, 97, 1), rgba(238, 204, 137, 1)); + background-color: #F45F77; + // background: linear-gradient(90deg, rgba(233, 180, 97, 1), rgba(238, 204, 137, 1)); font-size: 28rpx; font-weight: 500; color: rgba(255, 255, 255, 1); diff --git a/pages.json b/pages.json index 0d7764a..5c16f2e 100644 --- a/pages.json +++ b/pages.json @@ -889,7 +889,7 @@ }, "tabBar": { "color": "#333", - "selectedColor": "#a8700d", + "selectedColor": "#F45F77", "backgroundColor": "#ffffff", "borderStyle": "black", "list": [{ diff --git a/pages/activity/groupon/my-groupon.vue b/pages/activity/groupon/my-groupon.vue index d11fcbf..85f50b2 100644 --- a/pages/activity/groupon/my-groupon.vue +++ b/pages/activity/groupon/my-groupon.vue @@ -178,7 +178,7 @@ export default { } .line-active { - background: rgba(230, 184, 115, 1); + background: #F45F77; } } } @@ -234,10 +234,10 @@ export default { .invite-btn { width: 210rpx; line-height: 65rpx; - border: 1rpx solid #a8700d; + border: 1rpx solid #F45F77; border-radius: 33rpx; font-size: 26rpx; - color: #a8700d; + color: #F45F77; padding: 0; margin-right: 20rpx; background: #fff; diff --git a/pages/app/commission/goods.vue b/pages/app/commission/goods.vue index d76f9d9..72df7f3 100644 --- a/pages/app/commission/goods.vue +++ b/pages/app/commission/goods.vue @@ -138,7 +138,7 @@ page { width: 400rpx; font-size: 22rpx; font-weight: 500; - color: #a8700d; + color: #F45F77; margin-bottom: 10rpx; } .goods-price { diff --git a/pages/app/coupon/list.vue b/pages/app/coupon/list.vue index 7147024..17b569e 100644 --- a/pages/app/coupon/list.vue +++ b/pages/app/coupon/list.vue @@ -144,7 +144,7 @@ export default { } .line-active { - background: #e9b664; + background:#F45F77; } } .nav-wrap { diff --git a/pages/app/merchant/apply.vue b/pages/app/merchant/apply.vue index b4416c5..9e51513 100644 --- a/pages/app/merchant/apply.vue +++ b/pages/app/merchant/apply.vue @@ -3,7 +3,7 @@ - + @@ -474,9 +474,9 @@ background-color: #fff; .head-box { - background: url($IMG_URL+'/imgs/user/sh_leader_apply_head.png') no-repeat; + // background: url($IMG_URL+'/imgs/user/sh_leader_apply_head.png') no-repeat; background-size: 100% auto; - height: 370rpx; + // height: 370rpx; } } diff --git a/pages/app/merchant/index.vue b/pages/app/merchant/index.vue index 1078028..b24075e 100644 --- a/pages/app/merchant/index.vue +++ b/pages/app/merchant/index.vue @@ -576,7 +576,7 @@ export default { .state { font-size: 26rpx; - color: #a8700d; + color: #F45F77; } } .goods-order { diff --git a/pages/goods/comment/comment-list.vue b/pages/goods/comment/comment-list.vue index 306277c..b6ecc38 100644 --- a/pages/goods/comment/comment-list.vue +++ b/pages/goods/comment/comment-list.vue @@ -117,7 +117,7 @@ export default { .btn-active { background: linear-gradient(90deg, rgba(233, 180, 97, 1), rgba(238, 204, 137, 1)); box-shadow: 0px 7rpx 6rpx 0px rgba(229, 138, 0, 0.22); - color: #a8700d; + color: #F45F77; } } .comment-list { diff --git a/pages/goods/components/sh-coupon.vue b/pages/goods/components/sh-coupon.vue index 4cad267..6b45474 100644 --- a/pages/goods/components/sh-coupon.vue +++ b/pages/goods/components/sh-coupon.vue @@ -67,7 +67,7 @@ export default { .category-dot-active { width: 40rpx; height: 3rpx; - background: #a8700d; + background: #F45F77; margin-right: 10rpx; } } diff --git a/pages/goods/components/sh-filter.vue b/pages/goods/components/sh-filter.vue index feced9a..58bd15c 100644 --- a/pages/goods/components/sh-filter.vue +++ b/pages/goods/components/sh-filter.vue @@ -152,7 +152,7 @@ export default { } .line-active { - background: rgba(213, 166, 90, 1); + background: #F45F77; } .p-box { diff --git a/pages/goods/components/sh-groupon.vue b/pages/goods/components/sh-groupon.vue index 013d332..4a0366e 100644 --- a/pages/goods/components/sh-groupon.vue +++ b/pages/goods/components/sh-groupon.vue @@ -194,7 +194,7 @@ export default { .num-color { font-size: 24rpx; - color: #a8700d; + color: #F45F77; } } diff --git a/pages/goods/components/sh-price-card.vue b/pages/goods/components/sh-price-card.vue index cfc77fd..259587f 100644 --- a/pages/goods/components/sh-price-card.vue +++ b/pages/goods/components/sh-price-card.vue @@ -204,7 +204,8 @@ export default { // 正常商品 .normal-price-box { padding: 20rpx; - background: url($IMG_URL+'/imgs/detail/detail_price_normal_bg.png') no-repeat; + background-color: #F45F77; + // background: url($IMG_URL+'/imgs/detail/detail_price_normal_bg.png') no-repeat; background-size: 100% 100%; .unit, .notice { diff --git a/pages/goods/detail.vue b/pages/goods/detail.vue index db7280d..1aee0d1 100644 --- a/pages/goods/detail.vue +++ b/pages/goods/detail.vue @@ -544,7 +544,8 @@ export default { } .line-active { - background: rgba(168, 112, 13, 1); + // background: rgba(168, 112, 13, 1); + background: #F45F77; } } } @@ -636,7 +637,7 @@ export default { } .sub-title { - color: #a8700d; + color: #F45F77; font-size: 24rpx; font-weight: 500; line-height: 42rpx; @@ -716,8 +717,9 @@ export default { } .pay-btn { + background-color: #F45F77; box-shadow: 0px 7rpx 6rpx 0px rgba(229, 138, 0, 0.22); - background: linear-gradient(90deg, rgba(233, 180, 97, 1), rgba(238, 204, 137, 1)); + // background: linear-gradient(90deg, rgba(233, 180, 97, 1), rgba(238, 204, 137, 1)); } .score-btn { diff --git a/pages/index/cart.vue b/pages/index/cart.vue index fed6e4e..39f575d 100644 --- a/pages/index/cart.vue +++ b/pages/index/cart.vue @@ -15,9 +15,9 @@ - + - + @@ -59,10 +59,10 @@ - + 全选({{ totalCount.totalNum }}) - ¥{{ totalCount.totalPrice.toFixed(2) }} + 合计:¥{{ totalCount.totalPrice.toFixed(2) }} @@ -102,7 +102,7 @@ onMin(g) { uni.showModal({ title: '删除提示', - confirmColor: '#f0c785', + confirmColor: '#F45F77', content: `是否确认从购物车中删除此商品?`, success: res => { res.confirm && this.changeCartList({ ids: [g.id], art: 'delete' }); @@ -192,21 +192,22 @@ .tool-box { height: 90rpx; padding: 0 30rpx; - background: #f7f5f6; + background: #ffffff; .count-box { - font-size: 26rpx; - color: #999; + font-size: 30rpx; + color: #333333; .all-num { - color: #a8700d; + color: #F45F77; } } .set-btn { background: none; - font-size: 26rpx; - color: #a8700d; + font-size: 30rpx; + color: #333333; + font-weight:bold; } } } @@ -221,20 +222,21 @@ // 购物车项 .collect-list { background: #fff; - width: 750rpx; - margin-bottom: 20rpx; - padding: 20rpx 10rpx; + // width: 750rpx; + margin: 20rpx 24rpx; + padding: 40rpx 25rpx; + border-radius: 20rpx; // 商品卡片包裹 .goods-wrap { position: relative; - + width:100%; .order-sku { font-size: 24rpx; font-weight: 400; color: rgba(153, 153, 153, 1); - width: 440rpx; - margin-bottom: 20rpx; + // width: 440rpx; + // margin-bottom: 20rpx; .order-num { margin-right: 10rpx; @@ -344,19 +346,21 @@ } .price { - color: #ff0000; + color: #333333; font-size: 500; - margin-right: 30rpx; + margin-right: 28rpx; } .pay-btn { - width: 200rpx; - line-height: 70rpx; - background: linear-gradient(90deg, rgba(233, 180, 97, 1), rgba(238, 204, 137, 1)); + width: 186rpx; + line-height: 75rpx; + background: #F45F77; + // background: linear-gradient(90deg, rgba(233, 180, 97, 1), rgba(238, 204, 137, 1)); box-shadow: 0px 7rpx 6rpx 0px rgba(229, 138, 0, 0.22); - border-radius: 35rpx; + border-radius: 38rpx; padding: 0; - color: rgba(#fff, 0.9); + color: rgba(#fff, 1); + font-size: 30rpx; } .del-btn { diff --git a/pages/index/category/one-catgory.vue b/pages/index/category/one-catgory.vue index d37c0fd..ed2a2fb 100644 --- a/pages/index/category/one-catgory.vue +++ b/pages/index/category/one-catgory.vue @@ -169,7 +169,7 @@ export default { } .line-active { - background: #e6b873; + background: #F45F77; } .type-list { diff --git a/pages/index/category/takeout-catgory.vue b/pages/index/category/takeout-catgory.vue index c59879d..78d35ce 100644 --- a/pages/index/category/takeout-catgory.vue +++ b/pages/index/category/takeout-catgory.vue @@ -13,7 +13,7 @@ - + @@ -28,7 +28,7 @@ - + {{ typeMap[item.activity_type].text }} @@ -46,12 +46,12 @@ - 已售{{ item.sales }}件 + 已售{{ item.sales }}套 - + {{ item.price }} - ¥{{ item.original_price }} + ¥{{ item.original_price }} @@ -89,8 +89,8 @@ tipText="暂无该商品,还有更多好货等着你噢~"> - + @@ -305,7 +305,7 @@ cartGoodId = this.cartList.filter(item => item.goods_id === goodsId)[0].id; uni.showModal({ title: '删除提示', - confirmColor: '#f0c785', + confirmColor: '#F45F77', content: `是否确认从购物车中删除此商品?`, success: res => { res.confirm && this.changeCartList({ ids: [cartGoodId], art: 'delete' }); @@ -424,7 +424,7 @@ position: relative; color: #F45F77; font-size: rpx; - font-weight: bold; + // font-weight: bold; background: #fff; } @@ -443,7 +443,7 @@ .right-wrap { background-color: #fff; height: 100%; - width: 100%; + width: calc(100% - 180rpx); .category-img { width: 505rpx; @@ -462,13 +462,13 @@ .right-box { height: 100%; + width: 100%; } } .big-goods-card { background-color: #fff; border-radius: 20rpx; - width: calc(100% - 180rpx); box-shadow: 0 0 8rpx 2rpx rgba(199, 199, 199, 0.3); padding-bottom: 20rpx; @@ -496,7 +496,7 @@ .goods-title { font-size: 30rpx; - font-weight: bold; + // font-weight: bold; color: #333333; line-height: 36rpx; padding-top: 6rpx; @@ -602,7 +602,5 @@ } } } - .loadMoreContent .u-load-more-wrap{ - width: calc(100% - 180rpx); - } + diff --git a/pages/index/category/three-catgory.vue b/pages/index/category/three-catgory.vue index e3bad78..bca7ab7 100644 --- a/pages/index/category/three-catgory.vue +++ b/pages/index/category/three-catgory.vue @@ -127,7 +127,7 @@ export default { } .line-active { - background: #e6b873; + background: #F45F77; } .type-list { diff --git a/pages/index/category/two-catgory.vue b/pages/index/category/two-catgory.vue index a891e72..083f80d 100644 --- a/pages/index/category/two-catgory.vue +++ b/pages/index/category/two-catgory.vue @@ -140,7 +140,7 @@ export default { .line-active { width: 180rpx; height: 64rpx; - background: #e6b873; + background: #F45F77; border-radius: 0rpx 32rpx 32rpx 0rpx; color: #fff; } diff --git a/pages/index/components/sh-category-tabs.vue b/pages/index/components/sh-category-tabs.vue index b1e29d0..d6925dd 100644 --- a/pages/index/components/sh-category-tabs.vue +++ b/pages/index/components/sh-category-tabs.vue @@ -329,7 +329,7 @@ export default { color: #333333; } .title-active { - color: #a8700d; + color: #F45F77; } .tab-des { font-size: 22rpx; diff --git a/pages/index/components/sh-coupon.vue b/pages/index/components/sh-coupon.vue index 430b276..42594c9 100644 --- a/pages/index/components/sh-coupon.vue +++ b/pages/index/components/sh-coupon.vue @@ -183,7 +183,7 @@ export default { .notice { font-size: 22rpx; font-weight: 500; - color: #a8700d; + color: #F45F77; } } .card-right { @@ -193,7 +193,7 @@ export default { font-size: 24rpx; font-weight: 500; text-align: right; - color: #a8700d; + color: #F45F77; writing-mode: vertical-lr; /*从左向右 从右向左是 writing-mode: vertical-rl;*/ writing-mode: tb-lr; /*IE浏览器的从左向右 从右向左是 writing-mode: tb-rl;*/ } diff --git a/pages/index/components/sh-goods-card.vue b/pages/index/components/sh-goods-card.vue index f2d6afd..0ab55d0 100644 --- a/pages/index/components/sh-goods-card.vue +++ b/pages/index/components/sh-goods-card.vue @@ -182,7 +182,7 @@ cartGoodId = this.cartList.filter(item => item.goods_id === that.detail.id)[0].id; uni.showModal({ title: '删除提示', - confirmColor: '#f0c785', + confirmColor: '#F45F77', content: `是否确认从购物车中删除此商品?`, success: res => { res.confirm && this.changeCartList({ ids: [cartGoodId], art: 'delete' }); @@ -275,14 +275,15 @@ } .card-right { - width: 430rpx; + // width: 430rpx; + width: calc(100% - 225rpx); // height: 220rpx; } .goods-title { font-size: 30rpx; font-weight: 600; - width: 400rpx; + // width: 400rpx; color: #222222; padding-top: 17rpx; @@ -295,7 +296,7 @@ .subtitle-text { font-size: 24rpx; - width: 400rpx; + // width: 400rpx; font-weight: 500; color: #999999; } diff --git a/pages/index/components/sh-grid.vue b/pages/index/components/sh-grid.vue index 3e245c0..ff8aeed 100644 --- a/pages/index/components/sh-grid.vue +++ b/pages/index/components/sh-grid.vue @@ -39,21 +39,24 @@ export default { // 宫格 .grid-wap { background: #fff; - width: 750rpx; + /* width: 750rpx; */ padding: 30rpx 0 0; + border-radius: 20rpx; + margin: 0 24rpx; + margin-top: 20rpx; .grid-item { width: 25%; margin-bottom: 40rpx; .tool-img { - width: 44rpx; - height: 44rpx; + width: 50rpx; + height: 50rpx; } .item-title { - font-size: 26rpx; + font-size: 24rpx; font-weight: 500; - color: rgba(153, 153, 153, 1); + color: #333333; line-height: 24rpx; - padding-top: 20rpx; + padding-top: 17rpx; } } } diff --git a/pages/index/components/sh-hot-goods.vue b/pages/index/components/sh-hot-goods.vue index 4d2e744..1a8332b 100644 --- a/pages/index/components/sh-hot-goods.vue +++ b/pages/index/components/sh-hot-goods.vue @@ -1,6 +1,10 @@