Skip to content

A
admin-base
Commit ea923599 authored by 王's avatar 王
Browse files
Options

Merge branch 'development' of http://git.singsingenglish.com/new-sing/admin into development

parents 85987c63 0db31aa2
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 141 additions and 26 deletions
dist/index.html
View file @ ea923599
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=never><link rel=stylesheet href=https://at.alicdn.com/t/font_746649_7dsnjecwkpg.css><title>singsing-new-admin</title><link href=/static/css/app.53b0153abe0bfe1811cfe0c96b7da792.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.2ae2e69a05c33dfc65f8.js></script><script type=text/javascript src=/static/js/vendor.7b0c00ae9aa9f10c274f.js></script><script type=text/javascript src=/static/js/app.bd765625c6f1f494153f.js></script></body></html>
\ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=never><link rel=stylesheet href=https://at.alicdn.com/t/font_746649_7dsnjecwkpg.css><title>singsing-new-admin</title><link href=/static/css/app.bf7c9cc623bd2606ba6f971f682c102e.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.2ae2e69a05c33dfc65f8.js></script><script type=text/javascript src=/static/js/vendor.0856e2556bbad7b42ae6.js></script><script type=text/javascript src=/static/js/app.66b35873389cb92fae19.js></script></body></html>
\ No newline at end of file
dist/static/css/app.53b0153abe0bfe1811cfe0c96b7da792.css deleted 100644 → 0
View file @ 85987c63
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/app.53b0153abe0bfe1811cfe0c96b7da792.css.map deleted 100644 → 0
View file @ 85987c63
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/app.bf7c9cc623bd2606ba6f971f682c102e.css 0 → 100644
View file @ ea923599
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/app.bf7c9cc623bd2606ba6f971f682c102e.css.map 0 → 100644
View file @ ea923599
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.66b35873389cb92fae19.js 0 → 100644
View file @ ea923599
This diff is collapsed.
dist/static/js/app.66b35873389cb92fae19.js.map 0 → 100644
View file @ ea923599
This diff is collapsed.
dist/static/js/app.bd765625c6f1f494153f.js deleted 100644 → 0
View file @ 85987c63
This diff is collapsed.
dist/static/js/app.bd765625c6f1f494153f.js.map deleted 100644 → 0
View file @ 85987c63
This diff is collapsed.
dist/static/js/manifest.2ae2e69a05c33dfc65f8.js.map
View file @ ea923599
{"version":3,"sources":["webpack:///webpack/bootstrap 363de0f511c282952645"],"names":["parentJsonpFunction","window","chunkIds","moreModules","executeModules","moduleId","chunkId","result","i","resolves","length","installedChunks","push","Object","prototype","hasOwnProperty","call","modules","shift","__webpack_require__","s","installedModules","2","exports","module","l","m","c","d","name","getter","o","defineProperty","configurable","enumerable","get","n","__esModule","object","property","p","oe","err","console","error"],"mappings":"aACA,IAAAA,EAAAC,OAAA,aACAA,OAAA,sBAAAC,EAAAC,EAAAC,GAIA,IADA,IAAAC,EAAAC,EAAAC,EAAAC,EAAA,EAAAC,KACQD,EAAAN,EAAAQ,OAAoBF,IAC5BF,EAAAJ,EAAAM,GACAG,EAAAL,IACAG,EAAAG,KAAAD,EAAAL,GAAA,IAEAK,EAAAL,GAAA,EAEA,IAAAD,KAAAF,EACAU,OAAAC,UAAAC,eAAAC,KAAAb,EAAAE,KACAY,EAAAZ,GAAAF,EAAAE,IAIA,IADAL,KAAAE,EAAAC,EAAAC,GACAK,EAAAC,QACAD,EAAAS,OAAAT,GAEA,GAAAL,EACA,IAAAI,EAAA,EAAYA,EAAAJ,EAAAM,OAA2BF,IACvCD,EAAAY,IAAAC,EAAAhB,EAAAI,IAGA,OAAAD,GAIA,IAAAc,KAGAV,GACAW,EAAA,GAIA,SAAAH,EAAAd,GAGA,GAAAgB,EAAAhB,GACA,OAAAgB,EAAAhB,GAAAkB,QAGA,IAAAC,EAAAH,EAAAhB,IACAG,EAAAH,EACAoB,GAAA,EACAF,YAUA,OANAN,EAAAZ,GAAAW,KAAAQ,EAAAD,QAAAC,IAAAD,QAAAJ,GAGAK,EAAAC,GAAA,EAGAD,EAAAD,QAKAJ,EAAAO,EAAAT,EAGAE,EAAAQ,EAAAN,EAGAF,EAAAS,EAAA,SAAAL,EAAAM,EAAAC,GACAX,EAAAY,EAAAR,EAAAM,IACAhB,OAAAmB,eAAAT,EAAAM,GACAI,cAAA,EACAC,YAAA,EACAC,IAAAL,KAMAX,EAAAiB,EAAA,SAAAZ,GACA,IAAAM,EAAAN,KAAAa,WACA,WAA2B,OAAAb,EAAA,SAC3B,WAAiC,OAAAA,GAEjC,OADAL,EAAAS,EAAAE,EAAA,IAAAA,GACAA,GAIAX,EAAAY,EAAA,SAAAO,EAAAC,GAAsD,OAAA1B,OAAAC,UAAAC,eAAAC,KAAAsB,EAAAC,IAGtDpB,EAAAqB,EAAA,IAGArB,EAAAsB,GAAA,SAAAC,GAA8D,MAApBC,QAAAC,MAAAF,GAAoBA","file":"static/js/manifest.2ae2e69a05c33dfc65f8.js","sourcesContent":[" \t// install a JSONP callback for chunk loading\n \tvar parentJsonpFunction = window[\"webpackJsonp\"];\n \twindow[\"webpackJsonp\"] = function webpackJsonpCallback(chunkIds, moreModules, executeModules) {\n \t\t// add \"moreModules\" to the modules object,\n \t\t// then flag all \"chunkIds\" as loaded and fire callback\n \t\tvar moduleId, chunkId, i = 0, resolves = [], result;\n \t\tfor(;i < chunkIds.length; i++) {\n \t\t\tchunkId = chunkIds[i];\n \t\t\tif(installedChunks[chunkId]) {\n \t\t\t\tresolves.push(installedChunks[chunkId][0]);\n \t\t\t}\n \t\t\tinstalledChunks[chunkId] = 0;\n \t\t}\n \t\tfor(moduleId in moreModules) {\n \t\t\tif(Object.prototype.hasOwnProperty.call(moreModules, moduleId)) {\n \t\t\t\tmodules[moduleId] = moreModules[moduleId];\n \t\t\t}\n \t\t}\n \t\tif(parentJsonpFunction) parentJsonpFunction(chunkIds, moreModules, executeModules);\n \t\twhile(resolves.length) {\n \t\t\tresolves.shift()();\n \t\t}\n \t\tif(executeModules) {\n \t\t\tfor(i=0; i < executeModules.length; i++) {\n \t\t\t\tresult = __webpack_require__(__webpack_require__.s = executeModules[i]);\n \t\t\t}\n \t\t}\n \t\treturn result;\n \t};\n\n \t// The module cache\n \tvar installedModules = {};\n\n \t// objects to store loaded and loading chunks\n \tvar installedChunks = {\n \t\t2: 0\n \t};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId]) {\n \t\t\treturn installedModules[moduleId].exports;\n \t\t}\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, {\n \t\t\t\tconfigurable: false,\n \t\t\t\tenumerable: true,\n \t\t\t\tget: getter\n \t\t\t});\n \t\t}\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"/\";\n\n \t// on error function for async loading\n \t__webpack_require__.oe = function(err) { console.error(err); throw err; };\n\n\n\n// WEBPACK FOOTER //\n// webpack/bootstrap 363de0f511c282952645"],"sourceRoot":""}
\ No newline at end of file
{"version":3,"sources":["webpack:///webpack/bootstrap 9e39251c8e7efe3ea083"],"names":["parentJsonpFunction","window","chunkIds","moreModules","executeModules","moduleId","chunkId","result","i","resolves","length","installedChunks","push","Object","prototype","hasOwnProperty","call","modules","shift","__webpack_require__","s","installedModules","2","exports","module","l","m","c","d","name","getter","o","defineProperty","configurable","enumerable","get","n","__esModule","object","property","p","oe","err","console","error"],"mappings":"aACA,IAAAA,EAAAC,OAAA,aACAA,OAAA,sBAAAC,EAAAC,EAAAC,GAIA,IADA,IAAAC,EAAAC,EAAAC,EAAAC,EAAA,EAAAC,KACQD,EAAAN,EAAAQ,OAAoBF,IAC5BF,EAAAJ,EAAAM,GACAG,EAAAL,IACAG,EAAAG,KAAAD,EAAAL,GAAA,IAEAK,EAAAL,GAAA,EAEA,IAAAD,KAAAF,EACAU,OAAAC,UAAAC,eAAAC,KAAAb,EAAAE,KACAY,EAAAZ,GAAAF,EAAAE,IAIA,IADAL,KAAAE,EAAAC,EAAAC,GACAK,EAAAC,QACAD,EAAAS,OAAAT,GAEA,GAAAL,EACA,IAAAI,EAAA,EAAYA,EAAAJ,EAAAM,OAA2BF,IACvCD,EAAAY,IAAAC,EAAAhB,EAAAI,IAGA,OAAAD,GAIA,IAAAc,KAGAV,GACAW,EAAA,GAIA,SAAAH,EAAAd,GAGA,GAAAgB,EAAAhB,GACA,OAAAgB,EAAAhB,GAAAkB,QAGA,IAAAC,EAAAH,EAAAhB,IACAG,EAAAH,EACAoB,GAAA,EACAF,YAUA,OANAN,EAAAZ,GAAAW,KAAAQ,EAAAD,QAAAC,IAAAD,QAAAJ,GAGAK,EAAAC,GAAA,EAGAD,EAAAD,QAKAJ,EAAAO,EAAAT,EAGAE,EAAAQ,EAAAN,EAGAF,EAAAS,EAAA,SAAAL,EAAAM,EAAAC,GACAX,EAAAY,EAAAR,EAAAM,IACAhB,OAAAmB,eAAAT,EAAAM,GACAI,cAAA,EACAC,YAAA,EACAC,IAAAL,KAMAX,EAAAiB,EAAA,SAAAZ,GACA,IAAAM,EAAAN,KAAAa,WACA,WAA2B,OAAAb,EAAA,SAC3B,WAAiC,OAAAA,GAEjC,OADAL,EAAAS,EAAAE,EAAA,IAAAA,GACAA,GAIAX,EAAAY,EAAA,SAAAO,EAAAC,GAAsD,OAAA1B,OAAAC,UAAAC,eAAAC,KAAAsB,EAAAC,IAGtDpB,EAAAqB,EAAA,IAGArB,EAAAsB,GAAA,SAAAC,GAA8D,MAApBC,QAAAC,MAAAF,GAAoBA","file":"static/js/manifest.2ae2e69a05c33dfc65f8.js","sourcesContent":[" \t// install a JSONP callback for chunk loading\n \tvar parentJsonpFunction = window[\"webpackJsonp\"];\n \twindow[\"webpackJsonp\"] = function webpackJsonpCallback(chunkIds, moreModules, executeModules) {\n \t\t// add \"moreModules\" to the modules object,\n \t\t// then flag all \"chunkIds\" as loaded and fire callback\n \t\tvar moduleId, chunkId, i = 0, resolves = [], result;\n \t\tfor(;i < chunkIds.length; i++) {\n \t\t\tchunkId = chunkIds[i];\n \t\t\tif(installedChunks[chunkId]) {\n \t\t\t\tresolves.push(installedChunks[chunkId][0]);\n \t\t\t}\n \t\t\tinstalledChunks[chunkId] = 0;\n \t\t}\n \t\tfor(moduleId in moreModules) {\n \t\t\tif(Object.prototype.hasOwnProperty.call(moreModules, moduleId)) {\n \t\t\t\tmodules[moduleId] = moreModules[moduleId];\n \t\t\t}\n \t\t}\n \t\tif(parentJsonpFunction) parentJsonpFunction(chunkIds, moreModules, executeModules);\n \t\twhile(resolves.length) {\n \t\t\tresolves.shift()();\n \t\t}\n \t\tif(executeModules) {\n \t\t\tfor(i=0; i < executeModules.length; i++) {\n \t\t\t\tresult = __webpack_require__(__webpack_require__.s = executeModules[i]);\n \t\t\t}\n \t\t}\n \t\treturn result;\n \t};\n\n \t// The module cache\n \tvar installedModules = {};\n\n \t// objects to store loaded and loading chunks\n \tvar installedChunks = {\n \t\t2: 0\n \t};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId]) {\n \t\t\treturn installedModules[moduleId].exports;\n \t\t}\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, {\n \t\t\t\tconfigurable: false,\n \t\t\t\tenumerable: true,\n \t\t\t\tget: getter\n \t\t\t});\n \t\t}\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"/\";\n\n \t// on error function for async loading\n \t__webpack_require__.oe = function(err) { console.error(err); throw err; };\n\n\n\n// WEBPACK FOOTER //\n// webpack/bootstrap 9e39251c8e7efe3ea083"],"sourceRoot":""}
\ No newline at end of file
src/App.vue
View file @ ea923599
......@@ -6,7 +6,12 @@
<script>
export default {
name: 'App'
name: 'App',
data(){
return {
}
}
}
</script>
......
src/components/box/boxDialog.vue
View file @ ea923599
......@@ -58,6 +58,7 @@
<el-transfer
:titles="['单品列表', '盒子内容']"
v-model="singleList"
:filterable="true"
:props="{
key: 'id',
label: 'name'
......@@ -65,7 +66,7 @@
@change="changeTrans"
:data="data2">
<span slot-scope="{ option }" style="display: block">
{{ option.name }}
{{ option.name }}【库存{{option.num}}】
<el-input-number style="float: right" size="mini" v-model="option.checkNum"></el-input-number>
</span>
</el-transfer>
......
src/components/framework/index.vue
View file @ ea923599
......@@ -14,9 +14,7 @@
<div class="router-block">
<!--<tab/>-->
<transition name="el-fade-in-linear">
<keep-alive>
<router-view class="child-view" v-loading="$store.state.mainLoad"/>
</keep-alive>
</transition>
</div>
</div>
......
src/components/refund/index.vue
View file @ ea923599
......@@ -138,6 +138,7 @@
}
}
}
</script>
<style scoped>
......
src/components/resources/editor.vue
View file @ ea923599
......@@ -197,12 +197,16 @@
<el-upload
class="upload-demo"
action="/api/public/upload"
:on-remove="removeFile"
:http-request="uploadFileRadio"
multiple
:limit="1"
:on-exceed="handleExceed"
:on-success="uploadSuccess"
:file-list="selectedMould[nowIndex].content.radioUrl">
<el-button size="small" type="primary">点击上传</el-button>
:disabled="(fileUid && progress < 99)"
:file-list="selectedMould[nowIndex].content.radio">
<el-button size="small" type="primary" :disabled="(fileUid && progress < 99)">点击上传</el-button>
<div style="width: 300px">
<el-progress v-if="fileUid" :percentage="progress"></el-progress>
</div>
</el-upload>
</el-form-item>
<el-form-item label="今日目标">
......@@ -228,6 +232,20 @@
<!--音频1-->
<el-form label-width="100px" v-if="selectedMould[nowIndex] && selectedMould[this.nowIndex].key === 'radio1'">
<el-form-item label="音频">
<el-upload
class="upload-demo"
action="/api/public/upload"
:on-remove="removeFile"
:http-request="uploadFileRadio2"
multiple
:limit="1"
:disabled="(fileUid && progress < 99)"
:file-list="selectedMould[nowIndex].content.radio">
<el-button size="small" type="primary" :disabled="(fileUid && progress < 99)">点击上传</el-button>
<div style="width: 300px">
<el-progress v-if="fileUid" :percentage="progress"></el-progress>
</div>
</el-upload>
<el-upload
class="upload-demo"
action="/api/public/upload"
......@@ -323,6 +341,8 @@
class="upload-demo"
action="/api/public/upload"
:http-request="uploadFile"
:on-remove="removeFile"
:on-exceed="handleExceed"
multiple
:limit="1"
:disabled="(fileUid && progress < 99)"
......@@ -338,6 +358,8 @@
class="upload-demo"
action="/api/public/upload"
:http-request="uploadFileVideo1Banner"
:on-remove="removeFile"
:on-exceed="handleExceed"
list-type="picture-card"
multiple
:limit="1"
......@@ -380,7 +402,7 @@
</el-select>
</el-form-item>
</el-form>
<!--爸妈秀宝贝1-->
<!--唱学加油包1-->
<el-form label-width="100px" v-if="selectedMould[nowIndex] && selectedMould[this.nowIndex].key === 'refueling1'">
<el-form-item label="音频">
<el-upload
......@@ -388,6 +410,8 @@
action="/api/public/upload"
:http-request="uploadFileRadio"
multiple
:on-exceed="handleExceed"
:on-remove="removeFile"
:limit="1"
:disabled="(fileUid && progress < 99)"
:file-list="selectedMould[nowIndex].content.radio">
......@@ -403,7 +427,9 @@
action="/api/public/upload"
:http-request="uploadFileVideo1Banner"
list-type="picture-card"
:on-remove="removeFile"
multiple
:on-exceed="handleExceed"
:limit="1"
:disabled="(fileUid && progress < 99)"
:file-list="selectedMould[nowIndex].content.radio">
......@@ -434,7 +460,7 @@
</el-select>
</el-form-item>
</el-form>
<!--唱学加油包1-->
<!--爸妈秀宝贝1-->
<el-form label-width="100px" v-if="selectedMould[nowIndex] && selectedMould[this.nowIndex].key === 'show1'">
<el-form-item label="说明文字">
<el-input type="textarea" :rows="3" v-model="selectedMould[nowIndex].content.text"></el-input>
......@@ -517,20 +543,40 @@
} else {
this.dialogVisible = true;
}
},
// 上传Banner
uploadFileVideo1Banner(a){
this.$store.dispatch('setProgress',{type:'new',id:a.file.uid});
uploadFileApi({file:a.file,type:'local'}).then(res=>{
this.selectedMould[this.nowIndex].content.banner[0] = {name:res.url,url:process.env.IMAGE_URL_HEAD + res.url,title:'',lable:''}
this.selectedMould[this.nowIndex].content.banner[0] = {name:res.url,url:process.env.IMAGE_URL_HEAD + res.url,title:'',lable:''};
this.$store.dispatch('setProgress',{type:'delete',id:a.file.uid});
this.fileUid=null
})
},
// 删除文件
removeFile(a){
this.$store.dispatch('setProgress',{type:'delete',id:a.file.uid})
},
// 上传音频
uploadFileRadio(a){
this.$store.dispatch('setProgress',{type:'new',id:a.file.uid});
this.fileUid = a.file.uid;
uploadFileApi({file:a.file,type:'local'}).then(res=>{
this.selectedMould[this.nowIndex].content.radio[0] = {name:res.url,url:process.env.IMAGE_URL_HEAD + res.url,title:'',lable:''}
this.selectedMould[this.nowIndex].content.radio[0] = {name:res.url,url:process.env.IMAGE_URL_HEAD + res.url,title:'',lable:''};
this.$store.dispatch('setProgress',{type:'delete',id:a.file.uid});
this.fileUid=null
})
},
// 上传多个音频
uploadFileRadio2(a){
this.$store.dispatch('setProgress',{type:'new',id:a.file.uid});
this.fileUid = a.file.uid;
uploadFileApi({file:a.file,type:'local'}).then(res=>{
this.selectedMould[this.nowIndex].content.radio[0] = {name:res.url,url:process.env.IMAGE_URL_HEAD + res.url,title:'',lable:''};
this.$store.dispatch('setProgress',{type:'delete',id:a.file.uid});
this.fileUid=null
})
},
// 上传视频
......@@ -538,7 +584,9 @@
this.$store.dispatch('setProgress',{type:'new',id:a.file.uid});
this.fileUid = a.file.uid;
uploadFileApi({file:a.file,type:'local'}).then(res=>{
this.selectedMould[this.nowIndex].content.videoUrl[0]={name:res.url,url:process.env.IMAGE_URL_HEAD + res.url,title:'',lable:''}
this.selectedMould[this.nowIndex].content.radio.push({name:a.data.url,url:process.env.IMAGE_URL_HEAD + a.data.url,title:'',lable:''});
this.$store.dispatch('setProgress',{type:'delete',id:a.file.uid});
this.fileUid=null
})
},
// 列表选择
......
src/components/resources/editorDialog.vue
View file @ ea923599
......@@ -132,7 +132,8 @@
type: 'success',
message: '添加成功!'
});
this.editorObj.show = false
this.editorObj.show = false;
this.$emit('reflash')
});
break;
case 1:
......@@ -141,7 +142,8 @@
type: 'success',
message: '修改成功!'
});
this.editorObj.show = false
this.editorObj.show = false;
this.$emit('reflash')
});
}
},
......
src/components/resources/list.vue
View file @ ea923599
......@@ -27,7 +27,7 @@
<el-tag type="success" size="mini">{{data.min_age}}-{{data.max_age}}岁</el-tag>
</div>
</el-card>
<editor-dialog :editorObj="editorObj"/>
<editor-dialog :editorObj="editorObj" @reflash="getList"/>
</div>
</template>
......
src/service/index.js
View file @ ea923599
......@@ -82,7 +82,7 @@ export function upload(url,json) {
formData.append('file', file);
axios.post(url,formData,{ headers: {
'Content-Type': 'multipart/form-data'
},timeout:60000,
},timeout:100000,
onUploadProgress: progressEvent => {
if(store.state.progressList.find(i=>{return i.id === json.file.uid})){
let progress = ((Number(progressEvent.loaded) + Number(y*process.env.MAX_FILESIZE)) / Number(json.file.size) * 100| 0);
......
src/store/actions.js
View file @ ea923599
......@@ -7,6 +7,7 @@ export default{
setUserName({commit},name){
commit('setUserName',name);
},
// 设置进度条
setProgress({commit},data){
commit('progress',data);
},
......
src/util/resourceMould.js
View file @ ea923599
......@@ -11,7 +11,7 @@ export const MOULDLIST = [
name:'看一看-1',
key:'look1',
content:{
radioUrl:[],
radio:[],
today:'',
directory:'',
nextIndex:'',
......
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