Merge branch 'dev' of http://git.ycjcjy.com/SpaceOfCheng/wechat into dev

src/pages/sales/salesGiveOutDetail/index.vue

@@ -61,6 +61,8 @@
 
 <script>
 import topCaseInfo from '../../../components/topCaseInfo/index'
+import { createNamespacedHelpers } from 'vuex'
+const { mapState: mapForbidState, mapActions: mapForbidActions } = createNamespacedHelpers('forbid')
 
 export default {
   name: '',
@@ -73,15 +75,29 @@ export default {
         showSelect: false,
         userName: 'xxx'
       },
+      data: [
+        [
+          {}
+        ],
+        [
+
+        ]
+      ]
     }
   },
+  computed: {
+    ...mapForbidState({
+      salesCardList: x => x.salesCardList
+    })
+  },
   components: {
     topCaseInfo,
   },
   created () {
-
+    this.getSalesCardList({ id: this.$route.query.id })
   },
   methods: {
+    ...mapForbidActions(['getSalesCardList']),
     cutNav (index) {
       this.activeIndex = index
     },

src/store/forbid/index.js

@@ -84,7 +84,7 @@ export default {
             ...data
           }
         }).then(res => {
-          context.commit('setForbidList', res)
+          context.commit('setSalesCardList', res)
           resolve(res)
         }).catch((err) => {
           reject(err)

src/util/ajax.js

@@ -3,7 +3,17 @@ import qs from 'qs'
 import toolClass from './util'
 import router from '../pages/user/router'
 import { Toast } from '../../node_modules/vant';
-var JWT = localStorage.getItem('JWT')
+
+const token = function (headers) {
+  let JWT
+  if (headers){
+    localStorage.setItem('JWT', headers.authorization)
+    JWT = headers.authorization
+  }
+  console.log(JWT)
+  return JWT ? JWT : localStorage.getItem('JWT')
+}
+
 const Axios = axios.create({
   timeout: 60000,
   responseType: 'json',
@@ -12,11 +22,12 @@ const Axios = axios.create({
   urlData: {},
   headers: {
     'Content-Type': 'multipart/form-data',
-    'authorization': JWT
+    'authorization': token()
   }
 })
 
 Axios.interceptors.request.use((config) => {
+  config.headers.authorization = token()
   // 处理请求data,若为get请求，拼到url后面，若为post请求，直接添加到body中
   config.urlData = { ...config.urlData, org: 'MQ' }
   let urlData = qs.stringify(config.urlData)
@@ -51,8 +62,7 @@ const ajax = (...args) => {
   return new Promise((resolve, reject) => {
     Axios(...args).then(({ data, headers }) => {
       if (headers.authorization) {
-        localStorage.setItem('JWT', headers.authorization)
-        JWT = headers.authorization
+        token(headers)
       }
       const { code, message, result } = data
       if (code === 200) {