diff --git a/src/views/bxg/shop/goods/form.vue b/src/views/bxg/shop/goods/form.vue
index 36e7a8c..bdbcb3d 100644
--- a/src/views/bxg/shop/goods/form.vue
+++ b/src/views/bxg/shop/goods/form.vue
@@ -209,6 +209,31 @@
               </div>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="无理由退款(天)：">
+              <div class="acea-row">
+                <el-input-number v-model="formValidate.config.withoutReason"></el-input-number>
+              </div>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="价保(天)：" >
+              <div class="acea-row">
+                <el-input-number v-model="formValidate.config.confirmed"></el-input-number>
+              </div>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="无理由退款图标：" prop="image">
+              <single-pic v-model="formValidate.config.withoutReasonPic"  type="image" :num="1" :width="150" :height="150" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="价保图标：" prop="image">
+              <single-pic v-model="formValidate.config.confirmedPic"  type="image" :num="1" :width="150" :height="150" />
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="24">
@@ -491,6 +516,12 @@ export default {
         id: 0,
         spec_type: 0,
         temp_id: '',
+        config:{
+          withoutReason:null,
+          withoutReasonPic:'',
+          confirmed:null,
+          confirmedPic:'',
+        },
         attrs: [],
         items: [
           {
@@ -738,18 +769,26 @@ export default {
         size: 999,
         sort: 'id,desc'
       }).then(data => {
-          console.log('dara', data);
+          // console.log('dara', data);
           that.brandList=data.content
         //若为编辑，应初始化一下品牌
         }),
       //查询商品规格和分类
       getInfo(id).then(async res => {
         let data = res.productInfo;
-        console.log('data:'+data,res)
         if(data){
+          console.log('data11111',data)
           let cate_id = parseInt(data.cate_id) || 0;
           let brand_id = parseInt(data.brand_id) || 0;
           this.attrs = data.items || [];
+          if (data.config==undefined){
+            data['config']={
+              withoutReason:null,
+              withoutReasonPic:'',
+              confirmed:null,
+              confirmedPic:'',
+            }
+          }
           that.formValidate = data;
           that.formValidate.cate_id = cate_id;
           that.formValidate.brand_id = brand_id;
diff --git a/src/views/bxg/shop/goods/index.vue b/src/views/bxg/shop/goods/index.vue
index a9cae69..98b2d7b 100644
--- a/src/views/bxg/shop/goods/index.vue
+++ b/src/views/bxg/shop/goods/index.vue
@@ -219,6 +219,7 @@ export default {
       this.$refs.form.getCates()
     },
     edit(data) {
+      console.log('data.config',data.config)
       this.isAdd = false
       const _this = this.$refs.form
       _this.getCates()
@@ -234,6 +235,12 @@ export default {
         parameter:data.parameter,
         keyword: data.keyword,
         barCode: data.barCode,
+      //   config:data.config==null?{
+      //   withoutReason:null,
+      //     withoutReasonPic:'',
+      //     confirmed:null,
+      //     confirmedPic:'',
+      // }:data.config,
         storeCategory: data.storeCategory || {id:null},
         storeBrand:data.brandName || {id:null},
         price: data.price,
diff --git a/src/views/bxg/shop/set/seckill.vue b/src/views/bxg/shop/set/seckill.vue
index 5665c09..a701dc5 100644
--- a/src/views/bxg/shop/set/seckill.vue
+++ b/src/views/bxg/shop/set/seckill.vue
@@ -119,7 +119,8 @@ export default {
         groupName: data.groupName,
         time: data.map.time>9?data.map.time+':00':'0'+data.map.time+':00',
         continued: data.map.continued,
-        status:data.map.status
+        status:data.map.status,
+        rule:data.map.rule
       }
       _this.dialog = true
     }
diff --git a/src/views/bxg/shop/set/seckillform.vue b/src/views/bxg/shop/set/seckillform.vue
index 9b28ee0..3f69725 100644
--- a/src/views/bxg/shop/set/seckillform.vue
+++ b/src/views/bxg/shop/set/seckillform.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog"
-             :title="isAdd ? '新增' : '编辑'" width="500px">
+             :title="isAdd ? '新增' : '编辑'" width="900px">
     <el-form ref="form" :model="form" :rules="rules" size="small" label-width="150px">
       <el-form-item label="开启时间(整数小时)">
 <!--        <el-input v-model="form.time" style="width: 270px;"/>-->
@@ -23,6 +23,9 @@
           <el-radio :label="2">关闭</el-radio>
         </el-radio-group>
       </el-form-item>
+      <el-form-item label="秒杀规则">
+        <editor v-model="form.rule" />
+      </el-form-item>
     </el-form>
     <div slot="footer" class="dialog-footer">
       <!--<el-input v-model="form.groupName" />-->
@@ -35,9 +38,10 @@
 <script>
 import {add, edit} from '@/api/bxg/yxSystemGroupData'
 import picUpload from '@/components/pic-upload'
+import editor from "@views/bxg/components/Editor";
 
 export default {
-  components: {picUpload},
+  components: {picUpload,editor},
   props: {
     isAdd: {
       type: Boolean,
@@ -52,7 +56,8 @@ export default {
         groupName: 'yshop_seckill_time',
         time: '08:00',
         status:2, //默认关闭
-        continued: 2
+        continued: 2,
+        rule:''
       },
       rules: {}
     }
@@ -121,7 +126,8 @@ export default {
         groupName: 'yshop_seckill_time',
         time: '08:00',
         continued: 2,
-        status:2 //默认关闭
+        status:2, //默认关闭
+        rule:''
       }
     }
   }
diff --git a/src/views/bxg/yxEvaluation/index.vue b/src/views/bxg/yxEvaluation/index.vue
index 3f534aa..a51ecfe 100644
--- a/src/views/bxg/yxEvaluation/index.vue
+++ b/src/views/bxg/yxEvaluation/index.vue
@@ -149,7 +149,7 @@ export default {
         initialFrameWidth: '100%', // 初始容器宽度
         UEDITOR_HOME_URL: '/UEditor/',
         serverUrl: '',
-        zIndex:9999,
+        zIndex:5000
       },
       editableTabsValue: '1',
       editableTabs:[],
diff --git a/src/views/bxg/yxStoreExpert/index.vue b/src/views/bxg/yxStoreExpert/index.vue
index 5630545..e7fbf29 100644
--- a/src/views/bxg/yxStoreExpert/index.vue
+++ b/src/views/bxg/yxStoreExpert/index.vue
@@ -113,7 +113,7 @@ import MaterialList from "@/components/material";
 
 // crud交由presenter持有
 const defaultCrud = CRUD({ title: '专家', url: 'bxg/api/yxStoreExpert', sort: 'id,desc', crudMethod: { ...crudYxStoreExpert }})
-const defaultForm = { id: null, image: null, expertName: null, expertInfo: null,
+const defaultForm = { id: null, image: null, expertName: null, expertInfo: null,isShow:1,
   expertStatus: null, expertUnit: null, createTime: null, updateTime: null, isDel: null,sort:0 }
 export default {
   name: 'YxStoreExpert',
@@ -140,9 +140,9 @@ export default {
         expertStatus: [
           { required: true, message: '专家的职级不能为空', trigger: 'blur' }
         ],
-        expertUnit: [
-          { required: true, message: '专家所属单位不能为空', trigger: 'blur' }
-        ]
+        // expertUnit: [
+        //   { required: true, message: '专家所属单位不能为空', trigger: 'blur' }
+        // ]
       }    }
   },
   watch: {