diff --git a/src/api/move/message.js b/src/api/move/message.js
index 57411dd..297d8da 100644
--- a/src/api/move/message.js
+++ b/src/api/move/message.js
@@ -12,4 +12,7 @@
 const add = (data) => {
   return instance.post('/appPushInfo/add', data)
 }
+const update = (data) => {
+  return instance.post('/appPushInfo/update', data)
+}
 export { listPage, add }

diff --git a/src/api/move/message.js b/src/api/move/message.js
index 57411dd..297d8da 100644
--- a/src/api/move/message.js
+++ b/src/api/move/message.js
@@ -12,4 +12,7 @@
 const add = (data) => {
   return instance.post('/appPushInfo/add', data)
 }
+const update = (data) => {
+  return instance.post('/appPushInfo/update', data)
+}
 export { listPage, add }
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index 7b2ef09..754c1dd 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -28,10 +28,10 @@
                 placeholder="请选择"
                 style="width: 100%"
               >
-                <el-option
+                <!-- <el-option
                   label="无"
                   value=""
-                />
+                /> -->
                 <el-option
                   v-for="item in categoryList"
                   :key="item.categoryCode"

diff --git a/src/api/move/message.js b/src/api/move/message.js
index 57411dd..297d8da 100644
--- a/src/api/move/message.js
+++ b/src/api/move/message.js
@@ -12,4 +12,7 @@
 const add = (data) => {
   return instance.post('/appPushInfo/add', data)
 }
+const update = (data) => {
+  return instance.post('/appPushInfo/update', data)
+}
 export { listPage, add }
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index 7b2ef09..754c1dd 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -28,10 +28,10 @@
                 placeholder="请选择"
                 style="width: 100%"
               >
-                <el-option
+                <!-- <el-option
                   label="无"
                   value=""
-                />
+                /> -->
                 <el-option
                   v-for="item in categoryList"
                   :key="item.categoryCode"
diff --git a/src/components/mycomponent/dialog/move/massageAddDialog.vue b/src/components/mycomponent/dialog/move/massageAddDialog.vue
index 4711d81..3cc8855 100644
--- a/src/components/mycomponent/dialog/move/massageAddDialog.vue
+++ b/src/components/mycomponent/dialog/move/massageAddDialog.vue
@@ -19,6 +19,7 @@
             width="300px"
             class="inputWidth"
             style="justify-content: space-between"
+            :disabled="!(title === '消息推送新增')"
           />
         </div>
         <div class="inputBox">
@@ -34,6 +35,7 @@
               type="textarea"
               :rows="3"
               placeholder="请输入内容"
+              :disabled="!(title === '消息推送新增')"
             />
           </input-vue>
         </div>
@@ -45,26 +47,24 @@
             width="300px"
             class="inputWidth"
             style="justify-content: space-between; align-items: baseline"
+            :disabled="!(title === '消息推送新增')"
           >
             <div style="width: 100%; padding-left: 58px">
               <div style="margin-top: 10px">
-                <el-radio
-                  v-model="massageInfo.userFlag"
-                  :label="1"
-                >
+                <el-radio v-model="massageInfo.userFlag" :label="1" :disabled="!(title === '消息推送新增')">
                   全部用户
                 </el-radio>
               </div>
 
               <div style="margin-top: 10px">
-                <el-radio
-                  v-model="massageInfo.userFlag"
-                  :label="0"
-                >
+                <el-radio v-model="massageInfo.userFlag" :label="0" :disabled="!(title === '消息推送新增')">
                   标签用户
                 </el-radio>
-                <div v-if="massageInfo.userFlag==0" style="height: 80px; overflow: auto ;margin-top: 10px">
-                  <el-checkbox-group v-model="checkList" :max="5">
+                <div
+                  v-if="massageInfo.userFlag === 0"
+                  style="height: 80px; overflow: auto; margin-top: 10px"
+                >
+                  <el-checkbox-group v-model="checkList" :max="5" :disabled="!(title === '消息推送新增')"> 
                     <el-checkbox
                       v-for="item in ProvinceList"
                       :key="item.id"
@@ -77,85 +77,115 @@
           </input-vue>
         </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>
+      <div class="btnBox" v-if="title === '消息推送新增'">
+        <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 { add } from '../../../../api/move/message'
-import { order_area } from '../../../../api/order/order'
+import InputVue from "../../input/inputVue.vue";
+import DialogHeader from "../dialogHeader.vue";
+import RedStar from "../../redStar.vue";
+import InputNumber from "../../input/inputNumber.vue";
+import { add } from "../../../../api/move/message";
+import { order_area } from "../../../../api/order/order";
 export default {
   components: {
     DialogHeader,
     RedStar,
     InputVue,
-    InputNumber
+    InputNumber,
   },
   props: {
     dataInfo: {},
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: true,
     },
-    title: ''
+    title: "",
   },
   data() {
     return {
       checkList: [],
       ProvinceList: [],
       massageInfo: {
-        messageTitle: '',
-        messageContent: '',
+        messageTitle: "",
+        messageContent: "",
         userFlag: 1,
-        provinceList: []
-      }
-    }
+        provinceList: [],
+      },
+    };
   },
   mounted() {
-    order_area('pid=0').then((res) => {
-      console.log(res)
-      this.ProvinceList = res
-    })
+    order_area("pid=0").then((res) => {
+      this.ProvinceList = res;
+    });
+    console.log(this.title)
   },
   methods: {
     close() {
-      this.$emit('close')
+      this.$emit("close");
+      this.massageInfo = {
+        messageTitle: "",
+        messageContent: "",
+        userFlag: 1,
+        provinceList: [],
+      };
+      this.checkList = [];
     },
     save() {
-      if (this.title == '消息推送新增') {
-        const temp = { ...this.massageInfo }
+      if (this.valiate()) {
+        const temp = { ...this.massageInfo };
         if (this.massageInfo.userFlag == 0) {
-          temp.provinceList = this.checkList
+          temp.provinceList = this.checkList;
         }
         add(temp).then((res) => {
-          if (res != '') {
-            this.$message.success('新增成功')
-            this.close()
-            this.massageInfo = {
-              messageTitle: '',
-              messageContent: '',
-              userFlag: 1,
-              provinceList: []
-            }
-          }
-        })
+          this.$message.success("新增成功");
+          this.close();
+          this.massageInfo = {
+            messageTitle: "",
+            messageContent: "",
+            userFlag: 1,
+            provinceList: [],
+          };
+        });
       }
-    }
-
-  }
-}
+    },
+    valiate() {
+      const {
+        massageInfo: { messageTitle, messageContent, userFlag, provinceList },
+      } = this;
+      if (messageTitle && messageContent) {
+        if (userFlag === 1) {
+          return true;
+        } else if (userFlag === 0 && this.checkList.length > 0) {
+          return true;
+        } else {
+          this.$message.error("请先完选择城市信息");
+          return false;
+        }
+      } else {
+        this.$message.error("请先完整填写信息");
+        return false;
+      }
+    },
+    init(row) {
+      this.massageInfo.messageTitle = row.messageTitle;
+      this.massageInfo.messageContent = row.messageContent;
+      if (row.targetUsers.split()[0] === "全部用户") {
+        this.massageInfo.userFlag = 1;
+      } else {
+        this.massageInfo.userFlag = 0;
+        this.checkList = this.ProvinceList.filter((item) =>
+          row.targetUsers.split(",").some((check) => check === item.name)
+        ).map((item) => item.name);
+      }
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>

diff --git a/src/api/move/message.js b/src/api/move/message.js
index 57411dd..297d8da 100644
--- a/src/api/move/message.js
+++ b/src/api/move/message.js
@@ -12,4 +12,7 @@
 const add = (data) => {
   return instance.post('/appPushInfo/add', data)
 }
+const update = (data) => {
+  return instance.post('/appPushInfo/update', data)
+}
 export { listPage, add }
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index 7b2ef09..754c1dd 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -28,10 +28,10 @@
                 placeholder="请选择"
                 style="width: 100%"
               >
-                <el-option
+                <!-- <el-option
                   label="无"
                   value=""
-                />
+                /> -->
                 <el-option
                   v-for="item in categoryList"
                   :key="item.categoryCode"
diff --git a/src/components/mycomponent/dialog/move/massageAddDialog.vue b/src/components/mycomponent/dialog/move/massageAddDialog.vue
index 4711d81..3cc8855 100644
--- a/src/components/mycomponent/dialog/move/massageAddDialog.vue
+++ b/src/components/mycomponent/dialog/move/massageAddDialog.vue
@@ -19,6 +19,7 @@
             width="300px"
             class="inputWidth"
             style="justify-content: space-between"
+            :disabled="!(title === '消息推送新增')"
           />
         </div>
         <div class="inputBox">
@@ -34,6 +35,7 @@
               type="textarea"
               :rows="3"
               placeholder="请输入内容"
+              :disabled="!(title === '消息推送新增')"
             />
           </input-vue>
         </div>
@@ -45,26 +47,24 @@
             width="300px"
             class="inputWidth"
             style="justify-content: space-between; align-items: baseline"
+            :disabled="!(title === '消息推送新增')"
           >
             <div style="width: 100%; padding-left: 58px">
               <div style="margin-top: 10px">
-                <el-radio
-                  v-model="massageInfo.userFlag"
-                  :label="1"
-                >
+                <el-radio v-model="massageInfo.userFlag" :label="1" :disabled="!(title === '消息推送新增')">
                   全部用户
                 </el-radio>
               </div>
 
               <div style="margin-top: 10px">
-                <el-radio
-                  v-model="massageInfo.userFlag"
-                  :label="0"
-                >
+                <el-radio v-model="massageInfo.userFlag" :label="0" :disabled="!(title === '消息推送新增')">
                   标签用户
                 </el-radio>
-                <div v-if="massageInfo.userFlag==0" style="height: 80px; overflow: auto ;margin-top: 10px">
-                  <el-checkbox-group v-model="checkList" :max="5">
+                <div
+                  v-if="massageInfo.userFlag === 0"
+                  style="height: 80px; overflow: auto; margin-top: 10px"
+                >
+                  <el-checkbox-group v-model="checkList" :max="5" :disabled="!(title === '消息推送新增')"> 
                     <el-checkbox
                       v-for="item in ProvinceList"
                       :key="item.id"
@@ -77,85 +77,115 @@
           </input-vue>
         </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>
+      <div class="btnBox" v-if="title === '消息推送新增'">
+        <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 { add } from '../../../../api/move/message'
-import { order_area } from '../../../../api/order/order'
+import InputVue from "../../input/inputVue.vue";
+import DialogHeader from "../dialogHeader.vue";
+import RedStar from "../../redStar.vue";
+import InputNumber from "../../input/inputNumber.vue";
+import { add } from "../../../../api/move/message";
+import { order_area } from "../../../../api/order/order";
 export default {
   components: {
     DialogHeader,
     RedStar,
     InputVue,
-    InputNumber
+    InputNumber,
   },
   props: {
     dataInfo: {},
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: true,
     },
-    title: ''
+    title: "",
   },
   data() {
     return {
       checkList: [],
       ProvinceList: [],
       massageInfo: {
-        messageTitle: '',
-        messageContent: '',
+        messageTitle: "",
+        messageContent: "",
         userFlag: 1,
-        provinceList: []
-      }
-    }
+        provinceList: [],
+      },
+    };
   },
   mounted() {
-    order_area('pid=0').then((res) => {
-      console.log(res)
-      this.ProvinceList = res
-    })
+    order_area("pid=0").then((res) => {
+      this.ProvinceList = res;
+    });
+    console.log(this.title)
   },
   methods: {
     close() {
-      this.$emit('close')
+      this.$emit("close");
+      this.massageInfo = {
+        messageTitle: "",
+        messageContent: "",
+        userFlag: 1,
+        provinceList: [],
+      };
+      this.checkList = [];
     },
     save() {
-      if (this.title == '消息推送新增') {
-        const temp = { ...this.massageInfo }
+      if (this.valiate()) {
+        const temp = { ...this.massageInfo };
         if (this.massageInfo.userFlag == 0) {
-          temp.provinceList = this.checkList
+          temp.provinceList = this.checkList;
         }
         add(temp).then((res) => {
-          if (res != '') {
-            this.$message.success('新增成功')
-            this.close()
-            this.massageInfo = {
-              messageTitle: '',
-              messageContent: '',
-              userFlag: 1,
-              provinceList: []
-            }
-          }
-        })
+          this.$message.success("新增成功");
+          this.close();
+          this.massageInfo = {
+            messageTitle: "",
+            messageContent: "",
+            userFlag: 1,
+            provinceList: [],
+          };
+        });
       }
-    }
-
-  }
-}
+    },
+    valiate() {
+      const {
+        massageInfo: { messageTitle, messageContent, userFlag, provinceList },
+      } = this;
+      if (messageTitle && messageContent) {
+        if (userFlag === 1) {
+          return true;
+        } else if (userFlag === 0 && this.checkList.length > 0) {
+          return true;
+        } else {
+          this.$message.error("请先完选择城市信息");
+          return false;
+        }
+      } else {
+        this.$message.error("请先完整填写信息");
+        return false;
+      }
+    },
+    init(row) {
+      this.massageInfo.messageTitle = row.messageTitle;
+      this.massageInfo.messageContent = row.messageContent;
+      if (row.targetUsers.split()[0] === "全部用户") {
+        this.massageInfo.userFlag = 1;
+      } else {
+        this.massageInfo.userFlag = 0;
+        this.checkList = this.ProvinceList.filter((item) =>
+          row.targetUsers.split(",").some((check) => check === item.name)
+        ).map((item) => item.name);
+      }
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/components/mycomponent/dialog/orderDetailDialog.vue b/src/components/mycomponent/dialog/orderDetailDialog.vue
index 23ccee3..49793af 100644
--- a/src/components/mycomponent/dialog/orderDetailDialog.vue
+++ b/src/components/mycomponent/dialog/orderDetailDialog.vue
@@ -1,20 +1,23 @@
 <!--订单详情弹窗-->
 <template>
-  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
+  <el-dialog
+    title="详情"
+    width="920px"
+    v-if="isShowInfo"
+    :visible.sync="isShowInfo"
+    append-to-body
+    @close="close"
+  >
     <div class="contanier">
       <div class="box">
         <div class="item">
-          <div class="title">
-            下单人
-          </div>
+          <div class="title">下单人</div>
           <div class="content">
-            {{ dataInfo ? dataInfo.userName : '' }}
+            {{ dataInfo ? dataInfo.userName : "" }}
           </div>
         </div>
         <div class="item">
-          <div class="title">
-            下单人角色
-          </div>
+          <div class="title">下单人角色</div>
           <div class="content">
             {{ dataInfo.userRole }}
           </div>
@@ -22,17 +25,13 @@
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">
-            联系方式
-          </div>
+          <div class="title">联系方式</div>
           <div class="content">
             {{ dataInfo.userPhone }}
           </div>
         </div>
         <div class="item">
-          <div class="title">
-            订单来源
-          </div>
+          <div class="title">订单来源</div>
           <div class="content">
             {{ dataInfo.orderSource }}
           </div>
@@ -40,17 +39,13 @@
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">
-            签订日期
-          </div>
+          <div class="title">签订日期</div>
           <div class="content">
             {{ dataInfo.signDate }}
           </div>
         </div>
         <div class="item">
-          <div class="title">
-            交付日期
-          </div>
+          <div class="title">交付日期</div>
           <div class="content">
             {{ dataInfo.deliveryDate }}
           </div>
@@ -58,17 +53,13 @@
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">
-            交付地址-省
-          </div>
+          <div class="title">交付地址-省</div>
           <div class="content">
             {{ dataInfo.deliveryProvince }}
           </div>
         </div>
         <div class="item">
-          <div class="title">
-            交付地址-市
-          </div>
+          <div class="title">交付地址-市</div>
           <div class="content">
             {{ dataInfo.deliveryCity }}
           </div>
@@ -76,17 +67,13 @@
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">
-            交付地址-区
-          </div>
+          <div class="title">交付地址-区</div>
           <div class="content">
             {{ dataInfo.deliveryArea }}
           </div>
         </div>
         <div class="item">
-          <div class="title">
-            交付地址-详细地址
-          </div>
+          <div class="title">交付地址-详细地址</div>
           <div class="content">
             {{ dataInfo.deliveryAddress }}
           </div>
@@ -94,17 +81,13 @@
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">
-            收货人
-          </div>
+          <div class="title">收货人</div>
           <div class="content">
             {{ dataInfo.receiver }}
           </div>
         </div>
         <div class="item">
-          <div class="title">
-            收货人联系方式
-          </div>
+          <div class="title">收货人联系方式</div>
           <div class="content">
             {{ dataInfo.receiverPhone }}
           </div>
@@ -112,9 +95,7 @@
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">
-            备注
-          </div>
+          <div class="title">备注</div>
           <div class="content">
             {{ dataInfo.remark }}
           </div>
@@ -122,9 +103,7 @@
       </div>
     </div>
     <div class="tab-container">
-      <div class="tab-title">
-        产品需求清单
-      </div>
+      <div class="tab-title">产品需求清单</div>
       <el-table
         ref="multipleTable"
         :data="tableData"
@@ -138,8 +117,10 @@
         style="width: 100%"
       >
         <el-table-column type="index" label="序号" />
-        <el-table-column prop="productCode" label="产品型号" />
         <el-table-column prop="productName" label="产品名称" />
+        <el-table-column prop="branchName" label="产品品牌" />
+        <el-table-column prop="categoryName" label="产品品类" />
+        <el-table-column prop="productCode" label="产品型号" />
         <el-table-column prop="productQuantity" label="产品数量" />
         <el-table-column prop="productPrice" label="产品单价" />
       </el-table>
@@ -148,32 +129,37 @@
 </template>
 
 <script>
-import { tableRowClassName } from '../../../utils/myUtils/changeTableTr'
-import { OrderDetail } from '../../../api/order/order'
-import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog' // 抽离porp 和 methods
+import { tableRowClassName } from "../../../utils/myUtils/changeTableTr";
+import { OrderDetail } from "../../../api/order/order";
+import { infoDialog } from "../../../utils/myUtils/mixins/infoDialog"; // 抽离porp 和 methods
 export default {
   mixins: [infoDialog],
   data() {
     return {
-      tableData: []
-    }
+      tableData: [],
+    };
   },
-  mounted() {
-    const id = this.dataInfo.id
-    if (!this.dataInfo.id) return
-    OrderDetail({ id: id }).then(res => {
-      console.log(res, '----')
-      this.tableData = res.productList
-    })
+  watch: {
+    dataInfo: {
+      deep: true,
+      immediate: true,
+      handler(newVal) {
+        if(newVal.id){
+          OrderDetail({ id: newVal.id }).then((res) => {
+          this.tableData = res.productList;
+        });
+        }
+      },
+    },
   },
   methods: {
-    tableRowClassName: tableRowClassName
-  }
-}
+    tableRowClassName: tableRowClassName,
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-@import '../../../assets/css/infoDialog.scss';
+@import "../../../assets/css/infoDialog.scss";
 
 .tab-container {
   margin-top: 20px;

diff --git a/src/api/move/message.js b/src/api/move/message.js
index 57411dd..297d8da 100644
--- a/src/api/move/message.js
+++ b/src/api/move/message.js
@@ -12,4 +12,7 @@
 const add = (data) => {
   return instance.post('/appPushInfo/add', data)
 }
+const update = (data) => {
+  return instance.post('/appPushInfo/update', data)
+}
 export { listPage, add }
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index 7b2ef09..754c1dd 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -28,10 +28,10 @@
                 placeholder="请选择"
                 style="width: 100%"
               >
-                <el-option
+                <!-- <el-option
                   label="无"
                   value=""
-                />
+                /> -->
                 <el-option
                   v-for="item in categoryList"
                   :key="item.categoryCode"
diff --git a/src/components/mycomponent/dialog/move/massageAddDialog.vue b/src/components/mycomponent/dialog/move/massageAddDialog.vue
index 4711d81..3cc8855 100644
--- a/src/components/mycomponent/dialog/move/massageAddDialog.vue
+++ b/src/components/mycomponent/dialog/move/massageAddDialog.vue
@@ -19,6 +19,7 @@
             width="300px"
             class="inputWidth"
             style="justify-content: space-between"
+            :disabled="!(title === '消息推送新增')"
           />
         </div>
         <div class="inputBox">
@@ -34,6 +35,7 @@
               type="textarea"
               :rows="3"
               placeholder="请输入内容"
+              :disabled="!(title === '消息推送新增')"
             />
           </input-vue>
         </div>
@@ -45,26 +47,24 @@
             width="300px"
             class="inputWidth"
             style="justify-content: space-between; align-items: baseline"
+            :disabled="!(title === '消息推送新增')"
           >
             <div style="width: 100%; padding-left: 58px">
               <div style="margin-top: 10px">
-                <el-radio
-                  v-model="massageInfo.userFlag"
-                  :label="1"
-                >
+                <el-radio v-model="massageInfo.userFlag" :label="1" :disabled="!(title === '消息推送新增')">
                   全部用户
                 </el-radio>
               </div>
 
               <div style="margin-top: 10px">
-                <el-radio
-                  v-model="massageInfo.userFlag"
-                  :label="0"
-                >
+                <el-radio v-model="massageInfo.userFlag" :label="0" :disabled="!(title === '消息推送新增')">
                   标签用户
                 </el-radio>
-                <div v-if="massageInfo.userFlag==0" style="height: 80px; overflow: auto ;margin-top: 10px">
-                  <el-checkbox-group v-model="checkList" :max="5">
+                <div
+                  v-if="massageInfo.userFlag === 0"
+                  style="height: 80px; overflow: auto; margin-top: 10px"
+                >
+                  <el-checkbox-group v-model="checkList" :max="5" :disabled="!(title === '消息推送新增')"> 
                     <el-checkbox
                       v-for="item in ProvinceList"
                       :key="item.id"
@@ -77,85 +77,115 @@
           </input-vue>
         </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>
+      <div class="btnBox" v-if="title === '消息推送新增'">
+        <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 { add } from '../../../../api/move/message'
-import { order_area } from '../../../../api/order/order'
+import InputVue from "../../input/inputVue.vue";
+import DialogHeader from "../dialogHeader.vue";
+import RedStar from "../../redStar.vue";
+import InputNumber from "../../input/inputNumber.vue";
+import { add } from "../../../../api/move/message";
+import { order_area } from "../../../../api/order/order";
 export default {
   components: {
     DialogHeader,
     RedStar,
     InputVue,
-    InputNumber
+    InputNumber,
   },
   props: {
     dataInfo: {},
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: true,
     },
-    title: ''
+    title: "",
   },
   data() {
     return {
       checkList: [],
       ProvinceList: [],
       massageInfo: {
-        messageTitle: '',
-        messageContent: '',
+        messageTitle: "",
+        messageContent: "",
         userFlag: 1,
-        provinceList: []
-      }
-    }
+        provinceList: [],
+      },
+    };
   },
   mounted() {
-    order_area('pid=0').then((res) => {
-      console.log(res)
-      this.ProvinceList = res
-    })
+    order_area("pid=0").then((res) => {
+      this.ProvinceList = res;
+    });
+    console.log(this.title)
   },
   methods: {
     close() {
-      this.$emit('close')
+      this.$emit("close");
+      this.massageInfo = {
+        messageTitle: "",
+        messageContent: "",
+        userFlag: 1,
+        provinceList: [],
+      };
+      this.checkList = [];
     },
     save() {
-      if (this.title == '消息推送新增') {
-        const temp = { ...this.massageInfo }
+      if (this.valiate()) {
+        const temp = { ...this.massageInfo };
         if (this.massageInfo.userFlag == 0) {
-          temp.provinceList = this.checkList
+          temp.provinceList = this.checkList;
         }
         add(temp).then((res) => {
-          if (res != '') {
-            this.$message.success('新增成功')
-            this.close()
-            this.massageInfo = {
-              messageTitle: '',
-              messageContent: '',
-              userFlag: 1,
-              provinceList: []
-            }
-          }
-        })
+          this.$message.success("新增成功");
+          this.close();
+          this.massageInfo = {
+            messageTitle: "",
+            messageContent: "",
+            userFlag: 1,
+            provinceList: [],
+          };
+        });
       }
-    }
-
-  }
-}
+    },
+    valiate() {
+      const {
+        massageInfo: { messageTitle, messageContent, userFlag, provinceList },
+      } = this;
+      if (messageTitle && messageContent) {
+        if (userFlag === 1) {
+          return true;
+        } else if (userFlag === 0 && this.checkList.length > 0) {
+          return true;
+        } else {
+          this.$message.error("请先完选择城市信息");
+          return false;
+        }
+      } else {
+        this.$message.error("请先完整填写信息");
+        return false;
+      }
+    },
+    init(row) {
+      this.massageInfo.messageTitle = row.messageTitle;
+      this.massageInfo.messageContent = row.messageContent;
+      if (row.targetUsers.split()[0] === "全部用户") {
+        this.massageInfo.userFlag = 1;
+      } else {
+        this.massageInfo.userFlag = 0;
+        this.checkList = this.ProvinceList.filter((item) =>
+          row.targetUsers.split(",").some((check) => check === item.name)
+        ).map((item) => item.name);
+      }
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/components/mycomponent/dialog/orderDetailDialog.vue b/src/components/mycomponent/dialog/orderDetailDialog.vue
index 23ccee3..49793af 100644
--- a/src/components/mycomponent/dialog/orderDetailDialog.vue
+++ b/src/components/mycomponent/dialog/orderDetailDialog.vue
@@ -1,20 +1,23 @@
 <!--订单详情弹窗-->
 <template>
-  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
+  <el-dialog
+    title="详情"
+    width="920px"
+    v-if="isShowInfo"
+    :visible.sync="isShowInfo"
+    append-to-body
+    @close="close"
+  >
     <div class="contanier">
       <div class="box">
         <div class="item">
-          <div class="title">
-            下单人
-          </div>
+          <div class="title">下单人</div>
           <div class="content">
-            {{ dataInfo ? dataInfo.userName : '' }}
+            {{ dataInfo ? dataInfo.userName : "" }}
           </div>
         </div>
         <div class="item">
-          <div class="title">
-            下单人角色
-          </div>
+          <div class="title">下单人角色</div>
           <div class="content">
             {{ dataInfo.userRole }}
           </div>
@@ -22,17 +25,13 @@
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">
-            联系方式
-          </div>
+          <div class="title">联系方式</div>
           <div class="content">
             {{ dataInfo.userPhone }}
           </div>
         </div>
         <div class="item">
-          <div class="title">
-            订单来源
-          </div>
+          <div class="title">订单来源</div>
           <div class="content">
             {{ dataInfo.orderSource }}
           </div>
@@ -40,17 +39,13 @@
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">
-            签订日期
-          </div>
+          <div class="title">签订日期</div>
           <div class="content">
             {{ dataInfo.signDate }}
           </div>
         </div>
         <div class="item">
-          <div class="title">
-            交付日期
-          </div>
+          <div class="title">交付日期</div>
           <div class="content">
             {{ dataInfo.deliveryDate }}
           </div>
@@ -58,17 +53,13 @@
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">
-            交付地址-省
-          </div>
+          <div class="title">交付地址-省</div>
           <div class="content">
             {{ dataInfo.deliveryProvince }}
           </div>
         </div>
         <div class="item">
-          <div class="title">
-            交付地址-市
-          </div>
+          <div class="title">交付地址-市</div>
           <div class="content">
             {{ dataInfo.deliveryCity }}
           </div>
@@ -76,17 +67,13 @@
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">
-            交付地址-区
-          </div>
+          <div class="title">交付地址-区</div>
           <div class="content">
             {{ dataInfo.deliveryArea }}
           </div>
         </div>
         <div class="item">
-          <div class="title">
-            交付地址-详细地址
-          </div>
+          <div class="title">交付地址-详细地址</div>
           <div class="content">
             {{ dataInfo.deliveryAddress }}
           </div>
@@ -94,17 +81,13 @@
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">
-            收货人
-          </div>
+          <div class="title">收货人</div>
           <div class="content">
             {{ dataInfo.receiver }}
           </div>
         </div>
         <div class="item">
-          <div class="title">
-            收货人联系方式
-          </div>
+          <div class="title">收货人联系方式</div>
           <div class="content">
             {{ dataInfo.receiverPhone }}
           </div>
@@ -112,9 +95,7 @@
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">
-            备注
-          </div>
+          <div class="title">备注</div>
           <div class="content">
             {{ dataInfo.remark }}
           </div>
@@ -122,9 +103,7 @@
       </div>
     </div>
     <div class="tab-container">
-      <div class="tab-title">
-        产品需求清单
-      </div>
+      <div class="tab-title">产品需求清单</div>
       <el-table
         ref="multipleTable"
         :data="tableData"
@@ -138,8 +117,10 @@
         style="width: 100%"
       >
         <el-table-column type="index" label="序号" />
-        <el-table-column prop="productCode" label="产品型号" />
         <el-table-column prop="productName" label="产品名称" />
+        <el-table-column prop="branchName" label="产品品牌" />
+        <el-table-column prop="categoryName" label="产品品类" />
+        <el-table-column prop="productCode" label="产品型号" />
         <el-table-column prop="productQuantity" label="产品数量" />
         <el-table-column prop="productPrice" label="产品单价" />
       </el-table>
@@ -148,32 +129,37 @@
 </template>
 
 <script>
-import { tableRowClassName } from '../../../utils/myUtils/changeTableTr'
-import { OrderDetail } from '../../../api/order/order'
-import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog' // 抽离porp 和 methods
+import { tableRowClassName } from "../../../utils/myUtils/changeTableTr";
+import { OrderDetail } from "../../../api/order/order";
+import { infoDialog } from "../../../utils/myUtils/mixins/infoDialog"; // 抽离porp 和 methods
 export default {
   mixins: [infoDialog],
   data() {
     return {
-      tableData: []
-    }
+      tableData: [],
+    };
   },
-  mounted() {
-    const id = this.dataInfo.id
-    if (!this.dataInfo.id) return
-    OrderDetail({ id: id }).then(res => {
-      console.log(res, '----')
-      this.tableData = res.productList
-    })
+  watch: {
+    dataInfo: {
+      deep: true,
+      immediate: true,
+      handler(newVal) {
+        if(newVal.id){
+          OrderDetail({ id: newVal.id }).then((res) => {
+          this.tableData = res.productList;
+        });
+        }
+      },
+    },
   },
   methods: {
-    tableRowClassName: tableRowClassName
-  }
-}
+    tableRowClassName: tableRowClassName,
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-@import '../../../assets/css/infoDialog.scss';
+@import "../../../assets/css/infoDialog.scss";
 
 .tab-container {
   margin-top: 20px;
diff --git a/src/views/move/message.vue b/src/views/move/message.vue
index bec59fa..cc4041f 100644
--- a/src/views/move/message.vue
+++ b/src/views/move/message.vue
@@ -100,13 +100,12 @@
       <el-table-column prop="targetUsers" label="目标用户" />
       <el-table-column label="操作">
         <template slot-scope="scope">
-          <el-button type="text" size="small">
-            编辑
+          <el-button type="text" size="small" @click="editCategory(scope.row)">
+            详情
           </el-button>
           <el-button
             type="text"
             size="small"
-            @click="handleClick(scope.row)"
           >
             删除
           </el-button>
@@ -116,7 +115,7 @@
     <group-page v-model="isFristPage" :limit="limit" :total="total" :offset="offset" :count="tableData.total" @setOffset="setOffset" @setLimit="setLimit" />
     <!-- 新增弹框 -->
 
-    <massage-add-dialog :is-show-info="isShowAdd" :title="title" :data-info="rowInfo" @close="closeAdd" />
+    <massage-add-dialog :is-show-info="isShowAdd" :title="title" :data-info="rowInfo" @close="closeAdd"  ref="addMessage"/>
   </div>
 </template>
 
@@ -172,6 +171,19 @@
         messageTitle: '',
         messageContent: ''
       }
+      listPage(`limit=${this.limit}&offset=${1}`, {}).then(res => {
+      // 得到相关数据
+        res.rows.forEach((item, index) => {
+          item.index = (index + 1) + ((1 - 1) * 10)
+        })
+        this.tableData = res
+      })
+    },
+    editCategory(row){
+      console.log(row)
+      this.isShowAdd = true
+      this.title = '消息推送编辑'
+      this.$refs.addMessage.init(row)
     }
   }
 }

diff --git a/src/api/move/message.js b/src/api/move/message.js
index 57411dd..297d8da 100644
--- a/src/api/move/message.js
+++ b/src/api/move/message.js
@@ -12,4 +12,7 @@
 const add = (data) => {
   return instance.post('/appPushInfo/add', data)
 }
+const update = (data) => {
+  return instance.post('/appPushInfo/update', data)
+}
 export { listPage, add }
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index 7b2ef09..754c1dd 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -28,10 +28,10 @@
                 placeholder="请选择"
                 style="width: 100%"
               >
-                <el-option
+                <!-- <el-option
                   label="无"
                   value=""
-                />
+                /> -->
                 <el-option
                   v-for="item in categoryList"
                   :key="item.categoryCode"
diff --git a/src/components/mycomponent/dialog/move/massageAddDialog.vue b/src/components/mycomponent/dialog/move/massageAddDialog.vue
index 4711d81..3cc8855 100644
--- a/src/components/mycomponent/dialog/move/massageAddDialog.vue
+++ b/src/components/mycomponent/dialog/move/massageAddDialog.vue
@@ -19,6 +19,7 @@
             width="300px"
             class="inputWidth"
             style="justify-content: space-between"
+            :disabled="!(title === '消息推送新增')"
           />
         </div>
         <div class="inputBox">
@@ -34,6 +35,7 @@
               type="textarea"
               :rows="3"
               placeholder="请输入内容"
+              :disabled="!(title === '消息推送新增')"
             />
           </input-vue>
         </div>
@@ -45,26 +47,24 @@
             width="300px"
             class="inputWidth"
             style="justify-content: space-between; align-items: baseline"
+            :disabled="!(title === '消息推送新增')"
           >
             <div style="width: 100%; padding-left: 58px">
               <div style="margin-top: 10px">
-                <el-radio
-                  v-model="massageInfo.userFlag"
-                  :label="1"
-                >
+                <el-radio v-model="massageInfo.userFlag" :label="1" :disabled="!(title === '消息推送新增')">
                   全部用户
                 </el-radio>
               </div>
 
               <div style="margin-top: 10px">
-                <el-radio
-                  v-model="massageInfo.userFlag"
-                  :label="0"
-                >
+                <el-radio v-model="massageInfo.userFlag" :label="0" :disabled="!(title === '消息推送新增')">
                   标签用户
                 </el-radio>
-                <div v-if="massageInfo.userFlag==0" style="height: 80px; overflow: auto ;margin-top: 10px">
-                  <el-checkbox-group v-model="checkList" :max="5">
+                <div
+                  v-if="massageInfo.userFlag === 0"
+                  style="height: 80px; overflow: auto; margin-top: 10px"
+                >
+                  <el-checkbox-group v-model="checkList" :max="5" :disabled="!(title === '消息推送新增')"> 
                     <el-checkbox
                       v-for="item in ProvinceList"
                       :key="item.id"
@@ -77,85 +77,115 @@
           </input-vue>
         </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>
+      <div class="btnBox" v-if="title === '消息推送新增'">
+        <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 { add } from '../../../../api/move/message'
-import { order_area } from '../../../../api/order/order'
+import InputVue from "../../input/inputVue.vue";
+import DialogHeader from "../dialogHeader.vue";
+import RedStar from "../../redStar.vue";
+import InputNumber from "../../input/inputNumber.vue";
+import { add } from "../../../../api/move/message";
+import { order_area } from "../../../../api/order/order";
 export default {
   components: {
     DialogHeader,
     RedStar,
     InputVue,
-    InputNumber
+    InputNumber,
   },
   props: {
     dataInfo: {},
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: true,
     },
-    title: ''
+    title: "",
   },
   data() {
     return {
       checkList: [],
       ProvinceList: [],
       massageInfo: {
-        messageTitle: '',
-        messageContent: '',
+        messageTitle: "",
+        messageContent: "",
         userFlag: 1,
-        provinceList: []
-      }
-    }
+        provinceList: [],
+      },
+    };
   },
   mounted() {
-    order_area('pid=0').then((res) => {
-      console.log(res)
-      this.ProvinceList = res
-    })
+    order_area("pid=0").then((res) => {
+      this.ProvinceList = res;
+    });
+    console.log(this.title)
   },
   methods: {
     close() {
-      this.$emit('close')
+      this.$emit("close");
+      this.massageInfo = {
+        messageTitle: "",
+        messageContent: "",
+        userFlag: 1,
+        provinceList: [],
+      };
+      this.checkList = [];
     },
     save() {
-      if (this.title == '消息推送新增') {
-        const temp = { ...this.massageInfo }
+      if (this.valiate()) {
+        const temp = { ...this.massageInfo };
         if (this.massageInfo.userFlag == 0) {
-          temp.provinceList = this.checkList
+          temp.provinceList = this.checkList;
         }
         add(temp).then((res) => {
-          if (res != '') {
-            this.$message.success('新增成功')
-            this.close()
-            this.massageInfo = {
-              messageTitle: '',
-              messageContent: '',
-              userFlag: 1,
-              provinceList: []
-            }
-          }
-        })
+          this.$message.success("新增成功");
+          this.close();
+          this.massageInfo = {
+            messageTitle: "",
+            messageContent: "",
+            userFlag: 1,
+            provinceList: [],
+          };
+        });
       }
-    }
-
-  }
-}
+    },
+    valiate() {
+      const {
+        massageInfo: { messageTitle, messageContent, userFlag, provinceList },
+      } = this;
+      if (messageTitle && messageContent) {
+        if (userFlag === 1) {
+          return true;
+        } else if (userFlag === 0 && this.checkList.length > 0) {
+          return true;
+        } else {
+          this.$message.error("请先完选择城市信息");
+          return false;
+        }
+      } else {
+        this.$message.error("请先完整填写信息");
+        return false;
+      }
+    },
+    init(row) {
+      this.massageInfo.messageTitle = row.messageTitle;
+      this.massageInfo.messageContent = row.messageContent;
+      if (row.targetUsers.split()[0] === "全部用户") {
+        this.massageInfo.userFlag = 1;
+      } else {
+        this.massageInfo.userFlag = 0;
+        this.checkList = this.ProvinceList.filter((item) =>
+          row.targetUsers.split(",").some((check) => check === item.name)
+        ).map((item) => item.name);
+      }
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/components/mycomponent/dialog/orderDetailDialog.vue b/src/components/mycomponent/dialog/orderDetailDialog.vue
index 23ccee3..49793af 100644
--- a/src/components/mycomponent/dialog/orderDetailDialog.vue
+++ b/src/components/mycomponent/dialog/orderDetailDialog.vue
@@ -1,20 +1,23 @@
 <!--订单详情弹窗-->
 <template>
-  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
+  <el-dialog
+    title="详情"
+    width="920px"
+    v-if="isShowInfo"
+    :visible.sync="isShowInfo"
+    append-to-body
+    @close="close"
+  >
     <div class="contanier">
       <div class="box">
         <div class="item">
-          <div class="title">
-            下单人
-          </div>
+          <div class="title">下单人</div>
           <div class="content">
-            {{ dataInfo ? dataInfo.userName : '' }}
+            {{ dataInfo ? dataInfo.userName : "" }}
           </div>
         </div>
         <div class="item">
-          <div class="title">
-            下单人角色
-          </div>
+          <div class="title">下单人角色</div>
           <div class="content">
             {{ dataInfo.userRole }}
           </div>
@@ -22,17 +25,13 @@
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">
-            联系方式
-          </div>
+          <div class="title">联系方式</div>
           <div class="content">
             {{ dataInfo.userPhone }}
           </div>
         </div>
         <div class="item">
-          <div class="title">
-            订单来源
-          </div>
+          <div class="title">订单来源</div>
           <div class="content">
             {{ dataInfo.orderSource }}
           </div>
@@ -40,17 +39,13 @@
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">
-            签订日期
-          </div>
+          <div class="title">签订日期</div>
           <div class="content">
             {{ dataInfo.signDate }}
           </div>
         </div>
         <div class="item">
-          <div class="title">
-            交付日期
-          </div>
+          <div class="title">交付日期</div>
           <div class="content">
             {{ dataInfo.deliveryDate }}
           </div>
@@ -58,17 +53,13 @@
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">
-            交付地址-省
-          </div>
+          <div class="title">交付地址-省</div>
           <div class="content">
             {{ dataInfo.deliveryProvince }}
           </div>
         </div>
         <div class="item">
-          <div class="title">
-            交付地址-市
-          </div>
+          <div class="title">交付地址-市</div>
           <div class="content">
             {{ dataInfo.deliveryCity }}
           </div>
@@ -76,17 +67,13 @@
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">
-            交付地址-区
-          </div>
+          <div class="title">交付地址-区</div>
           <div class="content">
             {{ dataInfo.deliveryArea }}
           </div>
         </div>
         <div class="item">
-          <div class="title">
-            交付地址-详细地址
-          </div>
+          <div class="title">交付地址-详细地址</div>
           <div class="content">
             {{ dataInfo.deliveryAddress }}
           </div>
@@ -94,17 +81,13 @@
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">
-            收货人
-          </div>
+          <div class="title">收货人</div>
           <div class="content">
             {{ dataInfo.receiver }}
           </div>
         </div>
         <div class="item">
-          <div class="title">
-            收货人联系方式
-          </div>
+          <div class="title">收货人联系方式</div>
           <div class="content">
             {{ dataInfo.receiverPhone }}
           </div>
@@ -112,9 +95,7 @@
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">
-            备注
-          </div>
+          <div class="title">备注</div>
           <div class="content">
             {{ dataInfo.remark }}
           </div>
@@ -122,9 +103,7 @@
       </div>
     </div>
     <div class="tab-container">
-      <div class="tab-title">
-        产品需求清单
-      </div>
+      <div class="tab-title">产品需求清单</div>
       <el-table
         ref="multipleTable"
         :data="tableData"
@@ -138,8 +117,10 @@
         style="width: 100%"
       >
         <el-table-column type="index" label="序号" />
-        <el-table-column prop="productCode" label="产品型号" />
         <el-table-column prop="productName" label="产品名称" />
+        <el-table-column prop="branchName" label="产品品牌" />
+        <el-table-column prop="categoryName" label="产品品类" />
+        <el-table-column prop="productCode" label="产品型号" />
         <el-table-column prop="productQuantity" label="产品数量" />
         <el-table-column prop="productPrice" label="产品单价" />
       </el-table>
@@ -148,32 +129,37 @@
 </template>
 
 <script>
-import { tableRowClassName } from '../../../utils/myUtils/changeTableTr'
-import { OrderDetail } from '../../../api/order/order'
-import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog' // 抽离porp 和 methods
+import { tableRowClassName } from "../../../utils/myUtils/changeTableTr";
+import { OrderDetail } from "../../../api/order/order";
+import { infoDialog } from "../../../utils/myUtils/mixins/infoDialog"; // 抽离porp 和 methods
 export default {
   mixins: [infoDialog],
   data() {
     return {
-      tableData: []
-    }
+      tableData: [],
+    };
   },
-  mounted() {
-    const id = this.dataInfo.id
-    if (!this.dataInfo.id) return
-    OrderDetail({ id: id }).then(res => {
-      console.log(res, '----')
-      this.tableData = res.productList
-    })
+  watch: {
+    dataInfo: {
+      deep: true,
+      immediate: true,
+      handler(newVal) {
+        if(newVal.id){
+          OrderDetail({ id: newVal.id }).then((res) => {
+          this.tableData = res.productList;
+        });
+        }
+      },
+    },
   },
   methods: {
-    tableRowClassName: tableRowClassName
-  }
-}
+    tableRowClassName: tableRowClassName,
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-@import '../../../assets/css/infoDialog.scss';
+@import "../../../assets/css/infoDialog.scss";
 
 .tab-container {
   margin-top: 20px;
diff --git a/src/views/move/message.vue b/src/views/move/message.vue
index bec59fa..cc4041f 100644
--- a/src/views/move/message.vue
+++ b/src/views/move/message.vue
@@ -100,13 +100,12 @@
       <el-table-column prop="targetUsers" label="目标用户" />
       <el-table-column label="操作">
         <template slot-scope="scope">
-          <el-button type="text" size="small">
-            编辑
+          <el-button type="text" size="small" @click="editCategory(scope.row)">
+            详情
           </el-button>
           <el-button
             type="text"
             size="small"
-            @click="handleClick(scope.row)"
           >
             删除
           </el-button>
@@ -116,7 +115,7 @@
     <group-page v-model="isFristPage" :limit="limit" :total="total" :offset="offset" :count="tableData.total" @setOffset="setOffset" @setLimit="setLimit" />
     <!-- 新增弹框 -->
 
-    <massage-add-dialog :is-show-info="isShowAdd" :title="title" :data-info="rowInfo" @close="closeAdd" />
+    <massage-add-dialog :is-show-info="isShowAdd" :title="title" :data-info="rowInfo" @close="closeAdd"  ref="addMessage"/>
   </div>
 </template>
 
@@ -172,6 +171,19 @@
         messageTitle: '',
         messageContent: ''
       }
+      listPage(`limit=${this.limit}&offset=${1}`, {}).then(res => {
+      // 得到相关数据
+        res.rows.forEach((item, index) => {
+          item.index = (index + 1) + ((1 - 1) * 10)
+        })
+        this.tableData = res
+      })
+    },
+    editCategory(row){
+      console.log(row)
+      this.isShowAdd = true
+      this.title = '消息推送编辑'
+      this.$refs.addMessage.init(row)
     }
   }
 }
diff --git a/src/views/order/historyOrder.vue b/src/views/order/historyOrder.vue
index 55bcea1..0f26885 100644
--- a/src/views/order/historyOrder.vue
+++ b/src/views/order/historyOrder.vue
@@ -62,7 +62,7 @@
       @setLimit="setLimit"
     />
     <!-- xiangqing弹框 -->
-    <orderDetailDialog v-if="isShowDetail" :data-info="dataInfo" @close="DetailDialogClose" />
+    <orderDetailDialog   :isShowInfo="isShowDetail" :data-info="dataInfo" @close="DetailDialogClose" />
   </div>
 </template>