Commit c9044292 authored by 徐光星's avatar 徐光星

Merge branch 'feat/group-buy' into 'master'

fix: code review

See merge request !9
parents 8bd68191 03c424b5
...@@ -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) {
......
...@@ -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);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment