Browse Source

no message

aXin-0810 1 year ago
parent
commit
d76f8d20bf
3 changed files with 17 additions and 12 deletions
  1. 2 3
      src/api/setActivity.js
  2. 2 2
      src/utils/request.js
  3. 13 7
      src/views/mallManagement/setActivity/formModule.vue

+ 2 - 3
src/api/setActivity.js

@@ -49,9 +49,8 @@ export function promotionQuestionnaireShow(params) {
 }
 
 export function promotionQuestionnaireDownload(params) {
-  return request({
-    url: '/promotion/questionnaire/download',
-    method: 'get',
+  return getBlob({
+    url: 'promotion/questionnaire/download',
     params
   })
 }

+ 2 - 2
src/utils/request.js

@@ -76,7 +76,7 @@ service.interceptors.response.use(
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
-          window.location.href = window.location.href.split("#")[0] + "#/setting/personal?isRenew=true"
+          window.location.href = window.location.href.split('#')[0] + '#/setting/personal?isRenew=true'
         })
       }
       return Promise.reject(new Error(res.message || 'Error'))
@@ -97,7 +97,7 @@ service.interceptors.response.use(
 
 export default service
 
-function zhapi(add, path) {
+export function zhapi(add, path) {
   if (add[add.length - 1] == '/' && path[0] == '/') {
     return add + path.substr(1)
   }

+ 13 - 7
src/views/mallManagement/setActivity/formModule.vue

@@ -10,8 +10,8 @@
 
 <script>
 import editTable from '@/components/template/editTable.js'
-import { required, mobileRequired, mobile, httpUrl, email } from '@/components/template/rules_verify.js'
-import { promotionQuestionnaireDownload } from '@/api/setActivity.js'
+import { getToken } from '@/utils/auth'
+import { zhapi } from '@/utils/request'
 export default {
   props: {
     item: {
@@ -144,10 +144,12 @@ export default {
                       <el-button
                         type="text"
                         onClick={() => {
-                          promotionQuestionnaireDownload({
-                            id: this.item.id,
-                            id2: row.id
-                          })
+                          window.open(
+                            zhapi(
+                              process.env.VUE_APP_BASE_API,
+                              `/promotion/questionnaire/download?id=${this.item.id}&id2=${row.id}&token=${getToken()}`
+                            )
+                          )
                         }}
                       >
                         下载二维码
@@ -177,7 +179,11 @@ export default {
         return this.acquireVerify(v.$parent, name)
       }
     },
-    piliangxiazai() {}
+    piliangxiazai() {
+      window.open(
+        zhapi(process.env.VUE_APP_BASE_API, `/promotion/questionnaire/download?id=${this.item.id}&token=${getToken()}`)
+      )
+    }
   }
 }
 </script>