diff --git a/pages/index/searchbar/detail/index.js b/pages/index/searchbar/detail/index.js index 34d5db1..910b839 100644 --- a/pages/index/searchbar/detail/index.js +++ b/pages/index/searchbar/detail/index.js @@ -1,11 +1,7 @@ const Http = require("../../../../utils/HttpBasics"); const imgurl = require("../../../../utils/imgurl"); const config = require("../../../../config/config"); -const extConfig = wx.getExtConfigSync ? wx.getExtConfigSync() : {} -let imgOrgUrl = extConfig.attr.imgOrgUrl; -let imgOrgUrl1 = extConfig.attr.imgOrgUrl1; -let imgNewUrl = extConfig.attr.imgNewUrl; -let imgNewUrl1 = extConfig.attr.imgNewUrl1; +const util = require("../../../../utils/util"); let app = getApp(); Page({ @@ -89,7 +85,7 @@ Page({ // 首先要绘制顶部的背景图片,因为它在最底层,然后才能绘制其他内容 // 绘制背景图 let bgimg1 = this.data.poterbg + `?imageView/2/w/${wW}/h/${wH}` - let bgimg2 = bgimg1.replace(this.getimgurl(this.data.poterbg), this.getnewimgurl(this.data.poterbg)) + let bgimg2 = util.getProxyImgUrl(bgimg1) wx.getImageInfo({ src: bgimg2, success: function(res) { @@ -118,7 +114,7 @@ Page({ let topImageWidth = parseInt(315 * scale) // 因为小数有时候会请求不到图片,所以转成int let topImageHeight = parseInt(200 * scale) let src1 = this.data.data.merchantImgUrl + `?imageView/2/w/${topImageWidth}/h/${topImageHeight}` - let src2 = src1.replace(this.getimgurl(this.data.data.merchantImgUrl), this.getnewimgurl(this.data.data.merchantImgUrl)) + let src2 = util.getProxyImgUrl(src1) wx.getImageInfo({ src: src2, success: function(res) { @@ -174,14 +170,6 @@ Page({ ctx.draw(true) }, - //判断图片路径 - getimgurl(str){ - if(str.indexOf(imgOrgUrl)!=-1){ - return imgOrgUrl - }else if(str.indexOf(imgOrgUrl1)!=-1){ - return imgOrgUrl1; - } - }, // getnewimgurl(str){ if(str.indexOf(imgOrgUrl)!=-1){ @@ -204,7 +192,7 @@ Page({ for (let i = 0; i < that.data.couponList.length; i++) { let imageItem = that.data.couponList[i].coverImg let src1 = imageItem + `?imageView/2/w/${cotentImageWidth}/h/${cotentImageHeight}` - let src2 = src1.replace(this.getimgurl(imageItem), this.getnewimgurl(imageItem)) + let src2 = util.getProxyImgUrl(src1) wx.getImageInfo({ src: src2, success: function(res) { @@ -221,7 +209,7 @@ Page({ let coImageWidth = parseInt(120 * scale) let coImageHeight = parseInt(120 * scale) let src1 = this.data.qrCode + `?imageView/2/w/${coImageWidth}/h/${coImageHeight}` - let src2 = src1.replace(this.getimgurl(this.data.qrCode), this.getnewimgurl(this.data.qrCode)) + let src2 = util.getProxyImgUrl(src1) wx.getImageInfo({ src: src2, success: function(res) { diff --git a/utils/util.js b/utils/util.js index cbee0bd..373748b 100644 --- a/utils/util.js +++ b/utils/util.js @@ -1,6 +1,12 @@ var barcode = require("./barcode"); var qrcode = require("./qrcode"); +const extConfig = wx.getExtConfigSync ? wx.getExtConfigSync() : {} +let imgOrgUrl = extConfig.attr.imgOrgUrl; +let imgOrgUrl1 = extConfig.attr.imgOrgUrl1; +let imgNewUrl = extConfig.attr.imgNewUrl; +let imgNewUrl1 = extConfig.attr.imgNewUrl1; + const formatTime = (date, fmt) => { try { if (!date) { @@ -148,12 +154,21 @@ function isJSON(str) { }) } } +function getProxyImgUrl(str) { + if (str.indexOf(imgOrgUrl) == 0) { + return str.replace(imgOrgUrl, imgNewUrl) + } else if(str.indexOf(imgOrgUrl1) == 0) { + return str.replace(imgOrgUrl1, imgNewUrl1) + } + return str +} module.exports = { formatTime: formatTime, barcode: barc, qrcode: qrc, isJSON: isJSON, fmtDate: fmtDate, - timechuo:timechuo, - timecha:timecha + timechuo: timechuo, + timecha: timecha, + getProxyImgUrl: getProxyImgUrl };