diff --git a/src/components/mycomponent/dialog/move/hotandNewsDialog.vue b/src/components/mycomponent/dialog/move/hotandNewsDialog.vue
index fc824f3..964678a 100644
--- a/src/components/mycomponent/dialog/move/hotandNewsDialog.vue
+++ b/src/components/mycomponent/dialog/move/hotandNewsDialog.vue
@@ -41,7 +41,10 @@
           <div class="inputBox">
             <red-star />
             <input-vue title="排序">
-              <input-number v-model.trim="hotInfo.recommendSort" style="width: 217px" />
+              <input-number
+                v-model.trim="hotInfo.recommendSort"
+                style="width: 217px"
+              />
             </input-vue>
           </div>
         </div>
@@ -74,11 +77,7 @@
                 :file-list="fileList"
                 :http-request="httpRequest"
               >
-                <el-button
-                  size="small"
-                  type="primary"
-                  style="width: 218px"
-                >
+                <el-button size="small" type="primary" style="width: 218px">
                   点击上传图片
                 </el-button>
               </el-upload>
@@ -99,40 +98,34 @@
         </div>
       </div>
       <div class="middle_text">
-        <div class="title">
-          <red-star /> 发布内容
-        </div>
+        <div class="title"><red-star /> 发布内容</div>
         <richtext v-model.trim="hotInfo.recommendContent" />
       </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 InputNumber from '../../input/inputNumber.vue'
-import InputVue from '../../input/inputVue.vue'
-import Richtext from '../../input/richtext.vue'
-import RedStar from '../../redStar.vue'
-import dialogHeader from '../dialogHeader.vue'
-import { list } from '../../../../api/move/bannerConfig'
-import { add, hotupdata } from '../../../../api/move/hotAndNews'
+import InputNumber from "../../input/inputNumber.vue";
+import InputVue from "../../input/inputVue.vue";
+import Richtext from "../../input/richtext.vue";
+import RedStar from "../../redStar.vue";
+import dialogHeader from "../dialogHeader.vue";
+import { list } from "../../../../api/move/bannerConfig";
+import { add, hotupdata } from "../../../../api/move/hotAndNews";
 export default {
   components: { dialogHeader, RedStar, InputVue, Richtext, InputNumber },
   props: {
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: true,
     },
-    title: '',
-    dataInfo: ''
+    title: "",
+    dataInfo: "",
   },
   data() {
     return {
@@ -140,151 +133,170 @@
       modelList: [],
       fileList: [],
       hotInfo: {
-        recommendModule: '',
-        recommendType: '',
-        recommendTitle: '',
-        recommendPicture: '',
-        recommendContent: '',
-        recommendPublisher: '',
-        publishTime: '',
-        recommendSort: 1
-      }
-    }
+        recommendModule: "",
+        recommendType: "",
+        recommendTitle: "",
+        recommendPicture: "",
+        recommendContent: "",
+        recommendPublisher: "",
+        publishTime: "",
+        recommendSort: 1,
+      },
+    };
   },
   watch: {
     dataInfo: {
       handler(vls) {
-        if (!vls.id) return
+        if (!vls.id) return;
         this.hotInfo = {
           id: vls.id,
           recommendModule: vls.recommendModule,
           recommendType: vls.recommendType,
           recommendTitle: vls.recommendTitle,
-          recommendPicture: this.getBase64('http://111.198.10.15:21403/static/' + vls.recommendPicture),
+          recommendPicture: this.getBase64(
+            "http://111.198.10.15:21403/static/" + vls.recommendPicture
+          ),
           recommendContent: vls.recommendContent,
           recommendPublisher: vls.recommendPublisher,
           publishTime: vls.publishTime,
-          recommendSort: vls.recommendSort
-        }
+          recommendSort: vls.recommendSort,
+        };
       },
-      deep: true
-    }
+      deep: true,
+    },
   },
   mounted() {
     list().then((res) => {
-      const str = res[26].detail
-      const str2 = res[27].detail
-      this.typeList = this.dealAry(str2)
-      this.modelList = this.dealAry(str)
-    })
+      const str = res[26].detail;
+      const str2 = res[27].detail;
+      this.typeList = this.dealAry(str2);
+      this.modelList = this.dealAry(str);
+    });
   },
   methods: {
     save() {
-      if (this.title == '新增') {
-        add(this.hotInfo).then((res) => {
-          if (res != '') {
-            this.$message.success('新增成功')
-            this.close()
-            this.hotInfo = {
-              recommendModule: '',
-              recommendType: '',
-              recommendTitle: '',
-              recommendPicture: '',
-              recommendContent: '',
-              recommendPublisher: '',
-              publishTime: '',
-              recommendSort: 1
-            }
-          }
-        })
+      const {
+        hotInfo: {
+          recommendModule,
+          recommendType,
+          recommendTitle,
+          recommendContent,
+          recommendPublisher,
+          publishTime,
+        },
+      } = this;
+      if (
+        recommendModule &&
+        recommendType &&
+        recommendTitle &&
+        recommendContent &&
+        recommendPublisher &&
+        publishTime
+      ) {
+        if (this.title == "新增") {
+          add(this.hotInfo).then((res) => {
+              this.$message.success("新增成功");
+              this.close();
+              this.hotInfo = {
+                recommendModule: "",
+                recommendType: "",
+                recommendTitle: "",
+                recommendPicture: "",
+                recommendContent: "",
+                recommendPublisher: "",
+                publishTime: "",
+                recommendSort: 1,
+              };
+          });
+        } else {
+          hotupdata(this.hotInfo).then((res) => {
+              this.$message.success("更新成功");
+              this.close();
+              this.hotInfo = {
+                recommendModule: "",
+                recommendType: "",
+                recommendTitle: "",
+                recommendPicture: "",
+                recommendContent: "",
+                recommendPublisher: "",
+                publishTime: "",
+                recommendSort: 1,
+              };
+          });
+        }
       } else {
-        hotupdata(this.hotInfo).then(res => {
-          if (res != '') {
-            this.$message.success('更新成功')
-            this.close()
-            this.hotInfo = {
-              recommendModule: '',
-              recommendType: '',
-              recommendTitle: '',
-              recommendPicture: '',
-              recommendContent: '',
-              recommendPublisher: '',
-              publishTime: '',
-              recommendSort: 1
-            }
-          }
-        })
+        this.$message.error("请先完整填写信息");
       }
     },
     dealAry(str) {
-      const Ary = []
-      const strAry = str.split(';')
+      const Ary = [];
+      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],
+        });
       }
-      return Ary
+      return Ary;
     },
     close() {
-      this.$emit('close')
+      this.$emit("close");
     },
     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.hotInfo.recommendPicture = reader.result
-          console.log(this.hotInfo.recommendPicture)
+          clearInterval(timer);
+          this.hotInfo.recommendPicture = reader.result;
+          console.log(this.hotInfo.recommendPicture);
         }
-      }, 300)
+      }, 300);
     },
     handleChange(file, fileList) {
-      console.log(fileList, file)
-      this.fileList = fileList.slice(-1)
+      console.log(fileList, file);
+      this.fileList = fileList.slice(-1);
     },
     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) {
+            windhotInfoow.URL.revokeObjectURL(img.src); // 清除释放
+          };
+          const src = window.URL.createObjectURL(blob);
+          img.src = src;
           // document.getElementById("container1").appendChild(img);
           // ====为了在页面显示图片，可以删除====
         }
-      }
-      xhr.send()
-    }
-  }
-}
+      };
+      xhr.send();
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>

diff --git a/src/components/mycomponent/dialog/move/hotandNewsDialog.vue b/src/components/mycomponent/dialog/move/hotandNewsDialog.vue
index fc824f3..964678a 100644
--- a/src/components/mycomponent/dialog/move/hotandNewsDialog.vue
+++ b/src/components/mycomponent/dialog/move/hotandNewsDialog.vue
@@ -41,7 +41,10 @@
           <div class="inputBox">
             <red-star />
             <input-vue title="排序">
-              <input-number v-model.trim="hotInfo.recommendSort" style="width: 217px" />
+              <input-number
+                v-model.trim="hotInfo.recommendSort"
+                style="width: 217px"
+              />
             </input-vue>
           </div>
         </div>
@@ -74,11 +77,7 @@
                 :file-list="fileList"
                 :http-request="httpRequest"
               >
-                <el-button
-                  size="small"
-                  type="primary"
-                  style="width: 218px"
-                >
+                <el-button size="small" type="primary" style="width: 218px">
                   点击上传图片
                 </el-button>
               </el-upload>
@@ -99,40 +98,34 @@
         </div>
       </div>
       <div class="middle_text">
-        <div class="title">
-          <red-star /> 发布内容
-        </div>
+        <div class="title"><red-star /> 发布内容</div>
         <richtext v-model.trim="hotInfo.recommendContent" />
       </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 InputNumber from '../../input/inputNumber.vue'
-import InputVue from '../../input/inputVue.vue'
-import Richtext from '../../input/richtext.vue'
-import RedStar from '../../redStar.vue'
-import dialogHeader from '../dialogHeader.vue'
-import { list } from '../../../../api/move/bannerConfig'
-import { add, hotupdata } from '../../../../api/move/hotAndNews'
+import InputNumber from "../../input/inputNumber.vue";
+import InputVue from "../../input/inputVue.vue";
+import Richtext from "../../input/richtext.vue";
+import RedStar from "../../redStar.vue";
+import dialogHeader from "../dialogHeader.vue";
+import { list } from "../../../../api/move/bannerConfig";
+import { add, hotupdata } from "../../../../api/move/hotAndNews";
 export default {
   components: { dialogHeader, RedStar, InputVue, Richtext, InputNumber },
   props: {
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: true,
     },
-    title: '',
-    dataInfo: ''
+    title: "",
+    dataInfo: "",
   },
   data() {
     return {
@@ -140,151 +133,170 @@
       modelList: [],
       fileList: [],
       hotInfo: {
-        recommendModule: '',
-        recommendType: '',
-        recommendTitle: '',
-        recommendPicture: '',
-        recommendContent: '',
-        recommendPublisher: '',
-        publishTime: '',
-        recommendSort: 1
-      }
-    }
+        recommendModule: "",
+        recommendType: "",
+        recommendTitle: "",
+        recommendPicture: "",
+        recommendContent: "",
+        recommendPublisher: "",
+        publishTime: "",
+        recommendSort: 1,
+      },
+    };
   },
   watch: {
     dataInfo: {
       handler(vls) {
-        if (!vls.id) return
+        if (!vls.id) return;
         this.hotInfo = {
           id: vls.id,
           recommendModule: vls.recommendModule,
           recommendType: vls.recommendType,
           recommendTitle: vls.recommendTitle,
-          recommendPicture: this.getBase64('http://111.198.10.15:21403/static/' + vls.recommendPicture),
+          recommendPicture: this.getBase64(
+            "http://111.198.10.15:21403/static/" + vls.recommendPicture
+          ),
           recommendContent: vls.recommendContent,
           recommendPublisher: vls.recommendPublisher,
           publishTime: vls.publishTime,
-          recommendSort: vls.recommendSort
-        }
+          recommendSort: vls.recommendSort,
+        };
       },
-      deep: true
-    }
+      deep: true,
+    },
   },
   mounted() {
     list().then((res) => {
-      const str = res[26].detail
-      const str2 = res[27].detail
-      this.typeList = this.dealAry(str2)
-      this.modelList = this.dealAry(str)
-    })
+      const str = res[26].detail;
+      const str2 = res[27].detail;
+      this.typeList = this.dealAry(str2);
+      this.modelList = this.dealAry(str);
+    });
   },
   methods: {
     save() {
-      if (this.title == '新增') {
-        add(this.hotInfo).then((res) => {
-          if (res != '') {
-            this.$message.success('新增成功')
-            this.close()
-            this.hotInfo = {
-              recommendModule: '',
-              recommendType: '',
-              recommendTitle: '',
-              recommendPicture: '',
-              recommendContent: '',
-              recommendPublisher: '',
-              publishTime: '',
-              recommendSort: 1
-            }
-          }
-        })
+      const {
+        hotInfo: {
+          recommendModule,
+          recommendType,
+          recommendTitle,
+          recommendContent,
+          recommendPublisher,
+          publishTime,
+        },
+      } = this;
+      if (
+        recommendModule &&
+        recommendType &&
+        recommendTitle &&
+        recommendContent &&
+        recommendPublisher &&
+        publishTime
+      ) {
+        if (this.title == "新增") {
+          add(this.hotInfo).then((res) => {
+              this.$message.success("新增成功");
+              this.close();
+              this.hotInfo = {
+                recommendModule: "",
+                recommendType: "",
+                recommendTitle: "",
+                recommendPicture: "",
+                recommendContent: "",
+                recommendPublisher: "",
+                publishTime: "",
+                recommendSort: 1,
+              };
+          });
+        } else {
+          hotupdata(this.hotInfo).then((res) => {
+              this.$message.success("更新成功");
+              this.close();
+              this.hotInfo = {
+                recommendModule: "",
+                recommendType: "",
+                recommendTitle: "",
+                recommendPicture: "",
+                recommendContent: "",
+                recommendPublisher: "",
+                publishTime: "",
+                recommendSort: 1,
+              };
+          });
+        }
       } else {
-        hotupdata(this.hotInfo).then(res => {
-          if (res != '') {
-            this.$message.success('更新成功')
-            this.close()
-            this.hotInfo = {
-              recommendModule: '',
-              recommendType: '',
-              recommendTitle: '',
-              recommendPicture: '',
-              recommendContent: '',
-              recommendPublisher: '',
-              publishTime: '',
-              recommendSort: 1
-            }
-          }
-        })
+        this.$message.error("请先完整填写信息");
       }
     },
     dealAry(str) {
-      const Ary = []
-      const strAry = str.split(';')
+      const Ary = [];
+      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],
+        });
       }
-      return Ary
+      return Ary;
     },
     close() {
-      this.$emit('close')
+      this.$emit("close");
     },
     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.hotInfo.recommendPicture = reader.result
-          console.log(this.hotInfo.recommendPicture)
+          clearInterval(timer);
+          this.hotInfo.recommendPicture = reader.result;
+          console.log(this.hotInfo.recommendPicture);
         }
-      }, 300)
+      }, 300);
     },
     handleChange(file, fileList) {
-      console.log(fileList, file)
-      this.fileList = fileList.slice(-1)
+      console.log(fileList, file);
+      this.fileList = fileList.slice(-1);
     },
     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) {
+            windhotInfoow.URL.revokeObjectURL(img.src); // 清除释放
+          };
+          const src = window.URL.createObjectURL(blob);
+          img.src = src;
           // document.getElementById("container1").appendChild(img);
           // ====为了在页面显示图片，可以删除====
         }
-      }
-      xhr.send()
-    }
-  }
-}
+      };
+      xhr.send();
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/move/hotAndNews.vue b/src/views/move/hotAndNews.vue
index ba86219..488c26d 100644
--- a/src/views/move/hotAndNews.vue
+++ b/src/views/move/hotAndNews.vue
@@ -57,7 +57,7 @@
           type="danger"
           icon="el-icon-delete-solid"
           class="btnItem bgred"
-          @click=" BatchDelete"
+          @click="BatchDelete"
         >
           删除
         </el-button>
@@ -76,14 +76,20 @@
       style="width: 100%"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column prop="index" label="序号" width="60"/>
+      <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="类型" />
-      <el-table-column prop="recommendTypeName" label="标题" />
+      <el-table-column prop="recommendTypeName" label="类型" />
+      <el-table-column prop="recommendTitle" label="标题" />
       <el-table-column prop="recommendPicture" label="图片">
         <template slot-scope="scope">
-          <img v-if="scope.row.recommendPicture!=''" :src="scope.row.recommendPicture" width="100" height="100px" alt="">
+          <img
+            v-if="scope.row.recommendPicture != ''"
+            :src= "scope.row.recommendPicture"
+            width="100"
+            height="100px"
+            alt=""
+          />
         </template>
       </el-table-column>
       <el-table-column prop="recommendContent" label="内容" />
@@ -95,141 +101,179 @@
           <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>
       </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"
+    />
     <!-- 新增弹框 -->
-    <hotand-news-dialog :is-show-info="isShowAdd" :title="title" :data-info="rowInfo" @close="closeAdd" />
+    <hotand-news-dialog
+      :is-show-info="isShowAdd"
+      :title="title"
+      :data-info="rowInfo"
+      @close="closeAdd"
+    />
   </div>
 </template>
 
 <script>
 // 组件
-import GroupPage from '../../components/mycomponent/groupPage.vue'
-import HotandNewsDialog from '../../components/mycomponent/dialog/move/hotandNewsDialog.vue'
+import GroupPage from "../../components/mycomponent/groupPage.vue";
+import HotandNewsDialog from "../../components/mycomponent/dialog/move/hotandNewsDialog.vue";
 // 逻辑
-import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
-import { listMixin } from '../../utils/myUtils/mixins/listPage'
-import { listPage, batchDelete, bdelete } from '../../api/move/hotAndNews'
-import { list } from '../../api/move/bannerConfig'
-export default { // 加入分页逻辑
+import { tableRowClassName } from "../../utils/myUtils/changeTableTr";
+import { listMixin } from "../../utils/myUtils/mixins/listPage";
+import { listPage, batchDelete, bdelete } from "../../api/move/hotAndNews";
+import { list } from "../../api/move/bannerConfig";
+export default {
+  // 加入分页逻辑
   components: {
     HotandNewsDialog,
-    GroupPage
+    GroupPage,
   },
   mixins: [listMixin],
   data() {
     return {
-      title: '',
+      title: "",
       isShowAdd: false, // 显示新增功能
       selectInfo: {
-        recommendType: '',
-        recommendTitle: ''
+        recommendType: "",
+        recommendTitle: "",
       },
-      rowInfo: '',
-      typeList: []
-    }
+      rowInfo: "",
+      typeList: [],
+    };
   },
   mounted() {
     list().then((res) => {
-      const str2 = res[27].detail
-      this.typeList = this.dealAry(str2)
-    })
+      const str2 = res[27].detail;
+      this.typeList = this.dealAry(str2);
+    });
   },
   methods: {
     tableRowClassName: tableRowClassName,
     dealAry(str) {
-      const Ary = []
-      const strAry = str.split(';')
+      const Ary = [];
+      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],
+        });
       }
-      return Ary
+      return Ary;
     },
     closeAdd() {
-      this.isShowAdd = false
-      this.refresh()
+      this.isShowAdd = false;
+      this.refresh();
     },
     addCategory() {
-      this.isShowAdd = true
-      this.title = '新增'
-      this.rowInfo = ''
+      this.isShowAdd = true;
+      this.title = "新增";
+      this.rowInfo = "";
     },
     updata(row) {
-      this.isShowAdd = true
-      this.title = '编辑'
-      this.rowInfo = row
+      this.isShowAdd = true;
+      this.title = "编辑";
+      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;
+          });
+          res.rows = res.rows.map((item, index) =>{
+            return{
+              ...item,
+              recommendPicture: "http://111.198.10.15:21403/static/" + item.recommendPicture,
+              publishTime:item.publishTime.split(' ')[0]
+            }
+          })
+          this.tableData = res;
+        }
+      );
     },
     reset() {
       this.selectInfo = {
-        recommendType: '',
-        recommendTitle: ''
-      }
-      listPage(`limit=${10}&offset=${1}`, this.selectInfo).then(res => {
-      // 得到相关数据
+        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
-      })
+          item.index = index + 1 + (1 - 1) * 10;
+        });
+        res.rows = res.rows.map((item, index) =>{
+            return{
+              ...item,
+              recommendPicture: "http://111.198.10.15:21403/static/" + item.recommendPicture,
+              publishTime:item.publishTime.split(' ')[0]
+            }
+          })
+        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.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) => {
+          // 删除成功跟新数据
+            this.$message({
+              message: "删除成功",
+              type: "success",
+            });
+            this.refresh();
+        });
+      });
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -265,7 +309,6 @@
         // width: 84px;
         font-size: 16px;
       }
-
     }
   }
   .footer {

diff --git a/src/components/mycomponent/dialog/move/hotandNewsDialog.vue b/src/components/mycomponent/dialog/move/hotandNewsDialog.vue
index fc824f3..964678a 100644
--- a/src/components/mycomponent/dialog/move/hotandNewsDialog.vue
+++ b/src/components/mycomponent/dialog/move/hotandNewsDialog.vue
@@ -41,7 +41,10 @@
           <div class="inputBox">
             <red-star />
             <input-vue title="排序">
-              <input-number v-model.trim="hotInfo.recommendSort" style="width: 217px" />
+              <input-number
+                v-model.trim="hotInfo.recommendSort"
+                style="width: 217px"
+              />
             </input-vue>
           </div>
         </div>
@@ -74,11 +77,7 @@
                 :file-list="fileList"
                 :http-request="httpRequest"
               >
-                <el-button
-                  size="small"
-                  type="primary"
-                  style="width: 218px"
-                >
+                <el-button size="small" type="primary" style="width: 218px">
                   点击上传图片
                 </el-button>
               </el-upload>
@@ -99,40 +98,34 @@
         </div>
       </div>
       <div class="middle_text">
-        <div class="title">
-          <red-star /> 发布内容
-        </div>
+        <div class="title"><red-star /> 发布内容</div>
         <richtext v-model.trim="hotInfo.recommendContent" />
       </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 InputNumber from '../../input/inputNumber.vue'
-import InputVue from '../../input/inputVue.vue'
-import Richtext from '../../input/richtext.vue'
-import RedStar from '../../redStar.vue'
-import dialogHeader from '../dialogHeader.vue'
-import { list } from '../../../../api/move/bannerConfig'
-import { add, hotupdata } from '../../../../api/move/hotAndNews'
+import InputNumber from "../../input/inputNumber.vue";
+import InputVue from "../../input/inputVue.vue";
+import Richtext from "../../input/richtext.vue";
+import RedStar from "../../redStar.vue";
+import dialogHeader from "../dialogHeader.vue";
+import { list } from "../../../../api/move/bannerConfig";
+import { add, hotupdata } from "../../../../api/move/hotAndNews";
 export default {
   components: { dialogHeader, RedStar, InputVue, Richtext, InputNumber },
   props: {
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: true,
     },
-    title: '',
-    dataInfo: ''
+    title: "",
+    dataInfo: "",
   },
   data() {
     return {
@@ -140,151 +133,170 @@
       modelList: [],
       fileList: [],
       hotInfo: {
-        recommendModule: '',
-        recommendType: '',
-        recommendTitle: '',
-        recommendPicture: '',
-        recommendContent: '',
-        recommendPublisher: '',
-        publishTime: '',
-        recommendSort: 1
-      }
-    }
+        recommendModule: "",
+        recommendType: "",
+        recommendTitle: "",
+        recommendPicture: "",
+        recommendContent: "",
+        recommendPublisher: "",
+        publishTime: "",
+        recommendSort: 1,
+      },
+    };
   },
   watch: {
     dataInfo: {
       handler(vls) {
-        if (!vls.id) return
+        if (!vls.id) return;
         this.hotInfo = {
           id: vls.id,
           recommendModule: vls.recommendModule,
           recommendType: vls.recommendType,
           recommendTitle: vls.recommendTitle,
-          recommendPicture: this.getBase64('http://111.198.10.15:21403/static/' + vls.recommendPicture),
+          recommendPicture: this.getBase64(
+            "http://111.198.10.15:21403/static/" + vls.recommendPicture
+          ),
           recommendContent: vls.recommendContent,
           recommendPublisher: vls.recommendPublisher,
           publishTime: vls.publishTime,
-          recommendSort: vls.recommendSort
-        }
+          recommendSort: vls.recommendSort,
+        };
       },
-      deep: true
-    }
+      deep: true,
+    },
   },
   mounted() {
     list().then((res) => {
-      const str = res[26].detail
-      const str2 = res[27].detail
-      this.typeList = this.dealAry(str2)
-      this.modelList = this.dealAry(str)
-    })
+      const str = res[26].detail;
+      const str2 = res[27].detail;
+      this.typeList = this.dealAry(str2);
+      this.modelList = this.dealAry(str);
+    });
   },
   methods: {
     save() {
-      if (this.title == '新增') {
-        add(this.hotInfo).then((res) => {
-          if (res != '') {
-            this.$message.success('新增成功')
-            this.close()
-            this.hotInfo = {
-              recommendModule: '',
-              recommendType: '',
-              recommendTitle: '',
-              recommendPicture: '',
-              recommendContent: '',
-              recommendPublisher: '',
-              publishTime: '',
-              recommendSort: 1
-            }
-          }
-        })
+      const {
+        hotInfo: {
+          recommendModule,
+          recommendType,
+          recommendTitle,
+          recommendContent,
+          recommendPublisher,
+          publishTime,
+        },
+      } = this;
+      if (
+        recommendModule &&
+        recommendType &&
+        recommendTitle &&
+        recommendContent &&
+        recommendPublisher &&
+        publishTime
+      ) {
+        if (this.title == "新增") {
+          add(this.hotInfo).then((res) => {
+              this.$message.success("新增成功");
+              this.close();
+              this.hotInfo = {
+                recommendModule: "",
+                recommendType: "",
+                recommendTitle: "",
+                recommendPicture: "",
+                recommendContent: "",
+                recommendPublisher: "",
+                publishTime: "",
+                recommendSort: 1,
+              };
+          });
+        } else {
+          hotupdata(this.hotInfo).then((res) => {
+              this.$message.success("更新成功");
+              this.close();
+              this.hotInfo = {
+                recommendModule: "",
+                recommendType: "",
+                recommendTitle: "",
+                recommendPicture: "",
+                recommendContent: "",
+                recommendPublisher: "",
+                publishTime: "",
+                recommendSort: 1,
+              };
+          });
+        }
       } else {
-        hotupdata(this.hotInfo).then(res => {
-          if (res != '') {
-            this.$message.success('更新成功')
-            this.close()
-            this.hotInfo = {
-              recommendModule: '',
-              recommendType: '',
-              recommendTitle: '',
-              recommendPicture: '',
-              recommendContent: '',
-              recommendPublisher: '',
-              publishTime: '',
-              recommendSort: 1
-            }
-          }
-        })
+        this.$message.error("请先完整填写信息");
       }
     },
     dealAry(str) {
-      const Ary = []
-      const strAry = str.split(';')
+      const Ary = [];
+      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],
+        });
       }
-      return Ary
+      return Ary;
     },
     close() {
-      this.$emit('close')
+      this.$emit("close");
     },
     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.hotInfo.recommendPicture = reader.result
-          console.log(this.hotInfo.recommendPicture)
+          clearInterval(timer);
+          this.hotInfo.recommendPicture = reader.result;
+          console.log(this.hotInfo.recommendPicture);
         }
-      }, 300)
+      }, 300);
     },
     handleChange(file, fileList) {
-      console.log(fileList, file)
-      this.fileList = fileList.slice(-1)
+      console.log(fileList, file);
+      this.fileList = fileList.slice(-1);
     },
     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) {
+            windhotInfoow.URL.revokeObjectURL(img.src); // 清除释放
+          };
+          const src = window.URL.createObjectURL(blob);
+          img.src = src;
           // document.getElementById("container1").appendChild(img);
           // ====为了在页面显示图片，可以删除====
         }
-      }
-      xhr.send()
-    }
-  }
-}
+      };
+      xhr.send();
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/move/hotAndNews.vue b/src/views/move/hotAndNews.vue
index ba86219..488c26d 100644
--- a/src/views/move/hotAndNews.vue
+++ b/src/views/move/hotAndNews.vue
@@ -57,7 +57,7 @@
           type="danger"
           icon="el-icon-delete-solid"
           class="btnItem bgred"
-          @click=" BatchDelete"
+          @click="BatchDelete"
         >
           删除
         </el-button>
@@ -76,14 +76,20 @@
       style="width: 100%"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column prop="index" label="序号" width="60"/>
+      <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="类型" />
-      <el-table-column prop="recommendTypeName" label="标题" />
+      <el-table-column prop="recommendTypeName" label="类型" />
+      <el-table-column prop="recommendTitle" label="标题" />
       <el-table-column prop="recommendPicture" label="图片">
         <template slot-scope="scope">
-          <img v-if="scope.row.recommendPicture!=''" :src="scope.row.recommendPicture" width="100" height="100px" alt="">
+          <img
+            v-if="scope.row.recommendPicture != ''"
+            :src= "scope.row.recommendPicture"
+            width="100"
+            height="100px"
+            alt=""
+          />
         </template>
       </el-table-column>
       <el-table-column prop="recommendContent" label="内容" />
@@ -95,141 +101,179 @@
           <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>
       </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"
+    />
     <!-- 新增弹框 -->
-    <hotand-news-dialog :is-show-info="isShowAdd" :title="title" :data-info="rowInfo" @close="closeAdd" />
+    <hotand-news-dialog
+      :is-show-info="isShowAdd"
+      :title="title"
+      :data-info="rowInfo"
+      @close="closeAdd"
+    />
   </div>
 </template>
 
 <script>
 // 组件
-import GroupPage from '../../components/mycomponent/groupPage.vue'
-import HotandNewsDialog from '../../components/mycomponent/dialog/move/hotandNewsDialog.vue'
+import GroupPage from "../../components/mycomponent/groupPage.vue";
+import HotandNewsDialog from "../../components/mycomponent/dialog/move/hotandNewsDialog.vue";
 // 逻辑
-import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
-import { listMixin } from '../../utils/myUtils/mixins/listPage'
-import { listPage, batchDelete, bdelete } from '../../api/move/hotAndNews'
-import { list } from '../../api/move/bannerConfig'
-export default { // 加入分页逻辑
+import { tableRowClassName } from "../../utils/myUtils/changeTableTr";
+import { listMixin } from "../../utils/myUtils/mixins/listPage";
+import { listPage, batchDelete, bdelete } from "../../api/move/hotAndNews";
+import { list } from "../../api/move/bannerConfig";
+export default {
+  // 加入分页逻辑
   components: {
     HotandNewsDialog,
-    GroupPage
+    GroupPage,
   },
   mixins: [listMixin],
   data() {
     return {
-      title: '',
+      title: "",
       isShowAdd: false, // 显示新增功能
       selectInfo: {
-        recommendType: '',
-        recommendTitle: ''
+        recommendType: "",
+        recommendTitle: "",
       },
-      rowInfo: '',
-      typeList: []
-    }
+      rowInfo: "",
+      typeList: [],
+    };
   },
   mounted() {
     list().then((res) => {
-      const str2 = res[27].detail
-      this.typeList = this.dealAry(str2)
-    })
+      const str2 = res[27].detail;
+      this.typeList = this.dealAry(str2);
+    });
   },
   methods: {
     tableRowClassName: tableRowClassName,
     dealAry(str) {
-      const Ary = []
-      const strAry = str.split(';')
+      const Ary = [];
+      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],
+        });
       }
-      return Ary
+      return Ary;
     },
     closeAdd() {
-      this.isShowAdd = false
-      this.refresh()
+      this.isShowAdd = false;
+      this.refresh();
     },
     addCategory() {
-      this.isShowAdd = true
-      this.title = '新增'
-      this.rowInfo = ''
+      this.isShowAdd = true;
+      this.title = "新增";
+      this.rowInfo = "";
     },
     updata(row) {
-      this.isShowAdd = true
-      this.title = '编辑'
-      this.rowInfo = row
+      this.isShowAdd = true;
+      this.title = "编辑";
+      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;
+          });
+          res.rows = res.rows.map((item, index) =>{
+            return{
+              ...item,
+              recommendPicture: "http://111.198.10.15:21403/static/" + item.recommendPicture,
+              publishTime:item.publishTime.split(' ')[0]
+            }
+          })
+          this.tableData = res;
+        }
+      );
     },
     reset() {
       this.selectInfo = {
-        recommendType: '',
-        recommendTitle: ''
-      }
-      listPage(`limit=${10}&offset=${1}`, this.selectInfo).then(res => {
-      // 得到相关数据
+        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
-      })
+          item.index = index + 1 + (1 - 1) * 10;
+        });
+        res.rows = res.rows.map((item, index) =>{
+            return{
+              ...item,
+              recommendPicture: "http://111.198.10.15:21403/static/" + item.recommendPicture,
+              publishTime:item.publishTime.split(' ')[0]
+            }
+          })
+        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.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) => {
+          // 删除成功跟新数据
+            this.$message({
+              message: "删除成功",
+              type: "success",
+            });
+            this.refresh();
+        });
+      });
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -265,7 +309,6 @@
         // width: 84px;
         font-size: 16px;
       }
-
     }
   }
   .footer {
diff --git a/src/views/order/orderShop.vue b/src/views/order/orderShop.vue
index a38e95f..ab6f457 100644
--- a/src/views/order/orderShop.vue
+++ b/src/views/order/orderShop.vue
@@ -175,13 +175,13 @@
           <el-table-column prop="productQuantity" label="产品数量" width="200px">
             <template slot-scope="{row,$index}">
               <span v-if="!showEdit[$index]">{{ row.productQuantity }}</span>
-              <el-input v-if="showEdit[$index]" v-model="addInfo.productList.productQuantity" placeholder="请输入产品数量" />
+              <el-input v-if="showEdit[$index]" v-model.number="addInfo.productList.productQuantity" placeholder="请输入产品数量"  onKeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode || event.which))) || event.which === 8" min="1"/>
             </template>
           </el-table-column>
           <el-table-column prop="productPrice" label="产品单价" width="200px">
             <template slot-scope="{row,$index}">
               <span v-if="!showEdit[$index]">{{ row.productPrice }}</span>
-              <el-input v-if="showEdit[$index]" v-model="addInfo.productList.productPrice" placeholder="请输入产品单价" />
+              <el-input v-if="showEdit[$index]" v-model.number="addInfo.productList.productPrice" placeholder="请输入产品单价" onKeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode || event.which))) || event.which === 8" min="1" />
             </template>
           </el-table-column>
           <el-table-column header-align="center" align="center" width="200" label="操作">
@@ -348,7 +348,8 @@
     },
     // 添加项目新需求
     handleAddBtn() {
-      const obj = {
+      if (this.showEdit[this.addInfo.productList.length - 1] === false || this.addInfo.productList.length === 0){
+        const obj = {
         brandName: '',
         categoryIds: '',
         productCode: '',
@@ -363,6 +364,9 @@
       this.productCode = ""
       this.productQuantity1 = ""
       this.productPrice1 = ""
+      }else{
+        this.$message.warning('请先保存上一次采购需求')
+      }
     },
     addTableDataClick() {
       const obj = {};
@@ -436,7 +440,16 @@
         receiver &&
         receiverPhone
       ) {
-        return true;
+        let reg = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/;
+        if(reg.test(userPhone)&& reg.test(receiverPhone)){
+          return true
+        }else{
+          this.$message({
+          message: "手机号格式不正确",
+          type: "error",
+        });
+          return false
+        }
       } else {
         this.$message({
           message: "请先填写完整订单信息",
@@ -449,8 +462,9 @@
     submit(index, row) {
       // 发送请求，隐藏输入框
       const { productCode, brandName, categoryIds, addInfo: { productList: { productQuantity, productPrice } } } = this
-      if (categoryIds && brandName && productQuantity && productPrice) {
-        row.productCode = this.addInfo.productList.productCode
+      if (categoryIds && brandName) {
+        if( productQuantity > 0 && productPrice > 0){
+          row.productCode = this.addInfo.productList.productCode
         row.brandName = this.brandName
         row.categoryIds = this.categoryIds
         row.productQuantity = this.addInfo.productList.productQuantity
@@ -474,6 +488,9 @@
         this.addInfo.productList.productCode = ''
         this.addInfo.productList.productQuantity = ''
         this.addInfo.productList.productPrice = ''
+        }else {
+          this.$message.error('单价或数量需大于等于1')
+        }
       } else {
         this.$message({
           message: "请先完整选择或填写信息",