Merge branch 'spp' into 'master'

Spp

See merge request !19

src/api/apiList.js

@@ -8,7 +8,8 @@ const baseUrl = '/api'
 // }
 
 // todo: url
-const httpUrl = 'https://repairtest.zeruiedu.com' // 测试接口
+// const httpUrl = 'https://repairtest.zeruiedu.com' // 测试接口
+const httpUrl = 'https://repair.zeruiedu.com' // 正式接口
 const h5Url = 'http://localhost:8080' // 测试h5线上地址
 // const h5Url = 'http://repair.h5.zeruiedu.com' // 测试h5线上地址
 window.localStorage.setItem('httpUrl', httpUrl)
@@ -51,6 +52,6 @@ export default {
     GET_WORKER: baseUrl + '/worker/get/worker', // 查看评论
     REPAIR_CANCEL: baseUrl + '/worker/repair/cancel', // 查看评论
     REPAIR_ASSIGN: baseUrl + '/worker/repair/assign', // 指派工人
-    WX_JSSDK: baseUrl + '/worker/wx/jssdk', // 获取jssdk参数
+    WX_JSSDK: baseUrl + '/worker/wx/jssdk' // 获取jssdk参数
 
 }

src/api/common.js

@@ -4,7 +4,7 @@ export function updateToken (cb, errcb) {
     axios
         .post(apiList.REFRESHTOKEN, null, {
             headers: {
-                token: window.localStorage.getItem('token'),
+                token: window.localStorage.getItem('token')
                 // type: 1
             }
         })

src/api/index.js

 import axios from './axios'
-import { Toast, Dialog } from 'vant'
-import router from '../router/index'
+import { Toast } from 'vant'
+// import router from '../router/index'
 import selfApi from '@/api/apiList'
 
 const instance = axios()

vue.config.js

@@ -61,8 +61,8 @@ module.exports = {
         proxy: {
             '/api/': {
                 // todo: url
-                target: 'https://repairtest.zeruiedu.com/api', // 测试
-                // target: 'https://repair.zeruiedu.com/api', // 正式
+                // target: 'https://repairtest.zeruiedu.com/api', // 测试
+                target: 'https://repair.zeruiedu.com/api', // 正式
                 autoRewrite: true,
                 changeOrigin: true,
                 ws: true,