diff --git a/src/api/accounts.js b/src/api/accounts.js
index 8021034..d18a35f 100644
--- a/src/api/accounts.js
+++ b/src/api/accounts.js
@@ -9,6 +9,12 @@
 // +----------------------------------------------------------------------
 import request from './request'
 
+/**
+ * @description 银行卡审核 -- 删除
+ */
+export function delApi(id) {
+  return request.post('merchant/intention/del/' + id)
+}
 
 /**
  * @description 银行卡审核 -- 修改 /sys/merchant/intention/edit/155
@@ -209,6 +215,14 @@ export function transferReviewApi(id, data) {
 export function transferMarkApi(id) {
   return request.get(`financial/mark/${id}/form`)
 }
+
+/**
+ * @description 申请转账 -- 驳回
+ */
+export function refuseApi(id, data) {
+  return request.post(`financial/refuse/${id}`, data)
+}
+
 /**
  * @description 申请转账 -- 转账
  */
diff --git a/src/filters/commFilter.js b/src/filters/commFilter.js
index 3162959..3187051 100644
--- a/src/filters/commFilter.js
+++ b/src/filters/commFilter.js
@@ -173,28 +173,28 @@ export function cancelOrderStatusFilter(status) {
  */
 
 export function orderPayType(type) {
-    const typeMap = {
-      '0': '余额支付',
-      '1': '微信支付',
-      '2': '小程序',
-      '3': '微信支付',
-      '4': '支付宝',
-      '5': '支付宝扫码',
-      '6': '微信扫码',
-      '7': '四川农信',
-      '8': '信用购',
-      '9': '商户余额支付',
-      '10': '对公转账',
-      '11': '微信收银',
-      '12': '现金收款',
-      '13': '支付宝收款'
-    }
-    return typeMap[type]
+  const typeMap = {
+    '0': '余额支付',
+    '1': '微信支付',
+    '2': '小程序',
+    '3': '微信支付',
+    '4': '支付宝',
+    '5': '支付宝扫码',
+    '6': '微信扫码',
+    '7': '四川农信',
+    '8': '信用购',
+    '9': '商户余额支付',
+    '10': '对公转账',
+    '11': '微信收银',
+    '12': '现金收款',
+    '13': '支付宝条码',
   }
-  /**
- *
- * 付费会员支付方式
- */
+  return typeMap[type]
+}
+/**
+*
+* 付费会员支付方式
+*/
 
 export function svipPayType(type) {
   const typeMap = {
@@ -213,12 +213,12 @@ export function svipPayType(type) {
  * @description 订单活动状态
  */
 export function activityOrderStatus(status) {
-    const statusMap = {
-      '-1': '未完成',
-      '10': '已完成',
-      '0': '进行中'
-    }
-    return statusMap[status]
+  const statusMap = {
+    '-1': '未完成',
+    '10': '已完成',
+    '0': '进行中'
+  }
+  return statusMap[status]
 }
 /**
  * @description 自提订单状态
@@ -260,13 +260,13 @@ export function reconciliationStatusFilter(status) {
  * @description 商品状态
  */
 export function productStatusFilter(status) {
-    const statusMap = {
-      '0': '下架',
-      '1': '上架显示',
-      '-1': '平台关闭'
-    }
-    return statusMap[status]
+  const statusMap = {
+    '0': '下架',
+    '1': '上架显示',
+    '-1': '平台关闭'
   }
+  return statusMap[status]
+}
 /**
  * @description 优惠券类型
  */
@@ -381,93 +381,93 @@ export function seckillStatusFilter(status) {
   }
   return statusMap[status]
 }
-  /**
- * @description 导出订单类型
- */
+/**
+* @description 导出订单类型
+*/
 export function exportOrderTypeFilter(type) {
-    const typeMap = {
-      'order': '订单',
-      'financial': '流水',
-      'delivery': '发货单',
-      'importDelivery': '导入记录',
-      'exportFinancial': '账单信息',
-      'searchLog': '用户搜索'
-    }
-    return typeMap[type]
+  const typeMap = {
+    'order': '订单',
+    'financial': '流水',
+    'delivery': '发货单',
+    'importDelivery': '导入记录',
+    'exportFinancial': '账单信息',
+    'searchLog': '用户搜索'
   }
+  return typeMap[type]
+}
 /**
  * @description 主体类型
  */
 export function organizationType(type) {
-    const typeMap = {
-      2401: '小微商户',
-      2500: '个人卖家',
-      4: '个体工商户',
-      2: '企业',
-      3: '党政、机关及事业单位',
-      1708: '其他组织'
-    }
-    return typeMap[type]
+  const typeMap = {
+    2401: '小微商户',
+    2500: '个人卖家',
+    4: '个体工商户',
+    2: '企业',
+    3: '党政、机关及事业单位',
+    1708: '其他组织'
   }
+  return typeMap[type]
+}
 
 /**
  * @description 证件类型
  */
 export function id_docType(type) {
-    const typeMap = {
-      1: '中国大陆居民-身份证',
-      2: '其他国家或地区居民-护照',
-      3: '中国香港居民–来往内地通行证',
-      4: '中国澳门居民–来往内地通行证',
-      5: '中国台湾居民–来往大陆通行证'
-    }
-    return typeMap[type]
+  const typeMap = {
+    1: '中国大陆居民-身份证',
+    2: '其他国家或地区居民-护照',
+    3: '中国香港居民–来往内地通行证',
+    4: '中国澳门居民–来往内地通行证',
+    5: '中国台湾居民–来往大陆通行证'
   }
-  /**
- * @description 证件类型
- */
+  return typeMap[type]
+}
+/**
+* @description 证件类型
+*/
 export function purchaseType(type) {
-    const typeMap = {
-      'sms': '短信',
-      'copy': '商品采集',
-      'dump': '电子面单',
-      'query': '物流查询'
-    }
-    return typeMap[type]
+  const typeMap = {
+    'sms': '短信',
+    'copy': '商品采集',
+    'dump': '电子面单',
+    'query': '物流查询'
   }
+  return typeMap[type]
+}
 
-  /**
- * @description 证件类型
- */
-   export function communityStatus(status) {
-    const statusMap = {
-      '0': '待审核',
-      '1': '审核通过',
-     '-1': '审核失败',
-      '-2': '强制下架'
-    }
-    return statusMap[status]
+/**
+* @description 证件类型
+*/
+export function communityStatus(status) {
+  const statusMap = {
+    '0': '待审核',
+    '1': '审核通过',
+    '-1': '审核失败',
+    '-2': '强制下架'
   }
+  return statusMap[status]
+}
 
-  /**
- * @description 订单配送状态
- */
-   export function runErrandStatus(status) {
-    const statusMap = {
-      '0': '待接单',
-      '-1': '已取消',
-      '2': '待取货',
-      '3': '配送中',
-      '4': '已完成',
-      '9': '物品返回中',
-      '10': '物品返回完成',
-      '100': '骑士到店'
-    }
-    return statusMap[status]
+/**
+* @description 订单配送状态
+*/
+export function runErrandStatus(status) {
+  const statusMap = {
+    '0': '待接单',
+    '-1': '已取消',
+    '2': '待取货',
+    '3': '配送中',
+    '4': '已完成',
+    '9': '物品返回中',
+    '10': '物品返回完成',
+    '100': '骑士到店'
   }
-  /**
- * @description 发送方式
- */
+  return statusMap[status]
+}
+/**
+* @description 发送方式
+*/
 export function sendWay(type) {
   const typesMap = {
     null: '-',
diff --git a/src/views/accounts/auditRecord/index.vue b/src/views/accounts/auditRecord/index.vue
index bf848ab..f042fa9 100644
--- a/src/views/accounts/auditRecord/index.vue
+++ b/src/views/accounts/auditRecord/index.vue
@@ -82,6 +82,7 @@
               @click="transferMark(scope.row, 1)">审核</el-button>
             <el-button type="text" size="small" @click="transferMark(scope.row, 2)">修改</el-button>
             <el-button type="text" size="small" @click="transferMark(scope.row, 3)">查看</el-button>
+            <el-button type="text" size="small" @click="onDel(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -98,8 +99,9 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="审核状态：" prop="status"
-              :rules="{ required:  (auditForm.status == 2 && title == '审核') , message: '审核状态不能为空', trigger: 'change' }">
-              <el-radio-group v-model="auditForm.status" @change="radioChange" :disabled="(title == '查看' || title == '修改')">
+              :rules="{ required: (title == '审核'), message: '审核状态不能为空', trigger: 'change' }">
+              <el-radio-group v-model="auditForm.status" @change="radioChange"
+                :disabled="(title == '查看' || title == '修改')">
                 <el-radio :label="1" class="radio">通过</el-radio>
                 <el-radio :label="2">拒绝</el-radio>
               </el-radio-group>
@@ -109,37 +111,43 @@
           <el-col :span="24">
             <el-form-item label="原因：" prop="fail_msg"
               :rules="{ required: (auditForm.status == 2 && title == '审核') ? true : false, message: '拒绝原因不能为空', trigger: 'change' }">
-              <el-input type="textarea" v-model="auditForm.fail_msg" :rows="3" :disabled="title == '查看' || title == '修改'"></el-input>
+              <el-input type="textarea" v-model="auditForm.fail_msg" :rows="3"
+                :disabled="title == '查看' || title == '修改'"></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="12">
             <el-form-item label="商户名称：">
-              <el-input v-model="transferData.merchantInfo.mer_name" placeholder="请输入商户名称" :disabled="title == '查看'"></el-input>
+              <el-input v-model="transferData.merchantInfo.mer_name" placeholder="请输入商户名称"
+                :disabled="title == '查看'"></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="12">
             <el-form-item label="开户银行：">
-              <el-input v-model="transferData.financial_account.bank" placeholder="请输入开户银行" :disabled="title == '查看'"></el-input>
+              <el-input v-model="transferData.financial_account.bank" placeholder="请输入开户银行"
+                :disabled="title == '查看'"></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="12">
             <el-form-item label="银行账号：">
-              <el-input v-model="transferData.financial_account.bank_code" placeholder="请输入银行账号" :disabled="title == '查看'"></el-input>
+              <el-input v-model="transferData.financial_account.bank_code" placeholder="请输入银行账号"
+                :disabled="title == '查看'"></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="12">
             <el-form-item label="开户户名：">
-              <el-input v-model="transferData.financial_account.name" placeholder="请输入开户户名" :disabled="title == '查看'"></el-input>
+              <el-input v-model="transferData.financial_account.name" placeholder="请输入开户户名"
+                :disabled="title == '查看'"></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="12">
             <el-form-item label="开户网点：">
-              <el-input v-model="transferData.financial_account.bank_branch" placeholder="请输入开户网点" :disabled="title == '查看'"></el-input>
+              <el-input v-model="transferData.financial_account.bank_branch" placeholder="请输入开户网点"
+                :disabled="title == '查看'"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -165,8 +173,8 @@
 // | Author: CRMEB Team <admin@crmeb.com>
 // +----------------------------------------------------------------------
 import { merSelectApi } from '@/api/product'
-import { bankListApi, bandAuditApi ,editApi} from "@/api/accounts";
-import { transferRecordApi, transferDetailApi, transferReviewApi, transferEditApi, transferMarkApi, transferHeaderDataApi, transferRecordsExportApi } from '@/api/accounts'
+import { bankListApi, bandAuditApi, editApi } from "@/api/accounts";
+import { delApi, transferRecordApi, transferDetailApi, transferReviewApi, transferEditApi, transferMarkApi, transferHeaderDataApi, transferRecordsExportApi } from '@/api/accounts'
 import createWorkBook from '@/utils/newToExcel.js';
 import timeOptions from '@/utils/timeOptions';
 export default {
@@ -245,28 +253,32 @@ export default {
 
     // 审核
     transferReview(id) {
+
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
           this.auditForm.id = this.transferData.id;
           this.auditForm.financial_account = this.transferData.financial_account;
-          if(this.title == '修改') {
-            editApi(this.auditForm).then(res=>{
+          this.auditForm.mer_id = this.transferData.mer_id;
+
+          if (this.title == '修改') {
+            editApi(this.auditForm).then(res => {
               this.$message.success(res.message);
-            this.dialogVisible = false;
-            this.getList(1);
+              this.dialogVisible = false;
+              this.getList(1);
             }).catch(res => {
-            this.listLoading = false;
-            this.$message.error(res.message)
-          })
+              this.listLoading = false;
+              this.$message.error(res.message)
+            })
           } else {
-          bandAuditApi(this.auditForm).then(res => {
-            this.$message.success(res.message);
-            this.dialogVisible = false;
-            this.getList(1);
-          }).catch(res => {
-            this.listLoading = false;
-            this.$message.error(res.message)
-          })
+            if (!this.auditForm.status) return this.$message.error("请选择审核状态!");
+            bandAuditApi(this.auditForm).then(res => {
+              this.$message.success(res.message);
+              this.dialogVisible = false;
+              this.getList(1);
+            }).catch(res => {
+              this.listLoading = false;
+              this.$message.error(res.message)
+            })
           }
         }
       })
@@ -282,7 +294,30 @@ export default {
       if (type == 1) this.title = '审核';
       if (type == 2) this.title = '修改';
       if (type == 3) this.title = '查看';
+    },
 
+    // 删除
+    onDel(item) {
+      this.$confirm('您确定要删除商户名称为 "' + item.merchantInfo.mer_name + '" 的" ' + (item.is_own == 1 ? '对公账户' : "法人账户") + '" 吗?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        delApi(item.id).then(res => {
+          this.$message.success('操作成功!');
+          this.getList();
+        }).catch((ree) => {
+          this.$message({
+            type: 'info',
+            message: ree
+          });
+        });
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        });
+      });
     },
 
     // 具体日期
diff --git a/src/views/accounts/subsidy/index.vue b/src/views/accounts/subsidy/index.vue
index f6392ed..4f0dcd7 100644
--- a/src/views/accounts/subsidy/index.vue
+++ b/src/views/accounts/subsidy/index.vue
@@ -22,15 +22,9 @@
         </el-form-item>
       </el-form>
     </div>
-    <cards-data v-if="cardLists.length>0" :card-lists="cardLists" />
+    <cards-data v-if="cardLists.length > 0" :card-lists="cardLists" />
     <el-card>
-      <el-table
-        v-loading="listLoading"
-        :data="tableData.data"
-        size="small"
-        class="table"
-        highlight-current-row
-      >
+      <el-table v-loading="listLoading" :data="tableData.data" size="small" class="table" highlight-current-row>
         <el-table-column label="编号" min-width="80">
           <template slot-scope="scope">
             <span>{{ scope.row.id }}</span>
@@ -44,33 +38,45 @@
         <el-table-column prop="extra.official_purchase_target" label="里海云仓采购目标金额" min-width="150" />
         <el-table-column prop="extra.purchase_target" label="其他店铺采购目标金额" min-width="150" />
         <el-table-column prop="create_time" label="创建时间" min-width="150" sortable />
+        <el-table-column prop="reason" label="备注" min-width="150" sortable />
         <el-table-column label="操作" min-width="150" fixed="right">
           <template slot-scope="scope">
-            <el-button
-              type="text"
-              size="small"
-              @click="handleStatus(scope.row.id, scope.$index)"
-            >审核</el-button>
-          </template>
-          <template slot-scope="scope">
-            <router-link v-if="scope.row.send_status == 0" :to=" { path:`${roterPre}` + '/order/list?order_sn='+scope.row.order_sn } ">
-              <el-button type="text" size="small" class="mr10">修改</el-button>
-            </router-link>
+            <el-button v-if="scope.row.send_status == 0" type="text" size="small"
+              @click="handleStatus(scope.row.id, scope.$index)">审核</el-button>
+            <el-button type="text" size="small" class="mr10" @click="showDialog(scope.row)">修改</el-button>
           </template>
         </el-table-column>
       </el-table>
       <div class="block">
-        <el-pagination
-          background
-          :page-size="tableFrom.limit"
-          :current-page="tableFrom.page"
-          layout="total, prev, pager, next, jumper"
-          :total="tableData.total"
-          @size-change="handleSizeChange"
-          @current-change="pageChange"
-        />
+        <el-pagination background :page-size="tableFrom.limit" :current-page="tableFrom.page"
+          layout="total, prev, pager, next, jumper" :total="tableData.total" @size-change="handleSizeChange"
+          @current-change="pageChange" />
       </div>
     </el-card>
+
+    <el-dialog title="修改数据" :visible.sync="dialogVisible">
+      <el-form ref="editForm" :model="formData" label-width="160px" :rules="rules">
+        <el-form-item label="销售目标金额">
+          <el-input type="number" readonly v-model="formData.extra.sale_target" placeholder="销售目标金额" />
+        </el-form-item>
+        <el-form-item label="里海云仓采购目标金额">
+          <el-input type="number" readonly v-model="formData.extra.official_purchase_target" placeholder="里海云仓采购目标金额" />
+        </el-form-item>
+        <el-form-item label="其他店铺采购目标金额">
+          <el-input type="number" readonly v-model="formData.extra.purchase_target" placeholder="其他店铺采购目标金额" />
+        </el-form-item>
+        <el-form-item label="重新审核说明">
+          <el-input type="number" readonly v-model="formData.reason" placeholder="重新审核说明" />
+        </el-form-item>
+        <el-form-item label="补贴金额" prop="amount">
+          <el-input type="number" v-model="formData.amount" placeholder="请输入补贴金额" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button @click="updateInfo" type="primary">确 认</el-button>
+      </div>
+    </el-dialog>
     <!-- <editForm ref="editForm" @complete="fetchData"></editForm> -->
   </div>
 </template>
@@ -94,6 +100,7 @@ export default {
         data: [],
         total: 0
       },
+      dialogVisible: false,
       roterPre: roterPre,
       listLoading: true,
       tableFrom: {
@@ -106,14 +113,41 @@ export default {
       fromList: fromList,
       options: [],
       cardLists: [],
+      formData: {
+        extra: {}
+      },
+      rules: {
+        amount: [{
+          required: true,
+          message: '请输入补贴金额',
+          tigger: 'blur'
+        }]
+      }
     }
   },
   mounted() {
     this.getList()
   },
   methods: {
+    showDialog(row) {
+      this.formData = { ...row };
+      this.dialogVisible = true;
+    },
+    updateInfo() {
+      this.$refs.editForm.validate((valid) => {
+        if (valid) {
+          subsidyUpdateApi(this.formData).then(res => {
+            this.$message.success(res.message);
+            this.dialogVisible = false;
+            this.getList()
+          }).catch(res => {
+            this.$message.error(res.message);
+          })
+        }
+      })
+    },
     /**重置 */
-    searchReset(){
+    searchReset() {
       this.timeVal = []
       this.tableFrom.type = ""
       this.tableFrom.status = ""
@@ -134,13 +168,13 @@ export default {
       let lebData = {};
       for (let i = 0; i < pageCount; i++) {
         lebData = await this.downData(excelData)
-        pageCount = Math.ceil(lebData.count/excelData.limit)
+        pageCount = Math.ceil(lebData.count / excelData.limit)
         if (lebData.export.length) {
           data = data.concat(lebData.export)
           excelData.page++
         }
       }
-      createWorkBook(lebData.header, lebData.title, data, lebData.foot,lebData.filename);
+      createWorkBook(lebData.header, lebData.title, data, lebData.foot, lebData.filename);
       return
     },
     // 列表
@@ -165,7 +199,7 @@ export default {
     // 审核
     handleStatus(id, idx) {
       this.$modalSure('确定审核通过当前数据？').then(() => {
-        subsidyStatusApi({id: id})
+        subsidyStatusApi({ id: id })
           .then(({ message }) => {
             this.$message.success(message);
             this.getList(1)
@@ -183,5 +217,4 @@ export default {
 }
 </script>
 
-<style scoped>
-</style>
+<style scoped></style>
diff --git a/src/views/accounts/transferRecord/index.vue b/src/views/accounts/transferRecord/index.vue
index f681ecc..2a4c0bc 100644
--- a/src/views/accounts/transferRecord/index.vue
+++ b/src/views/accounts/transferRecord/index.vue
@@ -3,27 +3,12 @@
     <div class="selCard mb14">
       <el-form :model="tableFrom" ref="searchForm" size="small" inline label-width="85px">
         <el-form-item label="时间选择：">
-          <el-date-picker
-            v-model="timeVal"
-            value-format="yyyy/MM/dd"
-            format="yyyy/MM/dd"
-            size="small"
-            type="daterange"
-            placement="bottom-end"
-            placeholder="自定义时间"
-            style="width: 280px;"
-            :picker-options="pickerOptions"
-            @change="onchangeTime"
-          />
+          <el-date-picker v-model="timeVal" value-format="yyyy/MM/dd" format="yyyy/MM/dd" size="small" type="daterange"
+            placement="bottom-end" placeholder="自定义时间" style="width: 280px;" :picker-options="pickerOptions"
+            @change="onchangeTime" />
         </el-form-item>
         <el-form-item label="审核状态：" prop="status">
-          <el-select
-            v-model="tableFrom.status"
-            clearable
-            placeholder="请选择"
-            class="selWidth"
-            @change="getList(1)"
-          >
+          <el-select v-model="tableFrom.status" clearable placeholder="请选择" class="selWidth" @change="getList(1)">
             <el-option label="全部" value="" />
             <el-option label="待审核" value="0" />
             <el-option label="已审核" value="1" />
@@ -31,42 +16,20 @@
           </el-select>
         </el-form-item>
         <el-form-item label="商户名称：" prop="mer_id">
-          <el-select
-            v-model="tableFrom.mer_id"
-            clearable
-            filterable
-            placeholder="请选择"
-            class="selWidth"
-            @change="getList(1)"
-          >
-            <el-option
-              v-for="item in merSelect"
-              :key="item.mer_id"
-              :label="item.mer_name"
-              :value="item.mer_id"
-            />
+          <el-select v-model="tableFrom.mer_id" clearable filterable placeholder="请选择" class="selWidth"
+            @change="getList(1)">
+            <el-option v-for="item in merSelect" :key="item.mer_id" :label="item.mer_name" :value="item.mer_id" />
           </el-select>
         </el-form-item>
         <el-form-item label="商户类别：" prop="is_trader">
-          <el-select
-            v-model="tableFrom.is_trader"
-            clearable
-            placeholder="请选择"
-            class="selWidth"
-            @change="getList(1)"
-          >
+          <el-select v-model="tableFrom.is_trader" clearable placeholder="请选择" class="selWidth" @change="getList(1)">
             <el-option label="自营" value="1" />
             <el-option label="非自营" value="0" />
           </el-select>
         </el-form-item>
         <el-form-item label="收款方式：" prop="financial_type">
-          <el-select
-            v-model="tableFrom.financial_type"
-            clearable
-            placeholder="请选择"
-            class="selWidth"
-            @change="getList(1)"
-          >
+          <el-select v-model="tableFrom.financial_type" clearable placeholder="请选择" class="selWidth"
+            @change="getList(1)">
             <el-option label="全部" value="" />
             <el-option label="银行卡" value="1" />
             <el-option label="支付宝" value="3" />
@@ -74,29 +37,14 @@
           </el-select>
         </el-form-item>
         <el-form-item label="转账状态：" prop="financial_status">
-            <el-select
-              v-model="tableFrom.financial_status"
-              placeholder="请选择"
-              class="selWidth"
-              clearable
-              @change="getList"
-            >
-              <el-option
-                v-for="item in arrivalStatusList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
+          <el-select v-model="tableFrom.financial_status" placeholder="请选择" class="selWidth" clearable
+            @change="getList">
+            <el-option v-for="item in arrivalStatusList" :key="item.value" :label="item.label" :value="item.value" />
+          </el-select>
         </el-form-item>
         <el-form-item label="关键字：" prop="keyword">
-          <el-input
-            v-model="tableFrom.keyword"
-            @keyup.enter.native="getList(1)"
-            placeholder="请输入管理员姓名"
-            class="selWidth"
-            size="small"
-          />
+          <el-input v-model="tableFrom.keyword" @keyup.enter.native="getList(1)" placeholder="请输入管理员姓名" class="selWidth"
+            size="small" />
         </el-form-item>
         <el-form-item>
           <el-button type="primary" size="small" @click="getList(1)">搜索</el-button>
@@ -104,39 +52,35 @@
         </el-form-item>
       </el-form>
     </div>
-    <cards-data v-if="cardLists.length>0" :card-lists="cardLists" />
+    <cards-data v-if="cardLists.length > 0" :card-lists="cardLists" />
     <el-card>
       <div class="mb20">
         <el-button size="small" type="primary" @click="exports">导出列表</el-button>
       </div>
-      <el-table
-        v-loading="listLoading"
-        tooltip-effect="dark"
-        :data="tableData.data"
-        size="small"
-        class="table"
-      >
+      <el-table v-loading="listLoading" tooltip-effect="dark" :data="tableData.data" size="small" class="table">
         <el-table-column label="序号" min-width="60">
-            <template scope="scope">
-                <span>{{ scope.$index+(tableFrom.page - 1) * tableFrom.limit + 1 }}</span>
-            </template>
+          <template scope="scope">
+            <span>{{ scope.$index + (tableFrom.page - 1) * tableFrom.limit + 1 }}</span>
+          </template>
         </el-table-column>
         <el-table-column prop="mer_name" label="商户类别" min-width="80">
           <template slot-scope="scope">
-            <span v-if="scope.row.merchant" class="spBlock">{{ scope.row.merchant .is_trader ? '自营' : '非自营' }}</span>
+            <span v-if="scope.row.merchant" class="spBlock">{{ scope.row.merchant.is_trader ? '自营' : '非自营' }}</span>
           </template>
         </el-table-column>
-         <el-table-column label="商户名称" min-width="150">
+        <el-table-column label="商户名称" min-width="150">
           <template slot-scope="scope">
             <span>{{ scope.row.merchant ? scope.row.merchant.mer_name : '' }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="create_time" label="申请时间" min-width="150"/>
+        <el-table-column prop="create_time" label="申请时间" min-width="150" />
         <el-table-column prop="extract_money" label="转账金额（元）" min-width="120" />
         <el-table-column prop="admin_id" label="平台管理员姓名" min-width="120" />
         <el-table-column label="收款方式" min-width="100">
           <template slot-scope="scope">
-            <span v-if="scope.row.financial_type">{{scope.row.financial_type == 1 ? '银行' : scope.row.financial_type == 2 ? '微信' : '支付宝' }}</span>
+            <span v-if="scope.row.financial_type">{{ scope.row.financial_type == 1 ? '银行' : scope.row.financial_type ==
+        2
+        ? '微信' : '支付宝' }}</span>
             <span v-else>--</span>
           </template>
         </el-table-column>
@@ -154,57 +98,83 @@
             <span>{{ scope.row.financial_status == 1 ? '已到账' : '未到账' }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="mer_money" label="商户余额（元）" min-width="120"/>
+        <el-table-column prop="mer_money" label="商户余额（元）" min-width="120" />
         <el-table-column label="操作" min-width="180" fixed="right">
           <template slot-scope="scope">
-            <el-button v-if="scope.row.status == 0" type="text" size="small" @click="transferDetail(scope.row.financial_id)">审核</el-button>
-            <el-button v-if="scope.row.status == 1 && scope.row.financial_status != 1" type="text" size="small" @click="transferDetail(scope.row.financial_id,1)">转账</el-button>
-            <el-button v-if="scope.row.status == 1 && scope.row.financial_status == 1" type="text" size="small" @click="transferDetail(scope.row.financial_id,0)">转账信息</el-button>
+            <el-button v-if="scope.row.status == 0" type="text" size="small"
+              @click="transferDetail(scope.row.financial_id)">审核</el-button>
+            <el-button v-if="scope.row.status == 1 && scope.row.financial_status != 1" type="text" size="small"
+              @click="transferDetail(scope.row.financial_id, 1)">转账</el-button>
+            <el-button v-if="scope.row.status == 1 && scope.row.financial_status == 1" type="text" size="small"
+              @click="transferDetail(scope.row.financial_id, 0)">转账信息</el-button>
+            <el-button type="text" size="small" v-if="scope.row.status == 1 && scope.row.financial_status != 1"
+              @click="onBackInfo(scope.row)">驳回</el-button>
             <el-button type="text" size="small" @click="transferMark(scope.row.financial_id)">备注</el-button>
           </template>
         </el-table-column>
       </el-table>
       <div class="block">
-        <el-pagination
-          background
-          :page-size="tableFrom.limit"
-          :current-page="tableFrom.page"
-          layout="total, prev, pager, next, jumper"
-          :total="tableData.total"
-          @size-change="handleSizeChange"
-          @current-change="pageChange"
-        />
+        <el-pagination background :page-size="tableFrom.limit" :current-page="tableFrom.page"
+          layout="total, prev, pager, next, jumper" :total="tableData.total" @size-change="handleSizeChange"
+          @current-change="pageChange" />
       </div>
     </el-card>
     <!--转账信息-->
-    <el-dialog :title="transferData.status == 0 ? '审核' :  '转账信息'" :visible.sync="dialogVisible" width="700px" v-if="dialogVisible">
+    <el-dialog :title="transferData.status == 0 ? '审核' : '转账信息'" :visible.sync="dialogVisible" width="700px"
+      v-if="dialogVisible">
       <div class="box-container">
         <el-form ref="ruleForm" size="small">
           <div class="section">
             <div class="title">商户信息</div>
             <div class="list">
-              <div class="item"><label class="name">商户名称：</label>{{ transferData.merchant && transferData.merchant.mer_name }}</div>
-              <div class="item"><label class="name">商户ID：</label>{{  transferData.merchant && transferData.merchant.mer_id }}</div>
+              <div class="item"><label class="name">商户名称：</label>{{ transferData.merchant &&
+        transferData.merchant.mer_name
+                }}</div>
+              <div class="item"><label class="name">商户ID：</label>{{ transferData.merchant &&
+        transferData.merchant.mer_id }}
+              </div>
               <div class="item"><label class="name">商户余额：</label>{{ transferData.mer_money }}</div>
-              <div class="item"><label class="name">商户收款方式：</label>{{ transferData.financial_type == 1 ? '银行卡' : transferData.financial_type == 2 ? '微信' : '支付宝' }}</div>
-              <div class="item" v-if="transferData.financial_type == 1"><label class="name">开户银行：</label>{{ transferData.financial_account.bank }}</div>
-              <div class="item" v-if="transferData.financial_type == 1"><label class="name">银行账号：</label>{{ transferData.financial_account.bank_code }}</div>
-              <div class="item" v-if="transferData.financial_type == 1"><label class="name">开户户名：</label>{{ transferData.financial_account.name }}</div>
-              <div class="item" v-if="transferData.financial_type == 1"><label class="name">开户网点：</label>{{ transferData.financial_account.bank_branch }}</div>
-              <div class="item" v-if="transferData.financial_type != 1"><label class="name">真实姓名：</label>{{ transferData.financial_account.name }}</div>
+              <div class="item"><label class="name">商户收款方式：</label>{{ transferData.financial_type == 1 ? '银行卡' :
+        transferData.financial_type == 2 ? '微信' : '支付宝' }}</div>
+              <div class="item" v-if="transferData.financial_type == 1"><label class="name">开户银行：</label>{{
+        transferData.financial_account.bank }}</div>
+              <div class="item" v-if="transferData.financial_type == 1"><label class="name">银行账号：</label>{{
+        transferData.financial_account.bank_code }}</div>
+              <div class="item" v-if="transferData.financial_type == 1"><label class="name">开户户名：</label>{{
+        transferData.financial_account.name }}</div>
+              <div class="item" v-if="transferData.financial_type == 1"><label class="name">开户网点：</label>{{
+        transferData.financial_account.bank_branch }}</div>
+              <div class="item" v-if="transferData.financial_type != 1"><label class="name">真实姓名：</label>{{
+        transferData.financial_account.name }}</div>
             </div>
           </div>
           <div class="section">
             <div class="title">收款信息</div>
             <div class="list">
-              <div class="item" v-if="transferData.financial_type == 2"><label class="name">微信号：</label>{{ transferData.financial_account.wechat }}</div>
-              <div class="item image" v-if="transferData.financial_type == 2"><label class="name">微信收款二维码：</label><img style="max-width: 150px; height: 80px;" @click="getPicture(transferData.financial_account.wechat_code);return false;" :src="transferData.financial_account.wechat_code"/></div>
-              <div class="item" v-if="transferData.financial_type == 3"><label class="name">支付宝账号：</label>{{ transferData.financial_account.alipay }}</div>
-              <div class="item image" v-if="transferData.financial_type == 3"><label class="name">支付宝收款二维码：</label><img style="max-width: 150px; height: 80px;" @click="getPicture(transferData.financial_account.alipay_code);return false;" :src="transferData.financial_account.alipay_code"/></div>
-              <div class="item"><label class="name">本次申请转账金额：</label><span class="font-red">{{ transferData.extract_money }}</span></div>
-              <div class="item" v-if="transferData.status != 0"><label class="name">审核状态：</label>{{ transferData.status == 0 ? '待审核' : transferData.status == 1 ? '已审核' : '审核失败' }}</div>
-              <div class="item" v-if="transferData.status == 1"><label class="name">审核时间：</label>{{ transferData.status_time }}</div>
-              <div class="item" v-if="transferData.status == -1"><label class="name">审核未通过原因：</label>{{ transferData.refusal }}</div>
+              <div class="item" v-if="transferData.financial_type == 2"><label class="name">微信号：</label>{{
+        transferData.financial_account.wechat }}</div>
+              <div class="item image" v-if="transferData.financial_type == 2"><label class="name">微信收款二维码：</label><img
+                  style="max-width: 150px; height: 80px;"
+                  @click="getPicture(transferData.financial_account.wechat_code); return false;"
+                  :src="transferData.financial_account.wechat_code" /></div>
+              <div class="item" v-if="transferData.financial_type == 3"><label class="name">支付宝账号：</label>{{
+        transferData.financial_account.alipay }}</div>
+              <div class="item image" v-if="transferData.financial_type == 3"><label class="name">支付宝收款二维码：</label><img
+                  style="max-width: 150px; height: 80px;"
+                  @click="getPicture(transferData.financial_account.alipay_code); return false;"
+                  :src="transferData.financial_account.alipay_code" /></div>
+              <div class="item"><label class="name">本次申请转账金额：</label><span class="font-red">{{
+        transferData.extract_money
+      }}</span></div>
+              <div class="item" v-if="transferData.status != 0"><label class="name">审核状态：</label>{{ transferData.status
+        == 0
+        ? '待审核' : transferData.status == 1 ? '已审核' : '审核失败' }}</div>
+              <div class="item" v-if="transferData.status == 1"><label class="name">审核时间：</label>{{
+        transferData.status_time
+      }}</div>
+              <div class="item" v-if="transferData.status == -1"><label class="name">审核未通过原因：</label>{{
+        transferData.refusal
+      }}</div>
               <el-form-item label="审核状态：" required v-if="transferData.status == 0" class="item">
                 <el-radio-group v-model="formValidate.status">
                   <el-radio :label="1" class="radio">通过</el-radio>
@@ -216,8 +186,9 @@
               </el-form-item>
               <el-form-item label="转账凭证：" v-if="transferData.status == 1" class="item">
                 <div class="acea-row">
-                  <div v-if="voucher_image.length > 0" v-for="(item,index) in voucher_image" :key="index" class="pictrue">
-                    <img :src="item" @click="getPicture(item)"/>
+                  <div v-if="voucher_image.length > 0" v-for="(item, index) in voucher_image" :key="index"
+                    class="pictrue">
+                    <img :src="item" @click="getPicture(item)" />
                     <i class="el-icon-error btndel" @click="handleRemove(index)" />
                   </div>
                   <div class="upLoadPicBox" @click="modalPicTap('2')">
@@ -231,15 +202,17 @@
           </div>
         </el-form>
       </div>
-       <span slot="footer" class="dialog-footer">
-        <el-button size="small" @click="dialogVisible=false">取消</el-button>
-        <el-button v-if="transferData.status == 0" type="primary" size="small" @click="transferReview(transferData.financial_id)">提交</el-button>
-        <el-button v-if="transferData.status == 1" type="primary" size="small" @click="onSubmit(transferData.financial_id)">提交</el-button>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="small" @click="dialogVisible = false">取消</el-button>
+        <el-button v-if="transferData.status == 0" type="primary" size="small"
+          @click="transferReview(transferData.financial_id)">提交</el-button>
+        <el-button v-if="transferData.status == 1" type="primary" size="small"
+          @click="onSubmit(transferData.financial_id)">提交</el-button>
       </span>
     </el-dialog>
     <!--查看二维码-->
     <el-dialog :visible.sync="pictureVisible" width="700px" v-if="pictureVisible">
-      <img :src="pictureUrl" class="pictures"/>
+      <img :src="pictureUrl" class="pictures" />
     </el-dialog>
     <!--导出订单列表-->
     <file-list ref="exportList" />
@@ -256,7 +229,7 @@
 // | Author: CRMEB Team <admin@crmeb.com>
 // +----------------------------------------------------------------------
 import { merSelectApi } from '@/api/product'
-import { transferRecordApi, transferDetailApi, transferReviewApi, transferEditApi, transferMarkApi, transferHeaderDataApi, transferRecordsExportApi } from '@/api/accounts'
+import { refuseApi, transferRecordApi, transferDetailApi, transferReviewApi, transferEditApi, transferMarkApi, transferHeaderDataApi, transferRecordsExportApi } from '@/api/accounts'
 import cardsData from "@/components/cards/index";
 import createWorkBook from '@/utils/newToExcel.js';
 import fileList from '@/components/exportFile/fileList'
@@ -334,7 +307,7 @@ export default {
   },
   methods: {
     /**重置 */
-    searchReset(){
+    searchReset() {
       this.timeVal = []
       this.tableFrom.date = ""
       this.$refs.searchForm.resetFields()
@@ -351,45 +324,45 @@ export default {
         });
     },
     // 头部数据
-    getHeaderData(){
+    getHeaderData() {
       transferHeaderDataApi().then((res) => {
         this.cardLists = res.data
       })
-      .catch((res) => {
-        this.$message.error(res.message);
-      });
+        .catch((res) => {
+          this.$message.error(res.message);
+        });
     },
     // 转账信息
-    transferDetail(id,num){
-      if(num) this.voucher_image = []
+    transferDetail(id, num) {
+      if (num) this.voucher_image = []
       transferDetailApi(id).then(res => {
         this.listLoading = false;
         this.dialogVisible = true;
         this.transferData = res.data
         this.formValidate.status = res.data.status
-        if(num){
+        if (num) {
           this.voucher_image = []
-        }else{
-            this.voucher_image = res.data.image
+        } else {
+          this.voucher_image = res.data.image
         }
       })
-      .catch(res => {
-        this.listLoading = false;
-        this.$message.error(res.message)
-      })
+        .catch(res => {
+          this.listLoading = false;
+          this.$message.error(res.message)
+        })
     },
     //获取支付二维码
-    getPicture(url){
+    getPicture(url) {
       this.pictureVisible = true;
       this.pictureUrl = url;
     },
     // 审核
-    transferReview(id){
+    transferReview(id) {
       let parmas = {
         status: this.formValidate.status,
         refusal: this.formValidate.refusal
       }
-      transferReviewApi(id,parmas).then(res => {
+      transferReviewApi(id, parmas).then(res => {
         this.listLoading = false;
         this.$message.success(res.message);
         this.dialogVisible = false;
@@ -400,24 +373,49 @@ export default {
       })
     },
     // 备注
-    transferMark(id){
+    transferMark(id) {
       this.$modalForm(transferMarkApi(id)).then(() => this.getList('1'))
     },
+
+    // 驳回
+    onBackInfo(item) {
+      this.$confirm('您确定要驳回商户名称为 "' + item.merchant.mer_name + '" 的"提现申请吗?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        transferReviewApi(item.financial_id, { status: 0 }).then(res => {
+          this.$message.success('操作成功!');
+          this.getList();
+        }).catch((ree) => {
+          this.$message({
+            type: 'info',
+            message: ree
+          });
+        });
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        });
+      });
+    },
+
     // 转账提交
-    onSubmit(id){
-      if(this.voucher_image == 0){
+    onSubmit(id) {
+      if (this.voucher_image == 0) {
         return this.$message.error('请上传转账凭证！')
-      }else{
-        transferEditApi(id,{image: this.voucher_image}).then(res => {
-        this.$message.success(res.message)
-        this.dialogVisible = false;
-        this.getList(1);
+      } else {
+        transferEditApi(id, { image: this.voucher_image }).then(res => {
+          this.$message.success(res.message)
+          this.dialogVisible = false;
+          this.getList(1);
         }).catch(res => {
           this.$message.error(res.message)
         })
       }
     },
-     // 点击商品图
+    // 点击商品图
     modalPicTap(tit, num, i) {
       const _this = this;
       const attr = [];
@@ -425,9 +423,9 @@ export default {
         if (tit === "2" && !num) {
           img.map((item) => {
             attr.push(item.attachment_src);
-              _this.voucher_image.push(item);
-            if(_this.voucher_image.length > 6){
-                _this.voucher_image.length = 6
+            _this.voucher_image.push(item);
+            if (_this.voucher_image.length > 6) {
+              _this.voucher_image.length = 6
             }
           });
         }
@@ -449,13 +447,13 @@ export default {
       let lebData = {};
       for (let i = 0; i < pageCount; i++) {
         lebData = await this.downData(excelData)
-        pageCount = Math.ceil(lebData.count/excelData.limit)
+        pageCount = Math.ceil(lebData.count / excelData.limit)
         if (lebData.export.length) {
           data = data.concat(lebData.export)
           excelData.page++
         }
       }
-      createWorkBook(lebData.header, lebData.title, data, lebData.foot,lebData.filename);
+      createWorkBook(lebData.header, lebData.title, data, lebData.foot, lebData.filename);
       return
     },
     /**订单列表 */
@@ -532,11 +530,13 @@ export default {
   margin-right: 10px;
   position: relative;
   cursor: pointer;
+
   img {
     width: 100%;
     height: 100%;
   }
 }
+
 .btndel {
   position: absolute;
   z-index: 1;
@@ -545,18 +545,22 @@ export default {
   left: 46px;
   top: -4px;
 }
+
 .box-container {
   overflow: hidden;
   padding: 0 10px;
 }
+
 .section {
   padding: 15px 0 30px;
   border-bottom: 1px dashed #eeeeee;
-  &:last-child{
+
+  &:last-child {
     padding: 30px 0 0;
     border-bottom: none;
   }
-  .title{
+
+  .title {
     padding-left: 10px;
     border-left: 3px solid var(--prev-color-primary);
     font-size: 14px;
@@ -565,10 +569,12 @@ export default {
     font-weight: bold;
   }
 }
+
 .box-container .list {
   display: flex;
   flex-wrap: wrap;
 }
+
 .box-container .item {
   margin-top: 16px;
   font-size: 13px;
@@ -576,26 +582,32 @@ export default {
   flex: 0 0 calc(100% / 2);
   color: #606266;
 }
-.box-container .list .info{
+
+.box-container .list .info {
   display: block;
-  .el-textarea{
-   margin-top: 10px;
+
+  .el-textarea {
+    margin-top: 10px;
   }
 }
+
 .box-container .list.image {
   margin: 20px 0;
   position: relative;
 }
+
 .box-container .list.image img {
   position: absolute;
   top: -20px;
 }
+
 .box-container .list .name {
   align-items: center;
   display: inline-block;
   color: #909399;
 }
-.pictures{
+
+.pictures {
   width: 100%;
   max-width: 100%;
 }
diff --git a/src/views/order/list/index.vue b/src/views/order/list/index.vue
index 3a6b2d3..dc0d80a 100644
--- a/src/views/order/list/index.vue
+++ b/src/views/order/list/index.vue
@@ -54,6 +54,7 @@
             @change="getList(1), getCardList()">
             <el-option label="余额支付" value="0" />
             <el-option label="微信支付" value="1" />
+            <el-option label="支付宝" value="2" />
             <el-option label="商户余额支付" value="9" />
             <el-option label="对公转账" value="10" />
             <el-option label="微信收银" value="11" />
@@ -137,7 +138,7 @@
 
         <el-table-column label="订单来源" min-width="80">
           <template slot-scope="scope">
-            <span>{{ scope.row.order_type == 2 ? '扫码付款':'平台下单' }}</span>
+            <span>{{ scope.row.order_type == 2 ? '扫码付款' : '平台下单' }}</span>
           </template>
         </el-table-column>
 
@@ -176,7 +177,9 @@
         </el-table-column>
         <el-table-column label="支付类型" min-width="80">
           <template slot-scope="scope">
-            <span v-if="scope.row.paid === 1">{{ scope.row.pay_type | orderPayType }}</span>
+            <span v-if="scope.row.pay_type == 10">对公转账</span>
+            <span v-else-if="scope.row.pay_type != 10 && scope.row.paid == 1">{{ scope.row.pay_type | orderPayType
+              }}</span>
             <span v-else>--</span>
           </template>
         </el-table-column>
diff --git a/src/views/product/productExamine/index.vue b/src/views/product/productExamine/index.vue
index 13c661e..8c28d95 100644
--- a/src/views/product/productExamine/index.vue
+++ b/src/views/product/productExamine/index.vue
@@ -12,10 +12,10 @@
             <el-option v-for="item in merSelect" :key="item.mer_id" :label="item.mer_name" :value="item.mer_id" />
           </el-select>
         </el-form-item>
-        <el-form-item label="商户类别：" prop="is_trader">
-          <el-select v-model="tableFrom.is_trader" clearable placeholder="请选择" class="selWidth" @change="getList(1)">
-            <el-option label="自营" value="1" />
-            <el-option label="非自营" value="0" />
+        <el-form-item label="店铺类型：" prop="type_id">
+          <el-select v-model="tableFrom.type_id" clearable filterable placeholder="请选择店铺类型" class="selWidth"
+            @change="getList(1)">
+            <el-option v-for="item in storeType" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
         </el-form-item>
         <el-form-item label="商品状态：" prop="us_status">
@@ -221,14 +221,22 @@
         <el-form-item label="排序：">
           <el-input-number v-model="formValidate.rank" size="small" placeholder="请输入排序序号" style="width: 200px;" />
         </el-form-item>
+
         <el-col :span="24">
           <el-form-item label="商品详情：">
-            <ueditor-from v-model="formValidate.content" :content="formValidate.content" />
+            <div class="upLoadPicBox" title="750*750px" style="display: flex;" @click="modalPicTap">
+              <div v-for="(item, index) in formValidate.content.image" class="pictrue details_pictrue"
+                @click.stop="deleteContentImg(index)" :key="index + item">
+                <img :src="item" :key="index" />
+              </div>
+              <div class="upLoad details_pictrue">
+                <i class="el-icon-camera cameraIconfont" />
+              </div>
+            </div>
           </el-form-item>
         </el-col>
-        <el-form-item style="margin-top:30px;">
-          <el-button type="primary" class="submission" size="small" @click="handleSubmit('formValidate')">提交</el-button>
-        </el-form-item>
+        <el-button style="margin-left:22px;" type="primary" class="submission" size="small"
+          @click="handleSubmit('formValidate')">提交</el-button>
       </el-form>
     </el-dialog>
     <!--预览商品-->
@@ -300,6 +308,9 @@ import {
   batchesOnOffApi,
   outportApi
 } from '@/api/product'
+import {
+  getstoreTypeApi,
+} from "@/api/merchant";
 import { roterPre } from '@/settings'
 import infoFrom from './info'
 import ueditorFrom from '@/components/ueditorFrom'
@@ -413,6 +424,7 @@ export default {
         hot_type: '',
         star: '',
         date: '',
+        type_id: '',
         svip_price_type: '',
         product_id: this.$route.query.id ? this.$route.query.id : ""
       },
@@ -433,7 +445,8 @@ export default {
       isBatch: false,
       labelForm: {},
       recommendForm: {},
-      drawer: false
+      drawer: false,
+      storeType: []
     }
   },
   mounted() {
@@ -441,10 +454,30 @@ export default {
     this.getList('')
     this.getCategorySelect()
     this.getLstFilterApi()
-    this.getLabelLst()
+    this.getLabelLst();
+    this.getStoreType();
   },
   methods: {
 
+    /**获取店铺类型 */
+    getStoreType() {
+      getstoreTypeApi().then(res => {
+        this.storeType = res.data
+      })
+    },
+
+    // 点击商品图
+    modalPicTap() {
+      let that = this;
+      this.$modalUpload(function (img) {
+        that.formValidate.content.image = that.formValidate.content.image.concat(img);
+      }, 10);
+    },
+    // 删除详情图片
+    deleteContentImg(index) {
+      this.formValidate.content.image.splice(index, 1)
+    },
+
     tableRowClassName({ row, rowIndex }) {
       if (this.product_id == row.product_id) {
         return "success-row"
@@ -562,7 +595,7 @@ export default {
           content: info.content,
           store_name: info.store_name,
           rank: info.rank,
-          star: info.star
+          star: info.star ? info.star : 0
         }
         if (info.is_benefit === 1) this.checkboxGroup.push('is_benefit')
         if (info.is_hot === 1) this.checkboxGroup.push('is_hot')
@@ -586,7 +619,6 @@ export default {
     },
     // 提交
     handleSubmit(name) {
-      console.log(this.formValidate)
       this.$refs[name].validate((valid) => {
         if (valid) {
           productUpdateApi(this.productId, this.formValidate).then(async res => {
@@ -783,6 +815,20 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.pictrue {
+  width: 60px;
+  height: 60px;
+  border: 1px dotted rgba(0, 0, 0, 0.1);
+  margin-right: 10px;
+  position: relative;
+  cursor: pointer;
+
+  img {
+    width: 100%;
+    height: 100%;
+  }
+}
+
 /deep/.el-select-dropdown__item {
   max-width: 350px !important;
 }