Commit 811247e8 authored by 罗超's avatar 罗超

修改

parent b0ffe0f3
<!DOCTYPE html>
<html>
<head>
<title><%= productName %></title>
<meta charset="utf-8">
<meta name="description" content="<%= productDescription %>">
<meta name="format-detection" content="telephone=no">
<meta name="msapplication-tap-highlight" content="no">
<meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width<% if (ctx.mode.cordova || ctx.mode.capacitor) { %>, viewport-fit=cover<% } %>">
<link rel="icon" type="image/png" sizes="128x128" href="icons/favicon-128x128.png">
<link rel="icon" type="image/png" sizes="96x96" href="icons/favicon-96x96.png">
<link rel="icon" type="image/png" sizes="32x32" href="icons/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="icons/favicon-16x16.png">
<link rel="icon" type="image/ico" href="favicon.ico">
</head>
<body>
<!-- quasar:entry-point -->
</body>
</html>
...@@ -11,11 +11,11 @@ ...@@ -11,11 +11,11 @@
import useMetaModule from '../../module/meta/metaModule' import useMetaModule from '../../module/meta/metaModule'
import { useI18n } from 'vue-i18n' import { useI18n } from 'vue-i18n'
import svgIcon from '../../components/global/svg-icon.vue' import svgIcon from '../../components/global/svg-icon.vue'
import { inject, provide, reactive, ref, toRefs } from 'vue' import { defineComponent, inject, provide, reactive, ref, toRefs } from 'vue'
import { DirtionmaryHelper } from '../../config/dictionary' import { DirtionmaryHelper } from '../../config/dictionary'
import ListHeader from '../../components/hotel/list/ListHeader.vue' import ListHeader from '../../components/hotel/list/ListHeader.vue'
import ListTable from '../../components/hotel/list/List-Table.vue' import ListTable from '../../components/hotel/list/List-Table.vue'
export default { export default defineComponent({
components: { svgIcon, ListHeader, ListTable }, components: { svgIcon, ListHeader, ListTable },
setup() { setup() {
const data = reactive({}) const data = reactive({})
...@@ -50,7 +50,7 @@ export default { ...@@ -50,7 +50,7 @@ export default {
...methods ...methods
} }
} }
} })
</script> </script>
<style></style> <style></style>
...@@ -8,14 +8,14 @@ ...@@ -8,14 +8,14 @@
</template> </template>
<script lang="ts"> <script lang="ts">
import { inject, provide, reactive, toRefs } from 'vue'; import { defineComponent, inject, provide, reactive, toRefs } from 'vue';
import useMetaModule from '../../module/meta/metaModule' import useMetaModule from '../../module/meta/metaModule'
import { useI18n } from 'vue-i18n' import { useI18n } from 'vue-i18n'
import { DirtionmaryHelper } from '../../config/dictionary'; import { DirtionmaryHelper } from '../../config/dictionary';
import OrderListHeader from '../../components/hotel/order/list/OrderListHeader.vue'; import OrderListHeader from '../../components/hotel/order/list/OrderListHeader.vue';
import OrderList from '../../components/hotel/order/list/OrderList.vue'; import OrderList from '../../components/hotel/order/list/OrderList.vue';
export default { export default defineComponent({
components: { OrderListHeader, OrderList }, components: { OrderListHeader, OrderList },
setup(props) { setup(props) {
console.log(' in ') console.log(' in ')
...@@ -45,7 +45,7 @@ export default { ...@@ -45,7 +45,7 @@ export default {
return {...toRefs(data),...methods,search} return {...toRefs(data),...methods,search}
} }
} })
</script> </script>
<style> <style>
......
// import { route } from 'quasar/wrappers'; import { StateType } from './../@types/index';
import { createMemoryHistory, createRouter, createWebHashHistory, createWebHistory } from 'vue-router' import { route } from 'quasar/wrappers';
import routes from './routes' import {
createMemoryHistory,
createRouter,
createWebHashHistory,
createWebHistory,
} from 'vue-router';
import routes from './routes';
/* /*
* If not building with SSR mode, you can * If not building with SSR mode, you can
...@@ -11,35 +19,20 @@ import routes from './routes' ...@@ -11,35 +19,20 @@ import routes from './routes'
* with the Router instance. * with the Router instance.
*/ */
// export default route(function (/* { store, ssrContext } */) { export default route<StateType>(function (/* { store, ssrContext } */) {
// const createHistory = process.env.SERVER const createHistory = process.env.SERVER
// ? createMemoryHistory ? createMemoryHistory
// : (process.env.VUE_ROUTER_MODE === 'history' ? createWebHistory : createWebHashHistory); : (process.env.VUE_ROUTER_MODE === 'history' ? createWebHistory : createWebHashHistory);
// const Router = createRouter({
// scrollBehavior: () => ({ left: 0, top: 0 }),
// routes,
// // Leave this as is and make changes in quasar.conf.js instead!
// // quasar.conf.js -> build -> vueRouterMode
// // quasar.conf.js -> build -> publicPath
// history: createHistory(
// process.env.MODE === 'ssr' ? void 0 : process.env.VUE_ROUTER_BASE
// ),
// });
// return Router;
// });
const createHistory = process.env.SERVER ? createMemoryHistory : process.env.VUE_ROUTER_MODE === 'history' ? createWebHistory : createWebHashHistory const Router = createRouter({
scrollBehavior: () => ({ left: 0, top: 0 }),
routes,
const Router = createRouter({ // Leave this as is and make changes in quasar.conf.js instead!
scrollBehavior: () => ({ left: 0, top: 0 }), // quasar.conf.js -> build -> vueRouterMode
routes, // quasar.conf.js -> build -> publicPath
history: createHistory(process.env.VUE_ROUTER_BASE),
});
// Leave this as is and make changes in quasar.conf.js instead! return Router;
// quasar.conf.js -> build -> vueRouterMode });
// quasar.conf.js -> build -> publicPath
history: createHistory(process.env.MODE === 'ssr' ? void 0 : process.env.VUE_ROUTER_BASE)
})
export default Router
...@@ -3,34 +3,34 @@ import { RouteRecordRaw } from 'vue-router' ...@@ -3,34 +3,34 @@ import { RouteRecordRaw } from 'vue-router'
const routes: RouteRecordRaw[] = [ const routes: RouteRecordRaw[] = [
{ {
path: '/index', path: '/index',
component: () => import('../layouts/MainLayout.vue'), component: () => import('layouts/MainLayout.vue'),
children: [ children: [
{ path: '', component: () => import('../pages/Index.vue') }, { path: '', component: () => import('pages/Index.vue') },
{ path: '/hotel', component: () => import('../pages/hotel/HotelList.vue') }, { path: '/hotel', component: () => import('pages/hotel/HotelList.vue') },
{ path: '/hotel/order', component: () => import('../pages/hotel/HotelOrder.vue') } { path: '/hotel/order', component: () => import('pages/hotel/HotelOrder.vue') }
] ]
}, },
{ {
path: '/auth/login', path: '/auth/login',
component: () => import('../pages/auth/login.vue') component: () => import('pages/auth/login.vue')
}, },
{ {
path: '/auth/regist', path: '/auth/regist',
component: () => import('../pages/auth/regist.vue') component: () => import('pages/auth/regist.vue')
}, },
{ {
path: '/auth/forget', path: '/auth/forget',
component: () => import('../pages/auth/forget.vue') component: () => import('pages/auth/forget.vue')
}, },
{ {
path: '/auth/newpassword/:code', path: '/auth/newpassword/:code',
component: () => import('../pages/auth/newpassword.vue') component: () => import('pages/auth/newpassword.vue')
}, },
// Always leave this as last one, // Always leave this as last one,
// but you can also remove it // but you can also remove it
{ {
path: '/:catchAll(.*)*', path: '/:catchAll(.*)*',
component: () => import('../pages/Error404.vue') component: () => import('pages/Error404.vue')
} }
] ]
......
import { createStore, createLogger, Store } from 'vuex' // import { store } from 'quasar/wrappers'
import { InjectionKey } from 'vue'
import { Router } from 'vue-router'
import { createStore, Store as VuexStore, useStore as vuexUseStore } from 'vuex'
import createPersistedState from 'vuex-persistedstate' import createPersistedState from 'vuex-persistedstate'
import mutations from './mutations' import mutations from './mutations'
import modules from './modules' import modules from './modules'
import { StateType } from '../@types' import { StateType } from '../@types'
import { InjectionKey } from 'vue'
export const key: InjectionKey<Store<StateType>> = Symbol() // provide typings for `this.$store`
console.log(modules) declare module '@vue/runtime-core' {
const store: Store<StateType> = createStore({ interface ComponentCustomProperties {
strict: !!process.env.DEBUGGING, $store: VuexStore<StateType>
}
}
export const storeKey: InjectionKey<VuexStore<StateType>> = Symbol()
declare module 'vuex' {
export interface Store<S> {
readonly $router: Router
}
}
const store: VuexStore<StateType> = createStore<StateType>({
mutations, mutations,
actions: {}, actions: {},
modules: { ...modules }, modules: { ...modules },
plugins: // enable strict mode (adds overhead!)
process.env.NODE_ENV !== 'production' // for dev mode and --debug builds only
? [ strict: !!process.env.DEBUGGING,
createLogger(), plugins: [
createPersistedState({ createPersistedState({
paths: ['app', 'user'] paths: ['app', 'user']
}) })
] ]
: [
createPersistedState({
paths: ['app', 'user']
})
]
}) })
export default store export default store
export function useStore() {
return vuexUseStore(storeKey)
}
// const store: Store<StateType> = createStore({
// strict: !!process.env.DEBUGGING,
// mutations,
// actions: {},
// modules: { ...modules },
// })
// export default store
import store from '../store' import { StateType } from './../@types/index';
import store from '../store/index'
// 定义 state 下的 module 值 // 定义 state 下的 module 值
type ModuleNameType = 'app' | 'console' | 'user' type ModuleNameType = 'app' | 'console' | 'user'
...@@ -23,6 +25,7 @@ type ModuleNameType = 'app' | 'console' | 'user' ...@@ -23,6 +25,7 @@ type ModuleNameType = 'app' | 'console' | 'user'
*/ */
export function setStoreState<T>(module: ModuleNameType, key: keyof T, value: any) { export function setStoreState<T>(module: ModuleNameType, key: keyof T, value: any) {
store.commit({ store.commit({
type: module + '/__set', type: module + '/__set',
key: key, key: key,
...@@ -45,5 +48,6 @@ export function dispatchAction<T>(module: ModuleNameType, key: keyof T, value?: ...@@ -45,5 +48,6 @@ export function dispatchAction<T>(module: ModuleNameType, key: keyof T, value?:
* @example 使用方法如下 const result = getStoreGetter<ConsoleGetterType>('console','list') * @example 使用方法如下 const result = getStoreGetter<ConsoleGetterType>('console','list')
*/ */
export function getStoreGetter<T>(module: ModuleNameType, key: keyof T) { export function getStoreGetter<T>(module: ModuleNameType, key: keyof T) {
console.log(store)
return store.getters[`${module}/${String(key)}`] return store.getters[`${module}/${String(key)}`]
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment