|
@@ -7,33 +7,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
|
});
|
|
|
};
|
|
|
-var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
- var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
|
|
|
- return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
|
|
|
- function verb(n) { return function (v) { return step([n, v]); }; }
|
|
|
- function step(op) {
|
|
|
- if (f) throw new TypeError("Generator is already executing.");
|
|
|
- while (_) try {
|
|
|
- if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
|
|
- if (y = 0, t) op = [op[0] & 2, t.value];
|
|
|
- switch (op[0]) {
|
|
|
- case 0: case 1: t = op; break;
|
|
|
- case 4: _.label++; return { value: op[1], done: false };
|
|
|
- case 5: _.label++; y = op[1]; op = [0]; continue;
|
|
|
- case 7: op = _.ops.pop(); _.trys.pop(); continue;
|
|
|
- default:
|
|
|
- if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
|
|
|
- if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
|
|
|
- if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
|
|
|
- if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
|
|
|
- if (t[2]) _.ops.pop();
|
|
|
- _.trys.pop(); continue;
|
|
|
- }
|
|
|
- op = body.call(thisArg, _);
|
|
|
- } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
|
|
|
- if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
|
- }
|
|
|
-};
|
|
|
import Vue from 'vue';
|
|
|
import App from './App.vue';
|
|
|
import router from './router';
|
|
@@ -64,29 +37,18 @@ import Pui from 'meri-design';
|
|
|
import 'meri-design/dist/index.css';
|
|
|
Vue.use(Pui);
|
|
|
//////////模拟传入参数
|
|
|
-var username = 'yangxiaoyong3';
|
|
|
+const username = 'yangxiaoyong3';
|
|
|
/////////////////
|
|
|
// 在跳入路由之前要请求获取权限信息
|
|
|
-router.beforeEach(function (to, from, next) { return __awaiter(void 0, void 0, void 0, function () {
|
|
|
- return __generator(this, function (_a) {
|
|
|
- switch (_a.label) {
|
|
|
- case 0:
|
|
|
- if (!!store.state.isrequestAuth) return [3 /*break*/, 3];
|
|
|
- return [4 /*yield*/, store.dispatch('getUserInfo', username)];
|
|
|
- case 1:
|
|
|
- _a.sent();
|
|
|
- return [4 /*yield*/, store.dispatch('getFloors')];
|
|
|
- case 2:
|
|
|
- _a.sent();
|
|
|
- _a.label = 3;
|
|
|
- case 3:
|
|
|
- next();
|
|
|
- return [2 /*return*/];
|
|
|
- }
|
|
|
- });
|
|
|
-}); });
|
|
|
+router.beforeEach((to, from, next) => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
+ if (!store.state.isrequestAuth) {
|
|
|
+ yield store.dispatch('getUserInfo', username);
|
|
|
+ yield store.dispatch('getFloors');
|
|
|
+ }
|
|
|
+ next();
|
|
|
+}));
|
|
|
new Vue({
|
|
|
- router: router,
|
|
|
- store: store,
|
|
|
- render: function (h) { return h(App); },
|
|
|
+ router,
|
|
|
+ store,
|
|
|
+ render: (h) => h(App),
|
|
|
}).$mount('#app');
|