diff --git a/README.md b/README.md index 7266817..5d30550 100644 --- a/README.md +++ b/README.md @@ -8,10 +8,12 @@ - doc 文档存放 ## 页面路由 - pages/index/index 首页
+- pages/shopping/shopping 购物车
组件 - index/search 顶部搜索框 - index/list 商品列表 - index/lsit/commodity 商品单条 + - index/shopping/shoppingitem 购物车商品信息 - pages/search/search 搜索页
组件 - index/search 顶部搜索框 @@ -22,4 +24,12 @@ - classify/navigation 左侧导航列表 - pages/product/product 商品页 - pages/personal/personal 我的页面 -- pages/message/message 个人信息 \ No newline at end of file +- pages/message/message 个人信息 +- pages/orderconfirm/orderconfirm 确认订单
+ 组件 + - orderconfirm/agreement 同意协议 + - orderconfirm/bottom 订单确认底部 + - orderconfirm/chooseaddr 选择地址 + - orderconfirm/chooseway 选择方式 + - orderconfirm/ordershopinfo 顶部的商品信息 + - orderconfirm/orderyf 运费 diff --git a/app.json b/app.json index 9a5e266..772589e 100644 --- a/app.json +++ b/app.json @@ -1,5 +1,6 @@ { "pages": [ + "pages/orderconfirm/orderconfirm", "pages/message/message", "pages/personal/personal", "pages/product/product", diff --git a/components/orderconfirm/orderagreement/orderagreement.js b/components/orderconfirm/orderagreement/orderagreement.js new file mode 100644 index 0000000..8dca30f --- /dev/null +++ b/components/orderconfirm/orderagreement/orderagreement.js @@ -0,0 +1,23 @@ +// components/orderconfirm/orderagreement/orderagreement.js +Component({ + /** + * 组件的属性列表 + */ + properties: { + + }, + + /** + * 组件的初始数据 + */ + data: { + + }, + + /** + * 组件的方法列表 + */ + methods: { + + } +}) diff --git a/components/orderconfirm/orderagreement/orderagreement.json b/components/orderconfirm/orderagreement/orderagreement.json new file mode 100644 index 0000000..e8cfaaf --- /dev/null +++ b/components/orderconfirm/orderagreement/orderagreement.json @@ -0,0 +1,4 @@ +{ + "component": true, + "usingComponents": {} +} \ No newline at end of file diff --git a/components/orderconfirm/orderagreement/orderagreement.scss b/components/orderconfirm/orderagreement/orderagreement.scss new file mode 100644 index 0000000..c504b7f --- /dev/null +++ b/components/orderconfirm/orderagreement/orderagreement.scss @@ -0,0 +1,19 @@ +.agree { + width: 690rpx; + // height: 96rpx; + line-height: 96rpx; + display: flex; + // border-bottom: 2rpx solid #EAEAEA; + margin: 0 auto; + color: #999999; + font-size: 26rpx; + .select { + width: 26rpx; + height: 26rpx; + margin: auto 0; + border-radius: 50%; + background-color: #EAEAEA; + margin-right: 25rpx; + margin-left: 31rpx; + } +} \ No newline at end of file diff --git a/components/orderconfirm/orderagreement/orderagreement.wxml b/components/orderconfirm/orderagreement/orderagreement.wxml new file mode 100644 index 0000000..6826993 --- /dev/null +++ b/components/orderconfirm/orderagreement/orderagreement.wxml @@ -0,0 +1,4 @@ + + + 同意使用条款和隐私政策 + \ No newline at end of file diff --git a/components/orderconfirm/orderagreement/orderagreement.wxss b/components/orderconfirm/orderagreement/orderagreement.wxss new file mode 100644 index 0000000..2b38057 --- /dev/null +++ b/components/orderconfirm/orderagreement/orderagreement.wxss @@ -0,0 +1,18 @@ +.agree { + width: 690rpx; + line-height: 96rpx; + display: flex; + margin: 0 auto; + color: #999999; + font-size: 26rpx; +} + +.agree .select { + width: 26rpx; + height: 26rpx; + margin: auto 0; + border-radius: 50%; + background-color: #EAEAEA; + margin-right: 25rpx; + margin-left: 31rpx; +} diff --git a/components/orderconfirm/orderbottom/orderbottom.js b/components/orderconfirm/orderbottom/orderbottom.js new file mode 100644 index 0000000..582dbcf --- /dev/null +++ b/components/orderconfirm/orderbottom/orderbottom.js @@ -0,0 +1,23 @@ +// components/orderconfirm/orderbottom/orderbottom.js +Component({ + /** + * 组件的属性列表 + */ + properties: { + + }, + + /** + * 组件的初始数据 + */ + data: { + + }, + + /** + * 组件的方法列表 + */ + methods: { + + } +}) diff --git a/components/orderconfirm/orderbottom/orderbottom.json b/components/orderconfirm/orderbottom/orderbottom.json new file mode 100644 index 0000000..e8cfaaf --- /dev/null +++ b/components/orderconfirm/orderbottom/orderbottom.json @@ -0,0 +1,4 @@ +{ + "component": true, + "usingComponents": {} +} \ No newline at end of file diff --git a/components/orderconfirm/orderbottom/orderbottom.scss b/components/orderconfirm/orderbottom/orderbottom.scss new file mode 100644 index 0000000..4dfedd2 --- /dev/null +++ b/components/orderconfirm/orderbottom/orderbottom.scss @@ -0,0 +1,21 @@ +.bottom { + width: 100%; + height: 99rpx; + line-height: 99rpx; + display: flex; + justify-content: space-between; + border-top: 2rpx solid #EAEAEA; + font-size: 28rpx; + .left { + margin-left: 59rpx; + .pri { + color: #E0C79D; + font-size: 26rpx; + margin-left: 19rpx; + } + } + .right { + color: #4CC97D; + margin-right: 38rpx; + } +} \ No newline at end of file diff --git a/components/orderconfirm/orderbottom/orderbottom.wxml b/components/orderconfirm/orderbottom/orderbottom.wxml new file mode 100644 index 0000000..a449666 --- /dev/null +++ b/components/orderconfirm/orderbottom/orderbottom.wxml @@ -0,0 +1,7 @@ + + + 总计 + $0.00 + + 结算 + \ No newline at end of file diff --git a/components/orderconfirm/orderbottom/orderbottom.wxss b/components/orderconfirm/orderbottom/orderbottom.wxss new file mode 100644 index 0000000..9e956e8 --- /dev/null +++ b/components/orderconfirm/orderbottom/orderbottom.wxss @@ -0,0 +1,24 @@ +.bottom { + width: 100%; + height: 99rpx; + line-height: 99rpx; + display: flex; + justify-content: space-between; + border-top: 2rpx solid #EAEAEA; + font-size: 28rpx; +} + +.bottom .left { + margin-left: 59rpx; +} + +.bottom .left .pri { + color: #E0C79D; + font-size: 26rpx; + margin-left: 19rpx; +} + +.bottom .right { + color: #4CC97D; + margin-right: 38rpx; +} diff --git a/components/orderconfirm/orderchooseaddr/orderchooseaddr.js b/components/orderconfirm/orderchooseaddr/orderchooseaddr.js new file mode 100644 index 0000000..e2c905a --- /dev/null +++ b/components/orderconfirm/orderchooseaddr/orderchooseaddr.js @@ -0,0 +1,23 @@ +// components/orderconfirm/orderchooseaddr/orderchooseaddr.js +Component({ + /** + * 组件的属性列表 + */ + properties: { + + }, + + /** + * 组件的初始数据 + */ + data: { + + }, + + /** + * 组件的方法列表 + */ + methods: { + + } +}) diff --git a/components/orderconfirm/orderchooseaddr/orderchooseaddr.json b/components/orderconfirm/orderchooseaddr/orderchooseaddr.json new file mode 100644 index 0000000..e8cfaaf --- /dev/null +++ b/components/orderconfirm/orderchooseaddr/orderchooseaddr.json @@ -0,0 +1,4 @@ +{ + "component": true, + "usingComponents": {} +} \ No newline at end of file diff --git a/components/orderconfirm/orderchooseaddr/orderchooseaddr.scss b/components/orderconfirm/orderchooseaddr/orderchooseaddr.scss new file mode 100644 index 0000000..c1a73e4 --- /dev/null +++ b/components/orderconfirm/orderchooseaddr/orderchooseaddr.scss @@ -0,0 +1,33 @@ +.orderchooseaddr { + width: 690rpx; + height: 148rpx; + margin: 0 auto; + border-bottom: 2rpx solid #EAEAEA; + display: flex; + justify-content: space-between; + .left { + width: 572rpx; + height: 80rpx; + .userinfo { + color: #333333; + font-size: 26rpx; + text-indent: 30rpx; + margin-top: 41rpx; + display: flex; + justify-content: space-between; + } + .addr { + color: #999999; + font-size: 24rpx; + text-indent: 30rpx; + margin-top: 32rpx; + } + } + .right { + width: 17rpx; + height: 30rpx; + background-color: #D3D3D3; + margin: auto 0; + margin-right: 19rpx; + } +} \ No newline at end of file diff --git a/components/orderconfirm/orderchooseaddr/orderchooseaddr.wxml b/components/orderconfirm/orderchooseaddr/orderchooseaddr.wxml new file mode 100644 index 0000000..99d00a1 --- /dev/null +++ b/components/orderconfirm/orderchooseaddr/orderchooseaddr.wxml @@ -0,0 +1,12 @@ + + + + 于于宇 15698857895 + 邮政编码：677467 + + + 中国大陆 山东省 青岛市 即墨区 纯阳路 某某某小区 + + + + \ No newline at end of file diff --git a/components/orderconfirm/orderchooseaddr/orderchooseaddr.wxss b/components/orderconfirm/orderchooseaddr/orderchooseaddr.wxss new file mode 100644 index 0000000..1559bfa --- /dev/null +++ b/components/orderconfirm/orderchooseaddr/orderchooseaddr.wxss @@ -0,0 +1,37 @@ +.orderchooseaddr { + width: 690rpx; + height: 148rpx; + margin: 0 auto; + border-bottom: 2rpx solid #EAEAEA; + display: flex; + justify-content: space-between; +} + +.orderchooseaddr .left { + width: 572rpx; + height: 80rpx; +} + +.orderchooseaddr .left .userinfo { + color: #333333; + font-size: 26rpx; + text-indent: 30rpx; + margin-top: 41rpx; + display: flex; + justify-content: space-between; +} + +.orderchooseaddr .left .addr { + color: #999999; + font-size: 24rpx; + text-indent: 30rpx; + margin-top: 32rpx; +} + +.orderchooseaddr .right { + width: 17rpx; + height: 30rpx; + background-color: #D3D3D3; + margin: auto 0; + margin-right: 19rpx; +} diff --git a/components/orderconfirm/orderchooseway/orderchooseway.js b/components/orderconfirm/orderchooseway/orderchooseway.js new file mode 100644 index 0000000..948c101 --- /dev/null +++ b/components/orderconfirm/orderchooseway/orderchooseway.js @@ -0,0 +1,23 @@ +// components/orderconfirm/orderchooseway/orderchooseway.js +Component({ + /** + * 组件的属性列表 + */ + properties: { + + }, + + /** + * 组件的初始数据 + */ + data: { + + }, + + /** + * 组件的方法列表 + */ + methods: { + + } +}) diff --git a/components/orderconfirm/orderchooseway/orderchooseway.json b/components/orderconfirm/orderchooseway/orderchooseway.json new file mode 100644 index 0000000..e8cfaaf --- /dev/null +++ b/components/orderconfirm/orderchooseway/orderchooseway.json @@ -0,0 +1,4 @@ +{ + "component": true, + "usingComponents": {} +} \ No newline at end of file diff --git a/components/orderconfirm/orderchooseway/orderchooseway.scss b/components/orderconfirm/orderchooseway/orderchooseway.scss new file mode 100644 index 0000000..505d799 --- /dev/null +++ b/components/orderconfirm/orderchooseway/orderchooseway.scss @@ -0,0 +1,30 @@ +.chooseway { + width: 690rpx; + height: 96rpx; + line-height: 96rpx; + display: flex; + border-bottom: 2rpx solid #EAEAEA; + margin: 0 auto; + .item { + display: flex; + margin-right: 90rpx; + .select { + width: 26rpx; + height: 26rpx; + margin: auto 0; + border-radius: 50%; + background-color: #EAEAEA; + } + .selected { + background-color: #47C877; + } + .way { + color: #333333; + font-size: 26rpx; + text-indent: 17rpx; + } + } + .item1 { + margin-left: 31rpx; + } +} \ No newline at end of file diff --git a/components/orderconfirm/orderchooseway/orderchooseway.wxml b/components/orderconfirm/orderchooseway/orderchooseway.wxml new file mode 100644 index 0000000..b125024 --- /dev/null +++ b/components/orderconfirm/orderchooseway/orderchooseway.wxml @@ -0,0 +1,10 @@ + + + + 快递配送 + + + + 到店自取 + + \ No newline at end of file diff --git a/components/orderconfirm/orderchooseway/orderchooseway.wxss b/components/orderconfirm/orderchooseway/orderchooseway.wxss new file mode 100644 index 0000000..144fa56 --- /dev/null +++ b/components/orderconfirm/orderchooseway/orderchooseway.wxss @@ -0,0 +1,35 @@ +.chooseway { + width: 690rpx; + height: 96rpx; + line-height: 96rpx; + display: flex; + border-bottom: 2rpx solid #EAEAEA; + margin: 0 auto; +} + +.chooseway .item { + display: flex; + margin-right: 90rpx; +} + +.chooseway .item .select { + width: 26rpx; + height: 26rpx; + margin: auto 0; + border-radius: 50%; + background-color: #EAEAEA; +} + +.chooseway .item .selected { + background-color: #47C877; +} + +.chooseway .item .way { + color: #333333; + font-size: 26rpx; + text-indent: 17rpx; +} + +.chooseway .item1 { + margin-left: 31rpx; +} diff --git a/components/orderconfirm/ordershopinfo/ordershopinfo.js b/components/orderconfirm/ordershopinfo/ordershopinfo.js new file mode 100644 index 0000000..f4cf637 --- /dev/null +++ b/components/orderconfirm/ordershopinfo/ordershopinfo.js @@ -0,0 +1,23 @@ +// components/orderconfirm/ordershopinfo/ordershopinfo.js +Component({ + /** + * 组件的属性列表 + */ + properties: { + + }, + + /** + * 组件的初始数据 + */ + data: { + + }, + + /** + * 组件的方法列表 + */ + methods: { + + } +}) diff --git a/components/orderconfirm/ordershopinfo/ordershopinfo.json b/components/orderconfirm/ordershopinfo/ordershopinfo.json new file mode 100644 index 0000000..33d83c1 --- /dev/null +++ b/components/orderconfirm/ordershopinfo/ordershopinfo.json @@ -0,0 +1,6 @@ +{ + "component": true, + "usingComponents": { + + } +} \ No newline at end of file diff --git a/components/orderconfirm/ordershopinfo/ordershopinfo.scss b/components/orderconfirm/ordershopinfo/ordershopinfo.scss new file mode 100644 index 0000000..1e3c375 --- /dev/null +++ b/components/orderconfirm/ordershopinfo/ordershopinfo.scss @@ -0,0 +1,42 @@ +.shopinfo { + width: 690rpx; + height: 218rpx; + border-bottom: 2rpx solid #EAEAEA; + margin: 0 auto; + display: flex; + justify-content: center; + .pic { + width: 150rpx; + height: 163rpx; + background-color: #EAEAEA; + margin-right: 40rpx; + } + .right { + width: 402rpx; + display: flex; + flex-direction: column; + justify-content: space-between; + margin-top: 6rpx; + .shopname { + font-size: 28rpx; + font-weight: bold; + line-height: 39rpx; + } + .down { + margin-bottom: 50rpx; + display: flex; + justify-content: space-between; + .shopdesc { + color: #666666; + font-size: 24rpx; + .size { + margin-right: 20rpx; + } + } + .pri { + color: #E1C89F; + font-size: 28rpx; + } + } + } +} \ No newline at end of file diff --git a/components/orderconfirm/ordershopinfo/ordershopinfo.wxml b/components/orderconfirm/ordershopinfo/ordershopinfo.wxml new file mode 100644 index 0000000..aa1295f --- /dev/null +++ b/components/orderconfirm/ordershopinfo/ordershopinfo.wxml @@ -0,0 +1,13 @@ + + + + 产品产品产品产品产品产品产品产品产品产品产品产品产品 + + + 规格10ml + 0.04kg + + ￥657 + + + \ No newline at end of file diff --git a/components/orderconfirm/ordershopinfo/ordershopinfo.wxss b/components/orderconfirm/ordershopinfo/ordershopinfo.wxss new file mode 100644 index 0000000..3febb91 --- /dev/null +++ b/components/orderconfirm/ordershopinfo/ordershopinfo.wxss @@ -0,0 +1,49 @@ +.shopinfo { + width: 690rpx; + height: 218rpx; + border-bottom: 2rpx solid #EAEAEA; + margin: 0 auto; + display: flex; + justify-content: center; +} + +.shopinfo .pic { + width: 150rpx; + height: 163rpx; + background-color: #EAEAEA; + margin-right: 40rpx; +} + +.shopinfo .right { + width: 402rpx; + display: flex; + flex-direction: column; + justify-content: space-between; + margin-top: 6rpx; +} + +.shopinfo .right .shopname { + font-size: 28rpx; + font-weight: bold; + line-height: 39rpx; +} + +.shopinfo .right .down { + margin-bottom: 50rpx; + display: flex; + justify-content: space-between; +} + +.shopinfo .right .down .shopdesc { + color: #666666; + font-size: 24rpx; +} + +.shopinfo .right .down .shopdesc .size { + margin-right: 20rpx; +} + +.shopinfo .right .down .pri { + color: #E1C89F; + font-size: 28rpx; +} diff --git a/components/orderconfirm/orderyf/orderyf.js b/components/orderconfirm/orderyf/orderyf.js new file mode 100644 index 0000000..fb835e8 --- /dev/null +++ b/components/orderconfirm/orderyf/orderyf.js @@ -0,0 +1,23 @@ +// components/orderconfirm/orderyf/orderyf.js +Component({ + /** + * 组件的属性列表 + */ + properties: { + + }, + + /** + * 组件的初始数据 + */ + data: { + + }, + + /** + * 组件的方法列表 + */ + methods: { + + } +}) diff --git a/components/orderconfirm/orderyf/orderyf.json b/components/orderconfirm/orderyf/orderyf.json new file mode 100644 index 0000000..e8cfaaf --- /dev/null +++ b/components/orderconfirm/orderyf/orderyf.json @@ -0,0 +1,4 @@ +{ + "component": true, + "usingComponents": {} +} \ No newline at end of file diff --git a/components/orderconfirm/orderyf/orderyf.scss b/components/orderconfirm/orderyf/orderyf.scss new file mode 100644 index 0000000..95c2833 --- /dev/null +++ b/components/orderconfirm/orderyf/orderyf.scss @@ -0,0 +1,17 @@ +.orderyf { + width: 690rpx; + height: 96rpx; + line-height: 96rpx; + display: flex; + border-bottom: 2rpx solid #EAEAEA; + margin: 0 auto; + justify-content: space-between; + font-size: 28rpx; + .left { + margin-left: 31rpx + } + .right { + margin-right: 20rpx; + ; + } +} \ No newline at end of file diff --git a/components/orderconfirm/orderyf/orderyf.wxml b/components/orderconfirm/orderyf/orderyf.wxml new file mode 100644 index 0000000..25ae3c3 --- /dev/null +++ b/components/orderconfirm/orderyf/orderyf.wxml @@ -0,0 +1,4 @@ + + 运费 + ￥16 + \ No newline at end of file diff --git a/components/orderconfirm/orderyf/orderyf.wxss b/components/orderconfirm/orderyf/orderyf.wxss new file mode 100644 index 0000000..a63eeb0 --- /dev/null +++ b/components/orderconfirm/orderyf/orderyf.wxss @@ -0,0 +1,18 @@ +.orderyf { + width: 690rpx; + height: 96rpx; + line-height: 96rpx; + display: flex; + border-bottom: 2rpx solid #EAEAEA; + margin: 0 auto; + justify-content: space-between; + font-size: 28rpx; +} + +.orderyf .left { + margin-left: 31rpx; +} + +.orderyf .right { + margin-right: 20rpx; +} diff --git a/pages/orderconfirm/orderconfirm.js b/pages/orderconfirm/orderconfirm.js new file mode 100644 index 0000000..fa9dc45 --- /dev/null +++ b/pages/orderconfirm/orderconfirm.js @@ -0,0 +1,23 @@ +// pages/orderconfirm/orderconfirm.js +Component({ + /** + * 组件的属性列表 + */ + properties: { + + }, + + /** + * 组件的初始数据 + */ + data: { + + }, + + /** + * 组件的方法列表 + */ + methods: { + + } +}) diff --git a/pages/orderconfirm/orderconfirm.json b/pages/orderconfirm/orderconfirm.json new file mode 100644 index 0000000..0f67a0a --- /dev/null +++ b/pages/orderconfirm/orderconfirm.json @@ -0,0 +1,11 @@ +{ + "component": true, + "usingComponents": { + "shopinfo": "/components/orderconfirm/ordershopinfo/ordershopinfo", + "chooseway": "/components/orderconfirm/orderchooseway/orderchooseway", + "chooseaddr": "/components/orderconfirm/orderchooseaddr/orderchooseaddr", + "orderyf": "/components/orderconfirm/orderyf/orderyf", + "agree": "/components/orderconfirm/orderagreement/orderagreement", + "bottom": "/components/orderconfirm/orderbottom/orderbottom" + } +} \ No newline at end of file diff --git a/pages/orderconfirm/orderconfirm.scss b/pages/orderconfirm/orderconfirm.scss new file mode 100644 index 0000000..711fb93 --- /dev/null +++ b/pages/orderconfirm/orderconfirm.scss @@ -0,0 +1,7 @@ +.orderconfirm { + .bottom { + width: 100%; + position: fixed; + bottom: 0; + } +} \ No newline at end of file diff --git a/pages/orderconfirm/orderconfirm.wxml b/pages/orderconfirm/orderconfirm.wxml new file mode 100644 index 0000000..22ec3be --- /dev/null +++ b/pages/orderconfirm/orderconfirm.wxml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/pages/orderconfirm/orderconfirm.wxss b/pages/orderconfirm/orderconfirm.wxss new file mode 100644 index 0000000..2dc1eca --- /dev/null +++ b/pages/orderconfirm/orderconfirm.wxss @@ -0,0 +1,5 @@ +.orderconfirm .bottom { + width: 100%; + position: fixed; + bottom: 0; +}