diff --git a/src/api/policy/index.js b/src/api/policy/index.js
index 0fcd3f8..299162c 100644
--- a/src/api/policy/index.js
+++ b/src/api/policy/index.js
@@ -27,7 +27,7 @@ export function save(data){
 export function destroy(data){
   return request({
     method:'post',
-    url:'/api/admin/policy/delete',
+    url:'/api/admin/policy/destroy',
     data
   })
 }
diff --git a/src/components/Breadcrumb/index.vue b/src/components/Breadcrumb/index.vue
index 524ff88..ba0ec6a 100644
--- a/src/components/Breadcrumb/index.vue
+++ b/src/components/Breadcrumb/index.vue
@@ -1,89 +1,89 @@
-<template>
-  <el-breadcrumb class="app-breadcrumb" separator="/">
-    <transition-group name="breadcrumb">
-      <el-breadcrumb-item v-for="(item,index) in levelList" :key="item.path">
-        <span v-if="item.redirect==='noRedirect'||index==levelList.length-1"
-          class="no-redirect">{{ item.meta.title }}</span>
-        <a v-else @click.prevent="handleLink(item)">{{ item.meta.title }}</a>
-      </el-breadcrumb-item>
-    </transition-group>
-  </el-breadcrumb>
-</template>
-
-<script>
-  import pathToRegexp from 'path-to-regexp'
-
-  export default {
-    data() {
-      return {
-        levelList: null
-      }
-    },
-    watch: {
-      $route() {
-        this.getBreadcrumb()
-      }
-    },
-    created() {
-      this.getBreadcrumb()
-    },
-    methods: {
-      getBreadcrumb() {
-        // only show routes with meta.title
-        let matched = this.$route.matched.filter(item => item.meta && item.meta.title)
-        const first = matched[0]
-
-        if (!this.isDashboard(first)) {
-          matched = [{
-            path: '/dashboard',
-            meta: {
-              title: '系统首页'
-            }
-          }].concat(matched)
-        }
-
-        this.levelList = matched.filter(item => item.meta && item.meta.title && item.meta.breadcrumb !== false)
-      },
-      isDashboard(route) {
-        const name = route && route.name
-        if (!name) {
-          return false
-        }
-        return name.trim().toLocaleLowerCase() === '系统首页'.toLocaleLowerCase()
-      },
-      pathCompile(path) {
-        // To solve this problem https://github.com/PanJiaChen/vue-element-admin/issues/561
-        const {
-          params
-        } = this.$route
-        var toPath = pathToRegexp.compile(path)
-        return toPath(params)
-      },
-      handleLink(item) {
-        const {
-          redirect,
-          path
-        } = item
-        if (redirect) {
-          this.$router.push(redirect)
-          return
-        }
-        this.$router.push(this.pathCompile(path))
-      }
-    }
-  }
-</script>
-
-<style lang="scss" scoped>
-  .app-breadcrumb.el-breadcrumb {
-    display: inline-block;
-    font-size: 14px;
-    line-height: 50px;
-    margin-left: 8px;
-
-    .no-redirect {
-      color: #97a8be;
-      cursor: text;
-    }
-  }
+<template>
+  <el-breadcrumb class="app-breadcrumb" separator="/">
+    <transition-group name="breadcrumb">
+      <el-breadcrumb-item v-for="(item,index) in levelList" :key="item.path">
+        <span v-if="item.redirect==='noRedirect'||index==levelList.length-1||item.path.includes('key')"
+          class="no-redirect">{{ item.meta.title }}</span>
+        <a v-else @click.prevent="handleLink(item)">{{ item.meta.title }}</a>
+      </el-breadcrumb-item>
+    </transition-group>
+  </el-breadcrumb>
+</template>
+
+<script>
+  import pathToRegexp from 'path-to-regexp'
+
+  export default {
+    data() {
+      return {
+        levelList: null
+      }
+    },
+    watch: {
+      $route() {
+        this.getBreadcrumb()
+      }
+    },
+    created() {
+      this.getBreadcrumb()
+    },
+    methods: {
+      getBreadcrumb() {
+        // only show routes with meta.title
+        let matched = this.$route.matched.filter(item => item.meta && item.meta.title)
+        const first = matched[0]
+
+        if (!this.isDashboard(first)) {
+          matched = [{
+            path: '/dashboard',
+            meta: {
+              title: '系统首页'
+            }
+          }].concat(matched)
+        }
+
+        this.levelList = matched.filter(item => item.meta && item.meta.title && item.meta.breadcrumb !== false)
+      },
+      isDashboard(route) {
+        const name = route && route.name
+        if (!name) {
+          return false
+        }
+        return name.trim().toLocaleLowerCase() === '系统首页'.toLocaleLowerCase()
+      },
+      pathCompile(path) {
+        // To solve this problem https://github.com/PanJiaChen/vue-element-admin/issues/561
+        const {
+          params
+        } = this.$route
+        var toPath = pathToRegexp.compile(path)
+        return toPath(params)
+      },
+      handleLink(item) {
+        const {
+          redirect,
+          path
+        } = item
+        if (redirect) {
+          this.$router.push(redirect)
+          return
+        }
+        this.$router.push(this.pathCompile(path))
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .app-breadcrumb.el-breadcrumb {
+    display: inline-block;
+    font-size: 14px;
+    line-height: 50px;
+    margin-left: 8px;
+
+    .no-redirect {
+      color: #97a8be;
+      cursor: text;
+    }
+  }
 </style>
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 22a1268..7098f3c 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -1,4 +1,3 @@
-import Vue from 'vue'
 import {
   asyncRoutes,
   constantRoutes
@@ -72,7 +71,7 @@ const componentHandler = (path) => {
   if(path === '#' || path === ''){
     return Layout
   }
-  if(path.includes('#') && path != '#'){
+  if(path.includes('#') && path !== '#'){
     return ()=>import('@/layout/noLayout')
   }
   return loadView(path)
@@ -104,6 +103,11 @@ export function generaMenu(routes, data) {
       routes.push(menu)
     }
   })
+  routes.push({
+    path: '*',
+    redirect: '/404',
+    hidden: true
+  })
 }
 
 const mutations = {
diff --git a/src/views/business/component/addMerchant.vue b/src/views/business/component/addMerchant.vue
index dd73eff..7c5fd1e 100644
--- a/src/views/business/component/addMerchant.vue
+++ b/src/views/business/component/addMerchant.vue
@@ -228,14 +228,14 @@ export default {
         ],
         boss_phone:[
           { required: true, message: '请填写法人/老板电话', trigger: 'blur' },
-          {pattern: /^[1][3-9][\d]{9}/,message:'手机号格式错误'}
+          { pattern: /^[1][3-9][\d]{9}/,message:'手机号格式错误'}
         ],
         contact:[
           { required: true, message: '请填写联系人', trigger: 'blur' }
         ],
         phone:[
           { required: true, message: '请填写联系人电话', trigger: 'blur' },
-          {pattern: /^[1][3-9][\d]{9}/,message:'手机号格式错误'}
+          { pattern: /^[1][3-9][\d]{9}/,message:'手机号格式错误'}
         ],
         username:[
           { required: true, message: '请填写简称/用户名', trigger: 'blur' }
diff --git a/src/views/order/component/orderLog.vue b/src/views/order/component/orderLog.vue
index ca5b055..218f9d7 100644
--- a/src/views/order/component/orderLog.vue
+++ b/src/views/order/component/orderLog.vue
@@ -1,23 +1,73 @@
 <template>
   <div>
-    <Modal title="订单日志" :value.sync="isShow" @on-visible-change="$emit('update:isShow',$event)">
-
+    <Modal :width="60" title="订单日志" :value.sync="isShow" @on-visible-change="$emit('update:isShow',$event)">
+      <xy-table :is-page="false" :list="list" :table-item="table" :height="300">
+        <template v-slot:btns>
+          <div></div>
+        </template>
+      </xy-table>
     </Modal>
   </div>
 </template>
 
 <script>
+import {getItemLogs} from "@/api/order"
+import {parseTime} from '@/utils'
+
 export default {
   props:{
+    id:Number,
     isShow:{
       type:Boolean,
       default:false
     }
   },
   data() {
-    return {}
+    return {
+      list:[],
+      table:[
+        {
+          label:'用户',
+          prop:'operator.name',
+          width: 120
+        },
+        {
+          label:'时间',
+          prop:'created_at',
+          width: 160,
+          formatter:(cell,data,value) => {
+            return parseTime(new Date(value),'{y}-{m}-{d}')
+          }
+        },
+        {
+          label:'操作',
+          prop:'operate_name',
+          width: 120
+        },
+        {
+          label:'备注',
+          prop:'remark',
+          align:'left',
+          sortable:false
+        }
+      ],
+    }
   },
-  methods: {}
+  methods: {
+    async getLog(){
+      const res = await getItemLogs({
+        item_id:this.id
+      })
+      this.list = res.data
+    }
+  },
+  watch:{
+    isShow(newVal){
+      if(newVal){
+        this.getLog()
+      }
+    }
+  }
 
 }
 </script>
diff --git a/src/views/order/orderList.vue b/src/views/order/orderList.vue
index 39a9f4d..83ef9e2 100644
--- a/src/views/order/orderList.vue
+++ b/src/views/order/orderList.vue
@@ -82,13 +82,13 @@
             <Button v-show="scope.row.state_name == '待处理'" icon="ios-paper-plane-outline" type="primary" style="margin-left: 10px;margin-bottom: 6px;" size="small" ghost>分发</Button>
             <Button v-show="scope.row.state_name == '待处理'" icon="ios-close" type="primary" style="margin-left: 10px;margin-bottom: 6px;" size="small" ghost>取消</Button>
             <Button v-show="scope.row.state_name == '已发布'" icon="ios-redo" type="primary" style="margin-left: 10px;margin-bottom: 6px;" size="small" ghost>收回</Button>
-            <Button icon="ios-clipboard-outline" type="primary" style="margin-left: 10px;margin-bottom: 6px;" size="small" ghost>日志</Button>
+            <Button icon="ios-clipboard-outline" type="primary" style="margin-left: 10px;margin-bottom: 6px;" size="small" ghost @click="selectId = scope.row.id,isShowLog = true">日志</Button>
           </template>
         </el-table-column>
       </template>
     </xy-table>
 
-    <orderLog :is-show.sync="isShowLog" @refresh="getOrders"></orderLog>
+    <orderLog :id="selectId" :is-show.sync="isShowLog" @refresh="getOrders"></orderLog>
   </div>
 </template>
 
@@ -103,6 +103,7 @@ export default {
   },
   data() {
     return {
+      selectId:null,
       isShowLog:false,
 
       merchants:[],
@@ -119,7 +120,8 @@ export default {
       },
 
       total:0,
-      list:[],
+      list:[{"id":2560,"order_id":2775,"product_type_id":16,"product_id":77,"original_price":null,"price":"0.00","commission":null,"sharing":"0.00","quantity":1,"created_at":"2022-08-24T06:56:44.000000Z","updated_at":"2022-08-24T06:56:44.000000Z","deleted_at":null,"state":"pending","merchant_id":null,"assigned_serial":null,"assign_id":null,"admin_actions":{"follow":"\u8ddf\u8fdb","assign":"\u5206\u53d1","cancel":"\u53d6\u6d88"},"order_name":"\u3010\u8d1d\u8d1d\u5802\u301119.9\u5143\u5355\u7406\u80ce\u53d1","paid_at":"2022-08-24 14:56:52","bookable_name":"\u5355\u54c1","order_quantity":1,"order_total":"19.90","order_items_count":1,"order_state":"ongoing","order_state_name":"\u8fdb\u884c\u4e2d","member":{"id":3397,"name":"\u7f57\u671d\u71d5","phone":"13814873429","due_date":"2022-08-01","hospital":"\u82cf\u5927\u9644\u4e00\u9662","wechat":null,"wechat_nickname":"\u71d5\u513f\ud83d\udc8b","address":null,"source":null,"user_source":null,"wechat_openid":"oEgEM0QgY61rU64Za0GSspOQOh_Y","wechat_unionid":null,"visit_count":null,"last_login_time":null,"lon":null,"lat":null,"province":null,"city":null,"area":"\u59d1\u82cf\u533a","operating":null,"ip":null,"machine":null,"pid":108,"site_id":null,"created_at":"2022-07-14T05:13:21.000000Z","updated_at":"2022-08-12T03:32:46.000000Z","deleted_at":null,"password":null,"promotion":1,"promotion_type":null,"promotion_id":null,"avatar":"https:\/\/thirdwx.qlogo.cn\/mmopen\/vi_32\/DYAIOgq83ersiaibpEqVs2IbraFU6LRYEKk7bGyPonibeiayhOjA5o6IlhdRhkRS1u3CGyWshJMCVneZwzaP8JaAmw\/132"},"memberPromotion":{"id":889,"name":null,"phone":"18662528918","due_date":null,"hospital":null,"wechat":null,"wechat_nickname":"Tony\u8001\u5e08_\u6ee1\u6708\u7406\u80ce\u53d1","address":null,"source":null,"user_source":null,"wechat_openid":"oEgEM0UWwCdncvbVWR65hw44qKXY","wechat_unionid":null,"visit_count":null,"last_login_time":null,"lon":null,"lat":null,"province":null,"city":null,"area":null,"operating":null,"ip":null,"machine":null,"pid":null,"site_id":null,"created_at":"2022-02-06T06:20:46.000000Z","updated_at":"2022-03-21T07:16:01.000000Z","deleted_at":null,"password":null,"promotion":null,"promotion_type":null,"promotion_id":null,"avatar":"https:\/\/thirdwx.qlogo.cn\/mmopen\/vi_32\/VN9nffOKP7SRGNPDUdxbTWDaJxdvAsFTJX7lLHibZYiaP9ZgfwUZVxFSBLFL3yptELNBDtNo7V7qJaOEfn0mIiaiaQ\/132"},"state_name":"\u5f85\u5904\u7406","product_type":{"id":16,"pid":15,"name":"\u5a74\u513f\u7406\u53d1\u7eaa\u5ff5\u54c1","sortnumber":"0","created_at":"2021-08-30T02:52:02.000000Z","updated_at":"2021-08-30T02:52:02.000000Z","deleted_at":null},"product":{"id":77,"product_type_id":16,"product_type_pid":15,"merchant_id":33,"shop_ids":"39","name":"\u3010\u8d1d\u8d1d\u5802\u301119.9\u5143\u5355\u7406\u80ce\u53d1","price":"19.90","original_price":"128.00","content":"<p><img title=\"1645355025686880.jpg\" alt=\"\u5fae\u4fe1\u56fe\u7247_20220220092705.jpg\" src=\"\/ueditor\/php\/upload\/image\/20220220\/1645355025686880.jpg\"\/><\/p><p><img title=\"1645355054687800.jpg\" alt=\"\u5fae\u4fe1\u56fe\u7247_20220220092713.jpg\" src=\"\/ueditor\/php\/upload\/image\/20220220\/1645355054687800.jpg\"\/><\/p><p><img title=\"1645355101782460.jpg\" alt=\"\u5fae\u4fe1\u56fe\u7247_20220220092723.jpg\" src=\"\/ueditor\/php\/upload\/image\/20220220\/1645355101782460.jpg\"\/><\/p><p><img src=\"\/ueditor\/php\/upload\/image\/20220403\/1648993884628548.png\" title=\"1648993884628548.png\" alt=\"\u6d41\u7a0b\u56fe1.png\"\/><\/p><p><img src=\"\/ueditor\/php\/upload\/image\/20220403\/1648993910784474.png\" title=\"1648993910784474.png\" alt=\"\u6d41\u7a0b\u56fe2.png\"\/><\/p><p><img src=\"\/ueditor\/php\/upload\/image\/20220403\/1648993917980628.png\" title=\"1648993917980628.png\" alt=\"\u6d41\u7a0b\u56fe3.png\"\/><\/p><p><\/p><p><br\/><\/p><p><br\/><\/p><p><br\/><\/p><p><img title=\"1645355153124580.jpg\" alt=\"\u5fae\u4fe1\u56fe\u7247_20220220092745.jpg\" src=\"\/ueditor\/php\/upload\/image\/20220220\/1645355153124580.jpg\"\/><\/p><p><img title=\"1645355174597015.jpg\" alt=\"\u5fae\u4fe1\u56fe\u7247_20220220092751.jpg\" src=\"\/ueditor\/php\/upload\/image\/20220220\/1645355174597015.jpg\"\/><\/p><p><img src=\"\/ueditor\/php\/upload\/image\/20220403\/1648981459318816.jpg\" title=\"1648981459318816.jpg\" alt=\"2f6395058c3aaeb1902d9eb21d70bc0.jpg\" width=\"1215\" height=\"1817\" style=\"width: 1215px; height: 1817px;\"\/><\/p><p><span style=\"font-family: \u5fae\u8f6f\u96c5\u9ed1,;\" microsoft=\"\"><\/span><\/p><p><span style=\"font-family: \u5fae\u8f6f\u96c5\u9ed1,;\" microsoft=\"\"><img src=\"\/ueditor\/php\/upload\/image\/20220713\/1657679664727396.jpg\" title=\"1657679664727396.jpg\" alt=\"\u5fae\u4fe1\u56fe\u7247_20220713102852.jpg\"\/><\/span><\/p><p><span style=\"font-family: \u5fae\u8f6f\u96c5\u9ed1,;\" microsoft=\"\">\u6b64\u5238\u4e0d\u5305\u62ec\u8def\u8d39\uff0c\u8def\u8d39\u572830-50\u5143\u4e0d\u7b49\uff0c\u59d1\u82cf\u533a\u514d\u8def\u8d39(\u8def\u8d39\u5728\u4e0b\u9762\u6709\u660e\u7ec6\u8bf4\u660e)<\/span><\/p><p><span style=\"font-family: \u5fae\u8f6f\u96c5\u9ed1,;\" microsoft=\"\">\u5907\u6ce8:\u9884\u7ea6\u65e5\u671f\u8bf7\u4e0d\u8981\u4e0e\u6253\u75ab\u82d7\u540c\u5929\uff0c\u56e0\u6253\u5b8c\u75ab\u82d7\u540e24\u5c0f\u65f6\u4e0d\u80fd\u6d17\u6fa1\uff0c\u800c\u5b9d\u5b9d\u7406\u80ce\u53d1\u5f53\u5929\u9700\u8981\u6d17\u6fa1\u7684\u3002<\/span><\/p><p><span style=\"font-family: \u5fae\u8f6f\u96c5\u9ed1,;\" microsoft=\"\">2.\u5ba2\u6237\u53ef\u6307\u5b9a\u9884\u7ea6\u4e0a\u95e8\u65e5\u671f\uff0c\u4f46\u4e0d\u80fd\u6307\u5b9a\u5177\u4f53\u7684\u65f6\u95f4\u6bb5\uff0c\u7406\u53d1\u5e08\u4f1a\u5728\u60a8\u9884\u7ea6\u65e5\u671f\u7684\u524d\u4e00\u5929\u4e0b\u5348\u7535\u8bdd\u901a\u77e5\uff0c\u8bf7\u4fdd\u6301\u624b\u673a\u7545\u901a(\u7531\u4e8e\u7406\u53d1\u5e08\u662f\u4e00\u5929\u670d\u52a1\u591a\u4e2a\u5b9d\u5b9d\uff0c\u5177\u4f53\u65f6\u95f4\u4f1a\u6839\u636e\u4e0a\u95e8\u7684\u8def\u7ebf\u5b89\u6392\uff0c\u5982\u8981\u6307\u5b9a\u4e0a\u95e8\u65f6\u95f4\u7684\u5b9d\u5b9d\u5bb6\u957f\uff0c\u5219\u4e0d\u9002\u5408\u6b64\u56e2\u8d2d\u3002\u6307\u5b9a\u5409\u65f6\u9700\u8981\u53e6\u5916\u4ed8\u8d39\uff0c\u7531\u6b64\u5e26\u6765\u7684\u4e0d\u4fbf\u656c\u8bf7\u8c05\u89e3.)<\/span><\/p><p><span style=\"font-family: \u5fae\u8f6f\u96c5\u9ed1,;\" microsoft=\"\">3.\u652f\u6301\u7684\u53d1\u578b:\u5e73\u5934\u3001\u5149\u5934(\u4e0d\u4fee\u526a\u53d1\u578b)<\/span><\/p><p><span style=\"font-family: \u5fae\u8f6f\u96c5\u9ed1,;\" microsoft=\"\">4.\u9002\u7528\u8303\u56f4:\u51fa\u751f0\u81f3100\u5929\u4ee5\u5185\u7684\u5b9d\u5b9d(\u80ce\u53d1)<\/span><\/p><p><span style=\"font-family: \u5fae\u8f6f\u96c5\u9ed1,;\" microsoft=\"\">5.\u7406\u53d1\u5e08\u670d\u52a1\u89c4\u8303:<\/span><\/p><p><span style=\"font-family: \u5fae\u8f6f\u96c5\u9ed1,;\" microsoft=\"\">*\u4e13\u4e1a\u5a74\u513f\u7406\u53d1\u5e08:\u8d1d\u8d1d\u5802\u7684\u7406\u53d1\u5e08\u90fd\u7ecf\u8fc7\u5a74\u513f\u5934\u90e8\u62a4\u7406\u548c\u7406\u53d1\u7684\u53cc\u91cd\u8bad\u7ec3\uff0c\u5177\u5907\u591a\u5e74\u7684\u5b9e\u8df5\u7ecf\u9a8c\u5e76\u638c\u63e1\u5a34\u719f\u7684\u5a74\u513f\u7406\u53d1\u6280\u5de7\u3002<\/span><\/p><p><span style=\"font-family: \u5fae\u8f6f\u96c5\u9ed1,;\" microsoft=\"\">*\u4e13\u4e1a\u7684\u7406\u53d1\u7528\u5177:\u4e13\u4e1a\u65e5\u672c\u8fdb\u53e3\u5a74\u513f\u7406\u53d1\u7528\u5177\uff0c\u5200\u5934\u9690\u85cf\uff0c\u5200\u8fb9\u5706\u6da6\u65e0\u9510\u89d2\uff0c\u4e0d\u4f1a\u4f24\u53ca\u5b9d\u5b9d\u7a1a\u5ae9\u7684\u76ae\u80a4\u3002<\/span><\/p><p><span style=\"font-family: \u5fae\u8f6f\u96c5\u9ed1,;\" microsoft=\"\">*\u4e13\u4e1a\u7684\u670d\u52a1\u6d41\u7a0b:\u8fdb\u95e8\u95ee\u597d--\u51fa\u793a\u5de5\u4f5c\u8bc1\u3001\u5065\u5eb7\u8bc1\u2014\u73b0\u573a\u6d88\u6bd2\u7406\u53d1\u7528\u5177--\u5b9d\u5b9d\u56f4\u515c--\u7406\u53d1<\/span><\/p><p>6. \u670d\u52a1\u8303\u56f4\u4e0a\u95e8\u533a\u57df\uff1a<\/p><p>\u59d1\u82cf\u533a\u514d\u8def\u8d39\uff08\u9664\u767d\u6d0b\u6e7e\u8857\u9053\uff0c\u9760\u8fd1\u91d1\u960a\u65b0\u57ce\u7684\u4e2d\u6d77\u5fa1\u666f\u6e7e\u3001\u4e07\u79d1\u91d1\u8272\u91cc\u7a0b\u3001\u5b9d\u7965\u82d1\u3001\u5b9d\u90bb\u82d1\u3001\u5bcc\u5f3a\u65b0\u82d1\u3001\u5357\u5c71\u91d1\u57ce\u3001\u91d1\u6210\u82b1\u56ed\u3001\u91d1\u7b51\u5bb6\u56ed\u3001\u548c\u7f8e\u5bb6\u56ed\u3001\u661f\u5149\u8000\u82b1\u56ed\u7b49\u5468\u8fb9\u5c0f\u533a\u8def\u8d3930\u5143)<\/p><p>\uff08\u56e0\u4e3a\u8fc7312\u56fd\u9053 \u4ee5\u524d\u8fd9\u91cc\u4e0d\u5c5e\u4e8e\u59d1\u82cf\u533a\uff0c\u6240\u4ee5\u5e08\u5085\u8981\u6536\u4e0a\u95e8\u8d3930\u5143\uff09<\/p><p>\u5176\u4ed6\u533a\uff08\u5de5\u4e1a\u56ed\u533a\u3001\u5434\u4e2d\u533a\u3001\u864e\u4e18\u533a\u3001\u76f8\u57ce\u533a\u3001\u5434\u6c5f\u533a\u677e\u9675\uff09\u8def\u8d3930-50\u5143\u4e0d\u7b49\uff1b\u8be6\u60c5\u8bf7\u54a8\u8be2\u5ba2\u670d\u3002<\/p><p><br\/><\/p><p>30\u5143\u8def\u8d39\u90e8\u5206\u533a\u57df\uff1a<\/p><p>\u767d\u6d0b\u6e7e\u8857\u9053\u3001\u91d1\u9e21\u6e56\u8857\u9053\u3001\u5a04\u8451\u8857\u9053\u3001\u957f\u6865\u8857\u9053\u3001\u90ed\u5df7\u8857\u9053\u3001\u8d8a\u6eaa\u8857\u9053\u3001\u57ce\u5357\u8857\u9053\u3001\u6728\u6e0e\u9547\u3001\u72ee\u5c71\u8857\u9053\u3001\u6a2a\u5858\u8857\u9053\u3001\u67ab\u6865\u8857\u9053\u3001\u6d52\u5885\u5173\u9547\u3001\u5143\u548c\u8857\u9053\u3001\u9ec4\u6865\u8857\u9053\u3001\u9ad8\u94c1\u65b0\u57ce\u3001\u9ec4\u57ed\u9547<\/p><p><br\/><\/p><p>50\u5143\u8def\u8d39\u90e8\u5206\u533a\u57df\uff1a<\/p><p>\u8f66\u574a\u3001\u552f\u4ead\u8857\u9053\u3001\u80dc\u6d66\u8857\u9053\u3001\u6a2a\u6cfe\u8857\u9053\u3001\u9999\u5c71\u8857\u9053\u3001\u592a\u6e56\u8857\u9053\u3001\u752a\u76f4\u9547\u3001\u5149\u798f\u9547\u3001\u80e5\u53e3\u9547\u3001\u4e34\u6e56\u9547\u3001\u4e1c\u6e1a\u8857\u9053\u3001\u901a\u5b89\u9547\u3001\u671b\u4ead\u9547\u3001\u5317\u6865\u8857\u9053\u3001\u592a\u5e73\u8857\u9053\u3001\u6f15\u6e56\u8857\u9053\u3001\u6e2d\u5858\u9547\u3001\u9633\u6f84\u6e56\u9547\u3001\u5434\u6c5f\u677e\u9675\u8857\u9053<\/p><p>\u9000\u6b3e\/\u6539\u7ea6\u89c4\u5219:<\/p><p>1\u3001\u9000\u6b3e\u65b9\u5f0f:<\/p><p>\u5982\u56e2\u8d2d\u5238\u7801\u672a\u6d88\u8d39\uff0c\u53ef\u968f\u65f6\u5b55\u80b2\u90a6\u5c0f\u7a0b\u5e8f\u540e\u53f0\u6211\u7684\u8ba2\u5355\u7533\u8bf7\u9000\u6b3e\u3002<\/p><p>2\u3001\u4e34\u65f6\u9000\u6539\u8bf7\u63d0\u524d24\u5c0f\u65f6\u7535\u8054\u5ba2\u670d\u8fdb\u884c\u4fee\u6539\u8ba2\u5355\uff0c\u82e5\u670d\u52a1\u4eba\u5458\u5df2\u51fa\u53d1\uff0c\u56e0\u5ba2\u6237\u539f\u56e0\u5bfc\u81f4\u65e0\u6cd5\u6b63\u5e38\u670d\u52a1\uff0c\u6211\u4eec\u5c06\u6b63\u5e38\u6536\u53d6\u4e0a\u95e8\u670d\u52a1\u8d39(\u59d1\u82cf\u533a\u7edf\u4e0020\u5143;\u5176\u4ed6\u533a\u57df\u540c\u4e0a\u95e8\u8def\u8d39)<\/p><p><br\/><\/p>","state":"active","created_at":"2022-02-20T11:07:26.000000Z","updated_at":"2022-08-01T05:58:36.000000Z","deleted_at":null,"policy_id":null,"fee":"0.00","sharing":"0.00","max_quantity":null,"limit_quantity":1,"pretend_quantity":0,"start_time":"2022-02-20 19:00:23","end_time":"2024-02-19 19:00:23","service_expire_days":null,"poster":"\/ueditor\/php\/upload\/image\/20220220\/1645328381479712.jpg","sortnumber":68,"poster_url":"https:\/\/yunyubang2021.langye.net\/ueditor\/php\/upload\/image\/20220220\/1645328381479712.jpg","state_name":"\u5df2\u4e0a\u67b6"},"merchant":{"id":33,"username":"\u8d1d\u8d1d\u5802","name":"\u82cf\u5dde\u8d1d\u8d1d\u5802\u6bcd\u5a74\u670d\u52a1\u6709\u9650\u516c\u53f8","logo_id":null,"address":"\u82cf\u5dde\u5e02\u91d1\u72ee\u6cb3\u6cbf45\u53f73\uff083\u53f7\u697c305-1\uff09","slogan":null,"site_id":null,"boss":"\u8427\u4e91","boss_phone":"13771992684","contact":"\u5510\u71d5\u840d","phone":"18018193021","certificate_id":null,"state":"active","created_at":"2022-02-20T10:53:27.000000Z","updated_at":"2022-08-24T07:20:18.000000Z","deleted_at":null,"business_number":"91320508093461470G","balance":"0.00","lng":"120.62042","lat":"31.29912","laravel_through_key":77},"order":{"id":2775,"order_name":"\u3010\u8d1d\u8d1d\u5802\u301119.9\u5143\u5355\u7406\u80ce\u53d1","bookable_type":"product","bookable_id":77,"member_id":3397,"member_promotion_id":889,"state":"ongoing","total":"19.90","quantity":1,"created_at":"2022-08-24T06:56:44.000000Z","updated_at":"2022-08-24T06:56:52.000000Z","deleted_at":null,"serial":"20220824000018","promotion_type":null,"promotion_id":null,"member_comment":"\u60f3\u4e5d\u6708\u4e00\u53f7\u7406\u53d1","op_comment":null,"shop_comment":null,"state_name":"\u8fdb\u884c\u4e2d","bookable_name":"\u5355\u54c1"}},{"id":2559,"order_id":2774,"product_type_id":2,"product_id":93,"original_price":null,"price":"0.00","commission":null,"sharing":"0.00","quantity":1,"created_at":"2022-08-24T06:53:44.000000Z","updated_at":"2022-08-24T09:28:14.000000Z","deleted_at":null,"state":"accepted","merchant_id":3,"assigned_serial":null,"assign_id":1718,"admin_actions":{"follow":"\u8ddf\u8fdb"},"order_name":"\u3010\u5e78\u5b55\u7eaa\u30119.9\u5b55\u5987\u7167\u793c\u5305","paid_at":"2022-08-24 14:53:52","bookable_name":"\u5355\u54c1","order_quantity":1,"order_total":"9.90","order_items_count":1,"order_state":"ongoing","order_state_name":"\u8fdb\u884c\u4e2d","member":{"id":4427,"name":"\u5b63\u5a77","phone":"15206212644","due_date":"2022-12-16","hospital":"\u82cf\u5927\u9644\u4e00\u9662","wechat":null,"wechat_nickname":"\u5b63\u5a77","address":null,"source":null,"user_source":null,"wechat_openid":"oEgEM0XSFi3kBA_jXhPfKMyxM5Fo","wechat_unionid":null,"visit_count":null,"last_login_time":null,"lon":null,"lat":null,"province":null,"city":null,"area":"\u76f8\u57ce\u533a","operating":null,"ip":null,"machine":null,"pid":105,"site_id":null,"created_at":"2022-08-24T06:50:57.000000Z","updated_at":"2022-08-24T06:53:53.000000Z","deleted_at":null,"password":null,"promotion":1,"promotion_type":null,"promotion_id":null,"avatar":"https:\/\/thirdwx.qlogo.cn\/mmopen\/vi_32\/Q0j4TwGTfTISicP2rOtOBAWyWxsSvnQwYjPNd50COpqNfAJTgFFqzrf7EmELZ2KW76JuQxuacyJYzBwPiahsBAyw\/132"},"memberPromotion":{"id":105,"name":"\u5434\u96c5\u5170","phone":"15051447827","due_date":"2016-11-01","hospital":null,"wechat":null,"wechat_nickname":"\ud83c\udf52\u840c\u5988\ud83c\udf53","address":null,"source":null,"user_source":null,"wechat_openid":"oEgEM0cCCWTWBs4tPjUm9YXCgK4U","wechat_unionid":null,"visit_count":null,"last_login_time":null,"lon":null,"lat":null,"province":null,"city":null,"area":null,"operating":null,"ip":null,"machine":null,"pid":null,"site_id":null,"created_at":"2021-12-08T04:36:58.000000Z","updated_at":"2022-07-12T05:47:15.000000Z","deleted_at":null,"password":null,"promotion":1,"promotion_type":null,"promotion_id":null,"avatar":"https:\/\/thirdwx.qlogo.cn\/mmopen\/vi_32\/PiajxSqBRaELiaicq1eiaAfneTDLFEJGLJZURArHVfZmhMeRBxpqB6LolUa2cdchgHz3sftt2qkxRibGjQ05dlTdL9w\/132"},"state_name":"\u5df2\u63a5\u6536","product_type":{"id":2,"pid":1,"name":"\u5b55\u5987\u7167","sortnumber":"0","created_at":"2021-07-25T01:24:27.000000Z","updated_at":"2021-08-30T02:47:11.000000Z","deleted_at":null},"product":{"id":93,"product_type_id":2,"product_type_pid":1,"merchant_id":3,"shop_ids":null,"name":"\u3010\u5e78\u5b55\u7eaa\u30119.9\u5b55\u5987\u7167\u793c\u5305","price":"9.90","original_price":"499.00","content":"<p><img src=\"\/ueditor\/php\/upload\/image\/20220415\/1650013686834320.png\" title=\"1650013686834320.png\" alt=\"1 .png\"\/><\/p><p><img src=\"\/ueditor\/php\/upload\/image\/20220415\/1650013731171833.png\" title=\"1650013731171833.png\" alt=\"2 .png\"\/><\/p><p><img src=\"\/ueditor\/php\/upload\/image\/20220415\/1650013745127104.jpeg\" title=\"1650013745127104.jpeg\" alt=\"3  .jpeg\"\/><\/p><p><img src=\"\/ueditor\/php\/upload\/image\/20220415\/1650013756283499.jpeg\" title=\"1650013756283499.jpeg\" alt=\"4 .jpeg\"\/><\/p><p><img src=\"\/ueditor\/php\/upload\/image\/20220415\/1650013766492864.jpeg\" title=\"1650013766492864.jpeg\" alt=\"5 .jpeg\"\/><\/p><p><img src=\"\/ueditor\/php\/upload\/image\/20220415\/1650013777685004.jpeg\" title=\"1650013777685004.jpeg\" alt=\"6.jpeg\"\/><\/p><p><img src=\"\/ueditor\/php\/upload\/image\/20220415\/1650013786975197.jpeg\" title=\"1650013786975197.jpeg\" alt=\"7. .jpeg\"\/><\/p><p><img src=\"\/ueditor\/php\/upload\/image\/20220415\/1650013796987326.jpeg\" title=\"1650013796987326.jpeg\" alt=\"8 .jpeg\"\/><\/p><p><img src=\"\/ueditor\/php\/upload\/image\/20220415\/1650013806224939.jpeg\" title=\"1650013806224939.jpeg\" alt=\"9 .jpeg\"\/><\/p>","state":"active","created_at":"2022-04-15T09:10:19.000000Z","updated_at":"2022-04-15T09:10:49.000000Z","deleted_at":null,"policy_id":null,"fee":"100.00","sharing":"0.00","max_quantity":null,"limit_quantity":1,"pretend_quantity":0,"start_time":"2022-04-15 16:11:52","end_time":"2023-04-11 16:11:52","service_expire_days":null,"poster":"\/ueditor\/php\/upload\/image\/20220415\/1650013636498020.png","sortnumber":55,"poster_url":"https:\/\/yunyubang2021.langye.net\/ueditor\/php\/upload\/image\/20220415\/1650013636498020.png","state_name":"\u5df2\u4e0a\u67b6"},"merchant":{"id":3,"username":"\u5e78\u5b55\u7eaa","name":"\u5e78\u5b55\u7eaa","logo_id":null,"address":"\u59d1\u82cf\u533a\/\u65b0\u533a\/\u56ed\u533a","slogan":null,"site_id":null,"boss":"\u65e0","boss_phone":"\u65e0","contact":"\u5ba2\u670d","phone":"18616951428","certificate_id":null,"state":"active","created_at":"2021-08-30T03:05:31.000000Z","updated_at":"2022-08-24T09:31:46.000000Z","deleted_at":null,"business_number":"\u65e0","balance":"-1250.00","lng":"120.620095","lat":"31.300602","laravel_through_key":93},"order":{"id":2774,"order_name":"\u3010\u5e78\u5b55\u7eaa\u30119.9\u5b55\u5987\u7167\u793c\u5305","bookable_type":"product","bookable_id":93,"member_id":4427,"member_promotion_id":105,"state":"ongoing","total":"9.90","quantity":1,"created_at":"2022-08-24T06:53:44.000000Z","updated_at":"2022-08-24T06:53:53.000000Z","deleted_at":null,"serial":"20220824000017","promotion_type":null,"promotion_id":null,"member_comment":"\u6709\u5927\u5b9d","op_comment":null,"shop_comment":null,"state_name":"\u8fdb\u884c\u4e2d","bookable_name":"\u5355\u54c1"}}],
+      //list:[],
       table:[
         {
           prop: "order_name",
@@ -134,30 +136,31 @@ export default {
         {
           prop:"order_total",
           label:"金额",
-          width: 100,
-          formatter:(cell,data,value,index)=>{
-            return `${value}￥`
-          }
+          width: 110,
+          align:'right'
         },
         {
           prop:"created_at",
           label:"下单时间",
-          width: 220,
+          width: 160,
           formatter:(cell,data,value,index)=>{
-            return parseTime(new Date(value),"{y}-{m}-{d} {h}:{i}:{s}")
+            return parseTime(new Date(value))
           }
         },
         {
           prop:"paid_at",
           label:"支付时间",
-          width: 220
+          width: 160,
+          formatter:(cell,data,value,index)=>{
+            return parseTime(new Date(value))
+          }
         },
         {
           prop:"updated_at",
           label:"更新时间",
-          width: 220,
+          width: 160,
           formatter:(cell,data,value,index)=>{
-            return parseTime(new Date(value),"{y}-{m}-{d} {h}:{i}:{s}")
+            return parseTime(new Date(value),"{y}-{m}-{d}")
           }
         },
         {
@@ -199,7 +202,7 @@ export default {
             {
               prop:"due_date",
               label:"预产期",
-              width: 150
+              width: 145
             }
           ],
         },
@@ -287,6 +290,6 @@ $primaryColor: #bf617c;
   margin-right: 10px;
 }
 ::v-deep .ivu-icon-ios-close:before{
-  color: #fff;
+  //color: #fff;
 }
 </style>
diff --git a/src/views/productService/clubProduct.vue b/src/views/productService/clubProduct.vue
new file mode 100644
index 0000000..d5ab2b4
--- /dev/null
+++ b/src/views/productService/clubProduct.vue
@@ -0,0 +1,51 @@
+<template>
+  <div style="padding: 0 20px">
+    <div ref="lxHeader">
+      <lx-header icon="md-apps" text="会所产品" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
+        <div slot="content"></div>
+        <slot>
+          <div>
+            <Input v-model="select.keywords" style="width: 200px; margin-right: 10px" placeholder="关键字搜索" />
+            <Select placeholder="类型搜索" v-model="select.type" style="width: 140px;margin-right: 10px">
+
+            </Select>
+            <Button type="primary">查询</Button>
+            <Button type="primary" style="margin-left: 10px" @click="$refs['addClubProduct'].type = 'add',$refs['addClubProduct'].isShow = true">新增</Button>
+          </div>
+        </slot>
+      </lx-header>
+    </div>
+
+    <xy-table></xy-table>
+
+    <addClubProduct ref="addClubProduct"></addClubProduct>
+  </div>
+</template>
+
+<script>
+import addClubProduct from '@/views/productService/components/addClubProduct'
+export default {
+  components:{
+    addClubProduct
+  },
+  data() {
+    return {
+      select:{
+        page:1,
+        pageSize:10,
+        keywords:'',
+        type:''
+      },
+
+      total:0,
+      list:[],
+      table:[]
+    }
+  },
+  methods: {}
+
+}
+</script>
+
+<style scoped lang="scss">
+</style>
diff --git a/src/views/productService/components/addClubProduct.vue b/src/views/productService/components/addClubProduct.vue
new file mode 100644
index 0000000..e719a4c
--- /dev/null
+++ b/src/views/productService/components/addClubProduct.vue
@@ -0,0 +1,24 @@
+<template>
+  <div>
+    <xy-dialog type="form" :is-show.sync="isShow" :title="this.type === 'add' ? '新增会所产品' : '编辑会所产品'">
+
+    </xy-dialog>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      id:'',
+      isShow:false,
+      type:''
+    }
+  },
+  methods: {}
+
+}
+</script>
+
+<style scoped lang="scss">
+</style>
diff --git a/src/views/productService/components/addConfinementClub.vue b/src/views/productService/components/addConfinementClub.vue
new file mode 100644
index 0000000..8cb96ba
--- /dev/null
+++ b/src/views/productService/components/addConfinementClub.vue
@@ -0,0 +1,44 @@
+<template>
+  <div>
+    <xy-dialog ref="dialog" :is-show.sync="isShow" type="form" :title="type === 'add' ? '新增月子会所' : '编辑月子会所'" :form="form" :rules="rules">
+
+    </xy-dialog>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      id:'',
+      isShow:false,
+      type:'',
+
+      form:{
+
+      },
+      rules:{
+
+      }
+    }
+  },
+  methods: {
+
+  },
+  watch:{
+    isShow(newVal){
+      if(newVal){
+
+      }else{
+        this.id = ''
+        this.type = ''
+        this.$refs['dialog'].reset()
+      }
+    }
+  }
+
+}
+</script>
+
+<style scoped lang="scss">
+</style>
diff --git a/src/views/productService/components/addPolicy.vue b/src/views/productService/components/addPolicy.vue
index 525ed20..8535f3e 100644
--- a/src/views/productService/components/addPolicy.vue
+++ b/src/views/productService/components/addPolicy.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <xy-dialog ref="dialog" :is-show.sync="isShow" type="form" :title="type === 'add' ? '新增政策' : '编辑政策'" :form="form" :rules="rules">
+    <xy-dialog :width="74" ref="dialog" :is-show.sync="isShow" type="form" :title="type === 'add' ? '新增政策' : '编辑政策'" :form="form" :rules="rules" @submit="submit">
       <template v-slot:name>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
@@ -16,10 +16,38 @@
           <div class="xy-table-item-label">
             <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>政策：
           </div>
-          <div class="xy-table-item-content">
-            <el-form-item v-for="(item,index) in form.items">
-              <div>{{'政策'+index}}</div>
+          <div class="xy-table-item-content" style="min-width: 640px">
+            <el-form-item v-for="(item,index) in form.items" :key="item.index">
+              <div class="xy-table-item-content-items">
+                <div class="xy-table-item-content-items-item">
+                  <div class="xy-table-item-content-items-item__title">{{'政策'+item.index}}</div>
+                </div>
+                <div class="xy-table-item-content-items-item">
+                  <div class="xy-table-item-content-items-item__label">操作</div>
+                  <el-select v-model="item.action" style="width: 160px;">
+                    <el-option v-for="(value,key) of actions" :value="key" :label="value"></el-option>
+                  </el-select>
+                </div>
+                <div class="xy-table-item-content-items-item">
+                  <div class="xy-table-item-content-items-item__label">计时</div>
+                  <el-input-number style="width: 100px;" :controls="false" :precision="1" v-model="item.timer"></el-input-number>
+                </div>
+                <div class="xy-table-item-content-items-item">
+                  <div class="xy-table-item-content-items-item__label">对订单操作</div>
+                  <el-select multiple v-model="item.operations" style="width: 160px;">
+                    <el-option v-for="(value,key) of operations" :value="key" :label="value"></el-option>
+                  </el-select>
+                </div>
+                <div class="xy-table-item-content-items-item">
+                  <div class="xy-table-item-content-items-item__label">佣金比</div>
+                  <el-input-number class="xy-table-item-content-items-item__percent" style="width: 100px;" v-model="item.fee_ratio" :controls="false" :precision="2"></el-input-number>
+                </div>
+                <div class="xy-table-item-content-items-item">
+                  <el-button type="primary" size="small" icon="el-icon-minus" style="width: 80px;" @click="removePolicy(item.index)">移除</el-button>
+                </div>
+              </div>
             </el-form-item>
+            <Button style="width: 200px;margin-top:20px;position: relative;left: 50%;transform: translateX(-50%);" type="dashed"  @click="addPolicy" icon="md-add">新增政策</Button>
           </div>
         </div>
       </template>
@@ -28,30 +56,154 @@
 </template>
 
 <script>
+import {store,save} from '@/api/policy'
+import { Message } from 'element-ui'
 export default {
   data() {
+    var itemsCheck = (rule, value, callback) => {
+      if(value.length === 0){
+        callback()
+      }else{
+        value.forEach(item => {
+          if(!item.action){
+            return callback(new Error(`请填写政策${item.index}操作`))
+          }
+          if(item.operations.length === 0){
+            return callback(new Error(`请选择政策${item.index}对订单操作`))
+          }
+          callback()
+        })
+      }
+    }
     return {
       id:'',
       isShow:false,
       type:'',
+      policyIndex:0,
+      actions:{
+        follow:'跟进',
+        assign:'分发',
+        recover:'收回',
+        cancel:'取消',
+        follow_by_merchant:'跟进',
+        accept_by_merchant:'接受',
+        return_by_merchant:'退回',
+        confirm_by_merchant:'确认有效',
+        finish_by_merchant:'核销',
+        mark_cancel_by_member:'用户退单',
+        mark_cancel_by_merchant:'标注退单',
+        confirm_merchant_cancel:'确认商家标注无效',
+        confirm_member_cancel:'确认用户退单'
+      },
+      operations:{
+        auto_accept:'自动接收',
+        auto_confirm:'自动确认',
+        auto_recover:'自动回收',
+        auto_fee:'自动扣除佣金',
+        auto_refund_fee:'自动反佣',
+        manually_refund_fee:'手工返佣',
+        auto_finish:'自动核销'
+      },
 
+      detail:{},
       form:{
         name:'',
         items:[]
       },
       rules:{
-
+        name:[
+          {required:true,message:'请填写名称'}
+        ],
+        items:[
+          { validator: itemsCheck, trigger: 'blur' }
+        ]
       }
     }
   },
   methods: {
+    getDetail(){
+      this.form.name = this.detail.name
+      this.form.items = this.detail.items.map(item => {
+        return {
+          index:++this.policyIndex,
+          action:item?.action,
+          timer:item?.timer,
+          operations:item?.operations.split(','),
+          fee_ratio:item?.fee_ratio,
+        }
+      })
+    },
+
+    addPolicy(){
+      this.form.items.push({
+        index:++this.policyIndex,
+        action:'',
+        timer:'',
+        operations:[],
+        fee_ratio:'',
+      })
+    },
+
+    removePolicy(index){
+      this.form.items.map((item,index1)=>{
+        if(index == item.index){
+          this.form.items.splice(index1,1)
+        }
+      })
+    },
+
+    submit(){
+      if(this.type === 'add'){
+        this.form.items.forEach(item => {
+          item.operations = item.operations.toString()
+        })
+        console.log(this.form)
+        store({
+          name:this.form.name,
+          items:this.form.items
+        }).then(res => {
+          Message({
+            type:'success',
+            message:'添加政策成功'
+          })
+          this.isShow = false
+          this.$emit('refresh')
+        })
+        return
+      }
+      if(this.type === 'editor'){
+        this.form.items.forEach(item => {
+          item.operations = item.operations.toString()
+        })
+        console.log(this.form)
+        save({
+          id:this.id,
+          name:this.form.name,
+          items:this.form.items
+        }).then(res => {
+          Message({
+            type:'success',
+            message:'编辑政策成功'
+          })
+          this.isShow = false
+          this.$emit('refresh')
+        })
+        return
+      }
+    }
+
+  },
+  computed:{
 
   },
   watch:{
     isShow(newVal){
       if(newVal){
-
+        if(this.type === 'editor'){
+          this.getDetail()
+        }
       }else{
+        this.policyIndex = 0
         this.id = ''
         this.type = ''
         this.$refs['dialog'].reset()
@@ -62,4 +214,50 @@ export default {
 </script>
 
 <style scoped lang="scss">
+.xy-table-item-label{
+  width: 130px;
+}
+.xy-table-item-content-items{
+  display: flex;
+
+  &-item{
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+
+    margin-bottom: 10px;
+    margin-right: 10px;
+
+    &__title{
+      width: 100px;
+      word-break: keep-all;
+      white-space: nowrap;
+      font-weight: 600;
+      text-align: center;
+    }
+    &__label{
+      word-break: keep-all;
+      white-space: nowrap;
+
+      padding: 0 10px;
+    }
+    &__percent{
+
+      position: relative;
+
+      &::after{
+        content:'%';
+
+        position: absolute;
+        right: 6%;
+        top: 0;
+      }
+    }
+  }
+}
+
+::v-deep .el-input__inner{
+  text-align: left;
+}
 </style>
diff --git a/src/views/productService/confinementClub.vue b/src/views/productService/confinementClub.vue
new file mode 100644
index 0000000..6921620
--- /dev/null
+++ b/src/views/productService/confinementClub.vue
@@ -0,0 +1,52 @@
+<template>
+  <div style="padding: 0 20px">
+    <div ref="lxHeader">
+      <lx-header icon="md-apps" text="月子会所" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
+        <div slot="content"></div>
+        <slot>
+          <div>
+            <Input v-model="select.keywords" style="width: 200px; margin-right: 10px" placeholder="关键字搜索" />
+            <Select placeholder="类型搜索" v-model="select.type" style="width: 140px;margin-right: 10px">
+
+            </Select>
+            <Button type="primary">查询</Button>
+            <Button type="primary" style="margin-left: 10px" @click="$refs['addConfinementClub'].type = 'add',$refs['addConfinementClub'].isShow = true">新增</Button>
+          </div>
+        </slot>
+      </lx-header>
+    </div>
+
+    <xy-table :total="total" :list="list" :table-item="table" @pageSizeChange="e => select.pageSize = e"></xy-table>
+
+    <addConfinementClub ref="addConfinementClub"></addConfinementClub>
+  </div>
+</template>
+
+<script>
+import addConfinementClub from '@/views/productService/components/addConfinementClub'
+export default {
+  components:{
+    addConfinementClub
+  },
+  data() {
+    return {
+      select:{
+        page:1,
+        pageSize:10,
+        keywords:'',
+        type:''
+      },
+
+      total:0,
+      list:[],
+      table:[],
+
+    }
+  },
+  methods: {}
+
+}
+</script>
+
+<style scoped lang="scss">
+</style>
diff --git a/src/views/productService/policyManage.vue b/src/views/productService/policyManage.vue
index 24a6264..72a955f 100644
--- a/src/views/productService/policyManage.vue
+++ b/src/views/productService/policyManage.vue
@@ -22,12 +22,14 @@
       @editor="editor"
       @delete="deletePolicy"></xy-table>
 
-    <addPolicy ref="addPolicy"></addPolicy>
+    <addPolicy ref="addPolicy" @refresh="getPolicies"></addPolicy>
   </div>
 </template>
 
 <script>
 import {index,destroy} from "@/api/policy"
+import {deepCopy} from "@/utils"
+import { Message } from 'element-ui'
 
 import addPolicy from "./components/addPolicy"
 export default {
@@ -94,12 +96,21 @@ export default {
     },
 
     editor(row){
+      this.$refs['addPolicy'].detail = deepCopy(row)
       this.$refs['addPolicy'].type = 'editor'
       this.$refs['addPolicy'].id = row.id
       this.$refs['addPolicy'].isShow = true
     },
     deletePolicy(row){
-
+      destroy({
+        id:row.id
+      }).then(res => {
+        Message({
+          type:'success',
+          message:'删除政策成功'
+        })
+        this.getPolicies()
+      })
     }
   },
   mounted() {