diff --git a/src/components/material/index.vue b/src/components/material/index.vue
index 19a546b..f1c0323 100644
--- a/src/components/material/index.vue
+++ b/src/components/material/index.vue
@@ -172,6 +172,12 @@ export default {
         return 5
       }
     },
+    // disabled:{
+    //   type:Boolean,
+    //   default(){
+    //     return false
+    //   }
+    // },
     // 宽度
     width: {
       type: Number,
diff --git a/src/utils/request.js b/src/utils/request.js
index cf716e6..ead5e25 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -61,6 +61,7 @@ service.interceptors.request.use(config => {
 
 // 响应拦截器
 service.interceptors.response.use(res => {
+  // console.log('res1111111111',res)
     // 未设置状态码则默认成功状态
     const code = res.data.code || 200;
     // 获取错误信息
@@ -89,7 +90,14 @@ service.interceptors.response.use(res => {
         type: 'error'
       })
       return Promise.reject(new Error(msg))
-    } else if (code === 901) {
+    }else if(res.data.status === 500){
+        Message({
+          message: msg,
+          type: 'error'
+        })
+        return Promise.reject(new Error(msg))
+      }
+    else if (code === 901) {
       Message({
         type: 'error',
         duration: 0,
diff --git a/src/views/bxg/activity/bargain/form.vue b/src/views/bxg/activity/bargain/form.vue
index 6420b7e..198e232 100644
--- a/src/views/bxg/activity/bargain/form.vue
+++ b/src/views/bxg/activity/bargain/form.vue
@@ -6,14 +6,17 @@
           <cgood v-model="form1.good" :disabled="true" ></cgood>
         </el-form-item>
       </el-col>
-      <el-form-item label="砍价名称">
+      <el-form-item label="砍价活动标题">
         <el-input v-model="form.title" style="width: 500px;" />
       </el-form-item>
+      <el-form-item label="商品名称">
+        <el-input v-model="form.storeName" style="width: 500px;" disabled="true"/>
+      </el-form-item>
       <el-form-item label="砍价简介">
-        <el-input v-model="form.info" style="width: 500px;" rows="5" type="textarea" />
+        <el-input v-model="form.info" disabled="true" style="width: 500px;" rows="5" type="textarea" />
       </el-form-item>
       <el-form-item label="单位">
-        <el-input v-model="form.unitName" style="width: 500px;" />
+        <el-input v-model="form.unitName" disabled="true" style="width: 500px;" />
       </el-form-item>
       <el-form-item label="活动开始时间">
         <template>
@@ -34,7 +37,7 @@
         </template>
       </el-form-item>
       <el-form-item label="砍价产品主图片">
-        <single-pic v-model="form.image" style="width: 500px" type="image" :num="1" :width="150" :height="150" />
+        <single-pic v-model="form.image"  style="width: 500px" type="image" :num="1" :width="150" :height="150" />
       </el-form-item>
       <el-form-item label="砍价产品轮播图">
         <MaterialList v-model="form.sliderImageArr" style="width: 500px" type="image" :num="4" :width="150" :height="150" />
@@ -208,9 +211,9 @@ export default {
           Object.keys(that.form).forEach(key=>{
                 if(data[key]) that.form[key] = data[key];
           })
-          that.form.productId = data.id
+          that.form.productId = data.id;
+          that.form.storeName = data.store_name;
           that.form.cate_id = cate_id;
-          that.form.title = data.store_name
           that.form.info = data.store_info
           that.form.unitName = data.unit_name
           that.form.imageArr = data.image
diff --git a/src/views/bxg/activity/bargain/index.vue b/src/views/bxg/activity/bargain/index.vue
index 72b0c12..60b7ce4 100644
--- a/src/views/bxg/activity/bargain/index.vue
+++ b/src/views/bxg/activity/bargain/index.vue
@@ -24,7 +24,8 @@
     <!--表格渲染-->
     <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
       <el-table-column prop="id" label="砍价产品ID" />
-      <el-table-column prop="title" label="砍价名称" />
+      <el-table-column prop="title" label="活动名称" />
+      <el-table-column prop="storeName" label="商品名称" />
       <el-table-column prop="image" label="砍价图片">
         <template slot-scope="scope">
           <a :href="scope.row.image" style="color: #42b983" target="_blank"><img :src="scope.row.image" alt="点击打开" class="el-avatar"></a>
diff --git a/src/views/bxg/activity/combination/form.vue b/src/views/bxg/activity/combination/form.vue
index 5b712ab..0960bcc 100644
--- a/src/views/bxg/activity/combination/form.vue
+++ b/src/views/bxg/activity/combination/form.vue
@@ -10,22 +10,22 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="拼团名称" prop="title">
-              <el-input v-model="formValidate.title" @input="onInput()" style="width: 500px;" placeholder="请输入拼团名称"/>
+            <el-form-item label="拼团商品名称" prop="title" >
+              <el-input v-model="formValidate.title" @input="onInput()" disabled="true" style="width: 500px;" placeholder="请输入拼团名称"/>
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="拼团简介" prop="info">
-              <el-input v-model="formValidate.info" @input="onInput()" style="width: 500px;" placeholder="请输入拼团简介"/>
+            <el-form-item label="拼团简介" prop="info" >
+              <el-input v-model="formValidate.info"  disabled="true" @input="onInput()" style="width: 500px;" placeholder="请输入拼团简介"/>
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="单位" prop="unitName">
-              <el-input v-model="formValidate.unitName" @input="onInput()" style="width: 500px;" placeholder="请输入单位"/>
+            <el-form-item label="单位" prop="unitName" >
+              <el-input v-model="formValidate.unitName"  disabled="true" @input="onInput()" style="width: 500px;" placeholder="请输入单位"/>
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="商品原价">
+            <el-form-item label="商品原价" >
 <!--              oneFormValidate[0].cost-->
               <el-input type="text" style="width: 500px;" disabled v-model="formValidate.productPrice" />
             </el-form-item>
diff --git a/src/views/bxg/shop/yxStoreHotList/index.vue b/src/views/bxg/shop/yxStoreHotList/index.vue
index 0573fb8..7a4ee00 100644
--- a/src/views/bxg/shop/yxStoreHotList/index.vue
+++ b/src/views/bxg/shop/yxStoreHotList/index.vue
@@ -52,9 +52,9 @@
               <el-radio :label="0">隐藏</el-radio>
             </el-radio-group>
           </el-form-item>
-<!--          <el-form-item label="排序">-->
-<!--            <el-input v-model="form.sort" style="width: 380px;" type="number" />-->
-<!--          </el-form-item>-->
+          <el-form-item label="排序">
+            <el-input v-model="form.sort" style="width: 380px;" type="number" />
+          </el-form-item>
 <!--          <el-form-item label="添加时间">-->
 <!--            <el-input v-model="form.createTime" style="width: 370px;" />-->
 <!--          </el-form-item>-->
@@ -79,7 +79,7 @@
         <el-table-column v-if="columns.visible('id')" prop="id" label="榜单列表ID" />
         <el-table-column v-if="columns.visible('listName')" prop="listName" label="榜单名称" />
 <!--        <el-table-column v-if="columns.visible('mouth')" prop="mouth" label="所属月份" />-->
-<!--        <el-table-column v-if="columns.visible('sort')" prop="sort" label="排序" />-->
+        <el-table-column v-if="columns.visible('sort')" prop="sort" label="排序" />
 <!--        <el-table-column v-if="columns.visible('productlist')" prop="productlist" label="商品列表" width="250">-->
 <!--          <template slot-scope="scope">-->
 <!--            <div v-for="(item,index) in (scope.row.productInfoList)">-->