Merge remote-tracking branch 'origin/master'

doum

11 小时以前 8dfc59832df6e86f1840857a5b497faa9061a2af

 mini-program/utils/http.interceptor.js

@@ -6,6 +6,7 @@
   
   // 请求拦截器
   uni.$u.http.interceptors.request.use((config) => {
      console.log(config)
      if(config.data && config.data.tokenType===1){
         config.header['tokenType'] = config.data.tokenType;
         const HeadShoptoken = vm.$store.state.shopToken