Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
N
newShopFront
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
newshop
newShopFront
Commits
c809425b
Commit
c809425b
authored
Dec 17, 2019
by
邓学云
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
配送
parent
07c2936b
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
17 additions
and
10 deletions
+17
-10
debug.log
debug.log
+4
-0
main.js
src/main.js
+4
-1
roleList.vue
src/views/authority/roleList.vue
+1
-0
deliveryDetails.vue
src/views/delivery/details/deliveryDetails.vue
+7
-8
vue.config.js
vue.config.js
+1
-1
No files found.
debug.log
View file @
c809425b
...
...
@@ -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.048:ERROR:scoped_process_suspend.cc(40)] NtResumeProcess: 已尝试访问正在退出的过程。 (0xc000010a)
[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
src/main.js
View file @
c809425b
...
...
@@ -16,16 +16,19 @@ import 'quill/dist/quill.bubble.css'
import
VueAMap
from
'vue-amap'
;
// mock
// WARNING: `mockjs` NOT SUPPORT `IE` PLEASE DO NOT USE IN `production` ENV.
import
'./mock'
//
import './mock'
import
bootstrap
from
'./core/bootstrap'
import
'./core/lazy_use'
import
'./permission'
// permission control
import
'./utils/filter'
// global filter
import
'./components/global.less'
import
common
from
'@/static/js/common.js'
Vue
.
config
.
productionTip
=
false
Vue
.
prototype
.
common
=
common
// mount axios Vue.$http and this.$http
Vue
.
use
(
VueAxios
)
Vue
.
use
(
VueQuillEditor
)
...
...
src/views/authority/roleList.vue
View file @
c809425b
...
...
@@ -219,6 +219,7 @@ export default {
// res:cur_role_nodes=>树节点
// every_role_name:该权限节点的name
// every_role_node_ids:该节点包括的节点的id
console
.
log
(
res
)
const
resTree
=
res
.
cur_role_nodes
;
var
parentTree
;
resTree
.
forEach
(
one
=>
{
...
...
src/views/delivery/details/deliveryDetails.vue
View file @
c809425b
...
...
@@ -139,21 +139,21 @@
label=
"配送城市"
:labelCol=
"labelCol"
:wrapperCol=
"wrapperCol"
>
<
!--
<
a-tree
<a-tree
checkable
:treeData=
"modalTree.treeData"
v-model=
"modalTree.checkedKeys"
:replaceFields=
"modalTree.replaceFields"
>
</a-tree>
-->
<a-tree
</a-tree>
<
!--
<
a-tree
checkable
:treeData=
"modalTree.treeData"
v-model=
"modalTree.checkedKeys"
:replaceFields=
"modalTree.replaceFields"
>
</a-tree>
</a-tree>
-->
<!-- @expand="expand"
@check="selectCity" -->
</a-form-item>
...
...
@@ -240,8 +240,7 @@ export default {
mixins
:
[
mixin
,
mixinDevice
],
components
:
{
FooterToolBar
,
STable
,
Tree
STable
},
data
(){
return
{
...
...
@@ -325,7 +324,7 @@ export default {
this
.
getTransport
();
this
.
getUserGroup
();
// this.getProvince();
this
.
getAllC
ity
()
this
.
getAllC
()
var
goId
=
this
.
$route
.
query
.
goid
;
if
(
goId
==
0
){
this
.
getDetails
(
this
.
$route
.
query
.
GUID
)
...
...
@@ -488,7 +487,7 @@ export default {
}
},
// 获取全部省市
getAllC
ity
(){
getAllC
(){
getAllCity
().
then
(
res
=>
{
this
.
modalTree
.
treeData
=
[];
this
.
modalTree
.
checkedKeys
=
[];
...
...
vue.config.js
View file @
c809425b
...
...
@@ -102,7 +102,7 @@ const vueConfig = {
// If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
proxy
:
{
'/apis'
:
{
target
:
'http://localhost/
hantengfei/newShopBack1
/backend/web/v1/'
,
target
:
'http://localhost/
dengxueyun/newshopBack
/backend/web/v1/'
,
ws
:
false
,
changeOrigin
:
true
,
pathRewrite
:{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment