diff --git a/mp-cu/colorUI/components/ui-swiper/ui-swiper.js b/mp-cu/colorUI/components/ui-swiper/ui-swiper.js index 1227453be363dbf24b5fd6db628d3e2f6282633d..6785eae50f2b9fa03c9fe6d60652540ed46605f6 100644 --- a/mp-cu/colorUI/components/ui-swiper/ui-swiper.js +++ b/mp-cu/colorUI/components/ui-swiper/ui-swiper.js @@ -87,7 +87,8 @@ Component({ { wx.openEmbeddedMiniProgram({ appId: appid, - path: path + path: path, + allowFullScreen:true }) } diff --git a/pages/about/about.js b/pages/about/about.js index 611d1c066f3f2998483de0ece26ae80958d01b90..737d58eb584633a48ed9e07727e4c27aef2ecb5a 100644 --- a/pages/about/about.js +++ b/pages/about/about.js @@ -149,7 +149,7 @@ Page({ let isDoc = /\.(doc|docx|xls|xlsx|ppt|pptx|pdf)$/.test(href) if (isDoc) { - this.openLinkDoc(e) + this.openLinkDoc(e.detail) return } @@ -287,7 +287,7 @@ Page({ let fileType // 如果是a标签href中插入的文档 - let src = e.currentTarget.dataset.src + let src = e.src || e.href var n=0; for (var i = 0; i < self.data.downloadFileDomain.length; i++) { @@ -310,8 +310,8 @@ Page({ url = src fileType = /doc|docx|xls|xlsx|ppt|pptx|pdf$/.exec(src)[0] } else { - url = e.currentTarget.dataset.filelink - fileType = e.currentTarget.dataset.filetype + url = e.filelink || e.href + fileType = e.filetype } wx.downloadFile({ diff --git a/pages/detail/detail.js b/pages/detail/detail.js index 54e2aa772aab20d246386abf688b8a605c4f0c3a..bf8ec44bd0d93d1c7636e9c3ea25da64992abb28 100644 --- a/pages/detail/detail.js +++ b/pages/detail/detail.js @@ -668,7 +668,7 @@ Page({ let isDoc = /\.(doc|docx|xls|xlsx|ppt|pptx|pdf)$/.test(href) if (isDoc) { - this.openLinkDoc(e) + this.openLinkDoc(e.detail) return } @@ -697,7 +697,8 @@ Page({ { wx.openEmbeddedMiniProgram({ appId: appid, - path: path + path: path, + allowFullScreen:true }) } @@ -816,7 +817,7 @@ Page({ let fileType // 如果是a标签href中插入的文档 - let src = e.currentTarget.dataset.src + let src = e.src || e.href var n=0; for (var i = 0; i < self.data.downloadFileDomain.length; i++) { @@ -839,8 +840,8 @@ Page({ url = src fileType = /doc|docx|xls|xlsx|ppt|pptx|pdf$/.exec(src)[0] } else { - url = e.currentTarget.dataset.filelink - fileType = e.currentTarget.dataset.filetype + url = e.filelink || e.href + fileType = e.filetype } wx.downloadFile({