Merge branch 'liuin' into develop

config/index.js

@@ -28,12 +28,12 @@ module.exports = {
     assetsSubDirectory: 'static',
     assetsPublicPath: '/',
     proxyTable: {
-      '/xcmg_file': {
-      target: 'http://lichee.iask.in',
-      changeOrigin: true,
-      pathRewrite: {
-        '^/xcmg_file': '/xcmg_file'
-      }
+      // '/xcmg_file': {
+      // target: 'http://lichee.iask.in',
+      // changeOrigin: true,
+      // pathRewrite: {
+      //   '^/xcmg_file': '/xcmg_file'
+      // }
     },
   },
 

src/pages/invoice/invoice.vue

@@ -19,8 +19,9 @@
               <span class="number-left">发票号码 {{ list.invoice_no }}</span>
               <div class="number-right">
                 <img src="@/assets/invoice/download.png">
-                <span class="invoice-download" @click="downLoad(list.file_url)">发票下载</span>
-                <!-- <a href="https://180.104.121.66:8090/dump_dir/032001700611_84582415.pdf">发票下载</a> -->
+                <!-- <span class="invoice-download" @click="downLoad(list.file_url)">发票下载</span> -->
+                <!-- <a href="http://180.104.121.66:8090/dump_dir/032001700611_84582415.pdf" download="http://180.104.121.66:8090/dump_dir/032001700611_84582415.pdf">pdf</a> -->
+                <a :href="list.file_url" download="电子发票.pdf">发票下载</a>
               </div>
             </div>
           </div>