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
c7cb6239
Commit
c7cb6239
authored
Sep 19, 2021
by
beisir
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat:我的订单到详情页
parent
f586fa06
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
52 additions
and
40 deletions
+52
-40
groupSwiper.vue
src/components/groupSwiper.vue
+6
-12
validation.service.js
src/service/validation.service.js
+5
-2
goodsCard.vue
src/views/goodsList/components/goodsCard.vue
+1
-1
index.vue
src/views/goodsList/index.vue
+11
-2
List.vue
src/views/orderList/components/List.vue
+28
-22
index.vue
src/views/orderList/index.vue
+1
-1
No files found.
src/components/groupSwiper.vue
View file @
c7cb6239
<
template
>
<div
class=
"avator-swiper"
@
click=
"onSlidePrevChange"
>
<div
class=
"avator-swiper"
>
<swiper
ref=
"mySwiper"
:options=
"swiperOptions"
class=
"avator-swiper_container"
>
<swiper-slide
v-for=
"(item, index) in avatorData"
...
...
@@ -79,21 +79,15 @@ export default {
return
this
.
$refs
.
mySwiper
.
swiper
;
}
},
watch
:
{
avatorData
()
{
clearInterval
(
this
.
timer
);
this
.
onSlidePrevChange
();
}
},
mounted
()
{
this
.
onSlidePrevChange
();
},
beforeDestroy
()
{
this
.
swiper
.
destroy
(
true
);
clearInterval
(
this
.
timer
);
// this.onSlidePrevChange();
},
// beforeDestroy() {
// this.swiper.destroy(true);
// },
methods
:
{
onSlidePrevChange
()
{
this
.
timer
&&
clearInterval
(
this
.
timer
);
this
.
timer
=
setInterval
(()
=>
{
this
.
$emit
(
'
animation-event-start
'
);
this
.
swiper
.
slidePrev
();
...
...
src/service/validation.service.js
View file @
c7cb6239
...
...
@@ -289,10 +289,10 @@ export const isWechat = ua.match(/MicroMessenger/i) == "micromessenger";
export
const
isWxMp
=
ua
.
match
(
/miniProgram/i
)
==
'
miniprogram
'
;
// 判断羊小咩(信用钱包)环境
export
const
isApp
=
ua
.
match
(
/xyqb/i
)
==
"
xyqb
"
;
export
const
isApp
=
ua
.
match
(
/xyqb/i
)
==
"
xyqb
"
;
// 判断真享生活
export
const
isVcc
=
ua
.
match
(
/VCC/i
)
==
"
vcc
"
;
export
const
isVcc
=
ua
.
match
(
/VCC/i
)
==
"
vcc
"
;
// 判断IOS环境
export
const
isIOS
=
/iphone|ipad|ipod/
.
test
(
ua
);
...
...
@@ -303,6 +303,9 @@ export const isAndroid = /android/.test(ua);
// 判断
export
const
appVersion
=
ua
.
match
(
/xyqb
\/([\d
|.
]
+
)
/
);
// 判断羊小咩环境
export
const
isXyqb
=
ua
.
match
(
/xyqb/i
)
==
"
xyqb
"
;
export
const
isQQ
=
ua
.
match
(
/QQ/i
)
==
'
qq
'
;
export
const
isWeiBo
=
ua
.
match
(
/Weibo/i
)
==
'
weibo
'
;
...
...
src/views/goodsList/components/goodsCard.vue
View file @
c7cb6239
...
...
@@ -156,7 +156,7 @@ export default {
border-radius: 6px;
overflow: hidden;
position: relative;
padding: 3px;
//
padding: 3px;
margin-right: 8px;
.cr-image {
width: 100%;
...
...
src/views/goodsList/index.vue
View file @
c7cb6239
...
...
@@ -18,7 +18,8 @@
</div>
<div
class=
"group-portrait-ul"
>
<groupSwiper
v-if=
"topicCfg.groupBuyUserInfoList"
v-if=
"showLoops"
ref=
"swipeRota"
:avator-data=
"topicCfg.groupBuyUserInfoList"
@
animation-event-start=
"animationEventStart"
@
animation-event-end=
"animationEventEnd"
...
...
@@ -92,7 +93,6 @@ export default {
data
()
{
return
{
showShare
:
false
,
avatorData
:
[],
animate
:
{
...
...
@@ -104,6 +104,7 @@ export default {
},
showSwipe
:
false
,
showLoops
:
false
,
customers
:
{},
// goodsSpecialId 是
...
...
@@ -169,7 +170,15 @@ export default {
}
}
},
deactivated
()
{
clearTimeout
(
this
.
$refs
.
swipeRota
.
timer
);
this
.
showLoops
=
false
;
},
activated
()
{
this
.
showLoops
=
true
;
this
.
$nextTick
(()
=>
{
this
.
$refs
.
swipeRota
.
onSlidePrevChange
();
});
// this.topicIndex = topicIndex;
// this.setTitleColor(this.topicCfg.bgcolor);
// store.commit('changeTitle', this.topicCfg.title || '活动页');
...
...
src/views/orderList/components/List.vue
View file @
c7cb6239
...
...
@@ -74,6 +74,9 @@ import ListItem from './ListItem.vue';
const
EVENT_LOADING
=
'
load
'
;
const
EVENT_CLICK
=
'
option-click
'
;
import
countDown
from
'
@/components/countDown
'
;
import
{
isWxMp
,
isApp
}
from
'
@/service/validation.service
'
;
import
Bridge
from
'
@qg/js-bridge
'
;
import
MpBridge
from
'
@/service/mp
'
;
export
default
{
name
:
'
OrderSkuList
'
,
components
:
{
...
...
@@ -90,6 +93,7 @@ export default {
},
data
()
{
return
{
nativeBridge
:
null
,
gpCountDown
:
new
Date
(
'
2021-09-12 00:00:00
'
).
getTime
(),
listLoading
:
false
,
...
...
@@ -123,31 +127,21 @@ export default {
this
.
listFinished
=
val
;
}
},
created
()
{
if
(
isApp
)
this
.
nativeBridge
=
new
Bridge
();
else
if
(
isWxMp
)
this
.
nativeBridge
=
new
MpBridge
();
},
methods
:
{
goGroupDetails
(
goodsItem
)
{
const
{
skuNo
,
goodsSpecialId
,
activityTemplateInfoId
,
activityTemplateDetailId
,
activityInfoId
}
=
goodsItem
;
this
.
$router
.
push
({
paht
:
'
/groupBuy/skuInfoSmallPic
'
,
query
:
{
h
:
0
,
skuNo
,
goodsSpecialId
,
activityId
:
activityInfoId
,
templateId
:
activityTemplateInfoId
,
templateDetailId
:
activityTemplateDetailId
}
goGroupDetails
(
skuInfo
)
{
this
.
nativeBridge
.
openNewUrl
({
newUrl
:
`/pages/order/orderDetail?orderNo=
${
skuInfo
.
orderNo
}
`
});
},
async
openShareEvent
(
skuInfo
)
{
let
options
=
await
this
.
getShareData
(
skuInfo
);
this
.
$store
.
dispatch
(
'
goods_share_open
'
,
options
);
this
.
goGroupDetails
(
skuInfo
);
// let options = await this.getShareData(skuInfo);
// this.$store.dispatch('goods_share_open', options);
},
async
getShareData
(
skuInfo
)
{
return
Promise
.
resolve
({
...
...
@@ -158,8 +152,20 @@ export default {
});
// await
},
toDetail
(
order
)
{
this
.
$router
.
push
({
path
:
'
/orderDetail
'
,
query
:
{
orderNo
:
order
.
orderNo
}
});
toDetail
(
goodsItem
)
{
const
{
skuNo
,
skuList
,
activityInfoId
,
activityHundredGroupId
}
=
goodsItem
;
this
.
$router
.
push
({
path
:
'
/groupBuy/skuInfoSmallPic
'
,
query
:
{
h
:
0
,
skuNo
,
activityHundredGroupId
,
goodsSpecialId
:
skuList
[
0
].
goodsSpecialId
,
activityId
:
activityInfoId
,
templateId
:
skuList
[
0
].
activityTemplateInfoId
,
templateDetailId
:
skuList
[
0
].
activityTemplateDetailId
}
});
},
onLoad
()
{
this
.
$emit
(
EVENT_LOADING
);
...
...
src/views/orderList/index.vue
View file @
c7cb6239
...
...
@@ -253,7 +253,7 @@ export default {
pageSize
,
status
});
console
.
log
(
res
.
records
);
//
console.log(res.records);
if
(
res
?.
records
?.
length
)
{
this
.
setNavListData
(
'
loading
'
,
false
);
list
=
[...
list
,
...
res
.
records
];
...
...
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