Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
A
admin-base
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
new-sing
admin-base
Commits
2c258fa7
Commit
2c258fa7
authored
Dec 29, 2018
by
chenfenglei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
老师列表加手机号搜索
parent
e3899215
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
2 deletions
+20
-2
index.vue
src/components/monthOrder/index.vue
+19
-1
index.vue
src/components/userDetail/index.vue
+1
-1
No files found.
src/components/monthOrder/index.vue
View file @
2c258fa7
...
@@ -41,6 +41,16 @@
...
@@ -41,6 +41,16 @@
:value=
"item.id"
>
:value=
"item.id"
>
</el-option>
</el-option>
</el-select>
</el-select>
</el-form-item>
<el-form-item
label=
"支付类型"
>
<el-select
v-model=
"searchFrom.order_type"
placeholder=
"请选择"
@
change=
"getOrderList"
clearable
>
<el-option
v-for=
"item in orderTypeOption"
:key=
"item.id"
:label=
"item.value"
:value=
"item.id"
>
</el-option>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
label=
"订单状态"
>
<el-form-item
label=
"订单状态"
>
<el-select
multiple
v-model=
"searchFrom.status"
placeholder=
"请选择"
@
change=
"getOrderList"
clearable
>
<el-select
multiple
v-model=
"searchFrom.status"
placeholder=
"请选择"
@
change=
"getOrderList"
clearable
>
...
@@ -280,7 +290,7 @@
...
@@ -280,7 +290,7 @@
import
detailDialog
from
'./detail'
import
detailDialog
from
'./detail'
import
refundDetail
from
'./refundDetail'
import
refundDetail
from
'./refundDetail'
import
AddressArray
from
'../framework/address-picker/addr'
import
AddressArray
from
'../framework/address-picker/addr'
import
{
INVITETYPE
,
ORDERSTATUS
,
BUYTYPE
,
BUYTYPEOPTION
,
ORDERSTATUSOPTION
,
INVITETYPEOPTION
,
GOODSTYPE
}
from
"../../util/wordbook"
;
import
{
INVITETYPE
,
ORDERSTATUS
,
BUYTYPE
,
BUYTYPEOPTION
,
ORDERSTATUSOPTION
,
INVITETYPEOPTION
,
GOODSTYPE
,
BUYWay
}
from
"../../util/wordbook"
;
import
CommonJs
from
'../../util/common'
;
import
CommonJs
from
'../../util/common'
;
export
default
{
export
default
{
...
@@ -308,6 +318,7 @@
...
@@ -308,6 +318,7 @@
invite_type
:
''
,
invite_type
:
''
,
invite_id
:
''
,
invite_id
:
''
,
buy_type
:
''
,
buy_type
:
''
,
order_type
:
''
,
status
:
[
1
,
4
,
5
],
status
:
[
1
,
4
,
5
],
goods_id
:
''
,
goods_id
:
''
,
out_trade_no
:
''
,
out_trade_no
:
''
,
...
@@ -334,6 +345,7 @@
...
@@ -334,6 +345,7 @@
inviteTypeOption
:
INVITETYPEOPTION
,
inviteTypeOption
:
INVITETYPEOPTION
,
orderStatusOption
:
ORDERSTATUSOPTION
,
orderStatusOption
:
ORDERSTATUSOPTION
,
buyTypeOption
:
BUYTYPEOPTION
,
buyTypeOption
:
BUYTYPEOPTION
,
orderTypeOption
:
BUYWay
,
inviteSearchPlaceholder
:
''
,
inviteSearchPlaceholder
:
''
,
rules
:{
rules
:{
value
:[
value
:[
...
@@ -390,6 +402,9 @@
...
@@ -390,6 +402,9 @@
}
}
if
(
this
.
searchFrom
.
buy_type
)
{
if
(
this
.
searchFrom
.
buy_type
)
{
json
.
buy_type
=
this
.
searchFrom
.
buy_type
json
.
buy_type
=
this
.
searchFrom
.
buy_type
}
if
(
this
.
searchFrom
.
order_type
)
{
json
.
order_type
=
this
.
searchFrom
.
order_type
}
}
if
(
this
.
searchFrom
.
status
)
{
if
(
this
.
searchFrom
.
status
)
{
json
.
status
=
this
.
searchFrom
.
status
.
toString
()
json
.
status
=
this
.
searchFrom
.
status
.
toString
()
...
@@ -490,6 +505,9 @@
...
@@ -490,6 +505,9 @@
}
}
if
(
this
.
searchFrom
.
buy_type
)
{
if
(
this
.
searchFrom
.
buy_type
)
{
json
.
buy_type
=
this
.
searchFrom
.
buy_type
json
.
buy_type
=
this
.
searchFrom
.
buy_type
}
if
(
this
.
searchFrom
.
order_type
)
{
json
.
order_type
=
this
.
searchFrom
.
order_type
}
}
if
(
this
.
searchFrom
.
status
)
{
if
(
this
.
searchFrom
.
status
)
{
json
.
status
=
this
.
searchFrom
.
status
.
toString
()
json
.
status
=
this
.
searchFrom
.
status
.
toString
()
...
...
src/components/userDetail/index.vue
View file @
2c258fa7
...
@@ -579,7 +579,7 @@
...
@@ -579,7 +579,7 @@
user_id
:
this
.
id
,
user_id
:
this
.
id
,
limit
:
this
.
limit
,
limit
:
this
.
limit
,
page
:
this
.
nowPage
,
page
:
this
.
nowPage
,
status
:
'1,
3
'
status
:
'1,
4,5
'
}
;
}
;
getOrderListApi
(
json
).
then
(
res
=>
{
getOrderListApi
(
json
).
then
(
res
=>
{
res
.
list
.
forEach
(
i
=>
{
res
.
list
.
forEach
(
i
=>
{
...
...
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