diff --git a/src/components/guadMap/index.vue b/src/components/guadMap/index.vue
index 402ad7e..6a0fd56 100644
--- a/src/components/guadMap/index.vue
+++ b/src/components/guadMap/index.vue
@@ -68,7 +68,7 @@
             map: this.map,
             title: this.deviceList[i].deviceName,
             content:
-              '<div class="circle-container">xxxxxxx<div class="circle-one"></div><div class="circle-three"></div><div class="circle-two"></div><div class="circle-four"></div></div>',
+              '<div class="circle-container"><div class="circle-one"></div><div class="circle-three"></div><div class="circle-two"></div><div class="circle-four"></div></div>',
             offset: new AMap.Pixel(-15, -20),
           });
           

diff --git a/src/components/guadMap/index.vue b/src/components/guadMap/index.vue
index 402ad7e..6a0fd56 100644
--- a/src/components/guadMap/index.vue
+++ b/src/components/guadMap/index.vue
@@ -68,7 +68,7 @@
             map: this.map,
             title: this.deviceList[i].deviceName,
             content:
-              '<div class="circle-container">xxxxxxx<div class="circle-one"></div><div class="circle-three"></div><div class="circle-two"></div><div class="circle-four"></div></div>',
+              '<div class="circle-container"><div class="circle-one"></div><div class="circle-three"></div><div class="circle-two"></div><div class="circle-four"></div></div>',
             offset: new AMap.Pixel(-15, -20),
           });
           
diff --git a/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue b/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue
index 53e82be..4fcc6ff 100644
--- a/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue
+++ b/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue
@@ -123,18 +123,18 @@
       type: Boolean,
       default: false
     },
-    dataInfo: ''
+    dataInfo: {}
   },
   data() {
     return {
-      orderInfo: ''
+      orderInfo: {}
     }
   },
   watch: {
     dataInfo: {
       handler(value) {
         console.log(value)
-        if (!value.id) return
+        if (!value?.id) return
 
         detail({ id: value.id }).then(res => {
           this.orderInfo = res

diff --git a/src/components/guadMap/index.vue b/src/components/guadMap/index.vue
index 402ad7e..6a0fd56 100644
--- a/src/components/guadMap/index.vue
+++ b/src/components/guadMap/index.vue
@@ -68,7 +68,7 @@
             map: this.map,
             title: this.deviceList[i].deviceName,
             content:
-              '<div class="circle-container">xxxxxxx<div class="circle-one"></div><div class="circle-three"></div><div class="circle-two"></div><div class="circle-four"></div></div>',
+              '<div class="circle-container"><div class="circle-one"></div><div class="circle-three"></div><div class="circle-two"></div><div class="circle-four"></div></div>',
             offset: new AMap.Pixel(-15, -20),
           });
           
diff --git a/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue b/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue
index 53e82be..4fcc6ff 100644
--- a/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue
+++ b/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue
@@ -123,18 +123,18 @@
       type: Boolean,
       default: false
     },
-    dataInfo: ''
+    dataInfo: {}
   },
   data() {
     return {
-      orderInfo: ''
+      orderInfo: {}
     }
   },
   watch: {
     dataInfo: {
       handler(value) {
         console.log(value)
-        if (!value.id) return
+        if (!value?.id) return
 
         detail({ id: value.id }).then(res => {
           this.orderInfo = res
diff --git a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
index 6d94be8..5e58333 100644
--- a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
+++ b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
@@ -1,7 +1,13 @@
 <!--商机转订单弹窗-->
 <template>
-  <el-dialog title="商机转订单" width="1030px" :visible.sync="isShowInfo" append-to-body @close="close">
-    <div v-if="isShowInfo" class="salesDialog ">
+  <el-dialog
+    title="商机转订单"
+    width="1030px"
+    :visible.sync="isShowInfo"
+    append-to-body
+    @close="close"
+  >
+    <div v-if="isShowInfo" class="salesDialog">
       <div class="container">
         <div class="containerFirst">
           <div class="inputBox">
@@ -26,7 +32,13 @@
         <div class="middle">
           <red-star />
           <input-vue title="交付地址">
-            <el-select v-model="changeOrderInfo.deliveryProvince" filterable placeholder="请选择" style="margin-right:10px" @change="changeProvince">
+            <el-select
+              v-model="changeOrderInfo.deliveryProvince"
+              filterable
+              placeholder="请选择"
+              style="margin-right: 10px"
+              @change="changeProvince"
+            >
               <el-option
                 v-for="item in ProvinceList"
                 :key="item.id"
@@ -34,7 +46,13 @@
                 :value="item.id"
               />
             </el-select>
-            <el-select v-model="changeOrderInfo.deliveryCity" filterable placeholder="请选择" style="margin-right:10px" @change="changeCity">
+            <el-select
+              v-model="changeOrderInfo.deliveryCity"
+              filterable
+              placeholder="请选择"
+              style="margin-right: 10px"
+              @change="changeCity"
+            >
               <el-option
                 v-for="item in CityList"
                 :key="item.id"
@@ -42,7 +60,12 @@
                 :value="item.id"
               />
             </el-select>
-            <el-select v-model="changeOrderInfo.deliveryArea" filterable placeholder="请选择" style="margin-right:10px">
+            <el-select
+              v-model="changeOrderInfo.deliveryArea"
+              filterable
+              placeholder="请选择"
+              style="margin-right: 10px"
+            >
               <el-option
                 v-for="item in AreaList"
                 :key="item.id"
@@ -50,7 +73,11 @@
                 :value="item.id"
               />
             </el-select>
-            <el-input v-model="changeOrderInfo.deliveryAddress" placeholder="请输入内容" style="width:638px" />
+            <el-input
+              v-model="changeOrderInfo.deliveryAddress"
+              placeholder="请输入内容"
+              style="width: 638px"
+            />
           </input-vue>
         </div>
         <div class="containerFirst">
@@ -68,7 +95,11 @@
             </input-vue>
           </div>
           <div class="inputBox">
-            <input-vue title="备注" class="inputWidth" style="justify-content: space-between;">
+            <input-vue
+              title="备注"
+              class="inputWidth"
+              style="justify-content: space-between"
+            >
               <el-input
                 v-model="changeOrderInfo.remark"
                 style="width: 300px"
@@ -81,113 +112,147 @@
         </div>
       </div>
       <div class="btnBox">
-        <el-button type="primary" class="save" @click="save">
-          保存
-        </el-button>
-        <el-button type="info" class="close" @click="close">
-          取消
-        </el-button>
+        <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+        <el-button type="info" class="close" @click="close"> 取消 </el-button>
       </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import InputVue from '../../input/inputVue.vue'
-import RedStar from '../../redStar.vue'
-import DialogHeader from '../dialogHeader.vue'
-import { order_area } from '../../../../api/order/order'
-import { turnOrder } from '../../../../api/sales/shop'
+import InputVue from "../../input/inputVue.vue";
+import RedStar from "../../redStar.vue";
+import DialogHeader from "../dialogHeader.vue";
+import { order_area } from "../../../../api/order/order";
+import { turnOrder } from "../../../../api/sales/shop";
 export default {
   components: {
     DialogHeader,
     InputVue,
-    RedStar
+    RedStar,
   },
-  props: ['isShowInfo', 'busOppoId'],
+  props: ["isShowInfo", "busOppoId"],
   data() {
     return {
       ProvinceList: [],
       CityList: [],
       AreaList: [],
       changeOrderInfo: {
-        busOppoId: '',
-        deliveryDate: '',
-        deliveryProvince: '',
-        deliveryCity: '',
-        deliveryArea: '',
-        deliveryAddress: '',
-        receiver: '',
-        receiverPhone: '',
-        remark: ''
-      }
-    }
+        busOppoId: "",
+        deliveryDate: "",
+        deliveryProvince: "",
+        deliveryCity: "",
+        deliveryArea: "",
+        deliveryAddress: "",
+        receiver: "",
+        receiverPhone: "",
+        remark: "",
+      },
+    };
   },
   mounted() {
-    order_area('pid=0').then(res => {
-      console.log(res)
-      this.ProvinceList = res
-    })
+    order_area("pid=0").then((res) => {
+      console.log(res);
+      this.ProvinceList = res;
+    });
   },
   methods: {
     save() {
-      const temp = { ...this.changeOrderInfo }
-      temp.busOppoId = this.busOppoId
-      const pindex = this.ProvinceList.findIndex(item => {
-        return item.id == temp.deliveryProvince
-      })
-      const cindex = this.CityList.findIndex(item => {
-        return item.id == temp.deliveryCity
-      })
-      const aindex = this.AreaList.findIndex(item => {
-        return item.id == temp.deliveryArea
-      })
-      if (cindex < 0 || aindex < 0 || pindex < 0) {
-        this.$message.error('请检查格式地址')
-        return
-      }
-      temp.deliveryProvince = this.ProvinceList[pindex].areaName
-      temp.deliveryCity = this.CityList[cindex].areaName
-      temp.deliveryArea = this.AreaList[aindex].areaName
+      const { receiver, deliveryDate } = this.changeOrderInfo;
       // console.log(temp);
-      turnOrder(temp).then(res => {
-        if (res != '') {
-          this.$message.success('添加成功')
-          this.close()
+      if (
+        this.valiateProvince() &&
+        this.valiatePhone() &&
+        receiver &&
+        deliveryDate
+      ) {
+        const temp = { ...this.changeOrderInfo };
+        temp.busOppoId = this.busOppoId;
+        const pindex = this.ProvinceList.findIndex((item) => {
+          return item.id == temp.deliveryProvince;
+        });
+        const cindex = this.CityList.findIndex((item) => {
+          return item.id == temp.deliveryCity;
+        });
+        const aindex = this.AreaList.findIndex((item) => {
+          return item.id == temp.deliveryArea;
+        });
+        temp.deliveryProvince = this.ProvinceList[pindex].areaName;
+        temp.deliveryCity = this.CityList[cindex].areaName;
+        temp.deliveryArea = this.AreaList[aindex].areaName;
+        turnOrder(temp).then((res) => {
+          this.$message.success("添加成功");
+          this.close();
+        });
+      }else {
+        console.log(this.valiatePhone())
+        if(this.valiatePhone() === false){
+          this.$message.error("请检查手机号格式是否正确");
+        }else if(this.valiateProvince() === false){
+          this.$message.error("请检查地址格式是否正确");
+        }else{
+          this.$message.error("请正确填写信息");
         }
-      })
+      }
     },
     close() {
-      this.$emit('close')
-      this.reset()
+      this.$emit("close");
+      this.reset();
     },
     reset() {
       this.changeOrderInfo = {
-        busOppoId: '',
-        deliveryDate: '',
-        deliveryProvince: '',
-        deliveryCity: '',
-        deliveryArea: '',
-        deliveryAddress: '',
-        receiver: '',
-        receiverPhone: '',
-        remark: ''
-      }
+        busOppoId: "",
+        deliveryDate: "",
+        deliveryProvince: "",
+        deliveryCity: "",
+        deliveryArea: "",
+        deliveryAddress: "",
+        receiver: "",
+        receiverPhone: "",
+        remark: "",
+      };
     },
     changeProvince(e) {
-      order_area('pid=' + e).then(res => {
-        console.log(res)
-        this.CityList = res
-      })
+      order_area("pid=" + e).then((res) => {
+        console.log(res);
+        this.CityList = res;
+      });
     },
     changeCity(e) {
-      order_area('pid=' + e).then(res => {
-        console.log(res)
-        this.AreaList = res
-      })
-    }
-  }
-}
+      order_area("pid=" + e).then((res) => {
+        console.log(res);
+        this.AreaList = res;
+      });
+    },
+    valiateProvince() {
+      // 验证地址是否正确
+      const temp = { ...this.changeOrderInfo };
+      const pindex = this.ProvinceList.findIndex((item) => {
+        return item.id == temp.deliveryProvince;
+      });
+      const cindex = this.CityList.findIndex((item) => {
+        return item.id == temp.deliveryCity;
+      });
+      const aindex = this.AreaList.findIndex((item) => {
+        return item.id == temp.deliveryArea;
+      });
+      if (cindex < 0 || aindex < 0 || pindex < 0) {
+        return false;
+      } else {
+        return true;
+      }
+    },
+    valiatePhone() {
+      const reg =
+        /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/;
+      if (reg.test(this.changeOrderInfo.receiverPhone)) {
+        return true;
+      } else {
+        return false;
+      }
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -199,14 +264,14 @@
     .middle {
       display: flex;
       align-items: center;
-    //   background: blue;
+      //   background: blue;
     }
-    .middle{
-        padding-right: 54px;
+    .middle {
+      padding-right: 54px;
     }
     .containerFirst {
-        // background: red;
-         flex: 1;
+      // background: red;
+      flex: 1;
       .inputBox {
         //   background: green;
         display: flex;

diff --git a/src/components/guadMap/index.vue b/src/components/guadMap/index.vue
index 402ad7e..6a0fd56 100644
--- a/src/components/guadMap/index.vue
+++ b/src/components/guadMap/index.vue
@@ -68,7 +68,7 @@
             map: this.map,
             title: this.deviceList[i].deviceName,
             content:
-              '<div class="circle-container">xxxxxxx<div class="circle-one"></div><div class="circle-three"></div><div class="circle-two"></div><div class="circle-four"></div></div>',
+              '<div class="circle-container"><div class="circle-one"></div><div class="circle-three"></div><div class="circle-two"></div><div class="circle-four"></div></div>',
             offset: new AMap.Pixel(-15, -20),
           });
           
diff --git a/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue b/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue
index 53e82be..4fcc6ff 100644
--- a/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue
+++ b/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue
@@ -123,18 +123,18 @@
       type: Boolean,
       default: false
     },
-    dataInfo: ''
+    dataInfo: {}
   },
   data() {
     return {
-      orderInfo: ''
+      orderInfo: {}
     }
   },
   watch: {
     dataInfo: {
       handler(value) {
         console.log(value)
-        if (!value.id) return
+        if (!value?.id) return
 
         detail({ id: value.id }).then(res => {
           this.orderInfo = res
diff --git a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
index 6d94be8..5e58333 100644
--- a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
+++ b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
@@ -1,7 +1,13 @@
 <!--商机转订单弹窗-->
 <template>
-  <el-dialog title="商机转订单" width="1030px" :visible.sync="isShowInfo" append-to-body @close="close">
-    <div v-if="isShowInfo" class="salesDialog ">
+  <el-dialog
+    title="商机转订单"
+    width="1030px"
+    :visible.sync="isShowInfo"
+    append-to-body
+    @close="close"
+  >
+    <div v-if="isShowInfo" class="salesDialog">
       <div class="container">
         <div class="containerFirst">
           <div class="inputBox">
@@ -26,7 +32,13 @@
         <div class="middle">
           <red-star />
           <input-vue title="交付地址">
-            <el-select v-model="changeOrderInfo.deliveryProvince" filterable placeholder="请选择" style="margin-right:10px" @change="changeProvince">
+            <el-select
+              v-model="changeOrderInfo.deliveryProvince"
+              filterable
+              placeholder="请选择"
+              style="margin-right: 10px"
+              @change="changeProvince"
+            >
               <el-option
                 v-for="item in ProvinceList"
                 :key="item.id"
@@ -34,7 +46,13 @@
                 :value="item.id"
               />
             </el-select>
-            <el-select v-model="changeOrderInfo.deliveryCity" filterable placeholder="请选择" style="margin-right:10px" @change="changeCity">
+            <el-select
+              v-model="changeOrderInfo.deliveryCity"
+              filterable
+              placeholder="请选择"
+              style="margin-right: 10px"
+              @change="changeCity"
+            >
               <el-option
                 v-for="item in CityList"
                 :key="item.id"
@@ -42,7 +60,12 @@
                 :value="item.id"
               />
             </el-select>
-            <el-select v-model="changeOrderInfo.deliveryArea" filterable placeholder="请选择" style="margin-right:10px">
+            <el-select
+              v-model="changeOrderInfo.deliveryArea"
+              filterable
+              placeholder="请选择"
+              style="margin-right: 10px"
+            >
               <el-option
                 v-for="item in AreaList"
                 :key="item.id"
@@ -50,7 +73,11 @@
                 :value="item.id"
               />
             </el-select>
-            <el-input v-model="changeOrderInfo.deliveryAddress" placeholder="请输入内容" style="width:638px" />
+            <el-input
+              v-model="changeOrderInfo.deliveryAddress"
+              placeholder="请输入内容"
+              style="width: 638px"
+            />
           </input-vue>
         </div>
         <div class="containerFirst">
@@ -68,7 +95,11 @@
             </input-vue>
           </div>
           <div class="inputBox">
-            <input-vue title="备注" class="inputWidth" style="justify-content: space-between;">
+            <input-vue
+              title="备注"
+              class="inputWidth"
+              style="justify-content: space-between"
+            >
               <el-input
                 v-model="changeOrderInfo.remark"
                 style="width: 300px"
@@ -81,113 +112,147 @@
         </div>
       </div>
       <div class="btnBox">
-        <el-button type="primary" class="save" @click="save">
-          保存
-        </el-button>
-        <el-button type="info" class="close" @click="close">
-          取消
-        </el-button>
+        <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+        <el-button type="info" class="close" @click="close"> 取消 </el-button>
       </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import InputVue from '../../input/inputVue.vue'
-import RedStar from '../../redStar.vue'
-import DialogHeader from '../dialogHeader.vue'
-import { order_area } from '../../../../api/order/order'
-import { turnOrder } from '../../../../api/sales/shop'
+import InputVue from "../../input/inputVue.vue";
+import RedStar from "../../redStar.vue";
+import DialogHeader from "../dialogHeader.vue";
+import { order_area } from "../../../../api/order/order";
+import { turnOrder } from "../../../../api/sales/shop";
 export default {
   components: {
     DialogHeader,
     InputVue,
-    RedStar
+    RedStar,
   },
-  props: ['isShowInfo', 'busOppoId'],
+  props: ["isShowInfo", "busOppoId"],
   data() {
     return {
       ProvinceList: [],
       CityList: [],
       AreaList: [],
       changeOrderInfo: {
-        busOppoId: '',
-        deliveryDate: '',
-        deliveryProvince: '',
-        deliveryCity: '',
-        deliveryArea: '',
-        deliveryAddress: '',
-        receiver: '',
-        receiverPhone: '',
-        remark: ''
-      }
-    }
+        busOppoId: "",
+        deliveryDate: "",
+        deliveryProvince: "",
+        deliveryCity: "",
+        deliveryArea: "",
+        deliveryAddress: "",
+        receiver: "",
+        receiverPhone: "",
+        remark: "",
+      },
+    };
   },
   mounted() {
-    order_area('pid=0').then(res => {
-      console.log(res)
-      this.ProvinceList = res
-    })
+    order_area("pid=0").then((res) => {
+      console.log(res);
+      this.ProvinceList = res;
+    });
   },
   methods: {
     save() {
-      const temp = { ...this.changeOrderInfo }
-      temp.busOppoId = this.busOppoId
-      const pindex = this.ProvinceList.findIndex(item => {
-        return item.id == temp.deliveryProvince
-      })
-      const cindex = this.CityList.findIndex(item => {
-        return item.id == temp.deliveryCity
-      })
-      const aindex = this.AreaList.findIndex(item => {
-        return item.id == temp.deliveryArea
-      })
-      if (cindex < 0 || aindex < 0 || pindex < 0) {
-        this.$message.error('请检查格式地址')
-        return
-      }
-      temp.deliveryProvince = this.ProvinceList[pindex].areaName
-      temp.deliveryCity = this.CityList[cindex].areaName
-      temp.deliveryArea = this.AreaList[aindex].areaName
+      const { receiver, deliveryDate } = this.changeOrderInfo;
       // console.log(temp);
-      turnOrder(temp).then(res => {
-        if (res != '') {
-          this.$message.success('添加成功')
-          this.close()
+      if (
+        this.valiateProvince() &&
+        this.valiatePhone() &&
+        receiver &&
+        deliveryDate
+      ) {
+        const temp = { ...this.changeOrderInfo };
+        temp.busOppoId = this.busOppoId;
+        const pindex = this.ProvinceList.findIndex((item) => {
+          return item.id == temp.deliveryProvince;
+        });
+        const cindex = this.CityList.findIndex((item) => {
+          return item.id == temp.deliveryCity;
+        });
+        const aindex = this.AreaList.findIndex((item) => {
+          return item.id == temp.deliveryArea;
+        });
+        temp.deliveryProvince = this.ProvinceList[pindex].areaName;
+        temp.deliveryCity = this.CityList[cindex].areaName;
+        temp.deliveryArea = this.AreaList[aindex].areaName;
+        turnOrder(temp).then((res) => {
+          this.$message.success("添加成功");
+          this.close();
+        });
+      }else {
+        console.log(this.valiatePhone())
+        if(this.valiatePhone() === false){
+          this.$message.error("请检查手机号格式是否正确");
+        }else if(this.valiateProvince() === false){
+          this.$message.error("请检查地址格式是否正确");
+        }else{
+          this.$message.error("请正确填写信息");
         }
-      })
+      }
     },
     close() {
-      this.$emit('close')
-      this.reset()
+      this.$emit("close");
+      this.reset();
     },
     reset() {
       this.changeOrderInfo = {
-        busOppoId: '',
-        deliveryDate: '',
-        deliveryProvince: '',
-        deliveryCity: '',
-        deliveryArea: '',
-        deliveryAddress: '',
-        receiver: '',
-        receiverPhone: '',
-        remark: ''
-      }
+        busOppoId: "",
+        deliveryDate: "",
+        deliveryProvince: "",
+        deliveryCity: "",
+        deliveryArea: "",
+        deliveryAddress: "",
+        receiver: "",
+        receiverPhone: "",
+        remark: "",
+      };
     },
     changeProvince(e) {
-      order_area('pid=' + e).then(res => {
-        console.log(res)
-        this.CityList = res
-      })
+      order_area("pid=" + e).then((res) => {
+        console.log(res);
+        this.CityList = res;
+      });
     },
     changeCity(e) {
-      order_area('pid=' + e).then(res => {
-        console.log(res)
-        this.AreaList = res
-      })
-    }
-  }
-}
+      order_area("pid=" + e).then((res) => {
+        console.log(res);
+        this.AreaList = res;
+      });
+    },
+    valiateProvince() {
+      // 验证地址是否正确
+      const temp = { ...this.changeOrderInfo };
+      const pindex = this.ProvinceList.findIndex((item) => {
+        return item.id == temp.deliveryProvince;
+      });
+      const cindex = this.CityList.findIndex((item) => {
+        return item.id == temp.deliveryCity;
+      });
+      const aindex = this.AreaList.findIndex((item) => {
+        return item.id == temp.deliveryArea;
+      });
+      if (cindex < 0 || aindex < 0 || pindex < 0) {
+        return false;
+      } else {
+        return true;
+      }
+    },
+    valiatePhone() {
+      const reg =
+        /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/;
+      if (reg.test(this.changeOrderInfo.receiverPhone)) {
+        return true;
+      } else {
+        return false;
+      }
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -199,14 +264,14 @@
     .middle {
       display: flex;
       align-items: center;
-    //   background: blue;
+      //   background: blue;
     }
-    .middle{
-        padding-right: 54px;
+    .middle {
+      padding-right: 54px;
     }
     .containerFirst {
-        // background: red;
-         flex: 1;
+      // background: red;
+      flex: 1;
       .inputBox {
         //   background: green;
         display: flex;
diff --git a/src/views/sales/orderList.vue b/src/views/sales/orderList.vue
index 36e1a2d..df1f8de 100644
--- a/src/views/sales/orderList.vue
+++ b/src/views/sales/orderList.vue
@@ -52,6 +52,7 @@
       }"
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
+      v-loading="loading"
     >
       <el-table-column type="selection" width="55" />
       <el-table-column prop="index" label="序号" />
@@ -103,7 +104,8 @@
       selectInfo: {
         orderId: '',
         userName: ''
-      }
+      },
+      loading:false
 
     }
   },
@@ -111,12 +113,16 @@
     tableRowClassName: tableRowClassName,
 
     getListPage(limit, offset) {
+      this.loading = true
       listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
       // 得到相关数据
         res.rows.forEach((item, index) => {
           item.index = (index + 1) + ((offset - 1) * 10)
         })
         this.tableData = res
+        this.loading = false
+      }).catch(err => {
+        this.loading = false
       })
     },
     reset() {

diff --git a/src/components/guadMap/index.vue b/src/components/guadMap/index.vue
index 402ad7e..6a0fd56 100644
--- a/src/components/guadMap/index.vue
+++ b/src/components/guadMap/index.vue
@@ -68,7 +68,7 @@
             map: this.map,
             title: this.deviceList[i].deviceName,
             content:
-              '<div class="circle-container">xxxxxxx<div class="circle-one"></div><div class="circle-three"></div><div class="circle-two"></div><div class="circle-four"></div></div>',
+              '<div class="circle-container"><div class="circle-one"></div><div class="circle-three"></div><div class="circle-two"></div><div class="circle-four"></div></div>',
             offset: new AMap.Pixel(-15, -20),
           });
           
diff --git a/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue b/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue
index 53e82be..4fcc6ff 100644
--- a/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue
+++ b/src/components/mycomponent/dialog/salesDialog/orderInfoDialog.vue
@@ -123,18 +123,18 @@
       type: Boolean,
       default: false
     },
-    dataInfo: ''
+    dataInfo: {}
   },
   data() {
     return {
-      orderInfo: ''
+      orderInfo: {}
     }
   },
   watch: {
     dataInfo: {
       handler(value) {
         console.log(value)
-        if (!value.id) return
+        if (!value?.id) return
 
         detail({ id: value.id }).then(res => {
           this.orderInfo = res
diff --git a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
index 6d94be8..5e58333 100644
--- a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
+++ b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
@@ -1,7 +1,13 @@
 <!--商机转订单弹窗-->
 <template>
-  <el-dialog title="商机转订单" width="1030px" :visible.sync="isShowInfo" append-to-body @close="close">
-    <div v-if="isShowInfo" class="salesDialog ">
+  <el-dialog
+    title="商机转订单"
+    width="1030px"
+    :visible.sync="isShowInfo"
+    append-to-body
+    @close="close"
+  >
+    <div v-if="isShowInfo" class="salesDialog">
       <div class="container">
         <div class="containerFirst">
           <div class="inputBox">
@@ -26,7 +32,13 @@
         <div class="middle">
           <red-star />
           <input-vue title="交付地址">
-            <el-select v-model="changeOrderInfo.deliveryProvince" filterable placeholder="请选择" style="margin-right:10px" @change="changeProvince">
+            <el-select
+              v-model="changeOrderInfo.deliveryProvince"
+              filterable
+              placeholder="请选择"
+              style="margin-right: 10px"
+              @change="changeProvince"
+            >
               <el-option
                 v-for="item in ProvinceList"
                 :key="item.id"
@@ -34,7 +46,13 @@
                 :value="item.id"
               />
             </el-select>
-            <el-select v-model="changeOrderInfo.deliveryCity" filterable placeholder="请选择" style="margin-right:10px" @change="changeCity">
+            <el-select
+              v-model="changeOrderInfo.deliveryCity"
+              filterable
+              placeholder="请选择"
+              style="margin-right: 10px"
+              @change="changeCity"
+            >
               <el-option
                 v-for="item in CityList"
                 :key="item.id"
@@ -42,7 +60,12 @@
                 :value="item.id"
               />
             </el-select>
-            <el-select v-model="changeOrderInfo.deliveryArea" filterable placeholder="请选择" style="margin-right:10px">
+            <el-select
+              v-model="changeOrderInfo.deliveryArea"
+              filterable
+              placeholder="请选择"
+              style="margin-right: 10px"
+            >
               <el-option
                 v-for="item in AreaList"
                 :key="item.id"
@@ -50,7 +73,11 @@
                 :value="item.id"
               />
             </el-select>
-            <el-input v-model="changeOrderInfo.deliveryAddress" placeholder="请输入内容" style="width:638px" />
+            <el-input
+              v-model="changeOrderInfo.deliveryAddress"
+              placeholder="请输入内容"
+              style="width: 638px"
+            />
           </input-vue>
         </div>
         <div class="containerFirst">
@@ -68,7 +95,11 @@
             </input-vue>
           </div>
           <div class="inputBox">
-            <input-vue title="备注" class="inputWidth" style="justify-content: space-between;">
+            <input-vue
+              title="备注"
+              class="inputWidth"
+              style="justify-content: space-between"
+            >
               <el-input
                 v-model="changeOrderInfo.remark"
                 style="width: 300px"
@@ -81,113 +112,147 @@
         </div>
       </div>
       <div class="btnBox">
-        <el-button type="primary" class="save" @click="save">
-          保存
-        </el-button>
-        <el-button type="info" class="close" @click="close">
-          取消
-        </el-button>
+        <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+        <el-button type="info" class="close" @click="close"> 取消 </el-button>
       </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import InputVue from '../../input/inputVue.vue'
-import RedStar from '../../redStar.vue'
-import DialogHeader from '../dialogHeader.vue'
-import { order_area } from '../../../../api/order/order'
-import { turnOrder } from '../../../../api/sales/shop'
+import InputVue from "../../input/inputVue.vue";
+import RedStar from "../../redStar.vue";
+import DialogHeader from "../dialogHeader.vue";
+import { order_area } from "../../../../api/order/order";
+import { turnOrder } from "../../../../api/sales/shop";
 export default {
   components: {
     DialogHeader,
     InputVue,
-    RedStar
+    RedStar,
   },
-  props: ['isShowInfo', 'busOppoId'],
+  props: ["isShowInfo", "busOppoId"],
   data() {
     return {
       ProvinceList: [],
       CityList: [],
       AreaList: [],
       changeOrderInfo: {
-        busOppoId: '',
-        deliveryDate: '',
-        deliveryProvince: '',
-        deliveryCity: '',
-        deliveryArea: '',
-        deliveryAddress: '',
-        receiver: '',
-        receiverPhone: '',
-        remark: ''
-      }
-    }
+        busOppoId: "",
+        deliveryDate: "",
+        deliveryProvince: "",
+        deliveryCity: "",
+        deliveryArea: "",
+        deliveryAddress: "",
+        receiver: "",
+        receiverPhone: "",
+        remark: "",
+      },
+    };
   },
   mounted() {
-    order_area('pid=0').then(res => {
-      console.log(res)
-      this.ProvinceList = res
-    })
+    order_area("pid=0").then((res) => {
+      console.log(res);
+      this.ProvinceList = res;
+    });
   },
   methods: {
     save() {
-      const temp = { ...this.changeOrderInfo }
-      temp.busOppoId = this.busOppoId
-      const pindex = this.ProvinceList.findIndex(item => {
-        return item.id == temp.deliveryProvince
-      })
-      const cindex = this.CityList.findIndex(item => {
-        return item.id == temp.deliveryCity
-      })
-      const aindex = this.AreaList.findIndex(item => {
-        return item.id == temp.deliveryArea
-      })
-      if (cindex < 0 || aindex < 0 || pindex < 0) {
-        this.$message.error('请检查格式地址')
-        return
-      }
-      temp.deliveryProvince = this.ProvinceList[pindex].areaName
-      temp.deliveryCity = this.CityList[cindex].areaName
-      temp.deliveryArea = this.AreaList[aindex].areaName
+      const { receiver, deliveryDate } = this.changeOrderInfo;
       // console.log(temp);
-      turnOrder(temp).then(res => {
-        if (res != '') {
-          this.$message.success('添加成功')
-          this.close()
+      if (
+        this.valiateProvince() &&
+        this.valiatePhone() &&
+        receiver &&
+        deliveryDate
+      ) {
+        const temp = { ...this.changeOrderInfo };
+        temp.busOppoId = this.busOppoId;
+        const pindex = this.ProvinceList.findIndex((item) => {
+          return item.id == temp.deliveryProvince;
+        });
+        const cindex = this.CityList.findIndex((item) => {
+          return item.id == temp.deliveryCity;
+        });
+        const aindex = this.AreaList.findIndex((item) => {
+          return item.id == temp.deliveryArea;
+        });
+        temp.deliveryProvince = this.ProvinceList[pindex].areaName;
+        temp.deliveryCity = this.CityList[cindex].areaName;
+        temp.deliveryArea = this.AreaList[aindex].areaName;
+        turnOrder(temp).then((res) => {
+          this.$message.success("添加成功");
+          this.close();
+        });
+      }else {
+        console.log(this.valiatePhone())
+        if(this.valiatePhone() === false){
+          this.$message.error("请检查手机号格式是否正确");
+        }else if(this.valiateProvince() === false){
+          this.$message.error("请检查地址格式是否正确");
+        }else{
+          this.$message.error("请正确填写信息");
         }
-      })
+      }
     },
     close() {
-      this.$emit('close')
-      this.reset()
+      this.$emit("close");
+      this.reset();
     },
     reset() {
       this.changeOrderInfo = {
-        busOppoId: '',
-        deliveryDate: '',
-        deliveryProvince: '',
-        deliveryCity: '',
-        deliveryArea: '',
-        deliveryAddress: '',
-        receiver: '',
-        receiverPhone: '',
-        remark: ''
-      }
+        busOppoId: "",
+        deliveryDate: "",
+        deliveryProvince: "",
+        deliveryCity: "",
+        deliveryArea: "",
+        deliveryAddress: "",
+        receiver: "",
+        receiverPhone: "",
+        remark: "",
+      };
     },
     changeProvince(e) {
-      order_area('pid=' + e).then(res => {
-        console.log(res)
-        this.CityList = res
-      })
+      order_area("pid=" + e).then((res) => {
+        console.log(res);
+        this.CityList = res;
+      });
     },
     changeCity(e) {
-      order_area('pid=' + e).then(res => {
-        console.log(res)
-        this.AreaList = res
-      })
-    }
-  }
-}
+      order_area("pid=" + e).then((res) => {
+        console.log(res);
+        this.AreaList = res;
+      });
+    },
+    valiateProvince() {
+      // 验证地址是否正确
+      const temp = { ...this.changeOrderInfo };
+      const pindex = this.ProvinceList.findIndex((item) => {
+        return item.id == temp.deliveryProvince;
+      });
+      const cindex = this.CityList.findIndex((item) => {
+        return item.id == temp.deliveryCity;
+      });
+      const aindex = this.AreaList.findIndex((item) => {
+        return item.id == temp.deliveryArea;
+      });
+      if (cindex < 0 || aindex < 0 || pindex < 0) {
+        return false;
+      } else {
+        return true;
+      }
+    },
+    valiatePhone() {
+      const reg =
+        /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/;
+      if (reg.test(this.changeOrderInfo.receiverPhone)) {
+        return true;
+      } else {
+        return false;
+      }
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -199,14 +264,14 @@
     .middle {
       display: flex;
       align-items: center;
-    //   background: blue;
+      //   background: blue;
     }
-    .middle{
-        padding-right: 54px;
+    .middle {
+      padding-right: 54px;
     }
     .containerFirst {
-        // background: red;
-         flex: 1;
+      // background: red;
+      flex: 1;
       .inputBox {
         //   background: green;
         display: flex;
diff --git a/src/views/sales/orderList.vue b/src/views/sales/orderList.vue
index 36e1a2d..df1f8de 100644
--- a/src/views/sales/orderList.vue
+++ b/src/views/sales/orderList.vue
@@ -52,6 +52,7 @@
       }"
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
+      v-loading="loading"
     >
       <el-table-column type="selection" width="55" />
       <el-table-column prop="index" label="序号" />
@@ -103,7 +104,8 @@
       selectInfo: {
         orderId: '',
         userName: ''
-      }
+      },
+      loading:false
 
     }
   },
@@ -111,12 +113,16 @@
     tableRowClassName: tableRowClassName,
 
     getListPage(limit, offset) {
+      this.loading = true
       listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
       // 得到相关数据
         res.rows.forEach((item, index) => {
           item.index = (index + 1) + ((offset - 1) * 10)
         })
         this.tableData = res
+        this.loading = false
+      }).catch(err => {
+        this.loading = false
       })
     },
     reset() {
diff --git a/src/views/sales/shop.vue b/src/views/sales/shop.vue
index 1f84e63..0a1c756 100644
--- a/src/views/sales/shop.vue
+++ b/src/views/sales/shop.vue
@@ -60,6 +60,7 @@
       }"
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
+      v-loading="loading"
     >
       <el-table-column type="selection" width="55" />
       <el-table-column prop="index" label="序号" />
@@ -126,7 +127,8 @@
         itemBudget: '',
         itemDuration: ''
       },
-      busOppoId: ''
+      busOppoId: '',
+      loading:false
     }
   },
   methods: {
@@ -141,12 +143,16 @@
       this.busOppoId = row.busOppoId
     },
     getListPage(limit, offset) {
+      this.loading = true
       listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
       // 得到相关数据
         res.rows.forEach((item, index) => {
           item.index = (index + 1) + ((offset - 1) * 10)
         })
         this.tableData = res
+        this.loading = false
+      }).catch(err => {
+        this.loading = false
       })
     },
     reset() {
@@ -155,7 +161,7 @@
         itemBudget: '',
         itemDuration: ''
       }
-    }
+    },
   }
 }
 </script>