diff --git a/src/api/yxStoreExpert.js b/src/api/yxStoreExpert.js
new file mode 100644
index 0000000..1c5d7db
--- /dev/null
+++ b/src/api/yxStoreExpert.js
@@ -0,0 +1,27 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'bxg/api/yxStoreExpert',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: 'bxg/api/yxStoreExpert/',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'bxg/api/yxStoreExpert',
+    method: 'put',
+    data
+  })
+}
+
+export default { add, edit, del }
diff --git a/src/views/bxg/activity/coupon/form.vue b/src/views/bxg/activity/coupon/form.vue
index ca7d551..940a156 100644
--- a/src/views/bxg/activity/coupon/form.vue
+++ b/src/views/bxg/activity/coupon/form.vue
@@ -19,8 +19,17 @@
       <el-form-item label="优惠券最低消费">
         <el-input-number v-model="form.useMinPrice" style="width: 300px;" />
       </el-form-item>
-      <el-form-item label="优惠券有效期限(天)">
-        <el-input-number v-model="form.couponTime" style="width: 300px;" />
+<!--      <el-form-item label="优惠券有效期限(天)">-->
+<!--        <el-input-number v-model="form.couponTime" style="width: 300px;" />-->
+<!--      </el-form-item>-->
+      <el-form-item label="优惠券有效期限">
+        <el-date-picker
+          v-model="form.dataList"
+          type="datetimerange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="['00:00:00']">
+        </el-date-picker>
       </el-form-item>
       <el-form-item label="排序">
         <el-input-number v-model="form.sort" style="width: 300px;" />
@@ -64,7 +73,8 @@ export default {
         integral: 0,
         couponPrice: 0,
         useMinPrice: 0,
-        couponTime: 1,
+        // couponTime: 1,
+        dataList:'',
         sort: 0,
         status: 1,
         type: 0,
@@ -92,17 +102,27 @@ export default {
     doSubmit() {
       this.loading = true
       if (this.isAdd) {
+        // console.log('this.form',this.form);
         this.doAdd()
       } else this.doEdit()
     },
     doAdd() {
       add(this.form).then(res => {
-        this.resetForm()
+        if (res.status==500){
+          this.$notify({
+            title: res.msg,
+            type: 'warning',
+            duration: 2500
+          })
+          this.loading = false
+          return
+        }
         this.$notify({
           title: '添加成功',
           type: 'success',
           duration: 2500
         })
+        this.resetForm()
         this.loading = false
         this.$parent.init()
       }).catch(err => {
@@ -134,7 +154,7 @@ export default {
         integral: 0,
         couponPrice: 0,
         useMinPrice: 0,
-        couponTime: 1,
+        // couponTime: 1,
         sort: 0,
         status: 1,
         type: 0,
diff --git a/src/views/bxg/shop/storeBrand/index.vue b/src/views/bxg/shop/storeBrand/index.vue
index 6b85f00..645aa52 100644
--- a/src/views/bxg/shop/storeBrand/index.vue
+++ b/src/views/bxg/shop/storeBrand/index.vue
@@ -5,7 +5,7 @@
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <div v-if="crud.props.searchToggle">
         <!-- 搜索 -->
-        <el-input v-model="query.cateName" clearable size="small" placeholder="输入品牌名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
+        <el-input v-model="query.brandName" clearable size="small" placeholder="输入品牌名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
         <rrOperation :crud="crud" />
       </div>
       <crudOperation :permission="permission" />
@@ -112,6 +112,10 @@ export default {
       return true
     }, // 新增与编辑前做的操作
     [CRUD.HOOK.afterToCU](crud, form) {
+      this.picArr = []
+      if (form.pic && form.id) {
+        this.picArr = form.pic.split(',')
+      }
     },
   }
 }
diff --git a/src/views/bxg/yxStoreExpert/index.vue b/src/views/bxg/yxStoreExpert/index.vue
new file mode 100644
index 0000000..5419187
--- /dev/null
+++ b/src/views/bxg/yxStoreExpert/index.vue
@@ -0,0 +1,170 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
+      <div v-if="crud.props.searchToggle">
+        <!-- 搜索 -->
+        <el-input v-model="query.expertName" clearable size="small" placeholder="输入专家名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
+        <rrOperation :crud="crud" />
+      </div>
+      <crudOperation :permission="permission" />
+      <!--表单组件-->
+      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px">
+        <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
+          <el-form-item label="专家id">
+            <el-input v-model="form.id" style="width: 370px;" />
+          </el-form-item>
+<!--          <el-form-item label="商户Id(0为总后台管理员创建,不为0的时候是商户后台创建)">-->
+<!--            <el-input v-model="form.merId" style="width: 370px;" />-->
+<!--          </el-form-item>-->
+<!--          <el-form-item label="人像大图" prop="image">-->
+<!--            <el-input v-model="form.image" style="width: 370px;" />-->
+<!--          </el-form-item>-->
+          <el-form-item label="人像大图">
+            <MaterialList v-model="picArr" type="image" :num="1" :width="150" :height="150" />
+          </el-form-item>
+          <el-form-item label="专家名称" prop="expertName">
+            <el-input v-model="form.expertName" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="专家简介" prop="expertInfo">
+            <el-input v-model="form.expertInfo" type="textarea" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="专家职级" prop="expertStatus">
+            <el-input v-model="form.expertStatus" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="所属单位" prop="expertUnit">
+            <el-input v-model="form.expertUnit" style="width: 370px;" />
+          </el-form-item>
+<!--          <el-form-item label="添加时间">-->
+<!--            <el-input v-model="form.createTime" style="width: 370px;" />-->
+<!--          </el-form-item>-->
+<!--          <el-form-item label="更新时间">-->
+<!--            <el-input v-model="form.updateTime" style="width: 370px;" />-->
+<!--          </el-form-item>-->
+<!--          <el-form-item label="是否删除">-->
+<!--            <el-input v-model="form.isDel" style="width: 370px;" />-->
+<!--          </el-form-item>-->
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="text" @click="crud.cancelCU">取消</el-button>
+          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
+        </div>
+      </el-dialog>
+      <!--表格渲染-->
+      <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="small" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
+        <el-table-column type="selection" width="55" />
+        <el-table-column v-if="columns.visible('id')" prop="id" label="专家id" />
+<!--        <el-table-column v-if="columns.visible('merId')" prop="merId" label="商户Id(0为总后台管理员创建,不为0的时候是商户后台创建)" />-->
+<!--        <el-table-column v-if="columns.visible('image')" prop="image" label="人像大图" />-->
+        <el-table-column v-if="columns.visible('expertName')" prop="expertName" label="专家名称" />
+        <el-table-column v-if="columns.visible('expertInfo')" prop="expertInfo" label="专家简介" />
+        <el-table-column v-if="columns.visible('expertStatus')" prop="expertStatus" label="专家职级" />
+        <el-table-column v-if="columns.visible('expertUnit')" prop="expertUnit" label="所属单位" />
+        <el-table-column v-if="columns.visible('createTime')" prop="createTime" label="添加时间">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.createTime) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column v-if="columns.visible('updateTime')" prop="updateTime" label="更新时间">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.updateTime) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column v-if="columns.visible('isDel')" prop="isDel" label="是否删除" />
+        <el-table-column v-permission="['admin','yxStoreExpert:edit','yxStoreExpert:del']" label="操作" width="150px" align="center">
+          <template slot-scope="scope">
+            <udOperation
+              :data="scope.row"
+              :permission="permission"
+            />
+          </template>
+        </el-table-column>
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+    </div>
+  </div>
+</template>
+
+<script>
+import crudYxStoreExpert from '@/api/yxStoreExpert'
+import CRUD, { presenter, header, form, crud } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import udOperation from '@crud/UD.operation'
+import pagination from '@crud/Pagination'
+import MaterialList from "@/components/material";
+
+// crud交由presenter持有
+const defaultCrud = CRUD({ title: '专家', url: 'bxg/api/yxStoreExpert', sort: 'id,desc', crudMethod: { ...crudYxStoreExpert }})
+const defaultForm = { id: null, merId: 0, image: null, expertName: null, expertInfo: null, expertStatus: null, expertUnit: null, createTime: null, updateTime: null, isDel: null }
+export default {
+  name: 'YxStoreExpert',
+  components: { pagination, crudOperation, rrOperation, udOperation ,MaterialList},
+  mixins: [presenter(defaultCrud), header(), form(defaultForm), crud()],
+  data() {
+    return {
+      picArr:[],
+      permission: {
+        add: ['admin', 'yxStoreExpert:add'],
+        edit: ['admin', 'yxStoreExpert:edit'],
+        del: ['admin', 'yxStoreExpert:del']
+      },
+      rules: {
+        image: [
+          { required: true, message: '专家人像大图不能为空', trigger: 'blur' }
+        ],
+        expertName: [
+          { required: true, message: '专家名称不能为空', trigger: 'blur' }
+        ],
+        expertInfo: [
+          { required: true, message: '专家简介不能为空', trigger: 'blur' }
+        ],
+        expertStatus: [
+          { required: true, message: '专家的职级不能为空', trigger: 'blur' }
+        ],
+        expertUnit: [
+          { required: true, message: '专家所属单位不能为空', trigger: 'blur' }
+        ]
+      }    }
+  },
+  watch: {
+    picArr: function(val) {
+      console.log();
+      this.form.image = val.join(',')
+    }
+  },
+  methods: {
+    // 获取数据前设置好接口地址
+    [CRUD.HOOK.beforeRefresh]() {
+      return true
+    }, // 新增与编辑前做的操作
+    [CRUD.HOOK.afterToCU](crud, form) {
+      this.picArr = []
+      if (form.pic && form.id) {
+        this.picArr = form.pic.split(',')
+      }
+    },
+  }
+}
+
+
+
+</script>
+
+<style scoped>
+  .table-img {
+    display: inline-block;
+    text-align: center;
+    background: #ccc;
+    color: #fff;
+    white-space: nowrap;
+    position: relative;
+    overflow: hidden;
+    vertical-align: middle;
+    width: 32px;
+    height: 32px;
+    line-height: 32px;
+  }
+</style>