diff --git a/README.md b/README.md index 077568a..d951fff 100644 --- a/README.md +++ b/README.md @@ -30,4 +30,5 @@ npm test For a detailed explanation on how things work, check out the [guide](http://vuejs-templates.github.io/webpack/) and [docs for vue-loader](http://vuejs.github.io/vue-loader). # 注意事项 -+ 屏幕分辨率800 * 600 \ No newline at end of file ++ 屏幕分辨率1280 * 960 ++ 15寸分辨率1024*768（这个为标准） \ No newline at end of file diff --git a/index.html b/index.html index 1de8767..a8742ef 100644 --- a/index.html +++ b/index.html @@ -2,7 +2,7 @@ - + 山东金宝一体机 diff --git a/package.json b/package.json index d0f72b4..dbbd7bc 100644 --- a/package.json +++ b/package.json @@ -17,11 +17,10 @@ "axios": "^0.18.0", "babel-polyfill": "^6.26.0", "element-ui": "^2.8.2", - "fastclick": "^1.0.6", "jsencrypt": "^3.3.2", "vue": "^2.5.2", - "vue-infinite-scroll": "^2.0.2", "vue-router": "^3.0.1", + "vue-seamless-scroll": "^1.1.23", "vuex": "^3.0.1" }, "devDependencies": { diff --git a/src/App.vue b/src/App.vue index 721d3a3..112c723 100644 --- a/src/App.vue +++ b/src/App.vue @@ -9,3 +9,9 @@ export default { name: 'App' } + + diff --git a/src/components/Back.vue b/src/components/Back.vue deleted file mode 100644 index 0267436..0000000 --- a/src/components/Back.vue +++ /dev/null @@ -1,45 +0,0 @@ - - - diff --git a/src/components/Modal.vue b/src/components/Modal.vue deleted file mode 100644 index 1f49d1d..0000000 --- a/src/components/Modal.vue +++ /dev/null @@ -1,37 +0,0 @@ - - - diff --git a/src/components/SecHeader.vue b/src/components/SecHeader.vue deleted file mode 100644 index 4044cd1..0000000 --- a/src/components/SecHeader.vue +++ /dev/null @@ -1,67 +0,0 @@ - - - diff --git a/src/components/alert.vue b/src/components/alert.vue deleted file mode 100644 index bf7a9a4..0000000 --- a/src/components/alert.vue +++ /dev/null @@ -1,116 +0,0 @@ - - - - - diff --git a/src/components/dialog.vue b/src/components/dialog.vue deleted file mode 100644 index ef36acc..0000000 --- a/src/components/dialog.vue +++ /dev/null @@ -1,111 +0,0 @@ - - - - - diff --git a/src/components/header.vue b/src/components/header.vue deleted file mode 100644 index aecc245..0000000 --- a/src/components/header.vue +++ /dev/null @@ -1,252 +0,0 @@ - - - - - diff --git a/src/components/header2.vue b/src/components/header2.vue deleted file mode 100644 index 676004e..0000000 --- a/src/components/header2.vue +++ /dev/null @@ -1,252 +0,0 @@ - - - - - diff --git a/src/components/loading.vue b/src/components/loading.vue deleted file mode 100644 index 968e2a3..0000000 --- a/src/components/loading.vue +++ /dev/null @@ -1,30 +0,0 @@ - - - diff --git a/src/components/toast.vue b/src/components/toast.vue deleted file mode 100644 index c64de84..0000000 --- a/src/components/toast.vue +++ /dev/null @@ -1,44 +0,0 @@ - - - - - diff --git a/src/config/filter.js b/src/config/filter.js deleted file mode 100644 index 90c609c..0000000 --- a/src/config/filter.js +++ /dev/null @@ -1,16 +0,0 @@ -import {accDiv} from '@config/utils.js' - -const filter = { - numeric (value, bit) { - if (!value) return '' - return Number(value).toFixed(bit) - }, - unitskg (value) { - if (!value) return '' - let res = accDiv(value, 1000) - res = Number(res).toFixed(3) - return res - } -} - -export default filter diff --git a/src/config/getData2.js b/src/config/getData.js similarity index 100% rename from src/config/getData2.js rename to src/config/getData.js diff --git a/src/config/getData1.js b/src/config/getData1.js deleted file mode 100644 index 528332c..0000000 --- a/src/config/getData1.js +++ /dev/null @@ -1,221 +0,0 @@ -import {post} from '@config/http.js' - -// 菜单 -export const authority = () => { - let res = { - sonTree: [ - {menu_id: '1', - path: 'RF01', - name: '工单管理', - sonTree: [ - {menu_id: '1', name: '工单作业', path: '/workorderassignment'} - ] - }, - {menu_id: '2', - path: 'RF02', - name: '半成品管理', - sonTree: [ - {menu_id: '1', name: '半成品入库', path: '/semifinishedinstore'}, - {menu_id: '2', name: '半成品出库', path: '/semifinishedoutstore'}, - {menu_id: '3', name: '半成品盘点', path: '/semifinishedcheck'}, - {menu_id: '4', name: '半成品拼盘', path: '/semifinishedcomposesearch'} - ] - }, - {menu_id: '3', - path: 'RF03', - name: '成品管理', - sonTree: [ - {menu_id: '1', name: '批量入库', path: '/batchinstore'}, - {menu_id: '2', name: '成品入库', path: '/finishedinstore'} - ] - }, - {menu_id: '4', - path: 'RF13', - name: '刻字管理', - sonTree: [ - {menu_id: '1', name: '刻字工序', path: '/letteringprocess'}, - {menu_id: '2', name: '人工刻字上料', path: '/letteringload'} - ] - }, - {menu_id: '5', - path: 'RF05', - name: '清洗管理', - sonTree: [ - {menu_id: '1', name: '清洗管理', path: '/cleaningloading'}, - {menu_id: '2', name: '人工倒料', path: '/manpour'} - ] - }, - {menu_id: '6', - path: 'RF07', - name: '专机管理', - sonTree: [ - {menu_id: '1', name: '人工倒料', path: '/manpouring'} - ] - }, - {menu_id: '7', - path: 'RF06', - name: '暂存区管理', - sonTree: [ - {menu_id: '1', name: '包装机选择', path: '/bzjselect'} - ] - }, - {menu_id: '8', - path: 'RF04', - name: '设备管理', - sonTree: [ - {menu_id: '1', name: '维修单管理', path: '/repairorder'}, - {menu_id: '2', name: '保养单管理', path: '/maintainorder'}, - {menu_id: '3', name: '点检单管理', path: '/checkorder'}, - {menu_id: '4', name: '润滑单管理', path: '/lubricorder'} - ] - } - ] - } - return res -} - -// 成品入库 -// 1.1仓库下拉框 -export const getBcpStor = () => post('api/pda/cp/in/getBcpStor', { -}) - -// 1.2单据类型下拉框 -export const getBillType = () => post('api/pda/cp/in/getBillType', { -}) - -// 1.3入库点下拉框 -export const getPoint = () => post('api/pda/cp/in/getPoint', { -}) - -// 1.4添加单据物料按钮 - -// 1.5选择成品箱物料页面 -export const getMaterial = (page, size, btime, etime, scode, mcode) => post('api/pda/cp/in/getMaterial', { - page: page, - size: size, - begin_time: btime, - end_time: etime, - sale_code: scode, - material_code: mcode -}) - -// 1.6删除一行（按钮） - -// 1.7确认入库（按钮）-->点击后弹出框（“确认入库是否继续？”） -export const confirmIn = (from) => post('api/pda/cp/in/confirmIn', { - from: from -}) - -// 1.8作业查询（按钮） - -// 2.1成品入库查询 -export const outgetAll = (sid, btime, etime, btype, mcode, scode) => post('api/pda/cp/in/getAll', { - stor_id: sid, - begin_time: btime, - end_time: etime, - bill_type: btype, - material_code: mcode, - storagevehicle_code: scode -}) - -// 2.2强制确认（按钮） -export const inconfirm = (row) => post('api/pda/cp/in/confirm', { - row: row -}) - -// 刻字上料 -// 1.1设备列表 -export const devicelist = () => post('api/device/list', { - workprocedure_id: '1535144682756116480' -}) - -// 1.2车间列表 -export const dictDetailByCode = (code) => post('api/dict/dictDetailByCode', { - code: code -}) - -// 1卸料 -export const kzunload = (dcode, qty) => post('api/pda/kzunload', { - device_code: dcode, - qty: qty -}) - -// 2余料上完 -export const kzresidue = (dcode) => post('api/pda/kzresidue', { - device_code: dcode -}) - -// 临时人工刻字上料 -// 1刻字上料 -export const tmpcallVechile = (dcode, qty) => post('api/pda/tmpcallVechile', { - device_code: dcode, - qty: qty -}) - -// 2空框回库 -export const tmpsendVechile = (dcode) => post('api/pda/tmpsendVechile', { - device_code: dcode -}) - -// 公共接口 -// 1.1车间列表 -export const dictall = () => post('api/dict/all', { -}) - -// 人工倒料 -// 1.1设备列表 -export const washdevicelist = (wid) => post('api/device/list', { - workprocedure_id: wid -}) - -// 1.2根据设备列表获取物料信息 -export const washquery = (parea, dcode) => post('api/pda/wash/query', { - product_area: parea, - device_code: dcode -}) - -// 1.3称重 -export const washweighing = (list) => post('api/pda/wash/weighing', { - list: list -}) - -// 1.4确认 -export const washweighingFinish = (dcode, dweight, mcode, mspec, mname) => post('api/pda/wash/weighingFinish', { - device_code: dcode, - deviceinstor_weight: dweight, - material_code: mcode, - material_spec: mspec, - material_name: mname -}) - -// 1.5查询物料列表 -export const washmaterialList = (page, size, mcode) => post('api/pda/wash/materialList', { - page: page, - size: size, - material_code: mcode -}) - -// 暂存区管理 -// 包装机管理1 -// 1.2包装机选择列表 -export const packageList = () => post('api/pda/package/packageList', { -}) -// 1.3空框送回 -export const sendVechile = (dcode) => post('api/pda/package/sendVechile', { - device_code: dcode -}) - -// 刻字暂存位选择2 -// 1.2包装机选择列表 -export const cachepoint = () => post('api/pda/package/cachepoint', { -}) -// 1.3确认上料 -export const sendMaterial = (dcode, pcode) => post('api/pda/package/sendMaterial', { - device_code: dcode, - point_code: pcode -}) -// 1.3空框送回 -export const sendVechile2 = (dcode, pcode) => post('api/pda/package/sendVechile2', { - device_code: dcode, - point_code: pcode -}) diff --git a/src/config/http.js b/src/config/http.js index 7591c1d..06ae22a 100644 --- a/src/config/http.js +++ b/src/config/http.js @@ -1,5 +1,4 @@ import axios from 'axios' -import { Dialog } from './utils.js' import store from '../vuex/store' import router from '@/router' @@ -23,7 +22,7 @@ axios.interceptors.request.use( return config }, error => { - Dialog('错误的传参') + this.$message.error('错误的传参') return Promise.reject(error) } ) @@ -55,7 +54,7 @@ export const post = (sevmethod, params) => { .then(response => { resolve(response.data) }, error => { - Dialog(error.message) + this.$message.error(error.message) reject(error.message) }) .catch((error) => { @@ -70,7 +69,7 @@ export const get = (sevmethod, params) => { .then(response => { resolve(response.data) }, error => { - Dialog(error.message) + this.$message.error(error.message) reject(error.message) }) .catch((error) => { diff --git a/src/config/rem.js b/src/config/rem.js index bd40b80..cb0e68b 100644 --- a/src/config/rem.js +++ b/src/config/rem.js @@ -5,7 +5,7 @@ var recalc = function () { var clientWidth = docEl.clientWidth if (!clientWidth) return - docEl.style.fontSize = 100 * (clientWidth / 800) + 'px' + docEl.style.fontSize = 100 * (clientWidth / 1024) + 'px' } if (!doc.addEventListener) return win.addEventListener(resizeEvt, recalc, false) diff --git a/src/config/utils.js b/src/config/utils.js index a5cd8cd..3b1912b 100644 --- a/src/config/utils.js +++ b/src/config/utils.js @@ -1,27 +1,3 @@ -import store from '../vuex/store' - -/** - * 弹出框 - */ -export const Dialog = (str) => { - store.dispatch('showAlert', true) - store.dispatch('alertMsg', str) - setTimeout(() => { - store.dispatch('showAlert', false) - }, 30000) -} - -/** - * 提示框 - */ -export const toast = (str) => { - store.dispatch('showToast', true) - store.dispatch('toastMsg', str) - setTimeout(() => { - store.dispatch('showToast', false) - }, 3000) -} - /** * 存储localStorage */ diff --git a/src/images/area_bg.png b/src/images/area_bg.png new file mode 100644 index 0000000..664c68b Binary files /dev/null and b/src/images/area_bg.png differ diff --git a/src/main.js b/src/main.js index 1347c70..7f96d9d 100644 --- a/src/main.js +++ b/src/main.js @@ -4,29 +4,18 @@ import Vue from 'vue' import App from './App' import router from './router' import store from './vuex/store' +import '@config/rem.js' import '@style/reset.css' import '@style/layout.styl' -import fastClick from 'fastclick' -import infiniteScroll from 'vue-infinite-scroll' -import { DatePicker, Select, Option } from 'element-ui' -import '@config/rem.js' -import {post} from '@config/http.js' -import { Dialog, toast } from '@config/utils.js' -import filter from '@config/filter.js' +import { Message, Select, Option } from 'element-ui' +import scroll from 'vue-seamless-scroll' import JSEncrypt from 'jsencrypt' -fastClick.attach(document.body) -Vue.use(infiniteScroll) -Vue.use(DatePicker) +Vue.prototype.$message = Message Vue.use(Select) Vue.use(Option) -Vue.prototype.$post = post -Vue.prototype.Dialog = Dialog -Vue.prototype.toast = toast +Vue.use(scroll) Vue.config.productionTip = false -for (let k in filter) { - Vue.filter(k, filter[k]) -} const publicKey = 'MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANL378k3RiZHWx5AfJqdH9xRNBmD9wGD\n' + '2iRe41HdTNF8RUhNnHit5NpMNtGL0NPTSSpPjjI1kJfVorRvaQerUgkCAwEAAQ==' diff --git a/src/pages/canvas.vue b/src/pages/canvas.vue index 0196222..2f25014 100644 --- a/src/pages/canvas.vue +++ b/src/pages/canvas.vue @@ -1,7 +1,7 @@ diff --git a/src/pages/index.vue b/src/pages/index.vue index 31eccd1..86a0478 100644 --- a/src/pages/index.vue +++ b/src/pages/index.vue @@ -76,7 +76,7 @@
- +
diff --git a/src/style/iconfont.styl b/src/style/iconfont.styl index 6adc613..e69de29 100644 --- a/src/style/iconfont.styl +++ b/src/style/iconfont.styl @@ -1,37 +0,0 @@ -.dropdown_icon::before - position absolute - right 0 - top 0 - content: '\e626' -.radio__icon--disabled .icon::before - content '\e608' -.radio__icon--checked .icon::before - content '\e608' -.close_icon::before - content '\e60f' -.select_icon::before - content '\e608' -.icon_exit - &::before - content '\e892' - -// new -[class*=" icon_"],[class^=icon_] - font-family: "iconfont" !important; - speak: none; - font-style: normal; - font-weight: 400; - font-variant: normal; - text-transform: none; - line-height: 1; - vertical-align: middle; - display: inline-block; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; -.icon_dropdown - font-size 15px - &::before - content: '\e626' -.icon_home - &::before - content: '\e632' diff --git a/src/style/layout.styl b/src/style/layout.styl index cc0eb7e..a0e44cc 100644 --- a/src/style/layout.styl +++ b/src/style/layout.styl @@ -7,13 +7,16 @@ url('iconfont/iconfont.ttf') format('truetype'); // 下拉框 +.el-select { + width: 100%; +} .el-input { - font-size: 16px; + font-size: .16rem; } .el-input__inner { - height 40px; - font-size: 14px; - line-height: 40px; + height .4rem; + font-size: .14rem; + line-height: .4rem; // text-align: right; border: 0; background-color: transparent; @@ -39,25 +42,25 @@ } .button { - font-size: 16px; - line-height: 40px; + font-size: .16rem; + line-height: .4rem; color #fff; - padding: 0 10px + padding: 0 .1rem border: 1px solid #fff; border-radius: 10px; background: transparent; } .button_s { - font-size: 12px; - padding: 0 2px + font-size: .12rem; + padding: 0 .02rem } .btn-primary { background: linear-gradient(0deg, #005ad2, #00a0ec); border-color: #083a7e; } .contianer - _wh(100vw, 100vh) - padding 2% + _wh(100%, 100%) + padding .15rem .content _wh(100%, 100%) .l-wrap @@ -68,13 +71,13 @@ border-radius: 10px; .item-wrap width 100% - padding 15px 8px + padding .15rem .08rem background: linear-gradient(90deg, #213a62, #243a63); border-radius: 10px; - margin-top: 20px; + margin-top: .2rem; .filter-name - _font(18px, 18px, #fff, 700,) + _font(.18rem, 1, #fff, 700,) .filter-label - _font(16px, 40px, #cee4ff,,) + _font(.16rem, .4rem, #cee4ff,,) .filter-value - _font(14px, 40px, #b0c7e8,,right) \ No newline at end of file + _font(.14rem, .4rem, #b0c7e8,,right) \ No newline at end of file diff --git a/src/style/mixin.styl b/src/style/mixin.styl index 8f996b9..08fc815 100644 --- a/src/style/mixin.styl +++ b/src/style/mixin.styl @@ -1,18 +1,3 @@ -$red = #e74f1a -$red1 = #E74F19 -$red2 = #FA6400 -$green = #6CBE8B -$green1 = #00d246 -$yellow = #E9B451 -$blue = #6798ef -$gray = #c9c9c9 -$gray1 = #8B90A6 -$gray2 = #DFE1E6 -$fc1 = #323232 -$orange = #ffa530 -$lightgreen = #b7e15d - - //宽高 _wh(w, h) width: w diff --git a/src/style/reset.css b/src/style/reset.css index f3e6098..e58ad1b 100644 --- a/src/style/reset.css +++ b/src/style/reset.css @@ -14,6 +14,10 @@ } body, html { + width: 100%; + height: 100%; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; -webkit-user-select: auto; -ms-user-select: auto; user-select: auto; diff --git a/src/vuex/modules/com.js b/src/vuex/modules/com.js index b98a504..917578b 100644 --- a/src/vuex/modules/com.js +++ b/src/vuex/modules/com.js @@ -2,92 +2,28 @@ import * as types from '../types' import { getStore, setStore } from '@config/utils.js' const baseUrl = process.env.NODE_ENV === 'development' ? 'http://192.168.81.171:8018' : 'http://192.168.81.171:8018' -const imgBaseUrl = process.env.NODE_ENV === 'development' ? 'http://192.168.81.171:8018' : 'http://192.168.81.171:8018' const state = { baseUrl: getStore('baseUrl') || baseUrl, - imgBaseUrl: getStore('imgBaseUrl') || imgBaseUrl, - lockTime: getStore('lockTime') || 0, - loading: false, - showToast: false, - showAlert: false, - showSuccess: true, - showFail: false, - toastMsg: '', - alertMsg: '' + lockTime: getStore('lockTime') || 0 } const getters = { baseUrl: state => state.baseUrl, - imgBaseUrl: state => state.imgBaseUrl, - lockTime: state => state.lockTime, - loading: state => state.loading, - showToast: state => state.showToast, - showAlert: state => state.showAlert + lockTime: state => state.lockTime } const actions = { setConfig ({commit}, res) { setStore('baseUrl', res.baseUrl) - setStore('imgBaseUrl', res.imgBaseUrl) setStore('lockTime', res.lockTime) commit(types.COM_CONFIG, res) - }, - setLoadingState ({ commit }, status) { - commit(types.COM_LOADING_STATUS, status) - }, - showToast ({ commit }, status) { - commit(types.COM_SHOW_TOAST, status) - }, - showAlert ({ commit }, status) { - commit(types.COM_SHOW_ALERT, status) - }, - showSuccess ({ commit }, status) { - commit(types.COM_SHOW_SUCCESS, status) - }, - showFail ({ commit }, status) { - commit(types.COM_SHOW_FAIL, status) - }, - toastMsg ({ commit }, str) { - commit(types.COM_TOAST_MSG, str) - }, - alertMsg ({ commit }, str) { - commit(types.COM_ALERT_MSG, str) } } const mutations = { [types.COM_CONFIG] (state, res) { state.baseUrl = res.baseUrl - state.imgBaseUrl = res.imgBaseUrl state.lockTime = res.lockTime - }, - - [types.COM_LOADING_STATUS] (state, status) { - state.loading = status - }, - - [types.COM_SHOW_TOAST] (state, status) { - state.showToast = status - }, - - [types.COM_SHOW_ALERT] (state, status) { - state.showAlert = status - }, - - [types.COM_SHOW_SUCCESS] (state, status) { - state.showSuccess = status - }, - - [types.COM_SHOW_FAIL] (state, status) { - state.showFail = status - }, - - [types.COM_TOAST_MSG] (state, str) { - state.toastMsg = str - }, - - [types.COM_ALERT_MSG] (state, str) { - state.alertMsg = str } } diff --git a/src/vuex/modules/data.js b/src/vuex/modules/data.js deleted file mode 100644 index 48d1133..0000000 --- a/src/vuex/modules/data.js +++ /dev/null @@ -1,70 +0,0 @@ -import * as types from '../types' -import { getStore, setStore } from '@config/utils.js' - -const state = { - keepAlive: JSON.parse(getStore('keepAlive')) || [], // 缓存页面 - materObj: getStore('materObj') || '', // 存储对象 - materArr: JSON.parse(getStore('materArr')) || [], // 存储数组 - deviceUuid: getStore('deviceUuid') || '', - deviceCode: getStore('deviceCode') || '', - isProductonplan: getStore('isProductonplan') || '' -} - -const getters = { - keepAlive: state => state.keepAlive, - materObj: state => state.materObj, - materArr: state => state.materArr, - deviceUuid: state => state.deviceUuid, - deviceCode: state => state.deviceCode, - isProductonplan: state => state.isProductonplan -} - -const actions = { - setKeepAlive ({commit}, res) { - setStore('keepAlive', res) - commit(types.SET_KEEP_ALIVE, res) - }, - setMaterObj ({commit}, res) { - setStore('materObj', res) - commit(types.SET_MATER_OBJ, res) - }, - setMaterArr ({commit}, res) { - setStore('materArr', res) - commit(types.SET_MATER_ARR, res) - }, - setDevice ({commit}, res) { - setStore('deviceUuid', res.deviceUuid) - setStore('deviceCode', res.deviceCode) - commit(types.DATA_DEVICE, res) - }, - getIsProplan ({ commit }, res) { - setStore('isProductonplan', res) - commit(types.DATA_IS_PROPLAN, res) - } -} - -const mutations = { - [types.SET_KEEP_ALIVE] (state, res) { - state.keepAlive = res - }, - [types.SET_MATER_OBJ] (state, res) { - state.materObj = res - }, - [types.SET_MATER_ARR] (state, res) { - state.materArr = res - }, - [types.DATA_DEVICE] (state, res) { - state.deviceUuid = res.deviceUuid - state.deviceCode = res.deviceCode - }, - [types.DATA_IS_PROPLAN] (state, res) { - state.isProductonplan = res - } -} - -export default { - state, - getters, - actions, - mutations -} diff --git a/src/vuex/store.js b/src/vuex/store.js index d63020a..a3fab07 100644 --- a/src/vuex/store.js +++ b/src/vuex/store.js @@ -3,14 +3,12 @@ import Vuex from 'vuex' import com from './modules/com' import user from './modules/user' -import data from './modules/data' Vue.use(Vuex) export default new Vuex.Store({ modules: { com, - user, - data + user } }) diff --git a/src/vuex/types.js b/src/vuex/types.js index 04294b2..0eefc22 100644 --- a/src/vuex/types.js +++ b/src/vuex/types.js @@ -1,12 +1,5 @@ // 公共配置 export const COM_CONFIG = 'COM_CONFIG' -export const COM_LOADING_STATUS = 'COM_LOADING_STATUS' -export const COM_SHOW_TOAST = 'COM_SHOW_TOAST' // 显示toast -export const COM_SHOW_SUCCESS = 'COM_SHOW_SUCCESS' // 显示成功toast -export const COM_SHOW_FAIL = 'COM_SHOW_FAIL' // 显示失败toast -export const COM_TOAST_MSG = 'COM_TOAST_MSG' // 显示toast文字 -export const COM_SHOW_ALERT = 'COM_SHOW_ALERT' -export const COM_ALERT_MSG = 'COM_ALERT_MSG' // 用户 export const SAVE_USER_INFO = 'SAVE_USER_INFO' diff --git a/yarn.lock b/yarn.lock index b07af4a..b8a7f17 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2046,6 +2046,11 @@ compression@^1.7.3: safe-buffer "5.1.2" vary "~1.1.2" +comutils@^1.1.9: + version "1.1.19" + resolved "https://registry.yarnpkg.com/comutils/-/comutils-1.1.19.tgz#3e07f306abf48e83726511713a72b20565034443" + integrity sha512-JxXB67juILiwhdLwOsYyjUqwWEhHdObI0EClOPk+JDtEuTbac59s0pxGpfCBnNNQ5JommifmcMGneW/4Cg7YWw== + concat-map@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" @@ -3416,11 +3421,6 @@ fast-levenshtein@~2.0.4: resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= -fastclick@^1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/fastclick/-/fastclick-1.0.6.tgz#161625b27b1a5806405936bda9a2c1926d06be6a" - integrity sha1-FhYlsnsaWAZAWTa9qaLBkm0Gvmo= - fastparse@^1.1.1: version "1.1.2" resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.2.tgz#91728c5a5942eced8531283c79441ee4122c35a9" @@ -8811,11 +8811,6 @@ vue-hot-reload-api@^2.2.0: resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.3.tgz#2756f46cb3258054c5f4723de8ae7e87302a1ccf" integrity sha512-KmvZVtmM26BQOMK1rwUZsrqxEGeKiYSZGA7SNWE6uExx8UX/cj9hq2MRV/wWC3Cq6AoeDGk57rL9YMFRel/q+g== -vue-infinite-scroll@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/vue-infinite-scroll/-/vue-infinite-scroll-2.0.2.tgz#ca37a91fe92ee0ad3b74acf8682c00917144b711" - integrity sha512-n+YghR059YmciANGJh9SsNWRi1YZEBVlODtmnb/12zI+4R72QZSWd+EuZ5mW6auEo/yaJXgxzwsuhvALVnm73A== - vue-jest@^1.0.2: version "1.4.0" resolved "https://registry.yarnpkg.com/vue-jest/-/vue-jest-1.4.0.tgz#1d6b4d2774b0aec06cfe5d39789039d3381bc528" @@ -8856,6 +8851,13 @@ vue-router@^3.0.1: resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.0.6.tgz#2e4f0f9cbb0b96d0205ab2690cfe588935136ac3" integrity sha512-Ox0ciFLswtSGRTHYhGvx2L44sVbTPNS+uD2kRISuo8B39Y79rOo0Kw0hzupTmiVtftQYCZl87mwldhh2L9Aquw== +vue-seamless-scroll@^1.1.23: + version "1.1.23" + resolved "https://registry.yarnpkg.com/vue-seamless-scroll/-/vue-seamless-scroll-1.1.23.tgz#dde81b3c79aa499791b3c3bffd0fdb22ff3e59a7" + integrity sha512-HBjUub8WwsKJzbFCrwKPDrZn4e+SSbkKgwWtjKtfLwesiFGwSsVxP44/Z6d3kpXy94qIFOiflJH6l0/9pj7SGA== + dependencies: + comutils "^1.1.9" + vue-style-loader@^3.0.0, vue-style-loader@^3.0.1: version "3.1.2" resolved "https://registry.yarnpkg.com/vue-style-loader/-/vue-style-loader-3.1.2.tgz#6b66ad34998fc9520c2f1e4d5fa4091641c1597a"