Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
group-buy-ui
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
ui
group-buy-ui
Commits
c108048c
Commit
c108048c
authored
Sep 22, 2021
by
beisir
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat:测试列表
parent
65690df2
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
8 deletions
+12
-8
goodsCard.vue
src/views/goodsList/components/goodsCard.vue
+9
-3
index.vue
src/views/goodsList/index.vue
+1
-3
List.vue
src/views/orderList/components/List.vue
+1
-1
extends.js
src/views/pay/extends.js
+1
-1
No files found.
src/views/goodsList/components/goodsCard.vue
View file @
c108048c
...
...
@@ -91,7 +91,7 @@ export default {
const
{
skuNo
,
goodsSpecialId
,
activityTemplateI
nfoI
d
,
activityTemplateId
,
activityTemplateDetailId
,
activityInfoId
}
=
this
.
goodsItem
;
...
...
@@ -101,6 +101,12 @@ export default {
return
;
}
if
(
s
===
2
)
{
// skuNo=2305164578817
// goodsSpecialId=59
// activityId=47
// templateId=58
// templateDetailId=83
this
.
$router
.
push
({
path
:
'
/groupBuy/skuInfo
'
,
query
:
{
...
...
@@ -108,7 +114,7 @@ export default {
skuNo
,
goodsSpecialId
,
activityId
:
activityInfoId
,
templateId
:
activityTemplateI
nfoI
d
,
templateId
:
activityTemplateId
,
templateDetailId
:
activityTemplateDetailId
}
});
...
...
@@ -116,7 +122,7 @@ export default {
return
false
;
}
this
.
$dialog
({
message
:
'
请在微信小程序中参与此活动哦
~
'
,
message
:
'
该活动已结束
~
'
,
confirmButtonText
:
s
===
3
?
'
重新选择
'
:
'
订阅消息
'
,
onConfirm
:
()
=>
{
// todo 跳转到小程序
...
...
src/views/goodsList/index.vue
View file @
c108048c
...
...
@@ -259,9 +259,7 @@ export default {
if
(
res
.
size
)
{
this
.
loading
=
false
;
this
.
showLoading
=
false
;
// res.items[5].goodsCount = 0;
this
.
goodsList
=
res
.
items
||
[];
console
.
log
(
this
.
goodsList
,
'
this.goodsList
'
);
if
(
!
res
.
hasNext
)
{
this
.
finished
=
true
;
}
else
{
...
...
@@ -298,7 +296,7 @@ async function getActivityList(urlQuery, next) {
t
.
hasStart
=
handleRemainTime
(
startTime
,
''
)[
0
]
>
0
;
t
=
{
...
t
,
...
handleDateFormat
(
startTime
,
endTime
)
};
t
.
stateTxt
=
!
t
.
hasStart
?
'
即将开始
'
:
t
.
hasStop
?
'
活动已结束
'
:
'
距结束
'
;
t
.
groupBuyUserInfoList
=
t
.
groupBuyUserInfoList
.
reverse
();
const
{
title
}
=
t
;
store
.
commit
(
'
CHANGE_TITLE
'
,
title
||
'
活动页
'
);
nextFns
(
vm
=>
{
...
...
src/views/orderList/components/List.vue
View file @
c108048c
...
...
@@ -128,7 +128,7 @@ export default {
3
:
{
class
:
'
Ol__head-fail
'
,
message
:
'
拼团失败
'
,
footTxt
:
'
0元拿商品,退款将原路返还
'
footTxt
:
'
退款将原路返还,请注意帐户变动
'
}
}
};
...
...
src/views/pay/extends.js
View file @
c108048c
...
...
@@ -21,7 +21,7 @@ export const goUrlExtends = {
});
}
setTimeout
(()
=>
{
this
.
$router
.
replace
({
name
:
'
orderList
'
,
params
:
{
stat
e
:
0
}
});
this
.
$router
.
replace
({
name
:
'
orderList
'
,
params
:
{
stat
us
:
0
}
});
},
500
);
},
goOrderDetail
()
{
...
...
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