diff --git a/dist.rar b/dist.rar
new file mode 100644
index 0000000..0c07f67
--- /dev/null
+++ b/dist.rar
Binary files differ

diff --git a/dist.rar b/dist.rar
new file mode 100644
index 0000000..0c07f67
--- /dev/null
+++ b/dist.rar
Binary files differ
diff --git a/src/components/mycomponent/dialog/move/bannerAddDialog.vue b/src/components/mycomponent/dialog/move/bannerAddDialog.vue
index e3bdd0c..6afaea5 100644
--- a/src/components/mycomponent/dialog/move/bannerAddDialog.vue
+++ b/src/components/mycomponent/dialog/move/bannerAddDialog.vue
@@ -13,7 +13,7 @@
         <div class="inputBox">
           <red-star />
           <input-vue
-            v-model="bannerInfo.bannerName"
+            v-model.trim="bannerInfo.bannerName"
             title="banner名称"
             placeholder="请输入唯一编号"
             width="300px"
@@ -89,124 +89,121 @@
         </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 DialogHeader from '../dialogHeader.vue'
-import RedStar from '../../redStar.vue'
-import InputNumber from '../../input/inputNumber.vue'
-import { getToken } from '@/utils/auth'
-import { Base64 } from 'js-base64'
-import { list, add, updata } from '../../../../api/move/bannerConfig'
+import InputVue from "../../input/inputVue.vue";
+import DialogHeader from "../dialogHeader.vue";
+import RedStar from "../../redStar.vue";
+import InputNumber from "../../input/inputNumber.vue";
+import { getToken } from "@/utils/auth";
+import { Base64 } from "js-base64";
+import { list, add, updata } from "../../../../api/move/bannerConfig";
 
 export default {
   components: {
     DialogHeader,
     RedStar,
     InputVue,
-    InputNumber
+    InputNumber,
   },
   props: {
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: true,
     },
-    title: '',
-    dataInfo: ''
+    title: "",
+    dataInfo: "",
   },
   data() {
     return {
       bannerInfo: {
-        bannerName: '',
-        bannerPicture: '',
-        skipUrl: '11',
-        bannerModule: '',
-        bannerSort: 0
+        bannerName: "",
+        bannerPicture: "",
+        skipUrl: "11",
+        bannerModule: "",
+        bannerSort: 0,
       },
       fileList: [],
-      modelList: []
-    }
+      modelList: [],
+    };
   },
   watch: {
     dataInfo: {
       handler(vls) {
+        console.log(vls, "编辑");
         // 得到base64网络
-        if (!vls.id) return
+        if (!vls.id) return;
         this.bannerInfo = {
           id: vls.id,
           bannerName: vls.bannerName,
-          bannerPicture: this.getBase64('http://111.198.10.15:21403/static/' + vls.bannerPicture),
+          bannerPicture: vls.bannerPicture,
           skipUrl: vls.skipUrl,
           bannerModule: vls.bannerModule,
-          bannerSort: vls.bannerSort
-        }
-        console.log(
-          this.getBase64('http://111.198.10.15:21403/static/' + vls.bannerPicture)
-        )
+          bannerSort: vls.bannerSort,
+        };
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   mounted() {
     list().then((res) => {
-      const Ary = []
-      const str = res[26].detail
-      const strAry = str.split(';')
+      const Ary = [];
+      const str = res[25].detail;
+      const strAry = str.split(";");
       for (let i = 0; i < strAry.length; i++) {
-        const temp = strAry[i].split(':')
+        const temp = strAry[i].split(":");
         Ary.push({
           key: temp[2],
-          value: temp[1]
-        })
+          value: temp[1],
+        });
       }
-      console.log(Ary)
-      this.modelList = Ary
-    })
+      this.modelList = Ary;
+    });
   },
   methods: {
     getToken: getToken,
     close() {
-      this.$emit('close')
+      this.$emit("close");
     },
     save() {
-      if (this.title == 'banner新增') {
-        add(this.bannerInfo).then((res) => {
-          if (res != '') {
-            this.close()
+      const {
+        bannerInfo: { bannerName, bannerPicture, bannerModule },
+      } = this;
+      if (bannerName && bannerPicture && bannerModule) {
+        if (this.title == "banner新增") {
+          add(this.bannerInfo).then((res) => {
+            this.$message.success("添加成功");
+            this.close();
             this.bannerInfo = {
-              bannerName: '',
-              bannerPicture: '',
-              skipUrl: '',
-              bannerModule: '',
-              bannerSort: 0
-            }
-          }
-        })
+              bannerName: "",
+              bannerPicture: "",
+              skipUrl: "",
+              bannerModule: "",
+              bannerSort: 0,
+            };
+          });
+        } else {
+          updata(this.bannerInfo).then((res) => {
+            this.$message.success("更新成功");
+            this.close();
+            this.bannerInfo = {
+              bannerName: "",
+              bannerPicture: "",
+              skipUrl: "",
+              bannerModule: "",
+              bannerSort: 0,
+            };
+          });
+        }
       } else {
-        updata(this.bannerInfo).then(res => {
-          if (res != '') {
-            this.$message.success('更新成功')
-            this.close()
-            this.bannerInfo = {
-              bannerName: '',
-              bannerPicture: '',
-              skipUrl: '',
-              bannerModule: '',
-              bannerSort: 0
-            }
-          }
-        })
+        this.$message.error("请先完整填写信息");
       }
     },
 
@@ -214,60 +211,80 @@
       // console.log(response, file, fileList);
     },
     httpRequest(file) {
-      console.log(file.file, '========================')
+      console.log(file.file, "========================");
 
       // this.bannerInfo.bannerPicture =  Base64.encode(file.file)
-      var reader = new FileReader()
+      var reader = new FileReader();
 
-      reader.readAsDataURL(file.file)
+      reader.readAsDataURL(file.file);
       // console.log(reader.readyState,"===========result====",reader,reader.FileReader);
       const timer = setInterval(() => {
         if (reader.result) {
-          clearInterval(timer)
-          this.bannerInfo.bannerPicture = reader.result
-          console.log(this.bannerInfo.bannerPicture)
+          clearInterval(timer);
+          this.bannerInfo.bannerPicture = reader.result;
+          console.log(this.bannerInfo.bannerPicture);
         }
-      }, 300)
+      }, 300);
     },
     handleChange(file, fileList) {
-      console.log(fileList, file)
-      this.fileList = fileList.slice(-1)
+      this.fileList = fileList.slice(-1);
     },
     //  网络图片转base64编码
     getBase64(imgUrl) {
-      window.URL = window.URL || window.webkitURL
-      var xhr = new XMLHttpRequest()
-      xhr.open('get', imgUrl, true)
+      window.URL = window.URL || window.webkitURL;
+      var xhr = new XMLHttpRequest();
+      xhr.open("get", imgUrl, true);
       // 至关重要
-      xhr.responseType = 'blob'
-      xhr.onload = function() {
+      xhr.responseType = "blob";
+      xhr.onload = function () {
         if (this.status == 200) {
           // 得到一个blob对象
-          var blob = this.response
-          console.log('blob', blob)
+          var blob = this.response;
+          console.log("blob", blob);
           // 至关重要
-          const oFileReader = new FileReader()
-          oFileReader.onloadend = function(e) {
+          const oFileReader = new FileReader();
+          oFileReader.onloadend = function (e) {
             // 此处拿到的已经是 base64的图片了
-            const base64 = e.target.result
+            const base64 = e.target.result;
             // console.log("方式一》》》》》》》》》", base64);
-          }
-          oFileReader.readAsDataURL(blob)
+          };
+          oFileReader.readAsDataURL(blob);
           // ====为了在页面显示图片，可以删除====
-          var img = document.createElement('img')
-          img.onload = function(e) {
-            window.URL.revokeObjectURL(img.src) // 清除释放
-          }
-          const src = window.URL.createObjectURL(blob)
-          img.src = src
+          var img = document.createElement("img");
+          img.onload = function (e) {
+            window.URL.revokeObjectURL(img.src); // 清除释放
+          };
+          const src = window.URL.createObjectURL(blob);
+          img.src = src;
           // document.getElementById("container1").appendChild(img);
           // ====为了在页面显示图片，可以删除====
         }
-      }
-      xhr.send()
-    }
-  }
-}
+      };
+      xhr.send();
+    },
+    // 网络图片转base64 canvans方式
+    getBase64Image(img) {
+      var canvas = document.createElement("canvas");
+      canvas.width = img.width;
+      canvas.height = img.height;
+      var ctx = canvas.getContext("2d");
+      ctx.drawImage(img, 0, 0, img.width, img.height);
+      var dataURL = canvas.toDataURL("image/png"); // 可选其他值 image/jpeg
+      return dataURL;
+    },
+
+    main(src) {
+      let _this = this
+      var image = new Image();
+      image.src = src + "?v=" + Math.random(); // 处理缓存
+      image.crossOrigin = "*"; // 支持跨域图片
+      image.onload = function () {
+        var base64 = _this.getBase64Image(image);
+        this.bannerInfo.bannerPicture = base64
+      };
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>

diff --git a/dist.rar b/dist.rar
new file mode 100644
index 0000000..0c07f67
--- /dev/null
+++ b/dist.rar
Binary files differ
diff --git a/src/components/mycomponent/dialog/move/bannerAddDialog.vue b/src/components/mycomponent/dialog/move/bannerAddDialog.vue
index e3bdd0c..6afaea5 100644
--- a/src/components/mycomponent/dialog/move/bannerAddDialog.vue
+++ b/src/components/mycomponent/dialog/move/bannerAddDialog.vue
@@ -13,7 +13,7 @@
         <div class="inputBox">
           <red-star />
           <input-vue
-            v-model="bannerInfo.bannerName"
+            v-model.trim="bannerInfo.bannerName"
             title="banner名称"
             placeholder="请输入唯一编号"
             width="300px"
@@ -89,124 +89,121 @@
         </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 DialogHeader from '../dialogHeader.vue'
-import RedStar from '../../redStar.vue'
-import InputNumber from '../../input/inputNumber.vue'
-import { getToken } from '@/utils/auth'
-import { Base64 } from 'js-base64'
-import { list, add, updata } from '../../../../api/move/bannerConfig'
+import InputVue from "../../input/inputVue.vue";
+import DialogHeader from "../dialogHeader.vue";
+import RedStar from "../../redStar.vue";
+import InputNumber from "../../input/inputNumber.vue";
+import { getToken } from "@/utils/auth";
+import { Base64 } from "js-base64";
+import { list, add, updata } from "../../../../api/move/bannerConfig";
 
 export default {
   components: {
     DialogHeader,
     RedStar,
     InputVue,
-    InputNumber
+    InputNumber,
   },
   props: {
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: true,
     },
-    title: '',
-    dataInfo: ''
+    title: "",
+    dataInfo: "",
   },
   data() {
     return {
       bannerInfo: {
-        bannerName: '',
-        bannerPicture: '',
-        skipUrl: '11',
-        bannerModule: '',
-        bannerSort: 0
+        bannerName: "",
+        bannerPicture: "",
+        skipUrl: "11",
+        bannerModule: "",
+        bannerSort: 0,
       },
       fileList: [],
-      modelList: []
-    }
+      modelList: [],
+    };
   },
   watch: {
     dataInfo: {
       handler(vls) {
+        console.log(vls, "编辑");
         // 得到base64网络
-        if (!vls.id) return
+        if (!vls.id) return;
         this.bannerInfo = {
           id: vls.id,
           bannerName: vls.bannerName,
-          bannerPicture: this.getBase64('http://111.198.10.15:21403/static/' + vls.bannerPicture),
+          bannerPicture: vls.bannerPicture,
           skipUrl: vls.skipUrl,
           bannerModule: vls.bannerModule,
-          bannerSort: vls.bannerSort
-        }
-        console.log(
-          this.getBase64('http://111.198.10.15:21403/static/' + vls.bannerPicture)
-        )
+          bannerSort: vls.bannerSort,
+        };
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   mounted() {
     list().then((res) => {
-      const Ary = []
-      const str = res[26].detail
-      const strAry = str.split(';')
+      const Ary = [];
+      const str = res[25].detail;
+      const strAry = str.split(";");
       for (let i = 0; i < strAry.length; i++) {
-        const temp = strAry[i].split(':')
+        const temp = strAry[i].split(":");
         Ary.push({
           key: temp[2],
-          value: temp[1]
-        })
+          value: temp[1],
+        });
       }
-      console.log(Ary)
-      this.modelList = Ary
-    })
+      this.modelList = Ary;
+    });
   },
   methods: {
     getToken: getToken,
     close() {
-      this.$emit('close')
+      this.$emit("close");
     },
     save() {
-      if (this.title == 'banner新增') {
-        add(this.bannerInfo).then((res) => {
-          if (res != '') {
-            this.close()
+      const {
+        bannerInfo: { bannerName, bannerPicture, bannerModule },
+      } = this;
+      if (bannerName && bannerPicture && bannerModule) {
+        if (this.title == "banner新增") {
+          add(this.bannerInfo).then((res) => {
+            this.$message.success("添加成功");
+            this.close();
             this.bannerInfo = {
-              bannerName: '',
-              bannerPicture: '',
-              skipUrl: '',
-              bannerModule: '',
-              bannerSort: 0
-            }
-          }
-        })
+              bannerName: "",
+              bannerPicture: "",
+              skipUrl: "",
+              bannerModule: "",
+              bannerSort: 0,
+            };
+          });
+        } else {
+          updata(this.bannerInfo).then((res) => {
+            this.$message.success("更新成功");
+            this.close();
+            this.bannerInfo = {
+              bannerName: "",
+              bannerPicture: "",
+              skipUrl: "",
+              bannerModule: "",
+              bannerSort: 0,
+            };
+          });
+        }
       } else {
-        updata(this.bannerInfo).then(res => {
-          if (res != '') {
-            this.$message.success('更新成功')
-            this.close()
-            this.bannerInfo = {
-              bannerName: '',
-              bannerPicture: '',
-              skipUrl: '',
-              bannerModule: '',
-              bannerSort: 0
-            }
-          }
-        })
+        this.$message.error("请先完整填写信息");
       }
     },
 
@@ -214,60 +211,80 @@
       // console.log(response, file, fileList);
     },
     httpRequest(file) {
-      console.log(file.file, '========================')
+      console.log(file.file, "========================");
 
       // this.bannerInfo.bannerPicture =  Base64.encode(file.file)
-      var reader = new FileReader()
+      var reader = new FileReader();
 
-      reader.readAsDataURL(file.file)
+      reader.readAsDataURL(file.file);
       // console.log(reader.readyState,"===========result====",reader,reader.FileReader);
       const timer = setInterval(() => {
         if (reader.result) {
-          clearInterval(timer)
-          this.bannerInfo.bannerPicture = reader.result
-          console.log(this.bannerInfo.bannerPicture)
+          clearInterval(timer);
+          this.bannerInfo.bannerPicture = reader.result;
+          console.log(this.bannerInfo.bannerPicture);
         }
-      }, 300)
+      }, 300);
     },
     handleChange(file, fileList) {
-      console.log(fileList, file)
-      this.fileList = fileList.slice(-1)
+      this.fileList = fileList.slice(-1);
     },
     //  网络图片转base64编码
     getBase64(imgUrl) {
-      window.URL = window.URL || window.webkitURL
-      var xhr = new XMLHttpRequest()
-      xhr.open('get', imgUrl, true)
+      window.URL = window.URL || window.webkitURL;
+      var xhr = new XMLHttpRequest();
+      xhr.open("get", imgUrl, true);
       // 至关重要
-      xhr.responseType = 'blob'
-      xhr.onload = function() {
+      xhr.responseType = "blob";
+      xhr.onload = function () {
         if (this.status == 200) {
           // 得到一个blob对象
-          var blob = this.response
-          console.log('blob', blob)
+          var blob = this.response;
+          console.log("blob", blob);
           // 至关重要
-          const oFileReader = new FileReader()
-          oFileReader.onloadend = function(e) {
+          const oFileReader = new FileReader();
+          oFileReader.onloadend = function (e) {
             // 此处拿到的已经是 base64的图片了
-            const base64 = e.target.result
+            const base64 = e.target.result;
             // console.log("方式一》》》》》》》》》", base64);
-          }
-          oFileReader.readAsDataURL(blob)
+          };
+          oFileReader.readAsDataURL(blob);
           // ====为了在页面显示图片，可以删除====
-          var img = document.createElement('img')
-          img.onload = function(e) {
-            window.URL.revokeObjectURL(img.src) // 清除释放
-          }
-          const src = window.URL.createObjectURL(blob)
-          img.src = src
+          var img = document.createElement("img");
+          img.onload = function (e) {
+            window.URL.revokeObjectURL(img.src); // 清除释放
+          };
+          const src = window.URL.createObjectURL(blob);
+          img.src = src;
           // document.getElementById("container1").appendChild(img);
           // ====为了在页面显示图片，可以删除====
         }
-      }
-      xhr.send()
-    }
-  }
-}
+      };
+      xhr.send();
+    },
+    // 网络图片转base64 canvans方式
+    getBase64Image(img) {
+      var canvas = document.createElement("canvas");
+      canvas.width = img.width;
+      canvas.height = img.height;
+      var ctx = canvas.getContext("2d");
+      ctx.drawImage(img, 0, 0, img.width, img.height);
+      var dataURL = canvas.toDataURL("image/png"); // 可选其他值 image/jpeg
+      return dataURL;
+    },
+
+    main(src) {
+      let _this = this
+      var image = new Image();
+      image.src = src + "?v=" + Math.random(); // 处理缓存
+      image.crossOrigin = "*"; // 支持跨域图片
+      image.onload = function () {
+        var base64 = _this.getBase64Image(image);
+        this.bannerInfo.bannerPicture = base64
+      };
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
index 5e58333..4cae18a 100644
--- a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
+++ b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
@@ -13,7 +13,7 @@
           <div class="inputBox">
             <red-star />
             <input-vue
-              v-model="changeOrderInfo.receiver"
+              v-model.trim="changeOrderInfo.receiver"
               title="收货人"
               width="300px"
               class="inputWidth"
@@ -22,7 +22,7 @@
           <div class="inputBox">
             <red-star />
             <input-vue
-              v-model="changeOrderInfo.receiverPhone"
+              v-model.trim="changeOrderInfo.receiverPhone"
               title="收货人联系方式"
               width="300px"
               class="inputWidth"
@@ -74,7 +74,7 @@
               />
             </el-select>
             <el-input
-              v-model="changeOrderInfo.deliveryAddress"
+              v-model.trim="changeOrderInfo.deliveryAddress"
               placeholder="请输入内容"
               style="width: 638px"
             />
@@ -101,7 +101,7 @@
               style="justify-content: space-between"
             >
               <el-input
-                v-model="changeOrderInfo.remark"
+                v-model.trim="changeOrderInfo.remark"
                 style="width: 300px"
                 type="textarea"
                 :rows="3"

diff --git a/dist.rar b/dist.rar
new file mode 100644
index 0000000..0c07f67
--- /dev/null
+++ b/dist.rar
Binary files differ
diff --git a/src/components/mycomponent/dialog/move/bannerAddDialog.vue b/src/components/mycomponent/dialog/move/bannerAddDialog.vue
index e3bdd0c..6afaea5 100644
--- a/src/components/mycomponent/dialog/move/bannerAddDialog.vue
+++ b/src/components/mycomponent/dialog/move/bannerAddDialog.vue
@@ -13,7 +13,7 @@
         <div class="inputBox">
           <red-star />
           <input-vue
-            v-model="bannerInfo.bannerName"
+            v-model.trim="bannerInfo.bannerName"
             title="banner名称"
             placeholder="请输入唯一编号"
             width="300px"
@@ -89,124 +89,121 @@
         </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 DialogHeader from '../dialogHeader.vue'
-import RedStar from '../../redStar.vue'
-import InputNumber from '../../input/inputNumber.vue'
-import { getToken } from '@/utils/auth'
-import { Base64 } from 'js-base64'
-import { list, add, updata } from '../../../../api/move/bannerConfig'
+import InputVue from "../../input/inputVue.vue";
+import DialogHeader from "../dialogHeader.vue";
+import RedStar from "../../redStar.vue";
+import InputNumber from "../../input/inputNumber.vue";
+import { getToken } from "@/utils/auth";
+import { Base64 } from "js-base64";
+import { list, add, updata } from "../../../../api/move/bannerConfig";
 
 export default {
   components: {
     DialogHeader,
     RedStar,
     InputVue,
-    InputNumber
+    InputNumber,
   },
   props: {
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: true,
     },
-    title: '',
-    dataInfo: ''
+    title: "",
+    dataInfo: "",
   },
   data() {
     return {
       bannerInfo: {
-        bannerName: '',
-        bannerPicture: '',
-        skipUrl: '11',
-        bannerModule: '',
-        bannerSort: 0
+        bannerName: "",
+        bannerPicture: "",
+        skipUrl: "11",
+        bannerModule: "",
+        bannerSort: 0,
       },
       fileList: [],
-      modelList: []
-    }
+      modelList: [],
+    };
   },
   watch: {
     dataInfo: {
       handler(vls) {
+        console.log(vls, "编辑");
         // 得到base64网络
-        if (!vls.id) return
+        if (!vls.id) return;
         this.bannerInfo = {
           id: vls.id,
           bannerName: vls.bannerName,
-          bannerPicture: this.getBase64('http://111.198.10.15:21403/static/' + vls.bannerPicture),
+          bannerPicture: vls.bannerPicture,
           skipUrl: vls.skipUrl,
           bannerModule: vls.bannerModule,
-          bannerSort: vls.bannerSort
-        }
-        console.log(
-          this.getBase64('http://111.198.10.15:21403/static/' + vls.bannerPicture)
-        )
+          bannerSort: vls.bannerSort,
+        };
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   mounted() {
     list().then((res) => {
-      const Ary = []
-      const str = res[26].detail
-      const strAry = str.split(';')
+      const Ary = [];
+      const str = res[25].detail;
+      const strAry = str.split(";");
       for (let i = 0; i < strAry.length; i++) {
-        const temp = strAry[i].split(':')
+        const temp = strAry[i].split(":");
         Ary.push({
           key: temp[2],
-          value: temp[1]
-        })
+          value: temp[1],
+        });
       }
-      console.log(Ary)
-      this.modelList = Ary
-    })
+      this.modelList = Ary;
+    });
   },
   methods: {
     getToken: getToken,
     close() {
-      this.$emit('close')
+      this.$emit("close");
     },
     save() {
-      if (this.title == 'banner新增') {
-        add(this.bannerInfo).then((res) => {
-          if (res != '') {
-            this.close()
+      const {
+        bannerInfo: { bannerName, bannerPicture, bannerModule },
+      } = this;
+      if (bannerName && bannerPicture && bannerModule) {
+        if (this.title == "banner新增") {
+          add(this.bannerInfo).then((res) => {
+            this.$message.success("添加成功");
+            this.close();
             this.bannerInfo = {
-              bannerName: '',
-              bannerPicture: '',
-              skipUrl: '',
-              bannerModule: '',
-              bannerSort: 0
-            }
-          }
-        })
+              bannerName: "",
+              bannerPicture: "",
+              skipUrl: "",
+              bannerModule: "",
+              bannerSort: 0,
+            };
+          });
+        } else {
+          updata(this.bannerInfo).then((res) => {
+            this.$message.success("更新成功");
+            this.close();
+            this.bannerInfo = {
+              bannerName: "",
+              bannerPicture: "",
+              skipUrl: "",
+              bannerModule: "",
+              bannerSort: 0,
+            };
+          });
+        }
       } else {
-        updata(this.bannerInfo).then(res => {
-          if (res != '') {
-            this.$message.success('更新成功')
-            this.close()
-            this.bannerInfo = {
-              bannerName: '',
-              bannerPicture: '',
-              skipUrl: '',
-              bannerModule: '',
-              bannerSort: 0
-            }
-          }
-        })
+        this.$message.error("请先完整填写信息");
       }
     },
 
@@ -214,60 +211,80 @@
       // console.log(response, file, fileList);
     },
     httpRequest(file) {
-      console.log(file.file, '========================')
+      console.log(file.file, "========================");
 
       // this.bannerInfo.bannerPicture =  Base64.encode(file.file)
-      var reader = new FileReader()
+      var reader = new FileReader();
 
-      reader.readAsDataURL(file.file)
+      reader.readAsDataURL(file.file);
       // console.log(reader.readyState,"===========result====",reader,reader.FileReader);
       const timer = setInterval(() => {
         if (reader.result) {
-          clearInterval(timer)
-          this.bannerInfo.bannerPicture = reader.result
-          console.log(this.bannerInfo.bannerPicture)
+          clearInterval(timer);
+          this.bannerInfo.bannerPicture = reader.result;
+          console.log(this.bannerInfo.bannerPicture);
         }
-      }, 300)
+      }, 300);
     },
     handleChange(file, fileList) {
-      console.log(fileList, file)
-      this.fileList = fileList.slice(-1)
+      this.fileList = fileList.slice(-1);
     },
     //  网络图片转base64编码
     getBase64(imgUrl) {
-      window.URL = window.URL || window.webkitURL
-      var xhr = new XMLHttpRequest()
-      xhr.open('get', imgUrl, true)
+      window.URL = window.URL || window.webkitURL;
+      var xhr = new XMLHttpRequest();
+      xhr.open("get", imgUrl, true);
       // 至关重要
-      xhr.responseType = 'blob'
-      xhr.onload = function() {
+      xhr.responseType = "blob";
+      xhr.onload = function () {
         if (this.status == 200) {
           // 得到一个blob对象
-          var blob = this.response
-          console.log('blob', blob)
+          var blob = this.response;
+          console.log("blob", blob);
           // 至关重要
-          const oFileReader = new FileReader()
-          oFileReader.onloadend = function(e) {
+          const oFileReader = new FileReader();
+          oFileReader.onloadend = function (e) {
             // 此处拿到的已经是 base64的图片了
-            const base64 = e.target.result
+            const base64 = e.target.result;
             // console.log("方式一》》》》》》》》》", base64);
-          }
-          oFileReader.readAsDataURL(blob)
+          };
+          oFileReader.readAsDataURL(blob);
           // ====为了在页面显示图片，可以删除====
-          var img = document.createElement('img')
-          img.onload = function(e) {
-            window.URL.revokeObjectURL(img.src) // 清除释放
-          }
-          const src = window.URL.createObjectURL(blob)
-          img.src = src
+          var img = document.createElement("img");
+          img.onload = function (e) {
+            window.URL.revokeObjectURL(img.src); // 清除释放
+          };
+          const src = window.URL.createObjectURL(blob);
+          img.src = src;
           // document.getElementById("container1").appendChild(img);
           // ====为了在页面显示图片，可以删除====
         }
-      }
-      xhr.send()
-    }
-  }
-}
+      };
+      xhr.send();
+    },
+    // 网络图片转base64 canvans方式
+    getBase64Image(img) {
+      var canvas = document.createElement("canvas");
+      canvas.width = img.width;
+      canvas.height = img.height;
+      var ctx = canvas.getContext("2d");
+      ctx.drawImage(img, 0, 0, img.width, img.height);
+      var dataURL = canvas.toDataURL("image/png"); // 可选其他值 image/jpeg
+      return dataURL;
+    },
+
+    main(src) {
+      let _this = this
+      var image = new Image();
+      image.src = src + "?v=" + Math.random(); // 处理缓存
+      image.crossOrigin = "*"; // 支持跨域图片
+      image.onload = function () {
+        var base64 = _this.getBase64Image(image);
+        this.bannerInfo.bannerPicture = base64
+      };
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
index 5e58333..4cae18a 100644
--- a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
+++ b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
@@ -13,7 +13,7 @@
           <div class="inputBox">
             <red-star />
             <input-vue
-              v-model="changeOrderInfo.receiver"
+              v-model.trim="changeOrderInfo.receiver"
               title="收货人"
               width="300px"
               class="inputWidth"
@@ -22,7 +22,7 @@
           <div class="inputBox">
             <red-star />
             <input-vue
-              v-model="changeOrderInfo.receiverPhone"
+              v-model.trim="changeOrderInfo.receiverPhone"
               title="收货人联系方式"
               width="300px"
               class="inputWidth"
@@ -74,7 +74,7 @@
               />
             </el-select>
             <el-input
-              v-model="changeOrderInfo.deliveryAddress"
+              v-model.trim="changeOrderInfo.deliveryAddress"
               placeholder="请输入内容"
               style="width: 638px"
             />
@@ -101,7 +101,7 @@
               style="justify-content: space-between"
             >
               <el-input
-                v-model="changeOrderInfo.remark"
+                v-model.trim="changeOrderInfo.remark"
                 style="width: 300px"
                 type="textarea"
                 :rows="3"
diff --git a/src/components/mycomponent/dialog/server/managementAddDialog.vue b/src/components/mycomponent/dialog/server/managementAddDialog.vue
index d3c1b9d..e1b2210 100644
--- a/src/components/mycomponent/dialog/server/managementAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/managementAddDialog.vue
@@ -12,7 +12,7 @@
         <div class="inputBox">
           <red-star />
           <input-vue
-            v-model="managementInfo.serviceCode"
+            v-model.trim="managementInfo.serviceCode"
             title="服务编号"
             placeholder="请输入服务编号"
             width="300px"
@@ -23,7 +23,7 @@
         <div class="inputBox">
           <red-star />
           <input-vue
-            v-model="managementInfo.serviceName"
+            v-model.trim="managementInfo.serviceName"
             title="服务名称"
             placeholder="请输入服务名称"
             width="300px"
@@ -78,7 +78,7 @@
         <div class="inputBox">
           <red-star />
           <input-vue
-            v-model="managementInfo.description"
+            v-model.trim="managementInfo.description"
             title="服务描述"
             width="300px"
             class="inputWidth"
@@ -112,7 +112,7 @@
             style="justify-content: space-between"
           >
             <el-input
-              v-model="managementInfo.remark"
+              v-model.trim="managementInfo.remark"
               type="textarea"
               style="width: 300px"
               :rows="2"

diff --git a/dist.rar b/dist.rar
new file mode 100644
index 0000000..0c07f67
--- /dev/null
+++ b/dist.rar
Binary files differ
diff --git a/src/components/mycomponent/dialog/move/bannerAddDialog.vue b/src/components/mycomponent/dialog/move/bannerAddDialog.vue
index e3bdd0c..6afaea5 100644
--- a/src/components/mycomponent/dialog/move/bannerAddDialog.vue
+++ b/src/components/mycomponent/dialog/move/bannerAddDialog.vue
@@ -13,7 +13,7 @@
         <div class="inputBox">
           <red-star />
           <input-vue
-            v-model="bannerInfo.bannerName"
+            v-model.trim="bannerInfo.bannerName"
             title="banner名称"
             placeholder="请输入唯一编号"
             width="300px"
@@ -89,124 +89,121 @@
         </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 DialogHeader from '../dialogHeader.vue'
-import RedStar from '../../redStar.vue'
-import InputNumber from '../../input/inputNumber.vue'
-import { getToken } from '@/utils/auth'
-import { Base64 } from 'js-base64'
-import { list, add, updata } from '../../../../api/move/bannerConfig'
+import InputVue from "../../input/inputVue.vue";
+import DialogHeader from "../dialogHeader.vue";
+import RedStar from "../../redStar.vue";
+import InputNumber from "../../input/inputNumber.vue";
+import { getToken } from "@/utils/auth";
+import { Base64 } from "js-base64";
+import { list, add, updata } from "../../../../api/move/bannerConfig";
 
 export default {
   components: {
     DialogHeader,
     RedStar,
     InputVue,
-    InputNumber
+    InputNumber,
   },
   props: {
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: true,
     },
-    title: '',
-    dataInfo: ''
+    title: "",
+    dataInfo: "",
   },
   data() {
     return {
       bannerInfo: {
-        bannerName: '',
-        bannerPicture: '',
-        skipUrl: '11',
-        bannerModule: '',
-        bannerSort: 0
+        bannerName: "",
+        bannerPicture: "",
+        skipUrl: "11",
+        bannerModule: "",
+        bannerSort: 0,
       },
       fileList: [],
-      modelList: []
-    }
+      modelList: [],
+    };
   },
   watch: {
     dataInfo: {
       handler(vls) {
+        console.log(vls, "编辑");
         // 得到base64网络
-        if (!vls.id) return
+        if (!vls.id) return;
         this.bannerInfo = {
           id: vls.id,
           bannerName: vls.bannerName,
-          bannerPicture: this.getBase64('http://111.198.10.15:21403/static/' + vls.bannerPicture),
+          bannerPicture: vls.bannerPicture,
           skipUrl: vls.skipUrl,
           bannerModule: vls.bannerModule,
-          bannerSort: vls.bannerSort
-        }
-        console.log(
-          this.getBase64('http://111.198.10.15:21403/static/' + vls.bannerPicture)
-        )
+          bannerSort: vls.bannerSort,
+        };
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   mounted() {
     list().then((res) => {
-      const Ary = []
-      const str = res[26].detail
-      const strAry = str.split(';')
+      const Ary = [];
+      const str = res[25].detail;
+      const strAry = str.split(";");
       for (let i = 0; i < strAry.length; i++) {
-        const temp = strAry[i].split(':')
+        const temp = strAry[i].split(":");
         Ary.push({
           key: temp[2],
-          value: temp[1]
-        })
+          value: temp[1],
+        });
       }
-      console.log(Ary)
-      this.modelList = Ary
-    })
+      this.modelList = Ary;
+    });
   },
   methods: {
     getToken: getToken,
     close() {
-      this.$emit('close')
+      this.$emit("close");
     },
     save() {
-      if (this.title == 'banner新增') {
-        add(this.bannerInfo).then((res) => {
-          if (res != '') {
-            this.close()
+      const {
+        bannerInfo: { bannerName, bannerPicture, bannerModule },
+      } = this;
+      if (bannerName && bannerPicture && bannerModule) {
+        if (this.title == "banner新增") {
+          add(this.bannerInfo).then((res) => {
+            this.$message.success("添加成功");
+            this.close();
             this.bannerInfo = {
-              bannerName: '',
-              bannerPicture: '',
-              skipUrl: '',
-              bannerModule: '',
-              bannerSort: 0
-            }
-          }
-        })
+              bannerName: "",
+              bannerPicture: "",
+              skipUrl: "",
+              bannerModule: "",
+              bannerSort: 0,
+            };
+          });
+        } else {
+          updata(this.bannerInfo).then((res) => {
+            this.$message.success("更新成功");
+            this.close();
+            this.bannerInfo = {
+              bannerName: "",
+              bannerPicture: "",
+              skipUrl: "",
+              bannerModule: "",
+              bannerSort: 0,
+            };
+          });
+        }
       } else {
-        updata(this.bannerInfo).then(res => {
-          if (res != '') {
-            this.$message.success('更新成功')
-            this.close()
-            this.bannerInfo = {
-              bannerName: '',
-              bannerPicture: '',
-              skipUrl: '',
-              bannerModule: '',
-              bannerSort: 0
-            }
-          }
-        })
+        this.$message.error("请先完整填写信息");
       }
     },
 
@@ -214,60 +211,80 @@
       // console.log(response, file, fileList);
     },
     httpRequest(file) {
-      console.log(file.file, '========================')
+      console.log(file.file, "========================");
 
       // this.bannerInfo.bannerPicture =  Base64.encode(file.file)
-      var reader = new FileReader()
+      var reader = new FileReader();
 
-      reader.readAsDataURL(file.file)
+      reader.readAsDataURL(file.file);
       // console.log(reader.readyState,"===========result====",reader,reader.FileReader);
       const timer = setInterval(() => {
         if (reader.result) {
-          clearInterval(timer)
-          this.bannerInfo.bannerPicture = reader.result
-          console.log(this.bannerInfo.bannerPicture)
+          clearInterval(timer);
+          this.bannerInfo.bannerPicture = reader.result;
+          console.log(this.bannerInfo.bannerPicture);
         }
-      }, 300)
+      }, 300);
     },
     handleChange(file, fileList) {
-      console.log(fileList, file)
-      this.fileList = fileList.slice(-1)
+      this.fileList = fileList.slice(-1);
     },
     //  网络图片转base64编码
     getBase64(imgUrl) {
-      window.URL = window.URL || window.webkitURL
-      var xhr = new XMLHttpRequest()
-      xhr.open('get', imgUrl, true)
+      window.URL = window.URL || window.webkitURL;
+      var xhr = new XMLHttpRequest();
+      xhr.open("get", imgUrl, true);
       // 至关重要
-      xhr.responseType = 'blob'
-      xhr.onload = function() {
+      xhr.responseType = "blob";
+      xhr.onload = function () {
         if (this.status == 200) {
           // 得到一个blob对象
-          var blob = this.response
-          console.log('blob', blob)
+          var blob = this.response;
+          console.log("blob", blob);
           // 至关重要
-          const oFileReader = new FileReader()
-          oFileReader.onloadend = function(e) {
+          const oFileReader = new FileReader();
+          oFileReader.onloadend = function (e) {
             // 此处拿到的已经是 base64的图片了
-            const base64 = e.target.result
+            const base64 = e.target.result;
             // console.log("方式一》》》》》》》》》", base64);
-          }
-          oFileReader.readAsDataURL(blob)
+          };
+          oFileReader.readAsDataURL(blob);
           // ====为了在页面显示图片，可以删除====
-          var img = document.createElement('img')
-          img.onload = function(e) {
-            window.URL.revokeObjectURL(img.src) // 清除释放
-          }
-          const src = window.URL.createObjectURL(blob)
-          img.src = src
+          var img = document.createElement("img");
+          img.onload = function (e) {
+            window.URL.revokeObjectURL(img.src); // 清除释放
+          };
+          const src = window.URL.createObjectURL(blob);
+          img.src = src;
           // document.getElementById("container1").appendChild(img);
           // ====为了在页面显示图片，可以删除====
         }
-      }
-      xhr.send()
-    }
-  }
-}
+      };
+      xhr.send();
+    },
+    // 网络图片转base64 canvans方式
+    getBase64Image(img) {
+      var canvas = document.createElement("canvas");
+      canvas.width = img.width;
+      canvas.height = img.height;
+      var ctx = canvas.getContext("2d");
+      ctx.drawImage(img, 0, 0, img.width, img.height);
+      var dataURL = canvas.toDataURL("image/png"); // 可选其他值 image/jpeg
+      return dataURL;
+    },
+
+    main(src) {
+      let _this = this
+      var image = new Image();
+      image.src = src + "?v=" + Math.random(); // 处理缓存
+      image.crossOrigin = "*"; // 支持跨域图片
+      image.onload = function () {
+        var base64 = _this.getBase64Image(image);
+        this.bannerInfo.bannerPicture = base64
+      };
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
index 5e58333..4cae18a 100644
--- a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
+++ b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
@@ -13,7 +13,7 @@
           <div class="inputBox">
             <red-star />
             <input-vue
-              v-model="changeOrderInfo.receiver"
+              v-model.trim="changeOrderInfo.receiver"
               title="收货人"
               width="300px"
               class="inputWidth"
@@ -22,7 +22,7 @@
           <div class="inputBox">
             <red-star />
             <input-vue
-              v-model="changeOrderInfo.receiverPhone"
+              v-model.trim="changeOrderInfo.receiverPhone"
               title="收货人联系方式"
               width="300px"
               class="inputWidth"
@@ -74,7 +74,7 @@
               />
             </el-select>
             <el-input
-              v-model="changeOrderInfo.deliveryAddress"
+              v-model.trim="changeOrderInfo.deliveryAddress"
               placeholder="请输入内容"
               style="width: 638px"
             />
@@ -101,7 +101,7 @@
               style="justify-content: space-between"
             >
               <el-input
-                v-model="changeOrderInfo.remark"
+                v-model.trim="changeOrderInfo.remark"
                 style="width: 300px"
                 type="textarea"
                 :rows="3"
diff --git a/src/components/mycomponent/dialog/server/managementAddDialog.vue b/src/components/mycomponent/dialog/server/managementAddDialog.vue
index d3c1b9d..e1b2210 100644
--- a/src/components/mycomponent/dialog/server/managementAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/managementAddDialog.vue
@@ -12,7 +12,7 @@
         <div class="inputBox">
           <red-star />
           <input-vue
-            v-model="managementInfo.serviceCode"
+            v-model.trim="managementInfo.serviceCode"
             title="服务编号"
             placeholder="请输入服务编号"
             width="300px"
@@ -23,7 +23,7 @@
         <div class="inputBox">
           <red-star />
           <input-vue
-            v-model="managementInfo.serviceName"
+            v-model.trim="managementInfo.serviceName"
             title="服务名称"
             placeholder="请输入服务名称"
             width="300px"
@@ -78,7 +78,7 @@
         <div class="inputBox">
           <red-star />
           <input-vue
-            v-model="managementInfo.description"
+            v-model.trim="managementInfo.description"
             title="服务描述"
             width="300px"
             class="inputWidth"
@@ -112,7 +112,7 @@
             style="justify-content: space-between"
           >
             <el-input
-              v-model="managementInfo.remark"
+              v-model.trim="managementInfo.remark"
               type="textarea"
               style="width: 300px"
               :rows="2"
diff --git a/src/components/mycomponent/dialog/server/operationAddDialog.vue b/src/components/mycomponent/dialog/server/operationAddDialog.vue
index d436541..abd0a23 100644
--- a/src/components/mycomponent/dialog/server/operationAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/operationAddDialog.vue
@@ -11,12 +11,12 @@
             width="300px"
             class="inputWidth"
             style="justify-content: space-between;"
-            v-model="form.date"
+            v-model.trim="form.date"
           />
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="服务名称" placeholder="请输入品牌名称" v-model="form.name" class="inputWidth" style="justify-content: space-between;">
+          <input-vue title="服务名称" placeholder="请输入品牌名称" v-model.trim="form.name" class="inputWidth" style="justify-content: space-between;">
             <el-select
               v-model="form.date"
               style="width:300PX"
@@ -43,12 +43,12 @@
             width="300px"
             class="inputWidth"
             style="justify-content: space-between;"
-            v-model="form.address"
+            v-model.trim="form.address"
           />
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="服务优惠" v-model="form.address1" placeholder="" class="inputWidth" style="justify-content: space-between;">
+          <input-vue title="服务优惠" v-model.trim="form.address1" placeholder="" class="inputWidth" style="justify-content: space-between;">
             <el-select
               v-model="form.address"
               style="width:300px"
@@ -69,13 +69,13 @@
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="时间" width="300px" class="inputWidth" style="justify-content: space-between;" v-model='form.address2'/>
+          <input-vue title="时间" width="300px" class="inputWidth" style="justify-content: space-between;" v-model.trim='form.address2'/>
         </div>
 
         <div class="inputBox">
         &nbsp;
           <input-vue title="备注" class="inputWidth" style="justify-content: space-between;">
-            <el-input v-model="textarea" type="textarea" style="width:300px" :rows="2" placeholder="请输入内容" />
+            <el-input v-model.trim="textarea" type="textarea" style="width:300px" :rows="2" placeholder="请输入内容" />
           </input-vue>
         </div>
       </div>

diff --git a/dist.rar b/dist.rar
new file mode 100644
index 0000000..0c07f67
--- /dev/null
+++ b/dist.rar
Binary files differ
diff --git a/src/components/mycomponent/dialog/move/bannerAddDialog.vue b/src/components/mycomponent/dialog/move/bannerAddDialog.vue
index e3bdd0c..6afaea5 100644
--- a/src/components/mycomponent/dialog/move/bannerAddDialog.vue
+++ b/src/components/mycomponent/dialog/move/bannerAddDialog.vue
@@ -13,7 +13,7 @@
         <div class="inputBox">
           <red-star />
           <input-vue
-            v-model="bannerInfo.bannerName"
+            v-model.trim="bannerInfo.bannerName"
             title="banner名称"
             placeholder="请输入唯一编号"
             width="300px"
@@ -89,124 +89,121 @@
         </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 DialogHeader from '../dialogHeader.vue'
-import RedStar from '../../redStar.vue'
-import InputNumber from '../../input/inputNumber.vue'
-import { getToken } from '@/utils/auth'
-import { Base64 } from 'js-base64'
-import { list, add, updata } from '../../../../api/move/bannerConfig'
+import InputVue from "../../input/inputVue.vue";
+import DialogHeader from "../dialogHeader.vue";
+import RedStar from "../../redStar.vue";
+import InputNumber from "../../input/inputNumber.vue";
+import { getToken } from "@/utils/auth";
+import { Base64 } from "js-base64";
+import { list, add, updata } from "../../../../api/move/bannerConfig";
 
 export default {
   components: {
     DialogHeader,
     RedStar,
     InputVue,
-    InputNumber
+    InputNumber,
   },
   props: {
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: true,
     },
-    title: '',
-    dataInfo: ''
+    title: "",
+    dataInfo: "",
   },
   data() {
     return {
       bannerInfo: {
-        bannerName: '',
-        bannerPicture: '',
-        skipUrl: '11',
-        bannerModule: '',
-        bannerSort: 0
+        bannerName: "",
+        bannerPicture: "",
+        skipUrl: "11",
+        bannerModule: "",
+        bannerSort: 0,
       },
       fileList: [],
-      modelList: []
-    }
+      modelList: [],
+    };
   },
   watch: {
     dataInfo: {
       handler(vls) {
+        console.log(vls, "编辑");
         // 得到base64网络
-        if (!vls.id) return
+        if (!vls.id) return;
         this.bannerInfo = {
           id: vls.id,
           bannerName: vls.bannerName,
-          bannerPicture: this.getBase64('http://111.198.10.15:21403/static/' + vls.bannerPicture),
+          bannerPicture: vls.bannerPicture,
           skipUrl: vls.skipUrl,
           bannerModule: vls.bannerModule,
-          bannerSort: vls.bannerSort
-        }
-        console.log(
-          this.getBase64('http://111.198.10.15:21403/static/' + vls.bannerPicture)
-        )
+          bannerSort: vls.bannerSort,
+        };
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   mounted() {
     list().then((res) => {
-      const Ary = []
-      const str = res[26].detail
-      const strAry = str.split(';')
+      const Ary = [];
+      const str = res[25].detail;
+      const strAry = str.split(";");
       for (let i = 0; i < strAry.length; i++) {
-        const temp = strAry[i].split(':')
+        const temp = strAry[i].split(":");
         Ary.push({
           key: temp[2],
-          value: temp[1]
-        })
+          value: temp[1],
+        });
       }
-      console.log(Ary)
-      this.modelList = Ary
-    })
+      this.modelList = Ary;
+    });
   },
   methods: {
     getToken: getToken,
     close() {
-      this.$emit('close')
+      this.$emit("close");
     },
     save() {
-      if (this.title == 'banner新增') {
-        add(this.bannerInfo).then((res) => {
-          if (res != '') {
-            this.close()
+      const {
+        bannerInfo: { bannerName, bannerPicture, bannerModule },
+      } = this;
+      if (bannerName && bannerPicture && bannerModule) {
+        if (this.title == "banner新增") {
+          add(this.bannerInfo).then((res) => {
+            this.$message.success("添加成功");
+            this.close();
             this.bannerInfo = {
-              bannerName: '',
-              bannerPicture: '',
-              skipUrl: '',
-              bannerModule: '',
-              bannerSort: 0
-            }
-          }
-        })
+              bannerName: "",
+              bannerPicture: "",
+              skipUrl: "",
+              bannerModule: "",
+              bannerSort: 0,
+            };
+          });
+        } else {
+          updata(this.bannerInfo).then((res) => {
+            this.$message.success("更新成功");
+            this.close();
+            this.bannerInfo = {
+              bannerName: "",
+              bannerPicture: "",
+              skipUrl: "",
+              bannerModule: "",
+              bannerSort: 0,
+            };
+          });
+        }
       } else {
-        updata(this.bannerInfo).then(res => {
-          if (res != '') {
-            this.$message.success('更新成功')
-            this.close()
-            this.bannerInfo = {
-              bannerName: '',
-              bannerPicture: '',
-              skipUrl: '',
-              bannerModule: '',
-              bannerSort: 0
-            }
-          }
-        })
+        this.$message.error("请先完整填写信息");
       }
     },
 
@@ -214,60 +211,80 @@
       // console.log(response, file, fileList);
     },
     httpRequest(file) {
-      console.log(file.file, '========================')
+      console.log(file.file, "========================");
 
       // this.bannerInfo.bannerPicture =  Base64.encode(file.file)
-      var reader = new FileReader()
+      var reader = new FileReader();
 
-      reader.readAsDataURL(file.file)
+      reader.readAsDataURL(file.file);
       // console.log(reader.readyState,"===========result====",reader,reader.FileReader);
       const timer = setInterval(() => {
         if (reader.result) {
-          clearInterval(timer)
-          this.bannerInfo.bannerPicture = reader.result
-          console.log(this.bannerInfo.bannerPicture)
+          clearInterval(timer);
+          this.bannerInfo.bannerPicture = reader.result;
+          console.log(this.bannerInfo.bannerPicture);
         }
-      }, 300)
+      }, 300);
     },
     handleChange(file, fileList) {
-      console.log(fileList, file)
-      this.fileList = fileList.slice(-1)
+      this.fileList = fileList.slice(-1);
     },
     //  网络图片转base64编码
     getBase64(imgUrl) {
-      window.URL = window.URL || window.webkitURL
-      var xhr = new XMLHttpRequest()
-      xhr.open('get', imgUrl, true)
+      window.URL = window.URL || window.webkitURL;
+      var xhr = new XMLHttpRequest();
+      xhr.open("get", imgUrl, true);
       // 至关重要
-      xhr.responseType = 'blob'
-      xhr.onload = function() {
+      xhr.responseType = "blob";
+      xhr.onload = function () {
         if (this.status == 200) {
           // 得到一个blob对象
-          var blob = this.response
-          console.log('blob', blob)
+          var blob = this.response;
+          console.log("blob", blob);
           // 至关重要
-          const oFileReader = new FileReader()
-          oFileReader.onloadend = function(e) {
+          const oFileReader = new FileReader();
+          oFileReader.onloadend = function (e) {
             // 此处拿到的已经是 base64的图片了
-            const base64 = e.target.result
+            const base64 = e.target.result;
             // console.log("方式一》》》》》》》》》", base64);
-          }
-          oFileReader.readAsDataURL(blob)
+          };
+          oFileReader.readAsDataURL(blob);
           // ====为了在页面显示图片，可以删除====
-          var img = document.createElement('img')
-          img.onload = function(e) {
-            window.URL.revokeObjectURL(img.src) // 清除释放
-          }
-          const src = window.URL.createObjectURL(blob)
-          img.src = src
+          var img = document.createElement("img");
+          img.onload = function (e) {
+            window.URL.revokeObjectURL(img.src); // 清除释放
+          };
+          const src = window.URL.createObjectURL(blob);
+          img.src = src;
           // document.getElementById("container1").appendChild(img);
           // ====为了在页面显示图片，可以删除====
         }
-      }
-      xhr.send()
-    }
-  }
-}
+      };
+      xhr.send();
+    },
+    // 网络图片转base64 canvans方式
+    getBase64Image(img) {
+      var canvas = document.createElement("canvas");
+      canvas.width = img.width;
+      canvas.height = img.height;
+      var ctx = canvas.getContext("2d");
+      ctx.drawImage(img, 0, 0, img.width, img.height);
+      var dataURL = canvas.toDataURL("image/png"); // 可选其他值 image/jpeg
+      return dataURL;
+    },
+
+    main(src) {
+      let _this = this
+      var image = new Image();
+      image.src = src + "?v=" + Math.random(); // 处理缓存
+      image.crossOrigin = "*"; // 支持跨域图片
+      image.onload = function () {
+        var base64 = _this.getBase64Image(image);
+        this.bannerInfo.bannerPicture = base64
+      };
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
index 5e58333..4cae18a 100644
--- a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
+++ b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
@@ -13,7 +13,7 @@
           <div class="inputBox">
             <red-star />
             <input-vue
-              v-model="changeOrderInfo.receiver"
+              v-model.trim="changeOrderInfo.receiver"
               title="收货人"
               width="300px"
               class="inputWidth"
@@ -22,7 +22,7 @@
           <div class="inputBox">
             <red-star />
             <input-vue
-              v-model="changeOrderInfo.receiverPhone"
+              v-model.trim="changeOrderInfo.receiverPhone"
               title="收货人联系方式"
               width="300px"
               class="inputWidth"
@@ -74,7 +74,7 @@
               />
             </el-select>
             <el-input
-              v-model="changeOrderInfo.deliveryAddress"
+              v-model.trim="changeOrderInfo.deliveryAddress"
               placeholder="请输入内容"
               style="width: 638px"
             />
@@ -101,7 +101,7 @@
               style="justify-content: space-between"
             >
               <el-input
-                v-model="changeOrderInfo.remark"
+                v-model.trim="changeOrderInfo.remark"
                 style="width: 300px"
                 type="textarea"
                 :rows="3"
diff --git a/src/components/mycomponent/dialog/server/managementAddDialog.vue b/src/components/mycomponent/dialog/server/managementAddDialog.vue
index d3c1b9d..e1b2210 100644
--- a/src/components/mycomponent/dialog/server/managementAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/managementAddDialog.vue
@@ -12,7 +12,7 @@
         <div class="inputBox">
           <red-star />
           <input-vue
-            v-model="managementInfo.serviceCode"
+            v-model.trim="managementInfo.serviceCode"
             title="服务编号"
             placeholder="请输入服务编号"
             width="300px"
@@ -23,7 +23,7 @@
         <div class="inputBox">
           <red-star />
           <input-vue
-            v-model="managementInfo.serviceName"
+            v-model.trim="managementInfo.serviceName"
             title="服务名称"
             placeholder="请输入服务名称"
             width="300px"
@@ -78,7 +78,7 @@
         <div class="inputBox">
           <red-star />
           <input-vue
-            v-model="managementInfo.description"
+            v-model.trim="managementInfo.description"
             title="服务描述"
             width="300px"
             class="inputWidth"
@@ -112,7 +112,7 @@
             style="justify-content: space-between"
           >
             <el-input
-              v-model="managementInfo.remark"
+              v-model.trim="managementInfo.remark"
               type="textarea"
               style="width: 300px"
               :rows="2"
diff --git a/src/components/mycomponent/dialog/server/operationAddDialog.vue b/src/components/mycomponent/dialog/server/operationAddDialog.vue
index d436541..abd0a23 100644
--- a/src/components/mycomponent/dialog/server/operationAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/operationAddDialog.vue
@@ -11,12 +11,12 @@
             width="300px"
             class="inputWidth"
             style="justify-content: space-between;"
-            v-model="form.date"
+            v-model.trim="form.date"
           />
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="服务名称" placeholder="请输入品牌名称" v-model="form.name" class="inputWidth" style="justify-content: space-between;">
+          <input-vue title="服务名称" placeholder="请输入品牌名称" v-model.trim="form.name" class="inputWidth" style="justify-content: space-between;">
             <el-select
               v-model="form.date"
               style="width:300PX"
@@ -43,12 +43,12 @@
             width="300px"
             class="inputWidth"
             style="justify-content: space-between;"
-            v-model="form.address"
+            v-model.trim="form.address"
           />
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="服务优惠" v-model="form.address1" placeholder="" class="inputWidth" style="justify-content: space-between;">
+          <input-vue title="服务优惠" v-model.trim="form.address1" placeholder="" class="inputWidth" style="justify-content: space-between;">
             <el-select
               v-model="form.address"
               style="width:300px"
@@ -69,13 +69,13 @@
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="时间" width="300px" class="inputWidth" style="justify-content: space-between;" v-model='form.address2'/>
+          <input-vue title="时间" width="300px" class="inputWidth" style="justify-content: space-between;" v-model.trim='form.address2'/>
         </div>
 
         <div class="inputBox">
         &nbsp;
           <input-vue title="备注" class="inputWidth" style="justify-content: space-between;">
-            <el-input v-model="textarea" type="textarea" style="width:300px" :rows="2" placeholder="请输入内容" />
+            <el-input v-model.trim="textarea" type="textarea" style="width:300px" :rows="2" placeholder="请输入内容" />
           </input-vue>
         </div>
       </div>
diff --git a/src/components/mycomponent/dialog/server/typeAddDialog.vue b/src/components/mycomponent/dialog/server/typeAddDialog.vue
index 6c98c04..042421d 100644
--- a/src/components/mycomponent/dialog/server/typeAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/typeAddDialog.vue
@@ -6,7 +6,7 @@
         <div class="inputBox">
           <red-star />
           <input-vue
-            v-model="addInfo.typeCode"
+            v-model.trim="addInfo.typeCode"
             title="服务类型编号"
             placeholder="请输入服务类型编号"
             width="300px"
@@ -17,7 +17,7 @@
         <div class="inputBox">
           <red-star />
           <input-vue
-            v-model="addInfo.typeName"
+            v-model.trim="addInfo.typeName"
             title="服务类型名称"
             placeholder="请输入服务类型名称"
             width="300px"
@@ -28,7 +28,7 @@
         <div class="inputBox">
           <red-star />
           <input-vue
-            v-model="addInfo.description"
+            v-model.trim="addInfo.description"
             title="描述"
             width="300px"
             class="inputWidth"
@@ -55,7 +55,7 @@
         <div class="inputBox">
           &nbsp;
           <input-vue title="备注" class="inputWidth" style="justify-content: space-between;">
-            <el-input v-model="addInfo.remark" type="textarea" style="width:300px" :rows="2" placeholder="请输入内容" />
+            <el-input v-model.trim="addInfo.remark" type="textarea" style="width:300px" :rows="2" placeholder="请输入内容" />
           </input-vue>
         </div>
       </div>

diff --git a/dist.rar b/dist.rar
new file mode 100644
index 0000000..0c07f67
--- /dev/null
+++ b/dist.rar
Binary files differ
diff --git a/src/components/mycomponent/dialog/move/bannerAddDialog.vue b/src/components/mycomponent/dialog/move/bannerAddDialog.vue
index e3bdd0c..6afaea5 100644
--- a/src/components/mycomponent/dialog/move/bannerAddDialog.vue
+++ b/src/components/mycomponent/dialog/move/bannerAddDialog.vue
@@ -13,7 +13,7 @@
         <div class="inputBox">
           <red-star />
           <input-vue
-            v-model="bannerInfo.bannerName"
+            v-model.trim="bannerInfo.bannerName"
             title="banner名称"
             placeholder="请输入唯一编号"
             width="300px"
@@ -89,124 +89,121 @@
         </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 DialogHeader from '../dialogHeader.vue'
-import RedStar from '../../redStar.vue'
-import InputNumber from '../../input/inputNumber.vue'
-import { getToken } from '@/utils/auth'
-import { Base64 } from 'js-base64'
-import { list, add, updata } from '../../../../api/move/bannerConfig'
+import InputVue from "../../input/inputVue.vue";
+import DialogHeader from "../dialogHeader.vue";
+import RedStar from "../../redStar.vue";
+import InputNumber from "../../input/inputNumber.vue";
+import { getToken } from "@/utils/auth";
+import { Base64 } from "js-base64";
+import { list, add, updata } from "../../../../api/move/bannerConfig";
 
 export default {
   components: {
     DialogHeader,
     RedStar,
     InputVue,
-    InputNumber
+    InputNumber,
   },
   props: {
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: true,
     },
-    title: '',
-    dataInfo: ''
+    title: "",
+    dataInfo: "",
   },
   data() {
     return {
       bannerInfo: {
-        bannerName: '',
-        bannerPicture: '',
-        skipUrl: '11',
-        bannerModule: '',
-        bannerSort: 0
+        bannerName: "",
+        bannerPicture: "",
+        skipUrl: "11",
+        bannerModule: "",
+        bannerSort: 0,
       },
       fileList: [],
-      modelList: []
-    }
+      modelList: [],
+    };
   },
   watch: {
     dataInfo: {
       handler(vls) {
+        console.log(vls, "编辑");
         // 得到base64网络
-        if (!vls.id) return
+        if (!vls.id) return;
         this.bannerInfo = {
           id: vls.id,
           bannerName: vls.bannerName,
-          bannerPicture: this.getBase64('http://111.198.10.15:21403/static/' + vls.bannerPicture),
+          bannerPicture: vls.bannerPicture,
           skipUrl: vls.skipUrl,
           bannerModule: vls.bannerModule,
-          bannerSort: vls.bannerSort
-        }
-        console.log(
-          this.getBase64('http://111.198.10.15:21403/static/' + vls.bannerPicture)
-        )
+          bannerSort: vls.bannerSort,
+        };
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   mounted() {
     list().then((res) => {
-      const Ary = []
-      const str = res[26].detail
-      const strAry = str.split(';')
+      const Ary = [];
+      const str = res[25].detail;
+      const strAry = str.split(";");
       for (let i = 0; i < strAry.length; i++) {
-        const temp = strAry[i].split(':')
+        const temp = strAry[i].split(":");
         Ary.push({
           key: temp[2],
-          value: temp[1]
-        })
+          value: temp[1],
+        });
       }
-      console.log(Ary)
-      this.modelList = Ary
-    })
+      this.modelList = Ary;
+    });
   },
   methods: {
     getToken: getToken,
     close() {
-      this.$emit('close')
+      this.$emit("close");
     },
     save() {
-      if (this.title == 'banner新增') {
-        add(this.bannerInfo).then((res) => {
-          if (res != '') {
-            this.close()
+      const {
+        bannerInfo: { bannerName, bannerPicture, bannerModule },
+      } = this;
+      if (bannerName && bannerPicture && bannerModule) {
+        if (this.title == "banner新增") {
+          add(this.bannerInfo).then((res) => {
+            this.$message.success("添加成功");
+            this.close();
             this.bannerInfo = {
-              bannerName: '',
-              bannerPicture: '',
-              skipUrl: '',
-              bannerModule: '',
-              bannerSort: 0
-            }
-          }
-        })
+              bannerName: "",
+              bannerPicture: "",
+              skipUrl: "",
+              bannerModule: "",
+              bannerSort: 0,
+            };
+          });
+        } else {
+          updata(this.bannerInfo).then((res) => {
+            this.$message.success("更新成功");
+            this.close();
+            this.bannerInfo = {
+              bannerName: "",
+              bannerPicture: "",
+              skipUrl: "",
+              bannerModule: "",
+              bannerSort: 0,
+            };
+          });
+        }
       } else {
-        updata(this.bannerInfo).then(res => {
-          if (res != '') {
-            this.$message.success('更新成功')
-            this.close()
-            this.bannerInfo = {
-              bannerName: '',
-              bannerPicture: '',
-              skipUrl: '',
-              bannerModule: '',
-              bannerSort: 0
-            }
-          }
-        })
+        this.$message.error("请先完整填写信息");
       }
     },
 
@@ -214,60 +211,80 @@
       // console.log(response, file, fileList);
     },
     httpRequest(file) {
-      console.log(file.file, '========================')
+      console.log(file.file, "========================");
 
       // this.bannerInfo.bannerPicture =  Base64.encode(file.file)
-      var reader = new FileReader()
+      var reader = new FileReader();
 
-      reader.readAsDataURL(file.file)
+      reader.readAsDataURL(file.file);
       // console.log(reader.readyState,"===========result====",reader,reader.FileReader);
       const timer = setInterval(() => {
         if (reader.result) {
-          clearInterval(timer)
-          this.bannerInfo.bannerPicture = reader.result
-          console.log(this.bannerInfo.bannerPicture)
+          clearInterval(timer);
+          this.bannerInfo.bannerPicture = reader.result;
+          console.log(this.bannerInfo.bannerPicture);
         }
-      }, 300)
+      }, 300);
     },
     handleChange(file, fileList) {
-      console.log(fileList, file)
-      this.fileList = fileList.slice(-1)
+      this.fileList = fileList.slice(-1);
     },
     //  网络图片转base64编码
     getBase64(imgUrl) {
-      window.URL = window.URL || window.webkitURL
-      var xhr = new XMLHttpRequest()
-      xhr.open('get', imgUrl, true)
+      window.URL = window.URL || window.webkitURL;
+      var xhr = new XMLHttpRequest();
+      xhr.open("get", imgUrl, true);
       // 至关重要
-      xhr.responseType = 'blob'
-      xhr.onload = function() {
+      xhr.responseType = "blob";
+      xhr.onload = function () {
         if (this.status == 200) {
           // 得到一个blob对象
-          var blob = this.response
-          console.log('blob', blob)
+          var blob = this.response;
+          console.log("blob", blob);
           // 至关重要
-          const oFileReader = new FileReader()
-          oFileReader.onloadend = function(e) {
+          const oFileReader = new FileReader();
+          oFileReader.onloadend = function (e) {
             // 此处拿到的已经是 base64的图片了
-            const base64 = e.target.result
+            const base64 = e.target.result;
             // console.log("方式一》》》》》》》》》", base64);
-          }
-          oFileReader.readAsDataURL(blob)
+          };
+          oFileReader.readAsDataURL(blob);
           // ====为了在页面显示图片，可以删除====
-          var img = document.createElement('img')
-          img.onload = function(e) {
-            window.URL.revokeObjectURL(img.src) // 清除释放
-          }
-          const src = window.URL.createObjectURL(blob)
-          img.src = src
+          var img = document.createElement("img");
+          img.onload = function (e) {
+            window.URL.revokeObjectURL(img.src); // 清除释放
+          };
+          const src = window.URL.createObjectURL(blob);
+          img.src = src;
           // document.getElementById("container1").appendChild(img);
           // ====为了在页面显示图片，可以删除====
         }
-      }
-      xhr.send()
-    }
-  }
-}
+      };
+      xhr.send();
+    },
+    // 网络图片转base64 canvans方式
+    getBase64Image(img) {
+      var canvas = document.createElement("canvas");
+      canvas.width = img.width;
+      canvas.height = img.height;
+      var ctx = canvas.getContext("2d");
+      ctx.drawImage(img, 0, 0, img.width, img.height);
+      var dataURL = canvas.toDataURL("image/png"); // 可选其他值 image/jpeg
+      return dataURL;
+    },
+
+    main(src) {
+      let _this = this
+      var image = new Image();
+      image.src = src + "?v=" + Math.random(); // 处理缓存
+      image.crossOrigin = "*"; // 支持跨域图片
+      image.onload = function () {
+        var base64 = _this.getBase64Image(image);
+        this.bannerInfo.bannerPicture = base64
+      };
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
index 5e58333..4cae18a 100644
--- a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
+++ b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
@@ -13,7 +13,7 @@
           <div class="inputBox">
             <red-star />
             <input-vue
-              v-model="changeOrderInfo.receiver"
+              v-model.trim="changeOrderInfo.receiver"
               title="收货人"
               width="300px"
               class="inputWidth"
@@ -22,7 +22,7 @@
           <div class="inputBox">
             <red-star />
             <input-vue
-              v-model="changeOrderInfo.receiverPhone"
+              v-model.trim="changeOrderInfo.receiverPhone"
               title="收货人联系方式"
               width="300px"
               class="inputWidth"
@@ -74,7 +74,7 @@
               />
             </el-select>
             <el-input
-              v-model="changeOrderInfo.deliveryAddress"
+              v-model.trim="changeOrderInfo.deliveryAddress"
               placeholder="请输入内容"
               style="width: 638px"
             />
@@ -101,7 +101,7 @@
               style="justify-content: space-between"
             >
               <el-input
-                v-model="changeOrderInfo.remark"
+                v-model.trim="changeOrderInfo.remark"
                 style="width: 300px"
                 type="textarea"
                 :rows="3"
diff --git a/src/components/mycomponent/dialog/server/managementAddDialog.vue b/src/components/mycomponent/dialog/server/managementAddDialog.vue
index d3c1b9d..e1b2210 100644
--- a/src/components/mycomponent/dialog/server/managementAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/managementAddDialog.vue
@@ -12,7 +12,7 @@
         <div class="inputBox">
           <red-star />
           <input-vue
-            v-model="managementInfo.serviceCode"
+            v-model.trim="managementInfo.serviceCode"
             title="服务编号"
             placeholder="请输入服务编号"
             width="300px"
@@ -23,7 +23,7 @@
         <div class="inputBox">
           <red-star />
           <input-vue
-            v-model="managementInfo.serviceName"
+            v-model.trim="managementInfo.serviceName"
             title="服务名称"
             placeholder="请输入服务名称"
             width="300px"
@@ -78,7 +78,7 @@
         <div class="inputBox">
           <red-star />
           <input-vue
-            v-model="managementInfo.description"
+            v-model.trim="managementInfo.description"
             title="服务描述"
             width="300px"
             class="inputWidth"
@@ -112,7 +112,7 @@
             style="justify-content: space-between"
           >
             <el-input
-              v-model="managementInfo.remark"
+              v-model.trim="managementInfo.remark"
               type="textarea"
               style="width: 300px"
               :rows="2"
diff --git a/src/components/mycomponent/dialog/server/operationAddDialog.vue b/src/components/mycomponent/dialog/server/operationAddDialog.vue
index d436541..abd0a23 100644
--- a/src/components/mycomponent/dialog/server/operationAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/operationAddDialog.vue
@@ -11,12 +11,12 @@
             width="300px"
             class="inputWidth"
             style="justify-content: space-between;"
-            v-model="form.date"
+            v-model.trim="form.date"
           />
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="服务名称" placeholder="请输入品牌名称" v-model="form.name" class="inputWidth" style="justify-content: space-between;">
+          <input-vue title="服务名称" placeholder="请输入品牌名称" v-model.trim="form.name" class="inputWidth" style="justify-content: space-between;">
             <el-select
               v-model="form.date"
               style="width:300PX"
@@ -43,12 +43,12 @@
             width="300px"
             class="inputWidth"
             style="justify-content: space-between;"
-            v-model="form.address"
+            v-model.trim="form.address"
           />
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="服务优惠" v-model="form.address1" placeholder="" class="inputWidth" style="justify-content: space-between;">
+          <input-vue title="服务优惠" v-model.trim="form.address1" placeholder="" class="inputWidth" style="justify-content: space-between;">
             <el-select
               v-model="form.address"
               style="width:300px"
@@ -69,13 +69,13 @@
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="时间" width="300px" class="inputWidth" style="justify-content: space-between;" v-model='form.address2'/>
+          <input-vue title="时间" width="300px" class="inputWidth" style="justify-content: space-between;" v-model.trim='form.address2'/>
         </div>
 
         <div class="inputBox">
         &nbsp;
           <input-vue title="备注" class="inputWidth" style="justify-content: space-between;">
-            <el-input v-model="textarea" type="textarea" style="width:300px" :rows="2" placeholder="请输入内容" />
+            <el-input v-model.trim="textarea" type="textarea" style="width:300px" :rows="2" placeholder="请输入内容" />
           </input-vue>
         </div>
       </div>
diff --git a/src/components/mycomponent/dialog/server/typeAddDialog.vue b/src/components/mycomponent/dialog/server/typeAddDialog.vue
index 6c98c04..042421d 100644
--- a/src/components/mycomponent/dialog/server/typeAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/typeAddDialog.vue
@@ -6,7 +6,7 @@
         <div class="inputBox">
           <red-star />
           <input-vue
-            v-model="addInfo.typeCode"
+            v-model.trim="addInfo.typeCode"
             title="服务类型编号"
             placeholder="请输入服务类型编号"
             width="300px"
@@ -17,7 +17,7 @@
         <div class="inputBox">
           <red-star />
           <input-vue
-            v-model="addInfo.typeName"
+            v-model.trim="addInfo.typeName"
             title="服务类型名称"
             placeholder="请输入服务类型名称"
             width="300px"
@@ -28,7 +28,7 @@
         <div class="inputBox">
           <red-star />
           <input-vue
-            v-model="addInfo.description"
+            v-model.trim="addInfo.description"
             title="描述"
             width="300px"
             class="inputWidth"
@@ -55,7 +55,7 @@
         <div class="inputBox">
           &nbsp;
           <input-vue title="备注" class="inputWidth" style="justify-content: space-between;">
-            <el-input v-model="addInfo.remark" type="textarea" style="width:300px" :rows="2" placeholder="请输入内容" />
+            <el-input v-model.trim="addInfo.remark" type="textarea" style="width:300px" :rows="2" placeholder="请输入内容" />
           </input-vue>
         </div>
       </div>
diff --git a/src/views/move/bannerConfig.vue b/src/views/move/bannerConfig.vue
index 8bb613a..a4f1aaf 100644
--- a/src/views/move/bannerConfig.vue
+++ b/src/views/move/bannerConfig.vue
@@ -42,7 +42,7 @@
           type="danger"
           icon="el-icon-delete-solid"
           class="btnItem bgred"
-          @click=" BatchDelete"
+          @click="BatchDelete"
         >
           删除
         </el-button>
@@ -68,12 +68,14 @@
         <template slot-scope="scope">
           <!-- {{scope.row.bannerPicture}} -->
           <img
-            v-if="scope.row.bannerPicture!=''"
-            :src="'http://111.198.10.15:21403/static/'+scope.row.bannerPicture"
+            v-if="scope.row.bannerPicture != ''"
+            :src="
+              'http://111.198.10.15:21403/static/' + scope.row.bannerPicture
+            "
             width="100"
             height="100px"
             alt=""
-          >
+          />
         </template>
       </el-table-column>
       <el-table-column prop="bannerModuleName" label="所属功能模块" />
@@ -83,11 +85,7 @@
           <el-button type="text" size="small" @click="updata(scope.row)">
             编辑
           </el-button>
-          <el-button
-            type="text"
-            size="small"
-            @click="Bdelete(scope.row)"
-          >
+          <el-button type="text" size="small" @click="Bdelete(scope.row)">
             删除
           </el-button>
         </template>
@@ -105,102 +103,138 @@
     />
     <!-- 新增弹框 -->
     <!-- <category-add-dialog  :isShowInfo="isShowAdd"  @close ="closeAdd"></category-add-dialog> -->
-    <banner-add-dialog :is-show-info="isShowAdd" :title="title" :data-info="rowInfo" @close="closeAdd" />
+    <banner-add-dialog
+      :is-show-info="isShowAdd"
+      :title="title"
+      :data-info="rowInfo"
+      @close="closeAdd"
+    />
   </div>
 </template>
 
 <script>
 // 组件
 
-import BannerAddDialog from '../../components/mycomponent/dialog/move/bannerAddDialog.vue'
-import GroupPage from '../../components/mycomponent/groupPage.vue'
+import BannerAddDialog from "../../components/mycomponent/dialog/move/bannerAddDialog.vue";
+import GroupPage from "../../components/mycomponent/groupPage.vue";
 // 逻辑
-import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
-import { listPage, bdelete, batchDelete } from '../../api/move/bannerConfig'
-import { listMixin } from '../../utils/myUtils/mixins/listPage'
+import { tableRowClassName } from "../../utils/myUtils/changeTableTr";
+import { listPage, bdelete, batchDelete } from "../../api/move/bannerConfig";
+import { listMixin } from "../../utils/myUtils/mixins/listPage";
 
-export default { // 加入分页逻辑
+export default {
+  // 加入分页逻辑
   components: {
     BannerAddDialog,
-    GroupPage
+    GroupPage,
   },
   mixins: [listMixin],
   data() {
     return {
       isShowAdd: false, // 显示新增功能
       selectInfo: {
-        bannerName: ''
+        bannerName: "",
       },
-      title: '',
-      rowInfo: ''
-    }
+      title: "",
+      rowInfo: "",
+    };
   },
   methods: {
     tableRowClassName: tableRowClassName,
     closeAdd() {
-      this.isShowAdd = false
-      this.refresh()
+      this.isShowAdd = false;
+      this.refresh();
     },
 
     addCategory() {
-      this.isShowAdd = true
-      this.title = 'banner新增'
+      this.isShowAdd = true;
+      this.title = "banner新增";
     },
     updata(row) {
-      this.isShowAdd = true
-      this.title = 'banner编辑'
-      this.rowInfo = row
+      this.isShowAdd = true;
+      this.title = "banner编辑";
+      this.rowInfo = row;
     },
     getListPage(limit, offset) {
-      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
-        // 得到相关数据
-        res.rows.forEach((item, index) => {
-          item.index = (index + 1) + ((offset - 1) * 10)
-        })
-        this.tableData = res
-      })
+      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(
+        (res) => {
+          // 得到相关数据
+          res.rows.forEach((item, index) => {
+            item.index = index + 1 + (offset - 1) * 10;
+          });
+          this.tableData = res;
+        }
+      );
     },
     reset() {
       this.selectInfo = {
-        bannerName: ''
-      }
+        bannerName: "",
+      };
+      listPage(`limit=${10}&offset=${1}`, this.selectInfo).then(
+        (res) => {
+          // 得到相关数据
+          res.rows.forEach((item, index) => {
+            item.index = index + 1 + (1 - 1) * 10;
+          });
+          this.tableData = res;
+        }
+      );
     },
     // 批量删除
     BatchDelete() {
-      //  得到选中行
-      const dle_ary = this.$refs.multipleTable.selection
-      const ids = []
-      dle_ary.forEach(ele => {
-        ids.push(ele.id)
-      })
-      batchDelete({ ids: ids }).then(res => {
-        if (res != '') {
-          this.$message({
-            message: '删除成功',
-            type: 'success'
+      if (this.$refs.multipleTable.selection.length) {
+        this.$confirm(`确认删除选中的这些数据吗？`, "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            //  得到选中行
+            const dle_ary = this.$refs.multipleTable.selection;
+            const ids = [];
+            dle_ary.forEach((ele) => {
+              ids.push(ele.id);
+            });
+            batchDelete({ ids: ids }).then((res) => {
+              this.$message({
+                message: "删除成功",
+                type: "success",
+              });
+              this.refresh();
+            });
           })
-          this.refresh()
-        }
-      })
+          .catch(() => {});
+      } else {
+        this.$message({
+          message: "请先选择需要删除的数据",
+          type: "error",
+        });
+      }
     },
     // 删除
     Bdelete(row) {
-      // console.log(row);
-      const id = row.id
-      bdelete({ id: id }).then(res => {
-        // console.log(res);
-        // 删除成功跟新数据
-        if (res != '') {
-          this.$message({
-            message: '删除成功',
-            type: 'success'
-          })
-          this.refresh()
-        }
+      this.$confirm(`确认删除此项内容吗？`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
       })
-    }
-  }
-}
+        .then(() => {
+          const id = row.id;
+          bdelete({ id: id }).then((res) => {
+            // console.log(res);
+            // 删除成功跟新数据
+            this.$message({
+              message: "删除成功",
+              type: "success",
+            });
+            this.refresh();
+          });
+        })
+        .catch(() => {});
+      // console.log(row);
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -242,7 +276,6 @@
         // width: 84px;
         font-size: 16px;
       }
-
     }
   }
 

diff --git a/dist.rar b/dist.rar
new file mode 100644
index 0000000..0c07f67
--- /dev/null
+++ b/dist.rar
Binary files differ
diff --git a/src/components/mycomponent/dialog/move/bannerAddDialog.vue b/src/components/mycomponent/dialog/move/bannerAddDialog.vue
index e3bdd0c..6afaea5 100644
--- a/src/components/mycomponent/dialog/move/bannerAddDialog.vue
+++ b/src/components/mycomponent/dialog/move/bannerAddDialog.vue
@@ -13,7 +13,7 @@
         <div class="inputBox">
           <red-star />
           <input-vue
-            v-model="bannerInfo.bannerName"
+            v-model.trim="bannerInfo.bannerName"
             title="banner名称"
             placeholder="请输入唯一编号"
             width="300px"
@@ -89,124 +89,121 @@
         </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 DialogHeader from '../dialogHeader.vue'
-import RedStar from '../../redStar.vue'
-import InputNumber from '../../input/inputNumber.vue'
-import { getToken } from '@/utils/auth'
-import { Base64 } from 'js-base64'
-import { list, add, updata } from '../../../../api/move/bannerConfig'
+import InputVue from "../../input/inputVue.vue";
+import DialogHeader from "../dialogHeader.vue";
+import RedStar from "../../redStar.vue";
+import InputNumber from "../../input/inputNumber.vue";
+import { getToken } from "@/utils/auth";
+import { Base64 } from "js-base64";
+import { list, add, updata } from "../../../../api/move/bannerConfig";
 
 export default {
   components: {
     DialogHeader,
     RedStar,
     InputVue,
-    InputNumber
+    InputNumber,
   },
   props: {
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: true,
     },
-    title: '',
-    dataInfo: ''
+    title: "",
+    dataInfo: "",
   },
   data() {
     return {
       bannerInfo: {
-        bannerName: '',
-        bannerPicture: '',
-        skipUrl: '11',
-        bannerModule: '',
-        bannerSort: 0
+        bannerName: "",
+        bannerPicture: "",
+        skipUrl: "11",
+        bannerModule: "",
+        bannerSort: 0,
       },
       fileList: [],
-      modelList: []
-    }
+      modelList: [],
+    };
   },
   watch: {
     dataInfo: {
       handler(vls) {
+        console.log(vls, "编辑");
         // 得到base64网络
-        if (!vls.id) return
+        if (!vls.id) return;
         this.bannerInfo = {
           id: vls.id,
           bannerName: vls.bannerName,
-          bannerPicture: this.getBase64('http://111.198.10.15:21403/static/' + vls.bannerPicture),
+          bannerPicture: vls.bannerPicture,
           skipUrl: vls.skipUrl,
           bannerModule: vls.bannerModule,
-          bannerSort: vls.bannerSort
-        }
-        console.log(
-          this.getBase64('http://111.198.10.15:21403/static/' + vls.bannerPicture)
-        )
+          bannerSort: vls.bannerSort,
+        };
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   mounted() {
     list().then((res) => {
-      const Ary = []
-      const str = res[26].detail
-      const strAry = str.split(';')
+      const Ary = [];
+      const str = res[25].detail;
+      const strAry = str.split(";");
       for (let i = 0; i < strAry.length; i++) {
-        const temp = strAry[i].split(':')
+        const temp = strAry[i].split(":");
         Ary.push({
           key: temp[2],
-          value: temp[1]
-        })
+          value: temp[1],
+        });
       }
-      console.log(Ary)
-      this.modelList = Ary
-    })
+      this.modelList = Ary;
+    });
   },
   methods: {
     getToken: getToken,
     close() {
-      this.$emit('close')
+      this.$emit("close");
     },
     save() {
-      if (this.title == 'banner新增') {
-        add(this.bannerInfo).then((res) => {
-          if (res != '') {
-            this.close()
+      const {
+        bannerInfo: { bannerName, bannerPicture, bannerModule },
+      } = this;
+      if (bannerName && bannerPicture && bannerModule) {
+        if (this.title == "banner新增") {
+          add(this.bannerInfo).then((res) => {
+            this.$message.success("添加成功");
+            this.close();
             this.bannerInfo = {
-              bannerName: '',
-              bannerPicture: '',
-              skipUrl: '',
-              bannerModule: '',
-              bannerSort: 0
-            }
-          }
-        })
+              bannerName: "",
+              bannerPicture: "",
+              skipUrl: "",
+              bannerModule: "",
+              bannerSort: 0,
+            };
+          });
+        } else {
+          updata(this.bannerInfo).then((res) => {
+            this.$message.success("更新成功");
+            this.close();
+            this.bannerInfo = {
+              bannerName: "",
+              bannerPicture: "",
+              skipUrl: "",
+              bannerModule: "",
+              bannerSort: 0,
+            };
+          });
+        }
       } else {
-        updata(this.bannerInfo).then(res => {
-          if (res != '') {
-            this.$message.success('更新成功')
-            this.close()
-            this.bannerInfo = {
-              bannerName: '',
-              bannerPicture: '',
-              skipUrl: '',
-              bannerModule: '',
-              bannerSort: 0
-            }
-          }
-        })
+        this.$message.error("请先完整填写信息");
       }
     },
 
@@ -214,60 +211,80 @@
       // console.log(response, file, fileList);
     },
     httpRequest(file) {
-      console.log(file.file, '========================')
+      console.log(file.file, "========================");
 
       // this.bannerInfo.bannerPicture =  Base64.encode(file.file)
-      var reader = new FileReader()
+      var reader = new FileReader();
 
-      reader.readAsDataURL(file.file)
+      reader.readAsDataURL(file.file);
       // console.log(reader.readyState,"===========result====",reader,reader.FileReader);
       const timer = setInterval(() => {
         if (reader.result) {
-          clearInterval(timer)
-          this.bannerInfo.bannerPicture = reader.result
-          console.log(this.bannerInfo.bannerPicture)
+          clearInterval(timer);
+          this.bannerInfo.bannerPicture = reader.result;
+          console.log(this.bannerInfo.bannerPicture);
         }
-      }, 300)
+      }, 300);
     },
     handleChange(file, fileList) {
-      console.log(fileList, file)
-      this.fileList = fileList.slice(-1)
+      this.fileList = fileList.slice(-1);
     },
     //  网络图片转base64编码
     getBase64(imgUrl) {
-      window.URL = window.URL || window.webkitURL
-      var xhr = new XMLHttpRequest()
-      xhr.open('get', imgUrl, true)
+      window.URL = window.URL || window.webkitURL;
+      var xhr = new XMLHttpRequest();
+      xhr.open("get", imgUrl, true);
       // 至关重要
-      xhr.responseType = 'blob'
-      xhr.onload = function() {
+      xhr.responseType = "blob";
+      xhr.onload = function () {
         if (this.status == 200) {
           // 得到一个blob对象
-          var blob = this.response
-          console.log('blob', blob)
+          var blob = this.response;
+          console.log("blob", blob);
           // 至关重要
-          const oFileReader = new FileReader()
-          oFileReader.onloadend = function(e) {
+          const oFileReader = new FileReader();
+          oFileReader.onloadend = function (e) {
             // 此处拿到的已经是 base64的图片了
-            const base64 = e.target.result
+            const base64 = e.target.result;
             // console.log("方式一》》》》》》》》》", base64);
-          }
-          oFileReader.readAsDataURL(blob)
+          };
+          oFileReader.readAsDataURL(blob);
           // ====为了在页面显示图片，可以删除====
-          var img = document.createElement('img')
-          img.onload = function(e) {
-            window.URL.revokeObjectURL(img.src) // 清除释放
-          }
-          const src = window.URL.createObjectURL(blob)
-          img.src = src
+          var img = document.createElement("img");
+          img.onload = function (e) {
+            window.URL.revokeObjectURL(img.src); // 清除释放
+          };
+          const src = window.URL.createObjectURL(blob);
+          img.src = src;
           // document.getElementById("container1").appendChild(img);
           // ====为了在页面显示图片，可以删除====
         }
-      }
-      xhr.send()
-    }
-  }
-}
+      };
+      xhr.send();
+    },
+    // 网络图片转base64 canvans方式
+    getBase64Image(img) {
+      var canvas = document.createElement("canvas");
+      canvas.width = img.width;
+      canvas.height = img.height;
+      var ctx = canvas.getContext("2d");
+      ctx.drawImage(img, 0, 0, img.width, img.height);
+      var dataURL = canvas.toDataURL("image/png"); // 可选其他值 image/jpeg
+      return dataURL;
+    },
+
+    main(src) {
+      let _this = this
+      var image = new Image();
+      image.src = src + "?v=" + Math.random(); // 处理缓存
+      image.crossOrigin = "*"; // 支持跨域图片
+      image.onload = function () {
+        var base64 = _this.getBase64Image(image);
+        this.bannerInfo.bannerPicture = base64
+      };
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
index 5e58333..4cae18a 100644
--- a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
+++ b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
@@ -13,7 +13,7 @@
           <div class="inputBox">
             <red-star />
             <input-vue
-              v-model="changeOrderInfo.receiver"
+              v-model.trim="changeOrderInfo.receiver"
               title="收货人"
               width="300px"
               class="inputWidth"
@@ -22,7 +22,7 @@
           <div class="inputBox">
             <red-star />
             <input-vue
-              v-model="changeOrderInfo.receiverPhone"
+              v-model.trim="changeOrderInfo.receiverPhone"
               title="收货人联系方式"
               width="300px"
               class="inputWidth"
@@ -74,7 +74,7 @@
               />
             </el-select>
             <el-input
-              v-model="changeOrderInfo.deliveryAddress"
+              v-model.trim="changeOrderInfo.deliveryAddress"
               placeholder="请输入内容"
               style="width: 638px"
             />
@@ -101,7 +101,7 @@
               style="justify-content: space-between"
             >
               <el-input
-                v-model="changeOrderInfo.remark"
+                v-model.trim="changeOrderInfo.remark"
                 style="width: 300px"
                 type="textarea"
                 :rows="3"
diff --git a/src/components/mycomponent/dialog/server/managementAddDialog.vue b/src/components/mycomponent/dialog/server/managementAddDialog.vue
index d3c1b9d..e1b2210 100644
--- a/src/components/mycomponent/dialog/server/managementAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/managementAddDialog.vue
@@ -12,7 +12,7 @@
         <div class="inputBox">
           <red-star />
           <input-vue
-            v-model="managementInfo.serviceCode"
+            v-model.trim="managementInfo.serviceCode"
             title="服务编号"
             placeholder="请输入服务编号"
             width="300px"
@@ -23,7 +23,7 @@
         <div class="inputBox">
           <red-star />
           <input-vue
-            v-model="managementInfo.serviceName"
+            v-model.trim="managementInfo.serviceName"
             title="服务名称"
             placeholder="请输入服务名称"
             width="300px"
@@ -78,7 +78,7 @@
         <div class="inputBox">
           <red-star />
           <input-vue
-            v-model="managementInfo.description"
+            v-model.trim="managementInfo.description"
             title="服务描述"
             width="300px"
             class="inputWidth"
@@ -112,7 +112,7 @@
             style="justify-content: space-between"
           >
             <el-input
-              v-model="managementInfo.remark"
+              v-model.trim="managementInfo.remark"
               type="textarea"
               style="width: 300px"
               :rows="2"
diff --git a/src/components/mycomponent/dialog/server/operationAddDialog.vue b/src/components/mycomponent/dialog/server/operationAddDialog.vue
index d436541..abd0a23 100644
--- a/src/components/mycomponent/dialog/server/operationAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/operationAddDialog.vue
@@ -11,12 +11,12 @@
             width="300px"
             class="inputWidth"
             style="justify-content: space-between;"
-            v-model="form.date"
+            v-model.trim="form.date"
           />
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="服务名称" placeholder="请输入品牌名称" v-model="form.name" class="inputWidth" style="justify-content: space-between;">
+          <input-vue title="服务名称" placeholder="请输入品牌名称" v-model.trim="form.name" class="inputWidth" style="justify-content: space-between;">
             <el-select
               v-model="form.date"
               style="width:300PX"
@@ -43,12 +43,12 @@
             width="300px"
             class="inputWidth"
             style="justify-content: space-between;"
-            v-model="form.address"
+            v-model.trim="form.address"
           />
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="服务优惠" v-model="form.address1" placeholder="" class="inputWidth" style="justify-content: space-between;">
+          <input-vue title="服务优惠" v-model.trim="form.address1" placeholder="" class="inputWidth" style="justify-content: space-between;">
             <el-select
               v-model="form.address"
               style="width:300px"
@@ -69,13 +69,13 @@
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="时间" width="300px" class="inputWidth" style="justify-content: space-between;" v-model='form.address2'/>
+          <input-vue title="时间" width="300px" class="inputWidth" style="justify-content: space-between;" v-model.trim='form.address2'/>
         </div>
 
         <div class="inputBox">
         &nbsp;
           <input-vue title="备注" class="inputWidth" style="justify-content: space-between;">
-            <el-input v-model="textarea" type="textarea" style="width:300px" :rows="2" placeholder="请输入内容" />
+            <el-input v-model.trim="textarea" type="textarea" style="width:300px" :rows="2" placeholder="请输入内容" />
           </input-vue>
         </div>
       </div>
diff --git a/src/components/mycomponent/dialog/server/typeAddDialog.vue b/src/components/mycomponent/dialog/server/typeAddDialog.vue
index 6c98c04..042421d 100644
--- a/src/components/mycomponent/dialog/server/typeAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/typeAddDialog.vue
@@ -6,7 +6,7 @@
         <div class="inputBox">
           <red-star />
           <input-vue
-            v-model="addInfo.typeCode"
+            v-model.trim="addInfo.typeCode"
             title="服务类型编号"
             placeholder="请输入服务类型编号"
             width="300px"
@@ -17,7 +17,7 @@
         <div class="inputBox">
           <red-star />
           <input-vue
-            v-model="addInfo.typeName"
+            v-model.trim="addInfo.typeName"
             title="服务类型名称"
             placeholder="请输入服务类型名称"
             width="300px"
@@ -28,7 +28,7 @@
         <div class="inputBox">
           <red-star />
           <input-vue
-            v-model="addInfo.description"
+            v-model.trim="addInfo.description"
             title="描述"
             width="300px"
             class="inputWidth"
@@ -55,7 +55,7 @@
         <div class="inputBox">
           &nbsp;
           <input-vue title="备注" class="inputWidth" style="justify-content: space-between;">
-            <el-input v-model="addInfo.remark" type="textarea" style="width:300px" :rows="2" placeholder="请输入内容" />
+            <el-input v-model.trim="addInfo.remark" type="textarea" style="width:300px" :rows="2" placeholder="请输入内容" />
           </input-vue>
         </div>
       </div>
diff --git a/src/views/move/bannerConfig.vue b/src/views/move/bannerConfig.vue
index 8bb613a..a4f1aaf 100644
--- a/src/views/move/bannerConfig.vue
+++ b/src/views/move/bannerConfig.vue
@@ -42,7 +42,7 @@
           type="danger"
           icon="el-icon-delete-solid"
           class="btnItem bgred"
-          @click=" BatchDelete"
+          @click="BatchDelete"
         >
           删除
         </el-button>
@@ -68,12 +68,14 @@
         <template slot-scope="scope">
           <!-- {{scope.row.bannerPicture}} -->
           <img
-            v-if="scope.row.bannerPicture!=''"
-            :src="'http://111.198.10.15:21403/static/'+scope.row.bannerPicture"
+            v-if="scope.row.bannerPicture != ''"
+            :src="
+              'http://111.198.10.15:21403/static/' + scope.row.bannerPicture
+            "
             width="100"
             height="100px"
             alt=""
-          >
+          />
         </template>
       </el-table-column>
       <el-table-column prop="bannerModuleName" label="所属功能模块" />
@@ -83,11 +85,7 @@
           <el-button type="text" size="small" @click="updata(scope.row)">
             编辑
           </el-button>
-          <el-button
-            type="text"
-            size="small"
-            @click="Bdelete(scope.row)"
-          >
+          <el-button type="text" size="small" @click="Bdelete(scope.row)">
             删除
           </el-button>
         </template>
@@ -105,102 +103,138 @@
     />
     <!-- 新增弹框 -->
     <!-- <category-add-dialog  :isShowInfo="isShowAdd"  @close ="closeAdd"></category-add-dialog> -->
-    <banner-add-dialog :is-show-info="isShowAdd" :title="title" :data-info="rowInfo" @close="closeAdd" />
+    <banner-add-dialog
+      :is-show-info="isShowAdd"
+      :title="title"
+      :data-info="rowInfo"
+      @close="closeAdd"
+    />
   </div>
 </template>
 
 <script>
 // 组件
 
-import BannerAddDialog from '../../components/mycomponent/dialog/move/bannerAddDialog.vue'
-import GroupPage from '../../components/mycomponent/groupPage.vue'
+import BannerAddDialog from "../../components/mycomponent/dialog/move/bannerAddDialog.vue";
+import GroupPage from "../../components/mycomponent/groupPage.vue";
 // 逻辑
-import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
-import { listPage, bdelete, batchDelete } from '../../api/move/bannerConfig'
-import { listMixin } from '../../utils/myUtils/mixins/listPage'
+import { tableRowClassName } from "../../utils/myUtils/changeTableTr";
+import { listPage, bdelete, batchDelete } from "../../api/move/bannerConfig";
+import { listMixin } from "../../utils/myUtils/mixins/listPage";
 
-export default { // 加入分页逻辑
+export default {
+  // 加入分页逻辑
   components: {
     BannerAddDialog,
-    GroupPage
+    GroupPage,
   },
   mixins: [listMixin],
   data() {
     return {
       isShowAdd: false, // 显示新增功能
       selectInfo: {
-        bannerName: ''
+        bannerName: "",
       },
-      title: '',
-      rowInfo: ''
-    }
+      title: "",
+      rowInfo: "",
+    };
   },
   methods: {
     tableRowClassName: tableRowClassName,
     closeAdd() {
-      this.isShowAdd = false
-      this.refresh()
+      this.isShowAdd = false;
+      this.refresh();
     },
 
     addCategory() {
-      this.isShowAdd = true
-      this.title = 'banner新增'
+      this.isShowAdd = true;
+      this.title = "banner新增";
     },
     updata(row) {
-      this.isShowAdd = true
-      this.title = 'banner编辑'
-      this.rowInfo = row
+      this.isShowAdd = true;
+      this.title = "banner编辑";
+      this.rowInfo = row;
     },
     getListPage(limit, offset) {
-      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
-        // 得到相关数据
-        res.rows.forEach((item, index) => {
-          item.index = (index + 1) + ((offset - 1) * 10)
-        })
-        this.tableData = res
-      })
+      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(
+        (res) => {
+          // 得到相关数据
+          res.rows.forEach((item, index) => {
+            item.index = index + 1 + (offset - 1) * 10;
+          });
+          this.tableData = res;
+        }
+      );
     },
     reset() {
       this.selectInfo = {
-        bannerName: ''
-      }
+        bannerName: "",
+      };
+      listPage(`limit=${10}&offset=${1}`, this.selectInfo).then(
+        (res) => {
+          // 得到相关数据
+          res.rows.forEach((item, index) => {
+            item.index = index + 1 + (1 - 1) * 10;
+          });
+          this.tableData = res;
+        }
+      );
     },
     // 批量删除
     BatchDelete() {
-      //  得到选中行
-      const dle_ary = this.$refs.multipleTable.selection
-      const ids = []
-      dle_ary.forEach(ele => {
-        ids.push(ele.id)
-      })
-      batchDelete({ ids: ids }).then(res => {
-        if (res != '') {
-          this.$message({
-            message: '删除成功',
-            type: 'success'
+      if (this.$refs.multipleTable.selection.length) {
+        this.$confirm(`确认删除选中的这些数据吗？`, "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            //  得到选中行
+            const dle_ary = this.$refs.multipleTable.selection;
+            const ids = [];
+            dle_ary.forEach((ele) => {
+              ids.push(ele.id);
+            });
+            batchDelete({ ids: ids }).then((res) => {
+              this.$message({
+                message: "删除成功",
+                type: "success",
+              });
+              this.refresh();
+            });
           })
-          this.refresh()
-        }
-      })
+          .catch(() => {});
+      } else {
+        this.$message({
+          message: "请先选择需要删除的数据",
+          type: "error",
+        });
+      }
     },
     // 删除
     Bdelete(row) {
-      // console.log(row);
-      const id = row.id
-      bdelete({ id: id }).then(res => {
-        // console.log(res);
-        // 删除成功跟新数据
-        if (res != '') {
-          this.$message({
-            message: '删除成功',
-            type: 'success'
-          })
-          this.refresh()
-        }
+      this.$confirm(`确认删除此项内容吗？`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
       })
-    }
-  }
-}
+        .then(() => {
+          const id = row.id;
+          bdelete({ id: id }).then((res) => {
+            // console.log(res);
+            // 删除成功跟新数据
+            this.$message({
+              message: "删除成功",
+              type: "success",
+            });
+            this.refresh();
+          });
+        })
+        .catch(() => {});
+      // console.log(row);
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -242,7 +276,6 @@
         // width: 84px;
         font-size: 16px;
       }
-
     }
   }
 
diff --git a/src/views/move/hotAndNews.vue b/src/views/move/hotAndNews.vue
index 6e5ee27..ba86219 100644
--- a/src/views/move/hotAndNews.vue
+++ b/src/views/move/hotAndNews.vue
@@ -76,7 +76,7 @@
       style="width: 100%"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column prop="index" label="序号" />
+      <el-table-column prop="index" label="序号" width="60"/>
       <el-table-column prop="recommendCode" label="编号" />
       <el-table-column prop="recommendModuleName" label="所属模块" />
       <el-table-column prop="recommendType" label="类型" />
@@ -187,6 +187,13 @@
         recommendType: '',
         recommendTitle: ''
       }
+      listPage(`limit=${10}&offset=${1}`, this.selectInfo).then(res => {
+      // 得到相关数据
+        res.rows.forEach((item, index) => {
+          item.index = (index + 1) + ((1 - 1) * 10)
+        })
+        this.tableData = res
+      })
     },
     BatchDelete() {
       //  得到选中行

diff --git a/dist.rar b/dist.rar
new file mode 100644
index 0000000..0c07f67
--- /dev/null
+++ b/dist.rar
Binary files differ
diff --git a/src/components/mycomponent/dialog/move/bannerAddDialog.vue b/src/components/mycomponent/dialog/move/bannerAddDialog.vue
index e3bdd0c..6afaea5 100644
--- a/src/components/mycomponent/dialog/move/bannerAddDialog.vue
+++ b/src/components/mycomponent/dialog/move/bannerAddDialog.vue
@@ -13,7 +13,7 @@
         <div class="inputBox">
           <red-star />
           <input-vue
-            v-model="bannerInfo.bannerName"
+            v-model.trim="bannerInfo.bannerName"
             title="banner名称"
             placeholder="请输入唯一编号"
             width="300px"
@@ -89,124 +89,121 @@
         </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 DialogHeader from '../dialogHeader.vue'
-import RedStar from '../../redStar.vue'
-import InputNumber from '../../input/inputNumber.vue'
-import { getToken } from '@/utils/auth'
-import { Base64 } from 'js-base64'
-import { list, add, updata } from '../../../../api/move/bannerConfig'
+import InputVue from "../../input/inputVue.vue";
+import DialogHeader from "../dialogHeader.vue";
+import RedStar from "../../redStar.vue";
+import InputNumber from "../../input/inputNumber.vue";
+import { getToken } from "@/utils/auth";
+import { Base64 } from "js-base64";
+import { list, add, updata } from "../../../../api/move/bannerConfig";
 
 export default {
   components: {
     DialogHeader,
     RedStar,
     InputVue,
-    InputNumber
+    InputNumber,
   },
   props: {
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: true,
     },
-    title: '',
-    dataInfo: ''
+    title: "",
+    dataInfo: "",
   },
   data() {
     return {
       bannerInfo: {
-        bannerName: '',
-        bannerPicture: '',
-        skipUrl: '11',
-        bannerModule: '',
-        bannerSort: 0
+        bannerName: "",
+        bannerPicture: "",
+        skipUrl: "11",
+        bannerModule: "",
+        bannerSort: 0,
       },
       fileList: [],
-      modelList: []
-    }
+      modelList: [],
+    };
   },
   watch: {
     dataInfo: {
       handler(vls) {
+        console.log(vls, "编辑");
         // 得到base64网络
-        if (!vls.id) return
+        if (!vls.id) return;
         this.bannerInfo = {
           id: vls.id,
           bannerName: vls.bannerName,
-          bannerPicture: this.getBase64('http://111.198.10.15:21403/static/' + vls.bannerPicture),
+          bannerPicture: vls.bannerPicture,
           skipUrl: vls.skipUrl,
           bannerModule: vls.bannerModule,
-          bannerSort: vls.bannerSort
-        }
-        console.log(
-          this.getBase64('http://111.198.10.15:21403/static/' + vls.bannerPicture)
-        )
+          bannerSort: vls.bannerSort,
+        };
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   mounted() {
     list().then((res) => {
-      const Ary = []
-      const str = res[26].detail
-      const strAry = str.split(';')
+      const Ary = [];
+      const str = res[25].detail;
+      const strAry = str.split(";");
       for (let i = 0; i < strAry.length; i++) {
-        const temp = strAry[i].split(':')
+        const temp = strAry[i].split(":");
         Ary.push({
           key: temp[2],
-          value: temp[1]
-        })
+          value: temp[1],
+        });
       }
-      console.log(Ary)
-      this.modelList = Ary
-    })
+      this.modelList = Ary;
+    });
   },
   methods: {
     getToken: getToken,
     close() {
-      this.$emit('close')
+      this.$emit("close");
     },
     save() {
-      if (this.title == 'banner新增') {
-        add(this.bannerInfo).then((res) => {
-          if (res != '') {
-            this.close()
+      const {
+        bannerInfo: { bannerName, bannerPicture, bannerModule },
+      } = this;
+      if (bannerName && bannerPicture && bannerModule) {
+        if (this.title == "banner新增") {
+          add(this.bannerInfo).then((res) => {
+            this.$message.success("添加成功");
+            this.close();
             this.bannerInfo = {
-              bannerName: '',
-              bannerPicture: '',
-              skipUrl: '',
-              bannerModule: '',
-              bannerSort: 0
-            }
-          }
-        })
+              bannerName: "",
+              bannerPicture: "",
+              skipUrl: "",
+              bannerModule: "",
+              bannerSort: 0,
+            };
+          });
+        } else {
+          updata(this.bannerInfo).then((res) => {
+            this.$message.success("更新成功");
+            this.close();
+            this.bannerInfo = {
+              bannerName: "",
+              bannerPicture: "",
+              skipUrl: "",
+              bannerModule: "",
+              bannerSort: 0,
+            };
+          });
+        }
       } else {
-        updata(this.bannerInfo).then(res => {
-          if (res != '') {
-            this.$message.success('更新成功')
-            this.close()
-            this.bannerInfo = {
-              bannerName: '',
-              bannerPicture: '',
-              skipUrl: '',
-              bannerModule: '',
-              bannerSort: 0
-            }
-          }
-        })
+        this.$message.error("请先完整填写信息");
       }
     },
 
@@ -214,60 +211,80 @@
       // console.log(response, file, fileList);
     },
     httpRequest(file) {
-      console.log(file.file, '========================')
+      console.log(file.file, "========================");
 
       // this.bannerInfo.bannerPicture =  Base64.encode(file.file)
-      var reader = new FileReader()
+      var reader = new FileReader();
 
-      reader.readAsDataURL(file.file)
+      reader.readAsDataURL(file.file);
       // console.log(reader.readyState,"===========result====",reader,reader.FileReader);
       const timer = setInterval(() => {
         if (reader.result) {
-          clearInterval(timer)
-          this.bannerInfo.bannerPicture = reader.result
-          console.log(this.bannerInfo.bannerPicture)
+          clearInterval(timer);
+          this.bannerInfo.bannerPicture = reader.result;
+          console.log(this.bannerInfo.bannerPicture);
         }
-      }, 300)
+      }, 300);
     },
     handleChange(file, fileList) {
-      console.log(fileList, file)
-      this.fileList = fileList.slice(-1)
+      this.fileList = fileList.slice(-1);
     },
     //  网络图片转base64编码
     getBase64(imgUrl) {
-      window.URL = window.URL || window.webkitURL
-      var xhr = new XMLHttpRequest()
-      xhr.open('get', imgUrl, true)
+      window.URL = window.URL || window.webkitURL;
+      var xhr = new XMLHttpRequest();
+      xhr.open("get", imgUrl, true);
       // 至关重要
-      xhr.responseType = 'blob'
-      xhr.onload = function() {
+      xhr.responseType = "blob";
+      xhr.onload = function () {
         if (this.status == 200) {
           // 得到一个blob对象
-          var blob = this.response
-          console.log('blob', blob)
+          var blob = this.response;
+          console.log("blob", blob);
           // 至关重要
-          const oFileReader = new FileReader()
-          oFileReader.onloadend = function(e) {
+          const oFileReader = new FileReader();
+          oFileReader.onloadend = function (e) {
             // 此处拿到的已经是 base64的图片了
-            const base64 = e.target.result
+            const base64 = e.target.result;
             // console.log("方式一》》》》》》》》》", base64);
-          }
-          oFileReader.readAsDataURL(blob)
+          };
+          oFileReader.readAsDataURL(blob);
           // ====为了在页面显示图片，可以删除====
-          var img = document.createElement('img')
-          img.onload = function(e) {
-            window.URL.revokeObjectURL(img.src) // 清除释放
-          }
-          const src = window.URL.createObjectURL(blob)
-          img.src = src
+          var img = document.createElement("img");
+          img.onload = function (e) {
+            window.URL.revokeObjectURL(img.src); // 清除释放
+          };
+          const src = window.URL.createObjectURL(blob);
+          img.src = src;
           // document.getElementById("container1").appendChild(img);
           // ====为了在页面显示图片，可以删除====
         }
-      }
-      xhr.send()
-    }
-  }
-}
+      };
+      xhr.send();
+    },
+    // 网络图片转base64 canvans方式
+    getBase64Image(img) {
+      var canvas = document.createElement("canvas");
+      canvas.width = img.width;
+      canvas.height = img.height;
+      var ctx = canvas.getContext("2d");
+      ctx.drawImage(img, 0, 0, img.width, img.height);
+      var dataURL = canvas.toDataURL("image/png"); // 可选其他值 image/jpeg
+      return dataURL;
+    },
+
+    main(src) {
+      let _this = this
+      var image = new Image();
+      image.src = src + "?v=" + Math.random(); // 处理缓存
+      image.crossOrigin = "*"; // 支持跨域图片
+      image.onload = function () {
+        var base64 = _this.getBase64Image(image);
+        this.bannerInfo.bannerPicture = base64
+      };
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
index 5e58333..4cae18a 100644
--- a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
+++ b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
@@ -13,7 +13,7 @@
           <div class="inputBox">
             <red-star />
             <input-vue
-              v-model="changeOrderInfo.receiver"
+              v-model.trim="changeOrderInfo.receiver"
               title="收货人"
               width="300px"
               class="inputWidth"
@@ -22,7 +22,7 @@
           <div class="inputBox">
             <red-star />
             <input-vue
-              v-model="changeOrderInfo.receiverPhone"
+              v-model.trim="changeOrderInfo.receiverPhone"
               title="收货人联系方式"
               width="300px"
               class="inputWidth"
@@ -74,7 +74,7 @@
               />
             </el-select>
             <el-input
-              v-model="changeOrderInfo.deliveryAddress"
+              v-model.trim="changeOrderInfo.deliveryAddress"
               placeholder="请输入内容"
               style="width: 638px"
             />
@@ -101,7 +101,7 @@
               style="justify-content: space-between"
             >
               <el-input
-                v-model="changeOrderInfo.remark"
+                v-model.trim="changeOrderInfo.remark"
                 style="width: 300px"
                 type="textarea"
                 :rows="3"
diff --git a/src/components/mycomponent/dialog/server/managementAddDialog.vue b/src/components/mycomponent/dialog/server/managementAddDialog.vue
index d3c1b9d..e1b2210 100644
--- a/src/components/mycomponent/dialog/server/managementAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/managementAddDialog.vue
@@ -12,7 +12,7 @@
         <div class="inputBox">
           <red-star />
           <input-vue
-            v-model="managementInfo.serviceCode"
+            v-model.trim="managementInfo.serviceCode"
             title="服务编号"
             placeholder="请输入服务编号"
             width="300px"
@@ -23,7 +23,7 @@
         <div class="inputBox">
           <red-star />
           <input-vue
-            v-model="managementInfo.serviceName"
+            v-model.trim="managementInfo.serviceName"
             title="服务名称"
             placeholder="请输入服务名称"
             width="300px"
@@ -78,7 +78,7 @@
         <div class="inputBox">
           <red-star />
           <input-vue
-            v-model="managementInfo.description"
+            v-model.trim="managementInfo.description"
             title="服务描述"
             width="300px"
             class="inputWidth"
@@ -112,7 +112,7 @@
             style="justify-content: space-between"
           >
             <el-input
-              v-model="managementInfo.remark"
+              v-model.trim="managementInfo.remark"
               type="textarea"
               style="width: 300px"
               :rows="2"
diff --git a/src/components/mycomponent/dialog/server/operationAddDialog.vue b/src/components/mycomponent/dialog/server/operationAddDialog.vue
index d436541..abd0a23 100644
--- a/src/components/mycomponent/dialog/server/operationAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/operationAddDialog.vue
@@ -11,12 +11,12 @@
             width="300px"
             class="inputWidth"
             style="justify-content: space-between;"
-            v-model="form.date"
+            v-model.trim="form.date"
           />
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="服务名称" placeholder="请输入品牌名称" v-model="form.name" class="inputWidth" style="justify-content: space-between;">
+          <input-vue title="服务名称" placeholder="请输入品牌名称" v-model.trim="form.name" class="inputWidth" style="justify-content: space-between;">
             <el-select
               v-model="form.date"
               style="width:300PX"
@@ -43,12 +43,12 @@
             width="300px"
             class="inputWidth"
             style="justify-content: space-between;"
-            v-model="form.address"
+            v-model.trim="form.address"
           />
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="服务优惠" v-model="form.address1" placeholder="" class="inputWidth" style="justify-content: space-between;">
+          <input-vue title="服务优惠" v-model.trim="form.address1" placeholder="" class="inputWidth" style="justify-content: space-between;">
             <el-select
               v-model="form.address"
               style="width:300px"
@@ -69,13 +69,13 @@
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="时间" width="300px" class="inputWidth" style="justify-content: space-between;" v-model='form.address2'/>
+          <input-vue title="时间" width="300px" class="inputWidth" style="justify-content: space-between;" v-model.trim='form.address2'/>
         </div>
 
         <div class="inputBox">
         &nbsp;
           <input-vue title="备注" class="inputWidth" style="justify-content: space-between;">
-            <el-input v-model="textarea" type="textarea" style="width:300px" :rows="2" placeholder="请输入内容" />
+            <el-input v-model.trim="textarea" type="textarea" style="width:300px" :rows="2" placeholder="请输入内容" />
           </input-vue>
         </div>
       </div>
diff --git a/src/components/mycomponent/dialog/server/typeAddDialog.vue b/src/components/mycomponent/dialog/server/typeAddDialog.vue
index 6c98c04..042421d 100644
--- a/src/components/mycomponent/dialog/server/typeAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/typeAddDialog.vue
@@ -6,7 +6,7 @@
         <div class="inputBox">
           <red-star />
           <input-vue
-            v-model="addInfo.typeCode"
+            v-model.trim="addInfo.typeCode"
             title="服务类型编号"
             placeholder="请输入服务类型编号"
             width="300px"
@@ -17,7 +17,7 @@
         <div class="inputBox">
           <red-star />
           <input-vue
-            v-model="addInfo.typeName"
+            v-model.trim="addInfo.typeName"
             title="服务类型名称"
             placeholder="请输入服务类型名称"
             width="300px"
@@ -28,7 +28,7 @@
         <div class="inputBox">
           <red-star />
           <input-vue
-            v-model="addInfo.description"
+            v-model.trim="addInfo.description"
             title="描述"
             width="300px"
             class="inputWidth"
@@ -55,7 +55,7 @@
         <div class="inputBox">
           &nbsp;
           <input-vue title="备注" class="inputWidth" style="justify-content: space-between;">
-            <el-input v-model="addInfo.remark" type="textarea" style="width:300px" :rows="2" placeholder="请输入内容" />
+            <el-input v-model.trim="addInfo.remark" type="textarea" style="width:300px" :rows="2" placeholder="请输入内容" />
           </input-vue>
         </div>
       </div>
diff --git a/src/views/move/bannerConfig.vue b/src/views/move/bannerConfig.vue
index 8bb613a..a4f1aaf 100644
--- a/src/views/move/bannerConfig.vue
+++ b/src/views/move/bannerConfig.vue
@@ -42,7 +42,7 @@
           type="danger"
           icon="el-icon-delete-solid"
           class="btnItem bgred"
-          @click=" BatchDelete"
+          @click="BatchDelete"
         >
           删除
         </el-button>
@@ -68,12 +68,14 @@
         <template slot-scope="scope">
           <!-- {{scope.row.bannerPicture}} -->
           <img
-            v-if="scope.row.bannerPicture!=''"
-            :src="'http://111.198.10.15:21403/static/'+scope.row.bannerPicture"
+            v-if="scope.row.bannerPicture != ''"
+            :src="
+              'http://111.198.10.15:21403/static/' + scope.row.bannerPicture
+            "
             width="100"
             height="100px"
             alt=""
-          >
+          />
         </template>
       </el-table-column>
       <el-table-column prop="bannerModuleName" label="所属功能模块" />
@@ -83,11 +85,7 @@
           <el-button type="text" size="small" @click="updata(scope.row)">
             编辑
           </el-button>
-          <el-button
-            type="text"
-            size="small"
-            @click="Bdelete(scope.row)"
-          >
+          <el-button type="text" size="small" @click="Bdelete(scope.row)">
             删除
           </el-button>
         </template>
@@ -105,102 +103,138 @@
     />
     <!-- 新增弹框 -->
     <!-- <category-add-dialog  :isShowInfo="isShowAdd"  @close ="closeAdd"></category-add-dialog> -->
-    <banner-add-dialog :is-show-info="isShowAdd" :title="title" :data-info="rowInfo" @close="closeAdd" />
+    <banner-add-dialog
+      :is-show-info="isShowAdd"
+      :title="title"
+      :data-info="rowInfo"
+      @close="closeAdd"
+    />
   </div>
 </template>
 
 <script>
 // 组件
 
-import BannerAddDialog from '../../components/mycomponent/dialog/move/bannerAddDialog.vue'
-import GroupPage from '../../components/mycomponent/groupPage.vue'
+import BannerAddDialog from "../../components/mycomponent/dialog/move/bannerAddDialog.vue";
+import GroupPage from "../../components/mycomponent/groupPage.vue";
 // 逻辑
-import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
-import { listPage, bdelete, batchDelete } from '../../api/move/bannerConfig'
-import { listMixin } from '../../utils/myUtils/mixins/listPage'
+import { tableRowClassName } from "../../utils/myUtils/changeTableTr";
+import { listPage, bdelete, batchDelete } from "../../api/move/bannerConfig";
+import { listMixin } from "../../utils/myUtils/mixins/listPage";
 
-export default { // 加入分页逻辑
+export default {
+  // 加入分页逻辑
   components: {
     BannerAddDialog,
-    GroupPage
+    GroupPage,
   },
   mixins: [listMixin],
   data() {
     return {
       isShowAdd: false, // 显示新增功能
       selectInfo: {
-        bannerName: ''
+        bannerName: "",
       },
-      title: '',
-      rowInfo: ''
-    }
+      title: "",
+      rowInfo: "",
+    };
   },
   methods: {
     tableRowClassName: tableRowClassName,
     closeAdd() {
-      this.isShowAdd = false
-      this.refresh()
+      this.isShowAdd = false;
+      this.refresh();
     },
 
     addCategory() {
-      this.isShowAdd = true
-      this.title = 'banner新增'
+      this.isShowAdd = true;
+      this.title = "banner新增";
     },
     updata(row) {
-      this.isShowAdd = true
-      this.title = 'banner编辑'
-      this.rowInfo = row
+      this.isShowAdd = true;
+      this.title = "banner编辑";
+      this.rowInfo = row;
     },
     getListPage(limit, offset) {
-      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
-        // 得到相关数据
-        res.rows.forEach((item, index) => {
-          item.index = (index + 1) + ((offset - 1) * 10)
-        })
-        this.tableData = res
-      })
+      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(
+        (res) => {
+          // 得到相关数据
+          res.rows.forEach((item, index) => {
+            item.index = index + 1 + (offset - 1) * 10;
+          });
+          this.tableData = res;
+        }
+      );
     },
     reset() {
       this.selectInfo = {
-        bannerName: ''
-      }
+        bannerName: "",
+      };
+      listPage(`limit=${10}&offset=${1}`, this.selectInfo).then(
+        (res) => {
+          // 得到相关数据
+          res.rows.forEach((item, index) => {
+            item.index = index + 1 + (1 - 1) * 10;
+          });
+          this.tableData = res;
+        }
+      );
     },
     // 批量删除
     BatchDelete() {
-      //  得到选中行
-      const dle_ary = this.$refs.multipleTable.selection
-      const ids = []
-      dle_ary.forEach(ele => {
-        ids.push(ele.id)
-      })
-      batchDelete({ ids: ids }).then(res => {
-        if (res != '') {
-          this.$message({
-            message: '删除成功',
-            type: 'success'
+      if (this.$refs.multipleTable.selection.length) {
+        this.$confirm(`确认删除选中的这些数据吗？`, "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            //  得到选中行
+            const dle_ary = this.$refs.multipleTable.selection;
+            const ids = [];
+            dle_ary.forEach((ele) => {
+              ids.push(ele.id);
+            });
+            batchDelete({ ids: ids }).then((res) => {
+              this.$message({
+                message: "删除成功",
+                type: "success",
+              });
+              this.refresh();
+            });
           })
-          this.refresh()
-        }
-      })
+          .catch(() => {});
+      } else {
+        this.$message({
+          message: "请先选择需要删除的数据",
+          type: "error",
+        });
+      }
     },
     // 删除
     Bdelete(row) {
-      // console.log(row);
-      const id = row.id
-      bdelete({ id: id }).then(res => {
-        // console.log(res);
-        // 删除成功跟新数据
-        if (res != '') {
-          this.$message({
-            message: '删除成功',
-            type: 'success'
-          })
-          this.refresh()
-        }
+      this.$confirm(`确认删除此项内容吗？`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
       })
-    }
-  }
-}
+        .then(() => {
+          const id = row.id;
+          bdelete({ id: id }).then((res) => {
+            // console.log(res);
+            // 删除成功跟新数据
+            this.$message({
+              message: "删除成功",
+              type: "success",
+            });
+            this.refresh();
+          });
+        })
+        .catch(() => {});
+      // console.log(row);
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -242,7 +276,6 @@
         // width: 84px;
         font-size: 16px;
       }
-
     }
   }
 
diff --git a/src/views/move/hotAndNews.vue b/src/views/move/hotAndNews.vue
index 6e5ee27..ba86219 100644
--- a/src/views/move/hotAndNews.vue
+++ b/src/views/move/hotAndNews.vue
@@ -76,7 +76,7 @@
       style="width: 100%"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column prop="index" label="序号" />
+      <el-table-column prop="index" label="序号" width="60"/>
       <el-table-column prop="recommendCode" label="编号" />
       <el-table-column prop="recommendModuleName" label="所属模块" />
       <el-table-column prop="recommendType" label="类型" />
@@ -187,6 +187,13 @@
         recommendType: '',
         recommendTitle: ''
       }
+      listPage(`limit=${10}&offset=${1}`, this.selectInfo).then(res => {
+      // 得到相关数据
+        res.rows.forEach((item, index) => {
+          item.index = (index + 1) + ((1 - 1) * 10)
+        })
+        this.tableData = res
+      })
     },
     BatchDelete() {
       //  得到选中行
diff --git a/src/views/sales/shop.vue b/src/views/sales/shop.vue
index 0a1c756..704d7c8 100644
--- a/src/views/sales/shop.vue
+++ b/src/views/sales/shop.vue
@@ -16,19 +16,21 @@
         <div class="inputBox" style="width: 144px">
           <el-input
             v-model="selectInfo.itemBudget"
-            placeholder="请输入项目预期"
+            placeholder="请输入项目预算"
             clearable
             class="product-input"
           />
         </div>
         预计工期
         <div class="inputBox" style="width: 144px">
-          <el-input
+          <!-- <el-input
             v-model="selectInfo.itemDuration"
             placeholder="请选择项目日期"
             clearable
             class="product-input"
-          />
+          /> -->
+          <el-date-picker v-model="selectInfo.itemDuration" type="date" placeholder="请选择日期" value-format="yyyy-MM-dd HH:mm:ss">
+          </el-date-picker>
         </div>
       </div>
       <div class="productBtn">
@@ -63,27 +65,20 @@
       v-loading="loading"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column prop="index" label="序号" />
+      <el-table-column prop="index" label="序号" width="60"/>
       <el-table-column prop="busOppoId" label="商机编号" />
       <el-table-column prop="itemName" label="项目名称" />
-      <el-table-column prop="itemBudget" label="预期工期" />
+      <el-table-column prop="itemBudget" label="项目预算" />
+      <el-table-column prop="itemDuration" label="预计工期" />
       <el-table-column prop="itemManager" label="商机负责人" />
       <el-table-column prop="phone" label="联系方式" />
       <el-table-column prop="status" label="商机状态" />
       <el-table-column label="操作">
         <template slot-scope="scope">
-          <el-button
-            type="text"
-            size="small"
-            @click="showInfo(scope.row)"
-          >
+          <el-button type="text" size="small" @click="showInfo(scope.row)">
             详情
           </el-button>
-          <el-button
-            type="text"
-            size="small"
-            @click="handleClick(scope.row)"
-          >
+          <el-button type="text" size="small" @click="handleClick(scope.row)">
             商机转订单
           </el-button>
 
@@ -91,31 +86,47 @@
         </template>
       </el-table-column>
     </el-table>
-    <group-page v-model="isFristPage" :limit="limit" :total="total" :offset="offset" :count="tableData.total" @setOffset="setOffset" @setLimit="setLimit" />
+    <group-page
+      v-model="isFristPage"
+      :limit="limit"
+      :total="total"
+      :offset="offset"
+      :count="tableData.total"
+      @setOffset="setOffset"
+      @setLimit="setLimit"
+    />
     <!-- 新增弹框 -->
 
     <!-- <brand-add-dialog  :isShowInfo="isShowAdd"
       @close="closeAdd"></brand-add-dialog> -->
-    <shop-info-dialog :is-show-info="isShowInfo" :data-info="rowInfo" @close="closeInfo" />
-    <slaes-change-order-dialog :is-show-info="isShowAdd" :bus-oppo-id="busOppoId" @close="closeAdd" />
+    <shop-info-dialog
+      :is-show-info="isShowInfo"
+      :data-info="rowInfo"
+      @close="closeInfo"
+    />
+    <slaes-change-order-dialog
+      :is-show-info="isShowAdd"
+      :bus-oppo-id="busOppoId"
+      @close="closeAdd"
+    />
   </div>
 </template>
 
 <script>
 // 组件
-import ShopInfoDialog from '../../components/mycomponent/dialog/salesDialog/shopInfoDialog.vue'
-import SlaesChangeOrderDialog from '../../components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue'
-import GroupPage from '../../components/mycomponent/groupPage.vue'
+import ShopInfoDialog from "../../components/mycomponent/dialog/salesDialog/shopInfoDialog.vue";
+import SlaesChangeOrderDialog from "../../components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue";
+import GroupPage from "../../components/mycomponent/groupPage.vue";
 
 // 逻辑
-import { listPage } from '../../api/sales/shop'
-import { listMixin, elDataDialog } from '../../utils/myUtils/mixins/listPage'
-import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
+import { listPage } from "../../api/sales/shop";
+import { listMixin, elDataDialog } from "../../utils/myUtils/mixins/listPage";
+import { tableRowClassName } from "../../utils/myUtils/changeTableTr";
 export default {
   components: {
     ShopInfoDialog,
     SlaesChangeOrderDialog,
-    GroupPage
+    GroupPage,
   },
   mixins: [listMixin, elDataDialog],
   data() {
@@ -123,47 +134,50 @@
       isShowAdd: false, // 显示新增功能
       isShowInfo: false, // 显示新增功能
       selectInfo: {
-        itemName: '',
-        itemBudget: '',
-        itemDuration: ''
+        itemName: "",
+        itemBudget: "",
+        itemDuration: "",
       },
-      busOppoId: '',
-      loading:false
-    }
+      busOppoId: "",
+      loading: false,
+    };
   },
   methods: {
     tableRowClassName: tableRowClassName,
     closeAdd() {
-      this.isShowAdd = false
+      this.isShowAdd = false;
     },
 
     handleClick(row) {
       // console.log(row);
-      this.isShowAdd = true
-      this.busOppoId = row.busOppoId
+      this.isShowAdd = true;
+      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)
+    getListPage(limit = 10, offset = 1) {
+      this.loading = true;
+      listPage(`limit=${limit}&offset=${offset}`, this.selectInfo)
+        .then((res) => {
+          // 得到相关数据
+          res.rows.forEach((item, index) => {
+            item.index = index + 1 + (offset - 1) * 10;
+          });
+          this.tableData = res;
+          this.loading = false;
         })
-        this.tableData = res
-        this.loading = false
-      }).catch(err => {
-        this.loading = false
-      })
+        .catch((err) => {
+          this.loading = false;
+        });
     },
     reset() {
       this.selectInfo = {
-        itemName: '',
-        itemBudget: '',
-        itemDuration: ''
-      }
+        itemName: "",
+        itemBudget: "",
+        itemDuration: "",
+      };
+      this.getListPage()
     },
-  }
-}
+  },
+};
 </script>
 
   <style lang="scss" scoped>
@@ -200,7 +214,6 @@
         // width: 84px;
         font-size: 16px;
       }
-
     }
   }
   .footer {

diff --git a/dist.rar b/dist.rar
new file mode 100644
index 0000000..0c07f67
--- /dev/null
+++ b/dist.rar
Binary files differ
diff --git a/src/components/mycomponent/dialog/move/bannerAddDialog.vue b/src/components/mycomponent/dialog/move/bannerAddDialog.vue
index e3bdd0c..6afaea5 100644
--- a/src/components/mycomponent/dialog/move/bannerAddDialog.vue
+++ b/src/components/mycomponent/dialog/move/bannerAddDialog.vue
@@ -13,7 +13,7 @@
         <div class="inputBox">
           <red-star />
           <input-vue
-            v-model="bannerInfo.bannerName"
+            v-model.trim="bannerInfo.bannerName"
             title="banner名称"
             placeholder="请输入唯一编号"
             width="300px"
@@ -89,124 +89,121 @@
         </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 DialogHeader from '../dialogHeader.vue'
-import RedStar from '../../redStar.vue'
-import InputNumber from '../../input/inputNumber.vue'
-import { getToken } from '@/utils/auth'
-import { Base64 } from 'js-base64'
-import { list, add, updata } from '../../../../api/move/bannerConfig'
+import InputVue from "../../input/inputVue.vue";
+import DialogHeader from "../dialogHeader.vue";
+import RedStar from "../../redStar.vue";
+import InputNumber from "../../input/inputNumber.vue";
+import { getToken } from "@/utils/auth";
+import { Base64 } from "js-base64";
+import { list, add, updata } from "../../../../api/move/bannerConfig";
 
 export default {
   components: {
     DialogHeader,
     RedStar,
     InputVue,
-    InputNumber
+    InputNumber,
   },
   props: {
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: true,
     },
-    title: '',
-    dataInfo: ''
+    title: "",
+    dataInfo: "",
   },
   data() {
     return {
       bannerInfo: {
-        bannerName: '',
-        bannerPicture: '',
-        skipUrl: '11',
-        bannerModule: '',
-        bannerSort: 0
+        bannerName: "",
+        bannerPicture: "",
+        skipUrl: "11",
+        bannerModule: "",
+        bannerSort: 0,
       },
       fileList: [],
-      modelList: []
-    }
+      modelList: [],
+    };
   },
   watch: {
     dataInfo: {
       handler(vls) {
+        console.log(vls, "编辑");
         // 得到base64网络
-        if (!vls.id) return
+        if (!vls.id) return;
         this.bannerInfo = {
           id: vls.id,
           bannerName: vls.bannerName,
-          bannerPicture: this.getBase64('http://111.198.10.15:21403/static/' + vls.bannerPicture),
+          bannerPicture: vls.bannerPicture,
           skipUrl: vls.skipUrl,
           bannerModule: vls.bannerModule,
-          bannerSort: vls.bannerSort
-        }
-        console.log(
-          this.getBase64('http://111.198.10.15:21403/static/' + vls.bannerPicture)
-        )
+          bannerSort: vls.bannerSort,
+        };
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   mounted() {
     list().then((res) => {
-      const Ary = []
-      const str = res[26].detail
-      const strAry = str.split(';')
+      const Ary = [];
+      const str = res[25].detail;
+      const strAry = str.split(";");
       for (let i = 0; i < strAry.length; i++) {
-        const temp = strAry[i].split(':')
+        const temp = strAry[i].split(":");
         Ary.push({
           key: temp[2],
-          value: temp[1]
-        })
+          value: temp[1],
+        });
       }
-      console.log(Ary)
-      this.modelList = Ary
-    })
+      this.modelList = Ary;
+    });
   },
   methods: {
     getToken: getToken,
     close() {
-      this.$emit('close')
+      this.$emit("close");
     },
     save() {
-      if (this.title == 'banner新增') {
-        add(this.bannerInfo).then((res) => {
-          if (res != '') {
-            this.close()
+      const {
+        bannerInfo: { bannerName, bannerPicture, bannerModule },
+      } = this;
+      if (bannerName && bannerPicture && bannerModule) {
+        if (this.title == "banner新增") {
+          add(this.bannerInfo).then((res) => {
+            this.$message.success("添加成功");
+            this.close();
             this.bannerInfo = {
-              bannerName: '',
-              bannerPicture: '',
-              skipUrl: '',
-              bannerModule: '',
-              bannerSort: 0
-            }
-          }
-        })
+              bannerName: "",
+              bannerPicture: "",
+              skipUrl: "",
+              bannerModule: "",
+              bannerSort: 0,
+            };
+          });
+        } else {
+          updata(this.bannerInfo).then((res) => {
+            this.$message.success("更新成功");
+            this.close();
+            this.bannerInfo = {
+              bannerName: "",
+              bannerPicture: "",
+              skipUrl: "",
+              bannerModule: "",
+              bannerSort: 0,
+            };
+          });
+        }
       } else {
-        updata(this.bannerInfo).then(res => {
-          if (res != '') {
-            this.$message.success('更新成功')
-            this.close()
-            this.bannerInfo = {
-              bannerName: '',
-              bannerPicture: '',
-              skipUrl: '',
-              bannerModule: '',
-              bannerSort: 0
-            }
-          }
-        })
+        this.$message.error("请先完整填写信息");
       }
     },
 
@@ -214,60 +211,80 @@
       // console.log(response, file, fileList);
     },
     httpRequest(file) {
-      console.log(file.file, '========================')
+      console.log(file.file, "========================");
 
       // this.bannerInfo.bannerPicture =  Base64.encode(file.file)
-      var reader = new FileReader()
+      var reader = new FileReader();
 
-      reader.readAsDataURL(file.file)
+      reader.readAsDataURL(file.file);
       // console.log(reader.readyState,"===========result====",reader,reader.FileReader);
       const timer = setInterval(() => {
         if (reader.result) {
-          clearInterval(timer)
-          this.bannerInfo.bannerPicture = reader.result
-          console.log(this.bannerInfo.bannerPicture)
+          clearInterval(timer);
+          this.bannerInfo.bannerPicture = reader.result;
+          console.log(this.bannerInfo.bannerPicture);
         }
-      }, 300)
+      }, 300);
     },
     handleChange(file, fileList) {
-      console.log(fileList, file)
-      this.fileList = fileList.slice(-1)
+      this.fileList = fileList.slice(-1);
     },
     //  网络图片转base64编码
     getBase64(imgUrl) {
-      window.URL = window.URL || window.webkitURL
-      var xhr = new XMLHttpRequest()
-      xhr.open('get', imgUrl, true)
+      window.URL = window.URL || window.webkitURL;
+      var xhr = new XMLHttpRequest();
+      xhr.open("get", imgUrl, true);
       // 至关重要
-      xhr.responseType = 'blob'
-      xhr.onload = function() {
+      xhr.responseType = "blob";
+      xhr.onload = function () {
         if (this.status == 200) {
           // 得到一个blob对象
-          var blob = this.response
-          console.log('blob', blob)
+          var blob = this.response;
+          console.log("blob", blob);
           // 至关重要
-          const oFileReader = new FileReader()
-          oFileReader.onloadend = function(e) {
+          const oFileReader = new FileReader();
+          oFileReader.onloadend = function (e) {
             // 此处拿到的已经是 base64的图片了
-            const base64 = e.target.result
+            const base64 = e.target.result;
             // console.log("方式一》》》》》》》》》", base64);
-          }
-          oFileReader.readAsDataURL(blob)
+          };
+          oFileReader.readAsDataURL(blob);
           // ====为了在页面显示图片，可以删除====
-          var img = document.createElement('img')
-          img.onload = function(e) {
-            window.URL.revokeObjectURL(img.src) // 清除释放
-          }
-          const src = window.URL.createObjectURL(blob)
-          img.src = src
+          var img = document.createElement("img");
+          img.onload = function (e) {
+            window.URL.revokeObjectURL(img.src); // 清除释放
+          };
+          const src = window.URL.createObjectURL(blob);
+          img.src = src;
           // document.getElementById("container1").appendChild(img);
           // ====为了在页面显示图片，可以删除====
         }
-      }
-      xhr.send()
-    }
-  }
-}
+      };
+      xhr.send();
+    },
+    // 网络图片转base64 canvans方式
+    getBase64Image(img) {
+      var canvas = document.createElement("canvas");
+      canvas.width = img.width;
+      canvas.height = img.height;
+      var ctx = canvas.getContext("2d");
+      ctx.drawImage(img, 0, 0, img.width, img.height);
+      var dataURL = canvas.toDataURL("image/png"); // 可选其他值 image/jpeg
+      return dataURL;
+    },
+
+    main(src) {
+      let _this = this
+      var image = new Image();
+      image.src = src + "?v=" + Math.random(); // 处理缓存
+      image.crossOrigin = "*"; // 支持跨域图片
+      image.onload = function () {
+        var base64 = _this.getBase64Image(image);
+        this.bannerInfo.bannerPicture = base64
+      };
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
index 5e58333..4cae18a 100644
--- a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
+++ b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
@@ -13,7 +13,7 @@
           <div class="inputBox">
             <red-star />
             <input-vue
-              v-model="changeOrderInfo.receiver"
+              v-model.trim="changeOrderInfo.receiver"
               title="收货人"
               width="300px"
               class="inputWidth"
@@ -22,7 +22,7 @@
           <div class="inputBox">
             <red-star />
             <input-vue
-              v-model="changeOrderInfo.receiverPhone"
+              v-model.trim="changeOrderInfo.receiverPhone"
               title="收货人联系方式"
               width="300px"
               class="inputWidth"
@@ -74,7 +74,7 @@
               />
             </el-select>
             <el-input
-              v-model="changeOrderInfo.deliveryAddress"
+              v-model.trim="changeOrderInfo.deliveryAddress"
               placeholder="请输入内容"
               style="width: 638px"
             />
@@ -101,7 +101,7 @@
               style="justify-content: space-between"
             >
               <el-input
-                v-model="changeOrderInfo.remark"
+                v-model.trim="changeOrderInfo.remark"
                 style="width: 300px"
                 type="textarea"
                 :rows="3"
diff --git a/src/components/mycomponent/dialog/server/managementAddDialog.vue b/src/components/mycomponent/dialog/server/managementAddDialog.vue
index d3c1b9d..e1b2210 100644
--- a/src/components/mycomponent/dialog/server/managementAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/managementAddDialog.vue
@@ -12,7 +12,7 @@
         <div class="inputBox">
           <red-star />
           <input-vue
-            v-model="managementInfo.serviceCode"
+            v-model.trim="managementInfo.serviceCode"
             title="服务编号"
             placeholder="请输入服务编号"
             width="300px"
@@ -23,7 +23,7 @@
         <div class="inputBox">
           <red-star />
           <input-vue
-            v-model="managementInfo.serviceName"
+            v-model.trim="managementInfo.serviceName"
             title="服务名称"
             placeholder="请输入服务名称"
             width="300px"
@@ -78,7 +78,7 @@
         <div class="inputBox">
           <red-star />
           <input-vue
-            v-model="managementInfo.description"
+            v-model.trim="managementInfo.description"
             title="服务描述"
             width="300px"
             class="inputWidth"
@@ -112,7 +112,7 @@
             style="justify-content: space-between"
           >
             <el-input
-              v-model="managementInfo.remark"
+              v-model.trim="managementInfo.remark"
               type="textarea"
               style="width: 300px"
               :rows="2"
diff --git a/src/components/mycomponent/dialog/server/operationAddDialog.vue b/src/components/mycomponent/dialog/server/operationAddDialog.vue
index d436541..abd0a23 100644
--- a/src/components/mycomponent/dialog/server/operationAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/operationAddDialog.vue
@@ -11,12 +11,12 @@
             width="300px"
             class="inputWidth"
             style="justify-content: space-between;"
-            v-model="form.date"
+            v-model.trim="form.date"
           />
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="服务名称" placeholder="请输入品牌名称" v-model="form.name" class="inputWidth" style="justify-content: space-between;">
+          <input-vue title="服务名称" placeholder="请输入品牌名称" v-model.trim="form.name" class="inputWidth" style="justify-content: space-between;">
             <el-select
               v-model="form.date"
               style="width:300PX"
@@ -43,12 +43,12 @@
             width="300px"
             class="inputWidth"
             style="justify-content: space-between;"
-            v-model="form.address"
+            v-model.trim="form.address"
           />
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="服务优惠" v-model="form.address1" placeholder="" class="inputWidth" style="justify-content: space-between;">
+          <input-vue title="服务优惠" v-model.trim="form.address1" placeholder="" class="inputWidth" style="justify-content: space-between;">
             <el-select
               v-model="form.address"
               style="width:300px"
@@ -69,13 +69,13 @@
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="时间" width="300px" class="inputWidth" style="justify-content: space-between;" v-model='form.address2'/>
+          <input-vue title="时间" width="300px" class="inputWidth" style="justify-content: space-between;" v-model.trim='form.address2'/>
         </div>
 
         <div class="inputBox">
         &nbsp;
           <input-vue title="备注" class="inputWidth" style="justify-content: space-between;">
-            <el-input v-model="textarea" type="textarea" style="width:300px" :rows="2" placeholder="请输入内容" />
+            <el-input v-model.trim="textarea" type="textarea" style="width:300px" :rows="2" placeholder="请输入内容" />
           </input-vue>
         </div>
       </div>
diff --git a/src/components/mycomponent/dialog/server/typeAddDialog.vue b/src/components/mycomponent/dialog/server/typeAddDialog.vue
index 6c98c04..042421d 100644
--- a/src/components/mycomponent/dialog/server/typeAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/typeAddDialog.vue
@@ -6,7 +6,7 @@
         <div class="inputBox">
           <red-star />
           <input-vue
-            v-model="addInfo.typeCode"
+            v-model.trim="addInfo.typeCode"
             title="服务类型编号"
             placeholder="请输入服务类型编号"
             width="300px"
@@ -17,7 +17,7 @@
         <div class="inputBox">
           <red-star />
           <input-vue
-            v-model="addInfo.typeName"
+            v-model.trim="addInfo.typeName"
             title="服务类型名称"
             placeholder="请输入服务类型名称"
             width="300px"
@@ -28,7 +28,7 @@
         <div class="inputBox">
           <red-star />
           <input-vue
-            v-model="addInfo.description"
+            v-model.trim="addInfo.description"
             title="描述"
             width="300px"
             class="inputWidth"
@@ -55,7 +55,7 @@
         <div class="inputBox">
           &nbsp;
           <input-vue title="备注" class="inputWidth" style="justify-content: space-between;">
-            <el-input v-model="addInfo.remark" type="textarea" style="width:300px" :rows="2" placeholder="请输入内容" />
+            <el-input v-model.trim="addInfo.remark" type="textarea" style="width:300px" :rows="2" placeholder="请输入内容" />
           </input-vue>
         </div>
       </div>
diff --git a/src/views/move/bannerConfig.vue b/src/views/move/bannerConfig.vue
index 8bb613a..a4f1aaf 100644
--- a/src/views/move/bannerConfig.vue
+++ b/src/views/move/bannerConfig.vue
@@ -42,7 +42,7 @@
           type="danger"
           icon="el-icon-delete-solid"
           class="btnItem bgred"
-          @click=" BatchDelete"
+          @click="BatchDelete"
         >
           删除
         </el-button>
@@ -68,12 +68,14 @@
         <template slot-scope="scope">
           <!-- {{scope.row.bannerPicture}} -->
           <img
-            v-if="scope.row.bannerPicture!=''"
-            :src="'http://111.198.10.15:21403/static/'+scope.row.bannerPicture"
+            v-if="scope.row.bannerPicture != ''"
+            :src="
+              'http://111.198.10.15:21403/static/' + scope.row.bannerPicture
+            "
             width="100"
             height="100px"
             alt=""
-          >
+          />
         </template>
       </el-table-column>
       <el-table-column prop="bannerModuleName" label="所属功能模块" />
@@ -83,11 +85,7 @@
           <el-button type="text" size="small" @click="updata(scope.row)">
             编辑
           </el-button>
-          <el-button
-            type="text"
-            size="small"
-            @click="Bdelete(scope.row)"
-          >
+          <el-button type="text" size="small" @click="Bdelete(scope.row)">
             删除
           </el-button>
         </template>
@@ -105,102 +103,138 @@
     />
     <!-- 新增弹框 -->
     <!-- <category-add-dialog  :isShowInfo="isShowAdd"  @close ="closeAdd"></category-add-dialog> -->
-    <banner-add-dialog :is-show-info="isShowAdd" :title="title" :data-info="rowInfo" @close="closeAdd" />
+    <banner-add-dialog
+      :is-show-info="isShowAdd"
+      :title="title"
+      :data-info="rowInfo"
+      @close="closeAdd"
+    />
   </div>
 </template>
 
 <script>
 // 组件
 
-import BannerAddDialog from '../../components/mycomponent/dialog/move/bannerAddDialog.vue'
-import GroupPage from '../../components/mycomponent/groupPage.vue'
+import BannerAddDialog from "../../components/mycomponent/dialog/move/bannerAddDialog.vue";
+import GroupPage from "../../components/mycomponent/groupPage.vue";
 // 逻辑
-import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
-import { listPage, bdelete, batchDelete } from '../../api/move/bannerConfig'
-import { listMixin } from '../../utils/myUtils/mixins/listPage'
+import { tableRowClassName } from "../../utils/myUtils/changeTableTr";
+import { listPage, bdelete, batchDelete } from "../../api/move/bannerConfig";
+import { listMixin } from "../../utils/myUtils/mixins/listPage";
 
-export default { // 加入分页逻辑
+export default {
+  // 加入分页逻辑
   components: {
     BannerAddDialog,
-    GroupPage
+    GroupPage,
   },
   mixins: [listMixin],
   data() {
     return {
       isShowAdd: false, // 显示新增功能
       selectInfo: {
-        bannerName: ''
+        bannerName: "",
       },
-      title: '',
-      rowInfo: ''
-    }
+      title: "",
+      rowInfo: "",
+    };
   },
   methods: {
     tableRowClassName: tableRowClassName,
     closeAdd() {
-      this.isShowAdd = false
-      this.refresh()
+      this.isShowAdd = false;
+      this.refresh();
     },
 
     addCategory() {
-      this.isShowAdd = true
-      this.title = 'banner新增'
+      this.isShowAdd = true;
+      this.title = "banner新增";
     },
     updata(row) {
-      this.isShowAdd = true
-      this.title = 'banner编辑'
-      this.rowInfo = row
+      this.isShowAdd = true;
+      this.title = "banner编辑";
+      this.rowInfo = row;
     },
     getListPage(limit, offset) {
-      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
-        // 得到相关数据
-        res.rows.forEach((item, index) => {
-          item.index = (index + 1) + ((offset - 1) * 10)
-        })
-        this.tableData = res
-      })
+      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(
+        (res) => {
+          // 得到相关数据
+          res.rows.forEach((item, index) => {
+            item.index = index + 1 + (offset - 1) * 10;
+          });
+          this.tableData = res;
+        }
+      );
     },
     reset() {
       this.selectInfo = {
-        bannerName: ''
-      }
+        bannerName: "",
+      };
+      listPage(`limit=${10}&offset=${1}`, this.selectInfo).then(
+        (res) => {
+          // 得到相关数据
+          res.rows.forEach((item, index) => {
+            item.index = index + 1 + (1 - 1) * 10;
+          });
+          this.tableData = res;
+        }
+      );
     },
     // 批量删除
     BatchDelete() {
-      //  得到选中行
-      const dle_ary = this.$refs.multipleTable.selection
-      const ids = []
-      dle_ary.forEach(ele => {
-        ids.push(ele.id)
-      })
-      batchDelete({ ids: ids }).then(res => {
-        if (res != '') {
-          this.$message({
-            message: '删除成功',
-            type: 'success'
+      if (this.$refs.multipleTable.selection.length) {
+        this.$confirm(`确认删除选中的这些数据吗？`, "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            //  得到选中行
+            const dle_ary = this.$refs.multipleTable.selection;
+            const ids = [];
+            dle_ary.forEach((ele) => {
+              ids.push(ele.id);
+            });
+            batchDelete({ ids: ids }).then((res) => {
+              this.$message({
+                message: "删除成功",
+                type: "success",
+              });
+              this.refresh();
+            });
           })
-          this.refresh()
-        }
-      })
+          .catch(() => {});
+      } else {
+        this.$message({
+          message: "请先选择需要删除的数据",
+          type: "error",
+        });
+      }
     },
     // 删除
     Bdelete(row) {
-      // console.log(row);
-      const id = row.id
-      bdelete({ id: id }).then(res => {
-        // console.log(res);
-        // 删除成功跟新数据
-        if (res != '') {
-          this.$message({
-            message: '删除成功',
-            type: 'success'
-          })
-          this.refresh()
-        }
+      this.$confirm(`确认删除此项内容吗？`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
       })
-    }
-  }
-}
+        .then(() => {
+          const id = row.id;
+          bdelete({ id: id }).then((res) => {
+            // console.log(res);
+            // 删除成功跟新数据
+            this.$message({
+              message: "删除成功",
+              type: "success",
+            });
+            this.refresh();
+          });
+        })
+        .catch(() => {});
+      // console.log(row);
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -242,7 +276,6 @@
         // width: 84px;
         font-size: 16px;
       }
-
     }
   }
 
diff --git a/src/views/move/hotAndNews.vue b/src/views/move/hotAndNews.vue
index 6e5ee27..ba86219 100644
--- a/src/views/move/hotAndNews.vue
+++ b/src/views/move/hotAndNews.vue
@@ -76,7 +76,7 @@
       style="width: 100%"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column prop="index" label="序号" />
+      <el-table-column prop="index" label="序号" width="60"/>
       <el-table-column prop="recommendCode" label="编号" />
       <el-table-column prop="recommendModuleName" label="所属模块" />
       <el-table-column prop="recommendType" label="类型" />
@@ -187,6 +187,13 @@
         recommendType: '',
         recommendTitle: ''
       }
+      listPage(`limit=${10}&offset=${1}`, this.selectInfo).then(res => {
+      // 得到相关数据
+        res.rows.forEach((item, index) => {
+          item.index = (index + 1) + ((1 - 1) * 10)
+        })
+        this.tableData = res
+      })
     },
     BatchDelete() {
       //  得到选中行
diff --git a/src/views/sales/shop.vue b/src/views/sales/shop.vue
index 0a1c756..704d7c8 100644
--- a/src/views/sales/shop.vue
+++ b/src/views/sales/shop.vue
@@ -16,19 +16,21 @@
         <div class="inputBox" style="width: 144px">
           <el-input
             v-model="selectInfo.itemBudget"
-            placeholder="请输入项目预期"
+            placeholder="请输入项目预算"
             clearable
             class="product-input"
           />
         </div>
         预计工期
         <div class="inputBox" style="width: 144px">
-          <el-input
+          <!-- <el-input
             v-model="selectInfo.itemDuration"
             placeholder="请选择项目日期"
             clearable
             class="product-input"
-          />
+          /> -->
+          <el-date-picker v-model="selectInfo.itemDuration" type="date" placeholder="请选择日期" value-format="yyyy-MM-dd HH:mm:ss">
+          </el-date-picker>
         </div>
       </div>
       <div class="productBtn">
@@ -63,27 +65,20 @@
       v-loading="loading"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column prop="index" label="序号" />
+      <el-table-column prop="index" label="序号" width="60"/>
       <el-table-column prop="busOppoId" label="商机编号" />
       <el-table-column prop="itemName" label="项目名称" />
-      <el-table-column prop="itemBudget" label="预期工期" />
+      <el-table-column prop="itemBudget" label="项目预算" />
+      <el-table-column prop="itemDuration" label="预计工期" />
       <el-table-column prop="itemManager" label="商机负责人" />
       <el-table-column prop="phone" label="联系方式" />
       <el-table-column prop="status" label="商机状态" />
       <el-table-column label="操作">
         <template slot-scope="scope">
-          <el-button
-            type="text"
-            size="small"
-            @click="showInfo(scope.row)"
-          >
+          <el-button type="text" size="small" @click="showInfo(scope.row)">
             详情
           </el-button>
-          <el-button
-            type="text"
-            size="small"
-            @click="handleClick(scope.row)"
-          >
+          <el-button type="text" size="small" @click="handleClick(scope.row)">
             商机转订单
           </el-button>
 
@@ -91,31 +86,47 @@
         </template>
       </el-table-column>
     </el-table>
-    <group-page v-model="isFristPage" :limit="limit" :total="total" :offset="offset" :count="tableData.total" @setOffset="setOffset" @setLimit="setLimit" />
+    <group-page
+      v-model="isFristPage"
+      :limit="limit"
+      :total="total"
+      :offset="offset"
+      :count="tableData.total"
+      @setOffset="setOffset"
+      @setLimit="setLimit"
+    />
     <!-- 新增弹框 -->
 
     <!-- <brand-add-dialog  :isShowInfo="isShowAdd"
       @close="closeAdd"></brand-add-dialog> -->
-    <shop-info-dialog :is-show-info="isShowInfo" :data-info="rowInfo" @close="closeInfo" />
-    <slaes-change-order-dialog :is-show-info="isShowAdd" :bus-oppo-id="busOppoId" @close="closeAdd" />
+    <shop-info-dialog
+      :is-show-info="isShowInfo"
+      :data-info="rowInfo"
+      @close="closeInfo"
+    />
+    <slaes-change-order-dialog
+      :is-show-info="isShowAdd"
+      :bus-oppo-id="busOppoId"
+      @close="closeAdd"
+    />
   </div>
 </template>
 
 <script>
 // 组件
-import ShopInfoDialog from '../../components/mycomponent/dialog/salesDialog/shopInfoDialog.vue'
-import SlaesChangeOrderDialog from '../../components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue'
-import GroupPage from '../../components/mycomponent/groupPage.vue'
+import ShopInfoDialog from "../../components/mycomponent/dialog/salesDialog/shopInfoDialog.vue";
+import SlaesChangeOrderDialog from "../../components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue";
+import GroupPage from "../../components/mycomponent/groupPage.vue";
 
 // 逻辑
-import { listPage } from '../../api/sales/shop'
-import { listMixin, elDataDialog } from '../../utils/myUtils/mixins/listPage'
-import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
+import { listPage } from "../../api/sales/shop";
+import { listMixin, elDataDialog } from "../../utils/myUtils/mixins/listPage";
+import { tableRowClassName } from "../../utils/myUtils/changeTableTr";
 export default {
   components: {
     ShopInfoDialog,
     SlaesChangeOrderDialog,
-    GroupPage
+    GroupPage,
   },
   mixins: [listMixin, elDataDialog],
   data() {
@@ -123,47 +134,50 @@
       isShowAdd: false, // 显示新增功能
       isShowInfo: false, // 显示新增功能
       selectInfo: {
-        itemName: '',
-        itemBudget: '',
-        itemDuration: ''
+        itemName: "",
+        itemBudget: "",
+        itemDuration: "",
       },
-      busOppoId: '',
-      loading:false
-    }
+      busOppoId: "",
+      loading: false,
+    };
   },
   methods: {
     tableRowClassName: tableRowClassName,
     closeAdd() {
-      this.isShowAdd = false
+      this.isShowAdd = false;
     },
 
     handleClick(row) {
       // console.log(row);
-      this.isShowAdd = true
-      this.busOppoId = row.busOppoId
+      this.isShowAdd = true;
+      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)
+    getListPage(limit = 10, offset = 1) {
+      this.loading = true;
+      listPage(`limit=${limit}&offset=${offset}`, this.selectInfo)
+        .then((res) => {
+          // 得到相关数据
+          res.rows.forEach((item, index) => {
+            item.index = index + 1 + (offset - 1) * 10;
+          });
+          this.tableData = res;
+          this.loading = false;
         })
-        this.tableData = res
-        this.loading = false
-      }).catch(err => {
-        this.loading = false
-      })
+        .catch((err) => {
+          this.loading = false;
+        });
     },
     reset() {
       this.selectInfo = {
-        itemName: '',
-        itemBudget: '',
-        itemDuration: ''
-      }
+        itemName: "",
+        itemBudget: "",
+        itemDuration: "",
+      };
+      this.getListPage()
     },
-  }
-}
+  },
+};
 </script>
 
   <style lang="scss" scoped>
@@ -200,7 +214,6 @@
         // width: 84px;
         font-size: 16px;
       }
-
     }
   }
   .footer {
diff --git a/src/views/server/Management.vue b/src/views/server/Management.vue
index bed5935..ad94c61 100644
--- a/src/views/server/Management.vue
+++ b/src/views/server/Management.vue
@@ -176,7 +176,6 @@
     handleClick(row) {
       this.title = "服务编辑";
       this.isShowAdd = true;
-      console.log(row);
       this.rowInfo = row;
     },
     reset() {
@@ -185,11 +184,12 @@
         serviceName: "",
         typeCode: "",
       };
+      this.getListPage()
     },
     // 获取指定页面
-    getListPage(limit, offset) {
+    getListPage(limit = 10, offset = 1) {
       this.loading = true
-      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(
+      listPage(`limit=${limit}&offset=${offset}`, this.selectInfo).then(
         (res) => {
           // 得到相关数据
           res.rows.forEach((item, index) => {

diff --git a/dist.rar b/dist.rar
new file mode 100644
index 0000000..0c07f67
--- /dev/null
+++ b/dist.rar
Binary files differ
diff --git a/src/components/mycomponent/dialog/move/bannerAddDialog.vue b/src/components/mycomponent/dialog/move/bannerAddDialog.vue
index e3bdd0c..6afaea5 100644
--- a/src/components/mycomponent/dialog/move/bannerAddDialog.vue
+++ b/src/components/mycomponent/dialog/move/bannerAddDialog.vue
@@ -13,7 +13,7 @@
         <div class="inputBox">
           <red-star />
           <input-vue
-            v-model="bannerInfo.bannerName"
+            v-model.trim="bannerInfo.bannerName"
             title="banner名称"
             placeholder="请输入唯一编号"
             width="300px"
@@ -89,124 +89,121 @@
         </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 DialogHeader from '../dialogHeader.vue'
-import RedStar from '../../redStar.vue'
-import InputNumber from '../../input/inputNumber.vue'
-import { getToken } from '@/utils/auth'
-import { Base64 } from 'js-base64'
-import { list, add, updata } from '../../../../api/move/bannerConfig'
+import InputVue from "../../input/inputVue.vue";
+import DialogHeader from "../dialogHeader.vue";
+import RedStar from "../../redStar.vue";
+import InputNumber from "../../input/inputNumber.vue";
+import { getToken } from "@/utils/auth";
+import { Base64 } from "js-base64";
+import { list, add, updata } from "../../../../api/move/bannerConfig";
 
 export default {
   components: {
     DialogHeader,
     RedStar,
     InputVue,
-    InputNumber
+    InputNumber,
   },
   props: {
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: true,
     },
-    title: '',
-    dataInfo: ''
+    title: "",
+    dataInfo: "",
   },
   data() {
     return {
       bannerInfo: {
-        bannerName: '',
-        bannerPicture: '',
-        skipUrl: '11',
-        bannerModule: '',
-        bannerSort: 0
+        bannerName: "",
+        bannerPicture: "",
+        skipUrl: "11",
+        bannerModule: "",
+        bannerSort: 0,
       },
       fileList: [],
-      modelList: []
-    }
+      modelList: [],
+    };
   },
   watch: {
     dataInfo: {
       handler(vls) {
+        console.log(vls, "编辑");
         // 得到base64网络
-        if (!vls.id) return
+        if (!vls.id) return;
         this.bannerInfo = {
           id: vls.id,
           bannerName: vls.bannerName,
-          bannerPicture: this.getBase64('http://111.198.10.15:21403/static/' + vls.bannerPicture),
+          bannerPicture: vls.bannerPicture,
           skipUrl: vls.skipUrl,
           bannerModule: vls.bannerModule,
-          bannerSort: vls.bannerSort
-        }
-        console.log(
-          this.getBase64('http://111.198.10.15:21403/static/' + vls.bannerPicture)
-        )
+          bannerSort: vls.bannerSort,
+        };
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   mounted() {
     list().then((res) => {
-      const Ary = []
-      const str = res[26].detail
-      const strAry = str.split(';')
+      const Ary = [];
+      const str = res[25].detail;
+      const strAry = str.split(";");
       for (let i = 0; i < strAry.length; i++) {
-        const temp = strAry[i].split(':')
+        const temp = strAry[i].split(":");
         Ary.push({
           key: temp[2],
-          value: temp[1]
-        })
+          value: temp[1],
+        });
       }
-      console.log(Ary)
-      this.modelList = Ary
-    })
+      this.modelList = Ary;
+    });
   },
   methods: {
     getToken: getToken,
     close() {
-      this.$emit('close')
+      this.$emit("close");
     },
     save() {
-      if (this.title == 'banner新增') {
-        add(this.bannerInfo).then((res) => {
-          if (res != '') {
-            this.close()
+      const {
+        bannerInfo: { bannerName, bannerPicture, bannerModule },
+      } = this;
+      if (bannerName && bannerPicture && bannerModule) {
+        if (this.title == "banner新增") {
+          add(this.bannerInfo).then((res) => {
+            this.$message.success("添加成功");
+            this.close();
             this.bannerInfo = {
-              bannerName: '',
-              bannerPicture: '',
-              skipUrl: '',
-              bannerModule: '',
-              bannerSort: 0
-            }
-          }
-        })
+              bannerName: "",
+              bannerPicture: "",
+              skipUrl: "",
+              bannerModule: "",
+              bannerSort: 0,
+            };
+          });
+        } else {
+          updata(this.bannerInfo).then((res) => {
+            this.$message.success("更新成功");
+            this.close();
+            this.bannerInfo = {
+              bannerName: "",
+              bannerPicture: "",
+              skipUrl: "",
+              bannerModule: "",
+              bannerSort: 0,
+            };
+          });
+        }
       } else {
-        updata(this.bannerInfo).then(res => {
-          if (res != '') {
-            this.$message.success('更新成功')
-            this.close()
-            this.bannerInfo = {
-              bannerName: '',
-              bannerPicture: '',
-              skipUrl: '',
-              bannerModule: '',
-              bannerSort: 0
-            }
-          }
-        })
+        this.$message.error("请先完整填写信息");
       }
     },
 
@@ -214,60 +211,80 @@
       // console.log(response, file, fileList);
     },
     httpRequest(file) {
-      console.log(file.file, '========================')
+      console.log(file.file, "========================");
 
       // this.bannerInfo.bannerPicture =  Base64.encode(file.file)
-      var reader = new FileReader()
+      var reader = new FileReader();
 
-      reader.readAsDataURL(file.file)
+      reader.readAsDataURL(file.file);
       // console.log(reader.readyState,"===========result====",reader,reader.FileReader);
       const timer = setInterval(() => {
         if (reader.result) {
-          clearInterval(timer)
-          this.bannerInfo.bannerPicture = reader.result
-          console.log(this.bannerInfo.bannerPicture)
+          clearInterval(timer);
+          this.bannerInfo.bannerPicture = reader.result;
+          console.log(this.bannerInfo.bannerPicture);
         }
-      }, 300)
+      }, 300);
     },
     handleChange(file, fileList) {
-      console.log(fileList, file)
-      this.fileList = fileList.slice(-1)
+      this.fileList = fileList.slice(-1);
     },
     //  网络图片转base64编码
     getBase64(imgUrl) {
-      window.URL = window.URL || window.webkitURL
-      var xhr = new XMLHttpRequest()
-      xhr.open('get', imgUrl, true)
+      window.URL = window.URL || window.webkitURL;
+      var xhr = new XMLHttpRequest();
+      xhr.open("get", imgUrl, true);
       // 至关重要
-      xhr.responseType = 'blob'
-      xhr.onload = function() {
+      xhr.responseType = "blob";
+      xhr.onload = function () {
         if (this.status == 200) {
           // 得到一个blob对象
-          var blob = this.response
-          console.log('blob', blob)
+          var blob = this.response;
+          console.log("blob", blob);
           // 至关重要
-          const oFileReader = new FileReader()
-          oFileReader.onloadend = function(e) {
+          const oFileReader = new FileReader();
+          oFileReader.onloadend = function (e) {
             // 此处拿到的已经是 base64的图片了
-            const base64 = e.target.result
+            const base64 = e.target.result;
             // console.log("方式一》》》》》》》》》", base64);
-          }
-          oFileReader.readAsDataURL(blob)
+          };
+          oFileReader.readAsDataURL(blob);
           // ====为了在页面显示图片，可以删除====
-          var img = document.createElement('img')
-          img.onload = function(e) {
-            window.URL.revokeObjectURL(img.src) // 清除释放
-          }
-          const src = window.URL.createObjectURL(blob)
-          img.src = src
+          var img = document.createElement("img");
+          img.onload = function (e) {
+            window.URL.revokeObjectURL(img.src); // 清除释放
+          };
+          const src = window.URL.createObjectURL(blob);
+          img.src = src;
           // document.getElementById("container1").appendChild(img);
           // ====为了在页面显示图片，可以删除====
         }
-      }
-      xhr.send()
-    }
-  }
-}
+      };
+      xhr.send();
+    },
+    // 网络图片转base64 canvans方式
+    getBase64Image(img) {
+      var canvas = document.createElement("canvas");
+      canvas.width = img.width;
+      canvas.height = img.height;
+      var ctx = canvas.getContext("2d");
+      ctx.drawImage(img, 0, 0, img.width, img.height);
+      var dataURL = canvas.toDataURL("image/png"); // 可选其他值 image/jpeg
+      return dataURL;
+    },
+
+    main(src) {
+      let _this = this
+      var image = new Image();
+      image.src = src + "?v=" + Math.random(); // 处理缓存
+      image.crossOrigin = "*"; // 支持跨域图片
+      image.onload = function () {
+        var base64 = _this.getBase64Image(image);
+        this.bannerInfo.bannerPicture = base64
+      };
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
index 5e58333..4cae18a 100644
--- a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
+++ b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
@@ -13,7 +13,7 @@
           <div class="inputBox">
             <red-star />
             <input-vue
-              v-model="changeOrderInfo.receiver"
+              v-model.trim="changeOrderInfo.receiver"
               title="收货人"
               width="300px"
               class="inputWidth"
@@ -22,7 +22,7 @@
           <div class="inputBox">
             <red-star />
             <input-vue
-              v-model="changeOrderInfo.receiverPhone"
+              v-model.trim="changeOrderInfo.receiverPhone"
               title="收货人联系方式"
               width="300px"
               class="inputWidth"
@@ -74,7 +74,7 @@
               />
             </el-select>
             <el-input
-              v-model="changeOrderInfo.deliveryAddress"
+              v-model.trim="changeOrderInfo.deliveryAddress"
               placeholder="请输入内容"
               style="width: 638px"
             />
@@ -101,7 +101,7 @@
               style="justify-content: space-between"
             >
               <el-input
-                v-model="changeOrderInfo.remark"
+                v-model.trim="changeOrderInfo.remark"
                 style="width: 300px"
                 type="textarea"
                 :rows="3"
diff --git a/src/components/mycomponent/dialog/server/managementAddDialog.vue b/src/components/mycomponent/dialog/server/managementAddDialog.vue
index d3c1b9d..e1b2210 100644
--- a/src/components/mycomponent/dialog/server/managementAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/managementAddDialog.vue
@@ -12,7 +12,7 @@
         <div class="inputBox">
           <red-star />
           <input-vue
-            v-model="managementInfo.serviceCode"
+            v-model.trim="managementInfo.serviceCode"
             title="服务编号"
             placeholder="请输入服务编号"
             width="300px"
@@ -23,7 +23,7 @@
         <div class="inputBox">
           <red-star />
           <input-vue
-            v-model="managementInfo.serviceName"
+            v-model.trim="managementInfo.serviceName"
             title="服务名称"
             placeholder="请输入服务名称"
             width="300px"
@@ -78,7 +78,7 @@
         <div class="inputBox">
           <red-star />
           <input-vue
-            v-model="managementInfo.description"
+            v-model.trim="managementInfo.description"
             title="服务描述"
             width="300px"
             class="inputWidth"
@@ -112,7 +112,7 @@
             style="justify-content: space-between"
           >
             <el-input
-              v-model="managementInfo.remark"
+              v-model.trim="managementInfo.remark"
               type="textarea"
               style="width: 300px"
               :rows="2"
diff --git a/src/components/mycomponent/dialog/server/operationAddDialog.vue b/src/components/mycomponent/dialog/server/operationAddDialog.vue
index d436541..abd0a23 100644
--- a/src/components/mycomponent/dialog/server/operationAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/operationAddDialog.vue
@@ -11,12 +11,12 @@
             width="300px"
             class="inputWidth"
             style="justify-content: space-between;"
-            v-model="form.date"
+            v-model.trim="form.date"
           />
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="服务名称" placeholder="请输入品牌名称" v-model="form.name" class="inputWidth" style="justify-content: space-between;">
+          <input-vue title="服务名称" placeholder="请输入品牌名称" v-model.trim="form.name" class="inputWidth" style="justify-content: space-between;">
             <el-select
               v-model="form.date"
               style="width:300PX"
@@ -43,12 +43,12 @@
             width="300px"
             class="inputWidth"
             style="justify-content: space-between;"
-            v-model="form.address"
+            v-model.trim="form.address"
           />
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="服务优惠" v-model="form.address1" placeholder="" class="inputWidth" style="justify-content: space-between;">
+          <input-vue title="服务优惠" v-model.trim="form.address1" placeholder="" class="inputWidth" style="justify-content: space-between;">
             <el-select
               v-model="form.address"
               style="width:300px"
@@ -69,13 +69,13 @@
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="时间" width="300px" class="inputWidth" style="justify-content: space-between;" v-model='form.address2'/>
+          <input-vue title="时间" width="300px" class="inputWidth" style="justify-content: space-between;" v-model.trim='form.address2'/>
         </div>
 
         <div class="inputBox">
         &nbsp;
           <input-vue title="备注" class="inputWidth" style="justify-content: space-between;">
-            <el-input v-model="textarea" type="textarea" style="width:300px" :rows="2" placeholder="请输入内容" />
+            <el-input v-model.trim="textarea" type="textarea" style="width:300px" :rows="2" placeholder="请输入内容" />
           </input-vue>
         </div>
       </div>
diff --git a/src/components/mycomponent/dialog/server/typeAddDialog.vue b/src/components/mycomponent/dialog/server/typeAddDialog.vue
index 6c98c04..042421d 100644
--- a/src/components/mycomponent/dialog/server/typeAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/typeAddDialog.vue
@@ -6,7 +6,7 @@
         <div class="inputBox">
           <red-star />
           <input-vue
-            v-model="addInfo.typeCode"
+            v-model.trim="addInfo.typeCode"
             title="服务类型编号"
             placeholder="请输入服务类型编号"
             width="300px"
@@ -17,7 +17,7 @@
         <div class="inputBox">
           <red-star />
           <input-vue
-            v-model="addInfo.typeName"
+            v-model.trim="addInfo.typeName"
             title="服务类型名称"
             placeholder="请输入服务类型名称"
             width="300px"
@@ -28,7 +28,7 @@
         <div class="inputBox">
           <red-star />
           <input-vue
-            v-model="addInfo.description"
+            v-model.trim="addInfo.description"
             title="描述"
             width="300px"
             class="inputWidth"
@@ -55,7 +55,7 @@
         <div class="inputBox">
           &nbsp;
           <input-vue title="备注" class="inputWidth" style="justify-content: space-between;">
-            <el-input v-model="addInfo.remark" type="textarea" style="width:300px" :rows="2" placeholder="请输入内容" />
+            <el-input v-model.trim="addInfo.remark" type="textarea" style="width:300px" :rows="2" placeholder="请输入内容" />
           </input-vue>
         </div>
       </div>
diff --git a/src/views/move/bannerConfig.vue b/src/views/move/bannerConfig.vue
index 8bb613a..a4f1aaf 100644
--- a/src/views/move/bannerConfig.vue
+++ b/src/views/move/bannerConfig.vue
@@ -42,7 +42,7 @@
           type="danger"
           icon="el-icon-delete-solid"
           class="btnItem bgred"
-          @click=" BatchDelete"
+          @click="BatchDelete"
         >
           删除
         </el-button>
@@ -68,12 +68,14 @@
         <template slot-scope="scope">
           <!-- {{scope.row.bannerPicture}} -->
           <img
-            v-if="scope.row.bannerPicture!=''"
-            :src="'http://111.198.10.15:21403/static/'+scope.row.bannerPicture"
+            v-if="scope.row.bannerPicture != ''"
+            :src="
+              'http://111.198.10.15:21403/static/' + scope.row.bannerPicture
+            "
             width="100"
             height="100px"
             alt=""
-          >
+          />
         </template>
       </el-table-column>
       <el-table-column prop="bannerModuleName" label="所属功能模块" />
@@ -83,11 +85,7 @@
           <el-button type="text" size="small" @click="updata(scope.row)">
             编辑
           </el-button>
-          <el-button
-            type="text"
-            size="small"
-            @click="Bdelete(scope.row)"
-          >
+          <el-button type="text" size="small" @click="Bdelete(scope.row)">
             删除
           </el-button>
         </template>
@@ -105,102 +103,138 @@
     />
     <!-- 新增弹框 -->
     <!-- <category-add-dialog  :isShowInfo="isShowAdd"  @close ="closeAdd"></category-add-dialog> -->
-    <banner-add-dialog :is-show-info="isShowAdd" :title="title" :data-info="rowInfo" @close="closeAdd" />
+    <banner-add-dialog
+      :is-show-info="isShowAdd"
+      :title="title"
+      :data-info="rowInfo"
+      @close="closeAdd"
+    />
   </div>
 </template>
 
 <script>
 // 组件
 
-import BannerAddDialog from '../../components/mycomponent/dialog/move/bannerAddDialog.vue'
-import GroupPage from '../../components/mycomponent/groupPage.vue'
+import BannerAddDialog from "../../components/mycomponent/dialog/move/bannerAddDialog.vue";
+import GroupPage from "../../components/mycomponent/groupPage.vue";
 // 逻辑
-import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
-import { listPage, bdelete, batchDelete } from '../../api/move/bannerConfig'
-import { listMixin } from '../../utils/myUtils/mixins/listPage'
+import { tableRowClassName } from "../../utils/myUtils/changeTableTr";
+import { listPage, bdelete, batchDelete } from "../../api/move/bannerConfig";
+import { listMixin } from "../../utils/myUtils/mixins/listPage";
 
-export default { // 加入分页逻辑
+export default {
+  // 加入分页逻辑
   components: {
     BannerAddDialog,
-    GroupPage
+    GroupPage,
   },
   mixins: [listMixin],
   data() {
     return {
       isShowAdd: false, // 显示新增功能
       selectInfo: {
-        bannerName: ''
+        bannerName: "",
       },
-      title: '',
-      rowInfo: ''
-    }
+      title: "",
+      rowInfo: "",
+    };
   },
   methods: {
     tableRowClassName: tableRowClassName,
     closeAdd() {
-      this.isShowAdd = false
-      this.refresh()
+      this.isShowAdd = false;
+      this.refresh();
     },
 
     addCategory() {
-      this.isShowAdd = true
-      this.title = 'banner新增'
+      this.isShowAdd = true;
+      this.title = "banner新增";
     },
     updata(row) {
-      this.isShowAdd = true
-      this.title = 'banner编辑'
-      this.rowInfo = row
+      this.isShowAdd = true;
+      this.title = "banner编辑";
+      this.rowInfo = row;
     },
     getListPage(limit, offset) {
-      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
-        // 得到相关数据
-        res.rows.forEach((item, index) => {
-          item.index = (index + 1) + ((offset - 1) * 10)
-        })
-        this.tableData = res
-      })
+      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(
+        (res) => {
+          // 得到相关数据
+          res.rows.forEach((item, index) => {
+            item.index = index + 1 + (offset - 1) * 10;
+          });
+          this.tableData = res;
+        }
+      );
     },
     reset() {
       this.selectInfo = {
-        bannerName: ''
-      }
+        bannerName: "",
+      };
+      listPage(`limit=${10}&offset=${1}`, this.selectInfo).then(
+        (res) => {
+          // 得到相关数据
+          res.rows.forEach((item, index) => {
+            item.index = index + 1 + (1 - 1) * 10;
+          });
+          this.tableData = res;
+        }
+      );
     },
     // 批量删除
     BatchDelete() {
-      //  得到选中行
-      const dle_ary = this.$refs.multipleTable.selection
-      const ids = []
-      dle_ary.forEach(ele => {
-        ids.push(ele.id)
-      })
-      batchDelete({ ids: ids }).then(res => {
-        if (res != '') {
-          this.$message({
-            message: '删除成功',
-            type: 'success'
+      if (this.$refs.multipleTable.selection.length) {
+        this.$confirm(`确认删除选中的这些数据吗？`, "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            //  得到选中行
+            const dle_ary = this.$refs.multipleTable.selection;
+            const ids = [];
+            dle_ary.forEach((ele) => {
+              ids.push(ele.id);
+            });
+            batchDelete({ ids: ids }).then((res) => {
+              this.$message({
+                message: "删除成功",
+                type: "success",
+              });
+              this.refresh();
+            });
           })
-          this.refresh()
-        }
-      })
+          .catch(() => {});
+      } else {
+        this.$message({
+          message: "请先选择需要删除的数据",
+          type: "error",
+        });
+      }
     },
     // 删除
     Bdelete(row) {
-      // console.log(row);
-      const id = row.id
-      bdelete({ id: id }).then(res => {
-        // console.log(res);
-        // 删除成功跟新数据
-        if (res != '') {
-          this.$message({
-            message: '删除成功',
-            type: 'success'
-          })
-          this.refresh()
-        }
+      this.$confirm(`确认删除此项内容吗？`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
       })
-    }
-  }
-}
+        .then(() => {
+          const id = row.id;
+          bdelete({ id: id }).then((res) => {
+            // console.log(res);
+            // 删除成功跟新数据
+            this.$message({
+              message: "删除成功",
+              type: "success",
+            });
+            this.refresh();
+          });
+        })
+        .catch(() => {});
+      // console.log(row);
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -242,7 +276,6 @@
         // width: 84px;
         font-size: 16px;
       }
-
     }
   }
 
diff --git a/src/views/move/hotAndNews.vue b/src/views/move/hotAndNews.vue
index 6e5ee27..ba86219 100644
--- a/src/views/move/hotAndNews.vue
+++ b/src/views/move/hotAndNews.vue
@@ -76,7 +76,7 @@
       style="width: 100%"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column prop="index" label="序号" />
+      <el-table-column prop="index" label="序号" width="60"/>
       <el-table-column prop="recommendCode" label="编号" />
       <el-table-column prop="recommendModuleName" label="所属模块" />
       <el-table-column prop="recommendType" label="类型" />
@@ -187,6 +187,13 @@
         recommendType: '',
         recommendTitle: ''
       }
+      listPage(`limit=${10}&offset=${1}`, this.selectInfo).then(res => {
+      // 得到相关数据
+        res.rows.forEach((item, index) => {
+          item.index = (index + 1) + ((1 - 1) * 10)
+        })
+        this.tableData = res
+      })
     },
     BatchDelete() {
       //  得到选中行
diff --git a/src/views/sales/shop.vue b/src/views/sales/shop.vue
index 0a1c756..704d7c8 100644
--- a/src/views/sales/shop.vue
+++ b/src/views/sales/shop.vue
@@ -16,19 +16,21 @@
         <div class="inputBox" style="width: 144px">
           <el-input
             v-model="selectInfo.itemBudget"
-            placeholder="请输入项目预期"
+            placeholder="请输入项目预算"
             clearable
             class="product-input"
           />
         </div>
         预计工期
         <div class="inputBox" style="width: 144px">
-          <el-input
+          <!-- <el-input
             v-model="selectInfo.itemDuration"
             placeholder="请选择项目日期"
             clearable
             class="product-input"
-          />
+          /> -->
+          <el-date-picker v-model="selectInfo.itemDuration" type="date" placeholder="请选择日期" value-format="yyyy-MM-dd HH:mm:ss">
+          </el-date-picker>
         </div>
       </div>
       <div class="productBtn">
@@ -63,27 +65,20 @@
       v-loading="loading"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column prop="index" label="序号" />
+      <el-table-column prop="index" label="序号" width="60"/>
       <el-table-column prop="busOppoId" label="商机编号" />
       <el-table-column prop="itemName" label="项目名称" />
-      <el-table-column prop="itemBudget" label="预期工期" />
+      <el-table-column prop="itemBudget" label="项目预算" />
+      <el-table-column prop="itemDuration" label="预计工期" />
       <el-table-column prop="itemManager" label="商机负责人" />
       <el-table-column prop="phone" label="联系方式" />
       <el-table-column prop="status" label="商机状态" />
       <el-table-column label="操作">
         <template slot-scope="scope">
-          <el-button
-            type="text"
-            size="small"
-            @click="showInfo(scope.row)"
-          >
+          <el-button type="text" size="small" @click="showInfo(scope.row)">
             详情
           </el-button>
-          <el-button
-            type="text"
-            size="small"
-            @click="handleClick(scope.row)"
-          >
+          <el-button type="text" size="small" @click="handleClick(scope.row)">
             商机转订单
           </el-button>
 
@@ -91,31 +86,47 @@
         </template>
       </el-table-column>
     </el-table>
-    <group-page v-model="isFristPage" :limit="limit" :total="total" :offset="offset" :count="tableData.total" @setOffset="setOffset" @setLimit="setLimit" />
+    <group-page
+      v-model="isFristPage"
+      :limit="limit"
+      :total="total"
+      :offset="offset"
+      :count="tableData.total"
+      @setOffset="setOffset"
+      @setLimit="setLimit"
+    />
     <!-- 新增弹框 -->
 
     <!-- <brand-add-dialog  :isShowInfo="isShowAdd"
       @close="closeAdd"></brand-add-dialog> -->
-    <shop-info-dialog :is-show-info="isShowInfo" :data-info="rowInfo" @close="closeInfo" />
-    <slaes-change-order-dialog :is-show-info="isShowAdd" :bus-oppo-id="busOppoId" @close="closeAdd" />
+    <shop-info-dialog
+      :is-show-info="isShowInfo"
+      :data-info="rowInfo"
+      @close="closeInfo"
+    />
+    <slaes-change-order-dialog
+      :is-show-info="isShowAdd"
+      :bus-oppo-id="busOppoId"
+      @close="closeAdd"
+    />
   </div>
 </template>
 
 <script>
 // 组件
-import ShopInfoDialog from '../../components/mycomponent/dialog/salesDialog/shopInfoDialog.vue'
-import SlaesChangeOrderDialog from '../../components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue'
-import GroupPage from '../../components/mycomponent/groupPage.vue'
+import ShopInfoDialog from "../../components/mycomponent/dialog/salesDialog/shopInfoDialog.vue";
+import SlaesChangeOrderDialog from "../../components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue";
+import GroupPage from "../../components/mycomponent/groupPage.vue";
 
 // 逻辑
-import { listPage } from '../../api/sales/shop'
-import { listMixin, elDataDialog } from '../../utils/myUtils/mixins/listPage'
-import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
+import { listPage } from "../../api/sales/shop";
+import { listMixin, elDataDialog } from "../../utils/myUtils/mixins/listPage";
+import { tableRowClassName } from "../../utils/myUtils/changeTableTr";
 export default {
   components: {
     ShopInfoDialog,
     SlaesChangeOrderDialog,
-    GroupPage
+    GroupPage,
   },
   mixins: [listMixin, elDataDialog],
   data() {
@@ -123,47 +134,50 @@
       isShowAdd: false, // 显示新增功能
       isShowInfo: false, // 显示新增功能
       selectInfo: {
-        itemName: '',
-        itemBudget: '',
-        itemDuration: ''
+        itemName: "",
+        itemBudget: "",
+        itemDuration: "",
       },
-      busOppoId: '',
-      loading:false
-    }
+      busOppoId: "",
+      loading: false,
+    };
   },
   methods: {
     tableRowClassName: tableRowClassName,
     closeAdd() {
-      this.isShowAdd = false
+      this.isShowAdd = false;
     },
 
     handleClick(row) {
       // console.log(row);
-      this.isShowAdd = true
-      this.busOppoId = row.busOppoId
+      this.isShowAdd = true;
+      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)
+    getListPage(limit = 10, offset = 1) {
+      this.loading = true;
+      listPage(`limit=${limit}&offset=${offset}`, this.selectInfo)
+        .then((res) => {
+          // 得到相关数据
+          res.rows.forEach((item, index) => {
+            item.index = index + 1 + (offset - 1) * 10;
+          });
+          this.tableData = res;
+          this.loading = false;
         })
-        this.tableData = res
-        this.loading = false
-      }).catch(err => {
-        this.loading = false
-      })
+        .catch((err) => {
+          this.loading = false;
+        });
     },
     reset() {
       this.selectInfo = {
-        itemName: '',
-        itemBudget: '',
-        itemDuration: ''
-      }
+        itemName: "",
+        itemBudget: "",
+        itemDuration: "",
+      };
+      this.getListPage()
     },
-  }
-}
+  },
+};
 </script>
 
   <style lang="scss" scoped>
@@ -200,7 +214,6 @@
         // width: 84px;
         font-size: 16px;
       }
-
     }
   }
   .footer {
diff --git a/src/views/server/Management.vue b/src/views/server/Management.vue
index bed5935..ad94c61 100644
--- a/src/views/server/Management.vue
+++ b/src/views/server/Management.vue
@@ -176,7 +176,6 @@
     handleClick(row) {
       this.title = "服务编辑";
       this.isShowAdd = true;
-      console.log(row);
       this.rowInfo = row;
     },
     reset() {
@@ -185,11 +184,12 @@
         serviceName: "",
         typeCode: "",
       };
+      this.getListPage()
     },
     // 获取指定页面
-    getListPage(limit, offset) {
+    getListPage(limit = 10, offset = 1) {
       this.loading = true
-      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(
+      listPage(`limit=${limit}&offset=${offset}`, this.selectInfo).then(
         (res) => {
           // 得到相关数据
           res.rows.forEach((item, index) => {
diff --git a/src/views/supplier/assess.vue b/src/views/supplier/assess.vue
index de44528..f619c3c 100644
--- a/src/views/supplier/assess.vue
+++ b/src/views/supplier/assess.vue
@@ -144,6 +144,7 @@
         assessAnnual: '',
         annualAssessResult: ''
       }
+      this.getListPage()
     }
   }
 

diff --git a/dist.rar b/dist.rar
new file mode 100644
index 0000000..0c07f67
--- /dev/null
+++ b/dist.rar
Binary files differ
diff --git a/src/components/mycomponent/dialog/move/bannerAddDialog.vue b/src/components/mycomponent/dialog/move/bannerAddDialog.vue
index e3bdd0c..6afaea5 100644
--- a/src/components/mycomponent/dialog/move/bannerAddDialog.vue
+++ b/src/components/mycomponent/dialog/move/bannerAddDialog.vue
@@ -13,7 +13,7 @@
         <div class="inputBox">
           <red-star />
           <input-vue
-            v-model="bannerInfo.bannerName"
+            v-model.trim="bannerInfo.bannerName"
             title="banner名称"
             placeholder="请输入唯一编号"
             width="300px"
@@ -89,124 +89,121 @@
         </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 DialogHeader from '../dialogHeader.vue'
-import RedStar from '../../redStar.vue'
-import InputNumber from '../../input/inputNumber.vue'
-import { getToken } from '@/utils/auth'
-import { Base64 } from 'js-base64'
-import { list, add, updata } from '../../../../api/move/bannerConfig'
+import InputVue from "../../input/inputVue.vue";
+import DialogHeader from "../dialogHeader.vue";
+import RedStar from "../../redStar.vue";
+import InputNumber from "../../input/inputNumber.vue";
+import { getToken } from "@/utils/auth";
+import { Base64 } from "js-base64";
+import { list, add, updata } from "../../../../api/move/bannerConfig";
 
 export default {
   components: {
     DialogHeader,
     RedStar,
     InputVue,
-    InputNumber
+    InputNumber,
   },
   props: {
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: true,
     },
-    title: '',
-    dataInfo: ''
+    title: "",
+    dataInfo: "",
   },
   data() {
     return {
       bannerInfo: {
-        bannerName: '',
-        bannerPicture: '',
-        skipUrl: '11',
-        bannerModule: '',
-        bannerSort: 0
+        bannerName: "",
+        bannerPicture: "",
+        skipUrl: "11",
+        bannerModule: "",
+        bannerSort: 0,
       },
       fileList: [],
-      modelList: []
-    }
+      modelList: [],
+    };
   },
   watch: {
     dataInfo: {
       handler(vls) {
+        console.log(vls, "编辑");
         // 得到base64网络
-        if (!vls.id) return
+        if (!vls.id) return;
         this.bannerInfo = {
           id: vls.id,
           bannerName: vls.bannerName,
-          bannerPicture: this.getBase64('http://111.198.10.15:21403/static/' + vls.bannerPicture),
+          bannerPicture: vls.bannerPicture,
           skipUrl: vls.skipUrl,
           bannerModule: vls.bannerModule,
-          bannerSort: vls.bannerSort
-        }
-        console.log(
-          this.getBase64('http://111.198.10.15:21403/static/' + vls.bannerPicture)
-        )
+          bannerSort: vls.bannerSort,
+        };
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   mounted() {
     list().then((res) => {
-      const Ary = []
-      const str = res[26].detail
-      const strAry = str.split(';')
+      const Ary = [];
+      const str = res[25].detail;
+      const strAry = str.split(";");
       for (let i = 0; i < strAry.length; i++) {
-        const temp = strAry[i].split(':')
+        const temp = strAry[i].split(":");
         Ary.push({
           key: temp[2],
-          value: temp[1]
-        })
+          value: temp[1],
+        });
       }
-      console.log(Ary)
-      this.modelList = Ary
-    })
+      this.modelList = Ary;
+    });
   },
   methods: {
     getToken: getToken,
     close() {
-      this.$emit('close')
+      this.$emit("close");
     },
     save() {
-      if (this.title == 'banner新增') {
-        add(this.bannerInfo).then((res) => {
-          if (res != '') {
-            this.close()
+      const {
+        bannerInfo: { bannerName, bannerPicture, bannerModule },
+      } = this;
+      if (bannerName && bannerPicture && bannerModule) {
+        if (this.title == "banner新增") {
+          add(this.bannerInfo).then((res) => {
+            this.$message.success("添加成功");
+            this.close();
             this.bannerInfo = {
-              bannerName: '',
-              bannerPicture: '',
-              skipUrl: '',
-              bannerModule: '',
-              bannerSort: 0
-            }
-          }
-        })
+              bannerName: "",
+              bannerPicture: "",
+              skipUrl: "",
+              bannerModule: "",
+              bannerSort: 0,
+            };
+          });
+        } else {
+          updata(this.bannerInfo).then((res) => {
+            this.$message.success("更新成功");
+            this.close();
+            this.bannerInfo = {
+              bannerName: "",
+              bannerPicture: "",
+              skipUrl: "",
+              bannerModule: "",
+              bannerSort: 0,
+            };
+          });
+        }
       } else {
-        updata(this.bannerInfo).then(res => {
-          if (res != '') {
-            this.$message.success('更新成功')
-            this.close()
-            this.bannerInfo = {
-              bannerName: '',
-              bannerPicture: '',
-              skipUrl: '',
-              bannerModule: '',
-              bannerSort: 0
-            }
-          }
-        })
+        this.$message.error("请先完整填写信息");
       }
     },
 
@@ -214,60 +211,80 @@
       // console.log(response, file, fileList);
     },
     httpRequest(file) {
-      console.log(file.file, '========================')
+      console.log(file.file, "========================");
 
       // this.bannerInfo.bannerPicture =  Base64.encode(file.file)
-      var reader = new FileReader()
+      var reader = new FileReader();
 
-      reader.readAsDataURL(file.file)
+      reader.readAsDataURL(file.file);
       // console.log(reader.readyState,"===========result====",reader,reader.FileReader);
       const timer = setInterval(() => {
         if (reader.result) {
-          clearInterval(timer)
-          this.bannerInfo.bannerPicture = reader.result
-          console.log(this.bannerInfo.bannerPicture)
+          clearInterval(timer);
+          this.bannerInfo.bannerPicture = reader.result;
+          console.log(this.bannerInfo.bannerPicture);
         }
-      }, 300)
+      }, 300);
     },
     handleChange(file, fileList) {
-      console.log(fileList, file)
-      this.fileList = fileList.slice(-1)
+      this.fileList = fileList.slice(-1);
     },
     //  网络图片转base64编码
     getBase64(imgUrl) {
-      window.URL = window.URL || window.webkitURL
-      var xhr = new XMLHttpRequest()
-      xhr.open('get', imgUrl, true)
+      window.URL = window.URL || window.webkitURL;
+      var xhr = new XMLHttpRequest();
+      xhr.open("get", imgUrl, true);
       // 至关重要
-      xhr.responseType = 'blob'
-      xhr.onload = function() {
+      xhr.responseType = "blob";
+      xhr.onload = function () {
         if (this.status == 200) {
           // 得到一个blob对象
-          var blob = this.response
-          console.log('blob', blob)
+          var blob = this.response;
+          console.log("blob", blob);
           // 至关重要
-          const oFileReader = new FileReader()
-          oFileReader.onloadend = function(e) {
+          const oFileReader = new FileReader();
+          oFileReader.onloadend = function (e) {
             // 此处拿到的已经是 base64的图片了
-            const base64 = e.target.result
+            const base64 = e.target.result;
             // console.log("方式一》》》》》》》》》", base64);
-          }
-          oFileReader.readAsDataURL(blob)
+          };
+          oFileReader.readAsDataURL(blob);
           // ====为了在页面显示图片，可以删除====
-          var img = document.createElement('img')
-          img.onload = function(e) {
-            window.URL.revokeObjectURL(img.src) // 清除释放
-          }
-          const src = window.URL.createObjectURL(blob)
-          img.src = src
+          var img = document.createElement("img");
+          img.onload = function (e) {
+            window.URL.revokeObjectURL(img.src); // 清除释放
+          };
+          const src = window.URL.createObjectURL(blob);
+          img.src = src;
           // document.getElementById("container1").appendChild(img);
           // ====为了在页面显示图片，可以删除====
         }
-      }
-      xhr.send()
-    }
-  }
-}
+      };
+      xhr.send();
+    },
+    // 网络图片转base64 canvans方式
+    getBase64Image(img) {
+      var canvas = document.createElement("canvas");
+      canvas.width = img.width;
+      canvas.height = img.height;
+      var ctx = canvas.getContext("2d");
+      ctx.drawImage(img, 0, 0, img.width, img.height);
+      var dataURL = canvas.toDataURL("image/png"); // 可选其他值 image/jpeg
+      return dataURL;
+    },
+
+    main(src) {
+      let _this = this
+      var image = new Image();
+      image.src = src + "?v=" + Math.random(); // 处理缓存
+      image.crossOrigin = "*"; // 支持跨域图片
+      image.onload = function () {
+        var base64 = _this.getBase64Image(image);
+        this.bannerInfo.bannerPicture = base64
+      };
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
index 5e58333..4cae18a 100644
--- a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
+++ b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
@@ -13,7 +13,7 @@
           <div class="inputBox">
             <red-star />
             <input-vue
-              v-model="changeOrderInfo.receiver"
+              v-model.trim="changeOrderInfo.receiver"
               title="收货人"
               width="300px"
               class="inputWidth"
@@ -22,7 +22,7 @@
           <div class="inputBox">
             <red-star />
             <input-vue
-              v-model="changeOrderInfo.receiverPhone"
+              v-model.trim="changeOrderInfo.receiverPhone"
               title="收货人联系方式"
               width="300px"
               class="inputWidth"
@@ -74,7 +74,7 @@
               />
             </el-select>
             <el-input
-              v-model="changeOrderInfo.deliveryAddress"
+              v-model.trim="changeOrderInfo.deliveryAddress"
               placeholder="请输入内容"
               style="width: 638px"
             />
@@ -101,7 +101,7 @@
               style="justify-content: space-between"
             >
               <el-input
-                v-model="changeOrderInfo.remark"
+                v-model.trim="changeOrderInfo.remark"
                 style="width: 300px"
                 type="textarea"
                 :rows="3"
diff --git a/src/components/mycomponent/dialog/server/managementAddDialog.vue b/src/components/mycomponent/dialog/server/managementAddDialog.vue
index d3c1b9d..e1b2210 100644
--- a/src/components/mycomponent/dialog/server/managementAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/managementAddDialog.vue
@@ -12,7 +12,7 @@
         <div class="inputBox">
           <red-star />
           <input-vue
-            v-model="managementInfo.serviceCode"
+            v-model.trim="managementInfo.serviceCode"
             title="服务编号"
             placeholder="请输入服务编号"
             width="300px"
@@ -23,7 +23,7 @@
         <div class="inputBox">
           <red-star />
           <input-vue
-            v-model="managementInfo.serviceName"
+            v-model.trim="managementInfo.serviceName"
             title="服务名称"
             placeholder="请输入服务名称"
             width="300px"
@@ -78,7 +78,7 @@
         <div class="inputBox">
           <red-star />
           <input-vue
-            v-model="managementInfo.description"
+            v-model.trim="managementInfo.description"
             title="服务描述"
             width="300px"
             class="inputWidth"
@@ -112,7 +112,7 @@
             style="justify-content: space-between"
           >
             <el-input
-              v-model="managementInfo.remark"
+              v-model.trim="managementInfo.remark"
               type="textarea"
               style="width: 300px"
               :rows="2"
diff --git a/src/components/mycomponent/dialog/server/operationAddDialog.vue b/src/components/mycomponent/dialog/server/operationAddDialog.vue
index d436541..abd0a23 100644
--- a/src/components/mycomponent/dialog/server/operationAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/operationAddDialog.vue
@@ -11,12 +11,12 @@
             width="300px"
             class="inputWidth"
             style="justify-content: space-between;"
-            v-model="form.date"
+            v-model.trim="form.date"
           />
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="服务名称" placeholder="请输入品牌名称" v-model="form.name" class="inputWidth" style="justify-content: space-between;">
+          <input-vue title="服务名称" placeholder="请输入品牌名称" v-model.trim="form.name" class="inputWidth" style="justify-content: space-between;">
             <el-select
               v-model="form.date"
               style="width:300PX"
@@ -43,12 +43,12 @@
             width="300px"
             class="inputWidth"
             style="justify-content: space-between;"
-            v-model="form.address"
+            v-model.trim="form.address"
           />
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="服务优惠" v-model="form.address1" placeholder="" class="inputWidth" style="justify-content: space-between;">
+          <input-vue title="服务优惠" v-model.trim="form.address1" placeholder="" class="inputWidth" style="justify-content: space-between;">
             <el-select
               v-model="form.address"
               style="width:300px"
@@ -69,13 +69,13 @@
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="时间" width="300px" class="inputWidth" style="justify-content: space-between;" v-model='form.address2'/>
+          <input-vue title="时间" width="300px" class="inputWidth" style="justify-content: space-between;" v-model.trim='form.address2'/>
         </div>
 
         <div class="inputBox">
         &nbsp;
           <input-vue title="备注" class="inputWidth" style="justify-content: space-between;">
-            <el-input v-model="textarea" type="textarea" style="width:300px" :rows="2" placeholder="请输入内容" />
+            <el-input v-model.trim="textarea" type="textarea" style="width:300px" :rows="2" placeholder="请输入内容" />
           </input-vue>
         </div>
       </div>
diff --git a/src/components/mycomponent/dialog/server/typeAddDialog.vue b/src/components/mycomponent/dialog/server/typeAddDialog.vue
index 6c98c04..042421d 100644
--- a/src/components/mycomponent/dialog/server/typeAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/typeAddDialog.vue
@@ -6,7 +6,7 @@
         <div class="inputBox">
           <red-star />
           <input-vue
-            v-model="addInfo.typeCode"
+            v-model.trim="addInfo.typeCode"
             title="服务类型编号"
             placeholder="请输入服务类型编号"
             width="300px"
@@ -17,7 +17,7 @@
         <div class="inputBox">
           <red-star />
           <input-vue
-            v-model="addInfo.typeName"
+            v-model.trim="addInfo.typeName"
             title="服务类型名称"
             placeholder="请输入服务类型名称"
             width="300px"
@@ -28,7 +28,7 @@
         <div class="inputBox">
           <red-star />
           <input-vue
-            v-model="addInfo.description"
+            v-model.trim="addInfo.description"
             title="描述"
             width="300px"
             class="inputWidth"
@@ -55,7 +55,7 @@
         <div class="inputBox">
           &nbsp;
           <input-vue title="备注" class="inputWidth" style="justify-content: space-between;">
-            <el-input v-model="addInfo.remark" type="textarea" style="width:300px" :rows="2" placeholder="请输入内容" />
+            <el-input v-model.trim="addInfo.remark" type="textarea" style="width:300px" :rows="2" placeholder="请输入内容" />
           </input-vue>
         </div>
       </div>
diff --git a/src/views/move/bannerConfig.vue b/src/views/move/bannerConfig.vue
index 8bb613a..a4f1aaf 100644
--- a/src/views/move/bannerConfig.vue
+++ b/src/views/move/bannerConfig.vue
@@ -42,7 +42,7 @@
           type="danger"
           icon="el-icon-delete-solid"
           class="btnItem bgred"
-          @click=" BatchDelete"
+          @click="BatchDelete"
         >
           删除
         </el-button>
@@ -68,12 +68,14 @@
         <template slot-scope="scope">
           <!-- {{scope.row.bannerPicture}} -->
           <img
-            v-if="scope.row.bannerPicture!=''"
-            :src="'http://111.198.10.15:21403/static/'+scope.row.bannerPicture"
+            v-if="scope.row.bannerPicture != ''"
+            :src="
+              'http://111.198.10.15:21403/static/' + scope.row.bannerPicture
+            "
             width="100"
             height="100px"
             alt=""
-          >
+          />
         </template>
       </el-table-column>
       <el-table-column prop="bannerModuleName" label="所属功能模块" />
@@ -83,11 +85,7 @@
           <el-button type="text" size="small" @click="updata(scope.row)">
             编辑
           </el-button>
-          <el-button
-            type="text"
-            size="small"
-            @click="Bdelete(scope.row)"
-          >
+          <el-button type="text" size="small" @click="Bdelete(scope.row)">
             删除
           </el-button>
         </template>
@@ -105,102 +103,138 @@
     />
     <!-- 新增弹框 -->
     <!-- <category-add-dialog  :isShowInfo="isShowAdd"  @close ="closeAdd"></category-add-dialog> -->
-    <banner-add-dialog :is-show-info="isShowAdd" :title="title" :data-info="rowInfo" @close="closeAdd" />
+    <banner-add-dialog
+      :is-show-info="isShowAdd"
+      :title="title"
+      :data-info="rowInfo"
+      @close="closeAdd"
+    />
   </div>
 </template>
 
 <script>
 // 组件
 
-import BannerAddDialog from '../../components/mycomponent/dialog/move/bannerAddDialog.vue'
-import GroupPage from '../../components/mycomponent/groupPage.vue'
+import BannerAddDialog from "../../components/mycomponent/dialog/move/bannerAddDialog.vue";
+import GroupPage from "../../components/mycomponent/groupPage.vue";
 // 逻辑
-import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
-import { listPage, bdelete, batchDelete } from '../../api/move/bannerConfig'
-import { listMixin } from '../../utils/myUtils/mixins/listPage'
+import { tableRowClassName } from "../../utils/myUtils/changeTableTr";
+import { listPage, bdelete, batchDelete } from "../../api/move/bannerConfig";
+import { listMixin } from "../../utils/myUtils/mixins/listPage";
 
-export default { // 加入分页逻辑
+export default {
+  // 加入分页逻辑
   components: {
     BannerAddDialog,
-    GroupPage
+    GroupPage,
   },
   mixins: [listMixin],
   data() {
     return {
       isShowAdd: false, // 显示新增功能
       selectInfo: {
-        bannerName: ''
+        bannerName: "",
       },
-      title: '',
-      rowInfo: ''
-    }
+      title: "",
+      rowInfo: "",
+    };
   },
   methods: {
     tableRowClassName: tableRowClassName,
     closeAdd() {
-      this.isShowAdd = false
-      this.refresh()
+      this.isShowAdd = false;
+      this.refresh();
     },
 
     addCategory() {
-      this.isShowAdd = true
-      this.title = 'banner新增'
+      this.isShowAdd = true;
+      this.title = "banner新增";
     },
     updata(row) {
-      this.isShowAdd = true
-      this.title = 'banner编辑'
-      this.rowInfo = row
+      this.isShowAdd = true;
+      this.title = "banner编辑";
+      this.rowInfo = row;
     },
     getListPage(limit, offset) {
-      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
-        // 得到相关数据
-        res.rows.forEach((item, index) => {
-          item.index = (index + 1) + ((offset - 1) * 10)
-        })
-        this.tableData = res
-      })
+      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(
+        (res) => {
+          // 得到相关数据
+          res.rows.forEach((item, index) => {
+            item.index = index + 1 + (offset - 1) * 10;
+          });
+          this.tableData = res;
+        }
+      );
     },
     reset() {
       this.selectInfo = {
-        bannerName: ''
-      }
+        bannerName: "",
+      };
+      listPage(`limit=${10}&offset=${1}`, this.selectInfo).then(
+        (res) => {
+          // 得到相关数据
+          res.rows.forEach((item, index) => {
+            item.index = index + 1 + (1 - 1) * 10;
+          });
+          this.tableData = res;
+        }
+      );
     },
     // 批量删除
     BatchDelete() {
-      //  得到选中行
-      const dle_ary = this.$refs.multipleTable.selection
-      const ids = []
-      dle_ary.forEach(ele => {
-        ids.push(ele.id)
-      })
-      batchDelete({ ids: ids }).then(res => {
-        if (res != '') {
-          this.$message({
-            message: '删除成功',
-            type: 'success'
+      if (this.$refs.multipleTable.selection.length) {
+        this.$confirm(`确认删除选中的这些数据吗？`, "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            //  得到选中行
+            const dle_ary = this.$refs.multipleTable.selection;
+            const ids = [];
+            dle_ary.forEach((ele) => {
+              ids.push(ele.id);
+            });
+            batchDelete({ ids: ids }).then((res) => {
+              this.$message({
+                message: "删除成功",
+                type: "success",
+              });
+              this.refresh();
+            });
           })
-          this.refresh()
-        }
-      })
+          .catch(() => {});
+      } else {
+        this.$message({
+          message: "请先选择需要删除的数据",
+          type: "error",
+        });
+      }
     },
     // 删除
     Bdelete(row) {
-      // console.log(row);
-      const id = row.id
-      bdelete({ id: id }).then(res => {
-        // console.log(res);
-        // 删除成功跟新数据
-        if (res != '') {
-          this.$message({
-            message: '删除成功',
-            type: 'success'
-          })
-          this.refresh()
-        }
+      this.$confirm(`确认删除此项内容吗？`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
       })
-    }
-  }
-}
+        .then(() => {
+          const id = row.id;
+          bdelete({ id: id }).then((res) => {
+            // console.log(res);
+            // 删除成功跟新数据
+            this.$message({
+              message: "删除成功",
+              type: "success",
+            });
+            this.refresh();
+          });
+        })
+        .catch(() => {});
+      // console.log(row);
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -242,7 +276,6 @@
         // width: 84px;
         font-size: 16px;
       }
-
     }
   }
 
diff --git a/src/views/move/hotAndNews.vue b/src/views/move/hotAndNews.vue
index 6e5ee27..ba86219 100644
--- a/src/views/move/hotAndNews.vue
+++ b/src/views/move/hotAndNews.vue
@@ -76,7 +76,7 @@
       style="width: 100%"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column prop="index" label="序号" />
+      <el-table-column prop="index" label="序号" width="60"/>
       <el-table-column prop="recommendCode" label="编号" />
       <el-table-column prop="recommendModuleName" label="所属模块" />
       <el-table-column prop="recommendType" label="类型" />
@@ -187,6 +187,13 @@
         recommendType: '',
         recommendTitle: ''
       }
+      listPage(`limit=${10}&offset=${1}`, this.selectInfo).then(res => {
+      // 得到相关数据
+        res.rows.forEach((item, index) => {
+          item.index = (index + 1) + ((1 - 1) * 10)
+        })
+        this.tableData = res
+      })
     },
     BatchDelete() {
       //  得到选中行
diff --git a/src/views/sales/shop.vue b/src/views/sales/shop.vue
index 0a1c756..704d7c8 100644
--- a/src/views/sales/shop.vue
+++ b/src/views/sales/shop.vue
@@ -16,19 +16,21 @@
         <div class="inputBox" style="width: 144px">
           <el-input
             v-model="selectInfo.itemBudget"
-            placeholder="请输入项目预期"
+            placeholder="请输入项目预算"
             clearable
             class="product-input"
           />
         </div>
         预计工期
         <div class="inputBox" style="width: 144px">
-          <el-input
+          <!-- <el-input
             v-model="selectInfo.itemDuration"
             placeholder="请选择项目日期"
             clearable
             class="product-input"
-          />
+          /> -->
+          <el-date-picker v-model="selectInfo.itemDuration" type="date" placeholder="请选择日期" value-format="yyyy-MM-dd HH:mm:ss">
+          </el-date-picker>
         </div>
       </div>
       <div class="productBtn">
@@ -63,27 +65,20 @@
       v-loading="loading"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column prop="index" label="序号" />
+      <el-table-column prop="index" label="序号" width="60"/>
       <el-table-column prop="busOppoId" label="商机编号" />
       <el-table-column prop="itemName" label="项目名称" />
-      <el-table-column prop="itemBudget" label="预期工期" />
+      <el-table-column prop="itemBudget" label="项目预算" />
+      <el-table-column prop="itemDuration" label="预计工期" />
       <el-table-column prop="itemManager" label="商机负责人" />
       <el-table-column prop="phone" label="联系方式" />
       <el-table-column prop="status" label="商机状态" />
       <el-table-column label="操作">
         <template slot-scope="scope">
-          <el-button
-            type="text"
-            size="small"
-            @click="showInfo(scope.row)"
-          >
+          <el-button type="text" size="small" @click="showInfo(scope.row)">
             详情
           </el-button>
-          <el-button
-            type="text"
-            size="small"
-            @click="handleClick(scope.row)"
-          >
+          <el-button type="text" size="small" @click="handleClick(scope.row)">
             商机转订单
           </el-button>
 
@@ -91,31 +86,47 @@
         </template>
       </el-table-column>
     </el-table>
-    <group-page v-model="isFristPage" :limit="limit" :total="total" :offset="offset" :count="tableData.total" @setOffset="setOffset" @setLimit="setLimit" />
+    <group-page
+      v-model="isFristPage"
+      :limit="limit"
+      :total="total"
+      :offset="offset"
+      :count="tableData.total"
+      @setOffset="setOffset"
+      @setLimit="setLimit"
+    />
     <!-- 新增弹框 -->
 
     <!-- <brand-add-dialog  :isShowInfo="isShowAdd"
       @close="closeAdd"></brand-add-dialog> -->
-    <shop-info-dialog :is-show-info="isShowInfo" :data-info="rowInfo" @close="closeInfo" />
-    <slaes-change-order-dialog :is-show-info="isShowAdd" :bus-oppo-id="busOppoId" @close="closeAdd" />
+    <shop-info-dialog
+      :is-show-info="isShowInfo"
+      :data-info="rowInfo"
+      @close="closeInfo"
+    />
+    <slaes-change-order-dialog
+      :is-show-info="isShowAdd"
+      :bus-oppo-id="busOppoId"
+      @close="closeAdd"
+    />
   </div>
 </template>
 
 <script>
 // 组件
-import ShopInfoDialog from '../../components/mycomponent/dialog/salesDialog/shopInfoDialog.vue'
-import SlaesChangeOrderDialog from '../../components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue'
-import GroupPage from '../../components/mycomponent/groupPage.vue'
+import ShopInfoDialog from "../../components/mycomponent/dialog/salesDialog/shopInfoDialog.vue";
+import SlaesChangeOrderDialog from "../../components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue";
+import GroupPage from "../../components/mycomponent/groupPage.vue";
 
 // 逻辑
-import { listPage } from '../../api/sales/shop'
-import { listMixin, elDataDialog } from '../../utils/myUtils/mixins/listPage'
-import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
+import { listPage } from "../../api/sales/shop";
+import { listMixin, elDataDialog } from "../../utils/myUtils/mixins/listPage";
+import { tableRowClassName } from "../../utils/myUtils/changeTableTr";
 export default {
   components: {
     ShopInfoDialog,
     SlaesChangeOrderDialog,
-    GroupPage
+    GroupPage,
   },
   mixins: [listMixin, elDataDialog],
   data() {
@@ -123,47 +134,50 @@
       isShowAdd: false, // 显示新增功能
       isShowInfo: false, // 显示新增功能
       selectInfo: {
-        itemName: '',
-        itemBudget: '',
-        itemDuration: ''
+        itemName: "",
+        itemBudget: "",
+        itemDuration: "",
       },
-      busOppoId: '',
-      loading:false
-    }
+      busOppoId: "",
+      loading: false,
+    };
   },
   methods: {
     tableRowClassName: tableRowClassName,
     closeAdd() {
-      this.isShowAdd = false
+      this.isShowAdd = false;
     },
 
     handleClick(row) {
       // console.log(row);
-      this.isShowAdd = true
-      this.busOppoId = row.busOppoId
+      this.isShowAdd = true;
+      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)
+    getListPage(limit = 10, offset = 1) {
+      this.loading = true;
+      listPage(`limit=${limit}&offset=${offset}`, this.selectInfo)
+        .then((res) => {
+          // 得到相关数据
+          res.rows.forEach((item, index) => {
+            item.index = index + 1 + (offset - 1) * 10;
+          });
+          this.tableData = res;
+          this.loading = false;
         })
-        this.tableData = res
-        this.loading = false
-      }).catch(err => {
-        this.loading = false
-      })
+        .catch((err) => {
+          this.loading = false;
+        });
     },
     reset() {
       this.selectInfo = {
-        itemName: '',
-        itemBudget: '',
-        itemDuration: ''
-      }
+        itemName: "",
+        itemBudget: "",
+        itemDuration: "",
+      };
+      this.getListPage()
     },
-  }
-}
+  },
+};
 </script>
 
   <style lang="scss" scoped>
@@ -200,7 +214,6 @@
         // width: 84px;
         font-size: 16px;
       }
-
     }
   }
   .footer {
diff --git a/src/views/server/Management.vue b/src/views/server/Management.vue
index bed5935..ad94c61 100644
--- a/src/views/server/Management.vue
+++ b/src/views/server/Management.vue
@@ -176,7 +176,6 @@
     handleClick(row) {
       this.title = "服务编辑";
       this.isShowAdd = true;
-      console.log(row);
       this.rowInfo = row;
     },
     reset() {
@@ -185,11 +184,12 @@
         serviceName: "",
         typeCode: "",
       };
+      this.getListPage()
     },
     // 获取指定页面
-    getListPage(limit, offset) {
+    getListPage(limit = 10, offset = 1) {
       this.loading = true
-      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(
+      listPage(`limit=${limit}&offset=${offset}`, this.selectInfo).then(
         (res) => {
           // 得到相关数据
           res.rows.forEach((item, index) => {
diff --git a/src/views/supplier/assess.vue b/src/views/supplier/assess.vue
index de44528..f619c3c 100644
--- a/src/views/supplier/assess.vue
+++ b/src/views/supplier/assess.vue
@@ -144,6 +144,7 @@
         assessAnnual: '',
         annualAssessResult: ''
       }
+      this.getListPage()
     }
   }
 
diff --git a/src/views/supplier/evaluate.vue b/src/views/supplier/evaluate.vue
index 3be46e0..83e36a6 100644
--- a/src/views/supplier/evaluate.vue
+++ b/src/views/supplier/evaluate.vue
@@ -53,7 +53,7 @@
             {{ scope.row.evaluateYearName }}年{{ scope.row.evaluateQuarterlyName }}
           </template>
         </el-table-column>
-        <el-table-column prop="quarterlyEvaluateResultName" label="季度评价结果" width="150" />
+        <el-table-column prop="quarterlyEvaluateResult" label="季度评价结果" width="150" />
         <el-table-column prop="quarterlyEvaluateDate" label="季度评价日期" width="150"/>
         <el-table-column header-align="center" width="200" align="center" fixed="right" label="操作">
           <template slot-scope="scope">

diff --git a/dist.rar b/dist.rar
new file mode 100644
index 0000000..0c07f67
--- /dev/null
+++ b/dist.rar
Binary files differ
diff --git a/src/components/mycomponent/dialog/move/bannerAddDialog.vue b/src/components/mycomponent/dialog/move/bannerAddDialog.vue
index e3bdd0c..6afaea5 100644
--- a/src/components/mycomponent/dialog/move/bannerAddDialog.vue
+++ b/src/components/mycomponent/dialog/move/bannerAddDialog.vue
@@ -13,7 +13,7 @@
         <div class="inputBox">
           <red-star />
           <input-vue
-            v-model="bannerInfo.bannerName"
+            v-model.trim="bannerInfo.bannerName"
             title="banner名称"
             placeholder="请输入唯一编号"
             width="300px"
@@ -89,124 +89,121 @@
         </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 DialogHeader from '../dialogHeader.vue'
-import RedStar from '../../redStar.vue'
-import InputNumber from '../../input/inputNumber.vue'
-import { getToken } from '@/utils/auth'
-import { Base64 } from 'js-base64'
-import { list, add, updata } from '../../../../api/move/bannerConfig'
+import InputVue from "../../input/inputVue.vue";
+import DialogHeader from "../dialogHeader.vue";
+import RedStar from "../../redStar.vue";
+import InputNumber from "../../input/inputNumber.vue";
+import { getToken } from "@/utils/auth";
+import { Base64 } from "js-base64";
+import { list, add, updata } from "../../../../api/move/bannerConfig";
 
 export default {
   components: {
     DialogHeader,
     RedStar,
     InputVue,
-    InputNumber
+    InputNumber,
   },
   props: {
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: true,
     },
-    title: '',
-    dataInfo: ''
+    title: "",
+    dataInfo: "",
   },
   data() {
     return {
       bannerInfo: {
-        bannerName: '',
-        bannerPicture: '',
-        skipUrl: '11',
-        bannerModule: '',
-        bannerSort: 0
+        bannerName: "",
+        bannerPicture: "",
+        skipUrl: "11",
+        bannerModule: "",
+        bannerSort: 0,
       },
       fileList: [],
-      modelList: []
-    }
+      modelList: [],
+    };
   },
   watch: {
     dataInfo: {
       handler(vls) {
+        console.log(vls, "编辑");
         // 得到base64网络
-        if (!vls.id) return
+        if (!vls.id) return;
         this.bannerInfo = {
           id: vls.id,
           bannerName: vls.bannerName,
-          bannerPicture: this.getBase64('http://111.198.10.15:21403/static/' + vls.bannerPicture),
+          bannerPicture: vls.bannerPicture,
           skipUrl: vls.skipUrl,
           bannerModule: vls.bannerModule,
-          bannerSort: vls.bannerSort
-        }
-        console.log(
-          this.getBase64('http://111.198.10.15:21403/static/' + vls.bannerPicture)
-        )
+          bannerSort: vls.bannerSort,
+        };
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   mounted() {
     list().then((res) => {
-      const Ary = []
-      const str = res[26].detail
-      const strAry = str.split(';')
+      const Ary = [];
+      const str = res[25].detail;
+      const strAry = str.split(";");
       for (let i = 0; i < strAry.length; i++) {
-        const temp = strAry[i].split(':')
+        const temp = strAry[i].split(":");
         Ary.push({
           key: temp[2],
-          value: temp[1]
-        })
+          value: temp[1],
+        });
       }
-      console.log(Ary)
-      this.modelList = Ary
-    })
+      this.modelList = Ary;
+    });
   },
   methods: {
     getToken: getToken,
     close() {
-      this.$emit('close')
+      this.$emit("close");
     },
     save() {
-      if (this.title == 'banner新增') {
-        add(this.bannerInfo).then((res) => {
-          if (res != '') {
-            this.close()
+      const {
+        bannerInfo: { bannerName, bannerPicture, bannerModule },
+      } = this;
+      if (bannerName && bannerPicture && bannerModule) {
+        if (this.title == "banner新增") {
+          add(this.bannerInfo).then((res) => {
+            this.$message.success("添加成功");
+            this.close();
             this.bannerInfo = {
-              bannerName: '',
-              bannerPicture: '',
-              skipUrl: '',
-              bannerModule: '',
-              bannerSort: 0
-            }
-          }
-        })
+              bannerName: "",
+              bannerPicture: "",
+              skipUrl: "",
+              bannerModule: "",
+              bannerSort: 0,
+            };
+          });
+        } else {
+          updata(this.bannerInfo).then((res) => {
+            this.$message.success("更新成功");
+            this.close();
+            this.bannerInfo = {
+              bannerName: "",
+              bannerPicture: "",
+              skipUrl: "",
+              bannerModule: "",
+              bannerSort: 0,
+            };
+          });
+        }
       } else {
-        updata(this.bannerInfo).then(res => {
-          if (res != '') {
-            this.$message.success('更新成功')
-            this.close()
-            this.bannerInfo = {
-              bannerName: '',
-              bannerPicture: '',
-              skipUrl: '',
-              bannerModule: '',
-              bannerSort: 0
-            }
-          }
-        })
+        this.$message.error("请先完整填写信息");
       }
     },
 
@@ -214,60 +211,80 @@
       // console.log(response, file, fileList);
     },
     httpRequest(file) {
-      console.log(file.file, '========================')
+      console.log(file.file, "========================");
 
       // this.bannerInfo.bannerPicture =  Base64.encode(file.file)
-      var reader = new FileReader()
+      var reader = new FileReader();
 
-      reader.readAsDataURL(file.file)
+      reader.readAsDataURL(file.file);
       // console.log(reader.readyState,"===========result====",reader,reader.FileReader);
       const timer = setInterval(() => {
         if (reader.result) {
-          clearInterval(timer)
-          this.bannerInfo.bannerPicture = reader.result
-          console.log(this.bannerInfo.bannerPicture)
+          clearInterval(timer);
+          this.bannerInfo.bannerPicture = reader.result;
+          console.log(this.bannerInfo.bannerPicture);
         }
-      }, 300)
+      }, 300);
     },
     handleChange(file, fileList) {
-      console.log(fileList, file)
-      this.fileList = fileList.slice(-1)
+      this.fileList = fileList.slice(-1);
     },
     //  网络图片转base64编码
     getBase64(imgUrl) {
-      window.URL = window.URL || window.webkitURL
-      var xhr = new XMLHttpRequest()
-      xhr.open('get', imgUrl, true)
+      window.URL = window.URL || window.webkitURL;
+      var xhr = new XMLHttpRequest();
+      xhr.open("get", imgUrl, true);
       // 至关重要
-      xhr.responseType = 'blob'
-      xhr.onload = function() {
+      xhr.responseType = "blob";
+      xhr.onload = function () {
         if (this.status == 200) {
           // 得到一个blob对象
-          var blob = this.response
-          console.log('blob', blob)
+          var blob = this.response;
+          console.log("blob", blob);
           // 至关重要
-          const oFileReader = new FileReader()
-          oFileReader.onloadend = function(e) {
+          const oFileReader = new FileReader();
+          oFileReader.onloadend = function (e) {
             // 此处拿到的已经是 base64的图片了
-            const base64 = e.target.result
+            const base64 = e.target.result;
             // console.log("方式一》》》》》》》》》", base64);
-          }
-          oFileReader.readAsDataURL(blob)
+          };
+          oFileReader.readAsDataURL(blob);
           // ====为了在页面显示图片，可以删除====
-          var img = document.createElement('img')
-          img.onload = function(e) {
-            window.URL.revokeObjectURL(img.src) // 清除释放
-          }
-          const src = window.URL.createObjectURL(blob)
-          img.src = src
+          var img = document.createElement("img");
+          img.onload = function (e) {
+            window.URL.revokeObjectURL(img.src); // 清除释放
+          };
+          const src = window.URL.createObjectURL(blob);
+          img.src = src;
           // document.getElementById("container1").appendChild(img);
           // ====为了在页面显示图片，可以删除====
         }
-      }
-      xhr.send()
-    }
-  }
-}
+      };
+      xhr.send();
+    },
+    // 网络图片转base64 canvans方式
+    getBase64Image(img) {
+      var canvas = document.createElement("canvas");
+      canvas.width = img.width;
+      canvas.height = img.height;
+      var ctx = canvas.getContext("2d");
+      ctx.drawImage(img, 0, 0, img.width, img.height);
+      var dataURL = canvas.toDataURL("image/png"); // 可选其他值 image/jpeg
+      return dataURL;
+    },
+
+    main(src) {
+      let _this = this
+      var image = new Image();
+      image.src = src + "?v=" + Math.random(); // 处理缓存
+      image.crossOrigin = "*"; // 支持跨域图片
+      image.onload = function () {
+        var base64 = _this.getBase64Image(image);
+        this.bannerInfo.bannerPicture = base64
+      };
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
index 5e58333..4cae18a 100644
--- a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
+++ b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
@@ -13,7 +13,7 @@
           <div class="inputBox">
             <red-star />
             <input-vue
-              v-model="changeOrderInfo.receiver"
+              v-model.trim="changeOrderInfo.receiver"
               title="收货人"
               width="300px"
               class="inputWidth"
@@ -22,7 +22,7 @@
           <div class="inputBox">
             <red-star />
             <input-vue
-              v-model="changeOrderInfo.receiverPhone"
+              v-model.trim="changeOrderInfo.receiverPhone"
               title="收货人联系方式"
               width="300px"
               class="inputWidth"
@@ -74,7 +74,7 @@
               />
             </el-select>
             <el-input
-              v-model="changeOrderInfo.deliveryAddress"
+              v-model.trim="changeOrderInfo.deliveryAddress"
               placeholder="请输入内容"
               style="width: 638px"
             />
@@ -101,7 +101,7 @@
               style="justify-content: space-between"
             >
               <el-input
-                v-model="changeOrderInfo.remark"
+                v-model.trim="changeOrderInfo.remark"
                 style="width: 300px"
                 type="textarea"
                 :rows="3"
diff --git a/src/components/mycomponent/dialog/server/managementAddDialog.vue b/src/components/mycomponent/dialog/server/managementAddDialog.vue
index d3c1b9d..e1b2210 100644
--- a/src/components/mycomponent/dialog/server/managementAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/managementAddDialog.vue
@@ -12,7 +12,7 @@
         <div class="inputBox">
           <red-star />
           <input-vue
-            v-model="managementInfo.serviceCode"
+            v-model.trim="managementInfo.serviceCode"
             title="服务编号"
             placeholder="请输入服务编号"
             width="300px"
@@ -23,7 +23,7 @@
         <div class="inputBox">
           <red-star />
           <input-vue
-            v-model="managementInfo.serviceName"
+            v-model.trim="managementInfo.serviceName"
             title="服务名称"
             placeholder="请输入服务名称"
             width="300px"
@@ -78,7 +78,7 @@
         <div class="inputBox">
           <red-star />
           <input-vue
-            v-model="managementInfo.description"
+            v-model.trim="managementInfo.description"
             title="服务描述"
             width="300px"
             class="inputWidth"
@@ -112,7 +112,7 @@
             style="justify-content: space-between"
           >
             <el-input
-              v-model="managementInfo.remark"
+              v-model.trim="managementInfo.remark"
               type="textarea"
               style="width: 300px"
               :rows="2"
diff --git a/src/components/mycomponent/dialog/server/operationAddDialog.vue b/src/components/mycomponent/dialog/server/operationAddDialog.vue
index d436541..abd0a23 100644
--- a/src/components/mycomponent/dialog/server/operationAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/operationAddDialog.vue
@@ -11,12 +11,12 @@
             width="300px"
             class="inputWidth"
             style="justify-content: space-between;"
-            v-model="form.date"
+            v-model.trim="form.date"
           />
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="服务名称" placeholder="请输入品牌名称" v-model="form.name" class="inputWidth" style="justify-content: space-between;">
+          <input-vue title="服务名称" placeholder="请输入品牌名称" v-model.trim="form.name" class="inputWidth" style="justify-content: space-between;">
             <el-select
               v-model="form.date"
               style="width:300PX"
@@ -43,12 +43,12 @@
             width="300px"
             class="inputWidth"
             style="justify-content: space-between;"
-            v-model="form.address"
+            v-model.trim="form.address"
           />
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="服务优惠" v-model="form.address1" placeholder="" class="inputWidth" style="justify-content: space-between;">
+          <input-vue title="服务优惠" v-model.trim="form.address1" placeholder="" class="inputWidth" style="justify-content: space-between;">
             <el-select
               v-model="form.address"
               style="width:300px"
@@ -69,13 +69,13 @@
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="时间" width="300px" class="inputWidth" style="justify-content: space-between;" v-model='form.address2'/>
+          <input-vue title="时间" width="300px" class="inputWidth" style="justify-content: space-between;" v-model.trim='form.address2'/>
         </div>
 
         <div class="inputBox">
         &nbsp;
           <input-vue title="备注" class="inputWidth" style="justify-content: space-between;">
-            <el-input v-model="textarea" type="textarea" style="width:300px" :rows="2" placeholder="请输入内容" />
+            <el-input v-model.trim="textarea" type="textarea" style="width:300px" :rows="2" placeholder="请输入内容" />
           </input-vue>
         </div>
       </div>
diff --git a/src/components/mycomponent/dialog/server/typeAddDialog.vue b/src/components/mycomponent/dialog/server/typeAddDialog.vue
index 6c98c04..042421d 100644
--- a/src/components/mycomponent/dialog/server/typeAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/typeAddDialog.vue
@@ -6,7 +6,7 @@
         <div class="inputBox">
           <red-star />
           <input-vue
-            v-model="addInfo.typeCode"
+            v-model.trim="addInfo.typeCode"
             title="服务类型编号"
             placeholder="请输入服务类型编号"
             width="300px"
@@ -17,7 +17,7 @@
         <div class="inputBox">
           <red-star />
           <input-vue
-            v-model="addInfo.typeName"
+            v-model.trim="addInfo.typeName"
             title="服务类型名称"
             placeholder="请输入服务类型名称"
             width="300px"
@@ -28,7 +28,7 @@
         <div class="inputBox">
           <red-star />
           <input-vue
-            v-model="addInfo.description"
+            v-model.trim="addInfo.description"
             title="描述"
             width="300px"
             class="inputWidth"
@@ -55,7 +55,7 @@
         <div class="inputBox">
           &nbsp;
           <input-vue title="备注" class="inputWidth" style="justify-content: space-between;">
-            <el-input v-model="addInfo.remark" type="textarea" style="width:300px" :rows="2" placeholder="请输入内容" />
+            <el-input v-model.trim="addInfo.remark" type="textarea" style="width:300px" :rows="2" placeholder="请输入内容" />
           </input-vue>
         </div>
       </div>
diff --git a/src/views/move/bannerConfig.vue b/src/views/move/bannerConfig.vue
index 8bb613a..a4f1aaf 100644
--- a/src/views/move/bannerConfig.vue
+++ b/src/views/move/bannerConfig.vue
@@ -42,7 +42,7 @@
           type="danger"
           icon="el-icon-delete-solid"
           class="btnItem bgred"
-          @click=" BatchDelete"
+          @click="BatchDelete"
         >
           删除
         </el-button>
@@ -68,12 +68,14 @@
         <template slot-scope="scope">
           <!-- {{scope.row.bannerPicture}} -->
           <img
-            v-if="scope.row.bannerPicture!=''"
-            :src="'http://111.198.10.15:21403/static/'+scope.row.bannerPicture"
+            v-if="scope.row.bannerPicture != ''"
+            :src="
+              'http://111.198.10.15:21403/static/' + scope.row.bannerPicture
+            "
             width="100"
             height="100px"
             alt=""
-          >
+          />
         </template>
       </el-table-column>
       <el-table-column prop="bannerModuleName" label="所属功能模块" />
@@ -83,11 +85,7 @@
           <el-button type="text" size="small" @click="updata(scope.row)">
             编辑
           </el-button>
-          <el-button
-            type="text"
-            size="small"
-            @click="Bdelete(scope.row)"
-          >
+          <el-button type="text" size="small" @click="Bdelete(scope.row)">
             删除
           </el-button>
         </template>
@@ -105,102 +103,138 @@
     />
     <!-- 新增弹框 -->
     <!-- <category-add-dialog  :isShowInfo="isShowAdd"  @close ="closeAdd"></category-add-dialog> -->
-    <banner-add-dialog :is-show-info="isShowAdd" :title="title" :data-info="rowInfo" @close="closeAdd" />
+    <banner-add-dialog
+      :is-show-info="isShowAdd"
+      :title="title"
+      :data-info="rowInfo"
+      @close="closeAdd"
+    />
   </div>
 </template>
 
 <script>
 // 组件
 
-import BannerAddDialog from '../../components/mycomponent/dialog/move/bannerAddDialog.vue'
-import GroupPage from '../../components/mycomponent/groupPage.vue'
+import BannerAddDialog from "../../components/mycomponent/dialog/move/bannerAddDialog.vue";
+import GroupPage from "../../components/mycomponent/groupPage.vue";
 // 逻辑
-import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
-import { listPage, bdelete, batchDelete } from '../../api/move/bannerConfig'
-import { listMixin } from '../../utils/myUtils/mixins/listPage'
+import { tableRowClassName } from "../../utils/myUtils/changeTableTr";
+import { listPage, bdelete, batchDelete } from "../../api/move/bannerConfig";
+import { listMixin } from "../../utils/myUtils/mixins/listPage";
 
-export default { // 加入分页逻辑
+export default {
+  // 加入分页逻辑
   components: {
     BannerAddDialog,
-    GroupPage
+    GroupPage,
   },
   mixins: [listMixin],
   data() {
     return {
       isShowAdd: false, // 显示新增功能
       selectInfo: {
-        bannerName: ''
+        bannerName: "",
       },
-      title: '',
-      rowInfo: ''
-    }
+      title: "",
+      rowInfo: "",
+    };
   },
   methods: {
     tableRowClassName: tableRowClassName,
     closeAdd() {
-      this.isShowAdd = false
-      this.refresh()
+      this.isShowAdd = false;
+      this.refresh();
     },
 
     addCategory() {
-      this.isShowAdd = true
-      this.title = 'banner新增'
+      this.isShowAdd = true;
+      this.title = "banner新增";
     },
     updata(row) {
-      this.isShowAdd = true
-      this.title = 'banner编辑'
-      this.rowInfo = row
+      this.isShowAdd = true;
+      this.title = "banner编辑";
+      this.rowInfo = row;
     },
     getListPage(limit, offset) {
-      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
-        // 得到相关数据
-        res.rows.forEach((item, index) => {
-          item.index = (index + 1) + ((offset - 1) * 10)
-        })
-        this.tableData = res
-      })
+      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(
+        (res) => {
+          // 得到相关数据
+          res.rows.forEach((item, index) => {
+            item.index = index + 1 + (offset - 1) * 10;
+          });
+          this.tableData = res;
+        }
+      );
     },
     reset() {
       this.selectInfo = {
-        bannerName: ''
-      }
+        bannerName: "",
+      };
+      listPage(`limit=${10}&offset=${1}`, this.selectInfo).then(
+        (res) => {
+          // 得到相关数据
+          res.rows.forEach((item, index) => {
+            item.index = index + 1 + (1 - 1) * 10;
+          });
+          this.tableData = res;
+        }
+      );
     },
     // 批量删除
     BatchDelete() {
-      //  得到选中行
-      const dle_ary = this.$refs.multipleTable.selection
-      const ids = []
-      dle_ary.forEach(ele => {
-        ids.push(ele.id)
-      })
-      batchDelete({ ids: ids }).then(res => {
-        if (res != '') {
-          this.$message({
-            message: '删除成功',
-            type: 'success'
+      if (this.$refs.multipleTable.selection.length) {
+        this.$confirm(`确认删除选中的这些数据吗？`, "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            //  得到选中行
+            const dle_ary = this.$refs.multipleTable.selection;
+            const ids = [];
+            dle_ary.forEach((ele) => {
+              ids.push(ele.id);
+            });
+            batchDelete({ ids: ids }).then((res) => {
+              this.$message({
+                message: "删除成功",
+                type: "success",
+              });
+              this.refresh();
+            });
           })
-          this.refresh()
-        }
-      })
+          .catch(() => {});
+      } else {
+        this.$message({
+          message: "请先选择需要删除的数据",
+          type: "error",
+        });
+      }
     },
     // 删除
     Bdelete(row) {
-      // console.log(row);
-      const id = row.id
-      bdelete({ id: id }).then(res => {
-        // console.log(res);
-        // 删除成功跟新数据
-        if (res != '') {
-          this.$message({
-            message: '删除成功',
-            type: 'success'
-          })
-          this.refresh()
-        }
+      this.$confirm(`确认删除此项内容吗？`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
       })
-    }
-  }
-}
+        .then(() => {
+          const id = row.id;
+          bdelete({ id: id }).then((res) => {
+            // console.log(res);
+            // 删除成功跟新数据
+            this.$message({
+              message: "删除成功",
+              type: "success",
+            });
+            this.refresh();
+          });
+        })
+        .catch(() => {});
+      // console.log(row);
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -242,7 +276,6 @@
         // width: 84px;
         font-size: 16px;
       }
-
     }
   }
 
diff --git a/src/views/move/hotAndNews.vue b/src/views/move/hotAndNews.vue
index 6e5ee27..ba86219 100644
--- a/src/views/move/hotAndNews.vue
+++ b/src/views/move/hotAndNews.vue
@@ -76,7 +76,7 @@
       style="width: 100%"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column prop="index" label="序号" />
+      <el-table-column prop="index" label="序号" width="60"/>
       <el-table-column prop="recommendCode" label="编号" />
       <el-table-column prop="recommendModuleName" label="所属模块" />
       <el-table-column prop="recommendType" label="类型" />
@@ -187,6 +187,13 @@
         recommendType: '',
         recommendTitle: ''
       }
+      listPage(`limit=${10}&offset=${1}`, this.selectInfo).then(res => {
+      // 得到相关数据
+        res.rows.forEach((item, index) => {
+          item.index = (index + 1) + ((1 - 1) * 10)
+        })
+        this.tableData = res
+      })
     },
     BatchDelete() {
       //  得到选中行
diff --git a/src/views/sales/shop.vue b/src/views/sales/shop.vue
index 0a1c756..704d7c8 100644
--- a/src/views/sales/shop.vue
+++ b/src/views/sales/shop.vue
@@ -16,19 +16,21 @@
         <div class="inputBox" style="width: 144px">
           <el-input
             v-model="selectInfo.itemBudget"
-            placeholder="请输入项目预期"
+            placeholder="请输入项目预算"
             clearable
             class="product-input"
           />
         </div>
         预计工期
         <div class="inputBox" style="width: 144px">
-          <el-input
+          <!-- <el-input
             v-model="selectInfo.itemDuration"
             placeholder="请选择项目日期"
             clearable
             class="product-input"
-          />
+          /> -->
+          <el-date-picker v-model="selectInfo.itemDuration" type="date" placeholder="请选择日期" value-format="yyyy-MM-dd HH:mm:ss">
+          </el-date-picker>
         </div>
       </div>
       <div class="productBtn">
@@ -63,27 +65,20 @@
       v-loading="loading"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column prop="index" label="序号" />
+      <el-table-column prop="index" label="序号" width="60"/>
       <el-table-column prop="busOppoId" label="商机编号" />
       <el-table-column prop="itemName" label="项目名称" />
-      <el-table-column prop="itemBudget" label="预期工期" />
+      <el-table-column prop="itemBudget" label="项目预算" />
+      <el-table-column prop="itemDuration" label="预计工期" />
       <el-table-column prop="itemManager" label="商机负责人" />
       <el-table-column prop="phone" label="联系方式" />
       <el-table-column prop="status" label="商机状态" />
       <el-table-column label="操作">
         <template slot-scope="scope">
-          <el-button
-            type="text"
-            size="small"
-            @click="showInfo(scope.row)"
-          >
+          <el-button type="text" size="small" @click="showInfo(scope.row)">
             详情
           </el-button>
-          <el-button
-            type="text"
-            size="small"
-            @click="handleClick(scope.row)"
-          >
+          <el-button type="text" size="small" @click="handleClick(scope.row)">
             商机转订单
           </el-button>
 
@@ -91,31 +86,47 @@
         </template>
       </el-table-column>
     </el-table>
-    <group-page v-model="isFristPage" :limit="limit" :total="total" :offset="offset" :count="tableData.total" @setOffset="setOffset" @setLimit="setLimit" />
+    <group-page
+      v-model="isFristPage"
+      :limit="limit"
+      :total="total"
+      :offset="offset"
+      :count="tableData.total"
+      @setOffset="setOffset"
+      @setLimit="setLimit"
+    />
     <!-- 新增弹框 -->
 
     <!-- <brand-add-dialog  :isShowInfo="isShowAdd"
       @close="closeAdd"></brand-add-dialog> -->
-    <shop-info-dialog :is-show-info="isShowInfo" :data-info="rowInfo" @close="closeInfo" />
-    <slaes-change-order-dialog :is-show-info="isShowAdd" :bus-oppo-id="busOppoId" @close="closeAdd" />
+    <shop-info-dialog
+      :is-show-info="isShowInfo"
+      :data-info="rowInfo"
+      @close="closeInfo"
+    />
+    <slaes-change-order-dialog
+      :is-show-info="isShowAdd"
+      :bus-oppo-id="busOppoId"
+      @close="closeAdd"
+    />
   </div>
 </template>
 
 <script>
 // 组件
-import ShopInfoDialog from '../../components/mycomponent/dialog/salesDialog/shopInfoDialog.vue'
-import SlaesChangeOrderDialog from '../../components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue'
-import GroupPage from '../../components/mycomponent/groupPage.vue'
+import ShopInfoDialog from "../../components/mycomponent/dialog/salesDialog/shopInfoDialog.vue";
+import SlaesChangeOrderDialog from "../../components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue";
+import GroupPage from "../../components/mycomponent/groupPage.vue";
 
 // 逻辑
-import { listPage } from '../../api/sales/shop'
-import { listMixin, elDataDialog } from '../../utils/myUtils/mixins/listPage'
-import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
+import { listPage } from "../../api/sales/shop";
+import { listMixin, elDataDialog } from "../../utils/myUtils/mixins/listPage";
+import { tableRowClassName } from "../../utils/myUtils/changeTableTr";
 export default {
   components: {
     ShopInfoDialog,
     SlaesChangeOrderDialog,
-    GroupPage
+    GroupPage,
   },
   mixins: [listMixin, elDataDialog],
   data() {
@@ -123,47 +134,50 @@
       isShowAdd: false, // 显示新增功能
       isShowInfo: false, // 显示新增功能
       selectInfo: {
-        itemName: '',
-        itemBudget: '',
-        itemDuration: ''
+        itemName: "",
+        itemBudget: "",
+        itemDuration: "",
       },
-      busOppoId: '',
-      loading:false
-    }
+      busOppoId: "",
+      loading: false,
+    };
   },
   methods: {
     tableRowClassName: tableRowClassName,
     closeAdd() {
-      this.isShowAdd = false
+      this.isShowAdd = false;
     },
 
     handleClick(row) {
       // console.log(row);
-      this.isShowAdd = true
-      this.busOppoId = row.busOppoId
+      this.isShowAdd = true;
+      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)
+    getListPage(limit = 10, offset = 1) {
+      this.loading = true;
+      listPage(`limit=${limit}&offset=${offset}`, this.selectInfo)
+        .then((res) => {
+          // 得到相关数据
+          res.rows.forEach((item, index) => {
+            item.index = index + 1 + (offset - 1) * 10;
+          });
+          this.tableData = res;
+          this.loading = false;
         })
-        this.tableData = res
-        this.loading = false
-      }).catch(err => {
-        this.loading = false
-      })
+        .catch((err) => {
+          this.loading = false;
+        });
     },
     reset() {
       this.selectInfo = {
-        itemName: '',
-        itemBudget: '',
-        itemDuration: ''
-      }
+        itemName: "",
+        itemBudget: "",
+        itemDuration: "",
+      };
+      this.getListPage()
     },
-  }
-}
+  },
+};
 </script>
 
   <style lang="scss" scoped>
@@ -200,7 +214,6 @@
         // width: 84px;
         font-size: 16px;
       }
-
     }
   }
   .footer {
diff --git a/src/views/server/Management.vue b/src/views/server/Management.vue
index bed5935..ad94c61 100644
--- a/src/views/server/Management.vue
+++ b/src/views/server/Management.vue
@@ -176,7 +176,6 @@
     handleClick(row) {
       this.title = "服务编辑";
       this.isShowAdd = true;
-      console.log(row);
       this.rowInfo = row;
     },
     reset() {
@@ -185,11 +184,12 @@
         serviceName: "",
         typeCode: "",
       };
+      this.getListPage()
     },
     // 获取指定页面
-    getListPage(limit, offset) {
+    getListPage(limit = 10, offset = 1) {
       this.loading = true
-      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(
+      listPage(`limit=${limit}&offset=${offset}`, this.selectInfo).then(
         (res) => {
           // 得到相关数据
           res.rows.forEach((item, index) => {
diff --git a/src/views/supplier/assess.vue b/src/views/supplier/assess.vue
index de44528..f619c3c 100644
--- a/src/views/supplier/assess.vue
+++ b/src/views/supplier/assess.vue
@@ -144,6 +144,7 @@
         assessAnnual: '',
         annualAssessResult: ''
       }
+      this.getListPage()
     }
   }
 
diff --git a/src/views/supplier/evaluate.vue b/src/views/supplier/evaluate.vue
index 3be46e0..83e36a6 100644
--- a/src/views/supplier/evaluate.vue
+++ b/src/views/supplier/evaluate.vue
@@ -53,7 +53,7 @@
             {{ scope.row.evaluateYearName }}年{{ scope.row.evaluateQuarterlyName }}
           </template>
         </el-table-column>
-        <el-table-column prop="quarterlyEvaluateResultName" label="季度评价结果" width="150" />
+        <el-table-column prop="quarterlyEvaluateResult" label="季度评价结果" width="150" />
         <el-table-column prop="quarterlyEvaluateDate" label="季度评价日期" width="150"/>
         <el-table-column header-align="center" width="200" align="center" fixed="right" label="操作">
           <template slot-scope="scope">
diff --git a/src/views/supplier/evaluateDialog.vue b/src/views/supplier/evaluateDialog.vue
index cba9c96..e72805d 100644
--- a/src/views/supplier/evaluateDialog.vue
+++ b/src/views/supplier/evaluateDialog.vue
@@ -93,7 +93,7 @@
 import { evaluateAdd } from '@/api/supplier/supplier'
 import { Uploadimg } from '@/api/common'
 import { getToday } from '@/utils/dateutils'
-
+import { throttle } from 'lodash'
 export default {
   name: 'EvaluateDialog',
   props: {
@@ -175,6 +175,9 @@
         })
       }
     },
+    throttleSave:function(){
+      throttle(this.save,3000)
+    },
     validateForm: function() {
       this.$refs.evaluateForm.validate(valid => {
         this.evaluateValid = valid