diff --git a/.env.development b/.env.development
index baeb582..6caf031 100644
--- a/.env.development
+++ b/.env.development
@@ -2,7 +2,7 @@
 ENV = 'development'
 
 # base api
-VUE_APP_BASE_API = 'http://testg.tropjoin.com'
+VUE_APP_BASE_API = 'http://test.tropjoin.com'
 # VUE_APP_BASE_API = 'https://api.tropjoin.com'
 
 # socket 连接地址
diff --git a/src/views/product/productList/editAttr.vue b/src/views/product/productList/editAttr.vue
index 90ab068..f0d579e 100644
--- a/src/views/product/productList/editAttr.vue
+++ b/src/views/product/productList/editAttr.vue
@@ -113,7 +113,7 @@
                 </el-table-column> -->
                 <el-table-column label="库存" min-width="100" align="center">
                   <template slot-scope="scope">
-                    <el-input-number v-model="oneFormBatch[0].stock" :min="0" class="priceBox" controls-position="right"/>
+                    <el-input-number disabled v-model="oneFormBatch[0].stock" :min="0" class="priceBox" controls-position="right"/>
                   </template>
                 </el-table-column>
                 <!-- <el-table-column label="商品编号" min-width="100" align="center">
@@ -154,7 +154,7 @@
                 <el-table-column v-for="(item,iii) in attrValue" :key="iii" :label="formThead[iii].title" align="center" min-width="120">
                   <template slot-scope="scope">
                     <el-input v-if="formThead[iii].title==='商品编号'" v-model="scope.row[iii]" type="text" class="priceBox" />
-                    <el-input-number v-else v-model="scope.row[iii]" :min="0" class="priceBox" controls-position="right"/>
+                    <el-input-number :disabled="!can_edit_stock&&iii=='stock'" v-else v-model="scope.row[iii]" :min="0" class="priceBox" controls-position="right"/>
                   </template>
                 </el-table-column>
                 <!-- <template v-if="formValidate.extension_type === 1">
@@ -193,7 +193,7 @@
                 <el-table-column v-for="(item,iii) in attrValue" :key="iii" :label="formThead[iii].title" align="center" min-width="120">
                   <template slot-scope="scope">
                     <el-input v-if="formThead[iii].title==='商品编号'" v-model="scope.row[iii]" type="text" class="priceBox" />
-                    <el-input-number v-else v-model="scope.row[iii]" :min="0" class="priceBox" controls-position="right"/>
+                    <el-input-number :disabled="!can_edit_stock&&iii=='stock'" v-else v-model="scope.row[iii]" :min="0" class="priceBox" controls-position="right"/>
                   </template>
                 </el-table-column>
                 <!-- <template v-if="formValidate.extension_type === 1">
@@ -310,6 +310,7 @@ export default {
       modal_loading: false,
       images: '',
       modalPic: false,
+      can_edit_stock:true,
       isChoice: '',
       columns: [],
       merCateList: [], // 商户
@@ -561,10 +562,11 @@ export default {
       }
     },
     // 获取规格数据
-    getAttrDetail(id) {
+    getAttrDetail(id,can_edit_stock) {
       this.product_id = id
       this.loading = true
       this.modals = true
+      this.can_edit_stock = can_edit_stock
       productDetailApi(id)
         .then((res) => {
           const info = res.data
diff --git a/src/views/product/productList/index.vue b/src/views/product/productList/index.vue
index 90aa2f9..49677b4 100644
--- a/src/views/product/productList/index.vue
+++ b/src/views/product/productList/index.vue
@@ -359,6 +359,7 @@
         </el-table-column>
         <el-table-column prop="remark" label="商品备注" min-width="70" />
         <el-table-column prop="price" label="商品售价" min-width="80" />
+        <el-table-column prop="product_recommend_type" label="活动专区" min-width="80" />
         <el-table-column prop="sales" label="销量" min-width="70" />
         <el-table-column prop="stock" label="库存" min-width="70" />
         <el-table-column
@@ -1335,7 +1336,7 @@ export default {
     },
     // 免审编辑
     onAuditFree(row) {
-      this.$refs.editAttr.getAttrDetail(row.product_id);
+      this.$refs.editAttr.getAttrDetail(row.product_id,row.can_edit_stock);
     },
     // 批量设置佣金
     batchCommision() {