Browse Source

Merge remote-tracking branch 'origin/master'

yangc 8 years ago
parent
commit
d8a03ebb98
2 changed files with 4 additions and 1 deletions
  1. 2 0
      components/applyPurchase/BatchPublish.vue
  2. 2 1
      nuxt.config.js

+ 2 - 0
components/applyPurchase/BatchPublish.vue

@@ -489,6 +489,8 @@
             this.modifyObj.currency = null
             this.modifyObj.currency = null
           }
           }
           this.modifyObj.code = this.modifyObj.code.trim()
           this.modifyObj.code = this.modifyObj.code.trim()
+          delete this.modifyObj.brandWord
+          delete this.modifyObj.codeWord
           this.$http.put('/seek/updateSeekPurchaseByBatch', this.modifyObj)
           this.$http.put('/seek/updateSeekPurchaseByBatch', this.modifyObj)
             .then(response => {
             .then(response => {
               if (response.data.success) {
               if (response.data.success) {

+ 2 - 1
nuxt.config.js

@@ -177,6 +177,7 @@ module.exports = {
     '/productuser/**': materialUrl,
     '/productuser/**': materialUrl,
     // 权限管理
     // 权限管理
     '/account/**': baseUrl,
     '/account/**': baseUrl,
-    '/vendor/**': baseUrl
+    '/vendor/**': baseUrl,
+    '/internalmessage-service/**': baseUrl
   }
   }
 }
 }