diff --git a/package-lock.json b/package-lock.json deleted file mode 100644 index d0d75c7..0000000 --- a/package-lock.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name": "points-mall", - "lockfileVersion": 3, - "requires": true, - "packages": {} -} diff --git a/supplied-h5/.env.example b/supplied-h5/.env.example index 2bea682..8e8ad65 100644 --- a/supplied-h5/.env.example +++ b/supplied-h5/.env.example @@ -1,2 +1,2 @@ -VUE_APP_SUPPLIED_API_BASE="http://localhost:8888/.netlify/functions" +VUE_APP_SUPPLIED_API_BASE="http://localhost:8888/api" VUE_APP_SUPPLIER_IDENTIFICATION="joyful-selection" diff --git a/supplied-h5/src/api/supplied-service.js b/supplied-h5/src/api/supplied-service.js index e2e6105..c6d911d 100644 --- a/supplied-h5/src/api/supplied-service.js +++ b/supplied-h5/src/api/supplied-service.js @@ -1,4 +1,4 @@ -const API_BASE = process.env.VUE_APP_SUPPLIED_API_BASE || 'http://localhost:8888/.netlify/functions' +const API_BASE = process.env.VUE_APP_SUPPLIED_API_BASE || 'http://localhost:8888/api' const normalizeBase = base => base.replace(/\/$/, '') diff --git a/supplied-h5/src/main.js b/supplied-h5/src/main.js index bc23797..213e3e0 100644 --- a/supplied-h5/src/main.js +++ b/supplied-h5/src/main.js @@ -1,11 +1,13 @@ import Vue from 'vue' import Vant from 'vant' +import { Skeleton } from 'vant' import { createPinia, PiniaVuePlugin } from 'pinia' import 'vant/lib/index.css' import App from './App.vue' import router from './router' Vue.use(Vant) +Vue.use(Skeleton) Vue.use(PiniaVuePlugin) Vue.config.productionTip = false diff --git a/supplied-h5/src/router/index.js b/supplied-h5/src/router/index.js index 2ae0a31..93249fe 100644 --- a/supplied-h5/src/router/index.js +++ b/supplied-h5/src/router/index.js @@ -13,6 +13,7 @@ import JoyfulSelectionPaymentSuccess from '@/view/joyful-selection/order/payment import JoyfulSelectionAddressList from '@/view/joyful-selection/address/index.vue' import JoyfulSelectionAddressEdit from '@/view/joyful-selection/address/edit/index.vue' import JoyfulSelectionOrders from '@/view/joyful-selection/profile/orders/index.vue' +import JoyfulSelectionOrderDetail from '@/view/joyful-selection/profile/order-detail/index.vue' import JoyfulSelectionProfile from '@/view/joyful-selection/profile/index.vue' import JoyfulSelectionPoints from '@/view/joyful-selection/profile/points/index.vue' import HomeLiving from '@/view/home-living/index.vue' @@ -41,6 +42,7 @@ export default new Router({ { path: 'address', component: JoyfulSelectionAddressList }, { path: 'address/edit', component: JoyfulSelectionAddressEdit }, { path: 'orders', component: JoyfulSelectionOrders }, + { path: 'order-detail', component: JoyfulSelectionOrderDetail }, { path: 'profile', component: JoyfulSelectionProfile }, { path: 'points', component: JoyfulSelectionPoints } ] diff --git a/supplied-h5/src/skeleton-view/components/CardSkeleton.vue b/supplied-h5/src/skeleton-view/components/CardSkeleton.vue new file mode 100644 index 0000000..3cecd75 --- /dev/null +++ b/supplied-h5/src/skeleton-view/components/CardSkeleton.vue @@ -0,0 +1,49 @@ + + + + + diff --git a/supplied-h5/src/skeleton-view/components/DetailSkeleton.vue b/supplied-h5/src/skeleton-view/components/DetailSkeleton.vue new file mode 100644 index 0000000..aab4b97 --- /dev/null +++ b/supplied-h5/src/skeleton-view/components/DetailSkeleton.vue @@ -0,0 +1,62 @@ + + + + + diff --git a/supplied-h5/src/skeleton-view/components/ListSkeleton.vue b/supplied-h5/src/skeleton-view/components/ListSkeleton.vue new file mode 100644 index 0000000..57dbd23 --- /dev/null +++ b/supplied-h5/src/skeleton-view/components/ListSkeleton.vue @@ -0,0 +1,114 @@ + + + + + diff --git a/supplied-h5/src/skeleton-view/components/ProfileSkeleton.vue b/supplied-h5/src/skeleton-view/components/ProfileSkeleton.vue new file mode 100644 index 0000000..d8c4ab6 --- /dev/null +++ b/supplied-h5/src/skeleton-view/components/ProfileSkeleton.vue @@ -0,0 +1,82 @@ + + + + + diff --git a/supplied-h5/src/skeleton-view/index.vue b/supplied-h5/src/skeleton-view/index.vue new file mode 100644 index 0000000..b7194c9 --- /dev/null +++ b/supplied-h5/src/skeleton-view/index.vue @@ -0,0 +1,12 @@ + + + diff --git a/supplied-h5/src/skeleton-view/joyful-selection/address/edit/index.vue b/supplied-h5/src/skeleton-view/joyful-selection/address/edit/index.vue new file mode 100644 index 0000000..e6170b2 --- /dev/null +++ b/supplied-h5/src/skeleton-view/joyful-selection/address/edit/index.vue @@ -0,0 +1,12 @@ + + + diff --git a/supplied-h5/src/skeleton-view/joyful-selection/address/index.vue b/supplied-h5/src/skeleton-view/joyful-selection/address/index.vue new file mode 100644 index 0000000..62b7e85 --- /dev/null +++ b/supplied-h5/src/skeleton-view/joyful-selection/address/index.vue @@ -0,0 +1,12 @@ + + + diff --git a/supplied-h5/src/skeleton-view/joyful-selection/cart/edit/index.vue b/supplied-h5/src/skeleton-view/joyful-selection/cart/edit/index.vue new file mode 100644 index 0000000..27b4e3f --- /dev/null +++ b/supplied-h5/src/skeleton-view/joyful-selection/cart/edit/index.vue @@ -0,0 +1,12 @@ + + + diff --git a/supplied-h5/src/skeleton-view/joyful-selection/cart/index.vue b/supplied-h5/src/skeleton-view/joyful-selection/cart/index.vue new file mode 100644 index 0000000..355b620 --- /dev/null +++ b/supplied-h5/src/skeleton-view/joyful-selection/cart/index.vue @@ -0,0 +1,12 @@ + + + diff --git a/supplied-h5/src/skeleton-view/joyful-selection/index.vue b/supplied-h5/src/skeleton-view/joyful-selection/index.vue new file mode 100644 index 0000000..0a4ecad --- /dev/null +++ b/supplied-h5/src/skeleton-view/joyful-selection/index.vue @@ -0,0 +1,12 @@ + + + diff --git a/supplied-h5/src/skeleton-view/joyful-selection/layout.vue b/supplied-h5/src/skeleton-view/joyful-selection/layout.vue new file mode 100644 index 0000000..582dec2 --- /dev/null +++ b/supplied-h5/src/skeleton-view/joyful-selection/layout.vue @@ -0,0 +1,12 @@ + + + diff --git a/supplied-h5/src/skeleton-view/joyful-selection/order/checkout/index.vue b/supplied-h5/src/skeleton-view/joyful-selection/order/checkout/index.vue new file mode 100644 index 0000000..b52182f --- /dev/null +++ b/supplied-h5/src/skeleton-view/joyful-selection/order/checkout/index.vue @@ -0,0 +1,12 @@ + + + diff --git a/supplied-h5/src/skeleton-view/joyful-selection/order/payment-success/index.vue b/supplied-h5/src/skeleton-view/joyful-selection/order/payment-success/index.vue new file mode 100644 index 0000000..7fb34e2 --- /dev/null +++ b/supplied-h5/src/skeleton-view/joyful-selection/order/payment-success/index.vue @@ -0,0 +1,12 @@ + + + diff --git a/supplied-h5/src/skeleton-view/joyful-selection/order/payment/index.vue b/supplied-h5/src/skeleton-view/joyful-selection/order/payment/index.vue new file mode 100644 index 0000000..351730d --- /dev/null +++ b/supplied-h5/src/skeleton-view/joyful-selection/order/payment/index.vue @@ -0,0 +1,12 @@ + + + diff --git a/supplied-h5/src/skeleton-view/joyful-selection/product-detail/index.vue b/supplied-h5/src/skeleton-view/joyful-selection/product-detail/index.vue new file mode 100644 index 0000000..e704c78 --- /dev/null +++ b/supplied-h5/src/skeleton-view/joyful-selection/product-detail/index.vue @@ -0,0 +1,12 @@ + + + diff --git a/supplied-h5/src/skeleton-view/joyful-selection/products/index.vue b/supplied-h5/src/skeleton-view/joyful-selection/products/index.vue new file mode 100644 index 0000000..48ad2db --- /dev/null +++ b/supplied-h5/src/skeleton-view/joyful-selection/products/index.vue @@ -0,0 +1,12 @@ + + + diff --git a/supplied-h5/src/skeleton-view/joyful-selection/profile/index.vue b/supplied-h5/src/skeleton-view/joyful-selection/profile/index.vue new file mode 100644 index 0000000..bc94461 --- /dev/null +++ b/supplied-h5/src/skeleton-view/joyful-selection/profile/index.vue @@ -0,0 +1,12 @@ + + + diff --git a/supplied-h5/src/skeleton-view/joyful-selection/profile/order-detail/index.vue b/supplied-h5/src/skeleton-view/joyful-selection/profile/order-detail/index.vue new file mode 100644 index 0000000..4c4371e --- /dev/null +++ b/supplied-h5/src/skeleton-view/joyful-selection/profile/order-detail/index.vue @@ -0,0 +1,12 @@ + + + diff --git a/supplied-h5/src/skeleton-view/joyful-selection/profile/orders/index.vue b/supplied-h5/src/skeleton-view/joyful-selection/profile/orders/index.vue new file mode 100644 index 0000000..0188dc8 --- /dev/null +++ b/supplied-h5/src/skeleton-view/joyful-selection/profile/orders/index.vue @@ -0,0 +1,12 @@ + + + diff --git a/supplied-h5/src/skeleton-view/joyful-selection/profile/points/index.vue b/supplied-h5/src/skeleton-view/joyful-selection/profile/points/index.vue new file mode 100644 index 0000000..211b926 --- /dev/null +++ b/supplied-h5/src/skeleton-view/joyful-selection/profile/points/index.vue @@ -0,0 +1,12 @@ + + + diff --git a/supplied-h5/src/skeleton-view/shop/index.vue b/supplied-h5/src/skeleton-view/shop/index.vue new file mode 100644 index 0000000..10d7171 --- /dev/null +++ b/supplied-h5/src/skeleton-view/shop/index.vue @@ -0,0 +1,12 @@ + + + diff --git a/supplied-h5/src/store/user.js b/supplied-h5/src/store/user.js index 750477f..6fb1f66 100644 --- a/supplied-h5/src/store/user.js +++ b/supplied-h5/src/store/user.js @@ -23,15 +23,12 @@ export const useUserStore = defineStore('joyfulSelectionUser', { supplierIdentification: '', supplierId: '', supplierName: '', - token: '', - refreshToken: '', - tokenExpiresAt: 0, pointsBalance: 0, loaded: false, loadingToken: false }), getters: { - hasToken: state => Boolean(state.token && state.tokenExpiresAt > Date.now()) + hasToken: state => Boolean(state.supplierId && state.userId) }, actions: { loadUser() { @@ -43,9 +40,6 @@ export const useUserStore = defineStore('joyfulSelectionUser', { this.supplierIdentification = supplierIdentification this.supplierId = supplierChanged ? '' : data.supplierId || '' this.supplierName = supplierChanged ? '' : data.supplierName || '' - this.token = supplierChanged ? '' : data.token || '' - this.refreshToken = supplierChanged ? '' : data.refreshToken || '' - this.tokenExpiresAt = supplierChanged ? 0 : Number(data.tokenExpiresAt || 0) this.pointsBalance = supplierChanged ? 0 : Number(data.pointsBalance || 0) this.loaded = true }, @@ -55,9 +49,6 @@ export const useUserStore = defineStore('joyfulSelectionUser', { supplierIdentification: this.supplierIdentification, supplierId: this.supplierId, supplierName: this.supplierName, - token: this.token, - refreshToken: this.refreshToken, - tokenExpiresAt: this.tokenExpiresAt, pointsBalance: this.pointsBalance }) this.loaded = true @@ -71,9 +62,6 @@ export const useUserStore = defineStore('joyfulSelectionUser', { if (nextUserId && nextUserId !== this.userId) { this.userId = nextUserId - this.token = '' - this.refreshToken = '' - this.tokenExpiresAt = 0 this.pointsBalance = 0 } if (!this.supplierIdentification) { @@ -94,12 +82,6 @@ export const useUserStore = defineStore('joyfulSelectionUser', { supplierIdentification: this.supplierIdentification }) - if (data?.supplierId && data.supplierId !== this.supplierId) { - this.token = '' - this.refreshToken = '' - this.tokenExpiresAt = 0 - } - this.supplierId = data?.supplierId || '' this.supplierName = data?.supplierName || '' this.persistUser() @@ -128,10 +110,6 @@ export const useUserStore = defineStore('joyfulSelectionUser', { this.supplierId = data?.supplierId || this.supplierId this.supplierName = data?.supplierName || this.supplierName - this.token = data?.token || data?.accessToken || '' - this.refreshToken = data?.refreshToken || '' - const expiresIn = Number(data?.expiresIn || 0) - this.tokenExpiresAt = this.token && expiresIn > 0 ? Date.now() + expiresIn * 1000 : 0 this.persistUser() })() @@ -148,14 +126,13 @@ export const useUserStore = defineStore('joyfulSelectionUser', { } await this.fetchBridgeToken() - if (!this.userId || !this.supplierId || !this.token) { + if (!this.userId || !this.supplierId) { return this.pointsBalance } const data = await postFunction('supplier-points', { userId: this.userId, - supplierId: this.supplierId, - token: this.token + supplierId: this.supplierId }) this.pointsBalance = Number(data?.userPoints || 0) diff --git a/supplied-h5/src/view/cute-selection/index.vue b/supplied-h5/src/view/cute-selection/index.vue index 8cb7678..b70dc45 100644 --- a/supplied-h5/src/view/cute-selection/index.vue +++ b/supplied-h5/src/view/cute-selection/index.vue @@ -1,14 +1,26 @@ diff --git a/supplied-h5/src/view/fresh-fruit/index.vue b/supplied-h5/src/view/fresh-fruit/index.vue index 4d82c74..d6b01ff 100644 --- a/supplied-h5/src/view/fresh-fruit/index.vue +++ b/supplied-h5/src/view/fresh-fruit/index.vue @@ -1,14 +1,26 @@ diff --git a/supplied-h5/src/view/happy-shopping/index.vue b/supplied-h5/src/view/happy-shopping/index.vue index 0242ef6..2e1a802 100644 --- a/supplied-h5/src/view/happy-shopping/index.vue +++ b/supplied-h5/src/view/happy-shopping/index.vue @@ -1,14 +1,26 @@ diff --git a/supplied-h5/src/view/home-living/index.vue b/supplied-h5/src/view/home-living/index.vue index 92cd029..319c304 100644 --- a/supplied-h5/src/view/home-living/index.vue +++ b/supplied-h5/src/view/home-living/index.vue @@ -1,14 +1,26 @@ diff --git a/supplied-h5/src/view/index.vue b/supplied-h5/src/view/index.vue index 710fc9c..cb7246f 100644 --- a/supplied-h5/src/view/index.vue +++ b/supplied-h5/src/view/index.vue @@ -1,5 +1,7 @@ + + diff --git a/supplied-h5/src/view/joyful-selection/profile/orders/index.vue b/supplied-h5/src/view/joyful-selection/profile/orders/index.vue index 0f294e0..25e34d3 100644 --- a/supplied-h5/src/view/joyful-selection/profile/orders/index.vue +++ b/supplied-h5/src/view/joyful-selection/profile/orders/index.vue @@ -1,74 +1,184 @@