edit

src/views/product/productExamine/index.vue

@@ -194,7 +194,7 @@
             <el-option label="已上架修改" value="3" />
           </el-select>
         </el-form-item>
-        <el-form-item label="待审核状态：" prop="status">
+        <el-form-item label="待审核状态：" prop="status" v-if="Number(tableFrom.type) == 12">
           <el-select
             v-model="tableFrom.status"
             placeholder="请选择"
@@ -357,7 +357,7 @@
             }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="remark" label="商家备注" min-width="100" />
+        <el-table-column prop="merchant.mark" label="商家备注" min-width="100" />
         <el-table-column label="是否惠美乡村店铺" min-width="80">
           <template slot-scope="scope">
             <span>{{ scope.row.merchant.is_huimei ? "是" : "否" }}</span>
@@ -442,7 +442,7 @@
               size="small"
               @click="getBack(scope.row.product_id)"
               v-if="[7 ,9, 10, 11].includes(Number(tableFrom.type))"
-              >返回</el-button
+              >{{tableFrom.type==7?'撤回':'返回'}}</el-button
             >
             <el-button
               type="text"
@@ -534,6 +534,13 @@
         label-width="100px"
         @submit.native.prevent
       >
+        <el-form-item label="商品类型：" prop="audit_type">
+          <el-radio-group v-model="formValidate.audit_type">
+            <el-radio :label="0">食品及保健品</el-radio>
+            <el-radio :label="1">化妆品及日化品</el-radio>
+            <el-radio :label="2">其他品类</el-radio>
+          </el-radio-group>
+        </el-form-item>
         <el-form-item label="品牌名称：" prop="store_name">
           <el-input
             :disabled="true"
@@ -601,7 +608,7 @@
             style="width: 200px"
           />
         </el-form-item>
-        <el-form-item label="平台商品分类：" prop="cate_id" label-width="100px">
+        <el-form-item label="平台商品分类：" prop="cate_id" label-width="110px">
           <el-cascader
             v-model="formValidate.cate_id"
             size="small"
@@ -832,15 +839,9 @@ export default {
         { label: "2星", value: 2 },
         { label: "1星", value: 1 },
       ],
-      // 1 出售中 2 仓库中 3 已售罄 4 警戒库存 5 回收站 6 产品部待审核 7 审核未通过  9 产品部复审 10 运维专员审核 11 最终审核
+      // 0 产品部审核 9 产品部复审 10 运维专员审核 11 最终审核
       statusList: [
-        { label: "出售中", value: 1 },
-        { label: "仓库中", value: 2 },
-        { label: "已售罄", value: 3 },
-        { label: "警戒库存", value: 4 },
-        { label: "回收站", value: 5 },
-        { label: "产品部待审核", value: 6 },
-        { label: "审核未通过", value: 7 },
+        { label: "产品部审核", value: 0 },
         { label: "产品部复审", value: 9 },
         { label: "运维专员审核", value: 10 },
         { label: "最终审核", value: 11 }
@@ -882,6 +883,7 @@ export default {
         slider_image: [],
         qualification: {},
         image: "",
+        audit_type:0
       },
       productStatusList: [
         { label: "上架显示", value: 1 },
@@ -985,17 +987,21 @@ export default {
     setSort(){
       this.$refs.table.clearSort()
       this.tableFrom.order = ''
+      this.tableFrom.status = ''
     },
     getBack(id) {
       this.$modalForm(productBackApi(id)).then(() => this.getList(""));
+      this.getLstFilterApi();
     },
     // 解锁
     openUnlock(id) {
       this.$modalForm(productLockApi(id)).then(() => this.getList(""));
+      this.getLstFilterApi();
     },
     // 锁定
     openLock(id) {
       this.$modalForm(productLockApi(id)).then(() => this.getList(""));
+      this.getLstFilterApi();
     },
     // 价格编辑
     onAuditFree(row) {
@@ -1215,6 +1221,7 @@ export default {
             slider_image: info.slider_image,
             qualification: info.qualification,
             image: info.image,
+            audit_type:info.audit_type
           };
           if (info.is_benefit === 1) this.checkboxGroup.push("is_benefit");
           if (info.is_hot === 1) this.checkboxGroup.push("is_hot");

src/views/user/list/userDetails.vue

@@ -557,7 +557,7 @@
               </div>
             </template>
           </el-tab-pane>
-          <el-tab-pane label="用户成长值" name="growth" size="small">
+          <!-- <el-tab-pane label="用户成长值" name="growth" size="small">
             <template v-if="activeName == 'growth'">
               <el-table :data="tableData.data" size="small">
                 <el-table-column
@@ -587,7 +587,7 @@
                 />
               </div>
             </template> 
-          </el-tab-pane>
+          </el-tab-pane> -->
           <el-tab-pane label="浏览足迹" name="footsteps">
             <template v-if="activeName == 'footsteps'">
               <el-table :data="tableData.data" size="small">