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
b2c4209f
Commit
b2c4209f
authored
6 years ago
by
chenfenglei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
新增月课新增订单
parent
35e40afd
Changes
15
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
250 additions
and
501 deletions
+250
-501
dialog.vue
src/components/achievement/dialog.vue
+4
-2
index.vue
src/components/achievement/index.vue
+6
-4
userList.vue
src/components/class/userList.vue
+0
-1
headIndex.vue
src/components/framework/headIndex.vue
+0
-3
dialog.vue
src/components/lesson/dialog.vue
+0
-1
index.vue
src/components/monthOrder/index.vue
+2
-4
newDialog.vue
src/components/monthOrder/newDialog.vue
+188
-97
entrance.vue
src/components/notBuyClass/entrance.vue
+0
-2
index.vue
src/components/notBuyClass/index.vue
+0
-2
index.vue
src/components/order/index.vue
+20
-22
newDialog.vue
src/components/order/newDialog.vue
+0
-344
dialog.vue
src/components/shop/dialog.vue
+10
-10
index.vue
src/components/smsRecord/index.vue
+0
-1
index.vue
src/components/yunji/index.vue
+8
-7
wordbook.js
src/util/wordbook.js
+12
-1
No files found.
src/components/achievement/dialog.vue
View file @
b2c4209f
...
@@ -19,12 +19,14 @@
...
@@ -19,12 +19,14 @@
},
},
methods
:{
methods
:{
initPage
(){
initPage
(){
console
.
log
(
this
.
dialogObj
)
},
},
},
},
watch
:{
watch
:{
'dialogObj'
(
value
){
'dialogObj.show'
(
value
){
if
(
value
){
this
.
initPage
()
this
.
initPage
()
}
}
}
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
src/components/achievement/index.vue
View file @
b2c4209f
...
@@ -139,8 +139,8 @@
...
@@ -139,8 +139,8 @@
dialogObj
:{
dialogObj
:{
show
:
false
,
show
:
false
,
title
:
'售卖课程'
,
title
:
'售卖课程'
,
id
:
""
,
teacher_
id
:
""
,
time
:
""
time
Value
:
""
,
},
},
}
}
},
},
...
@@ -171,7 +171,6 @@
...
@@ -171,7 +171,6 @@
end_at
:
this
.
searchFirstFrom
.
dateValue
[
1
]
end_at
:
this
.
searchFirstFrom
.
dateValue
[
1
]
};
};
}
}
console
.
log
(
json
)
getTeacherRankListApi
(
json
).
then
(
res
=>
{
getTeacherRankListApi
(
json
).
then
(
res
=>
{
this
.
firstList
=
res
;
this
.
firstList
=
res
;
})
})
...
@@ -203,7 +202,10 @@
...
@@ -203,7 +202,10 @@
this
.
searchSecondFrom
.
dateValue
=
[
star
,
end
]
this
.
searchSecondFrom
.
dateValue
=
[
star
,
end
]
},
},
nameClick
(
val
){
nameClick
(
val
){
console
.
log
(
val
)
this
.
dialogObj
.
teacher_id
=
val
.
tid
;
if
(
val
.
cur_date
){
this
.
dialogObj
.
timeValue
=
val
.
cur_date
}
this
.
dialogObj
.
show
=
true
;
this
.
dialogObj
.
show
=
true
;
},
},
}
}
...
...
This diff is collapsed.
Click to expand it.
src/components/class/userList.vue
View file @
b2c4209f
...
@@ -682,7 +682,6 @@
...
@@ -682,7 +682,6 @@
}
)
}
)
}
);
}
);
getClassUserApi
(
this
.
userObj
.
classId
,
json
).
then
(
res
=>
{
getClassUserApi
(
this
.
userObj
.
classId
,
json
).
then
(
res
=>
{
console
.
log
(
res
.
list
)
this
.
userTable
=
res
.
list
this
.
userTable
=
res
.
list
}
);
}
);
this
.
changeClassObj
=
{
this
.
changeClassObj
=
{
...
...
This diff is collapsed.
Click to expand it.
src/components/framework/headIndex.vue
View file @
b2c4209f
...
@@ -101,9 +101,6 @@ export default {
...
@@ -101,9 +101,6 @@ export default {
getLink
getLink
},
},
methods
:
{
methods
:
{
a
()
{
console
.
log
(
"aa"
);
},
logOut
()
{
logOut
()
{
this
.
$confirm
(
"确定退出系统?"
,
"提示"
,
{
this
.
$confirm
(
"确定退出系统?"
,
"提示"
,
{
confirmButtonText
:
"确定"
,
confirmButtonText
:
"确定"
,
...
...
This diff is collapsed.
Click to expand it.
src/components/lesson/dialog.vue
View file @
b2c4209f
...
@@ -321,7 +321,6 @@
...
@@ -321,7 +321,6 @@
this
.
selectBox
([
i
.
id
])
this
.
selectBox
([
i
.
id
])
});
});
}
}
});
});
break
;
break
;
case
2
:
case
2
:
...
...
This diff is collapsed.
Click to expand it.
src/components/monthOrder/index.vue
View file @
b2c4209f
...
@@ -71,7 +71,7 @@
...
@@ -71,7 +71,7 @@
<el-button
type=
"primary"
plain
@
click=
"exportTable"
>
导出
</el-button>
<el-button
type=
"primary"
plain
@
click=
"exportTable"
>
导出
</el-button>
</el-form-item>
</el-form-item>
<el-form-item
style=
"float:right"
>
<el-form-item
style=
"float:right"
>
<
!-- <el-button type="success" plain @click="add">新增订单</el-button> --
>
<
el-button
type=
"success"
plain
@
click=
"add"
v-if=
"!$store.state.readonly"
>
新增订单
</el-button
>
</el-form-item>
</el-form-item>
</el-form>
</el-form>
<el-table
<el-table
...
@@ -229,7 +229,7 @@
...
@@ -229,7 +229,7 @@
</el-table-column>
</el-table-column>
</el-table>
</el-table>
<address-dialog
v-if=
"dialogObj.show"
:dialogObj=
"dialogObj"
@
reflash=
"onUpdateAddress"
></address-dialog>
<address-dialog
v-if=
"dialogObj.show"
:dialogObj=
"dialogObj"
@
reflash=
"onUpdateAddress"
></address-dialog>
<order-dialog
v-if=
"newdialogObj.show"
:newdialogObj=
"newdialogObj"
></order-dialog>
<order-dialog
v-if=
"newdialogObj.show"
:newdialogObj=
"newdialogObj"
@
reflash=
"getOrderList"
></order-dialog>
<refund-dialog
:dialogObj=
"refundDialogObj"
@
reflash=
"onAfterRefund"
@
changeShow=
"changeShow"
></refund-dialog>
<refund-dialog
:dialogObj=
"refundDialogObj"
@
reflash=
"onAfterRefund"
@
changeShow=
"changeShow"
></refund-dialog>
<detail-dialog
:dialogObj=
"dialogDetailObj"
@
changeShow=
"changeDetailShow"
/>
<detail-dialog
:dialogObj=
"dialogDetailObj"
@
changeShow=
"changeDetailShow"
/>
<source-dialog
:dialogObj=
"sourceDialog"
/>
<source-dialog
:dialogObj=
"sourceDialog"
/>
...
@@ -588,7 +588,6 @@
...
@@ -588,7 +588,6 @@
json
.
name
=
name
json
.
name
=
name
}
}
getTeacherListApi
(
json
).
then
(
res
=>
{
getTeacherListApi
(
json
).
then
(
res
=>
{
console
.
log
(
res
.
list
)
this
.
teacherList
=
res
.
list
this
.
teacherList
=
res
.
list
this
.
loading
=
false
this
.
loading
=
false
});
});
...
@@ -597,7 +596,6 @@
...
@@ -597,7 +596,6 @@
console
.
log
(
'handleCurrentTeacherChange'
,
val
)
console
.
log
(
'handleCurrentTeacherChange'
,
val
)
},
},
updateTeacher
(
val
){
updateTeacher
(
val
){
console
.
log
(
val
)
this
.
promoterDialog
.
show
=
true
;
this
.
promoterDialog
.
show
=
true
;
this
.
promoterDialog
.
id
=
val
.
id
;
this
.
promoterDialog
.
id
=
val
.
id
;
this
.
promoterDialog
.
teacher_id
=
val
.
invite_id
;
this
.
promoterDialog
.
teacher_id
=
val
.
invite_id
;
...
...
This diff is collapsed.
Click to expand it.
src/components/monthOrder/newDialog.vue
View file @
b2c4209f
This diff is collapsed.
Click to expand it.
src/components/notBuyClass/entrance.vue
View file @
b2c4209f
...
@@ -96,7 +96,6 @@
...
@@ -96,7 +96,6 @@
getConfigListApi
({
key
:
this
.
searchFrom2
.
key
}).
then
(
res
=>
{
getConfigListApi
({
key
:
this
.
searchFrom2
.
key
}).
then
(
res
=>
{
if
(
res
.
list
&&
res
.
list
.
length
>
0
){
if
(
res
.
list
&&
res
.
list
.
length
>
0
){
// 期数默认配置
// 期数默认配置
// console.log(res.list)
}
else
{
}
else
{
this
.
searchFrom2
.
value
=
''
;
this
.
searchFrom2
.
value
=
''
;
}
}
...
@@ -113,7 +112,6 @@
...
@@ -113,7 +112,6 @@
})
})
},
},
getUser
(
data
){
getUser
(
data
){
console
.
log
(
data
)
if
(
data
.
value
!=
""
){
if
(
data
.
value
!=
""
){
this
.
$confirm
(
'此操作将设置系统指定配置为商品?'
,
'提示'
,
{
this
.
$confirm
(
'此操作将设置系统指定配置为商品?'
,
'提示'
,
{
confirmButtonText
:
'确定'
,
confirmButtonText
:
'确定'
,
...
...
This diff is collapsed.
Click to expand it.
src/components/notBuyClass/index.vue
View file @
b2c4209f
...
@@ -116,7 +116,6 @@ export default {
...
@@ -116,7 +116,6 @@ export default {
json
.
goods_id
=
this
.
searchFrom
.
goods_id
json
.
goods_id
=
this
.
searchFrom
.
goods_id
}
}
getClassConfigApi
(
json
).
then
(
res
=>
{
getClassConfigApi
(
json
).
then
(
res
=>
{
console
.
log
(
res
);
this
.
total
=
res
.
total
;
this
.
total
=
res
.
total
;
this
.
configList
=
res
.
list
;
this
.
configList
=
res
.
list
;
});
});
...
@@ -142,7 +141,6 @@ export default {
...
@@ -142,7 +141,6 @@ export default {
cancelButtonText
:
'取消'
,
cancelButtonText
:
'取消'
,
type
:
'warning'
type
:
'warning'
}).
then
(()
=>
{
}).
then
(()
=>
{
console
.
log
(
id
,
value
)
updateDescApi
({
desc
:
value
},
id
).
then
(
res
=>
{
updateDescApi
({
desc
:
value
},
id
).
then
(
res
=>
{
this
.
$message
({
this
.
$message
({
type
:
'success'
,
type
:
'success'
,
...
...
This diff is collapsed.
Click to expand it.
src/components/order/index.vue
View file @
b2c4209f
...
@@ -28,6 +28,12 @@
...
@@ -28,6 +28,12 @@
<el-form-item
label=
"团ID"
>
<el-form-item
label=
"团ID"
>
<el-input
v-model=
"searchFrom.order_group_id"
></el-input>
<el-input
v-model=
"searchFrom.order_group_id"
></el-input>
</el-form-item>
</el-form-item>
<el-form-item
label=
"是否团长"
>
<el-select
v-model=
"searchFrom.is_captain"
placeholder=
"请选择"
@
change=
"getOrderList"
clearable
>
<el-option
v-for=
"item in isLeaderOption"
:key=
"item.id"
:label=
"item.value"
:value=
"item.id"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item
label=
"购买方式"
>
<el-form-item
label=
"购买方式"
>
<el-select
v-model=
"searchFrom.buy_type"
placeholder=
"请选择"
@
change=
"getOrderList"
clearable
>
<el-select
v-model=
"searchFrom.buy_type"
placeholder=
"请选择"
@
change=
"getOrderList"
clearable
>
<el-option
v-for=
"item in buyTypeOption"
:key=
"item.id"
:label=
"item.value"
:value=
"item.id"
>
<el-option
v-for=
"item in buyTypeOption"
:key=
"item.id"
:label=
"item.value"
:value=
"item.id"
>
...
@@ -51,9 +57,6 @@
...
@@ -51,9 +57,6 @@
<el-button
type=
"primary"
plain
@
click=
"getOrderList"
>
搜索
</el-button>
<el-button
type=
"primary"
plain
@
click=
"getOrderList"
>
搜索
</el-button>
<el-button
type=
"primary"
plain
@
click=
"exportTable"
>
导出
</el-button>
<el-button
type=
"primary"
plain
@
click=
"exportTable"
>
导出
</el-button>
</el-form-item>
</el-form-item>
<el-form-item
style=
"float:right"
>
<!-- <el-button type="success" plain @click="add">新增订单</el-button> -->
</el-form-item>
</el-form>
</el-form>
<el-table
:data=
"tableData"
@
expand-change=
"changeRow"
style=
"width: 100%"
>
<el-table
:data=
"tableData"
@
expand-change=
"changeRow"
style=
"width: 100%"
>
<el-table-column
prop=
"out_trade_no"
label=
"订单号"
>
<el-table-column
prop=
"out_trade_no"
label=
"订单号"
>
...
@@ -111,7 +114,7 @@
...
@@ -111,7 +114,7 @@
</el-table-column>
</el-table-column>
<el-table-column
label=
"实付金额"
width=
"80"
>
<el-table-column
label=
"实付金额"
width=
"80"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
{{
scope
.
row
.
money
|
moneytFilter
}}
{{
scope
.
row
.
money
|
moneytFilter
}}
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
label=
"收货地址"
>
<el-table-column
label=
"收货地址"
>
...
@@ -155,7 +158,6 @@
...
@@ -155,7 +158,6 @@
</el-table-column>
</el-table-column>
</el-table>
</el-table>
<address-dialog
v-if=
"dialogObj.show"
:dialogObj=
"dialogObj"
@
reflash=
"onUpdateAddress"
></address-dialog>
<address-dialog
v-if=
"dialogObj.show"
:dialogObj=
"dialogObj"
@
reflash=
"onUpdateAddress"
></address-dialog>
<order-dialog
v-if=
"newdialogObj.show"
:newdialogObj=
"newdialogObj"
></order-dialog>
<refund-dialog
:dialogObj=
"refundDialogObj"
@
reflash=
"onAfterRefund"
@
changeShow=
"changeShow"
></refund-dialog>
<refund-dialog
:dialogObj=
"refundDialogObj"
@
reflash=
"onAfterRefund"
@
changeShow=
"changeShow"
></refund-dialog>
<detail-dialog
:dialogObj=
"dialogDetailObj"
@
changeShow=
"changeDetailShow"
/>
<detail-dialog
:dialogObj=
"dialogDetailObj"
@
changeShow=
"changeDetailShow"
/>
<source-dialog
:dialogObj=
"sourceDialog"
/>
<source-dialog
:dialogObj=
"sourceDialog"
/>
...
@@ -192,7 +194,6 @@ import {
...
@@ -192,7 +194,6 @@ import {
}
from
"../../service/api"
;
}
from
"../../service/api"
;
import
page
from
"../framework/page"
;
import
page
from
"../framework/page"
;
import
addressDialog
from
"./dialog"
;
import
addressDialog
from
"./dialog"
;
import
orderDialog
from
"./newDialog"
;
import
sourceDialog
from
"./sourceDialog"
;
import
sourceDialog
from
"./sourceDialog"
;
import
refundDialog
from
"./refundDialog"
;
import
refundDialog
from
"./refundDialog"
;
import
couponDialog
from
"./couponDialog"
;
import
couponDialog
from
"./couponDialog"
;
...
@@ -207,7 +208,8 @@ import {
...
@@ -207,7 +208,8 @@ import {
ORDERSTATUSOPTION
,
ORDERSTATUSOPTION
,
INVITETYPEOPTION
,
INVITETYPEOPTION
,
GOODSTYPE
,
GOODSTYPE
,
ISLEADER
ISLEADER
,
ISLEADEROPTION
}
from
"../../util/wordbook"
;
}
from
"../../util/wordbook"
;
import
CommonJs
from
"../../util/common"
;
import
CommonJs
from
"../../util/common"
;
...
@@ -240,15 +242,13 @@ export default {
...
@@ -240,15 +242,13 @@ export default {
goods_id
:
""
,
goods_id
:
""
,
out_trade_no
:
""
,
out_trade_no
:
""
,
payTime
:
[],
payTime
:
[],
order_group_id
:
""
order_group_id
:
""
,
is_captain
:
""
,
},
},
tableData
:
[],
tableData
:
[],
dialogObj
:
{
dialogObj
:
{
show
:
false
show
:
false
},
},
newdialogObj
:
{
show
:
false
},
refundDialogObj
:
{
refundDialogObj
:
{
show
:
false
,
show
:
false
,
id
:
""
,
id
:
""
,
...
@@ -274,7 +274,8 @@ export default {
...
@@ -274,7 +274,8 @@ export default {
teacher_id
:
""
teacher_id
:
""
},
},
teacherList
:
[],
teacherList
:
[],
loading
:
false
loading
:
false
,
isLeaderOption
:
ISLEADEROPTION
,
};
};
},
},
methods
:
{
methods
:
{
...
@@ -325,6 +326,9 @@ export default {
...
@@ -325,6 +326,9 @@ export default {
}
}
if
(
this
.
searchFrom
.
out_trade_no
)
{
if
(
this
.
searchFrom
.
out_trade_no
)
{
json
.
out_trade_no
=
this
.
searchFrom
.
out_trade_no
;
json
.
out_trade_no
=
this
.
searchFrom
.
out_trade_no
;
}
if
(
this
.
searchFrom
.
is_captain
||
this
.
searchFrom
.
is_captain
==
0
)
{
json
.
is_captain
=
this
.
searchFrom
.
is_captain
;
}
}
if
(
this
.
searchFrom
.
receive_mobile
)
{
if
(
this
.
searchFrom
.
receive_mobile
)
{
json
.
receive_mobile
=
this
.
searchFrom
.
receive_mobile
;
json
.
receive_mobile
=
this
.
searchFrom
.
receive_mobile
;
...
@@ -431,6 +435,9 @@ export default {
...
@@ -431,6 +435,9 @@ export default {
if
(
this
.
searchFrom
.
goods_id
)
{
if
(
this
.
searchFrom
.
goods_id
)
{
json
.
goods_id
=
this
.
searchFrom
.
goods_id
;
json
.
goods_id
=
this
.
searchFrom
.
goods_id
;
}
}
if
(
this
.
searchFrom
.
is_captain
||
this
.
searchFrom
.
is_captain
==
0
)
{
json
.
is_captain
=
this
.
searchFrom
.
is_captain
;
}
if
(
this
.
searchFrom
.
out_trade_no
)
{
if
(
this
.
searchFrom
.
out_trade_no
)
{
json
.
out_trade_no
=
this
.
searchFrom
.
out_trade_no
;
json
.
out_trade_no
=
this
.
searchFrom
.
out_trade_no
;
}
}
...
@@ -449,7 +456,6 @@ export default {
...
@@ -449,7 +456,6 @@ export default {
}
}
json
.
course_type
=
1
;
//日课
json
.
course_type
=
1
;
//日课
getOrderListApi
(
json
).
then
(
res
=>
{
getOrderListApi
(
json
).
then
(
res
=>
{
console
.
log
(
res
.
list
);
res
.
list
.
forEach
(
i
=>
{
res
.
list
.
forEach
(
i
=>
{
i
.
refundList
=
[];
i
.
refundList
=
[];
});
});
...
@@ -584,13 +590,10 @@ export default {
...
@@ -584,13 +590,10 @@ export default {
});
});
});
});
},
},
add
()
{
this
.
newdialogObj
.
show
=
true
;
}
},
},
components
:
{
components
:
{
addressDialog
,
addressDialog
,
orderDialog
,
refundDialog
,
refundDialog
,
detailDialog
,
detailDialog
,
refundDetail
,
refundDetail
,
...
@@ -606,11 +609,6 @@ export default {
...
@@ -606,11 +609,6 @@ export default {
this
.
getGoodsOption
();
this
.
getGoodsOption
();
},
},
watch
:
{
watch
:
{
"newdialogObj.show"
:
function
(
val
)
{
if
(
!
val
)
{
this
.
getOrderList
();
}
}
},
},
filters
:
{
filters
:
{
isLeader
(
value
){
isLeader
(
value
){
...
...
This diff is collapsed.
Click to expand it.
src/components/order/newDialog.vue
deleted
100644 → 0
View file @
35e40afd
This diff is collapsed.
Click to expand it.
src/components/shop/dialog.vue
View file @
b2c4209f
...
@@ -8,19 +8,19 @@
...
@@ -8,19 +8,19 @@
<el-form
ref=
"form"
:model=
"form"
label-width=
"100px"
:disabled=
"dialogObj.type === 2"
>
<el-form
ref=
"form"
:model=
"form"
label-width=
"100px"
:disabled=
"dialogObj.type === 2"
>
<el-row>
<el-row>
<el-col
:span=
"12"
>
<el-col
:span=
"12"
>
<el-form-item
label=
"商品名称"
>
<el-form-item
label=
"商品名称"
required
>
<el-input
v-model=
"form.name"
></el-input>
<el-input
v-model=
"form.name"
></el-input>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"12"
>
<el-col
:span=
"12"
>
<el-form-item
label=
"商品描述"
>
<el-form-item
label=
"商品描述"
required
>
<el-input
v-model=
"form.goods_desc.desc"
></el-input>
<el-input
v-model=
"form.goods_desc.desc"
></el-input>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
</el-row>
</el-row>
<el-row>
<el-row>
<el-col
:span=
"12"
>
<el-col
:span=
"12"
>
<el-form-item
label=
"商品类型"
>
<el-form-item
label=
"商品类型"
required
>
<el-select
v-model=
"form.goods_type"
placeholder=
"请选择"
>
<el-select
v-model=
"form.goods_type"
placeholder=
"请选择"
>
<el-option
<el-option
:label=
"'普通商品'"
:label=
"'普通商品'"
...
@@ -46,7 +46,7 @@
...
@@ -46,7 +46,7 @@
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"12"
v-if=
"form.goods_type === 4"
>
<el-col
:span=
"12"
v-if=
"form.goods_type === 4"
>
<el-form-item
label=
"可用商品"
>
<el-form-item
label=
"可用商品"
required
>
<el-select
multiple
v-model=
"goodsYou"
placeholder=
"全部"
>
<el-select
multiple
v-model=
"goodsYou"
placeholder=
"全部"
>
<el-option
v-for=
"data in goodsList"
<el-option
v-for=
"data in goodsList"
:key=
"data.id"
:key=
"data.id"
...
@@ -59,7 +59,7 @@
...
@@ -59,7 +59,7 @@
</el-row>
</el-row>
<el-row
v-if=
"form.goods_type === 3"
>
<el-row
v-if=
"form.goods_type === 3"
>
<el-col
:span=
"12"
>
<el-col
:span=
"12"
>
<el-form-item
label=
"续课已购商品"
>
<el-form-item
label=
"续课已购商品"
required
>
<el-select
v-model=
"goOn_goods_Id.before_goods_id"
placeholder=
"请选择"
>
<el-select
v-model=
"goOn_goods_Id.before_goods_id"
placeholder=
"请选择"
>
<el-option
v-for=
"data in goodsList"
<el-option
v-for=
"data in goodsList"
:key=
"data.id"
:key=
"data.id"
...
@@ -71,7 +71,7 @@
...
@@ -71,7 +71,7 @@
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"12"
>
<el-col
:span=
"12"
>
<el-form-item
label=
"续购商品"
>
<el-form-item
label=
"续购商品"
required
>
<el-select
v-model=
"goOn_goods_Id.after_goods_id"
placeholder=
"请选择"
>
<el-select
v-model=
"goOn_goods_Id.after_goods_id"
placeholder=
"请选择"
>
<el-option
v-for=
"data in goodsList"
<el-option
v-for=
"data in goodsList"
:key=
"data.id"
:key=
"data.id"
...
@@ -84,7 +84,7 @@
...
@@ -84,7 +84,7 @@
</el-row>
</el-row>
<el-row
v-if=
"form.goods_type !== 3 && form.goods_type !== 4 && form.goods_type !== 5"
>
<el-row
v-if=
"form.goods_type !== 3 && form.goods_type !== 4 && form.goods_type !== 5"
>
<el-col
:span=
"12"
>
<el-col
:span=
"12"
>
<el-form-item
label=
"课程类型"
>
<el-form-item
label=
"课程类型"
required
>
<el-select
v-model=
"form.course_type"
placeholder=
"请选择"
@
change=
"changeLessonType()"
>
<el-select
v-model=
"form.course_type"
placeholder=
"请选择"
@
change=
"changeLessonType()"
>
<el-option
<el-option
:label=
"'日课'"
:label=
"'日课'"
...
@@ -98,7 +98,7 @@
...
@@ -98,7 +98,7 @@
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"12"
>
<el-col
:span=
"12"
>
<el-form-item
label=
"课程"
>
<el-form-item
label=
"课程"
required
>
<el-select
v-model=
"form.course_id"
placeholder=
"请选择"
>
<el-select
v-model=
"form.course_id"
placeholder=
"请选择"
>
<el-option
<el-option
v-for=
"data in lessonList"
v-for=
"data in lessonList"
...
@@ -248,7 +248,7 @@
...
@@ -248,7 +248,7 @@
</el-form-item>
</el-form-item>
<el-row>
<el-row>
<el-col
:span=
"24"
>
<el-col
:span=
"24"
>
<el-form-item
label=
"商品详情"
>
<el-form-item
label=
"商品详情"
required
>
<!--
<el-input
type=
"textarea"
:rows=
"25"
v-model=
"form.desc.detail"
></el-input>
-->
<!--
<el-input
type=
"textarea"
:rows=
"25"
v-model=
"form.desc.detail"
></el-input>
-->
<editor-detail
:lookData=
"form.desc"
/>
<editor-detail
:lookData=
"form.desc"
/>
</el-form-item>
</el-form-item>
...
@@ -256,7 +256,7 @@
...
@@ -256,7 +256,7 @@
</el-row>
</el-row>
<el-row>
<el-row>
<el-col
:span=
"24"
>
<el-col
:span=
"24"
>
<el-form-item
label=
"购买须知"
>
<el-form-item
label=
"购买须知"
required
>
<!--
<el-input
type=
"textarea"
:rows=
"25"
v-model=
"form.desc.qa"
></el-input>
-->
<!--
<el-input
type=
"textarea"
:rows=
"25"
v-model=
"form.desc.qa"
></el-input>
-->
<editor-know
:lookData1=
"form.desc"
/>
<editor-know
:lookData1=
"form.desc"
/>
</el-form-item>
</el-form-item>
...
...
This diff is collapsed.
Click to expand it.
src/components/smsRecord/index.vue
View file @
b2c4209f
...
@@ -139,7 +139,6 @@
...
@@ -139,7 +139,6 @@
json
.
mobile
=
this
.
searchFrom
.
mobile
json
.
mobile
=
this
.
searchFrom
.
mobile
}
}
getsmsRecordApi
(
json
).
then
((
res
)
=>
{
getsmsRecordApi
(
json
).
then
((
res
)
=>
{
console
.
log
(
res
.
list
)
this
.
total
=
res
.
total
;
this
.
total
=
res
.
total
;
this
.
list
=
res
.
list
?
res
.
list
:
[]
this
.
list
=
res
.
list
?
res
.
list
:
[]
})
})
...
...
This diff is collapsed.
Click to expand it.
src/components/yunji/index.vue
View file @
b2c4209f
...
@@ -52,7 +52,7 @@
...
@@ -52,7 +52,7 @@
<el-form-item>
<el-form-item>
<el-button
type=
"primary"
@
click=
"getList"
>
搜索
</el-button>
<el-button
type=
"primary"
@
click=
"getList"
>
搜索
</el-button>
<el-button
type=
"primary"
plain
@
click=
"exportTable(list)"
>
导出
</el-button>
<el-button
type=
"primary"
plain
@
click=
"exportTable(list)"
>
导出
</el-button>
<el-button
type=
"success"
plain
@
click=
"classListOption()"
>
同步进度
</el-button>
<el-button
type=
"success"
plain
@
click=
"classListOption()"
>
当前
同步进度
</el-button>
</el-form-item>
</el-form-item>
</el-form>
</el-form>
<el-table
:data=
"list"
style=
"width: 100%"
>
<el-table
:data=
"list"
style=
"width: 100%"
>
...
@@ -156,7 +156,7 @@ export default {
...
@@ -156,7 +156,7 @@ export default {
goodList
:
[],
goodList
:
[],
classObj
:{
classObj
:{
show
:
false
,
show
:
false
,
title
:
"同步进度"
,
title
:
"
当前
同步进度"
,
order_id
:
0
,
order_id
:
0
,
teacher_id
:
0
teacher_id
:
0
},
},
...
@@ -244,11 +244,6 @@ export default {
...
@@ -244,11 +244,6 @@ export default {
getyunjiApi
(
json
).
then
(
res
=>
{
getyunjiApi
(
json
).
then
(
res
=>
{
this
.
total
=
res
.
total
;
this
.
total
=
res
.
total
;
this
.
list
=
res
.
list
?
res
.
list
:
[];
this
.
list
=
res
.
list
?
res
.
list
:
[];
console
.
log
(
res
)
this
.
classList
=
res
.
teacher
;
if
(
res
.
last_pull_time
){
this
.
last_pull_time
=
res
.
last_pull_time
;
}
});
});
},
},
getGoodsOption
()
{
getGoodsOption
()
{
...
@@ -314,6 +309,12 @@ export default {
...
@@ -314,6 +309,12 @@ export default {
},
},
classListOption
()
{
classListOption
()
{
this
.
classObj
.
show
=
true
;
this
.
classObj
.
show
=
true
;
getyunjiApi
({
page
:
1
,
limit
:
200
}).
then
(
res
=>
{
this
.
classList
=
res
.
teacher
;
if
(
res
.
last_pull_time
){
this
.
last_pull_time
=
res
.
last_pull_time
;
}
});
}
}
}
}
};
};
...
...
This diff is collapsed.
Click to expand it.
src/util/wordbook.js
View file @
b2c4209f
...
@@ -133,4 +133,15 @@ export const QRSTATUS = {
...
@@ -133,4 +133,15 @@ export const QRSTATUS = {
export
const
ISLEADER
=
{
export
const
ISLEADER
=
{
0
:
'否'
,
0
:
'否'
,
1
:
'是'
1
:
'是'
}
}
\ No newline at end of file
export
const
ISLEADEROPTION
=
[
{
id
:
0
,
value
:
'否'
},
{
id
:
1
,
value
:
'是'
},
];
\ No newline at end of file
This diff is collapsed.
Click to expand it.
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