edit

src/views/merchant/deposit/index.vue

@@ -73,7 +73,7 @@
             />
           </el-select>
         </el-form-item> -->
-        <el-form-item v-if="type == 0" label="退回状态：" prop="status">
+        <!-- <el-form-item v-if="type == 0" label="退回状态：" prop="status">
           <el-select
             v-model="tableFrom.status"
             clearable
@@ -85,6 +85,19 @@
             <el-option label="未退回" value="-1" />
             <el-option label="已退回" value="1" />
           </el-select>
+        </el-form-item> -->
+        <el-form-item label="状态：" prop="status" v-if="type == 2">
+          <el-select
+            v-model="tableFrom.status"
+            clearable
+            placeholder="请选择"
+            class="selWidth"
+            @change="getList(1)"
+          >
+            <el-option label="待审核" value="0" />
+            <el-option label="同意" value="1" />
+            <el-option label="失败" value="-2" />
+          </el-select>
         </el-form-item>
         <el-form-item label="关键字：" prop="keyword">
           <el-input
@@ -105,7 +118,7 @@
         <el-tabs
           v-if="headeNum.length > 0"
           v-model="type"
-          @tab-click="getList(1)"
+          @tab-click="getList(1),resetStatus()"
         >
           <el-tab-pane
             v-for="(item, index) in headeNum"
@@ -318,6 +331,12 @@
           <template slot-scope="scope">
             <span>{{ type == 0 ? scope.row.admin_mark : scope.row.mark }}</span>
           </template>
+        </el-table-column>
+         <el-table-column label="状态" min-width="120" v-if="type == 2">
+          <template slot-scope="scope">
+            <!-- 0 待审核 -2 失败 1 同意 -->
+            <span>{{ scope.row.status == 0 ? '待审核':scope.row.status == 1 ? '同意': '失败' }}</span>
+          </template>
         </el-table-column>
         <el-table-column
           v-if="type == 2"
@@ -706,6 +725,9 @@ export default {
     this.getList("");
   },
   methods: {
+    resetStatus(){
+      this.tableFrom.status = ''
+    },
     /**重置 */
     searchReset(){
       this.timeVal = []

src/views/merchant/list/index.vue

@@ -265,8 +265,8 @@
           <template slot-scope="scope">
             <el-switch
               v-model="scope.row.status"
-              :active-value="1"
-              :inactive-value="0"
+              :active-value="0"
+              :inactive-value="1"
               active-text="开启"
               inactive-text="关闭"
               :width="55"
@@ -274,7 +274,7 @@
             />
           </template>
         </el-table-column>
-        <el-table-column prop="lock" label="开启/关闭权限" min-width="110">
+        <el-table-column prop="lock" label="限制(开启/关闭)" min-width="120" v-if="isStatus!=0">
           <template slot-scope="scope">
             <el-switch
               v-model="scope.row.lock"
@@ -324,7 +324,7 @@
         <el-table-column label="操作" min-width="220" fixed="right">
           <template slot-scope="scope">
             <el-button
-              v-if="isStatus=== '1'"
+              v-if="isStatus=== '1' || isStatus=== '2' "
               type="text"
               size="small"
               @click="onLogo(scope.row.mer_id)"
@@ -440,7 +440,7 @@ export default {
         {
           count: "",
           type: "2",
-          title: "已关闭权限商户",
+          title: "已限制商户",
         },
         {
           count: "",
@@ -603,7 +603,7 @@ export default {
       if(this.isStatus==2){
         this.tableFrom = {...this.tableFrom,lock:'1',status:''}
       }else{
-        this.tableFrom = {...this.tableFrom,status:this.isStatus,lock:''}
+        this.tableFrom = {...this.tableFrom,status:this.isStatus,lock:'0'}
       }
       this.tableFrom.page = num ? num : this.tableFrom.page;
       merchantListApi(this.tableFrom)

src/views/product/productExamine/editAttr.vue

@@ -71,7 +71,7 @@
                     <el-input @input="handleOnform('proportion')" v-model="oneFormBatch[0].proportion" :min="0" class="priceBox" controls-position="right"/>
                   </template>
                 </el-table-column>
-                <el-table-column label="抵扣卷" min-width="100" align="center">
+                <el-table-column label="抵扣券" min-width="100" align="center">
                   <template slot-scope="scope">
                     <el-input @input="batchInput" v-model="oneFormBatch[0].coupon" class="priceBox" controls-position="right"/>
                   </template>
@@ -271,7 +271,7 @@ const objTitle = {
     title: '占比'
   },
   coupon:{
-    title:'抵扣卷'
+    title:'抵扣券'
   },
   stock: {
     title: '库存'

src/views/product/productExamine/info.vue

@@ -745,7 +745,7 @@ const objTitle = {
     title: "占比",
   },
   coupon:{
-    title:'抵扣卷'
+    title:'抵扣券'
   },
   stock: {
     title: "库存",

src/views/product/productExamine/proDetails.vue

@@ -1223,7 +1223,7 @@ const objTitle = {
     title: "占比",
   },
   coupon:{
-    title:'抵扣卷'
+    title:'抵扣券'
   },
   stock: {
     title: "库存",