diff --git a/src/api/merchant.js b/src/api/merchant.js
index 6410fc7..5a391cc 100644
--- a/src/api/merchant.js
+++ b/src/api/merchant.js
@@ -228,6 +228,12 @@ export function updateStoreTypeApi(type, data) {
 export function merchantIsCloseApi(id, status) {
   return request.post(`system/merchant/close/${id}`, { status })
 }
+/**
+ * @description 商户列表 -- 退店开关
+ */
+export function merchantIsLockApi(id, lock) {
+  return request.post(`system/merchant/lock/${id}`, { lock })
+}
 /**
  * @description 商户列表 -- 开启商户数
  */
diff --git a/src/api/product.js b/src/api/product.js
index bac1947..a50dced 100644
--- a/src/api/product.js
+++ b/src/api/product.js
@@ -157,6 +157,12 @@ export function categoryListApi(data) {
 export function exportProductApi(data) {
   return request.get(`store/product/export`, data)
 }
+/**
+ * @description 导出用户操作记录
+ */
+export function exportOperate(id = '0', data) {
+  return request.get(`store/product/export_operate/${id}`, data)
+}
 /**
  * @description 商户分类 -- 列表
  */
@@ -185,6 +191,12 @@ export function seckillProductDetailApi(id) {
 export function productStatusFirstApi(data) {
   return request.post(`store/product/status_first`, data)
 }
+/**
+ * @description 商品审核 -- 初步审核
+ */
+export function productStatusFirstTwoApi(data) {
+  return request.post(`store/product/status_first2`, data)
+}
 /**
  * @description 商品审核 -- 二次审核
  */
@@ -299,6 +311,18 @@ export function seckillChangeApi(id, status) {
 export function toVirtualSalesApi(id) {
   return request.get(`store/product/ficti/form/${id}`)
 }
+/**
+ * @description 商品列表 -- 锁定/解锁
+ */
+export function productLockApi(id) {
+  return request.get(`store/product/lock/form/${id}`)
+}
+/**
+ * @description 商品列表 -- 返回
+ */
+export function productBackApi(id) {
+  return request.get(`store/product/back/form/${id}`)
+}
 /**
  * @description 商品列表 -- 标记标记
  */
@@ -491,6 +515,10 @@ export function productGetTempKeysApi() {
 export function batchesLabelsApi(data) {
   return request.post(`store/product/batch_labels`, data)
 }
+/** 商品列表 -- 批量设置标记 */
+export function batchesTagNameApi(data) {
+  return request.post(`store/product/batch_tag_name`, data)
+}
 /** 商品列表 -- 批量设置推荐 */
 export function batchesRecommendApi(data) {
   return request.post(`store/product/batch_hot`, data)
diff --git a/src/directive/el-drag-dialog/drag.js b/src/directive/el-drag-dialog/drag.js
index 61550f2..14bcdc2 100644
--- a/src/directive/el-drag-dialog/drag.js
+++ b/src/directive/el-drag-dialog/drag.js
@@ -1,78 +1,83 @@
-
+import { startDrag } from './drags.js'
 export default {
   bind(el, binding, vnode) {
-    const dialogHeaderEl = el.querySelector('.el-dialog__header')
-    const dragDom = el.querySelector('.el-dialog')
-    dialogHeaderEl.style.cssText += ';cursor:move;'
-    dragDom.style.cssText += ';top:0px;'
+    startDrag(el.querySelector('.el-dialog__header'), el.querySelector('.el-dialog'), binding.value);
+    // const dialogHeaderEl = el.querySelector('.el-dialog__header')
+    // var dialogBodyEl = ''
+    // const dragDom = el.querySelector('.el-dialog')
+    // dialogHeaderEl.style.cssText += ';cursor:move;'
+    // dragDom.style.cssText += ';top:0px;'
 
-    // 获取原有属性 ie dom元素.currentStyle 火狐谷歌 window.getComputedStyle(dom元素, null);
-    const getStyle = (function () {
-      if (window.document.currentStyle) {
-        return (dom, attr) => dom.currentStyle[attr]
-      } else {
-        return (dom, attr) => getComputedStyle(dom, false)[attr]
-      }
-    })()
+    // // 获取原有属性 ie dom元素.currentStyle 火狐谷歌 window.getComputedStyle(dom元素, null);
+    // const getStyle = (function () {
+    //   if (window.document.currentStyle) {
+    //     return (dom, attr) => dom.currentStyle[attr]
+    //   } else {
+    //     return (dom, attr) => getComputedStyle(dom, false)[attr]
+    //   }
+    // })()
 
-    dialogHeaderEl.onmousedown = (e) => {
-      // 鼠标按下，计算当前元素距离可视区的距离
-      const disX = e.clientX - dialogHeaderEl.offsetLeft
-      const disY = e.clientY - dialogHeaderEl.offsetTop
+    // dialogHeaderEl.onmousedown = (e) => {
+    //   dialogBodyEl = el.querySelector('.el-dialog__body')
+    //   dialogBodyEl.style.cssText += '-webkit-user-select: none; -moz-user-select: none; -ms-user-select: none; user-select: none;'
+    //   // 鼠标按下，计算当前元素距离可视区的距离
+    //   const disX = e.clientX - dialogHeaderEl.offsetLeft
+    //   const disY = e.clientY - dialogHeaderEl.offsetTop
 
-      const dragDomWidth = dragDom.offsetWidth
-      const dragDomHeight = dragDom.offsetHeight
+    //   const dragDomWidth = dragDom.offsetWidth
+    //   const dragDomHeight = dragDom.offsetHeight
 
-      const screenWidth = document.body.clientWidth
-      const screenHeight = document.body.clientHeight
+    //   const screenWidth = document.body.clientWidth
+    //   const screenHeight = document.body.clientHeight
 
-      const minDragDomLeft = dragDom.offsetLeft
-      const maxDragDomLeft = screenWidth - dragDom.offsetLeft - dragDomWidth
+    //   const minDragDomLeft = dragDom.offsetLeft
+    //   const maxDragDomLeft = screenWidth - dragDom.offsetLeft - dragDomWidth
 
-      const minDragDomTop = dragDom.offsetTop
-      const maxDragDomTop = screenHeight - dragDom.offsetTop - dragDomHeight
+    //   const minDragDomTop = dragDom.offsetTop
+    //   const maxDragDomTop = screenHeight - dragDom.offsetTop - dragDomHeight
 
-      // 获取到的值带px 正则匹配替换
-      let styL = getStyle(dragDom, 'left')
-      let styT = getStyle(dragDom, 'top')
+    //   // 获取到的值带px 正则匹配替换
+    //   let styL = getStyle(dragDom, 'left')
+    //   let styT = getStyle(dragDom, 'top')
 
-      if (styL.includes('%')) {
-        styL = +document.body.clientWidth * (+styL.replace(/\%/g, '') / 100)
-        styT = +document.body.clientHeight * (+styT.replace(/\%/g, '') / 100)
-      } else {
-        styL = +styL.replace(/\px/g, '')
-        styT = +styT.replace(/\px/g, '')
-      }
+    //   if (styL.includes('%')) {
+    //     styL = +document.body.clientWidth * (+styL.replace(/\%/g, '') / 100)
+    //     styT = +document.body.clientHeight * (+styT.replace(/\%/g, '') / 100)
+    //   } else {
+    //     styL = +styL.replace(/\px/g, '')
+    //     styT = +styT.replace(/\px/g, '')
+    //   }
 
-      document.onmousemove = function (e) {
-        // 通过事件委托，计算移动的距离
-        let left = e.clientX - disX
-        let top = e.clientY - disY
+    //   document.onmousemove = function (e) {
+    //     // 通过事件委托，计算移动的距离
+    //     let left = e.clientX - disX
+    //     let top = e.clientY - disY
 
-        // 边界处理
-        if (-(left) > minDragDomLeft) {
-          left = -minDragDomLeft
-        } else if (left > maxDragDomLeft) {
-          left = maxDragDomLeft
-        }
+    //     // 边界处理
+    //     if (-(left) > minDragDomLeft) {
+    //       left = -minDragDomLeft
+    //     } else if (left > maxDragDomLeft) {
+    //       left = maxDragDomLeft
+    //     }
 
-        if (-(top) > minDragDomTop) {
-          top = -minDragDomTop
-        } else if (top > maxDragDomTop) {
-          top = maxDragDomTop
-        }
+    //     if (-(top) > minDragDomTop) {
+    //       top = -minDragDomTop
+    //     } else if (top > maxDragDomTop) {
+    //       top = maxDragDomTop
+    //     }
 
-        // 移动当前元素
-        dragDom.style.cssText += `;left:${left + styL}px;top:${top + styT}px;`
+    //     // 移动当前元素
+    //     dragDom.style.cssText += `;left:${left + styL}px;top:${top + styT}px;`
 
-        // emit onDrag event
-        vnode.child.$emit('dragDialog')
-      }
+    //     // emit onDrag event
+    //     vnode.child.$emit('dragDialog')
+    //   }
 
-      document.onmouseup = function (e) {
-        document.onmousemove = null
-        document.onmouseup = null
-      }
-    }
+    //   document.onmouseup = function (e) {
+    //     dialogBodyEl.style.cssText = ''
+    //     document.onmousemove = null
+    //     document.onmouseup = null
+    //   }
+    // }
   }
 }
diff --git a/src/directive/el-drag-dialog/drags.js b/src/directive/el-drag-dialog/drags.js
new file mode 100644
index 0000000..27dac79
--- /dev/null
+++ b/src/directive/el-drag-dialog/drags.js
@@ -0,0 +1,106 @@
+/**
+ * 拖拽移动
+ * @param  {elementObjct} bar 鼠标点击控制拖拽的元素
+ * @param {elementObjct}  target 移动的元素
+ * @param {function}  callback 移动后的回调
+ */
+export function startDrag(bar, target, callback) {
+    var params = {
+        top: 0,
+        left: 0,
+        currentX: 0,
+        currentY: 0,
+        flag: false,
+        cWidth: 0,
+        cHeight: 0,
+        tWidth: 0,
+        tHeight: 0
+    };
+
+    // 给拖动块添加样式
+    bar.style.cursor = 'move';
+
+    // 获取相关CSS属性
+    // o是移动对象
+    // var getCss = function (o, key) {
+    //   return o.currentStyle ? o.currentStyle[key] : document.defaultView.getComputedStyle(o, false)[key];
+    // };
+
+    bar.onmousedown = function (event) {
+        // 按下时初始化params
+        var e = event ? event : window.event;
+        params = {
+            top: target.offsetTop,
+            left: target.offsetLeft,
+            currentX: e.clientX,
+            currentY: e.clientY,
+            flag: true,
+            cWidth: document.body.clientWidth,
+            cHeight: document.body.clientHeight,
+            tWidth: target.offsetWidth,
+            tHeight: target.offsetHeight
+        };
+
+        // 给被拖动块初始化样式
+        target.style.margin = 0;
+        target.style.top = params.top + 'px';
+        target.style.left = params.left + 'px';
+
+        if (!event) {
+            // 防止IE文字选中
+            bar.onselectstart = function () {
+                return false;
+            }
+        }
+
+        document.onmousemove = function (event) {
+            // 防止文字选中
+            window.getSelection ? window.getSelection().removeAllRanges() : document.selection.empty();
+
+            var e = event ? event : window.event;
+            if (params.flag) {
+                var nowX = e.clientX;
+                var nowY = e.clientY;
+                // 差异距离
+                var disX = nowX - params.currentX;
+                var disY = nowY - params.currentY;
+                // 最终移动位置
+                var zLeft = 0;
+                var zTop = 0;
+
+                zLeft = parseInt(params.left) + disX;
+                // 限制X轴范围
+                if (zLeft <= -parseInt(params.tWidth / 2)) {
+                    zLeft = -parseInt(params.tWidth / 2);
+                }
+                if (zLeft >= params.cWidth - parseInt(params.tWidth * 0.5)) {
+                    zLeft = params.cWidth - parseInt(params.tWidth * 0.5);
+                }
+
+                zTop = parseInt(params.top) + disY;
+                // 限制Y轴范围
+                if (zTop <= 0) {
+                    zTop = 0;
+                }
+                if (zTop >= params.cHeight - parseInt(params.tHeight * 0.5)) {
+                    zTop = params.cHeight - parseInt(params.tHeight * 0.5);
+                }
+
+                // 执行移动
+                target.style.left = zLeft + 'px';
+                target.style.top = zTop + 'px';
+            }
+
+            if (typeof callback == "function") {
+                callback(zLeft, zTop);
+            }
+        }
+
+        document.onmouseup = function () {
+            params.flag = false;
+            document.onmousemove = null;
+            document.onmouseup = null;
+        };
+    };
+}
+
diff --git a/src/filters/commFilter.js b/src/filters/commFilter.js
index bf39785..1000dbc 100644
--- a/src/filters/commFilter.js
+++ b/src/filters/commFilter.js
@@ -166,7 +166,7 @@ export function cancelOrderStatusFilter(status) {
 
 export function orderPayType(type) {
   const typeMap = {
-    '0': '消费券支付',
+    '0': '余额支付',
     '1': '微信支付',
     '2': '小程序',
     '3': '微信支付',
diff --git a/src/router/modules/product.js b/src/router/modules/product.js
index 7f40f05..40fd289 100644
--- a/src/router/modules/product.js
+++ b/src/router/modules/product.js
@@ -87,6 +87,15 @@ const productRouter =
       },
       component: () => import('@/views/product/priceDescription/index.vue')
     },
+    {
+      path: 'operate',
+      name: 'operate',
+      meta: {
+        title: '商品操作日志',
+        noCache: true
+      },
+      component: () => import('@/views/product/operate/index.vue')
+    },
     {
       path: 'band',
       name: 'ProductBand',
diff --git a/src/views/accounts/receipt/index.vue b/src/views/accounts/receipt/index.vue
index 6f5c4a8..bca4054 100644
--- a/src/views/accounts/receipt/index.vue
+++ b/src/views/accounts/receipt/index.vue
@@ -1,9 +1,19 @@
 <template>
   <div class="divBox">
     <div class="selCard">
-      <el-form :model="tableFrom" ref="searchForm" size="small" inline label-width="85px">
+      <el-form
+        :model="tableFrom"
+        ref="searchForm"
+        size="small"
+        inline
+        label-width="85px"
+      >
         <el-form-item label="订单状态：" class="width100" prop="order_type">
-          <el-radio-group v-model="tableFrom.order_type" type="button" @change="getList(1)">
+          <el-radio-group
+            v-model="tableFrom.order_type"
+            type="button"
+            @change="getList(1)"
+          >
             <el-radio-button label="">全部 </el-radio-button>
             <el-radio-button label="1">待付款</el-radio-button>
             <el-radio-button label="2">待发货</el-radio-button>
@@ -22,7 +32,7 @@
             type="daterange"
             placement="bottom-end"
             placeholder="自定义时间"
-            style="width: 280px;"
+            style="width: 280px"
             clearable
             :picker-options="pickerOptions"
             @change="onchangeTime"
@@ -46,20 +56,20 @@
           </el-select>
         </el-form-item>
         <el-form-item label="开票状态：" prop="status">
-            <el-select
-              v-model="tableFrom.status"
-              placeholder="请选择"
-              class="selWidth"
-              clearable
-              @change="getList"
-            >
-              <el-option
-                v-for="item in invoiceStatusList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
+          <el-select
+            v-model="tableFrom.status"
+            placeholder="请选择"
+            class="selWidth"
+            clearable
+            @change="getList"
+          >
+            <el-option
+              v-for="item in invoiceStatusList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
         </el-form-item>
         <el-form-item label="用户信息：" prop="username">
           <el-input
@@ -80,8 +90,10 @@
           </el-input>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" size="small" @click="getList(1)">搜索</el-button>
-          <el-button size="small" @click="searchReset()">重置</el-button> 
+          <el-button type="primary" size="small" @click="getList(1)"
+            >搜索</el-button
+          >
+          <el-button size="small" @click="searchReset()">重置</el-button>
         </el-form-item>
       </el-form>
     </div>
@@ -93,51 +105,89 @@
         size="small"
         class="table"
       >
-        <el-table-column prop="storeOrder.order_sn" label="订单号" min-width="170"/>
-        <el-table-column prop="merchant.mer_name" label="商户名称" min-width="160" />
+        <el-table-column
+          prop="storeOrder.order_sn"
+          label="订单号"
+          min-width="170"
+        />
+        <el-table-column
+          prop="merchant.mer_name"
+          label="商户名称"
+          min-width="160"
+        />
         <el-table-column prop="user.nickname" label="用户昵称" min-width="90" />
         <el-table-column prop="order_price" label="订单金额" min-width="90" />
         <el-table-column label="订单状态" min-width="90">
           <template slot-scope="scope">
-            <span v-if="scope.row.storeOrder && scope.row.storeOrder.paid === 0 && scope.row.storeOrder.status === 0">待付款</span>
-            <span v-else>{{ scope.row.storeOrder && scope.row.storeOrder.status | orderStatusFilter }}</span>
+            <span
+              v-if="
+                scope.row.storeOrder &&
+                scope.row.storeOrder.paid === 0 &&
+                scope.row.storeOrder.status === 0
+              "
+              >待付款</span
+            >
+            <span v-else>{{
+              scope.row.storeOrder &&
+              scope.row.storeOrder.status | orderStatusFilter
+            }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="receipt_price" label="发票金额" min-width="90"/>
-        <el-table-column prop="receipt_sn" label="发票单号" min-width="120"/>
+        <el-table-column prop="receipt_price" label="发票金额" min-width="90" />
+        <el-table-column prop="receipt_sn" label="申请单号" min-width="120" />
         <el-table-column label="发票类型" min-width="100">
           <template slot-scope="scope">
-            <span v-if="scope.row.receipt_info">{{scope.row.receipt_info.receipt_type == 1 ? '普通发票' : '专用发票' }}</span>
+            <span v-if="scope.row.receipt_info">{{
+              scope.row.receipt_info.receipt_type == 1 ? "普通发票" : "专用发票"
+            }}</span>
             <span v-else>--</span>
           </template>
         </el-table-column>
         <el-table-column label="发票抬头" min-width="90">
           <template slot-scope="scope">
-            <span>{{ scope.row.receipt_info.receipt_title_type === '1' ? "个人" : "企业" }}</span>
+            <span>{{
+              scope.row.receipt_info.receipt_title_type === "1"
+                ? "个人"
+                : "企业"
+            }}</span>
           </template>
         </el-table-column>
         <el-table-column label="发票联系人" min-width="100">
           <template slot-scope="scope">
-            <span>{{ scope.row.storeOrder && scope.row.storeOrder.real_name }}</span>
+            <span>{{
+              scope.row.storeOrder && scope.row.storeOrder.real_name
+            }}</span>
           </template>
         </el-table-column>
         <el-table-column label="发票联系信息" min-width="150">
           <template slot-scope="scope">
-            <span>{{ scope.row.delivery_info.email ? scope.row.delivery_info.email :  scope.row.delivery_info.user_address && scope.row.delivery_info.user_address + scope.row.delivery_info.user_phone && scope.row.delivery_info.user_phone}}</span>
+            <span>{{
+              scope.row.delivery_info.email
+                ? scope.row.delivery_info.email
+                : scope.row.delivery_info.user_address &&
+                  scope.row.delivery_info.user_address +
+                    scope.row.delivery_info.user_phone &&
+                  scope.row.delivery_info.user_phone
+            }}</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 label="开票状态" min-width="100">
           <template slot-scope="scope">
-            <span>{{ scope.row.status == 1 ? '已开' : '未开' }}</span>
+            <span>{{ scope.row.status == 1 ? "已开" : "未开" }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="mer_mark" label="发票备注" min-width="100"/>  
+        <el-table-column prop="mer_mark" label="发票备注" min-width="100" />
         <el-table-column label="操作" min-width="100" fixed="right">
           <template slot-scope="scope">
-            <el-button type="text" size="small" @click="getInvoiceInfo(scope.row.order_receipt_id)">详情</el-button>
+            <el-button
+              type="text"
+              size="small"
+              @click="getInvoiceInfo(scope.row.order_receipt_id)"
+              >详情</el-button
+            >
           </template>
-        </el-table-column>   
+        </el-table-column>
       </el-table>
       <div class="block">
         <el-pagination
@@ -152,38 +202,118 @@
       </div>
     </el-card>
     <!--开票-->
-    <el-dialog v-if="dialogVisible" :title="invoiceInfo.title" :visible.sync="dialogVisible" width="600px">
+    <el-dialog
+      v-if="dialogVisible"
+      :title="invoiceInfo.title"
+      :visible.sync="dialogVisible"
+      width="600px"
+    >
       <div v-loading="loading">
         <div class="box-container">
           <div class="title">发票详情</div>
           <div class="acea-row">
-            <div class="list sp"><label class="name" style="color: #333;">发票申请单号：</label>{{ invoiceInfo.receipt_sn }}</div>
+            <div class="list sp">
+              <label class="name" style="color: #333">发票申请单号：</label
+              >{{ invoiceInfo.receipt_sn }}
+            </div>
           </div>
           <div class="title">发票信息</div>
           <div class="acea-row">
-            <div class="list sp"><label class="name">发票抬头：</label>{{ invoiceInfo.receipt_info.receipt_title }}</div>
-            <div class="list sp"><label class="name">发票类型：</label>{{ invoiceInfo.receipt_info.receipt_type == 1 ? '普通发票' : '专用发票' }}</div>
-            <div class="list sp"><label class="name">发票抬头类型：</label>{{ invoiceInfo.receipt_info.receipt_title_type == '1' ? '个人' : '企业' }}</div>
-            <div class="list sp"><label class="name">发票金额：</label>{{ invoiceInfo.receipt_price }}</div>
-            <div v-if="invoiceInfo.receipt_info.receipt_title_type == '2'" class="list sp"><label class="name">企业税号：</label>{{ invoiceInfo.receipt_info.duty_paragraph }}</div>
-            <div v-if="invoiceInfo.receipt_info.receipt_type == 2" class="list sp"><label class="name">开户银行：</label>{{ invoiceInfo.receipt_info.bank_name }}</div>
-            <div v-if="invoiceInfo.receipt_info.receipt_type == 2" class="list sp"><label class="name">银行账号：</label>{{ invoiceInfo.receipt_info.bank_code }}</div>
-            <div v-if="invoiceInfo.receipt_info.receipt_type == 2" class="list sp"><label class="name">企业地址：</label>{{ invoiceInfo.receipt_info.address }}</div>
-            <div v-if="invoiceInfo.receipt_info.receipt_type == 2" class="list sp"><label class="name">企业电话：</label>{{ invoiceInfo.receipt_info.tel }}</div>
+            <div class="list sp">
+              <label class="name">发票抬头：</label
+              >{{ invoiceInfo.receipt_info.receipt_title }}
+            </div>
+            <div class="list sp">
+              <label class="name">发票类型：</label
+              >{{
+                invoiceInfo.receipt_info.receipt_type == 1
+                  ? "普通发票"
+                  : "专用发票"
+              }}
+            </div>
+            <div class="list sp">
+              <label class="name">发票抬头类型：</label
+              >{{
+                invoiceInfo.receipt_info.receipt_title_type == "1"
+                  ? "个人"
+                  : "企业"
+              }}
+            </div>
+            <div class="list sp">
+              <label class="name">发票金额：</label
+              >{{ invoiceInfo.receipt_price }}
+            </div>
+            <div
+              v-if="invoiceInfo.receipt_info.receipt_title_type == '2'"
+              class="list sp"
+            >
+              <label class="name">企业税号：</label
+              >{{ invoiceInfo.receipt_info.duty_paragraph }}
+            </div>
+            <div
+              v-if="invoiceInfo.receipt_info.receipt_type == 2"
+              class="list sp"
+            >
+              <label class="name">开户银行：</label
+              >{{ invoiceInfo.receipt_info.bank_name }}
+            </div>
+            <div
+              v-if="invoiceInfo.receipt_info.receipt_type == 2"
+              class="list sp"
+            >
+              <label class="name">银行账号：</label
+              >{{ invoiceInfo.receipt_info.bank_code }}
+            </div>
+            <div
+              v-if="invoiceInfo.receipt_info.receipt_type == 2"
+              class="list sp"
+            >
+              <label class="name">企业地址：</label
+              >{{ invoiceInfo.receipt_info.address }}
+            </div>
+            <div
+              v-if="invoiceInfo.receipt_info.receipt_type == 2"
+              class="list sp"
+            >
+              <label class="name">企业电话：</label
+              >{{ invoiceInfo.receipt_info.tel }}
+            </div>
           </div>
           <div class="title">联系信息：</div>
-          <div v-if="invoiceInfo.receipt_info.receipt_type == 1" class="acea-row">
-            <div class="list sp"><label class="name">联系邮箱：</label>{{ invoiceInfo.delivery_info.email }}</div>
+          <div
+            v-if="invoiceInfo.receipt_info.receipt_type == 1"
+            class="acea-row"
+          >
+            <div class="list sp">
+              <label class="name">联系邮箱：</label
+              >{{ invoiceInfo.delivery_info.email }}
+            </div>
           </div>
           <div v-else class="acea-row">
-            <div class="list sp"><label class="name">联系人姓名：</label>{{ invoiceInfo.delivery_info.user_name }}</div>
-            <div class="list sp"><label class="name">联系人电话：</label>{{ invoiceInfo.delivery_info.user_phone }}</div>
-            <div class="list sp"><label class="name">联系人地址：</label>{{ invoiceInfo.delivery_info.user_address }}</div>
+            <div class="list sp">
+              <label class="name">联系人姓名：</label
+              >{{ invoiceInfo.delivery_info.user_name }}
+            </div>
+            <div class="list sp">
+              <label class="name">联系人电话：</label
+              >{{ invoiceInfo.delivery_info.user_phone }}
+            </div>
+            <div class="list sp">
+              <label class="name">联系人地址：</label
+              >{{ invoiceInfo.delivery_info.user_address }}
+            </div>
           </div>
           <div class="acea-row">
-            <div class="list sp"><label class="name">开票状态：</label>{{ invoiceInfo.status == 1 ? '已开' : '未开' }}</div>
-            <div v-if="invoiceInfo.status == 1" class="list sp100"><label class="name">发票号码：</label>{{ invoiceInfo.receipt_no }}</div>
-            <div class="list sp100"><label class="name">发票备注：</label>{{ invoiceInfo.mer_mark }}</div>
+            <div class="list sp">
+              <label class="name">开票状态：</label
+              >{{ invoiceInfo.status == 1 ? "已开" : "未开" }}
+            </div>
+            <div v-if="invoiceInfo.status == 1" class="list sp100">
+              <label class="name">发票号码：</label>{{ invoiceInfo.receipt_no }}
+            </div>
+            <div class="list sp100">
+              <label class="name">发票备注：</label>{{ invoiceInfo.mer_mark }}
+            </div>
           </div>
         </div>
       </div>
@@ -192,78 +322,77 @@
 </template>
 
 <script>
-
-import { invoiceListApi, invoiceDetailApi } from '@/api/accounts'
-import { merSelectApi } from '@/api/product'
-import timeOptions from '@/utils/timeOptions';
+import { invoiceListApi, invoiceDetailApi } from "@/api/accounts";
+import { merSelectApi } from "@/api/product";
+import timeOptions from "@/utils/timeOptions";
 export default {
-  name: 'AccountsReceipt',
+  name: "AccountsReceipt",
   data() {
     return {
       pickerOptions: timeOptions,
-      logisticsName: 'refund',
+      logisticsName: "refund",
       dialogVisible: false,
       id: 0,
-      type: '',
+      type: "",
       tableData: {
         data: [],
-        total: 0
+        total: 0,
       },
       merSelect: [],
       invoiceStatusList: [
         { label: "已开票", value: 1 },
-        { label: "未开票", value: 0 }
+        { label: "未开票", value: 0 },
       ],
       listLoading: true,
       tableFrom: {
-        username: '',
-        type: '',
-        date: '',
+        username: "",
+        type: "",
+        date: "",
         page: 1,
         limit: 20,
-        receipt_sn: '',
-        order_type: '',
-        keyword: '',
-        status: '',
-        mer_id: ''
+        receipt_sn: "",
+        order_type: "",
+        keyword: "",
+        status: "",
+        mer_id: "",
       },
       orderChartType: {},
       timeVal: [],
       fromList: {
-        title: '选择时间',
+        title: "选择时间",
         custom: true,
         fromTxt: [
-          { text: '全部', val: '' },
-          { text: '今天', val: 'today' },
-          { text: '昨天', val: 'yesterday' },
-          { text: '最近7天', val: 'lately7' },
-          { text: '最近30天', val: 'lately30' },
-          { text: '本月', val: 'month' },
-          { text: '本年', val: 'year' }
-        ]
+          { text: "全部", val: "" },
+          { text: "今天", val: "today" },
+          { text: "昨天", val: "yesterday" },
+          { text: "最近7天", val: "lately7" },
+          { text: "最近30天", val: "lately30" },
+          { text: "本月", val: "month" },
+          { text: "本年", val: "year" },
+        ],
       },
       loading: false,
       invoiceInfo: {},
-    }
+    };
   },
   mounted() {
-    this.getList(1)
+    this.getList(1);
     this.getMerSelect();
   },
 
   methods: {
     /**重置 */
-    searchReset(){
-      this.timeVal = []
-      this.tableFrom.date = ""
-      this.$refs.searchForm.resetFields()
-      this.getList(1)
+    searchReset() {
+      this.timeVal = [];
+      this.tableFrom.date = "";
+      this.$refs.searchForm.resetFields();
+      this.getList(1);
     },
     // 具体日期
     onchangeTime(e) {
-      this.timeVal = e
-      this.tableFrom.date = e ? this.timeVal.join('-') : ''
-      this.getList(1)
+      this.timeVal = e;
+      this.tableFrom.date = e ? this.timeVal.join("-") : "";
+      this.getList(1);
     },
     // 商户列表；
     getMerSelect() {
@@ -276,50 +405,50 @@ export default {
         });
     },
     //详情
-    getInvoiceInfo(id){
-        this.loading = true
-        invoiceDetailApi(id)
-        .then(res => {
-          this.invoiceInfo = res.data
-          this.dialogVisible = true
-          this.loading = false
-        })
-        .catch(res => {
-          this.$message.error(res.message)
-          this.loading = false
-          this.dialogVisible = false
+    getInvoiceInfo(id) {
+      this.loading = true;
+      invoiceDetailApi(id)
+        .then((res) => {
+          this.invoiceInfo = res.data;
+          this.dialogVisible = true;
+          this.loading = false;
         })
+        .catch((res) => {
+          this.$message.error(res.message);
+          this.loading = false;
+          this.dialogVisible = false;
+        });
     },
     // 列表
     getList(num) {
-      this.listLoading = true
+      this.listLoading = true;
       this.tableFrom.page = num ? num : this.tableFrom.page;
       invoiceListApi(this.tableFrom)
-        .then(res => {
-          this.orderChartType = res.data.stat
-          this.tableData.data = res.data.list
-          this.tableData.total = res.data.count
-          this.listLoading = false
-        })
-        .catch(res => {
-          this.$message.error(res.message)
-          this.listLoading = false
+        .then((res) => {
+          this.orderChartType = res.data.stat;
+          this.tableData.data = res.data.list;
+          this.tableData.total = res.data.count;
+          this.listLoading = false;
         })
+        .catch((res) => {
+          this.$message.error(res.message);
+          this.listLoading = false;
+        });
     },
     pageChange(page) {
-      this.tableFrom.page = page
-      this.getList()
+      this.tableFrom.page = page;
+      this.getList();
     },
     handleSizeChange(val) {
-      this.tableFrom.limit = val
-      this.getList()
+      this.tableFrom.limit = val;
+      this.getList();
     },
 
     handleClose() {
-      this.dialogLogistics = false
+      this.dialogLogistics = false;
     },
-  }
-}
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -327,7 +456,7 @@ export default {
   overflow: hidden;
   padding: 0 10px;
 }
-.box-container .title{
+.box-container .title {
   color: #17233d;
   font-size: 14px;
   font-weight: bold;
@@ -341,10 +470,10 @@ export default {
   margin-top: 15px;
   font-size: 13px;
 }
-.box-container .list .info{
+.box-container .list .info {
   display: block;
-  .el-textarea{
-   margin-top: 10px;
+  .el-textarea {
+    margin-top: 10px;
   }
 }
 
@@ -362,5 +491,4 @@ export default {
   width: 100px;
   color: #606266;
 }
-
 </style>
diff --git a/src/views/merchant/application/index.vue b/src/views/merchant/application/index.vue
index 71936b3..a67fcc4 100644
--- a/src/views/merchant/application/index.vue
+++ b/src/views/merchant/application/index.vue
@@ -16,7 +16,7 @@
             <el-option label="审核未通过" value="2"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="选择时间：">
+        <el-form-item label="申请时间：">
           <el-date-picker
             v-model="timeVal"
             type="daterange"
@@ -28,22 +28,6 @@
             style="width: 280px"
           />
         </el-form-item>
-        <!-- <el-form-item label="商户分类：" prop="category_id">
-          <el-select
-            v-model="tableFrom.category_id"
-            clearable
-            placeholder="请选择"
-            class="selWidth"
-            @change="getList(1)"
-          >
-            <el-option
-              v-for="item in merCateList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
-          </el-select>
-        </el-form-item> -->
         <el-form-item label="店铺类型：" prop="type_id">
           <el-select
             v-model="tableFrom.type_id"
@@ -61,17 +45,13 @@
           </el-select>
         </el-form-item>
         <el-form-item label="所属城市：" prop="city_code">
-          <el-cascader
-          ref="cascader"
-          v-model="tableFrom.city_code"
-          :options="cityOptions"
-          :show-all-levels="false"
-          :props="{ emitPath: false }"
-          class="selWidth"
-          @change="handleCascader"
-          clearable
-          >
-        </el-cascader>
+          <el-input
+            v-model="tableFrom.city_code"
+            @keyup.enter.native="getList(1)"
+            placeholder="请输入所属城市"
+            class="selWidth"
+            clearable
+          />
         </el-form-item>
         <el-form-item label="商户关键字：" prop="keyword">
           <el-input
@@ -82,6 +62,15 @@
             clearable
           />
         </el-form-item>
+        <el-form-item label="备注：" prop="mark">
+          <el-input
+            v-model="tableFrom.mark"
+            @keyup.enter.native="getList(1)"
+            placeholder="请输入备注"
+            class="selWidth"
+            clearable
+          />
+        </el-form-item>
         <el-form-item>
           <el-button type="primary" size="small" @click="getList(1)">搜索</el-button>
           <el-button size="small" @click="searchReset()">重置</el-button> 
diff --git a/src/views/merchant/list/index.vue b/src/views/merchant/list/index.vue
index e3c680d..bfb8a96 100644
--- a/src/views/merchant/list/index.vue
+++ b/src/views/merchant/list/index.vue
@@ -1,7 +1,13 @@
 <template>
   <div class="divBox">
     <div class="selCard">
-      <el-form :model="tableFrom" ref="searchForm" size="small" label-width="105px" :inline="true">
+      <el-form
+        :model="tableFrom"
+        ref="searchForm"
+        size="small"
+        label-width="105px"
+        :inline="true"
+      >
         <el-form-item label="选择时间：">
           <el-date-picker
             v-model="timeVal"
@@ -10,7 +16,7 @@
             format="yyyy/MM/dd"
             value-format="yyyy/MM/dd"
             range-separator="-"
-            style="width:280px;"
+            style="width: 280px"
             :picker-options="pickerOptions"
             @change="onchangeTime"
           />
@@ -27,46 +33,38 @@
             <el-option label="非自营" value="0" />
           </el-select>
         </el-form-item>
-          <!-- <el-form-item label="商户分类：" prop="category_id">
-            <el-select
-            v-model="tableFrom.category_id"
-            clearable
+        <el-form-item label="是否惠美乡村：" prop="is_huimei">
+          <el-select
+            v-model="tableFrom.is_huimei"
             placeholder="请选择"
-            class="selWidth"
+            class="filter-item selWidth"
+            clearable
             @change="getList(1)"
           >
-            <el-option
-              v-for="item in merCateList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
-          </el-select>
-        </el-form-item> -->
-        <el-form-item label="是否惠美乡村：" prop="is_huimei">
-          <el-select v-model="tableFrom.is_huimei" placeholder="请选择" class="filter-item selWidth" clearable @change="getList(1)">
             <el-option label="是" value="1" />
             <el-option label="否" value="0" />
           </el-select>
         </el-form-item>
         <el-form-item label="是否退伍军人：" prop="is_soldier">
-          <el-select v-model="tableFrom.is_soldier" placeholder="请选择" class="filter-item selWidth" clearable @change="getList(1)">
+          <el-select
+            v-model="tableFrom.is_soldier"
+            placeholder="请选择"
+            class="filter-item selWidth"
+            clearable
+            @change="getList(1)"
+          >
             <el-option label="是" value="1" />
             <el-option label="否" value="0" />
           </el-select>
         </el-form-item>
         <el-form-item label="所属城市：" prop="city_code">
-          <el-cascader
-          ref="cascader"
-          v-model="tableFrom.city_code"
-          :options="cityOptions"
-          :show-all-levels="false"
-          :props="{ emitPath: false,label:'label' }"
-          class="selWidth"
-          @change="handleCascader"
-          clearable
-          >
-        </el-cascader>
+          <el-input
+            v-model="tableFrom.city_code"
+            @keyup.enter.native="getList(1)"
+            placeholder="请输入所属城市"
+            class="selWidth"
+            clearable
+          />
         </el-form-item>
         <el-form-item label="店铺类型：" prop="type_id">
           <el-select
@@ -92,37 +90,95 @@
             class="selWidth"
             @change="getList(1)"
           >
-            <el-option key="1" label="是" value="1"/>
-            <el-option key="0" label="否" value="0"/>
+            <el-option key="1" label="是" value="1" />
+            <el-option key="0" label="否" value="0" />
           </el-select>
         </el-form-item>
-        <el-form-item label="关键字：" prop="keyword">
+        <el-form-item label="企业关键字：" prop="keyword">
           <el-input
             v-model="tableFrom.keyword"
             @keyup.enter.native="getList(1)"
-            placeholder="请输入店铺关键字/店铺名/联系电话"
+            placeholder="请输入店铺/企业名称关键字"
+            class="selWidth"
+            clearable
+          />
+        </el-form-item>
+        <el-form-item label="姓名关键字：" prop="keyword">
+          <el-input
+            v-model="tableFrom.keyword"
+            @keyup.enter.native="getList(1)"
+            placeholder="请输入法人/对接人姓名"
+            class="selWidth"
+            clearable
+          />
+        </el-form-item>
+        <el-form-item label="对接人电话:" prop="keyword">
+          <el-input
+            v-model="tableFrom.keyword"
+            @keyup.enter.native="getList(1)"
+            placeholder="请输入对接人电话"
+            class="selWidth"
+            clearable
+          />
+        </el-form-item>
+        <el-form-item label="对接人身份证：" prop="keyword">
+          <el-input
+            v-model="tableFrom.keyword"
+            @keyup.enter.native="getList(1)"
+            placeholder="请输入对接人身份证"
+            class="selWidth"
+            clearable
+          />
+        </el-form-item>
+        <el-form-item label="是否店长店：" prop="is_store_mgr">
+          <el-select
+            v-model="tableFrom.is_store_mgr"
+            clearable
+            placeholder="请选择"
+            class="selWidth"
+            @change="getList(1)"
+          >
+            <el-option key="1" label="是" value="1" />
+            <el-option key="0" label="否" value="0" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="备注：" prop="mark">
+          <el-input
+            v-model="tableFrom.mark"
+            @keyup.enter.native="getList(1)"
+            placeholder="请输入备注"
             class="selWidth"
             clearable
           />
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" size="small" @click="getList(1)">搜索</el-button>
-          <el-button size="small" @click="searchReset()">重置</el-button> 
+          <el-button type="primary" size="small" @click="getList(1)"
+            >搜索</el-button
+          >
+          <el-button size="small" @click="searchReset()">重置</el-button>
         </el-form-item>
       </el-form>
     </div>
     <el-card class="mt14">
       <div class="mb20">
-        <el-tabs v-if="headeNum.length > 0" v-model="tableFrom.status" @tab-click="getList(1),getHeadNum()">
+        <el-tabs
+          v-if="headeNum.length > 0"
+          v-model="tableFrom.status"
+          @tab-click="getList(1), getHeadNum()"
+        >
           <el-tab-pane
-            v-for="(item,index) in headeNum"
+            v-for="(item, index) in headeNum"
             :key="index"
             :name="item.type.toString()"
-            :label="item.title +'('+item.count +')' "
+            :label="item.title + '(' + item.count + ')'"
           />
         </el-tabs>
-        <el-button size="small" type="primary" class="mt5" @click="onAdd">添加商户</el-button>
-        <el-button size="small" type="primary" class="mt5" @click="exports">导出列表</el-button>
+        <el-button size="small" type="primary" class="mt5" @click="onAdd"
+          >添加商户</el-button
+        >
+        <el-button size="small" type="primary" class="mt5" @click="exports"
+          >导出列表</el-button
+        >
       </div>
       <el-table
         v-loading="listLoading"
@@ -133,23 +189,31 @@
         <el-table-column prop="mer_id" label="ID" min-width="60" />
         <el-table-column prop="mer_name" label="店铺名称" min-width="150" />
         <el-table-column prop="ext.com.name" label="企业名称" min-width="150" />
-        <el-table-column prop="merchantType.type_name" label="店铺类型" min-width="150" />
+        <el-table-column
+          prop="merchantType.type_name"
+          label="店铺类型"
+          min-width="150"
+        />
         <el-table-column prop="is_huimei" label="是否惠美乡村" min-width="100">
           <template slot-scope="scope">
-            <span>{{scope.row.is_huimei == 1 ? '是' : '否'}}</span>
+            <span>{{ scope.row.is_huimei == 1 ? "是" : "否" }}</span>
           </template>
         </el-table-column>
         <el-table-column prop="is_soldier" label="是否军人" min-width="80">
           <template slot-scope="scope">
-            <span>{{scope.row.is_soldier == 1 ? '是' : '否'}}</span>
+            <span>{{ scope.row.is_soldier == 1 ? "是" : "否" }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="is_soldier" label="是否店长店" min-width="90">
+        <el-table-column prop="is_store_mgr" label="是否店长店" min-width="90">
           <template slot-scope="scope">
-            <span>{{scope.row.is_store_mgr == 1 ? '是' : '否'}}</span>
+            <span>{{ scope.row.is_store_mgr == 1 ? "是" : "否" }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="ext.idcard.name" label="法人姓名" min-width="150" />
+        <el-table-column
+          prop="ext.idcard.name"
+          label="法人姓名"
+          min-width="150"
+        />
         <el-table-column prop="status" label="推荐" min-width="100">
           <template slot-scope="scope">
             <el-switch
@@ -163,7 +227,7 @@
             />
           </template>
         </el-table-column>
-         <el-table-column prop="status" label="开启/关闭" min-width="100">
+        <el-table-column prop="status" label="开启/关闭" min-width="100">
           <template slot-scope="scope">
             <el-switch
               v-model="scope.row.status"
@@ -176,32 +240,53 @@
             />
           </template>
         </el-table-column>
+        <!-- <el-table-column prop="lock" label="退店(开启/关闭)" min-width="120">
+          <template slot-scope="scope">
+            <el-switch
+              v-model="scope.row.lock"
+              :active-value="1"
+              :inactive-value="0"
+              active-text="开启"
+              inactive-text="关闭"
+              :width="55"
+              @click.native="onchangeIsClose(scope.row, 'lock')"
+            />
+          </template>
+        </el-table-column> -->
         <el-table-column prop="real_name" label="对接人姓名" min-width="100" />
         <el-table-column prop="mer_phone" label="对接人电话" min-width="100" />
-        <el-table-column prop="ext.com.number" label="对接人身份证号" min-width="120" />
+        <el-table-column
+          prop="ext.com.number"
+          label="对接人身份证号"
+          min-width="120"
+        />
         <!-- <el-table-column prop="ext.com.initiator" label="发起人姓名" min-width="100" />
         <el-table-column prop="ext.com.inti_number" label="发起人编号" min-width="100" />
         <el-table-column prop="ext.com.inti_mobile" label="发起人电话" min-width="100" /> -->
-        <el-table-column prop="ext.biz.cityInfo" label="所属城市" min-width="100" />
+        <el-table-column
+          prop="ext.biz.cityInfo"
+          label="所属城市"
+          min-width="100"
+        />
         <el-table-column prop="create_time" label="创建时间" min-width="150" />
         <el-table-column prop="margin" label="保证金" min-width="150">
           <template slot-scope="scope">
-            <span>{{getNumber(scope.row,'margin')}}</span>
+            <span>{{ getNumber(scope.row, "margin") }}</span>
           </template>
         </el-table-column>
         <el-table-column prop="service" label="技术服务费" min-width="150">
           <template slot-scope="scope">
-            <span>{{getNumber(scope.row,'service')}}</span>
+            <span>{{ getNumber(scope.row, "service") }}</span>
           </template>
         </el-table-column>
         <el-table-column prop="goods" label="上架费" min-width="150">
           <template slot-scope="scope">
-            <span>{{getNumber(scope.row,'goods')}}</span>
+            <span>{{ getNumber(scope.row, "goods") }}</span>
           </template>
         </el-table-column>
         <el-table-column prop="sort" label="排序" min-width="100" />
         <el-table-column prop="mark" label="备注" min-width="200" />
-      
+
         <el-table-column label="操作" min-width="180" fixed="right">
           <template slot-scope="scope">
             <el-button
@@ -209,16 +294,33 @@
               type="text"
               size="small"
               @click="onLogo(scope.row.mer_id)"
-            >登录</el-button>
-            <el-button type="text" size="small" @click="onEdit(scope.row.mer_id)">编辑</el-button>
-            <el-button type="text" size="small" @click="setPayment(scope.row.mer_id)">缴费</el-button>
-            <el-button type="text" size="small" @click="onDetails(scope.row.mer_id)">详情</el-button>
+              >登录</el-button
+            >
+            <el-button
+              type="text"
+              size="small"
+              @click="onEdit(scope.row.mer_id)"
+              >编辑</el-button
+            >
+            <el-button
+              type="text"
+              size="small"
+              @click="setPayment(scope.row.mer_id)"
+              >缴费</el-button
+            >
+            <el-button
+              type="text"
+              size="small"
+              @click="onDetails(scope.row.mer_id)"
+              >详情</el-button
+            >
             <el-button
               v-if="tableFrom.status === '0'"
               type="text"
               size="small"
               @click="handleDelete(scope.row.mer_id, scope.$index)"
-            >删除</el-button>
+              >删除</el-button
+            >
           </template>
         </el-table-column>
       </el-table>
@@ -250,7 +352,6 @@
   </div>
 </template>
 <script>
-
 import {
   merchantListApi,
   merchantDeleteForm,
@@ -260,19 +361,21 @@ import {
   changeCopyApi,
   merchantCountApi,
   merchantIsCloseApi,
+  merchantIsLockApi,
   getstoreTypeApi,
   merchantPayForm,
   exportMerchantApi,
-  getMerCateApi, marginDeductionForm
+  getMerCateApi,
+  marginDeductionForm,
 } from "@/api/merchant";
-import merDetail from './handle/merDetails.vue';
+import merDetail from "./handle/merDetails.vue";
 import { fromList } from "@/libs/constants.js";
 import { roterPre } from "@/settings";
 import SettingMer from "@/libs/settingMer";
-import createWorkBook from '@/utils/newToExcel.js';
+import createWorkBook from "@/utils/newToExcel.js";
 import Cookies from "js-cookie";
-import timeOptions from '@/utils/timeOptions';
-import cityOptions from '@/utils/city';
+import timeOptions from "@/utils/timeOptions";
+import cityOptions from "@/utils/city";
 export default {
   name: "MerchantList",
   components: { merDetail },
@@ -284,23 +387,28 @@ export default {
       isChecked: false,
       listLoading: true,
       merCateList: [],
-      cityOptions:cityOptions,
+      cityOptions: cityOptions,
       storeType: [],
       headeNum: [
         {
-          count: '',
+          count: "",
           type: "1",
-          title: "正常开启的商户"
+          title: "正常开启的商户",
         },
         {
-          count: '',
+          count: "",
           type: "0",
-          title: "已关闭商户"
-        }
+          title: "已关闭商户",
+        },
+        // {
+        //   count: "",
+        //   type: "2",
+        //   title: "已退店商户",
+        // },
       ],
       tableData: {
         data: [],
-        total: 0
+        total: 0,
       },
       tableFrom: {
         page: 1,
@@ -310,15 +418,15 @@ export default {
         keyword: "",
         is_trader: "",
         is_best: "",
-        category_id: '',
+        category_id: "",
         type_id: "",
-        city_code:'',
-        city:'',
+        city_code: "",
+        city: "",
       },
       autoUpdate: true,
       merId: "",
       drawer: false,
-      timeVal: []
+      timeVal: [],
     };
   },
   mounted() {
@@ -328,56 +436,70 @@ export default {
     this.getList("");
   },
   methods: {
-  getNumber(row,name){
-    if(name=='margin'){
-      return row[`is_${name}`] == 0?'无':row[`ot_${name}`]-row[`${name}`]>0 ? '待缴' : '已缴'
-    }else{
-      return row[`is_${name}`] == 0?'无':row[`ot_${name}_cost`]-row[`${name}_cost`]>0 ? '待缴' : '已缴'
-    }
-
-  },
-  handleCascader(){
-    this.tableFrom.city = this.$refs["cascader"]?.getCheckedNodes()[0]?.label
-    this.getList(1)
-  },
-  async exports() {
-      let excelData = JSON.parse(JSON.stringify(this.tableFrom)), data = []
-      excelData.page = 1
-      let pageCount = 1
+    getNumber(row, name) {
+      if (name == "margin") {
+        return row[`is_${name}`] == 0
+          ? "无"
+          : row[`ot_${name}`] - row[`${name}`] > 0
+          ? "待缴"
+          : "已缴";
+      } else {
+        return row[`is_${name}`] == 0
+          ? "无"
+          : row[`ot_${name}_cost`] - row[`${name}_cost`] > 0
+          ? "待缴"
+          : "已缴";
+      }
+    },
+    handleCascader() {
+      this.tableFrom.city = this.$refs["cascader"]?.getCheckedNodes()[0]?.label;
+      this.getList(1);
+    },
+    async exports() {
+      let excelData = JSON.parse(JSON.stringify(this.tableFrom)),
+        data = [];
+      excelData.page = 1;
+      let pageCount = 1;
       let lebData = {};
       for (let i = 0; i < pageCount; i++) {
-        lebData = await this.downData(excelData)
-        pageCount = Math.ceil(lebData.count/excelData.limit)
+        lebData = await this.downData(excelData);
+        pageCount = Math.ceil(lebData.count / excelData.limit);
         if (lebData.export.length) {
-          data = data.concat(lebData.export)
-          excelData.page++
+          data = data.concat(lebData.export);
+          excelData.page++;
         }
       }
-      createWorkBook(lebData.header, lebData.title, data, lebData.foot,lebData.filename);
-      return
+      createWorkBook(
+        lebData.header,
+        lebData.title,
+        data,
+        lebData.foot,
+        lebData.filename
+      );
+      return;
     },
     /**订单列表 */
     downData(excelData) {
       return new Promise((resolve, reject) => {
         exportMerchantApi(excelData).then((res) => {
-          return resolve(res.data)
-        })
-      })
+          return resolve(res.data);
+        });
+      });
     },
     /**重置 */
-    searchReset(){
-      this.timeVal = []
-      this.tableFrom.date = ""
-      this.$refs.searchForm.resetFields()
-      this.getList(1)
+    searchReset() {
+      this.timeVal = [];
+      this.tableFrom.date = "";
+      this.$refs.searchForm.resetFields();
+      this.getList(1);
     },
     onLogo(id) {
       merchantLoginApi(id)
-        .then(res => {
+        .then((res) => {
           Cookies.set("merchantToken", res.data.token);
           window.open(`${location.origin}${res.data.url}`);
         })
-        .catch(res => {
+        .catch((res) => {
           this.$message.error(res.message);
         });
     },
@@ -391,38 +513,42 @@ export default {
     // 获取开启商户数
     getHeadNum() {
       merchantCountApi()
-        .then(res => {
+        .then((res) => {
           this.headeNum[0]["count"] = res.data.valid;
           this.headeNum[1]["count"] = res.data.invalid;
         })
-        .catch(res => {});
+        .catch((res) => {});
     },
     // 商户分类；
     getMerCategory() {
-        getMerCateApi().then(res => {
-            this.merCateList = res.data
-        }).catch(res => {
-            this.$message.error(res.message)
+      getMerCateApi()
+        .then((res) => {
+          this.merCateList = res.data;
         })
+        .catch((res) => {
+          this.$message.error(res.message);
+        });
     },
-    getStoreType(){
-        getstoreTypeApi().then(res => {
-            this.storeType = res.data
-        }).catch(res => {
-            this.$message.error(res.message)
+    getStoreType() {
+      getstoreTypeApi()
+        .then((res) => {
+          this.storeType = res.data;
         })
+        .catch((res) => {
+          this.$message.error(res.message);
+        });
     },
     // 列表
     getList(num) {
       this.listLoading = true;
       this.tableFrom.page = num ? num : this.tableFrom.page;
       merchantListApi(this.tableFrom)
-        .then(res => {
+        .then((res) => {
           this.tableData.data = res.data.list;
           this.tableData.total = res.data.count;
           this.listLoading = false;
         })
-        .catch(res => {
+        .catch((res) => {
           this.listLoading = false;
           this.$message.error(res.message);
         });
@@ -450,17 +576,27 @@ export default {
           });
       });
     },
-    // 开启关闭
-    onchangeIsClose(row) {
-      merchantIsCloseApi(row.mer_id, row.status)
-        .then(({ message }) => {
-          this.$message.success(message);
-          this.getList("");
-          this.getHeadNum();
-        })
-        .catch(({ message }) => {
-          this.$message.error(message);
-        });
+    // 开启关闭退店
+    onchangeIsClose(row, type) {
+      type == "lock"
+        ? merchantIsLockApi(row.mer_id, row.lock)
+            .then(({ message }) => {
+              this.$message.success(message);
+              this.getList("");
+              this.getHeadNum();
+            })
+            .catch(({ message }) => {
+              this.$message.error(message);
+            })
+        : merchantIsCloseApi(row.mer_id, row.status)
+            .then(({ message }) => {
+              this.$message.success(message);
+              this.getList("");
+              this.getHeadNum();
+            })
+            .catch(({ message }) => {
+              this.$message.error(message);
+            });
     },
     // 添加
     onAdd() {
@@ -474,7 +610,6 @@ export default {
       this.$refs.merDetail.isEdit = true;
       this.$refs.merDetail.getInfo(id);
       this.drawer = true;
-
     },
     // 详情
     onDetails(id) {
@@ -490,11 +625,11 @@ export default {
       this.drawer = false;
     },
     // 缴费
-    setPayment(id){
+    setPayment(id) {
       this.$modalForm(merchantPayForm(id)).then(() => this.getList(""));
     },
     // 删除
-    handleDelete(id) { 
+    handleDelete(id) {
       this.$modalForm(merchantDeleteForm(id)).then(() => this.getList(""));
     },
     // 扣除保证金
@@ -509,10 +644,9 @@ export default {
     // 修改密码表单
     onPassword(id) {
       this.$modalForm(merchantPasswordApi(id));
-    }
-  }
+    },
+  },
 };
 </script>
 
-<style scoped lang="scss">
-</style>
+<style scoped lang="scss"></style>
diff --git a/src/views/order/list/index.vue b/src/views/order/list/index.vue
index a9addd1..e628c45 100644
--- a/src/views/order/list/index.vue
+++ b/src/views/order/list/index.vue
@@ -105,7 +105,7 @@
             class="selWidth"
             @change="getList(1),getCardList()"
           >
-            <el-option label="消费券" value="0" />
+            <el-option label="余额" value="0" />
             <el-option label="微信" value="1" />
             <el-option label="支付宝" value="2" />
             <el-option label="铸源星" value="7" />
diff --git a/src/views/order/refund/index.vue b/src/views/order/refund/index.vue
index 1b1b3bf..b6ead9d 100644
--- a/src/views/order/refund/index.vue
+++ b/src/views/order/refund/index.vue
@@ -74,7 +74,7 @@
             class="selWidth"
             @change="getList(1)"
           >
-            <el-option label="消费券" value="0" />
+            <el-option label="余额" value="0" />
             <el-option label="微信" value="1" />
             <el-option label="支付宝" value="2" />
             <el-option label="铸源星" value="7" />
diff --git a/src/views/product/operate/index.vue b/src/views/product/operate/index.vue
new file mode 100644
index 0000000..e5ec665
--- /dev/null
+++ b/src/views/product/operate/index.vue
@@ -0,0 +1,237 @@
+<template>
+  <div class="divBox">
+    <div class="selCard">
+      <el-form
+        size="small"
+        :model="tableFrom"
+        ref="searchForm"
+        label-width="85px"
+        inline
+      >
+        <el-form-item label="时间选择：" prop="date">
+          <el-date-picker
+            v-model="timeVal"
+            value-format="yyyy/MM/dd"
+            format="yyyy/MM/dd"
+            type="daterange"
+            placement="bottom-end"
+            placeholder="自定义时间"
+            :picker-options="pickerOptions"
+            style="width: 280px"
+            @change="onchangeTime"
+          />
+        </el-form-item>
+        <el-form-item label="操作端：">
+          <el-select
+            v-model="tableFrom.type"
+            placeholder="请选择"
+            class="selWidth mr10"
+            clearable
+            filterable
+            @change="getList(1)"
+          >
+            <el-option label="平台端" value="1" />
+            <el-option label="商户端" value="2" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="商品id:" prop="nickname">
+          <el-input
+            v-model="tableFrom.id"
+            @keyup.enter.native="getList(1)"
+            placeholder="请输入id"
+            class="selWidth"
+            clearable
+          />
+        </el-form-item>
+        <el-form-item label="操作人:" prop="nickname">
+          <el-input
+            v-model="tableFrom.operator_nickname"
+            @keyup.enter.native="getList(1)"
+            placeholder="请输入操作人"
+            class="selWidth"
+            clearable
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" size="small" @click="getList(1)"
+            >搜索</el-button
+          >
+          <el-button size="small" @click="searchReset()">重置</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+    <el-card class="mt14">
+      <el-button class="mb20" type="primary" size="small" @click="exports"
+        >导出列表</el-button
+      >
+      <el-table
+        border
+        ref="productRecords"
+        :data="tableData.data"
+        row-key="operate_log_id"
+        size="small"
+        v-loading="listLoading"
+        class="ones"
+      >
+        <el-table-column
+          align="center"
+          label="序号"
+          min-width="60"
+          prop="operate_log_id"
+        />
+        <el-table-column align="center" label="操作记录" min-width="120">
+          <template slot-scope="scope">
+            <span>{{ scope.row.category_name }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="操作端" min-width="100">
+          <template slot-scope="scope">
+            <span>{{ scope.row.type }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="操作角色" min-width="100">
+          <template slot-scope="scope">
+            <span>{{ scope.row.operator_role_nickname }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="操作人" min-width="100">
+          <template slot-scope="scope">
+            <span>{{ scope.row.operator_nickname }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          align="center"
+          label="操作时间"
+          min-width="100"
+          prop="create_time"
+        />
+      </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"
+        />
+      </div>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import { operateRecordList, exportOperate } from "@/api/product";
+import timeOptions from "@/utils/timeOptions";
+import createWorkBook from "@/utils/newToExcel.js";
+export default {
+  name: "ProductComment",
+  data() {
+    return {
+      pickerOptions: timeOptions,
+      tableData: {
+        data: [],
+        total: 0,
+      },
+      timeVal: [],
+      listLoading: true,
+      tableFrom: {
+        page: 1,
+        limit: 20,
+        type: "",
+        date: "",
+      },
+    };
+  },
+  mounted() {
+    this.getList(1);
+  },
+  methods: {
+    async exports() {
+      let excelData = JSON.parse(JSON.stringify(this.tableFrom)),
+        data = [];
+      excelData.page = 1;
+      let pageCount = 1;
+      let lebData = {};
+      for (let i = 0; i < pageCount; i++) {
+        lebData = await this.downData(excelData);
+        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
+      );
+      return;
+    },
+    /**订单列表 */
+    downData(excelData) {
+      return new Promise((resolve, reject) => {
+        let id = this.tableFrom.id;
+        exportOperate(id ? id : "0", excelData).then((res) => {
+          return resolve(res.data);
+        });
+      });
+    },
+    /**重置 */
+    searchReset() {
+      this.timeVal = [];
+      this.tableFrom.date = "";
+      this.$refs.searchForm.resetFields();
+      this.getList(1);
+    },
+    // 选择时间
+    selectChange(tab) {
+      this.tableFrom.date = tab;
+      this.timeVal = [];
+      // this.tableFrom.page = 1;
+      this.getList(1);
+    },
+    // 具体日期
+    onchangeTime(e) {
+      this.timeVal = e;
+      // this.tableFrom.date = this.timeVal ? this.timeVal.join("-") : "";
+      this.tableFrom.date = e ? this.timeVal.join("-") : "";
+      // this.tableFrom.page = 1;
+      this.getList(1);
+    },
+    // 列表
+    getList(num) {
+      this.listLoading = true;
+      this.tableFrom.page = num ? num : this.tableFrom.page;
+      let id = this.tableFrom.id;
+      operateRecordList(id ? id : "0", this.tableFrom)
+        .then((res) => {
+          this.tableData.data = res.data.list;
+          this.tableData.total = res.data.count;
+          this.listLoading = false;
+        })
+        .catch((res) => {
+          this.listLoading = false;
+          this.$message.error(res.message);
+        });
+    },
+    pageChange(page) {
+      this.tableFrom.page = page;
+      this.getList("");
+    },
+    handleSizeChange(val) {
+      this.tableFrom.limit = val;
+      this.getList("");
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+::v-deep .el-rate {
+  margin-top: 9px;
+}
+</style>
diff --git a/src/views/product/productExamine/index.vue b/src/views/product/productExamine/index.vue
index 90b845f..83c3409 100644
--- a/src/views/product/productExamine/index.vue
+++ b/src/views/product/productExamine/index.vue
@@ -1,35 +1,100 @@
 <template>
   <div class="divBox">
     <div class="selCard">
-      <el-form inline size="small" :model="tableFrom" ref="searchForm" label-width="103px">
+      <el-form
+        inline
+        size="small"
+        :model="tableFrom"
+        ref="searchForm"
+        label-width="103px"
+      >
         <el-form-item label="商品分类：" prop="pid">
-          <el-cascader v-model="tableFrom.pid" class="selWidth" :options="merCateList" :props="{ checkStrictly: true, emitPath:false }" clearable @change="getList(1)" />
+          <el-cascader
+            v-model="tableFrom.pid"
+            class="selWidth"
+            :options="merCateList"
+            :props="{ checkStrictly: true, emitPath: false }"
+            clearable
+            @change="getList(1)"
+          />
         </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="us_status">
-          <el-select v-model="tableFrom.us_status" placeholder="请选择" class="filter-item selWidth" clearable @change="getList(1)">
-            <el-option v-for="item in productStatusList" :key="item.value" :label="item.label" :value="item.value" />
+          <el-select
+            v-model="tableFrom.us_status"
+            placeholder="请选择"
+            class="filter-item selWidth"
+            clearable
+            @change="getList(1)"
+          >
+            <el-option
+              v-for="item in productStatusList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
           </el-select>
         </el-form-item>
         <el-form-item label="推荐级别：" prop="star">
-          <el-select v-model="tableFrom.star" placeholder="请选择" class="filter-item selWidth" clearable @change="getList(1)">
-            <el-option v-for="item in recommendedLevelStatus" :key="item.value" :label="item.label" :value="item.value" />
-          </el-select>               
+          <el-select
+            v-model="tableFrom.star"
+            placeholder="请选择"
+            class="filter-item selWidth"
+            clearable
+            @change="getList(1)"
+          >
+            <el-option
+              v-for="item in recommendedLevelStatus"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
         </el-form-item>
         <el-form-item label="标签：" prop="sys_labels">
-          <el-select v-model="tableFrom.sys_labels" placeholder="请选择" class="filter-item selWidth" clearable filterable @change="getList(1)">
-            <el-option v-for="item in labelList" :key="item.id" :label="item.name" :value="item.id" />
-          </el-select>               
+          <el-select
+            v-model="tableFrom.sys_labels"
+            placeholder="请选择"
+            class="filter-item selWidth"
+            clearable
+            filterable
+            @change="getList(1)"
+          >
+            <el-option
+              v-for="item in labelList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
         </el-form-item>
         <!-- <el-form-item label="会员价：" prop="svip_price_type">
         <el-select v-model="tableFrom.svip_price_type" placeholder="请选择" class="selWidth" clearable @change="getList(1)">
@@ -38,87 +103,209 @@
           <el-option label="自定义设置" value="2" />
         </el-select>
       </el-form-item> -->
-      <el-form-item label="商品推荐：" prop="hot_type">
-        <el-select v-model="tableFrom.hot_type" placeholder="请选择" class="filter-item selWidth" clearable filterable @change="getList(1)">
-          <el-option v-for="item in recommendList" :key="item.value" :label="item.name" :value="item.value" />
-        </el-select>               
-      </el-form-item>
-      <el-form-item label="商品类型：" prop="audit_type">
-        <el-select v-model="tableFrom.audit_type" placeholder="请选择" class="filter-item selWidth" clearable @change="getList(1)">
-          <el-option v-for="item in productTypeList" :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" />  
-      </el-form-item>
-      <el-form-item label="标记：" prop="keyword">
-        <el-input v-model="tableFrom.tag_name" @keyup.enter.native="getList(1)" placeholder="请输入标记" class="selWidth" />  
-      </el-form-item>
-      <el-form-item label="时间选择：" prop="create_time">
+        <el-form-item label="商品推荐：" prop="hot_type">
+          <el-select
+            v-model="tableFrom.hot_type"
+            placeholder="请选择"
+            class="filter-item selWidth"
+            clearable
+            filterable
+            @change="getList(1)"
+          >
+            <el-option
+              v-for="item in recommendList"
+              :key="item.value"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="商品类型：" prop="audit_type">
+          <el-select
+            v-model="tableFrom.audit_type"
+            placeholder="请选择"
+            class="filter-item selWidth"
+            clearable
+            @change="getList(1)"
+          >
+            <el-option
+              v-for="item in productTypeList"
+              :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"
+          />
+        </el-form-item>
+        <el-form-item label="标记：" prop="keyword">
+          <el-input
+            v-model="tableFrom.tag_name"
+            @keyup.enter.native="getList(1)"
+            placeholder="请输入标记"
+            class="selWidth"
+          />
+        </el-form-item>
+        <el-form-item label="时间选择：" prop="create_time">
           <el-date-picker
-          v-model="timeVal"
-          value-format="yyyy/MM/dd"
-          format="yyyy/MM/dd"
-          type="daterange"
-          placement="bottom-end"
-          placeholder="自定义时间"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          style="width: 280px;"
-          :picker-options="pickerOptions"
-          @change="onchangeTime"
-          clearable
-        />
+            v-model="timeVal"
+            value-format="yyyy/MM/dd"
+            format="yyyy/MM/dd"
+            type="daterange"
+            placement="bottom-end"
+            placeholder="自定义时间"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            style="width: 280px"
+            :picker-options="pickerOptions"
+            @change="onchangeTime"
+            clearable
+          />
         </el-form-item>
         <el-form-item label="是否惠美乡村：" prop="is_huimei">
-          <el-select v-model="tableFrom.is_huimei" placeholder="请选择" class="filter-item selWidth" clearable @change="getList(1)">
+          <el-select
+            v-model="tableFrom.is_huimei"
+            placeholder="请选择"
+            class="filter-item selWidth"
+            clearable
+            @change="getList(1)"
+          >
             <el-option label="是" value="1" />
             <el-option label="否" value="0" />
           </el-select>
         </el-form-item>
         <el-form-item label="审核状态：" prop="is_audited">
-          <el-select v-model="tableFrom.is_audited" placeholder="请选择" class="filter-item selWidth" clearable @change="getList(1)">
+          <el-select
+            v-model="tableFrom.is_audited"
+            placeholder="请选择"
+            class="filter-item selWidth"
+            clearable
+            @change="getList(1)"
+          >
             <el-option label="首次提报" value="0" />
             <el-option label="已上架提报" value="1" />
             <el-option label="首次修改" value="2" />
             <el-option label="已上架修改" value="3" />
           </el-select>
         </el-form-item>
-      <el-form-item>
-        <el-button type="primary" size="small" @click="getList(1)">搜索</el-button>
-        <el-button size="small" @click="searchReset()">重置</el-button>
-      </el-form-item>
-    </el-form>
-  </div>
+        <el-form-item label="待审核状态：" prop="status">
+          <el-select
+            v-model="tableFrom.status"
+            placeholder="请选择"
+            class="filter-item selWidth"
+            clearable
+            @change="getList(1)"
+          >
+            <el-option
+              v-for="item in statusList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" size="small" @click="getList(1)"
+            >搜索</el-button
+          >
+          <el-button size="small" @click="searchReset()">重置</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
     <el-card class="mt14">
-      <el-tabs v-model="tableFrom.type" @tab-click="getList(1),getLstFilterApi()">
-        <el-tab-pane v-for="(item,index) in headeNum" :key="index" :name="item.type.toString()" :label="item.name +'('+item.count +')' " />
+      <el-tabs
+        v-model="tableFrom.type"
+        @tab-click="getList(1), getLstFilterApi(),setSort()"
+      >
+        <el-tab-pane
+          v-for="(item, index) in headeNum"
+          :key="index"
+          :name="item.type.toString()"
+          :label="item.name + '(' + item.count + ')'"
+        />
       </el-tabs>
       <div class="mt5 mb20">
         <!-- <el-button v-show="tableFrom.type === '6'" size="small" :disabled="multipleSelection.length==0" @click="batch">批量审核</el-button> -->
-        <el-button size="small" :disabled="multipleSelection.length==0 " @click="batchOff">批量强制下架</el-button>
-        <el-button size="small" :disabled="multipleSelection.length==0 " @click="batchShow(0)">批量不显示</el-button>
-        <el-button size="small" :disabled="multipleSelection.length==0 " @click="batchShow(1)">批量显示</el-button>
-        <el-button :disabled="multipleSelection.length==0" size="small" @click="batchLabel">批量设置标签</el-button>
-        <el-button :disabled="multipleSelection.length==0" size="small" @click="batchRecommend">批量设置推荐</el-button>
-        <el-button type="primary" size="small" @click="exports">导出列表</el-button>
+        <el-button
+          size="small"
+          :disabled="multipleSelection.length == 0"
+          @click="batchOff"
+          >批量强制下架</el-button
+        >
+        <el-button
+          size="small"
+          :disabled="multipleSelection.length == 0"
+          @click="batchShow(0)"
+          >批量不显示</el-button
+        >
+        <el-button
+          size="small"
+          :disabled="multipleSelection.length == 0"
+          @click="batchShow(1)"
+          >批量显示</el-button
+        >
+        <el-button
+          :disabled="multipleSelection.length == 0"
+          size="small"
+          @click="batchLabel"
+          >批量设置标记</el-button
+        >
+        <el-button
+          :disabled="multipleSelection.length == 0"
+          size="small"
+          @click="batchRecommend"
+          >批量设置推荐</el-button
+        >
+        <el-button type="primary" size="small" @click="exports"
+          >导出列表</el-button
+        >
       </div>
-      <el-table v-loading="listLoading"  :data="tableData.data" size="small" @selection-change="handleSelectionChange">
-        <el-table-column v-if="Number(tableFrom.type)<7" key="2" type="selection" width="55" />
+      <el-table
+        v-loading="listLoading"
+        max-height="600"
+        :data="tableData.data"
+        size="small"
+        ref="table"
+        @sort-change="handleSortChange"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column
+          v-if="Number(tableFrom.type) < 7"
+          key="2"
+          type="selection"
+          width="55"
+        />
         <el-table-column type="expand">
           <template slot-scope="props">
             <el-form label-position="left" inline class="demo-table-expand">
               <el-form-item label="平台分类：">
-                <span>{{ props.row.storeCategory?props.row.storeCategory.cate_name:'-' }}</span>
+                <span>{{
+                  props.row.storeCategory
+                    ? props.row.storeCategory.cate_name
+                    : "-"
+                }}</span>
               </el-form-item>
               <el-form-item label="商品分类：">
                 <template v-if="props.row.merCateId.length">
-                  <span v-for="(item, index) in props.row.merCateId" :key="index" class="mr10">{{ item.category ? item.category.cate_name : '-' }}</span>
+                  <span
+                    v-for="(item, index) in props.row.merCateId"
+                    :key="index"
+                    class="mr10"
+                    >{{ item.category ? item.category.cate_name : "-" }}</span
+                  >
                 </template>
                 <span v-else>-</span>
               </el-form-item>
               <el-form-item label="品牌：">
-                <span>{{ props.row.brand ? props.row.brand.brand_name: '其它' }}</span>
+                <span>{{
+                  props.row.brand ? props.row.brand.brand_name : "其它"
+                }}</span>
               </el-form-item>
               <el-form-item label="市场价格：">
                 <span>{{ props.row.ot_price | filterEmpty }}</span>
@@ -145,29 +332,40 @@
         <el-table-column label="商品图" min-width="70">
           <template slot-scope="scope">
             <div class="demo-image__preview">
-              <el-image style="width: 36px; height: 36px" :src="scope.row.image" :preview-src-list="[scope.row.image]" />
+              <el-image
+                style="width: 36px; height: 36px"
+                :src="scope.row.image"
+                :preview-src-list="[scope.row.image]"
+              />
             </div>
           </template>
         </el-table-column>
         <el-table-column prop="store_name" label="商品名称" min-width="180">
           <template slot-scope="scope">
-            <div><span class="tags_name" :class="'name'+scope.row.spec_type">{{ scope.row.spec_type==0 ? '[单规格]' : '[多规格]' }}</span>{{ scope.row.store_name || '-' }}</div>
+            <div>
+              <span class="tags_name" :class="'name' + scope.row.spec_type">{{
+                scope.row.spec_type == 0 ? "[单规格]" : "[多规格]"
+              }}</span
+              >{{ scope.row.store_name || "-" }}
+            </div>
           </template>
         </el-table-column>
         <el-table-column label="商户名称" min-width="100">
           <template slot-scope="scope">
-            <span>{{ scope.row.merchant ? scope.row.merchant.mer_name : '' }}</span>
+            <span>{{
+              scope.row.merchant ? scope.row.merchant.mer_name : ""
+            }}</span>
           </template>
         </el-table-column>
         <el-table-column prop="remark" label="商家备注" min-width="100" />
         <el-table-column label="是否惠美乡村店铺" min-width="80">
           <template slot-scope="scope">
-            <span>{{ scope.row.merchant.is_huimei ? '是' : '否' }}</span>
+            <span>{{ scope.row.merchant.is_huimei ? "是" : "否" }}</span>
           </template>
         </el-table-column>
         <el-table-column label="是否惠美乡村产品" min-width="80">
           <template slot-scope="scope">
-            <span>{{ scope.row.is_huimei ? '是' : '否' }}</span>
+            <span>{{ scope.row.is_huimei ? "是" : "否" }}</span>
           </template>
         </el-table-column>
         <el-table-column prop="price" label="商品售价" min-width="80" />
@@ -184,11 +382,22 @@
             </el-rate>
           </template>
         </el-table-column>
-        <el-table-column prop="storeCategory.cate_name" label="平台分类" min-width="80" />
+        <el-table-column
+          prop="storeCategory.cate_name"
+          label="平台分类"
+          min-width="80"
+        />
         <el-table-column prop="rank" label="排序" min-width="60" />
         <el-table-column prop="status" label="是否显示" min-width="80">
           <template slot-scope="scope">
-            <el-switch v-model="scope.row.is_used" :active-value="1" :inactive-value="0" active-text="显示" inactive-text="隐藏" @change="onchangeIsShow(scope.row)" />
+            <el-switch
+              v-model="scope.row.is_used"
+              :active-value="1"
+              :inactive-value="0"
+              active-text="显示"
+              inactive-text="隐藏"
+              @change="onchangeIsShow(scope.row)"
+            />
           </template>
         </el-table-column>
         <el-table-column prop="stock" label="商品状态" min-width="90">
@@ -197,159 +406,304 @@
           </template>
         </el-table-column>
         <el-table-column prop="refusal" label="拒绝/锁定原因" min-width="110" />
-        <el-table-column prop="create_time" label="创建时间" min-width="120" />
-        <el-table-column key="8" label="操作" min-width="210" fixed="right">
+        <el-table-column prop="create_time" sortable='custom' label="创建时间" min-width="120" />
+        <el-table-column prop="update_time" sortable='custom' label="更新时间" min-width="120" />
+        <el-table-column key="8" label="操作" min-width="260" fixed="right">
           <template slot-scope="scope">
-            <el-button type="text" size="small" @click="onDetails(scope.row.product_id)">详情</el-button>
-            <el-button v-if="tableFrom.type === '6' || tableFrom.type === '10' || tableFrom.type === '11'" type="text" size="small" @click.native="toExamine(scope.row.product_id)">审核</el-button>
-            <el-button v-if="scope.row.status == 15" type="text" size="small" @click.native="toExamine(scope.row.product_id)">解锁</el-button>
-            <el-button type="text" size="small" class="mr10" @click="handlePreview(scope.row.product_id)">预览</el-button>
+            <el-button
+              type="text"
+              size="small"
+              @click="onDetails(scope.row.product_id)"
+              >详情</el-button
+            >
+            <el-button
+              v-if="audit"
+              type="text"
+              size="small"
+              @click.native="toExamine(scope.row.product_id)"
+              >审核</el-button
+            >
+            <el-button
+              v-if="audit"
+              type="text"
+              size="small"
+              @click="openLock(scope.row.product_id)"
+              >锁定</el-button
+            >
+            <el-button
+              v-if="scope.row.lock == 1"
+              type="text"
+              size="small"
+              @click.native="openUnlock(scope.row.product_id)"
+              >解锁</el-button
+            >
+            <el-button
+              type="text"
+              size="small"
+              @click="getBack(scope.row.product_id)"
+              v-if="[7 ,9, 10, 11].includes(Number(tableFrom.type))"
+              >返回</el-button
+            >
+            <el-button
+              type="text"
+              size="small"
+              class="mr10"
+              @click="handlePreview(scope.row.product_id)"
+              >预览</el-button
+            >
             <el-dropdown>
               <span class="el-dropdown-link">
-                  更多<i class="el-icon-arrow-down el-icon--right" />
+                更多<i class="el-icon-arrow-down el-icon--right" />
               </span>
               <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item v-if="Number(tableFrom.type) < 7" @click.native="onEdit(scope.row.product_id)">编辑商品</el-dropdown-item>
-                <el-dropdown-item v-if="Number(tableFrom.type) < 7" @click.native="onAuditFree(scope.row)">价格编辑</el-dropdown-item>
+                <el-dropdown-item
+                  v-if="Number(tableFrom.type) < 7"
+                  @click.native="onEdit(scope.row.product_id)"
+                  >编辑商品</el-dropdown-item
+                >
+                <el-dropdown-item
+                  v-if="Number(tableFrom.type) < 7"
+                  @click.native="onAuditFree(scope.row)"
+                  >价格编辑</el-dropdown-item
+                >
                 <el-dropdown-item v-if="tableFrom.type != 5">
-                  <router-link :to="{path: roterPre + '/product/comment/?product_id=' + scope.row.product_id}" style="font-size: 14px;">
+                  <router-link
+                    :to="{
+                      path:
+                        roterPre +
+                        '/product/comment/?product_id=' +
+                        scope.row.product_id,
+                    }"
+                    style="font-size: 14px"
+                  >
                     查看评价
                   </router-link>
                 </el-dropdown-item>
                 <!-- <el-dropdown-item v-if="tableFrom.type !== '5'" @click.native="onEditLabel(scope.row)">编辑标签</el-dropdown-item> -->
-                <el-dropdown-item @click.native="setTagName(scope.row.product_id)">编辑标签</el-dropdown-item>
-                <el-dropdown-item v-if="tableFrom.type === '6' || tableFrom.type === '1'"  @click.native="toVirtualSales(scope.row.product_id)">已售数量</el-dropdown-item> 
-                <el-dropdown-item v-if="Number(tableFrom.type) < 3" @click.native="toOff(scope.row.product_id)">强制下架</el-dropdown-item>
+                <el-dropdown-item
+                  @click.native="setTagName(scope.row.product_id)"
+                  >编辑标记</el-dropdown-item
+                >
+                <el-dropdown-item
+                  v-if="tableFrom.type === '6' || tableFrom.type === '1'"
+                  @click.native="toVirtualSales(scope.row.product_id)"
+                  >已售数量</el-dropdown-item
+                >
+                <el-dropdown-item
+                  v-if="Number(tableFrom.type) < 3"
+                  @click.native="toOff(scope.row.product_id)"
+                  >强制下架</el-dropdown-item
+                >
               </el-dropdown-menu>
             </el-dropdown>
           </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>
-    <info-from ref="infoFrom" :is-show="isShow" :ids="OffId" @subSuccess="subSuccess" />
-    <el-dialog title="商品编辑" :visible.sync="dialogVisible" width="960px" :before-close="handleClose" :append-to-body='append'>
-      <el-form ref="formValidate" v-loading="fullscreenLoading" class="formValidate mt20" :rules="ruleValidate" :model="formValidate" size="small" label-width="100px" @submit.native.prevent>
+    <info-from
+      ref="infoFrom"
+      :is-show="isShow"
+      :ids="OffId"
+      @subSuccess="subSuccess"
+    />
+    <el-dialog
+      title="商品编辑"
+      :visible.sync="dialogVisible"
+      width="960px"
+      :before-close="handleClose"
+      :append-to-body="append"
+    >
+      <el-form
+        ref="formValidate"
+        v-loading="fullscreenLoading"
+        class="formValidate mt20"
+        :rules="ruleValidate"
+        :model="formValidate"
+        size="small"
+        label-width="100px"
+        @submit.native.prevent
+      >
         <el-form-item label="品牌名称：" prop="store_name">
-          <el-input :disabled='true' :value="formValidate.qualification&&formValidate.qualification.brands_name" size="small" placeholder="请输入商品名称" />
+          <el-input
+            :disabled="true"
+            :value="
+              formValidate.qualification &&
+              formValidate.qualification.brands_name
+            "
+            size="small"
+            placeholder="请输入商品名称"
+          />
         </el-form-item>
         <el-form-item label="商品名称：" prop="store_name">
-          <el-input v-model="formValidate.store_name" size="small" placeholder="请输入商品名称" />
+          <el-input
+            v-model="formValidate.store_name"
+            size="small"
+            placeholder="请输入商品名称"
+          />
         </el-form-item>
         <el-form-item label="商品关键字：" prop="keyword">
-              <el-input
-                v-model="formValidate.keyword"
-                placeholder="请输入商品关键字"
-                size="small"
-              />
+          <el-input
+            v-model="formValidate.keyword"
+            placeholder="请输入商品关键字"
+            size="small"
+          />
         </el-form-item>
         <el-form-item label="商品封面图：" prop="image">
           <div class="demo-image__preview">
-              <el-image
-                style="width: 60px; height: 60px"
-                :src="formValidate.image"
-                :preview-src-list="[formValidate.image]"
-              />
-            </div>
+            <el-image
+              style="width: 60px; height: 60px"
+              :src="formValidate.image"
+              :preview-src-list="[formValidate.image]"
+            />
+          </div>
         </el-form-item>
         <el-form-item label="星级推荐：">
-          <el-rate class="rate_star" v-model="formValidate.star" :colors="colors" style="margin-top: 4px;"></el-rate>
-          <span style="margin-top: 4px; font-size: 12px;">备注：5星为最高推荐级别，1星为最低推荐级别，设置后会在商城商品列表、搜索商品列表中体现。</span>
+          <el-rate
+            class="rate_star"
+            v-model="formValidate.star"
+            :colors="colors"
+            style="margin-top: 4px"
+          ></el-rate>
+          <span style="margin-top: 4px; font-size: 12px"
+            >备注：5星为最高推荐级别，1星为最低推荐级别，设置后会在商城商品列表、搜索商品列表中体现。</span
+          >
         </el-form-item>
         <el-form-item label="商品推荐：">
-          <el-checkbox-group v-model="checkboxGroup" size="small" @change="onChangeGroup">
-            <el-checkbox v-for="(item, index) in recommend" :key="index" :label="item.value">{{ item.name }}</el-checkbox>
+          <el-checkbox-group
+            v-model="checkboxGroup"
+            size="small"
+            @change="onChangeGroup"
+          >
+            <el-checkbox
+              v-for="(item, index) in recommend"
+              :key="index"
+              :label="item.value"
+              >{{ item.name }}</el-checkbox
+            >
           </el-checkbox-group>
         </el-form-item>
         <el-form-item label="排序：">
-          <el-input-number v-model="formValidate.rank" size="small" placeholder="请输入排序序号" style="width: 200px;" />
+          <el-input-number
+            v-model="formValidate.rank"
+            size="small"
+            placeholder="请输入排序序号"
+            style="width: 200px"
+          />
         </el-form-item>
         <el-form-item label="平台商品分类：" prop="cate_id" label-width="100px">
-              <el-cascader
-                v-model="formValidate.cate_id"
-                size="small"
-                :options="merCateList"
-                :props="props"
-                filterable
-                clearable
-              />
+          <el-cascader
+            v-model="formValidate.cate_id"
+            size="small"
+            :options="merCateList"
+            :props="props"
+            filterable
+            clearable
+          />
         </el-form-item>
         <el-form-item label="商品轮播图：" prop="slider_image">
-              <div class="acea-row">
-                <div
-                  v-for="(item, index) in formValidate.slider_image"
-                  :key="index"
-                  class="pictrue"
-                  draggable="false"
-                  @dragstart="handleDragStart($event, item)"
-                  @dragover.prevent="handleDragOver($event, item)"
-                  @dragenter="handleDragEnter($event, item)"
-                  @dragend="handleDragEnd($event, item)"
-                >
-                  <!-- <img :src="item"> -->
-                  <el-image
-                    style="width: 60px; height: 60px"
-                    :src="item"
-                    :preview-src-list="[item]"
-                  />
-                  <i
-                    class="el-icon-error btndel"
-                    @click="handleRemove(index)"
-                  />
-                </div>
-                <div
-                  v-if="formValidate.slider_image.length < 10"
-                  class="uploadCont"
-                  title="750*750px"
-                >
-                  <div class="upLoadPicBox" @click="modalPicTap('2')">
-                    <div class="upLoad">
-                      <i class="el-icon-camera cameraIconfont" />
-                    </div>
-                  </div>
+          <div class="acea-row">
+            <div
+              v-for="(item, index) in formValidate.slider_image"
+              :key="index"
+              class="pictrue"
+              draggable="false"
+              @dragstart="handleDragStart($event, item)"
+              @dragover.prevent="handleDragOver($event, item)"
+              @dragenter="handleDragEnter($event, item)"
+              @dragend="handleDragEnd($event, item)"
+            >
+              <!-- <img :src="item"> -->
+              <el-image
+                style="width: 60px; height: 60px"
+                :src="item"
+                :preview-src-list="[item]"
+              />
+              <i class="el-icon-error btndel" @click="handleRemove(index)" />
+            </div>
+            <div
+              v-if="formValidate.slider_image.length < 10"
+              class="uploadCont"
+              title="750*750px"
+            >
+              <div class="upLoadPicBox" @click="modalPicTap('2')">
+                <div class="upLoad">
+                  <i class="el-icon-camera cameraIconfont" />
                 </div>
               </div>
-            </el-form-item>
+            </div>
+          </div>
+        </el-form-item>
         <el-col :span="24">
           <el-form-item label="商品详情：">
-            <ueditor-from v-model="formValidate.content" :content="formValidate.content" />
+            <ueditor-from
+              v-model="formValidate.content"
+              :content="formValidate.content"
+            />
           </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 style="margin-top: 30px">
+          <el-button
+            type="primary"
+            class="submission"
+            size="small"
+            @click="handleSubmit('formValidate')"
+            >提交</el-button
+          >
         </el-form-item>
       </el-form>
     </el-dialog>
-     <!--预览商品-->
+    <!--预览商品-->
     <div v-if="previewVisible">
       <div class="bg" @click.stop="previewVisible = false" />
-      <preview-box v-if="previewVisible" ref="previewBox" :goods-id="goodsId" :product-type="0" :preview-key="previewKey" />
+      <preview-box
+        v-if="previewVisible"
+        ref="previewBox"
+        :goods-id="goodsId"
+        :product-type="0"
+        :preview-key="previewKey"
+      />
     </div>
     <!--编辑标签-->
     <el-dialog
       v-if="dialogLabel"
-      title="选择标签"
+      title="编辑标记"
       :visible.sync="dialogLabel"
       width="470px"
       :before-close="handleClose"
     >
-      <el-form ref="labelForm" :model="labelForm" @submit.native.prevent size="small">
-        <el-form-item>
-          <el-select v-model="labelForm.sys_labels" clearable filterable multiple size="small" placeholder="请选择" class="width100">
-            <el-option
-              v-for="item in labelList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id.toString()"
-            />
-          </el-select>
+      <el-form
+        ref="labelForm"
+        :model="labelForm"
+        inline
+        :rules="rules"
+        @submit.native.prevent
+        size="small"
+      >
+        <el-form-item label="标记" prop="tag_name">
+          <el-input
+            v-model="labelForm.tag_name"
+            placeholder="请输入商品关键字"
+            size="small"
+            class="selWidth"
+          />
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
-        <el-button size="small" @click="dialogLabel=false">取消</el-button>
-        <el-button type="primary" size="small" @click="submitForm('labelForm')">提交</el-button>
+        <el-button size="small" @click="dialogLabel = false">取消</el-button>
+        <el-button type="primary" size="small" @click="submitForm('labelForm')"
+          >提交</el-button
+        >
       </span>
     </el-dialog>
     <!--编辑推荐-->
@@ -362,8 +716,17 @@
     >
       <el-form @submit.native.prevent size="small">
         <el-form-item label="商品推荐：">
-         <el-checkbox-group v-model="recommendGroup" @change="onChangeRecommend" size="small">
-            <el-checkbox v-for="(item, index) in recommend" :key="index" :label="item.value">{{ item.name }}</el-checkbox>
+          <el-checkbox-group
+            v-model="recommendGroup"
+            @change="onChangeRecommend"
+            size="small"
+          >
+            <el-checkbox
+              v-for="(item, index) in recommend"
+              :key="index"
+              :label="item.value"
+              >{{ item.name }}</el-checkbox
+            >
           </el-checkbox-group>
         </el-form-item>
       </el-form>
@@ -384,7 +747,6 @@
 </template>
 
 <script>
-
 import {
   changeApi,
   productLstApi,
@@ -398,40 +760,48 @@ import {
   getProductLabelApi,
   updatetProductLabel,
   batchesLabelsApi,
+  batchesTagNameApi,
   batchesRecommendApi,
   batchesOnOffApi,
   exportProductApi,
-  setTagNameApi
-} from '@/api/product'
-import { roterPre } from '@/settings'
-import infoFrom from './info'
-import editAttr from './editAttr'
-import ueditorFrom from '@/components/ueditorFrom'
-import previewBox from '@/components/previewBox/index'
-import proDetail from './proDetails.vue';
-import timeOptions from '@/utils/timeOptions';
-import createWorkBook from '@/utils/newToExcel.js';
-const proOptions = [{
-  name: '热门榜单',
-  value: 'is_hot'
-}, {
-  name: '促销单品',
-  value: 'is_benefit'
-}, {
-  name: '精品推荐',
-  value: 'is_best'
-}, {
-  name: '首发新品',
-  value: 'is_new'
-}]
+  setTagNameApi,
+  productLockApi,
+  productBackApi,
+} from "@/api/product";
+import { roterPre } from "@/settings";
+import infoFrom from "./info";
+import editAttr from "./editAttr";
+import ueditorFrom from "@/components/ueditorFrom";
+import previewBox from "@/components/previewBox/index";
+import proDetail from "./proDetails.vue";
+import timeOptions from "@/utils/timeOptions";
+import createWorkBook from "@/utils/newToExcel.js";
+const proOptions = [
+  {
+    name: "热门榜单",
+    value: "is_hot",
+  },
+  {
+    name: "促销单品",
+    value: "is_benefit",
+  },
+  {
+    name: "精品推荐",
+    value: "is_best",
+  },
+  {
+    name: "首发新品",
+    value: "is_new",
+  },
+];
 export default {
-  name: 'ProductExamine1',
+  name: "ProductExamine1",
   components: {
     infoFrom,
     ueditorFrom,
     previewBox,
     proDetail,
-    editAttr
+    editAttr,
   },
   data() {
     return {
@@ -439,42 +809,62 @@ export default {
       pickerOptions: timeOptions,
       timeVal: [],
       ruleValidate: {
-        store_name: [{
-          required: true,
-          message: "请输入商品名称",
-          trigger: "blur"
-        },]
+        store_name: [
+          {
+            required: true,
+            message: "请输入商品名称",
+            trigger: "blur",
+          },
+        ],
       },
-      
+
       dialogVisible: false,
       dialogRecommend: false,
       append: true,
       checkboxGroup: [],
       recommendGroup: [],
-      colors: ['#99A9BF', '#F7BA2A', '#FF9900'],
+      colors: ["#99A9BF", "#F7BA2A", "#FF9900"],
       recommendedLevelStatus: [
         { label: "全部", value: "" },
         { label: "5星", value: 5 },
         { label: "4星", value: 4 },
         { label: "3星", value: 3 },
         { label: "2星", value: 2 },
-        { label: "1星", value: 1 }
+        { label: "1星", value: 1 },
       ],
-      auditedList:['首次提报','已上架提报','首次修改','已上架修改'],
+      // 1 出售中 2 仓库中 3 已售罄 4 警戒库存 5 回收站 6 产品部待审核 7 审核未通过  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: 9 },
+        { label: "运维专员审核", value: 10 },
+        { label: "最终审核", value: 11 }
+      ],
+      auditedList: ["首次提报", "已上架提报", "首次修改", "已上架修改"],
       recommend: proOptions,
-      recommendList: [{
-        name: '热门榜单',
-        value: 'hot'
-      }, {
-        name: '促销单品',
-        value: 'good'
-      }, {
-        name: '精品推荐',
-        value: 'best'
-      }, {
-        name: '首发新品',
-        value: 'new'
-      }],
+      recommendList: [
+        {
+          name: "热门榜单",
+          value: "hot",
+        },
+        {
+          name: "促销单品",
+          value: "good",
+        },
+        {
+          name: "精品推荐",
+          value: "best",
+        },
+        {
+          name: "首发新品",
+          value: "new",
+        },
+      ],
       formValidate: {
         is_hot: 0,
         is_best: 0,
@@ -482,16 +872,16 @@ export default {
         is_benefit: 0,
         ficti: 0,
         is_ficti: "",
-        content: '',
-        store_name: '',
+        content: "",
+        store_name: "",
         rank: 0,
-        us_status: '',
+        us_status: "",
         star: 0,
-        keyword:'',
-        cate_id:0,
+        keyword: "",
+        cate_id: 0,
         slider_image: [],
-        qualification:{},
-        image:''
+        qualification: {},
+        image: "",
       },
       productStatusList: [
         { label: "上架显示", value: 1 },
@@ -499,9 +889,9 @@ export default {
         { label: "平台关闭", value: -1 },
       ],
       productTypeList: [
-        { label: '食品及保健品', value: 0 },
-        { label: '化妆品及日化品', value: 1 },
-        { label: '其他品类', value: 2 }
+        { label: "食品及保健品", value: 0 },
+        { label: "化妆品及日化品", value: 1 },
+        { label: "其他品类", value: 2 },
       ],
       fullscreenLoading: false,
       isShow: false,
@@ -509,28 +899,29 @@ export default {
       listLoading: true,
       tableData: {
         data: [],
-        total: 0
+        total: 0,
       },
       tableFrom: {
         page: 1,
         limit: 20,
-        date:'',
-        cate_id: '',
-        sys_labels: '',
-        pid: '',
-        tag_name:'',
-        store_name: '',
-        audit_type:'',
-        type: '6',
-        mer_id: '',
-        keyword: '',
-        is_trader: '',
-        hot_type: '',
-        star: '',
-        svip_price_type: '',
-        is_audited:'',
-        is_huimei:'',
-        product_id: this.$route.query.id ? this.$route.query.id : ""
+        date: "",
+        cate_id: "",
+        sys_labels: "",
+        pid: "",
+        tag_name: "",
+        store_name: "",
+        audit_type: "",
+        type: "6",
+        mer_id: "",
+        keyword: "",
+        is_trader: "",
+        hot_type: "",
+        star: "",
+        svip_price_type: "",
+        is_audited: "",
+        is_huimei: "",
+        order:'',
+        product_id: this.$route.query.id ? this.$route.query.id : "",
       },
       categoryList: [],
       merCateList: [],
@@ -539,83 +930,137 @@ export default {
       merSelect: [],
       OffId: [],
       productId: 0,
-      tabClickIndex: '',
+      tabClickIndex: "",
       previewVisible: false,
-      goodsId: '',
-      previewKey: '',
-      product_id: '',
+      goodsId: "",
+      previewKey: "",
+      product_id: "",
       labelList: [],
       dialogLabel: false,
       isBatch: false,
-      labelForm: {},
+      labelForm: {
+        ids:[],
+        tag_name:''
+      },
+      rules: {
+        tag_name: [
+          { required: true, message: "请输入标记", trigger: "blur" },
+        ]
+      },
       recommendForm: {},
-      drawer: false
-    }
+      drawer: false,
+    };
   },
   mounted() {
-    this.getMerSelect()
-    this.getList('')
-    this.getCategorySelect()
-    this.getLstFilterApi()
-    this.getLabelLst()
+    this.getMerSelect();
+    this.getList("");
+    this.getCategorySelect();
+    this.getLstFilterApi();
+    this.getLabelLst();
+  },
+  computed: {
+    audit() {
+      return (
+        this.tableFrom.type === "6" ||
+        this.tableFrom.type === "10" ||
+        this.tableFrom.type === "11" ||
+        this.tableFrom.type === "9"
+      );
+    },
   },
   methods: {
+    handleSortChange(row){
+      switch (row.prop) {
+        case 'create_time':
+          this.tableFrom.order = row.order == 'ascending' ? 'create_asc' : 'create_desc';
+          break;
+        case 'update_time':
+          this.tableFrom.order = row.order == 'ascending' ? 'update_asc' : 'update_desc';
+          break;
+        default:
+          break;
+      }
+      this.getList('')
+    },
+    setSort(){
+      this.$refs.table.clearSort()
+      this.tableFrom.order = ''
+    },
+    getBack(id) {
+      this.$modalForm(productBackApi(id)).then(() => this.getList(""));
+    },
+    // 解锁
+    openUnlock(id) {
+      this.$modalForm(productLockApi(id)).then(() => this.getList(""));
+    },
+    // 锁定
+    openLock(id) {
+      this.$modalForm(productLockApi(id)).then(() => this.getList(""));
+    },
     // 价格编辑
     onAuditFree(row) {
-      this.$refs.editAttr.getAttrDetail(row.product_id)
+      this.$refs.editAttr.getAttrDetail(row.product_id);
     },
     async exports() {
-      let excelData = JSON.parse(JSON.stringify(this.tableFrom)), data = []
-      excelData.page = 1
-      let pageCount = 1
+      let excelData = JSON.parse(JSON.stringify(this.tableFrom)),
+        data = [];
+      excelData.page = 1;
+      let pageCount = 1;
       let lebData = {};
       for (let i = 0; i < pageCount; i++) {
-        lebData = await this.downData(excelData)
-        pageCount = Math.ceil(lebData.count/excelData.limit)
+        lebData = await this.downData(excelData);
+        pageCount = Math.ceil(lebData.count / excelData.limit);
         if (lebData.export.length) {
-          data = data.concat(lebData.export)
-          excelData.page++
+          data = data.concat(lebData.export);
+          excelData.page++;
         }
       }
-      createWorkBook(lebData.header, lebData.title, data, lebData.foot,lebData.filename);
-      return
+      createWorkBook(
+        lebData.header,
+        lebData.title,
+        data,
+        lebData.foot,
+        lebData.filename
+      );
+      return;
     },
     /**订单列表 */
     downData(excelData) {
       return new Promise((resolve, reject) => {
         exportProductApi(excelData).then((res) => {
-          return resolve(res.data)
-        })
-      })
+          return resolve(res.data);
+        });
+      });
     },
-          // 具体日期
+    // 具体日期
     onchangeTime(e) {
-      this.timeVal = e
-      this.tableFrom.date = e ? this.timeVal.join('-') : ''
-      this.getList(1)
+      this.timeVal = e;
+      this.tableFrom.date = e ? this.timeVal.join("-") : "";
+      this.getList(1);
     },
     /**重置 */
-    searchReset(){
-      this.timeVal = []
-      this.tableFrom.date = ""
-      this.$refs.searchForm.resetFields()
-      this.getList(1)
+    searchReset() {
+      this.timeVal = [];
+      this.tableFrom.date = "";
+      this.setSort()
+      this.$refs.searchForm.resetFields();
+      this.getList(1);
     },
     subSuccess() {
-      this.getList('')
-      this.getLstFilterApi()
+      this.getList("");
+      this.getLstFilterApi();
     },
     // 点击商品图
     modalPicTap(tit, num, i) {
       const _this = this;
       const attr = [];
-      this.$modalUpload(function(img) {
+      this.$modalUpload(function (img) {
         if (tit === "1" && !num) {
           _this.formValidate.image = img[0];
           _this.OneattrValue[0].image = img[0];
         }
         if (tit === "2" && !num) {
-          img.map(item => {
+          img.map((item) => {
             attr.push(item.attachment_src);
             _this.formValidate.slider_image.push(item);
             if (_this.formValidate.slider_image.length > 10) {
@@ -635,40 +1080,39 @@ export default {
       }, tit);
     },
     onchangeIsShow(row) {
-      changeApi(row.product_id, row.is_used).then(({
-        message
-      }) => {
-        this.$message.success(message)
-        this.getList('')
-        this.getLstFilterApi()
-      }).catch(({
-        message
-      }) => {
-        this.$message.error(message)
-      })
+      changeApi(row.product_id, row.is_used)
+        .then(({ message }) => {
+          this.$message.success(message);
+          this.getList("");
+          this.getLstFilterApi();
+        })
+        .catch(({ message }) => {
+          this.$message.error(message);
+        });
     },
     // 预览
     handlePreview(id) {
-      this.previewVisible = true
-      this.goodsId = id
-      this.previewKey = ''
+      this.previewVisible = true;
+      this.goodsId = id;
+      this.previewKey = "";
     },
     // 获取标签项
     getLabelLst() {
-      getProductLabelApi().then(res => {
-        this.labelList = res.data
-      })
-        .catch(res => {
-          this.$message.error(res.message)
+      getProductLabelApi()
+        .then((res) => {
+          this.labelList = res.data;
         })
+        .catch((res) => {
+          this.$message.error(res.message);
+        });
     },
     // 编辑标签
     onEditLabel(row) {
-      this.dialogLabel = true
-      this.product_id = row.product_id
+      this.dialogLabel = true;
+      this.product_id = row.product_id;
       this.labelForm = {
-        sys_labels: row.sys_labels
-      }
+        sys_labels: row.sys_labels,
+      };
     },
     handleRemove(i) {
       this.formValidate.slider_image.splice(i, 1);
@@ -677,7 +1121,7 @@ export default {
     onDetails(id) {
       this.product_id = id;
       this.drawer = true;
-      this.$refs.proDetail.getInfo(id)
+      this.$refs.proDetail.getInfo(id);
     },
     // 移动
     handleDragStart(e, item) {
@@ -707,260 +1151,304 @@ export default {
       this.drawer = false;
     },
     submitForm(name) {
-      this.$refs[name].validate(valid => {
+      this.$refs[name].validate((valid) => {
         if (valid) {
-          this.isBatch ? batchesLabelsApi(this.labelForm).then(({ message }) => {
-            this.$message.success(message)
-            this.getList('')
-            this.dialogLabel = false
-            this.isBatch = false
-          }).catch(res => {
-            this.$message.error(res.message)
-          }) :
-          updatetProductLabel(this.product_id, this.labelForm).then(({ message }) => {
-            this.$message.success(message)
-            this.getList('')
-            this.dialogLabel = false
-          }).catch(res => {
-            this.$message.error(res.message)
-          })
+          this.isBatch
+            ? batchesTagNameApi(this.labelForm)
+                .then(({ message }) => {
+                  this.$message.success(message);
+                  this.getList("");
+                  this.dialogLabel = false;
+                  this.isBatch = false;
+                })
+                .catch((res) => {
+                  this.$message.error(res.message);
+                })
+            : updatetProductLabel(this.product_id, this.labelForm)
+                .then(({ message }) => {
+                  this.$message.success(message);
+                  this.getList("");
+                  this.dialogLabel = false;
+                })
+                .catch((res) => {
+                  this.$message.error(res.message);
+                });
         } else {
-          return
+          return;
         }
-      })
+      });
     },
     batchRecommend() {
-      this.dialogRecommend = true
-      this.recommendGroup = []
+      this.dialogRecommend = true;
+      this.recommendGroup = [];
     },
     submitRecommendForm() {
-      this.recommendForm.ids = this.OffId
-      batchesRecommendApi(this.recommendForm).then(({ message }) => {
-        this.$message.success(message)
-        this.getList('')
-        this.dialogRecommend = false
-      }).catch(res => {
-        this.$message.error(res.message)
-      })
+      this.recommendForm.ids = this.OffId;
+      batchesRecommendApi(this.recommendForm)
+        .then(({ message }) => {
+          this.$message.success(message);
+          this.getList("");
+          this.dialogRecommend = false;
+        })
+        .catch((res) => {
+          this.$message.error(res.message);
+        });
     },
     getInfo(id) {
-      this.fullscreenLoading = true
+      this.fullscreenLoading = true;
       this.checkboxGroup = [];
-      productDetailApi(id).then(res => {
-        const info = res.data
-        this.formValidate = {
-          is_hot: info.is_hot,
-          is_best: info.is_best,
-          is_new: info.is_new,
-          is_benefit: info.is_benefit,
-          ficti: info.ficti,
-          content: info.content,
-          store_name: info.store_name,
-          rank: info.rank,
-          star: info.star,
-          keyword:info.keyword,
-          cate_id:info.cate_id,
-          slider_image: info.slider_image,
-          qualification:info.qualification,
-          image:info.image
-        }
-        if(info.is_benefit === 1) this.checkboxGroup.push('is_benefit')
-        if(info.is_hot === 1) this.checkboxGroup.push('is_hot')
-        if(info.is_best === 1) this.checkboxGroup.push('is_best')
-        if(info.is_new === 1) this.checkboxGroup.push('is_new')
-        this.fullscreenLoading = false
-      }).catch(res => {
-        this.$message.error(res.message)
-        this.fullscreenLoading = false
-      })
+      productDetailApi(id)
+        .then((res) => {
+          const info = res.data;
+          this.formValidate = {
+            is_hot: info.is_hot,
+            is_best: info.is_best,
+            is_new: info.is_new,
+            is_benefit: info.is_benefit,
+            ficti: info.ficti,
+            content: info.content,
+            store_name: info.store_name,
+            rank: info.rank,
+            star: info.star,
+            keyword: info.keyword,
+            cate_id: info.cate_id,
+            slider_image: info.slider_image,
+            qualification: info.qualification,
+            image: info.image,
+          };
+          if (info.is_benefit === 1) this.checkboxGroup.push("is_benefit");
+          if (info.is_hot === 1) this.checkboxGroup.push("is_hot");
+          if (info.is_best === 1) this.checkboxGroup.push("is_best");
+          if (info.is_new === 1) this.checkboxGroup.push("is_new");
+          this.fullscreenLoading = false;
+        })
+        .catch((res) => {
+          this.$message.error(res.message);
+          this.fullscreenLoading = false;
+        });
     },
     onEdit(id) {
-      this.productId = id
-      this.getInfo(id)
-      this.dialogVisible = true
+      this.productId = id;
+      this.getInfo(id);
+      this.dialogVisible = true;
     },
     // 编辑虚拟销量
     toVirtualSales(id) {
-      this.$modalForm(toVirtualSalesApi(id)).then(() => this.getList(''))
+      this.$modalForm(toVirtualSalesApi(id)).then(() => this.getList(""));
     },
     // 编辑标签
     setTagName(id) {
-      this.$modalForm(setTagNameApi(id)).then(() => this.getList(''))
+      this.$modalForm(setTagNameApi(id)).then(() => this.getList(""));
     },
     // 提交
     handleSubmit(name) {
-      console.log(this.formValidate)
+      console.log(this.formValidate);
       this.$refs[name].validate((valid) => {
-        if(valid) {
-          productUpdateApi(this.productId, this.formValidate).then(async res => {
-            this.fullscreenLoading = false
-            this.$message.success(res.message)
-            this.dialogVisible = false
-            this.getList('')
-          }).catch(res => {
-            this.fullscreenLoading = false
-            this.$message.error(res.message)
-          })
+        if (valid) {
+          productUpdateApi(this.productId, this.formValidate)
+            .then(async (res) => {
+              this.fullscreenLoading = false;
+              this.$message.success(res.message);
+              this.dialogVisible = false;
+              this.getList("");
+            })
+            .catch((res) => {
+              this.fullscreenLoading = false;
+              this.$message.error(res.message);
+            });
         } else {
-          return false
+          return false;
         }
-      })
+      });
     },
     onChangeGroup() {
-      this.checkboxGroup.includes('is_benefit') ? this.formValidate.is_benefit = 1 : this.formValidate.is_benefit = 0 && this.checkboxGroup.remove('is_benefit')
-      this.checkboxGroup.includes('is_best') ? this.formValidate.is_best = 1 : this.formValidate.is_best = 0 && this.checkboxGroup.remove('is_best')
-      this.checkboxGroup.includes('is_new') ? this.formValidate.is_new = 1 : this.formValidate.is_new = 0 && this.checkboxGroup.remove('is_new')
-      this.checkboxGroup.includes('is_hot') ? this.formValidate.is_hot = 1 : this.formValidate.is_hot = 0 && this.checkboxGroup.remove('is_hot')
+      this.checkboxGroup.includes("is_benefit")
+        ? (this.formValidate.is_benefit = 1)
+        : (this.formValidate.is_benefit =
+            0 && this.checkboxGroup.remove("is_benefit"));
+      this.checkboxGroup.includes("is_best")
+        ? (this.formValidate.is_best = 1)
+        : (this.formValidate.is_best =
+            0 && this.checkboxGroup.remove("is_best"));
+      this.checkboxGroup.includes("is_new")
+        ? (this.formValidate.is_new = 1)
+        : (this.formValidate.is_new = 0 && this.checkboxGroup.remove("is_new"));
+      this.checkboxGroup.includes("is_hot")
+        ? (this.formValidate.is_hot = 1)
+        : (this.formValidate.is_hot = 0 && this.checkboxGroup.remove("is_hot"));
     },
     onChangeRecommend() {
-      this.recommendForm.is_benefit = Number(this.recommendGroup.includes('is_benefit'));
-      this.recommendForm.is_best = Number(this.recommendGroup.includes('is_best'));
-      this.recommendForm.is_new = Number(this.recommendGroup.includes('is_new'));
-      this.recommendForm.is_hot = Number(this.recommendGroup.includes('is_hot'));
+      this.recommendForm.is_benefit = Number(
+        this.recommendGroup.includes("is_benefit")
+      );
+      this.recommendForm.is_best = Number(
+        this.recommendGroup.includes("is_best")
+      );
+      this.recommendForm.is_new = Number(
+        this.recommendGroup.includes("is_new")
+      );
+      this.recommendForm.is_hot = Number(
+        this.recommendGroup.includes("is_hot")
+      );
     },
     handleClose() {
-      this.dialogVisible = false
-      this.dialogLabel = false
-      this.dialogRecommend = false
+      this.dialogVisible = false;
+      this.dialogLabel = false;
+      this.dialogRecommend = false;
     },
     // 批量下架
     batchOff() {
-      if(this.multipleSelection.length === 0) return this.$message.warning('请先选择商品')
-      this.toOff(this.OffId)
+      if (this.multipleSelection.length === 0)
+        return this.$message.warning("请先选择商品");
+      this.toOff(this.OffId);
     },
     // 批量设置标签
     batchLabel() {
       this.labelForm = {
-        sys_labels: [],
-        ids: this.OffId
-      }
-      this.isBatch = true
-      this.dialogLabel = true
+        tag_name: '',
+        ids: this.OffId,
+      };
+      console.log(this.labelForm);
+      this.isBatch = true;
+      this.dialogLabel = true;
     },
     // 批量显示不显示
     batchShow(status) {
-      if(this.multipleSelection.length === 0) return this.$message.warning('请先选择商品')
-      let data = {status: status,ids: this.OffId}
-       batchesOnOffApi(data).then(res => {
-        this.$message.success(res.message)
-        this.getList('')
-      })
-      .catch(res => {
-        this.$message.error(res.message)
-      })
+      if (this.multipleSelection.length === 0)
+        return this.$message.warning("请先选择商品");
+      let data = { status: status, ids: this.OffId };
+      batchesOnOffApi(data)
+        .then((res) => {
+          this.$message.success(res.message);
+          this.getList("");
+        })
+        .catch((res) => {
+          this.$message.error(res.message);
+        });
     },
     // 下架
     toOff(id) {
-      this.$prompt('强制下架', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        inputErrorMessage: '请输入强制下架原因',
-        inputType: 'textarea',
-        inputPlaceholder: '请输入强制下架原因',
+      this.$prompt("强制下架", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        inputErrorMessage: "请输入强制下架原因",
+        inputType: "textarea",
+        inputPlaceholder: "请输入强制下架原因",
         inputValidator: (value) => {
-          if(!value) {
-            return '请输入强制下架原因'
+          if (!value) {
+            return "请输入强制下架原因";
           }
-        }
-      }).then(({
-        value
-      }) => {
-        productOffApi({
-          id: id,
-          status: -2,
-          refusal: value
-        }).then(res => {
-          this.$message({
-            type: 'success',
-            message: '提交成功'
-          })
-          this.getLstFilterApi()
-          this.getList('')
-        }).catch((res) => {
-          this.$message.error(res.message)
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '取消输入'
-        })
+        },
       })
+        .then(({ value }) => {
+          productOffApi({
+            id: id,
+            status: -2,
+            refusal: value,
+          })
+            .then((res) => {
+              this.$message({
+                type: "success",
+                message: "提交成功",
+              });
+              this.getLstFilterApi();
+              this.getList("");
+            })
+            .catch((res) => {
+              this.$message.error(res.message);
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "取消输入",
+          });
+        });
     },
     // 列表表头；
     getLstFilterApi() {
-      lstFilterApi().then(res => {
-        this.headeNum = res.data
-      }).catch(res => {
-        this.$message.error(res.message)
-      })
+      lstFilterApi()
+        .then((res) => {
+          this.headeNum = res.data;
+        })
+        .catch((res) => {
+          this.$message.error(res.message);
+        });
     },
     // 商户列表；
     getMerSelect() {
-      merSelectApi().then(res => {
-        this.merSelect = res.data
-      }).catch(res => {
-        this.$message.error(res.message)
-      })
+      merSelectApi()
+        .then((res) => {
+          this.merSelect = res.data;
+        })
+        .catch((res) => {
+          this.$message.error(res.message);
+        });
     },
     batch() {
-      if(this.multipleSelection.length === 0) return this.$message.warning('请先选择商品')
-      this.isShow = false
-      this.$refs.infoFrom.dialogVisible = true
+      if (this.multipleSelection.length === 0)
+        return this.$message.warning("请先选择商品");
+      this.isShow = false;
+      this.$refs.infoFrom.dialogVisible = true;
     },
     handleSelectionChange(val) {
-      this.multipleSelection = val
-      const data = []
+      this.multipleSelection = val;
+      const data = [];
       this.multipleSelection.map((item) => {
-        data.push(item.product_id)
-      })
-      this.OffId = data
+        data.push(item.product_id);
+      });
+      this.OffId = data;
     },
     toExamine(id) {
-      this.$refs.infoFrom.dialogVisible = true
-      this.isShow = true
-      this.$refs.infoFrom.getInfo(id)
+      this.$refs.infoFrom.dialogVisible = true;
+      this.isShow = true;
+      this.$refs.infoFrom.getInfo(id);
     },
     // 商户分类；
     getCategorySelect() {
-      categoryListApi().then(res => {
-        this.merCateList = res.data
-      }).catch(res => {
-        this.$message.error(res.message)
-      })
+      categoryListApi()
+        .then((res) => {
+          this.merCateList = res.data;
+        })
+        .catch((res) => {
+          this.$message.error(res.message);
+        });
     },
     // 列表
     getList(num) {
-      this.listLoading = true
+      this.listLoading = true;
       this.tableFrom.page = num ? num : this.tableFrom.page;
-      productLstApi(this.tableFrom).then(res => {
-        this.tableData.data = res.data.list
-        this.tableData.total = res.data.count
-        this.listLoading = false
-      }).catch(res => {
-        this.listLoading = false
-        this.$message.error(res.message)
-      })
+      productLstApi(this.tableFrom)
+        .then((res) => {
+          this.tableData.data = res.data.list;
+          this.tableData.total = res.data.count;
+          this.listLoading = false;
+        })
+        .catch((res) => {
+          this.listLoading = false;
+          this.$message.error(res.message);
+        });
     },
     pageChange(page) {
-      this.tableFrom.page = page
-      this.getList('')
+      this.tableFrom.page = page;
+      this.getList("");
     },
     handleSizeChange(val) {
-      this.tableFrom.limit = val
-      this.getList('')
-    }
-  }
-}
+      this.tableFrom.limit = val;
+      this.getList("");
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-::v-deep .el-select-dropdown__item{
-  max-width: 350px!important;
+::v-deep .el-select-dropdown__item {
+  max-width: 350px !important;
 }
-.template{
+.template {
   overflow: hidden;
 }
-.label-list{
+.label-list {
   height: 100%;
 }
 .bg {
@@ -992,17 +1480,17 @@ export default {
   left: 46px;
   top: -4px;
 }
-.tags_name{
+.tags_name {
   font-size: 10px;
   height: 16px;
   line-height: 16px;
   padding: 0 2px;
   margin-right: 2px;
-  &.name0{
+  &.name0 {
     color: var(--prev-color-primary);
   }
-  &.name1{
-    color: #FF8A4D;
+  &.name1 {
+    color: #ff8a4d;
   }
 }
 .rate_star {
@@ -1017,7 +1505,7 @@ table .el-image {
 }
 .demo-table-expand ::v-deep label {
   width: 105px;
-  color: #99a9bf; 
+  color: #99a9bf;
 }
 .demo-table-expand .el-form-item {
   margin-right: 0;
@@ -1035,5 +1523,4 @@ table .el-image {
 .el-icon-arrow-down {
   font-size: 12px;
 }
-
 </style>
diff --git a/src/views/product/productExamine/info.vue b/src/views/product/productExamine/info.vue
index 65c9ded..d69a2e5 100644
--- a/src/views/product/productExamine/info.vue
+++ b/src/views/product/productExamine/info.vue
@@ -2,75 +2,118 @@
   <el-dialog
     v-if="dialogVisible"
     title="商品审核"
+    v-el-drag-dialog
     :visible.sync="dialogVisible"
-    :append-to-body='isAppend'
+    :append-to-body="isAppend"
     width="1260px"
     top="60px"
     :before-close="handleClose"
     class="projectInfo"
   >
-    <div class="acea-row">
-      <span class="sp">店铺名称：{{ projectData.merchant&&projectData.merchant.mer_name }}</span>
-          <span class="sp">入驻企业名称：{{ projectData.merchant&&projectData.merchant.ext.com&&projectData.merchant.ext.com.name }}</span>
-          <span class="sp">店铺联系人: {{ projectData.merchant&&projectData.merchant.real_name }}</span>
-          <span class="sp" v-if="projectData.merchant">
-            营业执照：
-            <div class="demo-image__preview">
-              <el-image
-                style="width: 60px; height: 60px"
-                :src="projectData.merchant.mer_cert"
-                :preview-src-list="[projectData.merchant.mer_cert]"
-              />
-            </div>
-          </span>
-
-          <span class="sp">联系人电话：{{ projectData.merchant&&projectData.merchant.service_phone }}</span>
-          <span class="sp" v-if="projectData.refusal">上传拒绝原因：{{ projectData.refusal }}</span>
+    <div class="acea-row mt10">
+      <span class="sp"
+        >店铺名称：{{
+          projectData.merchant && projectData.merchant.mer_name
+        }}</span
+      >
+      <span class="sp"
+        >入驻企业名称：{{
+          projectData.merchant &&
+          projectData.merchant.ext.com &&
+          projectData.merchant.ext.com.name
+        }}</span
+      >
+      <span class="sp"
+        >店铺联系人:
+        {{ projectData.merchant && projectData.merchant.real_name }}</span
+      >
+      <span class="sp" v-if="projectData.merchant">
+        营业执照：
+        <div class="demo-image__preview">
+          <el-image
+            style="width: 60px; height: 60px"
+            :src="projectData.merchant.mer_cert"
+            :preview-src-list="[projectData.merchant.mer_cert]"
+          />
+        </div>
+      </span>
 
+      <span class="sp"
+        >联系人电话：{{
+          projectData.merchant && projectData.merchant.service_phone
+        }}</span
+      >
+      <span class="sp" v-if="projectData.refusal"
+        >上传拒绝原因：{{ projectData.refusal }}</span
+      >
     </div>
     <div class="acea-row">
-            <span class="sp">商品id：{{ projectData.product_id }}</span>
-            <span class="sp">商品名称：{{ projectData.store_name }}</span>
-            <span class="sp">平台分类：{{ projectData.storeCategory?projectData.storeCategory.cate_name:'' }}</span>
-            <!-- <span class="sp">品牌：{{ projectData.brand?projectData.brand.brand_name:'其他' }}</span> -->
-            <span class="sp">商品关键字：{{ projectData.keyword }}</span>
-            <span class="sp">商品单位：{{ projectData.unit_name }}</span>
-            <span class="sp">
-            商品分类：
-            <template v-if="projectData.merCateId">
-              <span v-for="(item, index) in projectData.merCateId" :key="index" class="mr10">{{ item.category?item.category.cate_name:'' }}</span>
-            </template>
-            <span v-else>-</span>
-          </span>
-          <span class="sp">商品简介：{{ projectData.store_info }}</span>
-          <span class="sp">商品备注：{{ projectData.remark }}</span>
-          <span class="sp">是否惠美乡村：{{ projectData.is_huimei?'是':'否' }}</span>
-          <span class="sp100">
-            商品封面图：
-            <div class="demo-image__preview">
-              <el-image
-                style="width: 60px; height: 60px"
-                :src="projectData.image"
-                :preview-src-list="[projectData.image]"
-              />
-            </div>
-          </span>
+      <span class="sp">商品id：{{ projectData.product_id }}</span>
+      <span class="sp">商品名称：{{ projectData.store_name }}</span>
+      <span class="sp"
+        >平台分类：{{
+          projectData.storeCategory ? projectData.storeCategory.cate_name : ""
+        }}</span
+      >
+      <!-- <span class="sp">品牌：{{ projectData.brand?projectData.brand.brand_name:'其他' }}</span> -->
+      <span class="sp">商品关键字：{{ projectData.keyword }}</span>
+      <span class="sp">商品单位：{{ projectData.unit_name }}</span>
+      <span class="sp">
+        商品分类：
+        <template v-if="projectData.merCateId">
+          <span
+            v-for="(item, index) in projectData.merCateId"
+            :key="index"
+            class="mr10"
+            >{{ item.category ? item.category.cate_name : "" }}</span
+          >
+        </template>
+        <span v-else>-</span>
+      </span>
+      <span class="sp">商品简介：{{ projectData.store_info }}</span>
+      <span class="sp">商品备注：{{ projectData.remark }}</span>
+      <span class="sp"
+        >是否惠美乡村：{{ projectData.is_huimei ? "是" : "否" }}</span
+      >
+      <span class="sp100">
+        商品封面图：
+        <div class="demo-image__preview">
+          <el-image
+            style="width: 60px; height: 60px"
+            :src="projectData.image"
+            :preview-src-list="[projectData.image]"
+          />
+        </div>
+      </span>
     </div>
-    <el-tabs v-if="projectData && isShow" v-model="activeNames" v-loading="loading">
+    <el-tabs
+      v-if="projectData && isShow"
+      v-model="activeNames"
+      v-loading="loading"
+    >
       <el-tab-pane label="商品信息" name="first">
         <div class="acea-row">
-          <span class="sp" v-if="projectData.temp && projectData.temp.name">运费模板：{{ projectData.temp?projectData.temp.name:'' }}</span>
-          <span class="sp100" v-if="projectData.temp && projectData.temp.info">运费说明：{{ projectData.temp?projectData.temp.info:'' }}</span>
+          <span class="sp" v-if="projectData.temp && projectData.temp.name"
+            >运费模板：{{ projectData.temp ? projectData.temp.name : "" }}</span
+          >
+          <span class="sp100" v-if="projectData.temp && projectData.temp.info"
+            >运费说明：{{ projectData.temp ? projectData.temp.info : "" }}</span
+          >
 
-           <span v-if="projectData.video_link" class="sp100">
+          <span v-if="projectData.video_link" class="sp100">
             主图视频：
-             <video style="width:40%;height: 180px;border-radius: 10px;" :src="projectData.video_link" controls="controls">
-                  您的浏览器不支持 video 标签。
-                </video>
+            <video
+              style="width: 40%; height: 180px; border-radius: 10px"
+              :src="projectData.video_link"
+              controls="controls"
+            >
+              您的浏览器不支持 video 标签。
+            </video>
           </span>
-          <span class="sp100">商品轮播图：
+          <span class="sp100"
+            >商品轮播图：
             <div
-              v-for="(item,index) in projectData.slider_image"
+              v-for="(item, index) in projectData.slider_image"
               :key="index"
               class="pictrue"
             >
@@ -84,239 +127,352 @@
         </div>
       </el-tab-pane>
       <el-tab-pane label="资质信息" name="aptitude">
-        <span class="sp">商品名称：
+        <span class="sp"
+          >商品名称：
           <el-radio-group v-model="qualification.commodity_type">
-            <el-radio :label="0" class="radio" :disabled="qualification.commodity_type==1">国产</el-radio>
-            <el-radio :label="1" :disabled="qualification.commodity_type==0">进口</el-radio>
+            <el-radio
+              :label="0"
+              class="radio"
+              :disabled="qualification.commodity_type == 1"
+              >国产</el-radio
+            >
+            <el-radio :label="1" :disabled="qualification.commodity_type == 0"
+              >进口</el-radio
+            >
           </el-radio-group>
         </span>
-      <div v-if="qualification.commodity_type == 0">
-        <span class="sp">生产企业名称：{{ qualification.production_name }}</span>
-        <span class="upload">
-          <div class="upload_left">生产营业执照：</div>
-          <div class="upload_right">
-            <div
-              v-for="(item,index) in qualification.businessList"
-              :key="index"
-            >
-              <a class="txt" v-if="getType(item)" :href="item.url" target="downloadFile" download>{{ item.name }}</a> 
-              <div class="pictrue" v-else>
-                <el-image
-                style="width: 60px; height: 60px;"
-                :src="item.url"
-                :preview-src-list="[item.url]"
-              />
+        <div v-if="qualification.commodity_type == 0">
+          <span class="sp"
+            >生产企业名称：{{ qualification.production_name }}</span
+          >
+          <span class="upload">
+            <div class="upload_left">生产营业执照：</div>
+            <div class="upload_right">
+              <div
+                v-for="(item, index) in qualification.businessList"
+                :key="index"
+              >
+                <a
+                  class="txt"
+                  v-if="getType(item)"
+                  :href="item.url"
+                  target="downloadFile"
+                  download
+                  >{{ item.name }}</a
+                >
+                <div class="pictrue" v-else>
+                  <el-image
+                    style="width: 60px; height: 60px"
+                    :src="item.url"
+                    :preview-src-list="[item.url]"
+                  />
+                </div>
               </div>
             </div>
-          </div>
-        </span>
-        <span class="upload">
-          <div class="upload_left">生产许可证：</div>
-          <div class="upload_right">
-            <div
-              v-for="(item,index) in qualification.licenceList"
-              :key="index"
-            >
-              <a class="txt" v-if="getType(item)" :href="item.url" target="downloadFile" download>{{ item.name }}</a> 
-              <div class="pictrue" v-else>
-                <el-image
-                style="width: 60px; height: 60px;"
-                :src="item.url"
-                :preview-src-list="[item.url]"
-              />
+          </span>
+          <span class="upload">
+            <div class="upload_left">生产许可证：</div>
+            <div class="upload_right">
+              <div
+                v-for="(item, index) in qualification.licenceList"
+                :key="index"
+              >
+                <a
+                  class="txt"
+                  v-if="getType(item)"
+                  :href="item.url"
+                  target="downloadFile"
+                  download
+                  >{{ item.name }}</a
+                >
+                <div class="pictrue" v-else>
+                  <el-image
+                    style="width: 60px; height: 60px"
+                    :src="item.url"
+                    :preview-src-list="[item.url]"
+                  />
+                </div>
               </div>
             </div>
-          </div>
-        </span>
-        <span class="upload">
-          <div class="upload_left">商标注册证：</div>
-          <div class="upload_right">
-            <div
-              v-for="(item,index) in qualification.trademarkList"
-              :key="index"
-            >
-              <a class="txt" v-if="getType(item)" :href="item.url" target="downloadFile" download>{{ item.name }}</a> 
-              <div class="pictrue" v-else>
-                <el-image
-                style="width: 60px; height: 60px;"
-                :src="item.url"
-                :preview-src-list="[item.url]"
-              />
+          </span>
+          <span class="upload">
+            <div class="upload_left">商标注册证：</div>
+            <div class="upload_right">
+              <div
+                v-for="(item, index) in qualification.trademarkList"
+                :key="index"
+              >
+                <a
+                  class="txt"
+                  v-if="getType(item)"
+                  :href="item.url"
+                  target="downloadFile"
+                  download
+                  >{{ item.name }}</a
+                >
+                <div class="pictrue" v-else>
+                  <el-image
+                    style="width: 60px; height: 60px"
+                    :src="item.url"
+                    :preview-src-list="[item.url]"
+                  />
+                </div>
               </div>
             </div>
-          </div>
-        </span>
-        <span class="upload">
-          <div class="upload_left">销售授权及品牌方营业执照：</div>
-          <div class="upload_right">
-            <div
-              v-for="(item,index) in qualification.authorizedList"
-              :key="index"
-            >
-              <a class="txt" v-if="getType(item)" :href="item.url" target="downloadFile" download>{{ item.name }}</a> 
-              <div class="pictrue" v-else>
-                <el-image
-                style="width: 60px; height: 60px;"
-                :src="item.url"
-                :preview-src-list="[item.url]"
-              />
+          </span>
+          <span class="upload">
+            <div class="upload_left">销售授权及品牌方营业执照：</div>
+            <div class="upload_right">
+              <div
+                v-for="(item, index) in qualification.authorizedList"
+                :key="index"
+              >
+                <a
+                  class="txt"
+                  v-if="getType(item)"
+                  :href="item.url"
+                  target="downloadFile"
+                  download
+                  >{{ item.name }}</a
+                >
+                <div class="pictrue" v-else>
+                  <el-image
+                    style="width: 60px; height: 60px"
+                    :src="item.url"
+                    :preview-src-list="[item.url]"
+                  />
+                </div>
               </div>
             </div>
-          </div>
-        </span>
-        <span class="upload">
-          <div class="upload_left">商品检测报告及备案：</div>
-          <div class="upload_right">
-            <div
-              v-for="(item,index) in qualification.commodityList"
-              :key="index"
-            >
-              <a class="txt" v-if="getType(item)" :href="item.url" target="downloadFile" download>{{ item.name }}</a> 
-              <div class="pictrue" v-else>
-                <el-image
-                style="width: 60px; height: 60px;"
-                :src="item.url"
-                :preview-src-list="[item.url]"
-              />
+          </span>
+          <span class="upload">
+            <div class="upload_left">商品检测报告及备案：</div>
+            <div class="upload_right">
+              <div
+                v-for="(item, index) in qualification.commodityList"
+                :key="index"
+              >
+                <a
+                  class="txt"
+                  v-if="getType(item)"
+                  :href="item.url"
+                  target="downloadFile"
+                  download
+                  >{{ item.name }}</a
+                >
+                <div class="pictrue" v-else>
+                  <el-image
+                    style="width: 60px; height: 60px"
+                    :src="item.url"
+                    :preview-src-list="[item.url]"
+                  />
+                </div>
               </div>
             </div>
-          </div>
-        </span>
-        <span class="upload">
-          <div class="upload_left">助农文件及其他资质：</div>
-          <div class="upload_right">
-            <div
-              v-for="(item,index) in qualification.otherList"
-              :key="index"
-            >
-              <a class="txt" v-if="getType(item)" :href="item.url" target="downloadFile" download>{{ item.name }}</a> 
-              <div class="pictrue" v-else>
-                <el-image
-                style="width: 60px; height: 60px;"
-                :src="item.url"
-                :preview-src-list="[item.url]"
-              />
+          </span>
+          <span class="upload">
+            <div class="upload_left">助农文件及其他资质：</div>
+            <div class="upload_right">
+              <div
+                v-for="(item, index) in qualification.otherList"
+                :key="index"
+              >
+                <a
+                  class="txt"
+                  v-if="getType(item)"
+                  :href="item.url"
+                  target="downloadFile"
+                  download
+                  >{{ item.name }}</a
+                >
+                <div class="pictrue" v-else>
+                  <el-image
+                    style="width: 60px; height: 60px"
+                    :src="item.url"
+                    :preview-src-list="[item.url]"
+                  />
+                </div>
               </div>
             </div>
-          </div>
-        </span>
-      </div>
-      <div v-if="qualification.commodity_type == 1">
-        <span class="sp">进口/企业境内总代企业名称: {{ qualification.import_name }}</span>
-        <span class="upload">
-          <div class="upload_left">生产营业执照：</div>
-          <div class="upload_right">
-            <div
-              v-for="(item,index) in qualification.importBusinessList"
-              :key="index"
-            >
-              <a class="txt" v-if="getType(item)" :href="item.url" target="downloadFile" download>{{ item.name }}</a> 
-              <div class="pictrue" v-else>
-                <el-image
-                style="width: 60px; height: 60px;"
-                :src="item.url"
-                :preview-src-list="[item.url]"
-              />
+          </span>
+        </div>
+        <div v-if="qualification.commodity_type == 1">
+          <span class="sp"
+            >进口/企业境内总代企业名称: {{ qualification.import_name }}</span
+          >
+          <span class="upload">
+            <div class="upload_left">生产营业执照：</div>
+            <div class="upload_right">
+              <div
+                v-for="(item, index) in qualification.importBusinessList"
+                :key="index"
+              >
+                <a
+                  class="txt"
+                  v-if="getType(item)"
+                  :href="item.url"
+                  target="downloadFile"
+                  download
+                  >{{ item.name }}</a
+                >
+                <div class="pictrue" v-else>
+                  <el-image
+                    style="width: 60px; height: 60px"
+                    :src="item.url"
+                    :preview-src-list="[item.url]"
+                  />
+                </div>
               </div>
             </div>
-          </div>
-        </span>
-        <span class="upload">
-          <div class="upload_left">销售授权及其他：</div>
-          <div class="upload_right">
-            <div
-              v-for="(item,index) in qualification.importAuthorizedList"
-              :key="index"
-            >
-              <a class="txt" v-if="getType(item)" :href="item.url" target="downloadFile" download>{{ item.name }}</a> 
-              <div class="pictrue" v-else>
-                <el-image
-                style="width: 60px; height: 60px;"
-                :src="item.url"
-                :preview-src-list="[item.url]"
-              />
+          </span>
+          <span class="upload">
+            <div class="upload_left">销售授权及其他：</div>
+            <div class="upload_right">
+              <div
+                v-for="(item, index) in qualification.importAuthorizedList"
+                :key="index"
+              >
+                <a
+                  class="txt"
+                  v-if="getType(item)"
+                  :href="item.url"
+                  target="downloadFile"
+                  download
+                  >{{ item.name }}</a
+                >
+                <div class="pictrue" v-else>
+                  <el-image
+                    style="width: 60px; height: 60px"
+                    :src="item.url"
+                    :preview-src-list="[item.url]"
+                  />
+                </div>
               </div>
             </div>
-          </div>
-        </span>
-        <span class="upload">
-          <div class="upload_left">海关检验检疫证书及报关单：</div>
-          <div class="upload_right">
-            <div
-              v-for="(item,index) in qualification.customsList"
-              :key="index"
-            >
-              <a class="txt" v-if="getType(item)" :href="item.url" target="downloadFile" download>{{ item.name }}</a> 
-              <div class="pictrue" v-else>
-                <el-image
-                style="width: 60px; height: 60px;"
-                :src="item.url"
-                :preview-src-list="[item.url]"
-              />
+          </span>
+          <span class="upload">
+            <div class="upload_left">海关检验检疫证书及报关单：</div>
+            <div class="upload_right">
+              <div
+                v-for="(item, index) in qualification.customsList"
+                :key="index"
+              >
+                <a
+                  class="txt"
+                  v-if="getType(item)"
+                  :href="item.url"
+                  target="downloadFile"
+                  download
+                  >{{ item.name }}</a
+                >
+                <div class="pictrue" v-else>
+                  <el-image
+                    style="width: 60px; height: 60px"
+                    :src="item.url"
+                    :preview-src-list="[item.url]"
+                  />
+                </div>
               </div>
             </div>
-          </div>
-        </span>
-        <span class="upload">
-          <div class="upload_left">产品外包装实物图：</div>
-          <div class="upload_right">
-            <div
-              v-for="(item,index) in qualification.packingList"
-              :key="index"
-            >
-              <a class="txt" v-if="getType(item)" :href="item.url" target="downloadFile" download>{{ item.name }}</a> 
-              <div class="pictrue" v-else>
-                <el-image
-                style="width: 60px; height: 60px;"
-                :src="item.url"
-                :preview-src-list="[item.url]"
-              />
+          </span>
+          <span class="upload">
+            <div class="upload_left">产品外包装实物图：</div>
+            <div class="upload_right">
+              <div
+                v-for="(item, index) in qualification.packingList"
+                :key="index"
+              >
+                <a
+                  class="txt"
+                  v-if="getType(item)"
+                  :href="item.url"
+                  target="downloadFile"
+                  download
+                  >{{ item.name }}</a
+                >
+                <div class="pictrue" v-else>
+                  <el-image
+                    style="width: 60px; height: 60px"
+                    :src="item.url"
+                    :preview-src-list="[item.url]"
+                  />
+                </div>
               </div>
             </div>
-          </div>
-        </span>
-        <span class="upload">
-          <div class="upload_left">其他资质：</div>
-          <div class="upload_right">
-            <div
-              v-for="(item,index) in qualification.importOtherList"
-              :key="index"
-            >
-              <a class="txt" v-if="getType(item)" :href="item.url" target="downloadFile" download>{{ item.name }}</a> 
-              <div class="pictrue" v-else>
-                <el-image
-                style="width: 60px; height: 60px;"
-                :src="item.url"
-                :preview-src-list="[item.url]"
-              />
+          </span>
+          <span class="upload">
+            <div class="upload_left">其他资质：</div>
+            <div class="upload_right">
+              <div
+                v-for="(item, index) in qualification.importOtherList"
+                :key="index"
+              >
+                <a
+                  class="txt"
+                  v-if="getType(item)"
+                  :href="item.url"
+                  target="downloadFile"
+                  download
+                  >{{ item.name }}</a
+                >
+                <div class="pictrue" v-else>
+                  <el-image
+                    style="width: 60px; height: 60px"
+                    :src="item.url"
+                    :preview-src-list="[item.url]"
+                  />
+                </div>
               </div>
             </div>
-          </div>
-        </span>
-      </div>
-    </el-tab-pane>
+          </span>
+        </div>
+      </el-tab-pane>
       <el-tab-pane label="商品详情" name="second">
         <span class="sp100">商品详情：</span>
-        <div class="contentPic" v-html="projectData.content"/>
+        <div class="contentPic" v-html="projectData.content" />
       </el-tab-pane>
       <el-tab-pane label="其他设置" name="third">
         <span class="sp100">商品排序：{{ projectData.sort }}</span>
         <span class="third mb20">
           <span>商品推荐：</span>
           <el-checkbox-group v-model="checkboxGroup" size="small">
-            <el-checkbox v-for="(item, index) in recommend" :key="index" disabled :label="item.value">{{ item.name }}</el-checkbox>
+            <el-checkbox
+              v-for="(item, index) in recommend"
+              :key="index"
+              disabled
+              :label="item.value"
+              >{{ item.name }}</el-checkbox
+            >
           </el-checkbox-group>
         </span>
-        <span v-if="projectData.guarantee && projectData.guarantee.templateValue.length" class="third mb20">
+        <span
+          v-if="
+            projectData.guarantee && projectData.guarantee.templateValue.length
+          "
+          class="third mb20"
+        >
           <span>服务保障：</span>
-          <span v-for="(item,index) in projectData.guarantee.templateValue" :key="index">
-              <span v-if="item.value">{{index+1}}. {{item.value.guarantee_name}}；</span>
+          <span
+            v-for="(item, index) in projectData.guarantee.templateValue"
+            :key="index"
+          >
+            <span v-if="item.value"
+              >{{ index + 1 }}. {{ item.value.guarantee_name }}；</span
+            >
           </span>
         </span>
       </el-tab-pane>
       <el-tab-pane label="商品规格" name="fourth">
-        <span class="sp">商品规格：{{ projectData.spec_type === 0 ? '单规格' : '多规格' }}</span>
-        <span class="sp">佣金设置：{{ projectData.extension_type === 0 ? '默认设置' : '单独设置' }}</span>
+        <span class="sp"
+          >商品规格：{{
+            projectData.spec_type === 0 ? "单规格" : "多规格"
+          }}</span
+        >
+        <span class="sp"
+          >佣金设置：{{
+            projectData.extension_type === 0 ? "默认设置" : "单独设置"
+          }}</span
+        >
         <span class="sp100">
           <span class="mb15" style="display: block">商品规格:</span>
           <template v-if="projectData.spec_type === 0">
@@ -332,19 +488,38 @@
                   </div>
                 </template>
               </el-table-column>
-              <el-table-column v-for="(item,iii) in attrValue" :key="iii" :label="formThead[iii].title" align="center" min-width="80">
+              <el-table-column
+                v-for="(item, iii) in attrValue"
+                :key="iii"
+                :label="formThead[iii].title"
+                align="center"
+                min-width="80"
+              >
                 <template slot-scope="scope">
-                  <a v-if="formThead[iii].title=='依据链接'" :href="scope.row[iii]" target="_blank">{{ scope.row[iii] }}</a>
+                  <a
+                    v-if="formThead[iii].title == '依据链接'"
+                    :href="scope.row[iii]"
+                    target="_blank"
+                    >{{ scope.row[iii] }}</a
+                  >
                   <span v-else class="priceBox" v-text="scope.row[iii]" />
                 </template>
               </el-table-column>
               <template v-if="projectData.extension_type === 1">
-                <el-table-column align="center" label="一级返佣(元)" min-width="120">
+                <el-table-column
+                  align="center"
+                  label="一级返佣(元)"
+                  min-width="120"
+                >
                   <template slot-scope="scope">
                     <span class="priceBox" v-text="scope.row.extension_one" />
                   </template>
                 </el-table-column>
-                <el-table-column align="center" label="二级返佣(元)" min-width="120">
+                <el-table-column
+                  align="center"
+                  label="二级返佣(元)"
+                  min-width="120"
+                >
                   <template slot-scope="scope">
                     <span class="priceBox" v-text="scope.row.extension_two" />
                   </template>
@@ -354,39 +529,64 @@
           </template>
           <template v-if="projectData.spec_type === 1">
             <el-table :data="ManyAttrValue" border size="small">
-                <template v-if="manyTabDate">
-                  <el-table-column v-for="(item,iii) in manyTabDate" :key="iii" align="center" :label="manyTabTit[iii].title" min-width="80">
-                    <template slot-scope="scope">
-                      <span class="priceBox" v-text="scope.row[iii]" />
-                    </template>
-                  </el-table-column>
-                </template>
+              <template v-if="manyTabDate">
+                <el-table-column
+                  v-for="(item, iii) in manyTabDate"
+                  :key="iii"
+                  align="center"
+                  :label="manyTabTit[iii].title"
+                  min-width="80"
+                >
+                  <template slot-scope="scope">
+                    <span class="priceBox" v-text="scope.row[iii]" />
+                  </template>
+                </el-table-column>
+              </template>
               <el-table-column align="center" label="图片" min-width="80">
                 <template slot-scope="scope">
                   <div class="upLoadPicBox">
                     <div class="pictrue tabPic">
                       <el-image
-                      style="width: 60px; height: 60px"
-                      :src="scope.row.image"
-                      :preview-src-list="[scope.row.image]"
-                    />
+                        style="width: 60px; height: 60px"
+                        :src="scope.row.image"
+                        :preview-src-list="[scope.row.image]"
+                      />
                     </div>
                   </div>
                 </template>
               </el-table-column>
-              <el-table-column v-for="(item,iii) in attrValue" :key="iii" :label="formThead[iii].title" align="center" min-width="80">
+              <el-table-column
+                v-for="(item, iii) in attrValue"
+                :key="iii"
+                :label="formThead[iii].title"
+                align="center"
+                min-width="80"
+              >
                 <template slot-scope="scope">
-                  <a v-if="formThead[iii].title=='依据链接'" :href="scope.row[iii]" target="_blank">{{ scope.row[iii] }}</a>
+                  <a
+                    v-if="formThead[iii].title == '依据链接'"
+                    :href="scope.row[iii]"
+                    target="_blank"
+                    >{{ scope.row[iii] }}</a
+                  >
                   <span v-else class="priceBox" v-text="scope.row[iii]" />
                 </template>
               </el-table-column>
               <template v-if="projectData.extension_type === 1">
-                <el-table-column align="center" label="一级返佣(元)" min-width="120">
+                <el-table-column
+                  align="center"
+                  label="一级返佣(元)"
+                  min-width="120"
+                >
                   <template slot-scope="scope">
                     <span class="priceBox">{{ scope.row.extension_one }}</span>
                   </template>
                 </el-table-column>
-                <el-table-column align="center" label="二级返佣(元)" min-width="120">
+                <el-table-column
+                  align="center"
+                  label="二级返佣(元)"
+                  min-width="120"
+                >
                   <template slot-scope="scope">
                     <span class="priceBox">{{ scope.row.extension_two }}</span>
                   </template>
@@ -397,237 +597,296 @@
         </span>
       </el-tab-pane>
     </el-tabs>
-    <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="80px" class="demo-ruleForm">
-      <el-form-item :label="projectData.status == 15?'解锁状态':'审核状态'" prop="status">
+    <el-form
+      ref="ruleForm"
+      :model="ruleForm"
+      :rules="rules"
+      label-width="80px"
+      class="demo-ruleForm"
+    >
+      <el-form-item
+        :label="projectData.status == 15 ? '解锁状态' : '审核状态'"
+        prop="status"
+      >
         <el-radio-group v-model="ruleForm.status">
           <el-radio :label="1">通过</el-radio>
-          <el-radio v-if="projectData.status == 0" :label="-1">拒绝</el-radio>
-          <el-radio v-if="projectData.status == 10 || projectData.status == 11" :label="15">锁定</el-radio>
-          <el-radio v-if="projectData.status == 10" :label="-2">返回上一级</el-radio>
-          <el-radio v-if="projectData.status == 11" :label="-2">返回上一级</el-radio>
+          <el-radio :label="-1">拒绝</el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item label="佐证图片" prop="status_img" label-width="80px">
-              <div class="acea-row">
-                <div
-                  v-for="(item, index) in ruleForm.status_img"
-                  :key="index"
-                  class="pictrue"
-                  draggable="false"
-                  @dragstart="handleDragStart($event, item)"
-                  @dragover.prevent="handleDragOver($event, item)"
-                  @dragenter="handleDragEnter($event, item)"
-                  @dragend="handleDragEnd($event, item)"
-                >
-                  <!-- <img :src="item"> -->
-                  <el-image
-                      style="width: 60px; height: 60px"
-                      :src="item"
-                      :preview-src-list="[item]"
-                    />
-                  <i
-                    class="el-icon-error btndel"
-                    @click="handleRemove(index)"
-                  />
-                </div>
-                <div
-                  v-if="ruleForm.status_img.length < 10"
-                  class="uploadCont"
-                  title="750*750px"
-                >
-                  <div class="upLoadPicBox" @click="modalPicTap('2')">
+        <div class="acea-row">
+          <div
+            v-for="(item, index) in ruleForm.status_img"
+            :key="index"
+            class="pictrue"
+            draggable="false"
+            @dragstart="handleDragStart($event, item)"
+            @dragover.prevent="handleDragOver($event, item)"
+            @dragenter="handleDragEnter($event, item)"
+            @dragend="handleDragEnd($event, item)"
+          >
+            <!-- <img :src="item"> -->
+            <el-image
+              style="width: 60px; height: 60px"
+              :src="item"
+              :preview-src-list="[item]"
+            />
+            <i class="el-icon-error btndel" @click="handleRemove(index)" />
+          </div>
+          <div
+            v-if="ruleForm.status_img.length < 10"
+            class="uploadCont"
+            title="750*750px"
+          >
+            <!-- <div class="upLoadPicBox" @paste="handlePaste" @click="modalPicTap('2')">
                     <div class="upLoad">
                       <i class="el-icon-camera cameraIconfont" />
                     </div>
-                  </div>
-                </div>
-              </div>
+                  </div> -->
+            <el-upload
+              :action="fileUrl"
+              :show-file-list="false"
+              list-type="picture-card"
+              multiple
+              :headers="myHeaders"
+              :on-success="setQualificationsList"
+              :before-upload="beforeUploadQualification"
+            >
+              <i class="el-icon-plus" />
+            </el-upload>
+          </div>
+        </div>
       </el-form-item>
-      <!-- <el-form-item label="佐证图片：" prop="status_img" label-width="90px">
-              <div
-                class="upLoadPicBox"
-                title="750*750px"
-                @click="modalPicTap('1')"
-              >
-                <div v-if="ruleForm.status_img" class="pictrue">
-                  <img :src="ruleForm.status_img">
-                </div>
-                <div v-else class="upLoad">
-                  <i class="el-icon-camera cameraIconfont" />
-                </div>
-              </div>
-      </el-form-item> -->
-      <el-form-item v-if="ruleForm.status===-1 || ruleForm.status===15" :label="projectData.status != 0 ?'锁定原因':'拒绝原因'" prop="refusal">
-        <el-input v-model="ruleForm.refusal" type="textarea" placeholder="请输入原因" />
+      <el-form-item
+        v-if="ruleForm.status === -1 || ruleForm.status === 15"
+        :label="projectData.status != 0 ? '锁定原因' : '拒绝原因'"
+        prop="refusal"
+      >
+        <el-input
+          v-model="ruleForm.refusal"
+          type="textarea"
+          placeholder="请输入原因"
+        />
       </el-form-item>
     </el-form>
     <div slot="footer" class="dialog-footer">
       <el-button size="small" @click="dialogVisible = false">取 消</el-button>
       <el-button size="small" type="primary" @click="onSubmit">确 定</el-button>
-  </div>
+    </div>
   </el-dialog>
 </template>
 
 <script>
-
-import { productStatusUnlockApi,productDetailApi, productStatusApi,productStatusFirstApi,productStatusSecondApi } from '@/api/product'
+import SettingMer from "@/libs/settingMer";
+import { getToken } from "@/utils/auth";
+import elDragDialog from "@/directive/el-drag-dialog";
+import {
+  productStatusUnlockApi,
+  productDetailApi,
+  productStatusApi,
+  productStatusFirstApi,
+  productStatusFirstTwoApi,
+  productStatusSecondApi,
+} from "@/api/product";
+import log from "@/libs/util.log";
 const defaultObj = {
-  image: '',
+  image: "",
   slider_image: [],
-  store_name: '',
-  store_info: '',
-  keyword: '',
-  brand_id: '', // 品牌id
-  cate_id: '', // 平台分类id
+  store_name: "",
+  store_info: "",
+  keyword: "",
+  brand_id: "", // 品牌id
+  cate_id: "", // 平台分类id
   mer_cate_id: [], // 商户分类id
-  unit_name: '',
+  unit_name: "",
   sort: 0,
   is_show: 0,
   is_benefit: 0,
   is_new: 0,
   is_good: 0,
-  temp_id: '',
-  attrValue: [{
-    image: '',
-    price: null,
-    svip_price: null,
-    cost: null,
-    ot_price: null,
-    proportion:0.6,
-    stock: 0,
-    growth:0,
-    bar_code: '',
-    weight: null,
-    volume: null,
-    gist_url:null
-  }],
+  temp_id: "",
+  attrValue: [
+    {
+      image: "",
+      price: null,
+      svip_price: null,
+      cost: null,
+      ot_price: null,
+      proportion: 0.6,
+      stock: 0,
+      growth: 0,
+      bar_code: "",
+      weight: null,
+      volume: null,
+      gist_url: null,
+    },
+  ],
   attr: [],
-  selectRule: '',
+  selectRule: "",
   extension_type: 0,
-  content: '',
-  spec_type: 0
-}
+  content: "",
+  spec_type: 0,
+};
 const objTitle = {
   price: {
-    title: '售价'
+    title: "售价",
   },
   svip_price: {
-    title: '付费会员价'
+    title: "付费会员价",
   },
   cost: {
-    title: '成本价'
+    title: "成本价",
   },
   ot_price: {
-    title: '市场价'
+    title: "市场价",
   },
   proportion: {
-    title: '占比'
+    title: "占比",
   },
   stock: {
-    title: '库存'
+    title: "库存",
   },
   growth: {
-    title: '成长值'
+    title: "成长值",
   },
   bar_code: {
-    title: '商品编号'
+    title: "商品编号",
   },
   weight: {
-    title: '重量（KG）'
+    title: "重量（KG）",
   },
   volume: {
-    title: '体积(m³)'
+    title: "体积(m³)",
   },
   gist_url: {
-    title: '依据链接'
-  }
-}
-const proOptions = [{ name: '是否热卖', value: 'is_hot' }, { name: '优品推荐', value: 'is_good' }, { name: '促销单品', value: 'is_benefit' }, { name: '是否精品', value: 'is_best' }, { name: '是否新品', value: 'is_new' }]
+    title: "依据链接",
+  },
+};
+const proOptions = [
+  { name: "是否热卖", value: "is_hot" },
+  { name: "优品推荐", value: "is_good" },
+  { name: "促销单品", value: "is_benefit" },
+  { name: "是否精品", value: "is_best" },
+  { name: "是否新品", value: "is_new" },
+];
 export default {
-  name: 'Info',
+  name: "Info",
   props: {
     isShow: {
       type: Boolean,
-      default: true
+      default: true,
     },
     ids: {
       type: Array,
-      default: () => []
-    }
+      default: () => [],
+    },
+  },
+
+  directives: {
+    elDragDialog,
   },
   data() {
     return {
       rules: {
         status: [
-          { required: true, message: '请选择审核状态', trigger: 'change' }
+          { required: true, message: "请选择审核状态", trigger: "change" },
         ],
         refusal: [
-          { required: true, message: '请填写拒绝原因', trigger: 'blur' }
+          { required: true, message: "请填写拒绝原因", trigger: "blur" },
         ],
         // status_img: [
         //   {type: 'array', required: true, message: '请上传佐证图片', trigger: 'blur' }
         // ]
       },
+      myHeaders: { "X-Token": getToken() },
       isAppend: true,
       proId: 0,
-      aptitude:0,
-      qualification:{
-          production_name: '',
-          businessList: [],
-          licenceList: [],
-          trademarkList: [],
-          authorizedList: [],
-          commodityList: [],
-          otherList: [],
-          importBusinessList: [],
-          importAuthorizedList: [],
-          customsList: [],
-          packingList: [],
-          importOtherList: [],
-          commodity_type: 0,
-          brands_name: '',
-          import_name: ''
+      aptitude: 0,
+      qualification: {
+        production_name: "",
+        businessList: [],
+        licenceList: [],
+        trademarkList: [],
+        authorizedList: [],
+        commodityList: [],
+        otherList: [],
+        importBusinessList: [],
+        importAuthorizedList: [],
+        customsList: [],
+        packingList: [],
+        importOtherList: [],
+        commodity_type: 0,
+        brands_name: "",
+        import_name: "",
       },
       ruleForm: {
-        refusal: '',
+        refusal: "",
         status: 1,
-        id: '',
-        status_img:[]
+        id: "",
+        status_img: [],
       },
       formThead: Object.assign({}, objTitle),
       manyTabDate: {},
       manyTabTit: {},
       loading: false,
       dialogVisible: false,
-      activeNames: 'first',
+      activeNames: "first",
       projectData: {
-        merchant:{
-          ext:{
-            com:{}
-          }
-        }
+        merchant: {
+          ext: {
+            com: {},
+          },
+        },
       },
       recommend: proOptions,
       checkboxGroup: [],
       svip_type: 0,
       OneattrValue: [Object.assign({}, defaultObj.attrValue[0])], // 单规格
-      ManyAttrValue: [Object.assign({}, defaultObj.attrValue[0])] // 多规格
-    }
+      ManyAttrValue: [Object.assign({}, defaultObj.attrValue[0])], // 多规格
+    };
   },
   computed: {
+    fileUrl() {
+      return SettingMer.https + `/upload/image/0/file`;
+    },
     attrValue() {
-      const obj = Object.assign({}, defaultObj.attrValue[0])
-      if(this.svip_type == 0)delete obj.svip_price
-      delete obj.image
-      return obj
+      const obj = Object.assign({}, defaultObj.attrValue[0]);
+      if (this.svip_type == 0) delete obj.svip_price;
+      delete obj.image;
+      return obj;
     },
     oneFormBatch() {
-      const obj = [Object.assign({}, defaultObj.attrValue[0])]
-      delete obj[0].bar_code
-      return obj
-    }
+      const obj = [Object.assign({}, defaultObj.attrValue[0])];
+      delete obj[0].bar_code;
+      return obj;
+    },
   },
   methods: {
+    handlePaste(event) {
+      console.log("粘贴");
+      const items = (event.clipboardData || event.originalEvent.clipboardData)
+        .items;
+      let pasteFiles = [];
+      console.log(event);
+    },
+    // 上传文件之前的钩子函数
+    beforeUploadQualification() {
+      if (this.ruleForm.status_img.length >= 10) {
+        this.$message.error("上传文件最大数量为10张, 上传失败!");
+        return false;
+      } else {
+        return true;
+      }
+    },
+    // 上传成功
+    setQualificationsList(response) {
+      if (response.status === 200) {
+        this.ruleForm.status_img.push(response.data.src);
+        console.log(this.ruleForm.status_img);
+      } else {
+        this.$message.error(response.message);
+      }
+    },
     handleRemove(i) {
       this.ruleForm.status_img.splice(i, 1);
     },
@@ -652,22 +911,22 @@ export default {
     handleDragStart(e, item) {
       this.dragging = item;
     },
-      getType(val){
-        var regex = /(?:\.([^.]+))?$/;
-        let suffix = regex.exec(val.url)[1]
-        return suffix == 'pdf'
-      },
-       // 点击商品图
-      modalPicTap(tit, num, i) {
+    getType(val) {
+      var regex = /(?:\.([^.]+))?$/;
+      let suffix = regex.exec(val.url)[1];
+      return suffix == "pdf";
+    },
+    // 点击商品图
+    modalPicTap(tit, num, i) {
       const _this = this;
       const attr = [];
-      this.$modalUpload(function(img) {
+      this.$modalUpload(function (img) {
         console.log(_this.ruleForm);
         if (tit === "1" && !num) {
           _this.ruleForm.status_img = img[0];
         }
         if (tit === "2" && !num) {
-          img.map(item => {
+          img.map((item) => {
             attr.push(item.attachment_src);
             _this.ruleForm.status_img.push(item);
             if (_this.ruleForm.status_img.length > 10) {
@@ -681,111 +940,126 @@ export default {
       console.log(this.projectData);
       let mode = {
         0: {
-          'api': productStatusFirstApi,
-          'status':10
+          api: productStatusFirstApi,
+          status: 9,
         },
         10: {
-          'api': productStatusSecondApi,
-          'status':11,
-          'backStatus':0,
+          api: productStatusSecondApi,
+          status: 11,
+        },
+        9: {
+          api: productStatusFirstTwoApi,
+          status: 10,
         },
         11: {
-          'api': productStatusApi,
-          'status':1,
-          'backStatus':10
+          api: productStatusApi,
+          status: 1,
         },
-        '15': {
-          'api': productStatusUnlockApi,
-          'status':10
-        }
-      }
-      this.$refs.ruleForm.validate(valid=>{
-        if(valid){
-          this.isShow ? this.ruleForm.id = this.proId : this.ruleForm.id = this.ids
+        15: {
+          api: productStatusUnlockApi,
+          status: 10,
+        },
+      };
+      this.$refs.ruleForm.validate((valid) => {
+        if (valid) {
+          this.isShow
+            ? (this.ruleForm.id = this.proId)
+            : (this.ruleForm.id = this.ids);
           let params = {
             ...this.ruleForm,
-            status: this.ruleForm.status==-1?-1:this.ruleForm.status ==15?15:this.ruleForm.status==-2?mode[this.projectData.status].backStatus:mode[this.projectData.status].status
-          }
-          mode[this.projectData.status].api(params).then(res => {
-            this.$message.success(res.message)
-            this.dialogVisible = false
-            this.activeNames = 'first'
-            this.$emit('subSuccess')
-          }).catch(res => {
-            this.listLoading = false
-            this.$message.error(res.message)
-          })
+            status:
+              this.ruleForm.status == -1
+                ? -1
+                : mode[this.projectData.status].status,
+          };
+          mode[this.projectData.status]
+            .api(params)
+            .then((res) => {
+              this.$message.success(res.message);
+              this.dialogVisible = false;
+              this.activeNames = "first";
+              this.$emit("subSuccess");
+            })
+            .catch((res) => {
+              this.listLoading = false;
+              this.$message.error(res.message);
+            });
         }
-      })
+      });
     },
     handleClose() {
-      this.dialogVisible = false
-      this.activeNames = 'first'
+      this.dialogVisible = false;
+      this.activeNames = "first";
     },
     getInfo(id) {
-      this.proId = id
-      this.loading = true
-      this.ruleForm.status_img = []
-      this.ruleForm.status = 1
-      this.ruleForm.refusal = ''
-      productDetailApi(id).then(res => {
-        this.projectData = res.data,
-        this.ruleForm.status_img = res.data.status_img
-        let qualification={
-          production_name: '',
-          businessList: [],
-          licenceList: [],
-          trademarkList: [],
-          authorizedList: [],
-          commodityList: [],
-          otherList: [],
-          importBusinessList: [],
-          importAuthorizedList: [],
-          customsList: [],
-          packingList: [],
-          importOtherList: [],
-          commodity_type: 0,
-          brands_name: '',
-          import_name: ''
-      }
-        this.qualification = res.data.qualification || qualification
-        this.svip_type = res.data.svip_price_type
-       
-        if (this.projectData.spec_type === 0) {
-          this.OneattrValue = res.data.attrValue
-        } else {
-          this.ManyAttrValue = res.data.attrValue
-        }
-        const tmp = {}
-        const tmpTab = {}
-        this.projectData.attr.forEach((o, i) => {
-          tmp['value' + i] = { title: o.value }
-          tmpTab['value' + i] = ''
+      this.proId = id;
+      this.loading = true;
+      this.ruleForm.status_img = [];
+      this.ruleForm.status = 1;
+      this.ruleForm.refusal = "";
+      productDetailApi(id)
+        .then((res) => {
+          (this.projectData = res.data),
+            (this.ruleForm.status_img = res.data.status_img);
+          let qualification = {
+            production_name: "",
+            businessList: [],
+            licenceList: [],
+            trademarkList: [],
+            authorizedList: [],
+            commodityList: [],
+            otherList: [],
+            importBusinessList: [],
+            importAuthorizedList: [],
+            customsList: [],
+            packingList: [],
+            importOtherList: [],
+            commodity_type: 0,
+            brands_name: "",
+            import_name: "",
+          };
+          this.qualification = res.data.qualification || qualification;
+          this.svip_type = res.data.svip_price_type;
+
+          if (this.projectData.spec_type === 0) {
+            this.OneattrValue = res.data.attrValue;
+          } else {
+            this.ManyAttrValue = res.data.attrValue;
+          }
+          const tmp = {};
+          const tmpTab = {};
+          this.projectData.attr.forEach((o, i) => {
+            tmp["value" + i] = { title: o.value };
+            tmpTab["value" + i] = "";
+          });
+          this.manyTabDate = tmpTab;
+          this.manyTabTit = tmp;
+          this.checkboxGroup = [];
+          this.formThead = Object.assign({}, this.formThead, tmp);
+          if (this.projectData.is_hot === 1) this.checkboxGroup.push("is_hot");
+          if (this.projectData.is_good === 1)
+            this.checkboxGroup.push("is_good");
+          if (this.projectData.is_benefit === 1)
+            this.checkboxGroup.push("is_benefit");
+          if (this.projectData.is_best === 1)
+            this.checkboxGroup.push("is_best");
+          if (this.projectData.is_new === 1) this.checkboxGroup.push("is_new");
+          this.loading = false;
         })
-        this.manyTabDate = tmpTab
-        this.manyTabTit = tmp
-        this.checkboxGroup = []
-        this.formThead = Object.assign({}, this.formThead, tmp)
-        if (this.projectData.is_hot === 1) this.checkboxGroup.push('is_hot')
-        if (this.projectData.is_good === 1) this.checkboxGroup.push('is_good')
-        if (this.projectData.is_benefit === 1) this.checkboxGroup.push('is_benefit')
-        if (this.projectData.is_best === 1) this.checkboxGroup.push('is_best')
-        if (this.projectData.is_new === 1) this.checkboxGroup.push('is_new')
-        this.loading = false
-      }).catch(res => {
-        this.$message.error(res.message)
-        this.loading = false
-      })
-    }
-  }
-}
+        .catch((res) => {
+          this.$message.error(res.message);
+          this.loading = false;
+        });
+    },
+  },
+};
 </script>
 
 <style scoped lang="scss">
-  .projectInfo ::v-deep .el-dialog__body{
-    padding-top: 0 !important;
-  }
-  .pictrue {
+.projectInfo ::v-deep .el-dialog__body {
+  padding-top: 0 !important;
+}
+.pictrue {
   width: 60px;
   height: 60px;
   border: 1px dotted rgba(0, 0, 0, 0.1);
@@ -797,6 +1071,11 @@ export default {
     height: 100%;
   }
 }
+::v-deep .el-upload--picture-card {
+  width: 58px;
+  height: 58px;
+  line-height: 70px;
+}
 .btndel {
   position: absolute;
   z-index: 1;
@@ -805,75 +1084,75 @@ export default {
   left: 46px;
   top: -4px;
 }
-  .upload{
+.upload {
+  display: flex;
+  flex-direction: row;
+  align-content: center;
+  height: 60px;
+  // line-height: 60px;
+  margin-bottom: 10px;
+  &_right {
     display: flex;
-    flex-direction: row;
-    align-content: center;
     height: 60px;
-    // line-height: 60px;
-    margin-bottom: 10px;
-    &_right{
-      display: flex;
-      height: 60px;
-    }
-    &_left{
-      width: 115px;
-    }
-    .txt{
-      width: 60px;
-      height: 60px;
-      line-height: 60px;
-      overflow: hidden;
-      display: inline-block;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-      border: 1px solid #DCDFE6;
-      border-radius: 4px;
-      margin-right: 10px;
-      color: blue;
-    }
   }
-  .projectInfo ::v-deep .el-tabs__content{
-    padding-left: 10px !important;
+  &_left {
+    width: 115px;
   }
-  .tabPic{
-    width: 40px !important;
-    height: 40px !important;
-    img{
-      width: 100%;
-      height: 100%;
-    }
-  }
-  .sp {
-    display: block;
-    width: 33%;
-    margin-bottom: 20px;
-  }
-  .sp100 {
-    width: 100%;
-    margin-bottom: 15px;
-    display: inline-block;
-  }
-  .third{
-    width: 100%;
-    display: flex;
-  }
-  .pictrue {
+  .txt {
     width: 60px;
     height: 60px;
-    border: 1px dotted rgba(0, 0, 0, 0.1);
+    line-height: 60px;
+    overflow: hidden;
+    display: inline-block;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    border: 1px solid #dcdfe6;
+    border-radius: 4px;
     margin-right: 10px;
-    position: relative;
-    cursor: pointer;
-    display: inline-block;
-    vertical-align: middle;
-    img {
-      width: 100%;
-      height: 100%;
-    }
+    color: blue;
   }
-  .demo-image__preview{
-    display: inline-block;
-    vertical-align: middle;
+}
+.projectInfo ::v-deep .el-tabs__content {
+  padding-left: 10px !important;
+}
+.tabPic {
+  width: 40px !important;
+  height: 40px !important;
+  img {
+    width: 100%;
+    height: 100%;
   }
+}
+.sp {
+  display: block;
+  width: 33%;
+  margin-bottom: 20px;
+}
+.sp100 {
+  width: 100%;
+  margin-bottom: 15px;
+  display: inline-block;
+}
+.third {
+  width: 100%;
+  display: flex;
+}
+.pictrue {
+  width: 60px;
+  height: 60px;
+  border: 1px dotted rgba(0, 0, 0, 0.1);
+  margin-right: 10px;
+  position: relative;
+  cursor: pointer;
+  display: inline-block;
+  vertical-align: middle;
+  img {
+    width: 100%;
+    height: 100%;
+  }
+}
+.demo-image__preview {
+  display: inline-block;
+  vertical-align: middle;
+}
 </style>
diff --git a/src/views/product/productExamine/proDetails.vue b/src/views/product/productExamine/proDetails.vue
index fbd92f9..704e953 100644
--- a/src/views/product/productExamine/proDetails.vue
+++ b/src/views/product/productExamine/proDetails.vue
@@ -21,11 +21,19 @@
           <ul class="list">
             <li class="item">
               <div class="title">商品类型</div>
-              <div>{{productData.type == 0 ? '普通商品' : productData.type == 1 ? '虚拟商品' : '卡密商品' }}</div>
+              <div>
+                {{
+                  productData.type == 0
+                    ? "普通商品"
+                    : productData.type == 1
+                    ? "虚拟商品"
+                    : "卡密商品"
+                }}
+              </div>
             </li>
             <li class="item">
               <div class="title">商品状态</div>
-              <div>{{ productData.status == 1 ? '上架显示' : '下架' }}</div>
+              <div>{{ productData.status == 1 ? "上架显示" : "下架" }}</div>
             </li>
             <li class="item">
               <div class="title">销量</div>
@@ -50,86 +58,160 @@
                   <div class="item-title">封面图：</div>
                   <!-- <img :src="productData.image" style="width:40px;height:40px;margin-right:12px;"/> -->
                   <el-image
-                  style="width: 60px; height: 60px"
-                  :src="productData.image"
-                  :preview-src-list="[productData.image]"
-                />
+                    style="width: 60px; height: 60px"
+                    :src="productData.image"
+                    :preview-src-list="[productData.image]"
+                  />
                 </li>
                 <li class="item item100">
                   <div class="item-title">轮播图：</div>
                   <el-image
-                  v-for="(pic,idx) in productData.slider_image"
-                  style="width: 60px; height: 60px"
-                  :key="idx"
-                  :src="pic"
-                  :preview-src-list="productData.slider_image"
-                />
+                    v-for="(pic, idx) in productData.slider_image"
+                    style="width: 60px; height: 60px"
+                    :key="idx"
+                    :src="pic"
+                    :preview-src-list="productData.slider_image"
+                  />
                   <!-- <img v-for="(pic,idx) in productData.slider_image" :key="idx" :src="pic" style="width:40px;height:40px;margin-right:12px;"/> -->
-                </li>  
+                </li>
               </ul>
               <ul class="list">
                 <li class="item">
-                <div class="item-title">商品简介：</div>
-                  <div class="value">{{productData.store_info}}</div>
+                  <div class="item-title">商品简介：</div>
+                  <div class="value">{{ productData.store_info }}</div>
                 </li>
                 <li class="item">
-                <div class="item-title">商品名称：</div>
-                  <div class="value">{{productData.store_name}}</div>
+                  <div class="item-title">商品名称：</div>
+                  <div class="value">{{ productData.store_name }}</div>
                 </li>
                 <li class="item">
-                <div class="item-title">品牌名称：</div>
-                  <div class="value">{{productData.qualification&&productData.qualification.brands_name}}</div>
+                  <div class="item-title">品牌名称：</div>
+                  <div class="value">
+                    {{
+                      productData.qualification &&
+                      productData.qualification.brands_name
+                    }}
+                  </div>
                 </li>
                 <li class="item">
                   <div class="item-title">平台分类：</div>
-                  <div class="value">{{productData.storeCategory&&productData.storeCategory.cate_name || '-'}}</div>
+                  <div class="value">
+                    {{
+                      (productData.storeCategory &&
+                        productData.storeCategory.cate_name) ||
+                      "-"
+                    }}
+                  </div>
                 </li>
-                <li v-if="productData.merCateId&&productData.merCateId.length>0" class="item">
+                <li
+                  v-if="
+                    productData.merCateId && productData.merCateId.length > 0
+                  "
+                  class="item"
+                >
                   <div class="item-title">商户分类：</div>
                   <div class="value">
-                    <span v-for="(item,index) in productData.merCateId" :key="index">{{item.category&&item.category.cate_name}}&nbsp;&nbsp;&nbsp;&nbsp;</span>
+                    <span
+                      v-for="(item, index) in productData.merCateId"
+                      :key="index"
+                      >{{
+                        item.category && item.category.cate_name
+                      }}&nbsp;&nbsp;&nbsp;&nbsp;</span
+                    >
                   </div>
                 </li>
                 <li class="item">
                   <div class="item-title">商品标签：</div>
-                  <div v-if="(productData.mer_labels&&productData.mer_labels_data.length) || (productData.sys_labels_data&&productData.sys_labels_data.length)" class="value">
-                    <template v-if="productData.mer_labels_data&&productData.mer_labels_data.length">
-                      <span v-for="(item,index) in productData.mer_labels_data" :key="index" class="value-item"> {{item}} </span> 
+                  <div
+                    v-if="
+                      (productData.mer_labels &&
+                        productData.mer_labels_data.length) ||
+                      (productData.sys_labels_data &&
+                        productData.sys_labels_data.length)
+                    "
+                    class="value"
+                  >
+                    <template
+                      v-if="
+                        productData.mer_labels_data &&
+                        productData.mer_labels_data.length
+                      "
+                    >
+                      <span
+                        v-for="(item, index) in productData.mer_labels_data"
+                        :key="index"
+                        class="value-item"
+                      >
+                        {{ item }}
+                      </span>
                     </template>
-                    <template v-if="productData.sys_labels_data&&productData.sys_labels_data.length">
-                      <span v-for="(item,index) in productData.sys_labels_data" :key="index" class="value-item"> {{item}} </span>
+                    <template
+                      v-if="
+                        productData.sys_labels_data &&
+                        productData.sys_labels_data.length
+                      "
+                    >
+                      <span
+                        v-for="(item, index) in productData.sys_labels_data"
+                        :key="index"
+                        class="value-item"
+                      >
+                        {{ item }}
+                      </span>
                     </template>
                   </div>
                   <div v-else class="value"><span>-</span></div>
                 </li>
                 <li class="item">
                   <div class="item-title">品牌选择：</div>
-                  <div class="value">{{productData.brand&&productData.brand.brand_name || '其它'}}</div>
+                  <div class="value">
+                    {{
+                      (productData.brand && productData.brand.brand_name) ||
+                      "其它"
+                    }}
+                  </div>
                 </li>
                 <li class="item">
                   <div class="item-title">单位：</div>
-                  <div class="value">{{productData.unit_name}}</div>
+                  <div class="value">{{ productData.unit_name }}</div>
                 </li>
                 <li class="item">
                   <div class="item-title">关键字：</div>
-                  <div class="value">{{productData.keyword || '-'}}</div>
+                  <div class="value">{{ productData.keyword || "-" }}</div>
                 </li>
                 <li class="item">
                   <div class="item-title">配送方式：</div>
-                  <template v-if="productData.type==0">
-                    <div v-if="productData.delivery_way.length==2" class="value">快递/到店自提</div>
-                    <div v-else-if="productData.delivery_way.length==1">{{productData.delivery_way[0]==1 ? "到店自提" : "快递"}}</div>
+                  <template v-if="productData.type == 0">
+                    <div
+                      v-if="productData.delivery_way.length == 2"
+                      class="value"
+                    >
+                      快递/到店自提
+                    </div>
+                    <div v-else-if="productData.delivery_way.length == 1">
+                      {{
+                        productData.delivery_way[0] == 1 ? "到店自提" : "快递"
+                      }}
+                    </div>
                   </template>
                   <template v-else>
-                    <div v-if="productData.type == 1" class="value">虚拟发货</div>
-                    <div v-else-if="productData.type == 2" class="value">卡密发货</div>
+                    <div v-if="productData.type == 1" class="value">
+                      虚拟发货
+                    </div>
+                    <div v-else-if="productData.type == 2" class="value">
+                      卡密发货
+                    </div>
                   </template>
                 </li>
               </ul>
               <ul v-if="productData.video_link" class="list">
                 <li class="item item100">
                   <div class="item-title">主图视频：</div>
-                  <video style="width:300px;height: 150px;border-radius: 10px;" :src="productData.video_link" controls="controls">
+                  <video
+                    style="width: 300px; height: 150px; border-radius: 10px"
+                    :src="productData.video_link"
+                    controls="controls"
+                  >
                     您的浏览器不支持 video 标签。
                   </video>
                 </li>
@@ -141,15 +223,39 @@
               <ul class="list">
                 <li class="item">
                   <div class="item-title">佣金设置：</div>
-                  <div class="value">{{productData.extension_type==1?"单独设置":"默认设置"}}</div>
+                  <div class="value">
+                    {{
+                      productData.extension_type == 1 ? "单独设置" : "默认设置"
+                    }}
+                  </div>
                 </li>
-                 <li v-if="mer_svip_status" class="item">
+                <li v-if="mer_svip_status" class="item">
                   <div>付费会员价设置：</div>
-                  <div class="value">{{productData.svip_price_type==0 ? '不设置会员价' : productData.svip_price_type==1 ? '默认设置会员价' : '自定义设置会员价'}}</div>
+                  <div class="value">
+                    {{
+                      productData.svip_price_type == 0
+                        ? "不设置会员价"
+                        : productData.svip_price_type == 1
+                        ? "默认设置会员价"
+                        : "自定义设置会员价"
+                    }}
+                  </div>
                 </li>
-                 <li class="item">
+                <li class="item">
                   <div class="item-title">规格：</div>
-                  <div class="value">{{productData.spec_type == 1 ? "多规格" : "单规格"}}</div>
+                  <div class="value">
+                    {{ productData.spec_type == 1 ? "多规格" : "单规格" }}
+                  </div>
+                </li>
+                <li class="item item100">
+                  <div class="item-title">佐证图片：</div>
+                  <el-image
+                    v-for="(item, index) in productData.status_img"
+                    :key="index"
+                    :src="item"
+                    style="width: 40px; height: 40px; margin-right: 12px"
+                    :preview-src-list="productData.status_img"
+                  />
                 </li>
               </ul>
             </div>
@@ -165,11 +271,16 @@
                 </li>  
               </ul>
             </div> -->
-            <div class="section" style="margin-top: 50px;">
+            <div class="section" style="margin-top: 50px">
               <div class="title">规格列表：</div>
               <div class="list">
                 <template v-if="productData.spec_type === 0">
-                  <el-table :data="OneattrValue" border class="tabNumWidth" size="mini">
+                  <el-table
+                    :data="OneattrValue"
+                    border
+                    class="tabNumWidth"
+                    size="mini"
+                  >
                     <el-table-column align="center" label="图片" min-width="80">
                       <template slot-scope="scope">
                         <div class="demo-image__preview">
@@ -181,55 +292,118 @@
                         </div>
                       </template>
                     </el-table-column>
-                    <el-table-column v-for="(item,iii) in attrValue" :key="iii" :label="formThead[iii].title" align="center" min-width="80">
+                    <el-table-column
+                      v-for="(item, iii) in attrValue"
+                      :key="iii"
+                      :label="formThead[iii].title"
+                      align="center"
+                      min-width="80"
+                    >
                       <template slot-scope="scope">
-                        <span class="priceBox" v-text="scope.row[iii]" />
+                        <a
+                          v-if="formThead[iii].title == '依据链接'"
+                          :href="isValidURL(scope.row[iii])"
+                          target="_blank"
+                          >{{ scope.row[iii] }}</a
+                        >
+                        <span v-else class="priceBox" v-text="scope.row[iii]" />
                       </template>
                     </el-table-column>
                     <template v-if="productData.extension_type === 1">
-                      <el-table-column align="center" label="一级返佣(元)" min-width="100">
+                      <el-table-column
+                        align="center"
+                        label="一级返佣(元)"
+                        min-width="100"
+                      >
                         <template slot-scope="scope">
-                          <span class="priceBox" v-text="scope.row.extension_one" />
+                          <span
+                            class="priceBox"
+                            v-text="scope.row.extension_one"
+                          />
                         </template>
                       </el-table-column>
-                      <el-table-column align="center" label="二级返佣(元)" min-width="100">
+                      <el-table-column
+                        align="center"
+                        label="二级返佣(元)"
+                        min-width="100"
+                      >
                         <template slot-scope="scope">
-                          <span class="priceBox" v-text="scope.row.extension_two" />
+                          <span
+                            class="priceBox"
+                            v-text="scope.row.extension_two"
+                          />
                         </template>
                       </el-table-column>
                     </template>
                   </el-table>
                 </template>
                 <template v-if="productData.spec_type === 1">
-                  <el-table :data="ManyAttrValue" border class="tabNumWidth" size="mini">
-                      <template v-if="manyTabDate">
-                        <el-table-column v-for="(item,iii) in manyTabDate" :key="iii" align="center" :label="manyTabTit[iii].title" min-width="100">
-                          <template slot-scope="scope">
-                            <span class="priceBox" v-text="scope.row[iii]" />
-                          </template>
-                        </el-table-column>
-                      </template>
+                  <el-table
+                    :data="ManyAttrValue"
+                    border
+                    class="tabNumWidth"
+                    size="mini"
+                  >
+                    <template v-if="manyTabDate">
+                      <el-table-column
+                        v-for="(item, iii) in manyTabDate"
+                        :key="iii"
+                        align="center"
+                        :label="manyTabTit[iii].title"
+                        min-width="100"
+                      >
+                        <template slot-scope="scope">
+                          <span class="priceBox" v-text="scope.row[iii]" />
+                        </template>
+                      </el-table-column>
+                    </template>
                     <el-table-column align="center" label="图片" min-width="80">
                       <template slot-scope="scope">
                         <div class="upLoadPicBox">
-                          <div class="pictrue tabPic"><img :src="scope.row.image"></div>
+                          <div class="pictrue tabPic">
+                            <img :src="scope.row.image" />
+                          </div>
                         </div>
                       </template>
                     </el-table-column>
-                    <el-table-column v-for="(item,iii) in attrValue" :key="iii" :label="formThead[iii].title" align="center" min-width="80">
+                    <el-table-column
+                      v-for="(item, iii) in attrValue"
+                      :key="iii"
+                      :label="formThead[iii].title"
+                      align="center"
+                      min-width="80"
+                    >
                       <template slot-scope="scope">
-                        <span class="priceBox">{{ scope.row[iii] }}</span>
+                        <a
+                          v-if="formThead[iii].title == '依据链接'"
+                          :href="isValidURL(scope.row[iii])"
+                          target="_blank"
+                          >{{ scope.row[iii] }}</a
+                        >
+                        <span v-else class="priceBox">{{ scope.row[iii] }}</span>
                       </template>
                     </el-table-column>
                     <template v-if="productData.extension_type === 1">
-                      <el-table-column align="center" label="一级返佣(元)" min-width="80">
+                      <el-table-column
+                        align="center"
+                        label="一级返佣(元)"
+                        min-width="80"
+                      >
                         <template slot-scope="scope">
-                          <span class="priceBox">{{ scope.row.extension_one }}</span>
+                          <span class="priceBox">{{
+                            scope.row.extension_one
+                          }}</span>
                         </template>
                       </el-table-column>
-                      <el-table-column align="center" label="二级返佣(元)" min-width="80">
+                      <el-table-column
+                        align="center"
+                        label="二级返佣(元)"
+                        min-width="80"
+                      >
                         <template slot-scope="scope">
-                          <span class="priceBox">{{ scope.row.extension_two }}</span>
+                          <span class="priceBox">{{
+                            scope.row.extension_two
+                          }}</span>
                         </template>
                       </el-table-column>
                     </template>
@@ -240,7 +414,7 @@
           </el-tab-pane>
           <el-tab-pane label="商品详情" name="detail">
             <div class="section">
-              <div class="contentPic" v-html="productData.content"/>
+              <div class="contentPic" v-html="productData.content" />
             </div>
           </el-tab-pane>
           <el-tab-pane label="营销信息" name="marketing">
@@ -248,59 +422,113 @@
               <ul class="list">
                 <li class="item">
                   <div class="item-title">店铺推荐：</div>
-                  <div class="value">{{productData.is_good ? '是' : '否'}}</div>
+                  <div class="value">
+                    {{ productData.is_good ? "是" : "否" }}
+                  </div>
                 </li>
                 <li class="item">
                   <div class="item-title">平台推荐：</div>
-                  <div v-if="productData.is_benefit||productData.is_new||productData.is_best||productData.is_hot" class="value">
-                    <span class="value-item" v-if="productData.is_benefit">促销单品</span>
-                    <span class="value-item" v-if="productData.is_new">首发新品</span>
-                    <span class="value-item" v-if="productData.is_best">精品推荐</span>
-                    <span class="value-item" v-if="productData.is_hot">热门榜单</span>
+                  <div
+                    v-if="
+                      productData.is_benefit ||
+                      productData.is_new ||
+                      productData.is_best ||
+                      productData.is_hot
+                    "
+                    class="value"
+                  >
+                    <span class="value-item" v-if="productData.is_benefit"
+                      >促销单品</span
+                    >
+                    <span class="value-item" v-if="productData.is_new"
+                      >首发新品</span
+                    >
+                    <span class="value-item" v-if="productData.is_best"
+                      >精品推荐</span
+                    >
+                    <span class="value-item" v-if="productData.is_hot"
+                      >热门榜单</span
+                    >
                   </div>
                   <div v-else class="value-item">无</div>
                 </li>
                 <li class="item">
                   <div class="item-title">分销礼包：</div>
-                  <div class="value">{{productData.is_gift_bag ? '是' : '否'}}</div>
+                  <div class="value">
+                    {{ productData.is_gift_bag ? "是" : "否" }}
+                  </div>
                 </li>
                 <li v-if="productData.star" class="item">
                   <div class="item-title">平台推荐星级：</div>
                   <div class="value">
-                    <el-rate disabled v-model="productData.star" :colors="colors"></el-rate>
+                    <el-rate
+                      disabled
+                      v-model="productData.star"
+                      :colors="colors"
+                    ></el-rate>
                   </div>
                 </li>
-                <li v-if="productData.merchant&&productData.integral_rate!=0" class="item">
+                <li
+                  v-if="productData.merchant && productData.integral_rate != 0"
+                  class="item"
+                >
                   <div class="item-title">积分抵扣比例：</div>
-                  <div v-if="productData.integral_rate == -1&&productData.merchant" class="value">默认设置{{'('+productData.merchant.mer_integral_rate+'%)'}}</div>
-                  <div v-else-if="productData.integral_rate > 0" class="value">单独设置{{'('+productData.integral_rate+'%)'}}</div>
+                  <div
+                    v-if="
+                      productData.integral_rate == -1 && productData.merchant
+                    "
+                    class="value"
+                  >
+                    默认设置{{
+                      "(" + productData.merchant.mer_integral_rate + "%)"
+                    }}
+                  </div>
+                  <div v-else-if="productData.integral_rate > 0" class="value">
+                    单独设置{{ "(" + productData.integral_rate + "%)" }}
+                  </div>
                 </li>
-                <li v-if="productData.integral_rate!=0" class="item">
+                <li v-if="productData.integral_rate != 0" class="item">
                   <div class="item-title">积分抵扣金额：</div>
-                  <div class="value">{{productData.integral_price_total}}元</div>
+                  <div class="value">
+                    {{ productData.integral_price_total }}元
+                  </div>
                 </li>
-                <li v-if="productData.coupon&&productData.coupon.length>0" class="item">
+                <li
+                  v-if="productData.coupon && productData.coupon.length > 0"
+                  class="item"
+                >
                   <div class="item-title">优惠券(赠送券)：</div>
                   <div class="value">
-                    <span v-for="(itm,idx) in productData.coupon" :key="idx" class="value-item"> {{itm.title}} </span>
+                    <span
+                      v-for="(itm, idx) in productData.coupon"
+                      :key="idx"
+                      class="value-item"
+                    >
+                      {{ itm.title }}
+                    </span>
                   </div>
                 </li>
                 <li class="item">
                   <div class="item-title">收藏人数：</div>
                   <div class="value">
-                    <span> {{productData.care_count}}人</span>
+                    <span> {{ productData.care_count }}人</span>
                   </div>
                 </li>
                 <li class="item">
                   <div class="item-title">已售数量：</div>
                   <div class="value">
-                    <span> {{productData.ficti}} (指手动添加数量)</span>
+                    <span> {{ productData.ficti }} (指手动添加数量)</span>
                   </div>
                 </li>
                 <li class="item">
                   <div class="item-title">实际销量 ：</div>
                   <div class="value">
-                    <span> {{productData.sales-productData.ficti}} (指实际售出数量)</span>
+                    <span>
+                      {{
+                        productData.sales - productData.ficti
+                      }}
+                      (指实际售出数量)</span
+                    >
                   </div>
                 </li>
               </ul>
@@ -311,36 +539,63 @@
               <ul class="list">
                 <li class="item">
                   <div class="item-title">支持退款：</div>
-                  <div class="value">{{productData.refund_switch ? '是' : '否'}}</div>
+                  <div class="value">
+                    {{ productData.refund_switch ? "是" : "否" }}
+                  </div>
                 </li>
                 <li class="item">
                   <div class="item-title">最少购买件数：</div>
-                  <div class="value">{{productData.once_min_count == 0 ? '不限购' : productData.once_min_count}}</div>
+                  <div class="value">
+                    {{
+                      productData.once_min_count == 0
+                        ? "不限购"
+                        : productData.once_min_count
+                    }}
+                  </div>
                 </li>
-                <li v-if="productData.pay_limit!=0" class="item">
+                <li v-if="productData.pay_limit != 0" class="item">
                   <div class="item-title">限购类型：</div>
-                  <div class="value">{{productData.pay_limit==1?'单次限购':'长期限购'}}{{productData.once_min_count+'('+productData.unit_name+')'}}</div>
+                  <div class="value">
+                    {{ productData.pay_limit == 1 ? "单次限购" : "长期限购"
+                    }}{{
+                      productData.once_min_count +
+                      "(" +
+                      productData.unit_name +
+                      ")"
+                    }}
+                  </div>
                 </li>
-               <li v-if="productData.guarantee" class="item item100">
+                <li v-if="productData.guarantee" class="item item100">
                   <div class="item-title">保障服务：</div>
-                  <div class="value" style="width: 250px;">
-                    <span>{{productData.guarantee.template_name}}</span>
-                    <div v-if="productData.guarantee.templateValue && productData.guarantee.templateValue.length>0" style="display: inline;">
-                      【<span v-for="(item,i) in productData.guarantee.templateValue" :key="i" class="value-temp">{{item.value&&item.value.guarantee_name}}</span>】
+                  <div class="value" style="width: 250px">
+                    <span>{{ productData.guarantee.template_name }}</span>
+                    <div
+                      v-if="
+                        productData.guarantee.templateValue &&
+                        productData.guarantee.templateValue.length > 0
+                      "
+                      style="display: inline"
+                    >
+                      【<span
+                        v-for="(item, i) in productData.guarantee.templateValue"
+                        :key="i"
+                        class="value-temp"
+                        >{{ item.value && item.value.guarantee_name }}</span
+                      >】
                     </div>
                   </div>
                 </li>
                 <li v-if="productData.refusal" class="item">
                   <div class="item-title">审核拒绝原因：</div>
-                  <div class="value">{{productData.refusal}}</div>
+                  <div class="value">{{ productData.refusal }}</div>
                 </li>
               </ul>
             </div>
             <div class="section">
-              <ul style="padding: 0;margin-top: 50px;">
+              <ul style="padding: 0; margin-top: 50px">
                 <li class="item item100">
                   <div class="item-title">商户商品参数：</div>
-                  <div class="value" style="width: 721px;">
+                  <div class="value" style="width: 721px">
                     <el-table
                       border
                       ref="tableParameter"
@@ -355,12 +610,16 @@
                         width="360"
                       >
                         <template slot-scope="scope">
-                          <span>{{scope.row.name}}</span>
+                          <span>{{ scope.row.name }}</span>
                         </template>
                       </el-table-column>
-                      <el-table-column align="center" label="参数值" width="360">
+                      <el-table-column
+                        align="center"
+                        label="参数值"
+                        width="360"
+                      >
                         <template slot-scope="scope">
-                          <span>{{scope.row.value}}</span>
+                          <span>{{ scope.row.value }}</span>
                         </template>
                       </el-table-column>
                     </el-table>
@@ -368,7 +627,7 @@
                 </li>
                 <li class="item item100">
                   <div class="item-title">平台商品参数：</div>
-                  <div class="value" style="width: 721px;">
+                  <div class="value" style="width: 721px">
                     <el-table
                       border
                       ref="tableParameter"
@@ -383,12 +642,16 @@
                         width="360"
                       >
                         <template slot-scope="scope">
-                          <span>{{scope.row.name}}</span>
+                          <span>{{ scope.row.name }}</span>
                         </template>
                       </el-table-column>
-                      <el-table-column align="center" label="参数值" width="360">
+                      <el-table-column
+                        align="center"
+                        label="参数值"
+                        width="360"
+                      >
                         <template slot-scope="scope">
-                          <span>{{scope.row.value}}</span>
+                          <span>{{ scope.row.value }}</span>
                         </template>
                       </el-table-column>
                     </el-table>
@@ -397,9 +660,28 @@
                 <li class="item item100">
                   <div class="item-title">关联系统表单：</div>
                   <div v-if="!productData.mer_form_id" class="value">关闭</div>
-                  <div v-else-if="productData.mer_form_id && formData.length==0" class="value">表单已被删除</div>
-                  <div v-else-if="formData.length>0 && productData.mer_form_id && activeName=='others'" class="value" style="width: 350px;">
-                    <iframe class="iframe-box" :src="formUrl" frameborder="0" ref="iframe" style="min-height: 300px;"></iframe>
+                  <div
+                    v-else-if="productData.mer_form_id && formData.length == 0"
+                    class="value"
+                  >
+                    表单已被删除
+                  </div>
+                  <div
+                    v-else-if="
+                      formData.length > 0 &&
+                      productData.mer_form_id &&
+                      activeName == 'others'
+                    "
+                    class="value"
+                    style="width: 350px"
+                  >
+                    <iframe
+                      class="iframe-box"
+                      :src="formUrl"
+                      frameborder="0"
+                      ref="iframe"
+                      style="min-height: 300px"
+                    ></iframe>
                     <!-- <el-table
                     border
                     class="specsList"
@@ -423,23 +705,31 @@
               </ul>
             </div>
           </el-tab-pane>
-          <el-tab-pane label="店铺信息" name="merchant" v-if="productData.merchant">
+          <el-tab-pane
+            label="店铺信息"
+            name="merchant"
+            v-if="productData.merchant"
+          >
             <div class="section">
               <ul class="list">
                 <li class="item">
                   <div class="item-title">商户名称：</div>
-                  <div class="value">{{productData.merchant.mer_name}}</div>
+                  <div class="value">{{ productData.merchant.mer_name }}</div>
                 </li>
                 <li class="item">
                   <div class="item-title">商户类别：</div>
-                  <div class="value">{{productData.merchant.is_trader == 1 ? '自营' : '非自营'}}</div>
+                  <div class="value">
+                    {{
+                      productData.merchant.is_trader == 1 ? "自营" : "非自营"
+                    }}
+                  </div>
                 </li>
                 <li class="item">
                   <div class="item-title">店铺类型：</div>
-                  <div class="value">{{productData.merchant.type_name}}</div>
+                  <div class="value">{{ productData.merchant.type_name }}</div>
                 </li>
               </ul>
-            </div> 
+            </div>
           </el-tab-pane>
           <el-tab-pane label="商品操作记录" name="records">
             <div class="section">
@@ -486,24 +776,32 @@
                   min-width="60"
                   prop="operate_log_id"
                 />
-                <el-table-column align="center" label="操作记录" min-width="120">
+                <el-table-column
+                  align="center"
+                  label="操作记录"
+                  min-width="120"
+                >
                   <template slot-scope="scope">
-                    <span>{{scope.row.category_name}}</span>
+                    <span>{{ scope.row.category_name }}</span>
                   </template>
                 </el-table-column>
                 <el-table-column align="center" label="操作端" min-width="100">
                   <template slot-scope="scope">
-                    <span>{{scope.row.type}}</span>
+                    <span>{{ scope.row.type }}</span>
                   </template>
                 </el-table-column>
-                <el-table-column align="center" label="操作角色" min-width="100">
+                <el-table-column
+                  align="center"
+                  label="操作角色"
+                  min-width="100"
+                >
                   <template slot-scope="scope">
-                    <span>{{scope.row.operator_role_nickname}}</span>
+                    <span>{{ scope.row.operator_role_nickname }}</span>
                   </template>
                 </el-table-column>
                 <el-table-column align="center" label="操作人" min-width="100">
                   <template slot-scope="scope">
-                    <span>{{scope.row.operator_nickname}}</span>
+                    <span>{{ scope.row.operator_nickname }}</span>
                   </template>
                 </el-table-column>
                 <el-table-column
@@ -514,314 +812,431 @@
                 />
               </el-table>
               <div class="block">
-                <el-pagination :page-size="recordForm.limit" :current-page="recordForm.page" layout="prev, pager, next, jumper" :total="recordData.total" @size-change="handleSizeChange" @current-change="pageChange" />
+                <el-pagination
+                  :page-size="recordForm.limit"
+                  :current-page="recordForm.page"
+                  layout="prev, pager, next, jumper"
+                  :total="recordData.total"
+                  @size-change="handleSizeChange"
+                  @current-change="pageChange"
+                />
               </div>
-            </div> 
+            </div>
           </el-tab-pane>
           <el-tab-pane label="审核回复栏" name="audit">
             <div class="section">
               <ul class="list">
-                <li class="item" v-if="productData.refusal">
+                <li class="audit" v-if="productData.refusal">
                   <div class="item-title">审核拒绝原因：</div>
-                  <div class="value">{{productData.refusal || ''}}</div>
+                  <div style="margin-left: 100px" class="value">
+                    <pre>{{ productData.refusal || "" }}</pre>
+                  </div>
                 </li>
                 <li class="item item100">
                   <div class="item-title">佐证图片：</div>
-                  <el-image v-for="(item,index) in productData.status_img" :key="index" :src="item" style="width:40px;height:40px;margin-right:12px;" :preview-src-list="productData.status_img" />
-                </li>  
+                  <el-image
+                    v-for="(item, index) in productData.status_img"
+                    :key="index"
+                    :src="item"
+                    style="width: 40px; height: 40px; margin-right: 12px"
+                    :preview-src-list="productData.status_img"
+                  />
+                </li>
               </ul>
             </div>
           </el-tab-pane>
           <el-tab-pane label="资质信息" name="aptitude">
-        <span class="sp">商品名称：
-          <el-radio-group v-model="qualification.commodity_type">
-            <el-radio :label="0" class="radio" :disabled="qualification.commodity_type==1">国产</el-radio>
-            <el-radio :label="1" :disabled="qualification.commodity_type==0">进口</el-radio>
-          </el-radio-group>
-        </span>
-      <div v-if="qualification.commodity_type == 0">
-        <span class="sp">生产企业名称：{{ qualification.production_name }}</span>
-        <span class="upload">
-          <div class="upload_left">生产营业执照：</div>
-          <div class="upload_right">
-            <div
-              v-for="(item,index) in qualification.businessList"
-              :key="index"
-            >
-              <a class="txt" v-if="getType(item)" :href="item.url" target="downloadFile" download>{{ item.name }}</a> 
-              <div class="pictrue" v-else>
-                <el-image
-                style="width: 60px; height: 60px;"
-                :src="item.url"
-                :preview-src-list="[item.url]"
-              />
-              </div>
+            <span class="sp"
+              >商品名称：
+              <el-radio-group v-model="qualification.commodity_type">
+                <el-radio
+                  :label="0"
+                  class="radio"
+                  :disabled="qualification.commodity_type == 1"
+                  >国产</el-radio
+                >
+                <el-radio
+                  :label="1"
+                  :disabled="qualification.commodity_type == 0"
+                  >进口</el-radio
+                >
+              </el-radio-group>
+            </span>
+            <div v-if="qualification.commodity_type == 0">
+              <span class="sp"
+                >生产企业名称：{{ qualification.production_name }}</span
+              >
+              <span class="upload">
+                <div class="upload_left">生产营业执照：</div>
+                <div class="upload_right">
+                  <div
+                    v-for="(item, index) in qualification.businessList"
+                    :key="index"
+                  >
+                    <a
+                      class="txt"
+                      v-if="getType(item)"
+                      :href="item.url"
+                      target="downloadFile"
+                      download
+                      >{{ item.name }}</a
+                    >
+                    <div class="pictrue" v-else>
+                      <el-image
+                        style="width: 60px; height: 60px"
+                        :src="item.url"
+                        :preview-src-list="[item.url]"
+                      />
+                    </div>
+                  </div>
+                </div>
+              </span>
+              <span class="upload">
+                <div class="upload_left">生产许可证：</div>
+                <div class="upload_right">
+                  <div
+                    v-for="(item, index) in qualification.licenceList"
+                    :key="index"
+                  >
+                    <a
+                      class="txt"
+                      v-if="getType(item)"
+                      :href="item.url"
+                      target="downloadFile"
+                      download
+                      >{{ item.name }}</a
+                    >
+                    <div class="pictrue" v-else>
+                      <el-image
+                        style="width: 60px; height: 60px"
+                        :src="item.url"
+                        :preview-src-list="[item.url]"
+                      />
+                    </div>
+                  </div>
+                </div>
+              </span>
+              <span class="upload">
+                <div class="upload_left">商标注册证：</div>
+                <div class="upload_right">
+                  <div
+                    v-for="(item, index) in qualification.trademarkList"
+                    :key="index"
+                  >
+                    <a
+                      class="txt"
+                      v-if="getType(item)"
+                      :href="item.url"
+                      target="downloadFile"
+                      download
+                      >{{ item.name }}</a
+                    >
+                    <div class="pictrue" v-else>
+                      <el-image
+                        style="width: 60px; height: 60px"
+                        :src="item.url"
+                        :preview-src-list="[item.url]"
+                      />
+                    </div>
+                  </div>
+                </div>
+              </span>
+              <span class="upload">
+                <div class="upload_left">销售授权及品牌方营业执照：</div>
+                <div class="upload_right">
+                  <div
+                    v-for="(item, index) in qualification.authorizedList"
+                    :key="index"
+                  >
+                    <a
+                      class="txt"
+                      v-if="getType(item)"
+                      :href="item.url"
+                      target="downloadFile"
+                      download
+                      >{{ item.name }}</a
+                    >
+                    <div class="pictrue" v-else>
+                      <el-image
+                        style="width: 60px; height: 60px"
+                        :src="item.url"
+                        :preview-src-list="[item.url]"
+                      />
+                    </div>
+                  </div>
+                </div>
+              </span>
+              <span class="upload">
+                <div class="upload_left">商品检测报告及备案：</div>
+                <div class="upload_right">
+                  <div
+                    v-for="(item, index) in qualification.commodityList"
+                    :key="index"
+                  >
+                    <a
+                      class="txt"
+                      v-if="getType(item)"
+                      :href="item.url"
+                      target="downloadFile"
+                      download
+                      >{{ item.name }}</a
+                    >
+                    <div class="pictrue" v-else>
+                      <el-image
+                        style="width: 60px; height: 60px"
+                        :src="item.url"
+                        :preview-src-list="[item.url]"
+                      />
+                    </div>
+                  </div>
+                </div>
+              </span>
+              <span class="upload">
+                <div class="upload_left">助农文件及其他资质：</div>
+                <div class="upload_right">
+                  <div
+                    v-for="(item, index) in qualification.otherList"
+                    :key="index"
+                  >
+                    <a
+                      class="txt"
+                      v-if="getType(item)"
+                      :href="item.url"
+                      target="downloadFile"
+                      download
+                      >{{ item.name }}</a
+                    >
+                    <div class="pictrue" v-else>
+                      <el-image
+                        style="width: 60px; height: 60px"
+                        :src="item.url"
+                        :preview-src-list="[item.url]"
+                      />
+                    </div>
+                  </div>
+                </div>
+              </span>
             </div>
-          </div>
-        </span>
-        <span class="upload">
-          <div class="upload_left">生产许可证：</div>
-          <div class="upload_right">
-            <div
-              v-for="(item,index) in qualification.licenceList"
-              :key="index"
-            >
-              <a class="txt" v-if="getType(item)" :href="item.url" target="downloadFile" download>{{ item.name }}</a> 
-              <div class="pictrue" v-else>
-                <el-image
-                style="width: 60px; height: 60px;"
-                :src="item.url"
-                :preview-src-list="[item.url]"
-              />
-              </div>
+            <div v-if="qualification.commodity_type == 1">
+              <span class="sp"
+                >进口/企业境内总代企业名称:
+                {{ qualification.import_name }}</span
+              >
+              <span class="upload">
+                <div class="upload_left">生产营业执照：</div>
+                <div class="upload_right">
+                  <div
+                    v-for="(item, index) in qualification.importBusinessList"
+                    :key="index"
+                  >
+                    <a
+                      class="txt"
+                      v-if="getType(item)"
+                      :href="item.url"
+                      target="downloadFile"
+                      download
+                      >{{ item.name }}</a
+                    >
+                    <div class="pictrue" v-else>
+                      <el-image
+                        style="width: 60px; height: 60px"
+                        :src="item.url"
+                        :preview-src-list="[item.url]"
+                      />
+                    </div>
+                  </div>
+                </div>
+              </span>
+              <span class="upload">
+                <div class="upload_left">销售授权及其他：</div>
+                <div class="upload_right">
+                  <div
+                    v-for="(item, index) in qualification.importAuthorizedList"
+                    :key="index"
+                  >
+                    <a
+                      class="txt"
+                      v-if="getType(item)"
+                      :href="item.url"
+                      target="downloadFile"
+                      download
+                      >{{ item.name }}</a
+                    >
+                    <div class="pictrue" v-else>
+                      <el-image
+                        style="width: 60px; height: 60px"
+                        :src="item.url"
+                        :preview-src-list="[item.url]"
+                      />
+                    </div>
+                  </div>
+                </div>
+              </span>
+              <span class="upload">
+                <div class="upload_left">海关检验检疫证书及报关单：</div>
+                <div class="upload_right">
+                  <div
+                    v-for="(item, index) in qualification.customsList"
+                    :key="index"
+                  >
+                    <a
+                      class="txt"
+                      v-if="getType(item)"
+                      :href="item.url"
+                      target="downloadFile"
+                      download
+                      >{{ item.name }}</a
+                    >
+                    <div class="pictrue" v-else>
+                      <el-image
+                        style="width: 60px; height: 60px"
+                        :src="item.url"
+                        :preview-src-list="[item.url]"
+                      />
+                    </div>
+                  </div>
+                </div>
+              </span>
+              <span class="upload">
+                <div class="upload_left">产品外包装实物图：</div>
+                <div class="upload_right">
+                  <div
+                    v-for="(item, index) in qualification.packingList"
+                    :key="index"
+                  >
+                    <a
+                      class="txt"
+                      v-if="getType(item)"
+                      :href="item.url"
+                      target="downloadFile"
+                      download
+                      >{{ item.name }}</a
+                    >
+                    <div class="pictrue" v-else>
+                      <el-image
+                        style="width: 60px; height: 60px"
+                        :src="item.url"
+                        :preview-src-list="[item.url]"
+                      />
+                    </div>
+                  </div>
+                </div>
+              </span>
+              <span class="upload">
+                <div class="upload_left">其他资质：</div>
+                <div class="upload_right">
+                  <div
+                    v-for="(item, index) in qualification.importOtherList"
+                    :key="index"
+                  >
+                    <a
+                      class="txt"
+                      v-if="getType(item)"
+                      :href="item.url"
+                      target="downloadFile"
+                      download
+                      >{{ item.name }}</a
+                    >
+                    <div class="pictrue" v-else>
+                      <el-image
+                        style="width: 60px; height: 60px"
+                        :src="item.url"
+                        :preview-src-list="[item.url]"
+                      />
+                    </div>
+                  </div>
+                </div>
+              </span>
             </div>
-          </div>
-        </span>
-        <span class="upload">
-          <div class="upload_left">商标注册证：</div>
-          <div class="upload_right">
-            <div
-              v-for="(item,index) in qualification.trademarkList"
-              :key="index"
-            >
-              <a class="txt" v-if="getType(item)" :href="item.url" target="downloadFile" download>{{ item.name }}</a> 
-              <div class="pictrue" v-else>
-                <el-image
-                style="width: 60px; height: 60px;"
-                :src="item.url"
-                :preview-src-list="[item.url]"
-              />
-              </div>
-            </div>
-          </div>
-        </span>
-        <span class="upload">
-          <div class="upload_left">销售授权及品牌方营业执照：</div>
-          <div class="upload_right">
-            <div
-              v-for="(item,index) in qualification.authorizedList"
-              :key="index"
-            >
-              <a class="txt" v-if="getType(item)" :href="item.url" target="downloadFile" download>{{ item.name }}</a> 
-              <div class="pictrue" v-else>
-                <el-image
-                style="width: 60px; height: 60px;"
-                :src="item.url"
-                :preview-src-list="[item.url]"
-              />
-              </div>
-            </div>
-          </div>
-        </span>
-        <span class="upload">
-          <div class="upload_left">商品检测报告及备案：</div>
-          <div class="upload_right">
-            <div
-              v-for="(item,index) in qualification.commodityList"
-              :key="index"
-            >
-              <a class="txt" v-if="getType(item)" :href="item.url" target="downloadFile" download>{{ item.name }}</a> 
-              <div class="pictrue" v-else>
-                <el-image
-                style="width: 60px; height: 60px;"
-                :src="item.url"
-                :preview-src-list="[item.url]"
-              />
-              </div>
-            </div>
-          </div>
-        </span>
-        <span class="upload">
-          <div class="upload_left">助农文件及其他资质：</div>
-          <div class="upload_right">
-            <div
-              v-for="(item,index) in qualification.otherList"
-              :key="index"
-            >
-              <a class="txt" v-if="getType(item)" :href="item.url" target="downloadFile" download>{{ item.name }}</a> 
-              <div class="pictrue" v-else>
-                <el-image
-                style="width: 60px; height: 60px;"
-                :src="item.url"
-                :preview-src-list="[item.url]"
-              />
-              </div>
-            </div>
-          </div>
-        </span>
-      </div>
-      <div v-if="qualification.commodity_type == 1">
-        <span class="sp">进口/企业境内总代企业名称: {{ qualification.import_name }}</span>
-        <span class="upload">
-          <div class="upload_left">生产营业执照：</div>
-          <div class="upload_right">
-            <div
-              v-for="(item,index) in qualification.importBusinessList"
-              :key="index"
-            >
-              <a class="txt" v-if="getType(item)" :href="item.url" target="downloadFile" download>{{ item.name }}</a> 
-              <div class="pictrue" v-else>
-                <el-image
-                style="width: 60px; height: 60px;"
-                :src="item.url"
-                :preview-src-list="[item.url]"
-              />
-              </div>
-            </div>
-          </div>
-        </span>
-        <span class="upload">
-          <div class="upload_left">销售授权及其他：</div>
-          <div class="upload_right">
-            <div
-              v-for="(item,index) in qualification.importAuthorizedList"
-              :key="index"
-            >
-              <a class="txt" v-if="getType(item)" :href="item.url" target="downloadFile" download>{{ item.name }}</a> 
-              <div class="pictrue" v-else>
-                <el-image
-                style="width: 60px; height: 60px;"
-                :src="item.url"
-                :preview-src-list="[item.url]"
-              />
-              </div>
-            </div>
-          </div>
-        </span>
-        <span class="upload">
-          <div class="upload_left">海关检验检疫证书及报关单：</div>
-          <div class="upload_right">
-            <div
-              v-for="(item,index) in qualification.customsList"
-              :key="index"
-            >
-              <a class="txt" v-if="getType(item)" :href="item.url" target="downloadFile" download>{{ item.name }}</a> 
-              <div class="pictrue" v-else>
-                <el-image
-                style="width: 60px; height: 60px;"
-                :src="item.url"
-                :preview-src-list="[item.url]"
-              />
-              </div>
-            </div>
-          </div>
-        </span>
-        <span class="upload">
-          <div class="upload_left">产品外包装实物图：</div>
-          <div class="upload_right">
-            <div
-              v-for="(item,index) in qualification.packingList"
-              :key="index"
-            >
-              <a class="txt" v-if="getType(item)" :href="item.url" target="downloadFile" download>{{ item.name }}</a> 
-              <div class="pictrue" v-else>
-                <el-image
-                style="width: 60px; height: 60px;"
-                :src="item.url"
-                :preview-src-list="[item.url]"
-              />
-              </div>
-            </div>
-          </div>
-        </span>
-        <span class="upload">
-          <div class="upload_left">其他资质：</div>
-          <div class="upload_right">
-            <div
-              v-for="(item,index) in qualification.importOtherList"
-              :key="index"
-            >
-              <a class="txt" v-if="getType(item)" :href="item.url" target="downloadFile" download>{{ item.name }}</a> 
-              <div class="pictrue" v-else>
-                <el-image
-                style="width: 60px; height: 60px;"
-                :src="item.url"
-                :preview-src-list="[item.url]"
-              />
-              </div>
-            </div>
-          </div>
-        </span>
-      </div>
-    </el-tab-pane>
+          </el-tab-pane>
         </el-tabs>
       </div>
     </el-drawer>
   </div>
 </template>
 <script>
-
-import { productDetailApi, operateRecordList, associatedMerFormInfo } from '@/api/product';
-import { associatedFormInfo } from '@/api/marketing';
-import SettingMer from '@/libs/settingMer'
+import {
+  productDetailApi,
+  operateRecordList,
+  associatedMerFormInfo,
+} from "@/api/product";
+import { associatedFormInfo } from "@/api/marketing";
+import SettingMer from "@/libs/settingMer";
 const defaultObj = {
-  image: '',
+  image: "",
   slider_image: [],
-  store_name: '',
-  store_info: '',
-  keyword: '',
-  brand_id: '', // 品牌id
-  cate_id: '', // 平台分类id
+  store_name: "",
+  store_info: "",
+  keyword: "",
+  brand_id: "", // 品牌id
+  cate_id: "", // 平台分类id
   mer_cate_id: [], // 商户分类id
-  unit_name: '',
+  unit_name: "",
   sort: 0,
   is_show: 0,
   is_benefit: 0,
   is_new: 0,
   is_good: 0,
-  temp_id: '',
+  temp_id: "",
   params: [],
-  attrValue: [{
-    image: '',
-    price: null,
-    svip_price: null,
-    cost: null,
-    ot_price: null,
-    proportion:0.6,
-    stock: 0,
-    growth:0,
-    bar_code: '',
-    weight: null,
-    volume: null
-  }],
+  attrValue: [
+    {
+      image: "",
+      price: null,
+      svip_price: null,
+      cost: null,
+      
+      ot_price: null,
+      proportion: 0.6,
+      stock: 0,
+      growth: 0,
+      bar_code: "",
+      gist_url:null,
+      weight: null,
+      volume: null,
+    },
+  ],
   attr: [],
-  selectRule: '',
+  selectRule: "",
   extension_type: 0,
-  content: '',
-  spec_type: 0
-}
+  content: "",
+  spec_type: 0,
+};
 const objTitle = {
   price: {
-    title: '售价'
+    title: "售价",
   },
   svip_price: {
-    title: '付费会员价'
+    title: "付费会员价",
   },
   cost: {
-    title: '成本价'
+    title: "成本价",
   },
   ot_price: {
-    title: '市场价'
+    title: "市场价",
   },
   proportion: {
-    title: '占比'
+    title: "占比",
   },
   stock: {
-    title: '库存'
+    title: "库存",
   },
   growth: {
-    title: '成长值'
+    title: "成长值",
   },
   bar_code: {
-    title: '商品编号'
+    title: "商品编号",
   },
   weight: {
-    title: '重量（KG）'
+    title: "重量（KG）",
+  },
+  gist_url:{
+    title: "依据链接",
   },
   volume: {
-    title: '体积(m³)'
-  }
-}
+    title: "体积(m³)",
+  },
+};
 export default {
   components: {},
   props: {
@@ -833,26 +1248,26 @@ export default {
   data() {
     return {
       loading: true,
-      productId: '',
-      qualification:{
-          production_name: '',
-          businessList: [],
-          licenceList: [],
-          trademarkList: [],
-          authorizedList: [],
-          commodityList: [],
-          otherList: [],
-          importBusinessList: [],
-          importAuthorizedList: [],
-          customsList: [],
-          packingList: [],
-          importOtherList: [],
-          commodity_type: 0,
-          brands_name: '',
-          import_name: ''
+      productId: "",
+      qualification: {
+        production_name: "",
+        businessList: [],
+        licenceList: [],
+        trademarkList: [],
+        authorizedList: [],
+        commodityList: [],
+        otherList: [],
+        importBusinessList: [],
+        importAuthorizedList: [],
+        customsList: [],
+        packingList: [],
+        importOtherList: [],
+        commodity_type: 0,
+        brands_name: "",
+        import_name: "",
       },
-      direction: 'rtl',
-      activeName: 'basic',
+      direction: "rtl",
+      activeName: "basic",
       productData: {},
       formThead: Object.assign({}, objTitle),
       manyTabDate: {},
@@ -861,147 +1276,159 @@ export default {
       ManyAttrValue: [Object.assign({}, defaultObj.attrValue[0])], // 多规格
       svip_type: 0,
       mer_svip_status: 0,
-      orderImg: require('@/assets/images/product_icon.png'),
+      orderImg: require("@/assets/images/product_icon.png"),
       merParams: [],
       sysParams: [],
       formUrl: "",
-      baseURL: SettingMer.httpUrl || 'http://localhost:8080',
+      baseURL: SettingMer.httpUrl || "http://localhost:8080",
       // baseURL: 'http://localhost:8080',
       formData: [],
       timeVal: [],
       recordData: {
         data: [],
-        total: 0
-      },//商品操作记录
+        total: 0,
+      }, //商品操作记录
       recordForm: {
-        type: '',
+        type: "",
         date: "",
         page: 1,
-        limit: 10
+        limit: 10,
       },
-      colors: ['#99A9BF', '#F7BA2A', '#FF9900'],
+      colors: ["#99A9BF", "#F7BA2A", "#FF9900"],
     };
   },
   computed: {
     attrValue() {
-      const obj = Object.assign({}, defaultObj.attrValue[0])
-      if(this.svip_type == 0 || this.mer_svip_status == 0)delete obj.svip_price
-      delete obj.image
-      return obj
+      const obj = Object.assign({}, defaultObj.attrValue[0]);
+      if (this.svip_type == 0 || this.mer_svip_status == 0)
+        delete obj.svip_price;
+      delete obj.image;
+      return obj;
     },
   },
-  filters: {
-  },
+  filters: {},
   methods: {
-    getType(val){
-        var regex = /(?:\.([^.]+))?$/;
-        let suffix = regex.exec(val.url)[1]
-        return suffix == 'pdf'
-      },
+    // pdf类型判断
+    getType(val) {
+      var regex = /(?:\.([^.]+))?$/;
+      let suffix = regex.exec(val.url)[1];
+      return suffix == "pdf";
+    },
+    isValidURL(url) {
+      // (http|https):\/\/([\w.]+\/?)\S*
+      var pattern = /^(http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?$/;
+      if(!pattern.test(url)){
+        return `https://${url}`
+      }
+      return url
+      // return pattern.test(url);
+    },
     handleClose() {
-      this.activeName = 'basic';
-      this.$emit('closeDrawer');
+      this.activeName = "basic";
+      this.$emit("closeDrawer");
     },
     getInfo(id) {
       this.loading = true;
       this.productId = id;
-      productDetailApi(id).then(res => {
-        this.loading = false;
-        this.productData = res.data
-        let qualification={
-          production_name: '',
-          businessList: [],
-          licenceList: [],
-          trademarkList: [],
-          authorizedList: [],
-          commodityList: [],
-          otherList: [],
-          importBusinessList: [],
-          importAuthorizedList: [],
-          customsList: [],
-          packingList: [],
-          importOtherList: [],
-          commodity_type: 0,
-          brands_name: '',
-          import_name: ''
-      }
-        this.qualification = res.data.qualification || qualification
-        this.mer_svip_status = res.data.mer_svip_status
-        this.svip_type = res.data.svip_price_type
-        if (this.productData.spec_type === 0) {
-          this.OneattrValue = res.data.attrValue
-        } else {
-          this.ManyAttrValue = res.data.attrValue
-        }
-        const tmp = {}
-        const tmpTab = {}
-        this.productData.attr.forEach((o, i) => {
-          tmp['value' + i] = { title: o.value }
-          tmpTab['value' + i] = ''
-        })
-        this.manyTabDate = tmpTab
-        this.manyTabTit = tmp
-        this.checkboxGroup = []
-        this.formThead = Object.assign({}, this.formThead, tmp)
-        this.sysParams = []
-        this.merParams = []
-        if(res.data.params&&res.data.params.length>0){
-          for(var i=0;i<res.data.params.length;i++){
-            if(res.data.params[i]['mer_id'] == 0){
-              this.sysParams.push(res.data.params[i])
-            }else{
-              this.merParams.push(res.data.params[i])
+      productDetailApi(id)
+        .then((res) => {
+          this.loading = false;
+          this.productData = res.data;
+          let qualification = {
+            production_name: "",
+            businessList: [],
+            licenceList: [],
+            trademarkList: [],
+            authorizedList: [],
+            commodityList: [],
+            otherList: [],
+            importBusinessList: [],
+            importAuthorizedList: [],
+            customsList: [],
+            packingList: [],
+            importOtherList: [],
+            commodity_type: 0,
+            brands_name: "",
+            import_name: "",
+          };
+          this.qualification = res.data.qualification || qualification;
+          this.mer_svip_status = res.data.mer_svip_status;
+          this.svip_type = res.data.svip_price_type;
+          if (this.productData.spec_type === 0) {
+            this.OneattrValue = res.data.attrValue;
+          } else {
+            this.ManyAttrValue = res.data.attrValue;
+          }
+          const tmp = {};
+          const tmpTab = {};
+          this.productData.attr.forEach((o, i) => {
+            tmp["value" + i] = { title: o.value };
+            tmpTab["value" + i] = "";
+          });
+          this.manyTabDate = tmpTab;
+          this.manyTabTit = tmp;
+          this.checkboxGroup = [];
+          this.formThead = Object.assign({}, this.formThead, tmp);
+          this.sysParams = [];
+          this.merParams = [];
+          if (res.data.params && res.data.params.length > 0) {
+            for (var i = 0; i < res.data.params.length; i++) {
+              if (res.data.params[i]["mer_id"] == 0) {
+                this.sysParams.push(res.data.params[i]);
+              } else {
+                this.merParams.push(res.data.params[i]);
+              }
             }
           }
-        }
-        if(res.data.mer_form_id)this.getFormInfo(res.data.mer_form_id,res.data.mer_id)
-        this.getRecordData(id)
-        this.loading = false
-      }).catch(res => {
-        this.$message.error(res.message)
-        this.loading = false
-      })
+          if (res.data.mer_form_id)
+            this.getFormInfo(res.data.mer_form_id, res.data.mer_id);
+          this.getRecordData(id);
+          this.loading = false;
+        })
+        .catch((res) => {
+          this.$message.error(res.message);
+          this.loading = false;
+        });
     },
     // 关联的表单信息
-    getFormInfo(id,merId){
-      associatedFormInfo(id,{mer_id:merId}).then((res) => {
-        this.formData = res.data
-        let time = new Date().getTime() * 1000
-        let formUrl = `${this.baseURL}/pages/admin/system_form/index?inner_frame=1&form_id=${id}&time=${time}`;
-        this.formUrl = formUrl;
-      })
-      .catch((res) => {
-        this.$message.error(res.message)
-      })
+    getFormInfo(id, merId) {
+      associatedFormInfo(id, { mer_id: merId })
+        .then((res) => {
+          this.formData = res.data;
+          let time = new Date().getTime() * 1000;
+          let formUrl = `${this.baseURL}/pages/admin/system_form/index?inner_frame=1&form_id=${id}&time=${time}`;
+          this.formUrl = formUrl;
+        })
+        .catch((res) => {
+          this.$message.error(res.message);
+        });
     },
     // 具体日期
     onchangeTime(e) {
-      this.timeVal = e
-      this.recordForm.date = e ? this.timeVal.join('-') : ''
-      this.getRecordData(this.productData.product_id)
+      this.timeVal = e;
+      this.recordForm.date = e ? this.timeVal.join("-") : "";
+      this.getRecordData(this.productData.product_id);
     },
     // 商品操作记录
-    getRecordData(id){
-      operateRecordList(id,this.recordForm)
-        .then(res => {
-          this.recordData.data = res.data.list
-          this.recordData.total = res.data.count
-        })
-        .catch(res => {
-          this.$message.error(res.message)
+    getRecordData(id) {
+      operateRecordList(id, this.recordForm)
+        .then((res) => {
+          this.recordData.data = res.data.list;
+          this.recordData.total = res.data.count;
         })
+        .catch((res) => {
+          this.$message.error(res.message);
+        });
     },
     pageChange(page) {
-      this.recordForm.page = page
-      this.getList('')
+      this.recordForm.page = page;
+      this.getList("");
     },
     handleSizeChange(val) {
-      this.recordForm.limit = val
-      this.getList('')
-    },
-    tabClick(tab) {
-   
+      this.recordForm.limit = val;
+      this.getList("");
     },
+    tabClick(tab) {},
   },
 };
 </script>
@@ -1053,7 +1480,7 @@ export default {
       width: 20%;
       font-size: 14px;
       line-height: 14px;
-      color: rgba(0, 0, 0, 0.85);      
+      color: rgba(0, 0, 0, 0.85);
       .title {
         margin-bottom: 12px;
         font-size: 13px;
@@ -1064,43 +1491,43 @@ export default {
   }
 }
 .sp {
-    display: block;
-    // width: 33%;
-    margin-bottom: 20px;
-  }
-.upload{
+  display: block;
+  // width: 33%;
+  margin-bottom: 20px;
+}
+.upload {
+  display: flex;
+  flex-direction: row;
+  // align-content: center;
+  align-items: center;
+  height: 60px;
+  // line-height: 60px;
+  margin-bottom: 20px;
+  &_right {
     display: flex;
-    flex-direction: row;
-    // align-content: center;
-    align-items: center;
     height: 60px;
-    // line-height: 60px;
-    margin-bottom: 20px;
-    &_right{
-      display: flex;
-      height: 60px;
-    }
-    &_left{
-      width: 115px;
-    }
-    .txt{
-      width: 60px;
-      height: 60px;
-      line-height: 60px;
-      overflow: hidden;
-      display: inline-block;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-      border: 1px solid #DCDFE6;
-      border-radius: 4px;
-      margin-right: 10px;
-      color: blue;
-    }
   }
-.tabNumWidth{
+  &_left {
+    width: 115px;
+  }
+  .txt {
+    width: 60px;
+    height: 60px;
+    line-height: 60px;
+    overflow: hidden;
+    display: inline-block;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    border: 1px solid #dcdfe6;
+    border-radius: 4px;
+    margin-right: 10px;
+    color: blue;
+  }
+}
+.tabNumWidth {
   max-height: 350px;
   overflow-y: auto;
-  &:before{
+  &:before {
     display: none;
   }
 }
@@ -1122,6 +1549,15 @@ export default {
     padding: 0;
     margin: 0;
   }
+  .audit {
+    margin-top: 16px;
+    font-size: 13px;
+    color: #606266;
+    .item-title {
+      width: 100px;
+      text-align: right;
+    }
+  }
   .item {
     flex: 0 0 calc(100% / 3);
     display: flex;
@@ -1139,42 +1575,42 @@ export default {
     &:nth-child(3n + 3) {
       padding-left: 20px;
     }
-    .item-title{
+    .item-title {
       width: 100px;
       text-align: right;
     }
   }
-  .item100{
+  .item100 {
     padding-left: 0;
     flex: 0 0 calc(100% / 1);
-    padding-left: 0!important;
+    padding-left: 0 !important;
   }
-  .contentPic{
+  .contentPic {
     width: 500px;
     margin: 0 auto;
     max-height: 600px;
     overflow-y: auto;
   }
- 
+
   .value {
     .value-item {
-      &::after{
+      &::after {
         content: "/";
         display: inline-block;
       }
-      &:last-child{
-        &::after{
+      &:last-child {
+        &::after {
           display: none;
         }
       }
     }
-    .value-temp{
-       &::after{
+    .value-temp {
+      &::after {
         content: "、";
         display: inline-block;
       }
-      &:last-child{
-        &::after{
+      &:last-child {
+        &::after {
           display: none;
         }
       }
@@ -1188,7 +1624,7 @@ export default {
     }
   }
 }
-.contentPic ::v-deep img{
+.contentPic ::v-deep img {
   max-width: 100%;
 }
 .tab {
@@ -1203,8 +1639,7 @@ export default {
 ::v-deep .el-drawer__body {
   overflow: auto;
 }
-::v-deep .ones th{
-  background: #F0F5FF;
+::v-deep .ones th {
+  background: #f0f5ff;
 }
-
 </style>
diff --git a/src/views/user/list/index.vue b/src/views/user/list/index.vue
index c0c2964..2f49773 100644
--- a/src/views/user/list/index.vue
+++ b/src/views/user/list/index.vue
@@ -250,7 +250,7 @@
                 <span>{{ row.user_type === 'routine' ? '小程序' : row.user_type === 'wechat' ? '公众号' : row.user_type === 'app' || row.user_type === 'App' ? 'App' : row.user_type === 'pc' ? 'PC' : 'H5' }}</span>
                 </template>
             </el-table-column>
-            <el-table-column prop="now_money" label="消费卷" sortable min-width="100" :sort-method="(a,b)=>{return a.now_money - b.now_money}"/>
+            <el-table-column prop="now_money" label="余额" sortable min-width="100" :sort-method="(a,b)=>{return a.now_money - b.now_money}"/>
             <el-table-column prop="integral" label="铸源星" min-width="100" />
             <el-table-column label="操作" min-width="150" fixed="right">
                 <template slot-scope="scope">
@@ -264,7 +264,7 @@
                         <el-dropdown-menu slot="dropdown">
                             <!-- <el-dropdown-item @click.native="onEdit(scope.row.uid)">编辑信息</el-dropdown-item>                             -->
                             <el-dropdown-item v-if="!scope.row.cancel_time" @click.native="setMoney(scope.row)">设置余额</el-dropdown-item>
-                            <el-dropdown-item v-if="!scope.row.cancel_time" @click.native="changeIntegral(scope.row)">设置积分</el-dropdown-item>
+                            <el-dropdown-item v-if="!scope.row.cancel_time" @click.native="changeIntegral(scope.row)">设置铸源星</el-dropdown-item>
                             <el-dropdown-item v-if="scope.row.vip_name && !scope.row.cancel_time">清除等级</el-dropdown-item>
                             <el-dropdown-item v-if="!scope.row.cancel_time" @click.native="setGroup(scope.row)">设置分组</el-dropdown-item>
                             <el-dropdown-item v-if="!scope.row.cancel_time" @click.native="setLabel(scope.row)">设置标签</el-dropdown-item>
diff --git a/src/views/user/list/userDetails.vue b/src/views/user/list/userDetails.vue
index 09c5720..197dcee 100644
--- a/src/views/user/list/userDetails.vue
+++ b/src/views/user/list/userDetails.vue
@@ -46,7 +46,7 @@
             <el-dropdown @command="handleCommand" class="ml10">
               <el-button icon="el-icon-more" size="small"></el-button>
               <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item command="integral">设置积分</el-dropdown-item>
+                <el-dropdown-item command="integral">设置铸源星</el-dropdown-item>
                 <el-dropdown-item command="balance">设置余额</el-dropdown-item>
                 <el-dropdown-item command="group">设置分组</el-dropdown-item> 
                 <el-dropdown-item command="label">设置标签</el-dropdown-item> 
@@ -75,7 +75,7 @@
               <div>{{psInfo.pay_price}}元</div>
             </li>
             <li class="item">
-              <div class="title">积分</div>
+              <div class="title">铸源星余额</div>
               <div>{{psInfo.integral}}</div>
             </li>
             <li class="item">
@@ -451,7 +451,7 @@
               </div>
             </template>
           </el-tab-pane>
-          <el-tab-pane label="积分明细" name="detailed">
+          <el-tab-pane label="铸源星明细" name="detailed">
             <template v-if="activeName == 'detailed'">
               <el-table :data="tableData.data" size="small">
                 <el-table-column