Commit 7e0d5fce by 赵雅纹

Merge branch 'feature-zyw-sc' into 'dev_7.1.0'

Feature zyw sc

See merge request !44
parents 98609b94 8fbc7196
...@@ -22,6 +22,9 @@ ...@@ -22,6 +22,9 @@
"pages/wantToBuyDetail/wantToBuyDetail", "pages/wantToBuyDetail/wantToBuyDetail",
"component/buyImageSwiper/buyImageSwiper", "component/buyImageSwiper/buyImageSwiper",
"pages/myShare/myShare", "pages/myShare/myShare",
"pages/user-center/user-center",
"pages/productDetail/productDetail",
"pages/confirmOrder/confirmOrder",
"pages/productDetail/productDetail" "pages/productDetail/productDetail"
], ],
"subPackages": [ "subPackages": [
......
...@@ -17,4 +17,8 @@ page { ...@@ -17,4 +17,8 @@ page {
box-sizing: border-box; box-sizing: border-box;
} }
.theme-color{
background-color: #CB3C3C;
}
{
"component": true,
"usingComponents": {}
}
\ No newline at end of file
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
} }
.product-detail-wrap{ .product-detail-wrap{
padding: 0 16rpx 0 24rpx; padding: 0 16rpx 0 24rpx;
margin-top: 17rpx;
} }
.price-icon{ .price-icon{
display: inline-block; display: inline-block;
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
"list": [] "list": []
}, },
"miniprogram": { "miniprogram": {
"current": 17, "current": 18,
"list": [ "list": [
{ {
"id": -1, "id": -1,
...@@ -143,6 +143,13 @@ ...@@ -143,6 +143,13 @@
"id": -1, "id": -1,
"name": "商品详情页", "name": "商品详情页",
"pathName": "pages/productDetail/productDetail", "pathName": "pages/productDetail/productDetail",
"query": "",
"scene": null
},
{
"id": -1,
"name": "确认订单",
"pathName": "pages/confirmOrder/confirmOrder",
"scene": null "scene": null
} }
] ]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment