Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system-vue

src/views/drivingSchool/DriveContractTest/index.vue

@@ -105,9 +105,11 @@
 
 <script>
 import { listTest, getTest, delTest, addTest, updateTest } from "./api/test";
+import editor from '@/components/Editor/index.vue'
 
 export default {
   name: "Test",
+  components: {editor},
   data() {
     return {
       viewFlag:false,

src/views/drivingSchool/DriveSchoolContract/index.vue

@@ -87,9 +87,11 @@
 
 <script>
 import { listContract, getContract, delContract, addContract, updateContract } from "./api/contract";
+import editor from '@/components/Editor/index.vue'
 
 export default {
   name: "Contract",
+  components: {editor},
   data() {
     return {
       viewFlag:false,

src/views/drivingSchool/DriveSchoolNotice/index.vue

@@ -105,9 +105,11 @@
 
 <script>
 import { listNotice, getNotice, delNotice, addNotice, updateNotice } from "./api/notice";
+import editor from '@/components/Editor/index.vue'
 
 export default {
   name: "Notice",
+  components: {editor},
   data() {
     return {
       viewContent:"",

src/views/drivingSchool/DriveSchoolTeachingJournal/index.vue

@@ -95,9 +95,10 @@
 
 <script>
 import { listJournal, getJournal, delJournal, addJournal, updateJournal } from "./api/journal";
-
+import editor from '@/components/Editor/index.vue'
 export default {
   name: "Journal",
+  components: {editor},
   data() {
     return {
       viewContent:"",

src/views/drivingSchool/IDriveSchoolCheck/index.vue

@@ -162,9 +162,10 @@
 
 <script>
 import { listCheck, getCheck, delCheck, addCheck, updateCheck,listCards } from "./api/check";
-
+import editor from '@/components/Editor/index.vue'
 export default {
   name: "Check",
+  components: {editor},
   data() {
     return {
       carLists:[],

src/views/drivingSchool/driveSchoolCoachBalance/index.vue

@@ -266,8 +266,8 @@ export default {
       console.log("252",this.queryParams)
       getBalanceList(this.queryParams).then(response => {
 
-        this.passList = response.rows;
-        this.total = response.total;
+        this.passList = response.data.records;
+        this.total = response.data.total;
         this.loading = false;
       });
     },

src/views/drivingSchool/driveSchoolDila/index.vue

@@ -136,9 +136,11 @@
 
 <script>
 import { listDial, getDial, delDial, addDial, updateDial } from "./api/dial";
+import editor from '@/components/Editor/index.vue'
 
 export default {
   name: "Dial",
+  components: {editor},
   data() {
     return {
       // 遮罩层

src/views/drivingSchool/drivingSchoolCar/index.vue

@@ -288,7 +288,7 @@
 
 <script>
 import { listCar, getCar, delCar, addCar, updateCar } from "./api/car";
-import {getToken} from "@/utils/auth";
+import { getAccessToken } from "@/utils/auth";
 
 export default {
   name: "Car",
@@ -305,7 +305,7 @@ export default {
         // 是否更新已经存在的用户数据
         updateSupport: 0,
         // 设置上传的请求头部
-        headers: {Authorization: "Bearer " + getToken()},
+        headers: {Authorization: "Bearer " + getAccessToken()},
         // 上传的地址
         url: process.env.VUE_APP_BASE_API + "/drivingSchool/system/car/importData"
       },

src/views/drivingSchool/drivingSchoolCarTwo/index.vue

@@ -292,7 +292,7 @@
 
 <script>
 import { listCar, getCar, delCar, addCar, updateCar } from "./api/car";
-import {getToken} from "@/utils/auth";
+import { getAccessToken } from "@/utils/auth";
 
 export default {
   name: "Car",
@@ -309,7 +309,7 @@ export default {
         // 是否更新已经存在的用户数据
         updateSupport: 0,
         // 设置上传的请求头部
-        headers: {Authorization: "Bearer " + getToken()},
+        headers: {Authorization: "Bearer " + getAccessToken()},
         // 上传的地址
         url: process.env.VUE_APP_BASE_API + "/drivingSchool/system/car/importData"
       },

src/views/drivingSchool/drivingSchoolInsurance/index.vue

@@ -158,9 +158,10 @@
 
 <script>
 import { listInsurance, getInsurance, delInsurance, addInsurance, updateInsurance ,listCards} from "./api/insurance";
-
+import editor from '@/components/Editor/index.vue'
 export default {
   name: "Insurance",
+  components: {editor},
   data() {
     return {
       viewContent:"",

src/views/drivingSchool/schoolCoach/index.vue

@@ -216,10 +216,11 @@
 <script>
 import { listSchoolCoach, getSchoolCoach, delSchoolCoach, addSchoolCoach, updateSchoolCoach } from "./api/schoolCoach";
 //import CouponTemplate from "@/views/system/inspection/PartnerManagement/couponTemplate";
-
+import editor from '@/components/Editor/index.vue'
 export default {
   name: "SchoolCoach",
   // components: {CouponTemplate},
+  components: {editor},
   data() {
     return {
       viewFlag:false,

src/views/drivingSchool/schoolCourse/index.vue

@@ -204,9 +204,10 @@
 
 <script>
 import { listDriveSchoolCourse, getDriveSchoolCourse, delDriveSchoolCourse, addDriveSchoolCourse, updateDriveSchoolCourse } from "./api/driveSchoolCourse";
-
+import editor from '@/components/Editor/index.vue'
 export default {
   name: "DriveSchoolCourse",
+  components: {editor},
   data() {
     return {
       viewFlag:false,