From 60054a53ff5986611c540444c6a0a86f00de1257 Mon Sep 17 00:00:00 2001 From: Wayne Hsu Date: Tue, 11 Apr 2023 20:49:16 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BC=89=E5=85=A5=E6=99=82=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96store?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- package.json | 2 + src/main.ts | 9 +- src/pages/Cart/CartFinish.vue | 103 ++++++++- src/pages/Cart/Checkout.vue | 3 +- src/pages/Cart/Index.vue | 368 ++++++++++++++++----------------- src/pages/Cart/Shipping.vue | 13 +- src/pages/Goods/Index.vue | 278 +++++++++++++++---------- src/pages/Login/Index.vue | 10 +- src/pages/Login/LineLogin.vue | 4 +- src/pages/My/Index.vue | 22 +- src/pages/My/Order/Index.vue | 89 +++++--- src/pages/My/Setting/Index.vue | 3 +- src/pages/Register/Index.vue | 16 +- src/services/order.js | 5 + src/store/Cart.js | 88 ++++---- src/store/Order.js | 18 +- src/store/User.js | 26 +++ src/utils/init.js | 11 +- src/utils/request.js | 7 +- vite.config.js | 11 +- yarn.lock | 85 ++++++++ 22 files changed, 760 insertions(+), 413 deletions(-) create mode 100644 src/store/User.js diff --git a/.env.development b/.env.development index 381d9ee..b98e177 100644 --- a/.env.development +++ b/.env.development @@ -10,4 +10,4 @@ VITE_APP_SSO_DOMAIN = 'localhost' # VITE_APP_BASE_URL = 'https://localhost' -VITE_APP_BASE_URL = 'https://localhost:5173' \ No newline at end of file +VITE_APP_BASE_URL = 'http://localhost:5173' \ No newline at end of file diff --git a/package.json b/package.json index 0d005bf..9b5b4ef 100644 --- a/package.json +++ b/package.json @@ -19,6 +19,7 @@ "js-cookie": "^3.0.1", "less": "^4.1.3", "lodash": "^4.17.21", + "nprogress": "^0.2.0", "pinia": "^2.0.28", "postcss": "^8.4.20", "uuid": "^9.0.0", @@ -38,6 +39,7 @@ "typescript": "^4.6.4", "unplugin-vue-components": "^0.22.12", "vite": "^3.2.3", + "vite-plugin-top-level-await": "^1.3.0", "vue-tsc": "^1.0.9" } } diff --git a/src/main.ts b/src/main.ts index ebdc21e..dd59596 100644 --- a/src/main.ts +++ b/src/main.ts @@ -3,7 +3,7 @@ import App from './App.vue' import router from './router' import store from './store' -import { initStore, initCart, initSession } from './utils/init' +import { initStore, initSession } from './utils/init' // import 'amfe-flexible' import 'vant/lib/index.css' @@ -34,9 +34,10 @@ app.directive('swiperight', { app.use(router).use(store); -initSession() -initStore() -initCart() +initSession(); +await initStore() + app.use(VueClipboard) app.mount('#app') + diff --git a/src/pages/Cart/CartFinish.vue b/src/pages/Cart/CartFinish.vue index fe6d316..7cd2ddf 100644 --- a/src/pages/Cart/CartFinish.vue +++ b/src/pages/Cart/CartFinish.vue @@ -3,14 +3,51 @@
@@ -26,6 +63,7 @@ import { useRoute } from "vue-router"; const route = useRoute(); const order_sn = route.query.order_sn; +const paycode = route.query.paycode; onMounted(async () => { if (order_sn) { @@ -38,4 +76,59 @@ onMounted(async () => { }); - + diff --git a/src/pages/Cart/Checkout.vue b/src/pages/Cart/Checkout.vue index 4045fe4..974f116 100644 --- a/src/pages/Cart/Checkout.vue +++ b/src/pages/Cart/Checkout.vue @@ -250,6 +250,7 @@ const logisticType = { 4: "OK", }; + onMounted(async () => { cartToOrder(); @@ -266,7 +267,7 @@ onMounted(async () => { //將購物車商品資料轉換成訂單商品資料 const cartToOrder = () => { - orderStore.goodsItems = cartStore.cartItems; + items.value = cartStore.cartItems; }; // 物流 diff --git a/src/pages/Cart/Index.vue b/src/pages/Cart/Index.vue index 4770089..886753d 100644 --- a/src/pages/Cart/Index.vue +++ b/src/pages/Cart/Index.vue @@ -1,217 +1,217 @@ \ No newline at end of file + diff --git a/src/pages/Cart/Shipping.vue b/src/pages/Cart/Shipping.vue index ebe3037..6a66983 100644 --- a/src/pages/Cart/Shipping.vue +++ b/src/pages/Cart/Shipping.vue @@ -75,7 +75,8 @@ diff --git a/src/pages/Login/Index.vue b/src/pages/Login/Index.vue index 29ae6e8..561f4f8 100644 --- a/src/pages/Login/Index.vue +++ b/src/pages/Login/Index.vue @@ -18,7 +18,7 @@
- 忘記密碼 ? - 還沒有帳號？ 立即註冊 @@ -81,7 +77,9 @@ const handleLogin = async () => { router.push("/user"); } else if (res.code === 201) { - router.push("/register"); + sessionStorage.setItem('reg',form.value.username) + + router.push({name:'Register',query: {type:'mobile'}}); } }; diff --git a/src/pages/Login/LineLogin.vue b/src/pages/Login/LineLogin.vue index 43c9cb8..c58dacb 100644 --- a/src/pages/Login/LineLogin.vue +++ b/src/pages/Login/LineLogin.vue @@ -38,8 +38,8 @@ if(!code){ router.push('/user/info') }else if(res.code == 201){ - sessionStorage.setItem('line',JSON.stringify(response.data)) - router.push('/register') + sessionStorage.setItem('reg',JSON.stringify(response.data)) + router.push({name:'Register',query: {type:'line'}}); }else{ } diff --git a/src/pages/My/Index.vue b/src/pages/My/Index.vue index d3f8ed9..1ba6c59 100644 --- a/src/pages/My/Index.vue +++ b/src/pages/My/Index.vue @@ -5,7 +5,7 @@
- avatar + avatar
@@ -77,23 +77,23 @@ >複制 -
  • - +
  • + 收貨地址 - - + + - +
    • -
  • - +
  • + 我的訂單 - - + + - +
  • diff --git a/src/pages/My/Order/Index.vue b/src/pages/My/Order/Index.vue index bacb4fb..75b7e5a 100644 --- a/src/pages/My/Order/Index.vue +++ b/src/pages/My/Order/Index.vue @@ -17,35 +17,40 @@
    @@ -58,19 +63,21 @@
    -

    訂單編號: #{{ order.order_sn }} , 日期: {{ order.add_time }}

    +

    訂單編號: #{{ order.order_sn }} ,
    日期: {{ order.add_time }}

    - - 訂單金額: ${{ order.goods_amount }} - , 商品項目: {{ order.goods_num }} - +
    + 訂單金額: ${{ order.order_amount }} +
    +
    +{{ getGoodsItem(order.goods_items) }} +
    再買一次 - Rate & Review Product + {{ orderStatus[order.order_status] }}
    @@ -92,18 +99,52 @@