From fb0f2b01afa0a809eb447be2072d708fdca0a2b4 Mon Sep 17 00:00:00 2001 From: lee-soo-heon Date: Tue, 10 Sep 2019 10:42:13 +0900 Subject: [PATCH] surveys --- package-lock.json | 12 +- package.json | 1 + src/App.vue | 28 ++- src/components/marketing/Survey.vue | 1 - src/components/marketing/SurveyForm.vue | 13 +- src/components/mypage/MyPage.vue | 7 +- src/components/order/OrderList.vue | 59 +++--- src/components/order/OrderPage.vue | 2 +- src/components/products/ProductDelete.vue | 100 +++++++++++ src/components/products/ProductDetail.vue | 1 - src/components/products/ProductList.vue | 5 +- src/components/products/ProductRecommend.vue | 168 ++++++++++-------- src/components/products/ProductRepository.vue | 56 +++--- src/main.js | 2 + 14 files changed, 299 insertions(+), 156 deletions(-) create mode 100644 src/components/products/ProductDelete.vue diff --git a/package-lock.json b/package-lock.json index d51e49c..e015e95 100644 --- a/package-lock.json +++ b/package-lock.json @@ -979,11 +979,18 @@ "babel-runtime": "^6.26.0" } }, + "babel-plugin-transform-runtime": { + "version": "6.23.0", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-runtime/-/babel-plugin-transform-runtime-6.23.0.tgz", + "integrity": "sha1-iEkNRGUC6puOfvsP4J7E2ZR5se4=", + "requires": { + "babel-runtime": "^6.22.0" + } + }, "babel-runtime": { "version": "6.26.0", "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", - "dev": true, "requires": { "core-js": "^2.4.0", "regenerator-runtime": "^0.11.0" @@ -7120,8 +7127,7 @@ "regenerator-runtime": { "version": "0.11.1", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", - "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==", - "dev": true + "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==" }, "regex-not": { "version": "1.0.2", diff --git a/package.json b/package.json index 551cdcc..bea43f2 100644 --- a/package.json +++ b/package.json @@ -9,6 +9,7 @@ "dependencies": { "@chenfengyuan/vue-number-input": "^1.1.1", "axios": "^0.19.0", + "babel-plugin-transform-runtime": "^6.23.0", "register-service-worker": "^1.6.2", "vue": "^2.6.10", "vue-router": "^3.0.3", diff --git a/src/App.vue b/src/App.vue index be4340c..49e7cb6 100644 --- a/src/App.vue +++ b/src/App.vue @@ -7,7 +7,7 @@ color="amber" > - 12 Street + 12 Street 상품추가 - 블랙리스트 - 구매리스트 + 상품삭제 + + + + + + + Login Logout @@ -125,6 +126,16 @@ > + + + + ({ orderData: {}, - }), created() { this.orderData=this.$route.params; diff --git a/src/components/marketing/SurveyForm.vue b/src/components/marketing/SurveyForm.vue index 1595815..9c1ee83 100644 --- a/src/components/marketing/SurveyForm.vue +++ b/src/components/marketing/SurveyForm.vue @@ -1,5 +1,5 @@ diff --git a/src/components/order/OrderList.vue b/src/components/order/OrderList.vue index f959978..1329b43 100644 --- a/src/components/order/OrderList.vue +++ b/src/components/order/OrderList.vue @@ -12,30 +12,14 @@ sort-by="calories" class="elevation-1" > - + + + @@ -83,7 +83,7 @@ name: 'OrderList', data: () => ({ dialog: false, - surveyComplete :true, + surveyComplete: true, loadData: false, headers: [ { @@ -160,8 +160,9 @@ this.editedIndex = -1 }, 300) }, - openSurvey(item){ - var me = this + openSurvey(item) { + var me = this + console.log(item) me.$router.push({name: 'survey', params: item}); } diff --git a/src/components/order/OrderPage.vue b/src/components/order/OrderPage.vue index fef3377..d4587c3 100644 --- a/src/components/order/OrderPage.vue +++ b/src/components/order/OrderPage.vue @@ -229,7 +229,7 @@ 'totalAmount': me.totalAmount } me.$router.push({name: 'orderfinish', params: data}); - me.$EventBus.$emit('message', JSON.parse(JSON.stringify(data))); + // me.$EventBus.$emit('message', JSON.parse(JSON.stringify(data))); }) } }, diff --git a/src/components/products/ProductDelete.vue b/src/components/products/ProductDelete.vue new file mode 100644 index 0000000..83b3596 --- /dev/null +++ b/src/components/products/ProductDelete.vue @@ -0,0 +1,100 @@ + + + + + \ No newline at end of file diff --git a/src/components/products/ProductDetail.vue b/src/components/products/ProductDetail.vue index 87a775b..8f37eb4 100644 --- a/src/components/products/ProductDetail.vue +++ b/src/components/products/ProductDetail.vue @@ -54,7 +54,6 @@
상품이름 : {{ selectItem.name }}
상품가격 : {{ selectItem.price }}
재고량 : {{selectItem.stock}} -
옵션 : diff --git a/src/components/products/ProductList.vue b/src/components/products/ProductList.vue index 6475f55..11f9e7b 100644 --- a/src/components/products/ProductList.vue +++ b/src/components/products/ProductList.vue @@ -23,7 +23,7 @@ DETAIL BUY - @@ -134,7 +133,6 @@ 'Name', 'Price', 'Stock', - 'Option', ], items: [], selectItem: {}, @@ -155,6 +153,7 @@ me.showBuy(newVal); }) console.log(this.$route) + }, computed: { numberOfPages() { diff --git a/src/components/products/ProductRecommend.vue b/src/components/products/ProductRecommend.vue index 30f8c75..38688ee 100644 --- a/src/components/products/ProductRecommend.vue +++ b/src/components/products/ProductRecommend.vue @@ -1,104 +1,116 @@