Merge branch 'zhengjei' of pplokijuhyg/deguodaigou into master

This commit is contained in:
asd 2019-12-13 17:23:41 +08:00
commit e1c35b0963
37 changed files with 641 additions and 15 deletions

View File

@ -5,15 +5,19 @@
- index 首页组件
- page 页面
- index 首页
- shopping 购物车
- orderconfirm 订单确认
- utils 插件
- [bin.js](./doc/bin.md)
- doc 文档存放
## 页面路由
- pages/index/index 首页 <br>
- pages/shopping/shopping 购物车 <br>
组件
- index/search 顶部搜索框
- index/list 商品列表
- index/lsit/commodity 商品单条
- index/shopping/shoppingitem 购物车商品信息
- pages/search/search 搜索页 <br>
组件
- index/search 顶部搜索框
@ -21,4 +25,11 @@
- pages/classify/classify 分类页 <br>
组件
- classify/list 右侧商品列表
- classify/navigation 左侧导航列表
- classify/navigation 左侧导航列表
组件
- orderconfirm/agreement 同意协议
- orderconfirm/bottom 订单确认底部
- orderconfirm/chooseaddr 选择地址
- orderconfirm/chooseway 选择方式
- orderconfirm/ordershopinfo 顶部的商品信息
- orderconfirm/orderyf 运费

View File

@ -1,16 +1,17 @@
{
"pages": [
"pages/classify/classify",
"pages/shopping/shopping",
"pages/search/search",
"pages/index/index"
],
"window": {
"backgroundTextStyle": "light",
"navigationBarBackgroundColor": "#fff",
"navigationBarTitleText": "WeChat",
"navigationBarTextStyle": "black"
},
"style": "v2",
"sitemapLocation": "sitemap.json"
"pages": [
"pages/orderconfirm/orderconfirm",
"pages/classify/classify",
"pages/shopping/shopping",
"pages/search/search",
"pages/index/index"
],
"window": {
"backgroundTextStyle": "light",
"navigationBarBackgroundColor": "#fff",
"navigationBarTitleText": "WeChat",
"navigationBarTextStyle": "black"
},
"style": "v2",
"sitemapLocation": "sitemap.json"
}

View File

@ -0,0 +1,23 @@
// components/orderconfirm/orderagreement/orderagreement.js
Component({
/**
* 组件的属性列表
*/
properties: {
},
/**
* 组件的初始数据
*/
data: {
},
/**
* 组件的方法列表
*/
methods: {
}
})

View File

@ -0,0 +1,4 @@
{
"component": true,
"usingComponents": {}
}

View File

@ -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;
}
}

View File

@ -0,0 +1,4 @@
<view class="agree">
<view class="select"></view>
<text>同意使用条款和隐私政策</text>
</view>

View File

@ -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;
}

View File

@ -0,0 +1,23 @@
// components/orderconfirm/orderbottom/orderbottom.js
Component({
/**
* 组件的属性列表
*/
properties: {
},
/**
* 组件的初始数据
*/
data: {
},
/**
* 组件的方法列表
*/
methods: {
}
})

View File

@ -0,0 +1,4 @@
{
"component": true,
"usingComponents": {}
}

View File

@ -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;
}
}

View File

@ -0,0 +1,7 @@
<view class="bottom">
<view class="left">
<text>总计</text>
<text class="pri">$0.00</text>
</view>
<view class="right">结算</view>
</view>

View File

@ -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;
}

View File

@ -0,0 +1,23 @@
// components/orderconfirm/orderchooseaddr/orderchooseaddr.js
Component({
/**
* 组件的属性列表
*/
properties: {
},
/**
* 组件的初始数据
*/
data: {
},
/**
* 组件的方法列表
*/
methods: {
}
})

View File

@ -0,0 +1,4 @@
{
"component": true,
"usingComponents": {}
}

View File

@ -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;
}
}

View File

@ -0,0 +1,12 @@
<view class="orderchooseaddr">
<view class="left">
<view class="userinfo">
<text class="username">于于宇 15698857895</text>
<text>邮政编码677467</text>
</view>
<view class="addr">
中国大陆 山东省 青岛市 即墨区 纯阳路 某某某小区
</view>
</view>
<view class="right"></view>
</view>

View File

@ -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;
}

View File

@ -0,0 +1,23 @@
// components/orderconfirm/orderchooseway/orderchooseway.js
Component({
/**
* 组件的属性列表
*/
properties: {
},
/**
* 组件的初始数据
*/
data: {
},
/**
* 组件的方法列表
*/
methods: {
}
})

View File

@ -0,0 +1,4 @@
{
"component": true,
"usingComponents": {}
}

View File

@ -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;
}
}

View File

@ -0,0 +1,10 @@
<view class="chooseway">
<view class="item item1">
<view class="select selected"></view>
<text class="way">快递配送</text>
</view>
<view class="item">
<view class="select"></view>
<text class="way">到店自取</text>
</view>
</view>

View File

@ -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;
}

View File

@ -0,0 +1,23 @@
// components/orderconfirm/ordershopinfo/ordershopinfo.js
Component({
/**
* 组件的属性列表
*/
properties: {
},
/**
* 组件的初始数据
*/
data: {
},
/**
* 组件的方法列表
*/
methods: {
}
})

View File

@ -0,0 +1,6 @@
{
"component": true,
"usingComponents": {
}
}

View File

@ -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;
}
}
}
}

View File

@ -0,0 +1,13 @@
<view class="shopinfo">
<view class="pic"></view>
<view class="right">
<view class="shopname">产品产品产品产品产品产品产品产品产品产品产品产品产品</view>
<view class="down">
<view class="shopdesc">
<text class="size">规格10ml</text>
<text> 0.04kg</text>
</view>
<view class="pri">¥657</view>
</view>
</view>
</view>

View File

@ -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;
}

View File

@ -0,0 +1,23 @@
// components/orderconfirm/orderyf/orderyf.js
Component({
/**
* 组件的属性列表
*/
properties: {
},
/**
* 组件的初始数据
*/
data: {
},
/**
* 组件的方法列表
*/
methods: {
}
})

View File

@ -0,0 +1,4 @@
{
"component": true,
"usingComponents": {}
}

View File

@ -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;
;
}
}

View File

@ -0,0 +1,4 @@
<view class="orderyf">
<view class="left">运费</view>
<view class="right">¥16</view>
</view>

View File

@ -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;
}

View File

@ -0,0 +1,23 @@
// pages/orderconfirm/orderconfirm.js
Component({
/**
* 组件的属性列表
*/
properties: {
},
/**
* 组件的初始数据
*/
data: {
},
/**
* 组件的方法列表
*/
methods: {
}
})

View File

@ -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"
}
}

View File

@ -0,0 +1,7 @@
.orderconfirm {
.bottom {
width: 100%;
position: fixed;
bottom: 0;
}
}

View File

@ -0,0 +1,11 @@
<view class="orderconfirm">
<shopinfo></shopinfo>
<chooseway></chooseway>
<chooseaddr></chooseaddr>
<orderyf></orderyf>
<agree></agree>
<view class="bottom">
<bottom></bottom>
</view>
</view>

View File

@ -0,0 +1,5 @@
.orderconfirm .bottom {
width: 100%;
position: fixed;
bottom: 0;
}