@@ -18,9 +18,7 @@
@@ -29,7 +27,7 @@
- 456/2
+ 456
@@ -38,32 +36,19 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ {{projectDetail.brandInfo.nam}}
@@ -73,19 +58,21 @@
商品名称
- 商品规格（内存-储存-颜色）
- ￥125
+ 商品规格（{{checkSkuInfo.sku}}）
+ ￥{{checkSkuInfo.price}}
-
- {{value}}
-
+
+ {{value}}
-
+
- 加入购物车
+ 加入购物车
立即购买
@@ -96,14 +83,9 @@
商品详情
-
- kooriookami
- 18100000000
- 苏州市
-
- 学校
-
- 江苏省苏州市吴中区吴中大道 1188 号
+
+ {{attributeMap[attribute.id]}}
kooriookami
@@ -111,7 +93,7 @@
苏州市
-
+
@@ -126,29 +108,66 @@ export default {
name: "productDetail",
data() {
return {
- breadcrumbList: [
- "服装",
- "外衣",
- "女式超柔软拉毛运动开衫"
- ],
like: true,
- value1: 4154.564,
+ value1: 415,
value2: 1314,
title: "销量人气",
form: {
num: 1
},
- editorValue: "awejfoiajovhahrfhaowiejfoawijfeoiawjefoawjjogihao",
- projectDetail: {}
+ projectDetail: {
+ projectInfo: {
+ name: ""
+ },
+ brandInfo: {
+ nam: ""
+ }
+ },
+ checkSkuInfo: {
+ price: 0.00
+ },
+ carouselImages: [],
+ attributeMap: {}
}
},
created() {
this.initProjectDetailInfo();
},
methods: {
+ initSku(){
+ let sku = this.projectDetail.projectSkuInfoList[0]["sku"];
+ let skuArr = sku.split("-");
+ skuArr.forEach((rule, index) => {
+ this.form['rule'+index] = rule;
+ })
+ this.selectRuleSku();
+ },
+ selectRuleSku(){
+ let ruleSize = this.projectDetail.ruleAttrModelList.length;
+ let sku = "";
+ for (let index = 0; ; index++) {
+ sku += this.form['rule'+index];
+ if (index + 1 === ruleSize){
+ break
+ }
+ sku += "-";
+ }
+ this.checkSkuInfo = this.projectDetail.projectSkuInfoList.find(skuInfo => skuInfo.sku === sku)
+ },
initProjectDetailInfo(){
- getDetailInfo(2).then(response => {
+ getDetailInfo(3).then(response => {
this.projectDetail = response.data;
+ this.projectDetail.productAttributeInfoList.map(productAttributeInfo => {
+ let key = productAttributeInfo.attributeId;
+ this.attributeMap[key] = productAttributeInfo["value"]
+ })
+ console.log(this.attributeMap)
+ let ruleAttrLength = this.projectDetail.ruleAttrModelList.length;
+ for (let index = 0; index < ruleAttrLength; index++) {
+ this.form["rule"+index] = null;
+ }
+ this.carouselImages = this.projectDetail.projectInfo.carouselImages.split(",")
+ this.initSku();
})
}
}
From aa94a0bf495295c39dff728986dfdf7c10e2c636 Mon Sep 17 00:00:00 2001
From: DongZeLiang <2746733890@qq.com>
Date: Tue, 26 Mar 2024 14:14:54 +0800
Subject: [PATCH 05/12] =?UTF-8?q?=E5=95=86=E5=93=81=E5=B1=9E=E6=80=A7?=
=?UTF-8?q?=E9=9B=86=E5=90=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/product/info/detail/index.vue | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/views/product/info/detail/index.vue b/src/views/product/info/detail/index.vue
index cb3ca31..71cbdd0 100644
--- a/src/views/product/info/detail/index.vue
+++ b/src/views/product/info/detail/index.vue
@@ -87,10 +87,9 @@
{{attributeMap[attribute.id]}}
-
- kooriookami
- 18100000000
- 苏州市
+
+ {{attributeMap[attributeInfo.id]}}
@@ -121,7 +120,8 @@ export default {
},
brandInfo: {
nam: ""
- }
+ },
+ attributeInfoList: []
},
checkSkuInfo: {
price: 0.00
From 4a1a8085813fcc7e45a57cba23289315b7be7bfe Mon Sep 17 00:00:00 2001
From: DongZeLiang <2746733890@qq.com>
Date: Tue, 26 Mar 2024 15:22:27 +0800
Subject: [PATCH 06/12] =?UTF-8?q?=E5=95=86=E5=93=81=E8=AF=A6=E6=83=85?=
=?UTF-8?q?=E9=A1=B5=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/router/index.js | 2 +-
src/views/product/info/detail/index.vue | 7 ++++---
src/views/product/info/index.vue | 7 +++++++
3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/router/index.js b/src/router/index.js
index 182d438..2fa4ea6 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -80,7 +80,7 @@ export const constantRoutes = [
redirect: 'product-detail',
children: [
{
- path: 'product-detail',
+ path: 'product-detail/:detailId(\\d+)',
component: () => import('@/views/product/info/detail/index'),
name: 'Demo',
meta: {title: '商品详情', icon: 'dashboard', affix: true}
diff --git a/src/views/product/info/detail/index.vue b/src/views/product/info/detail/index.vue
index 71cbdd0..cd7987a 100644
--- a/src/views/product/info/detail/index.vue
+++ b/src/views/product/info/detail/index.vue
@@ -131,7 +131,8 @@ export default {
}
},
created() {
- this.initProjectDetailInfo();
+ const detailId = this.$route.params && this.$route.params.detailId;
+ this.initProjectDetailInfo(detailId);
},
methods: {
initSku(){
@@ -154,8 +155,8 @@ export default {
}
this.checkSkuInfo = this.projectDetail.projectSkuInfoList.find(skuInfo => skuInfo.sku === sku)
},
- initProjectDetailInfo(){
- getDetailInfo(3).then(response => {
+ initProjectDetailInfo(detailId){
+ getDetailInfo(detailId).then(response => {
this.projectDetail = response.data;
this.projectDetail.productAttributeInfoList.map(productAttributeInfo => {
let key = productAttributeInfo.attributeId;
diff --git a/src/views/product/info/index.vue b/src/views/product/info/index.vue
index 1346ecd..5e8c755 100644
--- a/src/views/product/info/index.vue
+++ b/src/views/product/info/index.vue
@@ -115,6 +115,9 @@
+
+ 商品详情
+
{
skuInfo.image = this.oneSettingForm.image;
From fb9be580200c4aaeeda5b967aecbaf3372a9b3dd Mon Sep 17 00:00:00 2001
From: DongZeLiang <2746733890@qq.com>
Date: Fri, 29 Mar 2024 15:02:37 +0800
Subject: [PATCH 07/12] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E8=B4=AD?=
=?UTF-8?q?=E7=89=A9=E8=BD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/shopCart/Info.js | 44 ++++
src/views/shopCart/Info/index.vue | 331 ++++++++++++++++++++++++++++++
2 files changed, 375 insertions(+)
create mode 100644 src/api/shopCart/Info.js
create mode 100644 src/views/shopCart/Info/index.vue
diff --git a/src/api/shopCart/Info.js b/src/api/shopCart/Info.js
new file mode 100644
index 0000000..be8e70c
--- /dev/null
+++ b/src/api/shopCart/Info.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询购物车列表
+export function listInfo(query) {
+ return request({
+ url: '/shopCart/Info/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询购物车详细
+export function getInfo(id) {
+ return request({
+ url: '/shopCart/Info/' + id,
+ method: 'get'
+ })
+}
+
+// 新增购物车
+export function addInfo(data) {
+ return request({
+ url: '/shopCart/Info',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改购物车
+export function updateInfo(data) {
+ return request({
+ url: '/shopCart/Info/'+data.id,
+ method: 'put',
+ data: data
+ })
+}
+
+// 删除购物车
+export function delInfo(id) {
+ return request({
+ url: '/shopCart/Info/' + id,
+ method: 'delete'
+ })
+}
diff --git a/src/views/shopCart/Info/index.vue b/src/views/shopCart/Info/index.vue
new file mode 100644
index 0000000..54eafde
--- /dev/null
+++ b/src/views/shopCart/Info/index.vue
@@ -0,0 +1,331 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ 新增
+
+
+ 修改
+
+
+ 删除
+
+
+ 导出
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
商品名称
商品规格（{{checkSkuInfo.sku}}）
+ 库存：{{checkSkuInfo.stock}}
￥{{checkSkuInfo.price}}
@@ -72,7 +73,7 @@
- 加入购物车
+ 加入购物车
立即购买
@@ -102,14 +103,13 @@
+
+
From 5f3c214af2ce026bad9632495e003d0133043200 Mon Sep 17 00:00:00 2001
From: DongZeLiang <2746733890@qq.com>
Date: Mon, 8 Apr 2024 15:23:10 +0800
Subject: [PATCH 11/12] =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6=E8=AF=A6?=
=?UTF-8?q?=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/shopCart/detail/index.vue | 51 ++++++++++++++++++-----------
1 file changed, 31 insertions(+), 20 deletions(-)
diff --git a/src/views/shopCart/detail/index.vue b/src/views/shopCart/detail/index.vue
index 4e091c6..5789fe2 100644
--- a/src/views/shopCart/detail/index.vue
+++ b/src/views/shopCart/detail/index.vue
@@ -1,6 +1,6 @@
-
@@ -46,14 +46,9 @@
已失效
-
+ style="width: 100%">
@@ -79,7 +74,7 @@
- 全选
+ 全选
删除选中商品
@@ -113,7 +108,7 @@ export default {
cartProjectList: [],
// 失效商品
failureCartProjectList: [],
- multipleSelection: [],
+ cartProjectSelected: [],
// 购物车统计
statisticsCart: {
// 商品总数
@@ -133,21 +128,37 @@ export default {
getDetailInfo().then(response => {
console.log(response)
this.statisticsCart = response.data.statisticsCart;
- this.cartProjectList = response.data.cartSkuList
+ this.cartProjectList = response.data.cartSkuList;
+ setTimeout(this.initCartSelected, 200);
})
},
methods: {
- toggleSelection(rows) {
- if (rows) {
- rows.forEach(row => {
- this.$refs.multipleTable.toggleRowSelection(row);
- });
- } else {
- this.$refs.multipleTable.clearSelection();
+ initCartSelected(){
+ this.cartProjectList.forEach(cartProject => {
+ if ("Y" === cartProject.isSelected){
+ this.$refs.cartProjectTable.toggleRowSelection(cartProject, true);
+ }
+ })
+ },
+ changeIsAllCheck(){
+ if (this.isAllCheck){
+ this.$refs.cartProjectTable.toggleAllSelection();
+ }else {
+ this.$refs.cartProjectTable.clearSelection();
}
},
- handleSelectionChange(val) {
- this.multipleSelection = val;
+ // 当表格当中的记录发生选中改变的时候会调用此方法
+ // 并且传递过来selectedRow为当前表格选中的记录
+ handleSelectionChange(selectedRow) {
+ // selectedRow 为当前表格选中的记录
+ // cartProjectSelected 上次表格选中的记录
+ console.log(selectedRow)
+ console.log(this.cartProjectSelected)
+ // 所以 selectedRow 中 未包含 cartProjectSelected 则 为新选中的记录
+ // 若 cartProjectSelected 中 未包含 selectedRow 则 为取消选中的记录
+
+ this.isAllCheck = selectedRow.length === this.cartProjectList.length
+ this.cartProjectSelected = selectedRow;
}
}
}
From e2ba742b7638d1eae5d6b6c3b8316fd90cf94335 Mon Sep 17 00:00:00 2001
From: DongZeLiang <2746733890@qq.com>
Date: Mon, 8 Apr 2024 20:59:47 +0800
Subject: [PATCH 12/12] =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6=E8=AF=A6?=
=?UTF-8?q?=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/shopCart/Info.js | 7 ++
src/router/index.js | 4 +-
src/views/shopCart/detail/index.vue | 104 ++++++++++++++++++----------
3 files changed, 77 insertions(+), 38 deletions(-)
diff --git a/src/api/shopCart/Info.js b/src/api/shopCart/Info.js
index e2675f3..6eb4c49 100644
--- a/src/api/shopCart/Info.js
+++ b/src/api/shopCart/Info.js
@@ -33,6 +33,13 @@ export function addInfo(data) {
data: data
})
}
+export function cartInfoIsSelected(data) {
+ return request({
+ url: '/shopCart/Info/selected',
+ method: 'post',
+ data: data
+ })
+}
// 修改购物车
export function updateInfo(data) {
diff --git a/src/router/index.js b/src/router/index.js
index 20b2aaa..ffd7807 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -82,7 +82,7 @@ export const constantRoutes = [
{
path: 'product-detail/:detailId(\\d+)',
component: () => import('@/views/product/info/detail/index'),
- name: 'Demo',
+ name: 'productDetail',
meta: {title: '商品详情', icon: 'dashboard', affix: true}
}
]
@@ -95,7 +95,7 @@ export const constantRoutes = [
{
path: '/cart/detail',
component: () => import('@/views/shopCart/detail/index'),
- name: 'Demo',
+ name: 'myCart',
meta: {title: '我的购物车', icon: 'dashboard', affix: true}
}
]
diff --git a/src/views/shopCart/detail/index.vue b/src/views/shopCart/detail/index.vue
index 5789fe2..b59a730 100644
--- a/src/views/shopCart/detail/index.vue
+++ b/src/views/shopCart/detail/index.vue
@@ -1,8 +1,9 @@
-
-
+
+
+
@@ -14,11 +15,13 @@
- {{scope.row.name}}
+ {{ scope.row.name }}
- {{skuRule.ruleName}}：{{skuRule.ruleValue}}
+
+ {{ skuRule.ruleName }}：{{ skuRule.ruleValue }}
+
@@ -46,9 +49,10 @@
已失效
-
+
@@ -56,13 +60,13 @@
+ >
{{ scope.row.date }}
+ >
-
+
@@ -79,11 +83,12 @@
- 共 {{statisticsCart.total}} 件商品，已选择 {{statisticsCart.selectTotal}} 件
+ 共 {{ statisticsCart.total }} 件商品，已选择 {{ statisticsCart.selectTotal }} 件
- 商品合计 : ¥{{statisticsCart.priceTotal}}
+ 商品合计 : ¥{{ statisticsCart.priceTotal }}
- 应付总额：¥{{statisticsCart.actualTotal}}
+ 应付总额：¥{{ statisticsCart.actualTotal }}
@@ -98,7 +103,8 @@