From 6babb451116808560dee877ef440947106393e74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?TOP=E7=B3=AF=E7=B1=B3?= <1130395124@qq.com> Date: Thu, 23 Feb 2023 16:47:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9core=E7=9B=AE=E5=BD=95?= =?UTF-8?q?=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/models.js | 7 +++++++ src/core/models/order.js | 22 ++++++++++++++++++++++ src/core/{ => models}/user.js | 0 src/core/{libs => }/utils.js | 2 -- src/main.js | 4 +++- src/store/modules/user.js | 4 ++-- 6 files changed, 34 insertions(+), 5 deletions(-) create mode 100644 src/core/models.js create mode 100644 src/core/models/order.js rename src/core/{ => models}/user.js (100%) rename src/core/{libs => }/utils.js (99%) diff --git a/src/core/models.js b/src/core/models.js new file mode 100644 index 0000000..d8bf091 --- /dev/null +++ b/src/core/models.js @@ -0,0 +1,7 @@ +import order from "@/core/models/order"; +import user from "@/core/models/user"; + +export default { + order, + user, +} diff --git a/src/core/models/order.js b/src/core/models/order.js new file mode 100644 index 0000000..99d18bb --- /dev/null +++ b/src/core/models/order.js @@ -0,0 +1,22 @@ +export default { + state: { + NO_PAY: -1, + NO_PRICE: 0, + NO_SELECT_WORKER: 1, + NO_SERVICE: 2, + }, + parseOrderStateText(state) { + switch (state) { + case this.state.NO_PAY: + return '待支付'; + case this.state.NO_PRICE: + return '等待师傅报价'; + case this.state.NO_SELECT_WORKER: + return '等待您选择师傅'; + case this.state.NO_SERVICE: + return '等待师傅上门'; + default: + return '未知状态'; + } + } +} diff --git a/src/core/user.js b/src/core/models/user.js similarity index 100% rename from src/core/user.js rename to src/core/models/user.js diff --git a/src/core/libs/utils.js b/src/core/utils.js similarity index 99% rename from src/core/libs/utils.js rename to src/core/utils.js index bccadbc..389925e 100644 --- a/src/core/libs/utils.js +++ b/src/core/utils.js @@ -1,5 +1,3 @@ -import Vue from 'vue' - function time() { return parseInt(Math.round(new Date() / 1000)); }; diff --git a/src/main.js b/src/main.js index 661eebb..e3abc99 100644 --- a/src/main.js +++ b/src/main.js @@ -4,9 +4,10 @@ import App from './App' import store from "./store/index" import request from './core/libs/request' import event from './core/libs/event' -import utils from './core/libs/utils' +import utils from './core/utils' import config from './core/config' import apis from './core/apis' +import models from './core/models' import './static/iconfont/iconfont.css' Vue.use({ @@ -16,6 +17,7 @@ Vue.use({ Vue.prototype.$utils = utils Vue.prototype.$config = config Vue.prototype.$apis = apis + Vue.prototype.$models = models } }) diff --git a/src/store/modules/user.js b/src/store/modules/user.js index b24b100..c8cba42 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -1,4 +1,4 @@ -import user from '@/core/user' +import models from '@/core/models' export default { namespaced: true, @@ -27,7 +27,7 @@ export default { context.commit('userInfo', null); }, userInfo(context) { - user.getInfo().then(info => { + models.user.getInfo().then(info => { context.commit('userInfo', info); }); }