Merge branch 'master' of http://47.100.3.209:3000/gongdecai/wangluohuoyun-htqd

src/store/modules/permission.js

@@ -83,8 +83,9 @@ const actions = {
             const data = await getRoule().then().catch(error => {
                 clearStorage()
                 resetRouter()
-                window.location.href="https://admin.changyuntong56.com/#/login"
+                window.location.href=location.protocol+'//' + location.host+"/#/login"
             })
+            // console.log(location.protocol,location.host)
             const roles = []
             handleRoles(data.data, roles, '')
             console.log('roles', roles)

src/views/orderManagement/orderAudit.vue

@@ -496,7 +496,7 @@
                   }else if(response.data.records[i].terminationReason==2){
                     response.data.records[i].content='原因：货主原因终止<br/>描述：'+response.data.records[i].terminationReasonDescription
                   }else if(response.data.records[i].terminationReason==3){
-                    response.data.records[i].content='原因：司机个人原因终止<br/>描述：'+response.data.records[i].terminationReasonDescription
+                    response.data.records[i].content='原因：货主个人原因终止<br/>描述：'+response.data.records[i].terminationReasonDescription
                   }else if(response.data.records[i].terminationReason==4){
                     response.data.records[i].content='原因：其他<br/>描述：'+response.data.records[i].terminationReasonDescription
                   }

src/views/settlementManagement/advancePaymentAndRepaymentSettlement.vue

@@ -99,6 +99,10 @@ import {
         this.endDate = e[1]
         this.getList()
       },
+      searchBtn(status){
+        this.search=status
+        this.getList()
+      },
       // 默认日期
       getPassYearFormatDate() {
         var nowDate = new Date()
@@ -134,7 +138,8 @@ import {
         _obj.searchKeyWord = this.searchkeyWord
         _obj.startDate =  this.startDate
         _obj.endDate= this.endDate
-        _obj.searchType = this.scarch
+        _obj.searchType = this.search
+        console.log(_obj)
         getListpadsettleaccounts(_obj).then(response => {
           if(response.data.records.length>0){
             for (let i = 0; i < response.data.records.length; i++) {