Commit c809425b authored by 邓学云's avatar 邓学云

配送

parent 07c2936b
...@@ -291,3 +291,7 @@ ...@@ -291,3 +291,7 @@
[1217/102845.045:ERROR:process_memory_win.cc(73)] ReadMemory at 0x7fff6a8f1320 of 64 bytes failed: 仅完成部分的 ReadProcessMemory 或 WriteProcessMemory 请求。 (0x12B) [1217/102845.045:ERROR:process_memory_win.cc(73)] ReadMemory at 0x7fff6a8f1320 of 64 bytes failed: 仅完成部分的 ReadProcessMemory 或 WriteProcessMemory 请求。 (0x12B)
[1217/102845.048:ERROR:scoped_process_suspend.cc(40)] NtResumeProcess: 已尝试访问正在退出的过程。 (0xc000010a) [1217/102845.048:ERROR:scoped_process_suspend.cc(40)] NtResumeProcess: 已尝试访问正在退出的过程。 (0xc000010a)
[1217/103759.925:ERROR:process_info.cc(359)] UncheckedAllocate [1217/103759.925:ERROR:process_info.cc(359)] UncheckedAllocate
[1217/174328.388:ERROR:process_info.cc(359)] UncheckedAllocate
[1217/174328.389:ERROR:process_info.cc(359)] UncheckedAllocate
[1217/174415.247:ERROR:process_info.cc(359)] UncheckedAllocate
[1217/174421.088:ERROR:process_info.cc(359)] UncheckedAllocate
...@@ -16,16 +16,19 @@ import 'quill/dist/quill.bubble.css' ...@@ -16,16 +16,19 @@ import 'quill/dist/quill.bubble.css'
import VueAMap from 'vue-amap'; import VueAMap from 'vue-amap';
// mock // mock
// WARNING: `mockjs` NOT SUPPORT `IE` PLEASE DO NOT USE IN `production` ENV. // WARNING: `mockjs` NOT SUPPORT `IE` PLEASE DO NOT USE IN `production` ENV.
import './mock' // import './mock'
import bootstrap from './core/bootstrap' import bootstrap from './core/bootstrap'
import './core/lazy_use' import './core/lazy_use'
import './permission' // permission control import './permission' // permission control
import './utils/filter' // global filter import './utils/filter' // global filter
import './components/global.less' import './components/global.less'
import common from '@/static/js/common.js'
Vue.config.productionTip = false Vue.config.productionTip = false
Vue.prototype.common=common
// mount axios Vue.$http and this.$http // mount axios Vue.$http and this.$http
Vue.use(VueAxios) Vue.use(VueAxios)
Vue.use(VueQuillEditor) Vue.use(VueQuillEditor)
......
...@@ -219,6 +219,7 @@ export default { ...@@ -219,6 +219,7 @@ export default {
// res:cur_role_nodes=>树节点 // res:cur_role_nodes=>树节点
// every_role_name:该权限节点的name // every_role_name:该权限节点的name
// every_role_node_ids:该节点包括的节点的id // every_role_node_ids:该节点包括的节点的id
console.log(res)
const resTree=res.cur_role_nodes; const resTree=res.cur_role_nodes;
var parentTree; var parentTree;
resTree.forEach(one => { resTree.forEach(one => {
......
...@@ -139,21 +139,21 @@ ...@@ -139,21 +139,21 @@
label="配送城市" label="配送城市"
:labelCol="labelCol" :labelCol="labelCol"
:wrapperCol="wrapperCol"> :wrapperCol="wrapperCol">
<!-- <a-tree <a-tree
checkable checkable
:treeData="modalTree.treeData" :treeData="modalTree.treeData"
v-model="modalTree.checkedKeys" v-model="modalTree.checkedKeys"
:replaceFields="modalTree.replaceFields" :replaceFields="modalTree.replaceFields"
> >
</a-tree> --> </a-tree>
<a-tree <!-- <a-tree
checkable checkable
:treeData="modalTree.treeData" :treeData="modalTree.treeData"
v-model="modalTree.checkedKeys" v-model="modalTree.checkedKeys"
:replaceFields="modalTree.replaceFields" :replaceFields="modalTree.replaceFields"
> >
</a-tree> </a-tree> -->
<!-- @expand="expand" <!-- @expand="expand"
@check="selectCity" --> @check="selectCity" -->
</a-form-item> </a-form-item>
...@@ -240,8 +240,7 @@ export default { ...@@ -240,8 +240,7 @@ export default {
mixins: [mixin, mixinDevice], mixins: [mixin, mixinDevice],
components: { components: {
FooterToolBar, FooterToolBar,
STable, STable
Tree
}, },
data(){ data(){
return { return {
...@@ -325,7 +324,7 @@ export default { ...@@ -325,7 +324,7 @@ export default {
this.getTransport(); this.getTransport();
this.getUserGroup(); this.getUserGroup();
// this.getProvince(); // this.getProvince();
this.getAllCity() this.getAllC()
var goId=this.$route.query.goid; var goId=this.$route.query.goid;
if(goId==0){ if(goId==0){
this.getDetails(this.$route.query.GUID) this.getDetails(this.$route.query.GUID)
...@@ -488,7 +487,7 @@ export default { ...@@ -488,7 +487,7 @@ export default {
} }
}, },
// 获取全部省市 // 获取全部省市
getAllCity(){ getAllC(){
getAllCity().then(res => { getAllCity().then(res => {
this.modalTree.treeData=[]; this.modalTree.treeData=[];
this.modalTree.checkedKeys=[]; this.modalTree.checkedKeys=[];
......
...@@ -102,7 +102,7 @@ const vueConfig = { ...@@ -102,7 +102,7 @@ const vueConfig = {
// If you want to turn on the proxy, please remove the mockjs /src/main.jsL11 // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
proxy: { proxy: {
'/apis': { '/apis': {
target: 'http://localhost/hantengfei/newShopBack1/backend/web/v1/', target: 'http://localhost/dengxueyun/newshopBack/backend/web/v1/',
ws: false, ws: false,
changeOrigin: true, changeOrigin: true,
pathRewrite:{ pathRewrite:{
......
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