Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mayi-mp-shop
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
程默
mayi-mp-shop
Commits
9fa79476
Commit
9fa79476
authored
Sep 01, 2023
by
李嘉林
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
待办弹窗
parent
d8e7243a
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
11 deletions
+16
-11
config/dev.env.js
+2
-4
src/api/wly.js
+1
-1
src/components/common/WLYToDoList.vue
+13
-6
No files found.
config/dev.env.js
View file @
9fa79476
...
@@ -13,10 +13,8 @@ var prodEnv = require('./prod.env')
...
@@ -13,10 +13,8 @@ var prodEnv = require('./prod.env')
module
.
exports
=
merge
(
prodEnv
,
{
//zjgyl
module
.
exports
=
merge
(
prodEnv
,
{
//zjgyl
SHOP_MIXID
:
"'antgood'"
,
SHOP_MIXID
:
"'antgood'"
,
NODE_ENV
:
'"development"'
,
NODE_ENV
:
'"development"'
,
// BASE_URL:"'https://shop.mayi888.com'",
// BASE_URL:"'http://test-m-shop.mayi888.cn'",
// BASE_URL:"'http://192.168.1.146:3005'",
BASE_URL
:
"'https://uat-zanmall-m.cipmp.com'"
,
// BASE_URL:"'http://172.16.1.18:3000'",
BASE_URL
:
"'http://test-m-shop.mayi888.cn'"
,
ADMIN_URL
:
"'https://test-ant.mayi888.cn'"
,
ADMIN_URL
:
"'https://test-ant.mayi888.cn'"
,
GUIDE_URL
:
"'https://guide-m.mayi888.cn'"
,
GUIDE_URL
:
"'https://guide-m.mayi888.cn'"
,
// BASE_URL:"'http://192.168.137.1:3004'",
// BASE_URL:"'http://192.168.137.1:3004'",
...
...
src/api/wly.js
View file @
9fa79476
...
@@ -2,6 +2,6 @@ import { requestPOST, requestGET } from "@/utils/request.js";
...
@@ -2,6 +2,6 @@ import { requestPOST, requestGET } from "@/utils/request.js";
export
default
{
export
default
{
selectToDoList
(
options
)
{
selectToDoList
(
options
)
{
return
requestPOST
(
`
${
process
.
env
.
OLSHOP_URL
}
/packageRestaurant/market/selectToDoList`
,
options
)
return
requestPOST
(
`
${
process
.
env
.
BASE_URL
}
/innerApi/wlyService
/packageRestaurant/market/selectToDoList`
,
options
)
},
},
}
}
src/components/common/WLYToDoList.vue
View file @
9fa79476
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
<div
class=
"WLYToDoList__content"
>
<div
class=
"WLYToDoList__content"
>
<div
class=
"WLYToDoList__content__title"
>
待办事项
</div>
<div
class=
"WLYToDoList__content__title"
>
待办事项
</div>
<div
class=
"WLYToDoList__content__list"
>
<div
class=
"WLYToDoList__content__list"
>
<div
class=
"WLYToDoList__content__list__item"
v-for=
"(item,index) in list"
:key=
"index"
@
click=
"toPage(item)"
>
<div
class=
"WLYToDoList__content__list__item"
v-for=
"(item,index) in list"
:key=
"index"
@
click=
"toPage(item)"
v-if =
"item.count > 0"
>
<div
class=
"WLYToDoList__content__list__item__label"
>
{{
item
.
label
}}
</div>
<div
class=
"WLYToDoList__content__list__item__label"
>
{{
item
.
label
}}
</div>
<div
class=
"WLYToDoList__content__list__item__count"
>
{{
item
.
count
}}
项
<i
class=
"iconfont icon-tubiao_jiyao-xiangyou"
></i></div>
<div
class=
"WLYToDoList__content__list__item__count"
>
{{
item
.
count
}}
项
<i
class=
"iconfont icon-tubiao_jiyao-xiangyou"
></i></div>
</div>
</div>
...
@@ -31,10 +31,16 @@ export default {
...
@@ -31,10 +31,16 @@ export default {
link
:
"/#/pages/advanceOrder/index?getMixId=1&noLogin=true&advanceOrderStatus=reserve"
,
link
:
"/#/pages/advanceOrder/index?getMixId=1&noLogin=true&advanceOrderStatus=reserve"
,
},
},
{
{
id
:
0
,
id
:
1
,
label
:
"餐费待确认"
,
label
:
"餐费待确认"
,
count
:
0
,
count
:
0
,
link
:
"/#/pages/advanceOrder/index?getMixId=1&noLogin=true&advanceOrderStatus="
,
link
:
"/#/pages/advanceOrder/index?getMixId=1&noLogin=true&advanceOrderStatus="
,
},
{
id
:
2
,
label
:
"待大区确认"
,
count
:
0
,
link
:
"/#/pages/advanceOrder/index?getMixId=1&noLogin=true&advanceOrderStatus=secondSignature"
,
}
}
]
]
}
}
...
@@ -58,11 +64,12 @@ export default {
...
@@ -58,11 +64,12 @@ export default {
// 获取待办数据
// 获取待办数据
try
{
try
{
let
res
=
await
wly
.
selectToDoList
();
let
res
=
await
wly
.
selectToDoList
();
if
(
res
.
code
==
200
)
{
if
(
res
.
data
.
code
==
200
)
{
this
.
list
[
0
].
count
=
res
.
data
.
countBooking
;
this
.
list
[
0
].
count
=
Number
(
res
.
data
.
data
.
countBooking
);
this
.
list
[
1
].
count
=
res
.
data
.
countMealSecondConfirm
;
this
.
list
[
1
].
count
=
Number
(
res
.
data
.
data
.
countMealSecondConfirm
);
this
.
list
[
2
].
count
=
Number
(
res
.
data
.
data
.
countMealSecondSignature
);
}
}
if
(
res
.
data
.
total
>
0
)
{
if
(
res
.
data
.
data
.
total
>
0
)
{
this
.
show
=
true
;
this
.
show
=
true
;
}
}
}
catch
(
error
)
{
}
catch
(
error
)
{
...
...
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