diff --git a/pages.json b/pages.json index 7c555dc..cfbf9ce 100644 --- a/pages.json +++ b/pages.json @@ -1,5 +1,13 @@ { "pages": [ + { + "path" : "pages/clients/clients", + "style" : + { + "navigationBarTitleText": "客户列表", + "enablePullDownRefresh": true + } + }, { "path": "pages/index/index", "style": { @@ -13,14 +21,6 @@ "navigationBarTitleText": "登录", "enablePullDownRefresh": false } - }, - { - "path" : "pages/clients/clients", - "style" : - { - "navigationBarTitleText": "客户列表", - "enablePullDownRefresh": true - } }, { "path" : "pages/invite/invite", diff --git a/pages/index/index.vue b/pages/index/index.vue index 2912ca4..1f69659 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -1,9 +1,24 @@ @@ -37,9 +52,27 @@ } - diff --git a/pages/ordered/ordered.vue b/pages/ordered/ordered.vue index ebd0bc5..1c5428a 100644 --- a/pages/ordered/ordered.vue +++ b/pages/ordered/ordered.vue @@ -14,17 +14,23 @@ @@ -225,31 +231,39 @@ margin-bottom: 10px; } .list { - background-color: #fff; li { - padding: 20px; - border-bottom: 2px solid #f8f8f8; + padding: 0 24rpx; + margin: 16rpx 24rpx; + background-color: #fff; + border-radius: 16rpx; + } + .pro-name { + display: flex; + align-items: center; + padding: 18rpx 0; + font-size: 30rpx; + color: #333; + border-bottom: 1px solid #E6E8ED; + .icon { + width: 52rpx; + margin-right: 20rpx; + } + } + .info { + padding: 12rpx 0; } .line { display: flex; - justify-content: space-between; - margin-bottom: 10px; + padding: 12rpx 0; } - .text { - width: 30%; - font-size: 14px; - &:first-child { - margin-right: 10px; - } - &:nth-child(3), &:last-child { - width: 20%; - text-align: center; - } + .name { + margin-right: 10rpx; + font-size: 28rpx; + color: #999; } - .thead { - .text { - color: #767676; - } + .val { + font-size: 28rpx; + color: #333; } } diff --git a/static/filter.png b/static/filter.png deleted file mode 100644 index ee26aec..0000000 Binary files a/static/filter.png and /dev/null differ diff --git a/static/image/course1.png b/static/image/course1.png new file mode 100644 index 0000000..bc2dccf Binary files /dev/null and b/static/image/course1.png differ diff --git a/static/image/index/index1.png b/static/image/index/index1.png new file mode 100644 index 0000000..7aac24a Binary files /dev/null and b/static/image/index/index1.png differ diff --git a/static/image/index/index2.png b/static/image/index/index2.png new file mode 100644 index 0000000..b270ebf Binary files /dev/null and b/static/image/index/index2.png differ diff --git a/static/image/index/index3.png b/static/image/index/index3.png new file mode 100644 index 0000000..842121f Binary files /dev/null and b/static/image/index/index3.png differ diff --git a/static/image/index/index4.png b/static/image/index/index4.png new file mode 100644 index 0000000..8a9080f Binary files /dev/null and b/static/image/index/index4.png differ diff --git a/static/image/index/index5.png b/static/image/index/index5.png new file mode 100644 index 0000000..0ff2980 Binary files /dev/null and b/static/image/index/index5.png differ diff --git a/static/image/index/index6.png b/static/image/index/index6.png new file mode 100644 index 0000000..580a644 Binary files /dev/null and b/static/image/index/index6.png differ diff --git a/static/image/index/index7.png b/static/image/index/index7.png new file mode 100644 index 0000000..36f38ae Binary files /dev/null and b/static/image/index/index7.png differ diff --git a/styles/common.scss b/styles/common.scss index 1a497b9..0f82b25 100644 --- a/styles/common.scss +++ b/styles/common.scss @@ -66,13 +66,12 @@ page { .tab { display: flex; justify-content: space-around; - padding: 10px; margin-bottom: 10px; background-color: #fff; li { - padding: 0 4px; + padding: 0 10px; font-size: 14px; - line-height: 30px; + line-height: 50px; border-bottom: 3px solid transparent; } .active {