jufubao-admin-library 1.1.146 → 1.1.148

package/library/viewModules/viewTask/viewTask/list.vue

@@ -63,6 +63,8 @@ import XdPagination from "@/components/XdPagination.vue"
 import XdTable from "@/components/XdTable"
 import XdSearch from "@/components/XdSearch"
 import downloadJs from "downloadjs";
+import {isPlatform} from "@/utils/xd.base";
+
 import {
   mapActions,
   mapState,
@@ -294,6 +296,50 @@ export default {
       ];
     },
 
+    downLoadPdf(url,file_name,file_ext, loading){
+      let filename = `${file_name}.${file_ext}`;
+      let userAgent = window.navigator.userAgent;
+
+      //safari浏览器走访问模式，手机端和百度浏览器
+      //360，baidu,qq,chrome (下载正常)
+      if(!isPlatform().isPc || /^.+(baidu)/i.test(userAgent)) {
+        //alert('!isPC');
+        loading.close();
+        const link = document.createElement('a');
+        link.href = url;
+        link.download = filename;
+        document.body.appendChild(link);
+        link.click();
+        document.body.removeChild(link);
+        return
+      }
+
+      //360浏览器，safari，遨游（直接打开，无法下载）-- PC
+      let x = new XMLHttpRequest();
+      x.open("GET", url, true);
+      x.responseType = "blob";
+      x.onload = (e) => {
+        console.log('XMLHttpRequest',e);
+        if (e.target['status'] === 200) {
+          downloadJs(e.target.response, filename, 'application/pdf');
+          loading.close()
+        } else if (e.target['status'] === 404) {
+          console.error('error', e);
+          loading.close()
+        } else {
+          console.error('error', e);
+          loading.close()
+        }
+      };
+      x.onerror = (e) => {
+        console.log('onerror')
+        console.log('error', e);
+        loading.close()
+      }
+      x.send();
+
+    },
+
     /**
      *按钮操作
      **/
@@ -321,7 +367,9 @@ export default {
         let loading = this.$loading({})
         this.getDownloadUrl({serial_no})
           .then(res=>{
-            let download_url = ''
+            let download_url = '';
+            let userAgent = window.navigator.userAgent;
+
             //#ifdef partner-site
             if(res['download_url']) {
               download_url = res['download_url']
@@ -333,10 +381,27 @@ export default {
             }
             // #endif
 
+            //打印userAgent
             if(window.location.href.indexOf('UA=1') !== -1) {
-              alert(window.navigator.userAgent);
+              alert(userAgent);
             }
-            let userAgent = window.navigator.userAgent;
+
+            let filename = `${file_name}.${file_ext}`;
+            const link = document.createElement('a');
+            link.href = download_url;
+            link.download = filename;
+            document.body.appendChild(link);
+            link.click();
+            document.body.removeChild(link);
+            loading.close();
+            return
+
+            //pdf下载
+            if(/^.+(\.pdf)$/.test(download_url.split('?')[0])){
+              this.downLoadPdf(download_url,file_name,file_ext,loading);
+              return;
+            }
+
             let reg = /^.+(baidu|UCBrowser)/i;
             if(reg.test(userAgent)) {
               window.location.href = download_url;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-admin-library",
-  "version": "1.1.146",
+  "version": "1.1.148",
   "description": "聚福宝福利后台管理系统公共模块",
   "author": "goashiyong <gaoshiyong1272@vip.163.com>",
   "scripts": {