diff --git a/App.vue b/App.vue index 90cddd63..e4a04f44 100644 --- a/App.vue +++ b/App.vue @@ -1731,7 +1731,7 @@ // 蓝色 blue #1677ff // 棕色 brown #8B4513 // 紫色 purple #623cec - var default_theme = 'blue'; + var default_theme = 'purple'; return uni.getStorageSync('theme') || default_theme; }, // 设置主题 diff --git a/common/css/page.css b/common/css/page.css index f4fc7e1a..3e5e484e 100644 --- a/common/css/page.css +++ b/common/css/page.css @@ -670,6 +670,10 @@ button:before { background-color: #dddddd !important; } +.bg-grey-e { + background-color: #eeeeee !important; +} + .bg-grey-f5 { background-color: #f5f5f5 !important; } diff --git a/components/countdown/countdown.vue b/components/countdown/countdown.vue index 916750d9..98f8d0ea 100644 --- a/components/countdown/countdown.vue +++ b/components/countdown/countdown.vue @@ -2,16 +2,16 @@ - {{msec}} - {{propSecondDs}} + {{ msec }} + {{ propSecondDs }} - {{second}} - {{propMinuteDs}} - {{minute}} - {{propHourDs}} - {{hour}} + {{ second }} + {{ propMinuteDs }} + {{ minute }} + {{ propHourDs }} + {{ hour }} - {{propMsg}} + {{ propMsg }} - \ No newline at end of file + diff --git a/components/goods-list/goods-list.vue b/components/goods-list/goods-list.vue index 49a42bf5..e62e1714 100644 --- a/components/goods-list/goods-list.vue +++ b/components/goods-list/goods-list.vue @@ -25,12 +25,14 @@ {{ propCurrencySymbol }} {{ item[propPriceField] }} - - - - + + + + + + - + @@ -88,12 +90,14 @@ - - - - + + + + + + - + @@ -141,12 +145,15 @@ {{ propCurrencySymbol }} {{ item[propPriceField] }} - - - - + + + + + + + - + @@ -279,6 +286,11 @@ type: Boolean, default: false, }, + // 是否开启购物车按钮 ------ 滚动使用 + propOpenCart: { + type: Boolean, + default: true, + }, }, // 属性值改变监听 watch: { diff --git a/components/iconfont/iconfont.vue b/components/iconfont/iconfont.vue index d32bed09..a6d21770 100644 --- a/components/iconfont/iconfont.vue +++ b/components/iconfont/iconfont.vue @@ -3,38 +3,38 @@ diff --git a/pages/index/index.vue b/pages/index/index.vue index 9053094e..f3232f1d 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -3,6 +3,7 @@ +