From 35675e01297cb3005813d80d7413dc65540c91e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=BE=81?= Date: Sat, 7 May 2022 20:21:20 +0800 Subject: [PATCH 1/4] add goods list --- assets/images/goods/item.png | Bin 0 -> 32178 bytes assets/images/goods/sort-b1.png | Bin 0 -> 134 bytes assets/images/goods/sort-b2.png | Bin 0 -> 133 bytes assets/images/goods/sort-t1.png | Bin 0 -> 135 bytes assets/images/goods/sort-t2.png | Bin 0 -> 135 bytes pages/goods/list/index.vue | 75 +++++++++++++++++++++++++--- pages/goods/list/module/Item.vue | 22 +++++++++ pages/goods/list/module/Sort.vue | 81 +++++++++++++++++++++++++++++++ 8 files changed, 170 insertions(+), 8 deletions(-) create mode 100644 assets/images/goods/item.png create mode 100644 assets/images/goods/sort-b1.png create mode 100644 assets/images/goods/sort-b2.png create mode 100644 assets/images/goods/sort-t1.png create mode 100644 assets/images/goods/sort-t2.png create mode 100644 pages/goods/list/module/Item.vue create mode 100644 pages/goods/list/module/Sort.vue diff --git a/assets/images/goods/item.png b/assets/images/goods/item.png new file mode 100644 index 0000000000000000000000000000000000000000..a8ec0656cae4ac47740cb4a89ed5ad305d87aba5 GIT binary patch literal 32178 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 V<+Sf?e|xb5NQ%md)ClPZ{ts`oF?av~ literal 0 HcmV?d00001 diff --git a/assets/images/goods/sort-b1.png b/assets/images/goods/sort-b1.png new file mode 100644 index 0000000000000000000000000000000000000000..73217020c5e54cae1d24f366e620b754718d8ac8 GIT binary patch literal 134 zcmeAS@N?(olHy`uVBq!ia0vp^Y(UJ+0U|dr*8K)jjKx9jP7LeL$-D$|96VhdLnOkJ zZHk|rsbgbfV`mE~Xej*u@2^cwP0i~6|Np;doErW4=jZ1xZUX5*VVymD_MCQnbAG

gI0)z4*}Q$iB}m6|bb literal 0 HcmV?d00001 diff --git a/assets/images/goods/sort-b2.png b/assets/images/goods/sort-b2.png new file mode 100644 index 0000000000000000000000000000000000000000..3e599ae09d2bca94df81cd8ade1b1b5d17969b11 GIT binary patch literal 133 zcmeAS@N?(olHy`uVBq!ia0vp^Y(UJ+0U|dr*8K)jjKx9jP7LeL$-D$|>^)r^LnOkJ z|J;|`JHN5;LriJy)sAAetb2VwDI8q`D6ci7uxW=$x(2W-@w9rn6GXAekaNQ+uh%% hCnOX!a2;B~%&^s5pyl^-hfbhj44$rjF6*2UngE-KF5dtE literal 0 HcmV?d00001 diff --git a/pages/goods/list/index.vue b/pages/goods/list/index.vue index c930b79..67ceec9 100644 --- a/pages/goods/list/index.vue +++ b/pages/goods/list/index.vue @@ -7,17 +7,76 @@ --> \ No newline at end of file +.main { + width: 75rem; + margin: 0 auto; + + &__nav { + &-crumbs { + .el-icon-arrow-right { + margin: 0 10px; + } + } + &-sort { + width: 100%; + height: 48px; + background: #fff; + margin-top: 0.88rem; + margin-bottom: 1.13rem; + display: flex; + align-items: center; + padding: 0 1.88rem; + &-txt { + color: #999999; + margin-right: 1.88rem; + } + &-btn { + margin-right: 3.13rem; + } + } + } + &__content { + display: grid; + width: 100%; + grid-template-columns: repeat(auto-fill, 14.5rem); + justify-content: space-between; + grid-row-gap: 0.63rem; + } +} + diff --git a/pages/goods/list/module/Item.vue b/pages/goods/list/module/Item.vue new file mode 100644 index 0000000..fc71331 --- /dev/null +++ b/pages/goods/list/module/Item.vue @@ -0,0 +1,22 @@ + + + diff --git a/pages/goods/list/module/Sort.vue b/pages/goods/list/module/Sort.vue new file mode 100644 index 0000000..6484270 --- /dev/null +++ b/pages/goods/list/module/Sort.vue @@ -0,0 +1,81 @@ + + + From 7d42def8d005609ab8645243410ede9e70d30859 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=BE=81?= Date: Mon, 9 May 2022 09:38:27 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat:=E5=BC=80=E5=8F=91=E5=95=86=E5=93=81?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/goods/list/index.vue | 2 +- pages/goods/list/module/{Sort.vue => SortItem.vue} | 2 +- store/index.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename pages/goods/list/module/{Sort.vue => SortItem.vue} (93%) diff --git a/pages/goods/list/index.vue b/pages/goods/list/index.vue index 67ceec9..251ccb9 100644 --- a/pages/goods/list/index.vue +++ b/pages/goods/list/index.vue @@ -27,7 +27,7 @@ \ No newline at end of file + &-msg { + width: 714px; + height: 127px; + background: #f8f8f8; + padding: 30px 20px 0; + .msg-txt { + font-size: 14px; + font-family: Microsoft YaHei-Regular, Microsoft YaHei; + font-weight: 400; + color: #9e9e9e; + margin-right: 20px; + } + + .msg-service { + font-size: 14px; + font-family: Microsoft YaHei-Regular, Microsoft YaHei; + font-weight: 400; + color: #666666; + } + .msg-icon { + margin-left: 6px; + width: 12px; + height: 12px; + } + &--price { + padding-bottom: 30px; + } + .hr { + width: 673px; + height: 1px; + background: #dddddd; + } + &--service{ + padding-top: 16px; + } + } + } +} + diff --git a/pages/goods/list/index.vue b/pages/goods/list/index.vue index 251ccb9..f2452ba 100644 --- a/pages/goods/list/index.vue +++ b/pages/goods/list/index.vue @@ -13,26 +13,117 @@

全部商品开发书籍

-
+
排序 : - 综合 - - 上新 + 综合 + + 上新
- +
+ +
@@ -44,10 +135,19 @@ export default { } .main { - width: 75rem; + width: 1200px; margin: 0 auto; + padding-top: 14px; + padding-bottom: 60px; &__nav { + &::after { + display: block; + width: 1200px; + content: ""; + height: 1px; + background: #eee; + } &-crumbs { .el-icon-arrow-right { margin: 0 10px; @@ -55,28 +155,62 @@ export default { } &-sort { width: 100%; - height: 48px; - background: #fff; - margin-top: 0.88rem; - margin-bottom: 1.13rem; - display: flex; - align-items: center; - padding: 0 1.88rem; + height: 50px; + margin-top: 24px; + padding: 0 30px; &-txt { color: #999999; - margin-right: 1.88rem; + margin-right: 30px; } &-btn { - margin-right: 3.13rem; + margin-right: 50px; + cursor: pointer; + } + &-active { + color: #ff512b; } } } &__content { + margin-top: 30px; display: grid; width: 100%; - grid-template-columns: repeat(auto-fill, 14.5rem); + grid-template-columns: repeat(auto-fill, 232px); justify-content: space-between; - grid-row-gap: 0.63rem; + grid-row-gap: 10px; + } + &__pagination { + margin-top: 60px; + /deep/.el-pager { + margin-left: 8px; + } + + /deep/button, + /deep/.number, + /deep/.btn-quicknext, + /deep/.btn-quickprev { + width: 32px; + height: 32px; + text-align: center; + line-height: 32px; + margin-left: 8px; + border-radius: 2px 2px 2px 2px; + border: 1px solid rgba(0, 0, 0, 0.15); + font-size: 14px; + font-family: Microsoft YaHei-Regular, Microsoft YaHei; + font-weight: 400; + color: rgba(0, 0, 0, 0.65); + } + + /deep/.active { + background: #ff512b; + color: #fff; + } } } + diff --git a/pages/goods/list/module/Item.vue b/pages/goods/list/module/Item.vue index fc71331..84e9786 100644 --- a/pages/goods/list/module/Item.vue +++ b/pages/goods/list/module/Item.vue @@ -1,22 +1,92 @@ diff --git a/pages/goods/list/module/SortItem.vue b/pages/goods/list/module/SortItem.vue index f856422..a905ec9 100644 --- a/pages/goods/list/module/SortItem.vue +++ b/pages/goods/list/module/SortItem.vue @@ -3,17 +3,17 @@ {{ sortText }}
sort sort sort @@ -26,7 +26,6 @@
diff --git a/plugins/api/goods.js b/plugins/api/goods.js index 5989bbc..0567c27 100644 --- a/plugins/api/goods.js +++ b/plugins/api/goods.js @@ -16,7 +16,7 @@ const BASE_URL = `${ENV.base_url}/mall/product`; * @param {*} params */ export const ApiGetGoodsList = (params) => - ToAsyncAwait(axios.get(`${BASE_URL}/app/product/page`, params)); + ToAsyncAwait(axios.get(`${BASE_URL}/app/product/page`, {params})); /** * 获取推荐商品 * @param {*} params diff --git a/plugins/element-ui.js b/plugins/element-ui.js index 9ec8b61..ff3dbc9 100644 --- a/plugins/element-ui.js +++ b/plugins/element-ui.js @@ -1,5 +1,5 @@ import Vue from 'vue' import Element from 'element-ui' -import locale from 'element-ui/lib/locale/lang/en' +import locale from 'element-ui/lib/locale/lang/zh-CN' Vue.use(Element, { locale }) From 966d13922fa2565e6f6284199f07963b056475e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=BE=81?= Date: Mon, 9 May 2022 21:10:51 +0800 Subject: [PATCH 4/4] =?UTF-8?q?feat:=E5=BC=80=E5=8F=91=E5=95=86=E5=93=81?= =?UTF-8?q?=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/goods/detail/_id.vue | 77 ++++++++++++++++++-- pages/goods/list/index.vue | 4 +- pages/goods/list/module/SortItem.vue | 8 +- plugins/api/goods.js | 2 +- static/images/goods/left.png | Bin 0 -> 369 bytes {assets => static}/images/goods/more.png | Bin static/images/goods/right.png | Bin 0 -> 375 bytes {assets => static}/images/goods/sort-b1.png | Bin {assets => static}/images/goods/sort-b2.png | Bin {assets => static}/images/goods/sort-t1.png | Bin {assets => static}/images/goods/sort-t2.png | Bin 11 files changed, 79 insertions(+), 12 deletions(-) create mode 100644 static/images/goods/left.png rename {assets => static}/images/goods/more.png (100%) create mode 100644 static/images/goods/right.png rename {assets => static}/images/goods/sort-b1.png (100%) rename {assets => static}/images/goods/sort-b2.png (100%) rename {assets => static}/images/goods/sort-t1.png (100%) rename {assets => static}/images/goods/sort-t2.png (100%) diff --git a/pages/goods/detail/_id.vue b/pages/goods/detail/_id.vue index deac795..074496a 100644 --- a/pages/goods/detail/_id.vue +++ b/pages/goods/detail/_id.vue @@ -12,7 +12,9 @@

- +

新品 @@ -32,24 +34,47 @@ > 服务 +

+
+ 规格 +
+ 123 +
+
+
+
+ 加入购物车 + 立即购买 +
@@ -126,6 +151,48 @@ export default { padding-top: 16px; } } + + &-option { + padding-top: 24px; + + &--line { + margin-bottom: 6px; + .line-txt { + font-size: 14px; + font-family: Microsoft YaHei-Regular, Microsoft YaHei; + font-weight: 400; + color: #9e9e9e; + margin-left: 20px; + margin-right: 33px; + } + .line-btns { + width: 600px; + /deep/.ui-button__yellow_line { + background: #fff; + margin-right: 14px; + color: #666; + margin-bottom: 6px; + border-color: #ccc; + } + } + } + } + + &-pay { + margin-top: 40px; + button { + width: 144px; + height: 46px; + margin-right: 30px; + font-size: 18px; + &:nth-child(1) { + background: #fff; + } + &:nth-child(2) { + border: none; + } + } + } } } diff --git a/pages/goods/list/index.vue b/pages/goods/list/index.vue index f2452ba..7087ff2 100644 --- a/pages/goods/list/index.vue +++ b/pages/goods/list/index.vue @@ -115,9 +115,9 @@ export default { vm.$message.error(res.error.message); return false; } - vm.total = res.result.data.total; - vm.listData = res.result.data.records; console.log(`goodListRes`, res.result); + vm.total = res.result.total; + vm.listData = res.result.records; }, handleCurrentChange(val) { let vm = this; diff --git a/pages/goods/list/module/SortItem.vue b/pages/goods/list/module/SortItem.vue index a905ec9..ea36522 100644 --- a/pages/goods/list/module/SortItem.vue +++ b/pages/goods/list/module/SortItem.vue @@ -4,22 +4,22 @@
sort sort sort sort
diff --git a/plugins/api/goods.js b/plugins/api/goods.js index 0567c27..36e535e 100644 --- a/plugins/api/goods.js +++ b/plugins/api/goods.js @@ -34,7 +34,7 @@ export const ApiGetGoodsDetail = (params) => * @param {*} productId */ export const ApiGetGoodsSkus = (params) => -ToAsyncAwait(axios.get(`${BASE_URL}/app/product/sku`,params)); +ToAsyncAwait(axios.get(`${BASE_URL}/app/product/sku`,{params})); /** * 获取首页分类导航 diff --git a/static/images/goods/left.png b/static/images/goods/left.png new file mode 100644 index 0000000000000000000000000000000000000000..9777c9f30377cde6993a2ca9cfd1d8e484393535 GIT binary patch literal 369 zcmV-%0gnEOP)Px$D@jB_R7gv$)}c}aF$@OaKdX^QUIkH!;0XYMM1eRDGvE-%V<30{1OkEDO&o&9 zxS3*i!z{zy+;QD)({^pA-z064Eur8Okuz0&0B{K4Z5W0t%JrD}8o<-`epP+V0z=pz zyfT9`7>MZE1kPaqJ^{F7FoJz}?@yd_-$`I9HlAY?v|v%tip_$|{0Lw%QKy?T`@bGc zx$C+m5#3m^V1y;u9$1R)fHklUSPT0FMdVgh?{Y36w1=4412_mQzIg91$9A%excXrA zl*e>LWT~oIg*@3Qwa}f`tAXzIaw!@d4khU1fX%)A*@<0sz^==|ibnq_BWyvFz(n-a zIcIx0L?ZnHaGV@r%9)yPx$F-b&0R7gv;)}d0wFc1dde_NYYo!}AhNgM)!ILV`M?rD)2H(Keej#P2t|o3y*sb=^r(6b}H-0eleAR%`u?#6x}GzcKU0QT&xL=03$F z=iDa%H4>bJdhi9nQ_)#41r36+s0fTf#h?WBw;u%_(7LW0W?qjx zo3A8LDb*0saxnD0N0ltVc3SI=sAMVTdm02|upk(V&4MY|BpAW~Y>hE@qTiPQo1KLJ zHv*Psb|`