Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
welfare
Overview
Overview
Details
Activity
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
达摩4.0重构
welfare
Commits
3ef585f6
Commit
3ef585f6
authored
Jul 09, 2021
by
黑潮
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update: 导航
parent
9674e7e9
Hide whitespace changes
Inline
Side-by-side
Showing
18 changed files
with
70 additions
and
62 deletions
+70
-62
layout.vue
src/components/layout/layout.vue
+54
-1
address-lib-form.vue
src/views/gift-manage/address-lib-form.vue
+2
-3
address-lib-list.vue
src/views/gift-manage/address-lib-list.vue
+1
-1
pickup-form.vue
src/views/gift-manage/pickup-form.vue
+2
-3
pickup-list.vue
src/views/gift-manage/pickup-list.vue
+1
-1
real-gift-detail.vue
src/views/gift-manage/real-gift-detail.vue
+0
-6
real-gift.vue
src/views/gift-manage/real-gift.vue
+0
-6
real-stock-list.vue
src/views/gift-manage/real-stock-list.vue
+1
-1
sales-return-setting.vue
src/views/gift-manage/sales-return-setting.vue
+1
-1
stock-record.vue
src/views/gift-manage/stock-record.vue
+1
-1
virtual-gift-detail.vue
src/views/gift-manage/virtual-gift-detail.vue
+0
-6
virtual-gift.vue
src/views/gift-manage/virtual-gift.vue
+0
-6
virtual-stock-list.vue
src/views/gift-manage/virtual-stock-list.vue
+1
-1
index.vue
src/views/index.vue
+6
-1
delivery-detail.vue
src/views/performance-manage/delivery-detail.vue
+0
-6
delivery.vue
src/views/performance-manage/delivery.vue
+0
-6
record.vue
src/views/performance-manage/record.vue
+0
-6
refund.vue
src/views/performance-manage/refund.vue
+0
-6
No files found.
src/components/layout/layout.vue
View file @
3ef585f6
...
...
@@ -24,6 +24,15 @@
</div>
<!-- bread插槽 -->
<div
slot=
"bread"
>
<div
class=
"app-list__wrapper"
v-if=
"appListVisible && appList.length !== 0"
style=
"position:absolute"
>
<span>
当前福利支持以下应用使用:
</span>
<ul
class=
"app-list"
>
<li
v-for=
"(item, idx) in appList"
:key=
"idx"
@
click=
"goLink(item)"
>
<img
:src=
"item.iconUrl"
draggable=
"false"
/>
<span
:title=
"item.appName"
class=
"ellipsis-100"
>
{{
item
.
appName
}}
</span>
</li>
</ul>
</div>
<app-info
:code=
"moduleCode"
/>
</div>
</dm-layout>
...
...
@@ -49,7 +58,7 @@ import switchPage from '@/components/libs/switch-page';
import
{
reRreshRoute
}
from
'@/utils/index'
;
import
{
dealMkStorage
}
from
'@/utils/common'
;
import
commonApi
from
'@/api/common.js'
;
const
{
getSubappList
}
=
commonApi
;
const
{
getSubappList
,
getWelfareAppList
}
=
commonApi
;
// const { getAppInfo, loginUserMenuOfApp, getSubappList } = commonApi;
export
default
{
name
:
'Layout'
,
...
...
@@ -60,12 +69,23 @@ export default {
data
()
{
return
{
noAreaWarnVisible
:
false
,
// 没有域list警告(子应用列表请求后为空显示)
appList
:
[],
};
},
mounted
()
{
this
.
init
();
this
.
getAppList
();
},
methods
:
{
goLink
(
item
)
{
localStorage
.
setItem
(
'appApplicationId'
,
item
.
applicationId
);
window
.
open
(
item
.
authorizeUrl
,
'_blank'
,
'noopener'
);
},
getAppList
()
{
getWelfareAppList
().
then
(
res
=>
{
this
.
appList
=
res
.
result
||
[];
});
},
// 处理提交创建子应用的回调
handleSubApp
({
type
,
areaId
,
reason
})
{
this
.
addSubResVisible
=
true
;
...
...
@@ -131,6 +151,10 @@ export default {
]),
showLeft
()
{
return
!
(
this
.
project
==
''
||
this
.
project
==
'index'
);
},
appListVisible
()
{
let
routes
=
[
'/gic-card/list'
,
'/card-package/list'
,
'/gift-manage/real-gift'
,
'/gift-manage/virtual-gift'
];
return
routes
.
some
(
i
=>
i
.
indexOf
(
this
.
$route
.
path
)
>
-
1
);
}
},
watch
:
{
...
...
@@ -144,6 +168,35 @@ export default {
<
style
lang=
"scss"
scoped
>
.app-list
{
display
:
flex
;
margin-left
:
8px
;
&__wrapper
{
color
:
#606266
;
font-size
:
13px
;
position
:
absolute
;
left
:
110px
;
display
:
flex
;
margin-top
:
-5px
;
align-items
:
center
;
}
img
{
width
:
24px
;
height
:
24px
;
}
li
{
height
:
28px
;
background-color
:
#F5F7FA
;
border-radius
:
2px
;
padding
:
0
8px
0
3px
;
display
:
flex
;
align-items
:
center
;
cursor
:
pointer
}
li
+
li
{
margin-left
:
10px
;
}
}
.simu-el-item
{
margin-top
:
6px
;
padding-left
:
20px
;
...
...
src/views/gift-manage/address-lib-form.vue
View file @
3ef585f6
...
...
@@ -116,7 +116,7 @@ export default {
}
},
created
()
{
this
.
$emit
(
'updateBread'
,
[
{
breadName
:
'福利中心'
},
{
breadName
:
'通用设置'
},
{
breadName
:
'地址库管理'
,
breadPath
:
'/setting/address-lib-list'
},
{
breadName
:
(
this
.
addressId
?
'编辑'
:
'新建'
)
+
'地址库'
}
]);
this
.
$emit
(
'updateBread'
,
[
{
breadName
:
'地址库管理'
,
breadPath
:
'/setting/address-lib-list'
},
{
breadName
:
(
this
.
addressId
?
'编辑'
:
'新建'
)
+
'地址库'
}
]);
},
methods
:
{
change
(
value
){
...
...
@@ -208,4 +208,4 @@ export default {
.special
.el-checkbox__input.is-checked
+
.el-checkbox__label
{
color
:
#c4c6cf
;
}
</
style
>
\ No newline at end of file
</
style
>
src/views/gift-manage/address-lib-list.vue
View file @
3ef585f6
...
...
@@ -46,7 +46,7 @@ export default {
};
},
created
()
{
this
.
$emit
(
'updateBread'
,
[
{
breadName
:
'福利中心'
},
{
breadName
:
'通用设置'
},
{
breadName
:
'地址库管理'
}
]);
this
.
$emit
(
'updateBread'
,
[
{
breadName
:
'地址库管理'
}
]);
},
mounted
()
{
this
.
getTableList
();
...
...
src/views/gift-manage/pickup-form.vue
View file @
3ef585f6
...
...
@@ -126,7 +126,7 @@ export default {
}
},
created
()
{
this
.
$emit
(
'updateBread'
,
[
{
breadName
:
'福利中心'
},
{
breadName
:
'通用设置'
},
{
breadName
:
'自提点设置'
,
breadPath
:
'/setting/pickup-list'
},
{
breadName
:
this
.
isAdd
?
'新建自提点'
:
'编辑自提点'
,
breadPath
:
''
}
]);
this
.
$emit
(
'updateBread'
,
[
{
breadName
:
'自提点设置'
,
breadPath
:
'/setting/pickup-list'
},
{
breadName
:
this
.
isAdd
?
'新建自提点'
:
'编辑自提点'
,
breadPath
:
''
}
]);
},
methods
:
{
getInfo
()
{
...
...
@@ -287,4 +287,4 @@ export default {
.special
.el-checkbox__input.is-checked
+
.el-checkbox__label
{
color
:
#c4c6cf
;
}
</
style
>
\ No newline at end of file
</
style
>
src/views/gift-manage/pickup-list.vue
View file @
3ef585f6
...
...
@@ -65,7 +65,7 @@ export default {
};
},
created
()
{
this
.
$emit
(
'updateBread'
,
[
{
breadName
:
'福利中心'
},
{
breadName
:
'通用设置'
},
{
breadName
:
'自提点设置'
}
]);
this
.
$emit
(
'updateBread'
,
[
{
breadName
:
'自提点设置'
}
]);
},
mounted
()
{
this
.
getTableList
();
...
...
src/views/gift-manage/real-gift-detail.vue
View file @
3ef585f6
...
...
@@ -348,12 +348,6 @@ export default {
uploadUrl
:
uploadUrl
,
bread
:
[
{
breadName
:
'福利中心'
},
{
breadName
:
'礼品管理'
},
{
breadPath
:
'/gift-manage/real-gift'
,
breadName
:
'实物礼品'
},
...
...
src/views/gift-manage/real-gift.vue
View file @
3ef585f6
...
...
@@ -198,12 +198,6 @@ export default {
return
{
bread
:
[
{
breadName
:
'福利中心'
},
{
breadName
:
'礼品管理'
},
{
breadName
:
'实物礼品'
}
],
...
...
src/views/gift-manage/real-stock-list.vue
View file @
3ef585f6
...
...
@@ -10,7 +10,7 @@ export default {
stockList
},
created
()
{
this
.
$emit
(
'updateBread'
,
[
{
breadName
:
'
福利中心'
},
{
breadName
:
'礼品管理'
},
{
breadName
:
'
实物礼品'
,
breadPath
:
'/gift-manage/real-gift'
},
{
breadName
:
'库存记录'
}
]);
this
.
$emit
(
'updateBread'
,
[
{
breadName
:
'实物礼品'
,
breadPath
:
'/gift-manage/real-gift'
},
{
breadName
:
'库存记录'
}
]);
}
};
</
script
>
src/views/gift-manage/sales-return-setting.vue
View file @
3ef585f6
...
...
@@ -35,7 +35,7 @@ export default {
};
},
created
()
{
this
.
$emit
(
'updateBread'
,
[
{
breadName
:
'福利中心'
},
{
breadName
:
'通用设置'
},
{
breadName
:
'退货单设置'
}
]);
this
.
$emit
(
'updateBread'
,
[
{
breadName
:
'退货单设置'
}
]);
},
mounted
()
{
this
.
getDetail
();
...
...
src/views/gift-manage/stock-record.vue
View file @
3ef585f6
...
...
@@ -10,7 +10,7 @@ export default {
stockRecord
},
created
()
{
this
.
$emit
(
'updateBread'
,
[
{
breadName
:
'
福利中心'
},
{
breadName
:
'礼品管理'
},
{
breadName
:
'
库存上传记录'
}
]);
this
.
$emit
(
'updateBread'
,
[
{
breadName
:
'库存上传记录'
}
]);
}
};
</
script
>
src/views/gift-manage/virtual-gift-detail.vue
View file @
3ef585f6
...
...
@@ -247,12 +247,6 @@ export default {
uploadUrl
:
uploadUrl
,
bread
:
[
{
breadName
:
'福利中心'
},
{
breadName
:
'礼品管理'
},
{
breadPath
:
'/gift-manage/virtual-gift'
,
breadName
:
'虚拟礼品'
},
...
...
src/views/gift-manage/virtual-gift.vue
View file @
3ef585f6
...
...
@@ -222,12 +222,6 @@ export default {
return
{
bread
:
[
{
breadName
:
'福利中心'
},
{
breadName
:
'礼品管理'
},
{
breadName
:
'虚拟礼品'
}
],
...
...
src/views/gift-manage/virtual-stock-list.vue
View file @
3ef585f6
...
...
@@ -10,7 +10,7 @@ export default {
stockList
},
created
()
{
this
.
$emit
(
'updateBread'
,
[
{
breadName
:
'
福利中心'
},
{
breadName
:
'礼品管理'
},
{
breadName
:
'
虚拟礼品'
,
breadPath
:
'/gift-manage/virtual-gift'
},
{
breadName
:
'库存记录'
}
]);
this
.
$emit
(
'updateBread'
,
[
{
breadName
:
'虚拟礼品'
,
breadPath
:
'/gift-manage/virtual-gift'
},
{
breadName
:
'库存记录'
}
]);
}
};
</
script
>
src/views/index.vue
View file @
3ef585f6
...
...
@@ -2,7 +2,7 @@
<div
class=
"welfare-index"
>
<div
class=
"welfare-index-header"
>
福利中心
</div>
<div
class=
"enter"
>
<div
v-for=
"(item, idx) in wfTypes"
:key=
"idx"
:class=
"`block b$
{idx + 1}`" @click="
$router.push(item.target
)">
<div
v-for=
"(item, idx) in wfTypes"
:key=
"idx"
:class=
"`block b$
{idx + 1}`" @click="
openTab(item
)">
<span
class=
"title"
>
{{
item
.
title
}}
</span>
<div
class=
"target"
><i
class=
"icon-right-circle iconfont-welfare4"
></i></div>
</div>
...
...
@@ -18,6 +18,11 @@ export default {
return
{
wfTypes
};
},
methods
:
{
openTab
(
item
)
{
window
.
open
(
location
.
origin
+
'/welfare'
+
item
.
target
);
}
}
};
</
script
>
...
...
src/views/performance-manage/delivery-detail.vue
View file @
3ef585f6
...
...
@@ -130,12 +130,6 @@ export default {
created
()
{
this
.
$emit
(
'updateBread'
,
[
{
breadName
:
'福利中心'
},
{
breadName
:
'履约管理'
},
{
breadName
:
'发货单'
,
breadPath
:
'/gift-performance/delivery'
,
},
...
...
src/views/performance-manage/delivery.vue
View file @
3ef585f6
...
...
@@ -27,12 +27,6 @@ export default {
mounted
()
{
this
.
$emit
(
'updateBread'
,
[
{
breadName
:
'福利中心'
},
{
breadName
:
'履约管理'
},
{
breadName
:
'发货单'
},
]);
...
...
src/views/performance-manage/record.vue
View file @
3ef585f6
...
...
@@ -181,12 +181,6 @@ export default {
created
()
{
this
.
$emit
(
'updateBread'
,
[
{
breadName
:
'福利中心'
},
{
breadName
:
'履约管理'
},
{
breadName
:
'履约记录'
},
]);
...
...
src/views/performance-manage/refund.vue
View file @
3ef585f6
...
...
@@ -288,12 +288,6 @@ export default {
created
()
{
this
.
$emit
(
'updateBread'
,
[
{
breadName
:
'福利中心'
},
{
breadName
:
'履约管理'
},
{
breadName
:
'退货单'
},
]);
...
...
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