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
c9044292
Commit
c9044292
authored
Oct 18, 2021
by
徐光星
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feat/group-buy' into 'master'
fix: code review See merge request
!9
parents
8bd68191
03c424b5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
34 additions
and
41 deletions
+34
-41
index.vue
src/views/goodsDetail/index.vue
+17
-20
smallPic.vue
src/views/goodsDetail/smallPic.vue
+17
-21
No files found.
src/views/goodsDetail/index.vue
View file @
c9044292
...
@@ -427,27 +427,24 @@ export default {
...
@@ -427,27 +427,24 @@ export default {
this
.
detailInfo
=
res
;
this
.
detailInfo
=
res
;
this
.
setStartStatus
(
res
);
this
.
setStartStatus
(
res
);
this
.
showPage
=
true
;
this
.
showPage
=
true
;
try
{
this
.
detailInfo
.
contentDetailUrl
=
this
.
detailInfo
.
contentDetailUrl
.
replace
(
this
.
detailInfo
.
contentDetailUrl
=
this
.
detailInfo
.
contentDetailUrl
.
replace
(
'
http://
'
,
'
http://
'
,
'
https://
'
'
https://
'
);
);
const
detailImages
=
await
goods
.
getDetailPic
(
this
.
detailInfo
.
contentDetailUrl
);
const
detailImages
=
await
goods
.
getDetailPic
(
this
.
detailInfo
.
contentDetailUrl
);
// const imgReg = new RegExp('(?
<=
src
=
"
).[^
"
]
*
'
,
'
g
'
);
// const imgReg = new RegExp('(?
<=
src
=
"
).[^
"
]
*
'
,
'
g
'
);
// this.detailImgList = (detailImages ||
''
).match(imgReg);
// this.detailImgList = (detailImages ||
''
).match(imgReg);
let imgReg = /<img.*?(?:>|
\
/>)/gi;
let imgReg = /<img.*?(?:>|
\
/>)/gi;
// eslint-disable-next-line no-useless-escape
// eslint-disable-next-line no-useless-escape
let srcReg = /src=[
\'
"]?([^
\'
"]*)[
\'
"]?/i;
let srcReg = /src=[
\'
"]?([^
\'
"]*)[
\'
"]?/i;
let arr = (detailImages ||
''
).match(imgReg);
let arr = (detailImages ||
''
).match(imgReg);
let srcArr = [];
let srcArr = [];
for (let i = 0; i < arr.length; i++) {
for (let i = 0; i < arr.length; i++) {
let src = arr[i].match(srcReg)[1].replace(
'
http
:
//', 'https://');
let src = arr[i].match(srcReg)[1].replace(
'
http
:
//', 'https://');
srcArr
.
push
(
src
);
srcArr
.
push
(
src
);
}
this
.
detailImgList
=
srcArr
;
}
catch
(
error
)
{
console
.
error
(
error
);
}
}
this
.
detailImgList
=
srcArr
;
this
.
selectedGoods
.
skuId
=
this
.
detailInfo
.
skuNo
;
this
.
selectedGoods
.
skuId
=
this
.
detailInfo
.
skuNo
;
if
(
res
.
activitySkuTotalCount
===
0
)
{
if
(
res
.
activitySkuTotalCount
===
0
)
{
...
...
src/views/goodsDetail/smallPic.vue
View file @
c9044292
...
@@ -239,28 +239,24 @@ export default {
...
@@ -239,28 +239,24 @@ export default {
this
.
imgList
=
res
.
imageUrl
||
[];
this
.
imgList
=
res
.
imageUrl
||
[];
this
.
detailInfo
=
res
;
this
.
detailInfo
=
res
;
this
.
setStartStatus
(
res
);
this
.
setStartStatus
(
res
);
try
{
this
.
detailInfo
.
contentDetailUrl
=
this
.
detailInfo
.
contentDetailUrl
.
replace
(
this
.
detailInfo
.
contentDetailUrl
=
this
.
detailInfo
.
contentDetailUrl
.
replace
(
'
http://
'
,
'
http://
'
,
'
https://
'
'
https://
'
);
);
const
detailImages
=
await
goods
.
getDetailPic
(
this
.
detailInfo
.
contentDetailUrl
);
const
detailImages
=
await
goods
.
getDetailPic
(
this
.
detailInfo
.
contentDetailUrl
);
console
.
log
(
detailImages
);
console
.
log
(
detailImages
);
// const imgReg = new RegExp('(?
<=
src
=
"
).[^
"
]
*
'
,
'
g
'
);
// const imgReg = new RegExp('(?
<=
src
=
"
).[^
"
]
*
'
,
'
g
'
);
// this.detailImgList = (detailImages ||
''
).match(imgReg);
// this.detailImgList = (detailImages ||
''
).match(imgReg);
let imgReg = /<img.*?(?:>|
\
/>)/gi;
let imgReg = /<img.*?(?:>|
\
/>)/gi;
// eslint-disable-next-line no-useless-escape
// eslint-disable-next-line no-useless-escape
let srcReg = /src=[
\'
"]?([^
\'
"]*)[
\'
"]?/i;
let srcReg = /src=[
\'
"]?([^
\'
"]*)[
\'
"]?/i;
let arr = (detailImages ||
''
).match(imgReg);
let arr = (detailImages ||
''
).match(imgReg);
let srcArr = [];
let srcArr = [];
for (let i = 0; i < arr.length; i++) {
for (let i = 0; i < arr.length; i++) {
let src = arr[i].match(srcReg)[1].replace(
'
http
:
//', 'https://');
let src = arr[i].match(srcReg)[1].replace(
'
http
:
//', 'https://');
srcArr
.
push
(
src
);
srcArr
.
push
(
src
);
}
this
.
detailImgList
=
srcArr
;
}
catch
(
error
)
{
console
.
error
(
error
);
}
}
this
.
detailImgList
=
srcArr
;
}
catch
(
e
)
{
}
catch
(
e
)
{
console
.
log
(
e
);
console
.
log
(
e
);
}
}
...
...
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