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
8e12614f
Commit
8e12614f
authored
Dec 24, 2018
by
chenfenglei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
云集绑定状态
parent
ea307898
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
52 additions
and
24 deletions
+52
-24
entrance.vue
src/components/notBuyClass/entrance.vue
+1
-0
newDialog.vue
src/components/order/newDialog.vue
+46
-24
index.vue
src/components/yunji/index.vue
+5
-0
No files found.
src/components/notBuyClass/entrance.vue
View file @
8e12614f
...
...
@@ -160,6 +160,7 @@
};
getGoodsListApi
(
json
).
then
(
res
=>
{
res
.
list
.
forEach
(
i
=>
{
i
.
name
=
'['
+
GOODSTYPE
[
i
.
goods_type
]
+
']'
+
'['
+
i
.
current_price
/
100
+
'元]'
+
i
.
name
i
.
children
=
[];
});
this
.
periodsList
=
res
.
list
;
...
...
src/components/order/newDialog.vue
View file @
8e12614f
...
...
@@ -8,22 +8,22 @@
<el-form
ref=
"form"
:model=
"form"
label-width=
"120px"
:rules=
"rules"
>
<el-row>
<el-col
:span=
"12"
>
<el-form-item
label=
"期数名称"
prop=
"periods_id"
>
<el-select
v-model=
"form.periods_id"
placeholder=
"请选择"
>
<el-option
v-for=
"item in goodList
"
:key=
"item.id
"
:label=
"item.name
"
:value=
"item.id"
>
</el-option
>
</el-select
>
<el-form-item
label=
"期数名称"
>
<el-cascader
:options=
"periodsList"
:props=
"
{value:'id',label:'name'}
"
@active-item-change="handleItemChange
"
@change="changePeriods
"
v-model="selectedGoods"
>
</el-cascader
>
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<el-form-item
label=
"商品名称"
prop=
"goods_id"
>
<el-select
v-model=
"form.goods_id"
placeholder=
"请选择"
>
<el-option
v-for=
"(data,index) in goodList"
v-for=
"(data,index) in good
s
List"
:key=
"index"
:label=
"data | filterGoods"
:value=
"data.id"
>
...
...
@@ -102,7 +102,7 @@
</
template
>
<
script
>
import
{
getGoodsListApi
,
setOrderApi
}
from
"../../service/api"
import
{
getGoodsListApi
,
setOrderApi
,
getPeriodsApi
}
from
"../../service/api"
import
vueAddress
from
'../framework/address-picker/Address'
import
AddressArray
from
'../framework/address-picker/addr'
import
{
ORDERSTATUS
,
BUYTYPEOPTION
,
BUYWay
,
GOODSTYPE
}
from
"../../util/wordbook"
...
...
@@ -160,7 +160,9 @@ import {getGoodsListApi,setOrderApi} from "../../service/api"
pay_at
:
""
,
},
goodList
:[],
goodsList
:[],
periodsList
:[],
selectedGoods
:[],
buyTypeOptions
:
BUYTYPEOPTION
,
pickerOptions1
:
''
,
buyWayOptioms
:
BUYWay
,
...
...
@@ -186,12 +188,11 @@ import {getGoodsListApi,setOrderApi} from "../../service/api"
money
:
data
.
money
,
buy_type
:
data
.
buy_type
,
province_name
:
data
.
province_name
,
city
:
data
.
city
,
area
:
data
.
area
,
city_id
:
data
.
city
,
city_name
:
data
.
city_name
,
district_name
:
data
.
district_name
,
district
:
data
.
district
,
province
:
data
.
province
,
area
:
data
.
district_name
,
area_id
:
data
.
district
,
province
_id
:
data
.
province
,
address
:
data
.
address
,
receive_mobile
:
data
.
receive_mobile
,
receive_name
:
data
.
receive_name
,
...
...
@@ -261,18 +262,39 @@ import {getGoodsListApi,setOrderApi} from "../../service/api"
limit
:
200
};
getGoodsListApi
(
json
).
then
(
res
=>
{
console
.
log
(
res
)
this
.
goodList
=
res
.
list
;
this
.
goodsList
=
res
.
list
;
})
},
getPeriodsList
(){
let
json
=
{
page
:
1
,
limit
:
100
,
goods_type
:
'1,2'
};
getGoodsListApi
(
json
).
then
(
res
=>
{
res
.
list
.
forEach
(
i
=>
{
i
.
name
=
'['
+
GOODSTYPE
[
i
.
goods_type
]
+
']'
+
'['
+
i
.
current_price
/
100
+
'元]'
+
i
.
name
i
.
children
=
[];
});
this
.
periodsList
=
res
.
list
;
});
},
handleItemChange
(
val
){
getPeriodsApi
({
goods_id
:
val
[
0
]}).
then
(
res
=>
{
res
.
list
.
forEach
(
i
=>
{
i
.
name
=
i
.
title
});
this
.
periodsList
.
find
(
i
=>
{
return
i
.
id
===
val
[
0
]}).
children
=
res
.
list
})
},
changePeriods
(
data
){
if
(
data
.
length
>
1
){
this
.
form
.
periods_id
=
data
[
1
];
}
},
},
mounted
(){
this
.
getGoodsOption
();
this
.
getPeriodsList
();
},
watch
:{
'newdialogObj'
(
value
){
this
.
getGoodsOption
()
}
}
}
</
script
>
...
...
src/components/yunji/index.vue
View file @
8e12614f
...
...
@@ -99,6 +99,10 @@
<el-table-column
prop=
"receiver_name"
label=
"姓名"
>
</el-table-column>
<el-table-column
prop=
"teacher_name"
label=
"班级老师"
>
</el-table-column>
<el-table-column
prop=
"receiver_phone"
...
...
@@ -234,6 +238,7 @@
json
.
pull_end_at
=
this
.
searchFrom
.
syncTime
[
1
]
}
getyunjiApi
(
json
).
then
((
res
)
=>
{
console
.
log
(
res
.
list
)
this
.
total
=
res
.
total
;
this
.
list
=
res
.
list
?
res
.
list
:
[]
})
...
...
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