From e4be498094630a409d691159c90915882db1c450 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?LAPTOP-D7TKRI82=5C=E9=82=93?= <52643018@qq.com> Date: Tue, 22 Jun 2021 09:30:46 +0800 Subject: [PATCH 1/6] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]=20common.css=E7=BC=BA?= =?UTF-8?q?=E5=B0=91ifend=E6=94=B6=E5=B0=BE=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/styles/common.css | 2 +- pages.json | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/common/styles/common.css b/common/styles/common.css index b97fda2..4ba4084 100644 --- a/common/styles/common.css +++ b/common/styles/common.css @@ -60,7 +60,7 @@ checkbox .wx-checkbox-input.wx-checkbox-input-checked::before { radio:not([disabled]) .wx-radio-input:hover checkbox:not([disabled]) .wx-checkbox-input:hover { border-color: #d1d1d1 !important; } - +/* #endif */ /* 常用的 */ diff --git a/pages.json b/pages.json index 263206a..82d9271 100644 --- a/pages.json +++ b/pages.json @@ -21,6 +21,12 @@ "style": { "navigationBarTitleText": "我的" } + }, + { + "path": "pages/goodsDetail/goodsDetail", + "style": { + "navigationBarTitleText": "商品详情" + } } ], "globalStyle": { From 723e8652ad6aa93ab13374f05fa856d988955c49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?LAPTOP-D7TKRI82=5C=E9=82=93?= <52643018@qq.com> Date: Tue, 22 Jun 2021 11:17:13 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=95=86=E5=93=81?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/styles/common.css | 8 +- pages.json | 3 +- pages/goodsDetail/goodsDetail.vue | 200 +++++++++++++++++++++++++++++- 3 files changed, 204 insertions(+), 7 deletions(-) diff --git a/common/styles/common.css b/common/styles/common.css index 4ba4084..534f5db 100644 --- a/common/styles/common.css +++ b/common/styles/common.css @@ -280,11 +280,11 @@ radio:not([disabled]) .wx-radio-input:hover checkbox:not([disabled]) .wx-checkbo } .lf-color-primary { - color: #FA4427 !important; + color: #FE9903 !important; } .lf-bg-primary { - background: #FA4427 !important; + background: #FE9903 !important; } .lf-color-secondary { @@ -312,11 +312,11 @@ radio:not([disabled]) .wx-radio-input:hover checkbox:not([disabled]) .wx-checkbo } .lf-color-gray { - color: #656565 !important; + color: #777777 !important; } .lf-bg-gray { - background: #656565 !important; + background: #777777 !important; } .lf-color-999{ diff --git a/pages.json b/pages.json index b321520..cb16b98 100644 --- a/pages.json +++ b/pages.json @@ -25,7 +25,8 @@ { "path": "pages/goodsDetail/goodsDetail", "style": { - "navigationBarTitleText": "商品详情" + "navigationBarTitleText": "商品详情", + "backgroundColor": "#F5F5F5" } } ], diff --git a/pages/goodsDetail/goodsDetail.vue b/pages/goodsDetail/goodsDetail.vue index 10fbaaf..e5f48dd 100644 --- a/pages/goodsDetail/goodsDetail.vue +++ b/pages/goodsDetail/goodsDetail.vue @@ -1,6 +1,79 @@ @@ -8,7 +81,7 @@ export default { data(){ return { - + current: 0 // 轮播下标 } }, onLoad(){ @@ -20,6 +93,129 @@ } + \ No newline at end of file From 5fc3a45361b72ddc13a8f5b9d96dcf9ea9bcf936 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?LAPTOP-D7TKRI82=5C=E9=82=93?= <52643018@qq.com> Date: Tue, 22 Jun 2021 11:49:19 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=AE=8C=E6=88=90=E4=B8=AA=E4=BA=BA?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/styles/common.css | 4 ++ pages/center/index.vue | 129 ++++++++++++++++++++++++++++----------- 2 files changed, 98 insertions(+), 35 deletions(-) diff --git a/common/styles/common.css b/common/styles/common.css index 534f5db..a68d65d 100644 --- a/common/styles/common.css +++ b/common/styles/common.css @@ -125,6 +125,10 @@ radio:not([disabled]) .wx-radio-input:hover checkbox:not([disabled]) .wx-checkbo flex-wrap: wrap; } +.lf-text-vertical{ + vertical-align: middle; +} + .lf-line-1{ overflow: hidden; white-space: nowrap; diff --git a/pages/center/index.vue b/pages/center/index.vue index 88ee79b..e2d0f22 100644 --- a/pages/center/index.vue +++ b/pages/center/index.vue @@ -1,13 +1,61 @@ @@ -16,7 +64,7 @@ export default { data() { return { - title: 'Hello' + } }, onLoad() { @@ -28,35 +76,46 @@ } - + From f4f86d7032714ad87d5b42e3b07c4bebe4351818 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?LAPTOP-D7TKRI82=5C=E9=82=93?= <52643018@qq.com> Date: Tue, 22 Jun 2021 12:47:56 +0800 Subject: [PATCH 4/6] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=20=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83=E9=A1=B5=E9=9D=A2=E5=95=86?= =?UTF-8?q?=E6=88=B7=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/center/index.vue | 55 ++++++++++++++++++++++++++++++++++++------ 1 file changed, 47 insertions(+), 8 deletions(-) diff --git a/pages/center/index.vue b/pages/center/index.vue index e2d0f22..517d49f 100644 --- a/pages/center/index.vue +++ b/pages/center/index.vue @@ -3,7 +3,11 @@ - 时空网的忠实网友 + + 时空网的忠实网友 + 商户 + 管理员 + ID 78873 135****7547 @@ -57,6 +61,22 @@ + + + + 商家工具 + 李大叔家的店 + + + + + 卡券核销 + + + + + + @@ -101,6 +121,15 @@ flex: auto; height: max-content; } + .user-label{ + display: inline-block; + font-size: 24rpx; + color: #FFFFFF; + background-color: #1E89FF; + padding: 4rpx 16rpx; + border-radius: 30rpx; + margin-left: 8rpx; + } } .list{ @@ -109,13 +138,23 @@ background-color: #FFFFFF; width: 100%; height: auto; - .list-item{ - border-bottom: 1rpx solid #EEEEEE; - height: 110rpx; - box-sizing: border-box; - &:last-child{ - border-bottom: none; - } + } + .list-item{ + border-bottom: 1rpx solid #EEEEEE; + height: 110rpx; + box-sizing: border-box; + &:last-child{ + border-bottom: none; } } + + .shop-list{ + margin-top: 20rpx; + width: 750rpx; + height: auto; + background-color: #FFFFFF; + padding: 30rpx 32rpx; + padding-bottom: 0; + box-sizing: border-box; + } From 9d63de078fa05126b7c4aafeac3d402738495968 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?LAPTOP-D7TKRI82=5C=E9=82=93?= <52643018@qq.com> Date: Tue, 22 Jun 2021 14:09:20 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=88=91=E7=9A=84?= =?UTF-8?q?=E6=94=B6=E8=97=8F=E9=A1=B5=E9=9D=A2UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages.json | 8 +- pages/collect/index.vue | 74 +++++++++++++++++++ .../{goodsDetail.vue => index.vue} | 0 3 files changed, 81 insertions(+), 1 deletion(-) create mode 100644 pages/collect/index.vue rename pages/goodsDetail/{goodsDetail.vue => index.vue} (100%) diff --git a/pages.json b/pages.json index cb16b98..e933b50 100644 --- a/pages.json +++ b/pages.json @@ -23,11 +23,17 @@ } }, { - "path": "pages/goodsDetail/goodsDetail", + "path": "pages/goodsDetail/index", "style": { "navigationBarTitleText": "商品详情", "backgroundColor": "#F5F5F5" } + }, + { + "path": "pages/collect/index", + "style": { + "navigationBarTitleText": "我的收藏" + } } ], "globalStyle": { diff --git a/pages/collect/index.vue b/pages/collect/index.vue new file mode 100644 index 0000000..46018d0 --- /dev/null +++ b/pages/collect/index.vue @@ -0,0 +1,74 @@ + + + + + diff --git a/pages/goodsDetail/goodsDetail.vue b/pages/goodsDetail/index.vue similarity index 100% rename from pages/goodsDetail/goodsDetail.vue rename to pages/goodsDetail/index.vue From 42cb0db3d55c1d71ce74f2648d2bf317fe840167 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?LAPTOP-D7TKRI82=5C=E9=82=93?= <52643018@qq.com> Date: Tue, 22 Jun 2021 14:24:40 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=AE=8C=E6=88=90=E8=81=94=E7=B3=BB?= =?UTF-8?q?=E5=AE=A2=E6=9C=8D=E9=A1=B5=E9=9D=A2UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages.json | 6 +++ pages/contactService/index.vue | 71 ++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+) create mode 100644 pages/contactService/index.vue diff --git a/pages.json b/pages.json index e933b50..44b53ca 100644 --- a/pages.json +++ b/pages.json @@ -34,6 +34,12 @@ "style": { "navigationBarTitleText": "我的收藏" } + }, + { + "path": "pages/contactService/index", + "style": { + "navigationBarTitleText": "联系客服" + } } ], "globalStyle": { diff --git a/pages/contactService/index.vue b/pages/contactService/index.vue new file mode 100644 index 0000000..91344d3 --- /dev/null +++ b/pages/contactService/index.vue @@ -0,0 +1,71 @@ + + + + +