diff --git a/assets/css/v12-style.less b/assets/css/v12-style.less
index bf38100..94dc2f5 100644
--- a/assets/css/v12-style.less
+++ b/assets/css/v12-style.less
@@ -17,6 +17,9 @@ each(@colors, {
.v12-@{classname}-text{
color: @color !important;
}
+ .v12-@{classname}-border{
+ border: 1px solid @color !important;
+ }
});
/*===================字体大小======================*/
@@ -100,6 +103,8 @@ each(@colors, {
.generateRadius(100);
/*=========================================*/
+/*====================flex 函数表达式=====================*/
+
.v12-d-flex{
display: flex !important;
}
@@ -110,6 +115,14 @@ each(@colors, {
display: flex;
align-items: center;
}
+.v12-align-start{
+ display: flex;
+ align-items: start;
+}
+.v12-align-end{
+ display: flex;
+ align-items: end;
+}
.v12-justify-center{
display: flex;
justify-content: center;
diff --git a/components/CheckboxIcon.vue b/components/CheckboxIcon.vue
index 1ff67c1..e50fab9 100644
--- a/components/CheckboxIcon.vue
+++ b/components/CheckboxIcon.vue
@@ -1,6 +1,7 @@
-
+
+
@@ -43,7 +44,7 @@ export default {
width: 32rpx;
height: 32rpx;
box-sizing: border-box;
- border: 2rpx solid #D5D7D8;
+ border: 2px solid #D5D7D8;
border-radius: 50%;
}
@@ -53,7 +54,6 @@ export default {
}
.isSelected {
- border: 3px solid #FD5749;
- background: #FD5749;
+ border: 3px solid #C52733;
}
\ No newline at end of file
diff --git a/pages.json b/pages.json
index ce30577..50f12b8 100644
--- a/pages.json
+++ b/pages.json
@@ -836,6 +836,7 @@
},
"tabBar": {
"color": "#8B8F99",
+ "custom": true,
"selectedColor": "#FF564A",
"borderStyle": "black",
"backgroundColor": "#ffffff",
diff --git a/pages/cart.vue b/pages/cart.vue
index e4059db..f764b2d 100644
--- a/pages/cart.vue
+++ b/pages/cart.vue
@@ -41,49 +41,51 @@
class="store-cover"
mode="scaleToFill"
/>
- {{ item['merName'] }}
+ {{ item['merName'] }}
- 进店逛逛
-
+
-
-
-
+
+
+
+
+
{{ good['productInfo']['storeName'] }}
规格:{{ good['productInfo']['attrInfo']['sku'] }}
+
- ¥
- {{ good['truePrice'] }}
+ ¥
+ {{ good['truePrice'] }}
changeNumHandle(index, gIndex, good, e)"
>
-
+
- {{ good['cartNum'] }}
+ {{ good['cartNum'] }}
-
+
@@ -139,13 +149,15 @@
:mark="[-1]"
@change="onChange"
/>
- 全选({{ selectCount }})
+ 全选({{ selectCount }})
- 合计:
- ¥{{ total }}
+
+ 合计:
+ ¥
+ {{ total }}
- 结算
+ 结算