Merge branch 'master' of https://git.xoado.com/yaohui/xoadoPlatform

src/views/operation/driverPhone.vue

 <template>
   <el-card>
     <el-dialog title="更改手机号" :visible.sync="dialogFormVisible" width="30%">
-      <el-form :model="dataform" style="margin: -30px">
+      <el-form :model="dataform" style="margin: -30px 0;">
+        <div style="padding:10px;border:1px solid rgba(245, 154, 35, 1);background-color: rgba(250, 205, 145, 0.3);color: #F59A23;border-radius:5px">
+          <div>温馨提示</div>
+          <div>
+            1.更改认证中心手机号将同步修改司机在小多平台下所有账号手机号；
+          </div>
+          <div>2.如司机有未完成订单请使用原手机号与乘客进行联系;</div>
+          <div>3.更改手机号后请司机需要重新登录。</div>
+        </div>
         <el-form-item label="姓名:" :label-width="formLabelWidth">
           <span>{{ dataform.driverName }}</span>
         </el-form-item>
@@ -35,7 +43,7 @@
               suffix-icon="el-icon-search"
               v-model="selectResult.searchStr"
               style="max-width: 302px"
-              placeholder="请输入车牌号或者车主姓名"
+              placeholder="请输入司机姓名/手机号"
             ></el-input>
           </el-form-item>
         </el-col>
@@ -177,7 +185,7 @@ export default {
     return {
       newPhone: "",
       dataform: [],
-      formLabelWidth: "130px",
+      formLabelWidth: "80px",
       dialogFormVisible: false,
       dataSource: dataSource,
       props: {
@@ -240,7 +248,7 @@ export default {
   methods: {
     setPhone(d) {
       this.dataform = d;
-      this.newPhone="";
+      this.newPhone = "";
       this.dialogFormVisible = true;
     },
     carDetail(row) {
@@ -253,11 +261,11 @@ export default {
       if (!/(^1[3|4|5|6|7|8|9][0-9]{9}$)/.test(this.newPhone)) {
         return this.$message.info("手机号码格式不正确!");
       }
-      let d=this.dataform;
+      let d = this.dataform;
       let json = {
-        driverId:d.userId ,
+        driverId: d.userId,
         beforPhone: d.driverMobile,
-        afterPhone:this.newPhone,
+        afterPhone: this.newPhone,
 
         //    beforPhone: this.newPhone,
         // afterPhone: d.driverMobile,
@@ -265,13 +273,12 @@ export default {
       updateMobilenoCaptCha(json).then((res) => {
         if (res.status == 200) {
           this.initTable();
-            this.dialogFormVisible=false
+          this.dialogFormVisible = false;
           this.$message({
             type: "success",
             message: "操作成功!",
           });
-
-        }else{
+        } else {
           this.$message({
             type: "error",
             message: res.msg,

src/views/operation/orderDetail.vue

@@ -22,7 +22,7 @@
                             </el-select>
                         </div>
 
-                        <el-input v-model="orderid" placeholder="请输入内容"></el-input>
+                        <el-input v-model="orderid" placeholder="请输入订单号"></el-input>
 
                         <el-button
                             type="primary"
@@ -47,9 +47,9 @@
                     行程录音
                 </el-button>
             </el-row>
-            <el-container>
+            <el-container >
                 <el-container style="padding: 0">
-                    <el-aside width="40%" style="padding: 20px">
+                    <el-aside width="40%" style="padding: 20px" v-if="leftLogData.length>0">
                         <div class="title">行程记录</div>
                         <el-timeline style="margin-top: 20px">
                             <el-timeline-item
@@ -354,7 +354,7 @@
                         </div>
                     </el-dialog>
                     <!-- JJNTFZ_20220406164108046_4908288 -->
-                    <el-main>
+                    <el-main v-if="!!dataSource">
                         <div class="containers">
                             <el-card class="box-card">
                                 <div class="clearfix">
@@ -372,7 +372,7 @@
                                             type="primary"
                                             size="mini"
                                             @click="driverInfo()"
-                                            v-if="dataSource.status * 1 == 2"
+                                            v-if="dataSource.status * 1 == 2||dataSource.status * 1 == 1"
                                         >同步司机信息
                                         </el-button
                                         >
@@ -872,6 +872,7 @@ export default {
         Inquire() {
             //查询订单详情
             //查询订单详情
+            this.inputStatus=false
             let platformId = this.optionse;
             let json = {
                 orderId: this.orderid,
@@ -1052,6 +1053,7 @@ export default {
             this.$refs.audio.pause();
         },
         getOrderInfo(obj) {
+            this.dataSource = null;
             getThisorderInfo([obj.orderId], obj.testurl, obj.platformId).then(
                 (res) => {
                     if (res.status == 200) {
@@ -1072,6 +1074,7 @@ export default {
                             datas.otherInfo = {};
                         }
                         this.dataSource = datas;
+                   
                         this.getordersound(datas.waybillId);
                         try {
                             this.startAddressItem.adcode = datas.startAreaCode;
@@ -1203,6 +1206,7 @@ export default {
             return Array.isArray(arg);
         },
         seeLeftLog(json) {
+          this.leftLogData = []
             try {
                 OrderDetailsSelect(
                     {