diff --git a/src/api/goods/index.js b/src/api/goods/index.js
index e6ad5e3..2e26104 100644
--- a/src/api/goods/index.js
+++ b/src/api/goods/index.js
@@ -17,7 +17,50 @@ const api = {
   pool: '/goods/pool',
   collector:'/goods/collector'
 }
-
+/**
+ * 大牌
+ * @param {*} data
+ */
+export function setBrand (data) {
+  return axios({
+    url: '/goods/setBrand',
+    method: 'post',
+    data: data
+  })
+}
+/**
+ * 新品
+ * @param {*} data
+ */
+export function setNew (data) {
+  return axios({
+    url: '/goods/setNew',
+    method: 'post',
+    data: data
+  })
+}
+/**
+ * 是否店内
+ * @param {*} data
+ */
+export function setInstore (data) {
+  return axios({
+    url: '/goods/setInstore',
+    method: 'post',
+    data: data
+  })
+}
+/**
+ * 是否店内
+ * @param {*} data
+ */
+export function setRank (data) {
+  return axios({
+    url: '/goods/setRank',
+    method: 'post',
+    data: data
+  })
+}
 export function getCollector (params) {
   return axios({
     url: api.collector,
diff --git a/src/views/goods/Index.vue b/src/views/goods/Index.vue
index 616374f..ded10d9 100644
--- a/src/views/goods/Index.vue
+++ b/src/views/goods/Index.vue
@@ -1,168 +1,147 @@
 <template>
-  <a-card :bordered="false">
-    <div class="card-title">{{ $route.meta.title }}</div>
-    <div class="table-operator">
-      <!-- 搜索板块 -->
-      <a-row class="row-item-search">
-        <a-form class="search-form" :form="searchForm" layout="inline" @submit="handleSearch">
-          <a-form-item label="商品名称">
-            <a-input v-decorator="['goodsName']" class="goodsWidth" placeholder="请输入商品名称" />
-          </a-form-item>
-          <a-form-item label="商品编码">
-            <a-input v-decorator="['goodsNo']" class="goodsWidth" placeholder="请输入商品编码" />
-          </a-form-item>
-          <a-form-item label="商品分类">
-            <a-tree-select
-              class="goodsWidth"
-              :treeData="categoryListTree"
-              :dropdownStyle="{ maxHeight: '500px', overflow: 'auto' }"
-              allowClear
-              v-decorator="['categoryId', { initialValue: 0 }]"
-            ></a-tree-select>
-          </a-form-item>
-          <a-form-item label="规格类型">
-            <a-select @change="onchangeSpecs" placeholder="请选择">
-              <a-select-option :value="item.val" v-for="item in specsType" :key="item.val">
-                {{ item.name }}
-              </a-select-option>
-            </a-select>
-          </a-form-item>
-          <a-form-item label="渠道">
-            <a-select @change="getChannel" placeholder="请选择">
-              <a-select-option :value="item.id" v-for="item in checkList" :key="item.id">
-                {{ item.name }}
-              </a-select-option>
-            </a-select>
-          </a-form-item>
-          <a-form-item label="商户">
-            <a-select @change="changeMerchant" placeholder="请选择">
-              <a-select-option :value="item.merchant_id" v-for="item in merchantList" :key="item.merchant_id">
-                {{ item.name }}
-              </a-select-option>
-            </a-select>
-          </a-form-item>
-          <a-form-item label="商品价格">
-            <div style="display: flex" class="goodsType">
-              <a-input v-decorator="['goods_price_min']" placeholder="请输入" /><span style="padding: 0 3px 0 5px">-</span>
-              <a-input style="margin-left: 5px" v-decorator="['goods_price_max']" placeholder="请输入" />
-            </div>
-          </a-form-item>
-          <a-form-item label="利润率">
-            <div style="display: flex" class="goodsType">
-              <a-input v-decorator="['profit_rate_min']" placeholder="请输入" /><span style="padding: 0 3px 0 5px">-</span>
-              <a-input style="margin-left: 5px" v-decorator="['profit_rate_max']" placeholder="请输入" />
-            </div>
-          </a-form-item>
-          <a-form-item label="比同款下架">
-            <a-select @change="getGoodsJingDong" style="width: 120px" placeholder="请选择">
-              <a-select-option :value="item.val" v-for="item in isYesNo" :key="item.val">
-                {{ item.name }}
-              </a-select-option>
-            </a-select>
-          </a-form-item>
-          <a-form-item class="search-btn">
-            <a-button type="primary" icon="search" html-type="submit">搜索</a-button>
-          </a-form-item>
-        </a-form>
-      </a-row>
-      <!-- 操作板块 -->
-      <div class="row-item-tab clearfix">
-        <div class="tab-list fl-l">
-          <a-radio-group :defaultValue="queryParam.listType" @change="handleTabs">
-            <a-radio-button value="all">全部</a-radio-button>
-            <a-radio-button value="on_sale">出售中</a-radio-button>
-            <a-radio-button value="off_sale">已下架</a-radio-button>
-            <a-radio-button value="sold_out">已售罄</a-radio-button>
-            <a-radio-button value="in_pool">已入池</a-radio-button>
-            <a-radio-button value="out_pool">未入池</a-radio-button>
-          </a-radio-group>
-        </div>
-        <a-button v-if="$auth('/goods/create') && (storeVersion === 0 || (storeVersion === 1 && isSuper === 0))" class="fl-l" type="primary" icon="plus" @click="handleCreate()">创建商品</a-button>
-        <a-button
-          v-if="$module('goods-import') && $auth('/goods/import/batch') && (storeVersion === 0 || (storeVersion === 1 && isSuper === 0))"
-          class="fl-l"
-          icon="arrow-up"
-          @click="handleImport()"
-        >批量导入</a-button>
-        <a-button style="background-color: #501212; color: #fff; border: none" @click="handleExport(selectedRowKeys)">导出</a-button>
-        <a-button v-if="storeVersion === 0 || (storeVersion === 1 && isSuper === 0)" class="fl-l" style="background-color: #f0baae; border: none" type="primary" @click="handleModify()">批量修改</a-button>
-        <div v-if="selectedRowKeys.length" class="button-group">
-          <a-button-group class="ml-10">
-            <a-button v-action:status icon="arrow-up" @click="handleUpdateStatus(selectedRowKeys, true)">上架</a-button>
-            <a-button v-action:status icon="arrow-down" @click="handleUpdateStatus(selectedRowKeys, false)">下架</a-button>
-            <a-button v-if="isSuper === 1" v-action:pool icon="arrow-up" @click="handleUpdatePool(selectedRowKeys, true)">入池</a-button>
-            <a-button v-if="isSuper === 1" v-action:pool icon="arrow-down" @click="handleUpdatePool(selectedRowKeys, false)">出池</a-button>
-            <a-button v-if="storeVersion === 0 || (storeVersion === 1 && isSuper === 0)" v-action:delete icon="delete" @click="handleDelete(selectedRowKeys)">删除</a-button>
-          </a-button-group>
-        </div>
-      </div>
-    </div>
-    <s-table
-      ref="table"
-      rowKey="goods_id"
-      :loading="isLoading"
-      :columns="columns"
-      :data="loadData"
-      :rowSelection="rowSelection"
-      :pagination="pagination"
-      :scroll="{ x: 1450 }"
-    >
-      <!-- 商品图片 -->
-      <span slot="goods_image" slot-scope="text">
-        <a title="点击查看原图" :href="text" target="_blank">
-          <img width="50" height="50" :src="text" alt="商品图片" />
-        </a>
-      </span>
-      <!-- 商品名称 -->
-      <span slot="goods_name" slot-scope="text, item">
-        <a v-if="item.link" :href="item.link" style="white-space: pre-wrap; color: #1890ff" target="_blank">{{
+	<a-card :bordered="false">
+		<div class="card-title">{{ $route.meta.title }}</div>
+		<div class="table-operator">
+			<!-- 搜索板块 -->
+			<a-row class="row-item-search">
+				<a-form class="search-form" :form="searchForm" layout="inline" @submit="handleSearch">
+					<a-form-item label="商品名称">
+						<a-input v-decorator="['goodsName']" class="goodsWidth" placeholder="请输入商品名称" />
+					</a-form-item>
+					<a-form-item label="商品编码">
+						<a-input v-decorator="['goodsNo']" class="goodsWidth" placeholder="请输入商品编码" />
+					</a-form-item>
+					<a-form-item label="商品分类">
+						<a-tree-select class="goodsWidth" :treeData="categoryListTree" :dropdownStyle="{ maxHeight: '500px', overflow: 'auto' }" allowClear v-decorator="['categoryId', { initialValue: 0 }]"></a-tree-select>
+					</a-form-item>
+					<a-form-item label="规格类型">
+						<a-select @change="onchangeSpecs" placeholder="请选择">
+							<a-select-option :value="item.val" v-for="item in specsType" :key="item.val">
+								{{ item.name }}
+							</a-select-option>
+						</a-select>
+					</a-form-item>
+					<a-form-item label="渠道">
+						<a-select @change="getChannel" placeholder="请选择">
+							<a-select-option :value="item.id" v-for="item in checkList" :key="item.id">
+								{{ item.name }}
+							</a-select-option>
+						</a-select>
+					</a-form-item>
+					<a-form-item label="商户">
+						<a-select @change="changeMerchant" placeholder="请选择">
+							<a-select-option :value="item.merchant_id" v-for="item in merchantList" :key="item.merchant_id">
+								{{ item.name }}
+							</a-select-option>
+						</a-select>
+					</a-form-item>
+					<a-form-item label="商品价格">
+						<div style="display: flex" class="goodsType">
+							<a-input v-decorator="['goods_price_min']" placeholder="请输入" /><span style="padding: 0 3px 0 5px">-</span>
+							<a-input style="margin-left: 5px" v-decorator="['goods_price_max']" placeholder="请输入" />
+						</div>
+					</a-form-item>
+					<a-form-item label="利润率">
+						<div style="display: flex" class="goodsType">
+							<a-input v-decorator="['profit_rate_min']" placeholder="请输入" /><span style="padding: 0 3px 0 5px">-</span>
+							<a-input style="margin-left: 5px" v-decorator="['profit_rate_max']" placeholder="请输入" />
+						</div>
+					</a-form-item>
+					<a-form-item label="比同款下架">
+						<a-select @change="getGoodsJingDong" style="width: 120px" placeholder="请选择">
+							<a-select-option :value="item.val" v-for="item in isYesNo" :key="item.val">
+								{{ item.name }}
+							</a-select-option>
+						</a-select>
+					</a-form-item>
+					<a-form-item class="search-btn">
+						<a-button type="primary" icon="search" html-type="submit">搜索</a-button>
+					</a-form-item>
+				</a-form>
+			</a-row>
+			<a-modal v-model:visible="batchVisible" width="300px" :title="setupIndex==1?'设置是否大牌正品':setupIndex==2?'设置是否新品首发':setupIndex==3?'设置是否店内':'设置所属分类排行'" @ok="handleUpdateSetup(selectedRowKeys,setupIndex!=4?setupValue:paihang,setupIndex)">
+				<a-select v-if="setupIndex!=4" v-model="setupValue" style="width: 250px;margin:10px 0" placeholder="请选择">
+					<a-select-option :value="item.val" v-for="item in isYesNo" :key="item.val">
+						{{ item.name }}
+					</a-select-option>
+				</a-select>
+				<a-input v-model="paihang" v-else placeholder="请输入所属分类排行值" style="width: 250px;margin:10px 0" />
+			</a-modal>
+			<!-- 操作板块 -->
+			<div class="row-item-tab clearfix">
+				<div class="tab-list fl-l">
+					<a-radio-group :defaultValue="queryParam.listType" @change="handleTabs">
+						<a-radio-button value="all">全部</a-radio-button>
+						<a-radio-button value="on_sale">出售中</a-radio-button>
+						<a-radio-button value="off_sale">已下架</a-radio-button>
+						<a-radio-button value="sold_out">已售罄</a-radio-button>
+						<a-radio-button value="in_pool">已入池</a-radio-button>
+						<a-radio-button value="out_pool">未入池</a-radio-button>
+					</a-radio-group>
+				</div>
+				<a-button v-if="$auth('/goods/create') && (storeVersion === 0 || (storeVersion === 1 && isSuper === 0))" class="fl-l" type="primary" icon="plus" @click="handleCreate()">创建商品</a-button>
+				<a-button v-if="$module('goods-import') && $auth('/goods/import/batch') && (storeVersion === 0 || (storeVersion === 1 && isSuper === 0))" class="fl-l" icon="arrow-up" @click="handleImport()">批量导入</a-button>
+				<a-button style="background-color: #501212; color: #fff; border: none" @click="handleExport(selectedRowKeys)">导出</a-button>
+				<a-button v-if="storeVersion === 0 || (storeVersion === 1 && isSuper === 0)" class="fl-l" style="background-color: #f0baae; border: none" type="primary" @click="handleModify()">批量修改</a-button>
+        <!-- <a-button style="background-color: #9E7AFF; color: #fff; border: none" v-if="selectedRowKeys.length" @click="handleSetup(1)">设置大牌</a-button>
+				<a-button style="background-color: #FB322A; color: #fff; border: none" v-if="selectedRowKeys.length" @click="handleSetup(2)">设置新品</a-button>
+				<a-button style="background-color: #1184D2; color: #fff; border: none" v-if="selectedRowKeys.length" @click="handleSetup(3)">设置店内</a-button>
+				<a-button style="background-color: #EEA507; color: #fff; border: none" v-if="selectedRowKeys.length" @click="handleSetup(4)">设置排行榜</a-button> -->
+        <div v-if="selectedRowKeys.length" class="button-group" style="margin-top:15px">
+					<a-button-group class="ml-10">
+						<a-button v-action:status icon="arrow-up" @click="handleUpdateStatus(selectedRowKeys, true)">上架</a-button>
+						<a-button v-action:status icon="arrow-down" @click="handleUpdateStatus(selectedRowKeys, false)">下架</a-button>
+						<a-button v-if="isSuper === 1" v-action:pool icon="arrow-up" @click="handleUpdatePool(selectedRowKeys, true)">入池</a-button>
+						<a-button v-if="isSuper === 1" v-action:pool icon="arrow-down" @click="handleUpdatePool(selectedRowKeys, false)">出池</a-button>
+						<a-button v-if="storeVersion === 0 || (storeVersion === 1 && isSuper === 0)" v-action:delete icon="delete" @click="handleDelete(selectedRowKeys)">删除</a-button>
+					</a-button-group>
+				</div>
+			</div>
+		</div>
+		<s-table ref="table" rowKey="goods_id" :loading="isLoading" :columns="columns" :data="loadData" :rowSelection="rowSelection" :pagination="pagination" :scroll="{ x: 1450 }">
+			<!-- 商品图片 -->
+			<span slot="goods_image" slot-scope="text">
+				<a title="点击查看原图" :href="text" target="_blank">
+					<img width="50" height="50" :src="text" alt="商品图片" />
+				</a>
+			</span>
+			<!-- 商品名称 -->
+			<span slot="goods_name" slot-scope="text, item">
+				<a v-if="item.link" :href="item.link" style="white-space: pre-wrap; color: #1890ff" target="_blank">{{
           text
         }}</a>
-        <p style="white-space: pre-wrap" v-else>{{ text }}</p>
-      </span>
-      <!-- 商品状态 -->
-      <span slot="status" slot-scope="text, item">
-        <a-tag
-          class="cur-p"
-          :color="text == 10 ? 'green' : 'red'"
-          @click="handleUpdateStatus([item.goods_id], text != 10)"
-        >{{ text == 10 ? '上架' : '下架' }}</a-tag>
-      </span>
-        <!-- 京东下架 -->
-        <span slot="is_jd_remove" slot-scope="text">
-        <p
-          style="width: 40px;text-align: center;"
-          :style="{ color: text == 1 ? 'red' : 'green'}"
-        >
-          {{ text == 1 ? '是' : '否' }}
-        </p>
-      </span>
-      <!-- 商品池 -->
-      <span slot="is_pool" slot-scope="text">
-        <p
-          style="width: 40px"
-          :style="{ color: text == 0 ? 'red' : text == 1 ? 'green' : 'gray' }"
-        >
-          {{ text == 0 ? '待处理' : text == 1 ? '已入池' : '未入池' }}
-        </p>
-      </span>
-      <!-- 操作项 -->
-      <div class="actions" slot="action" slot-scope="text, item">
-        <!-- <router-link
+				<p style="white-space: pre-wrap" v-else>{{ text }}</p>
+			</span>
+			<!-- 商品状态 -->
+			<span slot="status" slot-scope="text, item">
+				<a-tag class="cur-p" :color="text == 10 ? 'green' : 'red'" @click="handleUpdateStatus([item.goods_id], text != 10)">{{ text == 10 ? '上架' : '下架' }}</a-tag>
+			</span>
+			<!-- 京东下架 -->
+			<span slot="is_jd_remove" slot-scope="text">
+				<p style="width: 40px;text-align: center;" :style="{ color: text == 1 ? 'red' : 'green'}">
+					{{ text == 1 ? '是' : '否' }}
+				</p>
+			</span>
+			<!-- 商品池 -->
+			<span slot="is_pool" slot-scope="text">
+				<p style="width: 40px" :style="{ color: text == 0 ? 'red' : text == 1 ? 'green' : 'gray' }">
+					{{ text == 0 ? '待处理' : text == 1 ? '已入池' : '未入池' }}
+				</p>
+			</span>
+			<!-- 操作项 -->
+			<div class="actions" slot="action" slot-scope="text, item">
+				<!-- <router-link
           v-if="$auth('/goods/update')"
           :to="{ path: '/goods/update', query: { goodsId: item.goods_id } }"
         >编辑</router-link
         > -->
-        <a @click="handleEdit(item.goods_id)">编辑</a>
-        <router-link
-          v-if="$module('goods-copy') && $auth('/goods/copy') && (storeVersion === 0 || (storeVersion === 1 && isSuper === 0))"
-          :to="{ path: '/goods/copy', query: { goodsId: item.goods_id } }"
-        >复制</router-link>
-        <!-- <a v-if="storeVersion === 0 || (storeVersion === 1 && isSuper === 0)" v-action:delete @click="handleDelete([item.goods_id])">删除</a> -->
-      </div>
-    </s-table>
-    <Update ref="UpdateRef" @refresh="refreshParentMethod" />
-  </a-card>
+				<a @click="handleEdit(item.goods_id)">编辑</a>
+				<router-link v-if="$module('goods-copy') && $auth('/goods/copy') && (storeVersion === 0 || (storeVersion === 1 && isSuper === 0))" :to="{ path: '/goods/copy', query: { goodsId: item.goods_id } }">复制</router-link>
+				<!-- <a v-if="storeVersion === 0 || (storeVersion === 1 && isSuper === 0)" v-action:delete @click="handleDelete([item.goods_id])">删除</a> -->
+			</div>
+		</s-table>
+		<Update ref="UpdateRef" @refresh="refreshParentMethod" />
+	</a-card>
 </template>
 
 <script>
@@ -174,403 +153,439 @@ import store from '../../store'
 import Update from './modules/Update'
 // 表格表头
 const columns = [
-  {
-    title: '商品ID',
-    dataIndex: 'goods_id',
-    width: '80px',
-    sorter: true,
-  },
-  {
-    title: '渠道',
-    width: '50px',
-    dataIndex: 'channel_name',
-  },
-  {
-    title: '商品编号',
-    dataIndex: 'goods_no',
-    width: '100px',
-  },
-  {
-    title: '商品图片',
-    width: '100px',
-    dataIndex: 'goods_image',
-    scopedSlots: { customRender: 'goods_image' },
-  },
-  {
-    title: '商品名称',
-    dataIndex: 'goods_name',
-    width: '260px',
-    scopedSlots: { customRender: 'goods_name' },
-  },
-  {
-    title: '商品价格',
-    width: '90px',
-    dataIndex: 'goods_price_min',
-    scopedSlots: { customRender: 'goods_price_min' },
-    sorter: true,
-  },
-  {
-    title: '成本价',
-    width: '80px',
-    dataIndex: 'cost_price_min',
-    scopedSlots: { customRender: 'cost_price_min' },
-    sorter: true,
-  },
-  {
-    title: '利润',
-    width: '80px',
-    dataIndex: 'profit',
-    sorter: true,
-  },
-  {
-    title: '利润率',
-    width: '80px',
-    dataIndex: 'profit_rate',
-    sorter: true,
-    scopedSlots: { customRender: 'profit_rate' },
-  },
-  // {
-  //   title: '加价率',
-  //   width: '90px',
-  //   dataIndex: 'markup_rate',
-  //   sorter: true,
-  //   scopedSlots: { customRender: 'markup_rate' },
-  // },
-  {
-    title: '总销量',
-    width: '80px',
-    dataIndex: 'sales_actual',
-    sorter: true,
-  },
-  {
-    title: '库存总量',
-    width: '90px',
-    dataIndex: 'stock_total',
-    sorter: true,
-  },
-  {
-    title: '状态',
-    width: '60px',
-    dataIndex: 'status',
-    scopedSlots: { customRender: 'status' },
-  },
-  {
-    title: '比同款下架',
-    width: '80px',
-    dataIndex: 'is_jd_remove',
-    scopedSlots: { customRender: 'is_jd_remove' },
-  },
-  {
-    title: '商品池',
-    width: '60px',
-    dataIndex: 'is_pool',
-    scopedSlots: { customRender: 'is_pool' },
-  },
-  {
-    title: '排序',
-    width: '80px',
-    dataIndex: 'sort',
-    sorter: true,
-  },
-  {
-    title: '添加时间',
-    width: '150px',
-    dataIndex: 'create_time',
-    sorter: true,
-  },
-  {
-    title: '操作',
-    dataIndex: 'action',
-    width: '150px',
-    scopedSlots: { customRender: 'action' },
-  },
+	{
+		title: '商品ID',
+		dataIndex: 'goods_id',
+		width: '80px',
+		sorter: true,
+	},
+	{
+		title: '渠道',
+		width: '50px',
+		dataIndex: 'channel_name',
+	},
+	{
+		title: '商品编号',
+		dataIndex: 'goods_no',
+		width: '100px',
+	},
+	{
+		title: '商品图片',
+		width: '100px',
+		dataIndex: 'goods_image',
+		scopedSlots: { customRender: 'goods_image' },
+	},
+	{
+		title: '商品名称',
+		dataIndex: 'goods_name',
+		width: '260px',
+		scopedSlots: { customRender: 'goods_name' },
+	},
+	{
+		title: '商品价格',
+		width: '90px',
+		dataIndex: 'goods_price_min',
+		scopedSlots: { customRender: 'goods_price_min' },
+		sorter: true,
+	},
+	{
+		title: '成本价',
+		width: '80px',
+		dataIndex: 'cost_price_min',
+		scopedSlots: { customRender: 'cost_price_min' },
+		sorter: true,
+	},
+	{
+		title: '利润',
+		width: '80px',
+		dataIndex: 'profit',
+		sorter: true,
+	},
+	{
+		title: '利润率',
+		width: '80px',
+		dataIndex: 'profit_rate',
+		sorter: true,
+		scopedSlots: { customRender: 'profit_rate' },
+	},
+	// {
+	//   title: '加价率',
+	//   width: '90px',
+	//   dataIndex: 'markup_rate',
+	//   sorter: true,
+	//   scopedSlots: { customRender: 'markup_rate' },
+	// },
+	{
+		title: '总销量',
+		width: '80px',
+		dataIndex: 'sales_actual',
+		sorter: true,
+	},
+	{
+		title: '库存总量',
+		width: '90px',
+		dataIndex: 'stock_total',
+		sorter: true,
+	},
+	{
+		title: '状态',
+		width: '60px',
+		dataIndex: 'status',
+		scopedSlots: { customRender: 'status' },
+	},
+	{
+		title: '比同款下架',
+		width: '80px',
+		dataIndex: 'is_jd_remove',
+		scopedSlots: { customRender: 'is_jd_remove' },
+	},
+	{
+		title: '商品池',
+		width: '60px',
+		dataIndex: 'is_pool',
+		scopedSlots: { customRender: 'is_pool' },
+	},
+	{
+		title: '排序',
+		width: '80px',
+		dataIndex: 'sort',
+		sorter: true,
+	},
+	{
+		title: '添加时间',
+		width: '150px',
+		dataIndex: 'create_time',
+		sorter: true,
+	},
+	{
+		title: '操作',
+		dataIndex: 'action',
+		width: '150px',
+		scopedSlots: { customRender: 'action' },
+	},
 ]
 export default {
-  name: 'Index',
-  components: {
-    ContentHeader,
-    STable,
-    Update,
-  },
-  data() {
-    return {
-      // 当前表单元素
-      searchForm: this.$form.createForm(this),
-      // 商品分类列表
-      categoryListTree: [],
-      // 查询参数
-      queryParam: {
-        listType: 'all',
-        spec_type: '',
-        channel: '',
-        merchant_id: '',
-        is_jd_remove:''
-      },
-      // 正在加载
-      isLoading: false,
-      // 表头
-      columns,
-      // 选择的元素
-      selectedRowKeys: [],
-      // 加载数据方法 必须为 Promise 对象
-      loadData: (param) => {
-        const data = { ...param, ...this.queryParam }
-        const orderEnum = {
-          ascend: 'asc',
-          descend: 'desc',
-        }
+	name: 'Index',
+	components: {
+		ContentHeader,
+		STable,
+		Update,
+	},
+	data() {
+		return {
+			// 当前表单元素
+			searchForm: this.$form.createForm(this),
+			// 商品分类列表
+			categoryListTree: [],
+			// 查询参数
+			queryParam: {
+				listType: 'all',
+				spec_type: '',
+				channel: '',
+				merchant_id: '',
+				is_jd_remove: ''
+			},
+			paihang: '',
+			setupIndex: 0,
+			setupValue: 1,
+			// 正在加载
+			isLoading: false,
+			// 表头
+			columns,
+			// 选择的元素
+			selectedRowKeys: [],
+			// 加载数据方法 必须为 Promise 对象
+			loadData: (param) => {
+				const data = { ...param, ...this.queryParam }
+				const orderEnum = {
+					ascend: 'asc',
+					descend: 'desc',
+				}
 
-        if (data.sortField && data.sortOrder && orderEnum[data.sortOrder]) {
-          data.sort = data.sortField
-          data.order = orderEnum[data.sortOrder]
-          delete data.sortField
-          delete data.sortOrder
-        } else {
-          delete data.sortField
-          delete data.sortOrder
-        }
-        return GoodsApi.list(data).then((response) => {
-          return response.data.list
-        })
-      },
-      specsType: [
-        { name: '全部', val: '' },
-        { name: '单规格', val: 10 },
-        { name: '多规格', val: 20 },
-      ],
-      isYesNo: [
-        { name: '是', val: 1 },
-        { name: '否', val: 0 },
-      ],
-      checkList: [],
-      merchantList: []
-    }
-  },
-  created() {
-    // 默认的查询参数
-    if (this.$route.query.listType) {
-      this.queryParam.listType = this.$route.query.listType
-    }
-    // 获取商品分类列表
-    this.getCategoryList()
-    this.getDataList() // 渠道
-    this.getShopList() // 商户
-  },
-  computed: {
-    rowSelection() {
-      return {
-        selectedRowKeys: this.selectedRowKeys,
-        onChange: this.onSelectChange,
-      }
-    },
-    isSuper() {
-      return window.localStorage.getItem('roles') ? JSON.parse(window.localStorage.getItem('roles')).isSuper : 0
-    },
-    storeVersion() {
-      return window.localStorage.getItem('storeInfo') ? JSON.parse(window.localStorage.getItem('storeInfo')).store_version : 0
-    }
-  },
-  methods: {
-    getGoodsJingDong(val){
-      this.queryParam.is_jd_remove = val
-    },
-    // 批量修改
-    handleModify() {
-      this.$router.push('/goods/modify')
-    },
-    // 导出
-    handleExport(goodsIds) {
-      const formData = this.searchForm.getFieldsValue()
-      var index = window.publicConfig.BASE_API.indexOf('?')
-      var resolve = window.publicConfig.BASE_API.substring(0, index)
-      const params =
-        '&goodsName=' +
-        (formData.goodsName || '') +
-        '&goodsNo=' +
-        (formData.goodsNo || '') +
-        '&goods_price_max=' +
-        (formData.goods_price_max || '') +
-        '&goods_price_min=' +
-        (formData.goods_price_min || '') +
-        '&profit_rate_max=' +
-        (formData.profit_rate_max || '') +
-        '&profit_rate_min=' +
-        (formData.profit_rate_min || '') +
-        '&categoryId=' +
-        (this.queryParam.categoryId || '') +
-        '&is_jd_remove=' +
-        (this.queryParam.is_jd_remove || '') +
-        '&channel=' +
-        this.queryParam.channel +
-        '&merchant_id=' +
-        this.queryParam.merchant_id +
-        '&goodsIds=' +
-        goodsIds +
-        '&Access-Token=' +
-        store.getters.token
-      console.log(params)
-      window.open(resolve + '?s=/store/goods/export' + params)
-    },
-    getChannel(val) {
-      this.queryParam.channel = val
-    },
-    changeMerchant(val) {
-      this.queryParam.merchant_id = val
-    },
-    // 获取商户列表
-    getShopList() {
-      this.isLoading = true
-      ShopApi.shopList({ page: 1, pageSize: 10000 })
-        .then((result) => {
-          const data = result.data.data
-          for (const shop of data) {
-            shop.name = shop.shop_name
-          }
-          this.merchantList = data
-          this.isLoading = false
-        })
-        .finally(() => (this.isLoading = false))
-    },
-    getDataList() {
-      return GoodsApi.getDataList().then((result) => {
-        const obj = result.data
-        Object.keys(obj).forEach((item) => {
-          this.checkList.push({ id: item, name: obj[item] })
-        })
-      })
-    },
-    onchangeSpecs(val) {
-      this.queryParam.spec_type = val
-    },
-    // 选中项发生变化时的回调
-    onSelectChange(selectedRowKeys) {
-      this.selectedRowKeys = selectedRowKeys
-    },
+				if (data.sortField && data.sortOrder && orderEnum[data.sortOrder]) {
+					data.sort = data.sortField
+					data.order = orderEnum[data.sortOrder]
+					delete data.sortField
+					delete data.sortOrder
+				} else {
+					delete data.sortField
+					delete data.sortOrder
+				}
+				return GoodsApi.list(data).then((response) => {
+					return response.data.list
+				})
+			},
+			specsType: [
+				{ name: '全部', val: '' },
+				{ name: '单规格', val: 10 },
+				{ name: '多规格', val: 20 },
+			],
+			isYesNo: [
+				{ name: '是', val: 1 },
+				{ name: '否', val: 0 },
+			],
+			checkList: [],
+			merchantList: [],
+			batchVisible: false
+		}
+	},
+	created() {
+		// 默认的查询参数
+		if (this.$route.query.listType) {
+			this.queryParam.listType = this.$route.query.listType
+		}
+		// 获取商品分类列表
+		this.getCategoryList()
+		this.getDataList() // 渠道
+		this.getShopList() // 商户
+	},
+	computed: {
+		rowSelection() {
+			return {
+				selectedRowKeys: this.selectedRowKeys,
+				onChange: this.onSelectChange,
+			}
+		},
+		isSuper() {
+			return window.localStorage.getItem('roles') ? JSON.parse(window.localStorage.getItem('roles')).isSuper : 0
+		},
+		storeVersion() {
+			return window.localStorage.getItem('storeInfo') ? JSON.parse(window.localStorage.getItem('storeInfo')).store_version : 0
+		}
+	},
+	methods: {
+		getGoodsJingDong(val) {
+			this.queryParam.is_jd_remove = val
+		},
+		// 批量修改
+		handleModify() {
+			this.$router.push('/goods/modify')
+		},
+		handleSetup(type) {
+			this.paihang = '';
+			this.setupValue = 1;
+			this.setupIndex = type
+			this.batchVisible = true
+		},
+		// 停售
+		handleUpdateSetup(goodsIds, val, type) {
+			this.isLoading = true
+			let url = ''
+			if (type == 1) {
+				url = GoodsApi.setBrand({ goodsIds, is_brand: val })
+			}
+			if (type == 2) {
+				url = GoodsApi.setNew({ goodsIds, is_new: val })
+			}
+			if (type == 3) {
+				url = GoodsApi.setInstore({ goodsIds, is_in_store: val })
+			}
+			if (type == 4) {
+				url = GoodsApi.setRank({ goodsIds, paihang: val })
+			}
+			url.then((result) => {
+				this.batchVisible = false
+				this.$message.success(result.message, 1.5)
+				this.handleRefresh()
+			})
+				.finally((result) => {
+          this.$message.warning(result.message, 1.5)
+					this.isLoading = false
+				})
+		},
+		// 导出
+		handleExport(goodsIds) {
+			const formData = this.searchForm.getFieldsValue()
+			var index = window.publicConfig.BASE_API.indexOf('?')
+			var resolve = window.publicConfig.BASE_API.substring(0, index)
+			const params =
+				'&goodsName=' +
+				(formData.goodsName || '') +
+				'&goodsNo=' +
+				(formData.goodsNo || '') +
+				'&goods_price_max=' +
+				(formData.goods_price_max || '') +
+				'&goods_price_min=' +
+				(formData.goods_price_min || '') +
+				'&profit_rate_max=' +
+				(formData.profit_rate_max || '') +
+				'&profit_rate_min=' +
+				(formData.profit_rate_min || '') +
+				'&categoryId=' +
+				(this.queryParam.categoryId || '') +
+				'&is_jd_remove=' +
+				(this.queryParam.is_jd_remove || '') +
+				'&channel=' +
+				this.queryParam.channel +
+				'&merchant_id=' +
+				this.queryParam.merchant_id +
+				'&goodsIds=' +
+				goodsIds +
+				'&Access-Token=' +
+				store.getters.token
+			console.log(params)
+			window.open(resolve + '?s=/store/goods/export' + params)
+		},
+		getChannel(val) {
+			this.queryParam.channel = val
+		},
+		changeMerchant(val) {
+			this.queryParam.merchant_id = val
+		},
+		// 获取商户列表
+		getShopList() {
+			this.isLoading = true
+			ShopApi.shopList({ page: 1, pageSize: 10000 })
+				.then((result) => {
+					const data = result.data.data
+					for (const shop of data) {
+						shop.name = shop.shop_name
+					}
+					this.merchantList = data
+					this.isLoading = false
+				})
+				.finally(() => (this.isLoading = false))
+		},
+		getDataList() {
+			return GoodsApi.getDataList().then((result) => {
+				const obj = result.data
+				Object.keys(obj).forEach((item) => {
+					this.checkList.push({ id: item, name: obj[item] })
+				})
+			})
+		},
+		onchangeSpecs(val) {
+			this.queryParam.spec_type = val
+		},
+		// 选中项发生变化时的回调
+		onSelectChange(selectedRowKeys) {
+			this.selectedRowKeys = selectedRowKeys
+		},
 
-    // 切换tab
-    handleTabs(e) {
-      this.queryParam.listType = e.target.value
-      this.handleRefresh(true)
-    },
+		// 切换tab
+		handleTabs(e) {
+			this.queryParam.listType = e.target.value
+			this.handleRefresh(true)
+		},
 
-    // 确认搜索
-    handleSearch(e) {
-      e.preventDefault()
-      this.searchForm.validateFields((error, values) => {
-        if (!error) {
-          this.queryParam = { ...this.queryParam, ...values }
-          this.handleRefresh(true)
-        }
-      })
-    },
+		// 确认搜索
+		handleSearch(e) {
+			e.preventDefault()
+			this.searchForm.validateFields((error, values) => {
+				if (!error) {
+					this.queryParam = { ...this.queryParam, ...values }
+					this.handleRefresh(true)
+				}
+			})
+		},
 
-    refreshParentMethod() {
-      this.handleRefresh(false)
-    },
-    // 重置搜索表单
-    handleReset() {
-      this.searchForm.resetFields()
-    },
+		refreshParentMethod() {
+			this.handleRefresh(false)
+		},
+		// 重置搜索表单
+		handleReset() {
+			this.searchForm.resetFields()
+		},
 
-    // 获取分类列表
-    getCategoryList() {
-      this.isLoading = true
-      CategoryModel.getListFromScreen()
-        .then((selectList) => {
-          this.categoryListTree = selectList
-        })
-        .finally(() => (this.isLoading = false))
-    },
+		// 获取分类列表
+		getCategoryList() {
+			this.isLoading = true
+			CategoryModel.getListFromScreen()
+				.then((selectList) => {
+					this.categoryListTree = selectList
+				})
+				.finally(() => (this.isLoading = false))
+		},
 
-    // 修改商品状态(上下架)
-    handleUpdateStatus(goodsIds, state = true) {
-      if (!this.$auth('/goods/index.status')) {
-        return false
-      }
-      this.isLoading = true
-      GoodsApi.state({ goodsIds, state })
-        .then((result) => {
-          // 显示成功
-          this.$message.success(result.message, 1.5)
-          this.handleRefresh()
-        })
-        .finally((result) => {
-          this.isLoading = false
-        })
-    },
+		// 修改商品状态(上下架)
+		handleUpdateStatus(goodsIds, state = true) {
+			if (!this.$auth('/goods/index.status')) {
+				return false
+			}
+			this.isLoading = true
+			GoodsApi.state({ goodsIds, state })
+				.then((result) => {
+					// 显示成功
+					this.$message.success(result.message, 1.5)
+					this.handleRefresh()
+				})
+				.finally((result) => {
+					this.isLoading = false
+				})
+		},
 
-    // 修改商品出入池
-    handleUpdatePool(goodsIds, state = true) {
-      this.isLoading = true
-      GoodsApi.pool({ goodsIds, state })
-        .then((result) => {
-          // 显示成功
-          this.$message.success(result.message, 1.5)
-          this.handleRefresh()
-        })
-        .finally((result) => {
-          this.isLoading = false
-        })
-    },
+		// 修改商品出入池
+		handleUpdatePool(goodsIds, state = true) {
+			this.isLoading = true
+			GoodsApi.pool({ goodsIds, state })
+				.then((result) => {
+					// 显示成功
+					this.$message.success(result.message, 1.5)
+					this.handleRefresh()
+				})
+				.finally((result) => {
+					this.isLoading = false
+				})
+		},
 
-    // 删除记录
-    handleDelete(goodsIds) {
-      const app = this
-      const modal = this.$confirm({
-        title: '您确定要删除该记录吗?',
-        content: '删除后不可恢复',
-        onOk() {
-          return GoodsApi.deleted({ goodsIds })
-            .then((result) => {
-              app.$message.success(result.message, 1.5)
-              app.handleRefresh()
-            })
-            .finally((result) => modal.destroy())
-        },
-      })
-    },
-    // 编辑记录
-    async handleEdit(id) {
-      // 显示对话框
-      this.$refs.UpdateRef.initData(id)
-    },
-    // 新增记录
-    handleCreate() {
-      this.$router.push('/goods/create')
-    },
+		// 删除记录
+		handleDelete(goodsIds) {
+			const app = this
+			const modal = this.$confirm({
+				title: '您确定要删除该记录吗?',
+				content: '删除后不可恢复',
+				onOk() {
+					return GoodsApi.deleted({ goodsIds })
+						.then((result) => {
+							app.$message.success(result.message, 1.5)
+							app.handleRefresh()
+						})
+						.finally((result) => modal.destroy())
+				},
+			})
+		},
+		// 编辑记录
+		async handleEdit(id) {
+			// 显示对话框
+			this.$refs.UpdateRef.initData(id)
+		},
+		// 新增记录
+		handleCreate() {
+			this.$router.push('/goods/create')
+		},
 
-    // 批量导入
-    handleImport() {
-      this.$router.push('/goods/import/batch')
-    },
+		// 批量导入
+		handleImport() {
+			this.$router.push('/goods/import/batch')
+		},
 
-    /**
-     * 刷新列表
-     * @param Boolean bool 强制刷新到第一页
-     */
-    handleRefresh(bool = false) {
-      this.selectedRowKeys = []
-      this.$refs.table.refresh(bool)
-    },
-  },
+		/**
+		 * 刷新列表
+		 * @param Boolean bool 强制刷新到第一页
+		 */
+		handleRefresh(bool = false) {
+			this.selectedRowKeys = []
+			this.$refs.table.refresh(bool)
+		},
+	},
 }
 </script>
 <style lang="less" scoped>
 .ant-card-body {
-  padding: 22px 29px 25px;
+	padding: 22px 29px 25px;
 }
 // 筛选tab
 .tab-list {
-  margin-right: 20px;
+	margin-right: 20px;
 }
 /deep/.search-form .ant-form-item-control-wrapper {
-  min-width: 120px !important;
+	min-width: 120px !important;
 }
 .goodsWidth {
-  min-width: 220px;
+	min-width: 220px;
 }
 .ant-table .actions a {
-  padding: 20px 4px;
-  margin: 0;
+	padding: 20px 4px;
+	margin: 0;
 }
 </style>
diff --git a/src/views/recovery/Index.vue b/src/views/recovery/Index.vue
index d60f89c..d2096e1 100644
--- a/src/views/recovery/Index.vue
+++ b/src/views/recovery/Index.vue
@@ -63,8 +63,8 @@
     >
       <!-- 回收图片 -->
       <span slot="recovery_image" slot-scope="text, item">
-        <a title="点击查看原图" :href="item.image.external_url" target="_blank">
-          <img width="50" height="50" :src="item.image.external_url" alt="回收图片" />
+        <a title="点击查看原图" :href="item.recovery_image" target="_blank">
+          <img width="50" height="50" :src="item.recovery_image" alt="回收图片" />
         </a>
       </span>
       <!-- 回收名称 -->
diff --git a/src/views/recovery/modules/Edit.vue b/src/views/recovery/modules/Edit.vue
index b698be4..7643897 100644
--- a/src/views/recovery/modules/Edit.vue
+++ b/src/views/recovery/modules/Edit.vue
@@ -50,7 +50,7 @@
           <span class="ml-10">个</span>
         </a-form-item>
         <a-form-item label="图片" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <SelectImage :defaultList="record.image ? [record.image] : []" v-decorator="['image_id']" />
+          <SelectImage :defaultList="record.recovery_image ? record.recovery_image : []" v-decorator="['image_id']" />
         </a-form-item>
         <a-form-item label="状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-radio-group v-decorator="['status', { initialValue: 1, rules: [{ required: true }] }]">
@@ -109,6 +109,12 @@ export default {
   methods: {
     // 显示对话框
     edit(record) {
+      let list = []
+			list.push({
+				preview_url: record.recovery_image,
+				file_id: 9999
+			})
+			record.recovery_image = list
       this.getCategoryList()
       // 显示窗口
       this.visible = true
diff --git a/src/views/server/Index.vue b/src/views/server/Index.vue
index b954cb2..91aa56b 100644
--- a/src/views/server/Index.vue
+++ b/src/views/server/Index.vue
@@ -63,8 +63,8 @@
     >
       <!-- 服务图片 -->
       <span slot="server_image" slot-scope="text, item">
-        <a title="点击查看原图" :href="item.image.external_url" target="_blank">
-          <img width="50" height="50" :src="item.image.external_url" alt="服务图片" />
+        <a title="点击查看原图" :href="item.server_image" target="_blank">
+          <img width="50" height="50" :src="item.server_image" alt="服务图片" />
         </a>
       </span>
       <!-- 服务名称 -->
diff --git a/src/views/server/modules/Edit.vue b/src/views/server/modules/Edit.vue
index c840f47..3f3db37 100644
--- a/src/views/server/modules/Edit.vue
+++ b/src/views/server/modules/Edit.vue
@@ -1,208 +1,178 @@
 <template>
-  <a-modal
-    title="编辑服务"
-    :width="920"
-    :visible="visible"
-    :confirmLoading="confirmLoading"
-    :maskClosable="false"
-    :destroyOnClose="true"
-    @ok="handleSubmit"
-    @cancel="handleCancel"
-  >
-    <a-spin :spinning="confirmLoading">
-      <a-form :form="form">
-        <a-form-item label="服务名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input
-            v-decorator="['server_name', { rules: [{ required: true, min: 2, message: '请输入至少2个字符' }] }]"
-          />
-        </a-form-item>
-        <a-form-item label="服务分类" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-select
-            v-decorator="['category_id', { initialValue: 0, rules: [{ required: true, message: '请选择分类' }] }]"
-          >
-            <a-select-option :value="0">选择分类</a-select-option>
-            <a-select-option v-for="(item, index) in categoryList" :key="index" :value="item.category_id">{{
+	<a-modal title="编辑服务" :width="920" :visible="visible" :confirmLoading="confirmLoading" :maskClosable="false" :destroyOnClose="true" @ok="handleSubmit" @cancel="handleCancel">
+		<a-spin :spinning="confirmLoading">
+			<a-form :form="form">
+				<a-form-item label="服务名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
+					<a-input v-decorator="['server_name', { rules: [{ required: true, min: 2, message: '请输入至少2个字符' }] }]" />
+				</a-form-item>
+				<a-form-item label="服务分类" :labelCol="labelCol" :wrapperCol="wrapperCol">
+					<a-select v-decorator="['category_id', { initialValue: 0, rules: [{ required: true, message: '请选择分类' }] }]">
+						<a-select-option :value="0">选择分类</a-select-option>
+						<a-select-option v-for="(item, index) in categoryList" :key="index" :value="item.category_id">{{
               item.name
             }}</a-select-option>
-          </a-select>
-        </a-form-item>
-        <a-form-item label="服务价格" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input-number
-            :min="0.01"
-            :precision="2"
-            v-decorator="['server_price', { initialValue: 1, rules: [{ required: true, message: '请输入服务价格' }] }]"
-          />
-          <span class="ml-10">元</span>
-        </a-form-item>
-        <a-form-item label="划线价" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input-number
-            :min="0.01"
-            :precision="2"
-            v-decorator="['line_price', { initialValue: 1, rules: [{ required: true, message: '请输入划线价' }] }]"
-          />
-          <span class="ml-10">元</span>
-        </a-form-item>
-        <a-form-item label="评论数量" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input-number
-            :min="10"
-            :step="10"
-            v-decorator="['comment_num', { initialValue: 10, rules: [{ required: true, message: '请输入评论数量' }] }]"
-          />
-        </a-form-item>
-        <a-form-item label="好评率" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input-number
-            :min="90"
-            :step="1"
-            :max="100"
-            v-decorator="['comment_rate', { initialValue: 90, rules: [{ required: true, message: '请输入好评率' }] }]"
-          />
-          <span class="ml-10">%</span>
-        </a-form-item>
-        <a-form-item label="销量" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input-number
-            :min="100"
-            v-decorator="['sold', { initialValue: 100, rules: [{ required: true, message: '请输入销量价格' }] }]"
-          />
-          <span class="ml-10">个</span>
-        </a-form-item>
-        <a-form-item label="服务图片" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <SelectImage :defaultList="record.image ? [record.image] : []" v-decorator="['image_id']" />
-        </a-form-item>
-        <a-form-item label="服务状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-radio-group v-decorator="['status', { initialValue: 1, rules: [{ required: true }] }]">
-            <a-radio :value="1">上架</a-radio>
-            <a-radio :value="2">下架</a-radio>
-          </a-radio-group>
-        </a-form-item>
-        <a-form-item label="排序" :labelCol="labelCol" :wrapperCol="wrapperCol" extra="数字越小越靠前">
-          <a-input-number
-            :min="0"
-            v-decorator="['sort', { initialValue: 100, rules: [{ required: true, message: '请输入至少1个数字' }] }]"
-          />
-        </a-form-item>
-        <a-form-item label="服务详情" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <Ueditor v-decorator="['content', { rules: [{ required: true, message: '服务详情不能为空' }] }]" />
-        </a-form-item>
-      </a-form>
-    </a-spin>
-  </a-modal>
+					</a-select>
+				</a-form-item>
+				<a-form-item label="服务价格" :labelCol="labelCol" :wrapperCol="wrapperCol">
+					<a-input-number :min="0.01" :precision="2" v-decorator="['server_price', { initialValue: 1, rules: [{ required: true, message: '请输入服务价格' }] }]" />
+					<span class="ml-10">元</span>
+				</a-form-item>
+				<a-form-item label="划线价" :labelCol="labelCol" :wrapperCol="wrapperCol">
+					<a-input-number :min="0.01" :precision="2" v-decorator="['line_price', { initialValue: 1, rules: [{ required: true, message: '请输入划线价' }] }]" />
+					<span class="ml-10">元</span>
+				</a-form-item>
+				<a-form-item label="评论数量" :labelCol="labelCol" :wrapperCol="wrapperCol">
+					<a-input-number :min="10" :step="10" v-decorator="['comment_num', { initialValue: 10, rules: [{ required: true, message: '请输入评论数量' }] }]" />
+				</a-form-item>
+				<a-form-item label="好评率" :labelCol="labelCol" :wrapperCol="wrapperCol">
+					<a-input-number :min="90" :step="1" :max="100" v-decorator="['comment_rate', { initialValue: 90, rules: [{ required: true, message: '请输入好评率' }] }]" />
+					<span class="ml-10">%</span>
+				</a-form-item>
+				<a-form-item label="销量" :labelCol="labelCol" :wrapperCol="wrapperCol">
+					<a-input-number :min="100" v-decorator="['sold', { initialValue: 100, rules: [{ required: true, message: '请输入销量价格' }] }]" />
+					<span class="ml-10">个</span>
+				</a-form-item>
+				<a-form-item label="服务图片" :labelCol="labelCol" :wrapperCol="wrapperCol">
+					<SelectImage :defaultList="record.server_image ? record.server_image : []" v-decorator="['image_id']" />
+				</a-form-item>
+				<a-form-item label="服务状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
+					<a-radio-group v-decorator="['status', { initialValue: 1, rules: [{ required: true }] }]">
+						<a-radio :value="1">上架</a-radio>
+						<a-radio :value="2">下架</a-radio>
+					</a-radio-group>
+				</a-form-item>
+				<a-form-item label="排序" :labelCol="labelCol" :wrapperCol="wrapperCol" extra="数字越小越靠前">
+					<a-input-number :min="0" v-decorator="['sort', { initialValue: 100, rules: [{ required: true, message: '请输入至少1个数字' }] }]" />
+				</a-form-item>
+				<a-form-item label="服务详情" :labelCol="labelCol" :wrapperCol="wrapperCol">
+					<Ueditor v-decorator="['content', { rules: [{ required: true, message: '服务详情不能为空' }] }]" />
+				</a-form-item>
+			</a-form>
+		</a-spin>
+	</a-modal>
 </template>
 
 <script>
 import * as Api from '@/api/server'
 import { SelectImage, Ueditor } from '@/components'
 export default {
-  components: {
-    SelectImage,
-    Ueditor
-  },
-  props: {
-    // 分类列表
-  },
-  data () {
-    return {
-      categoryList: [],
-      // 对话框标题
-      title: '',
-      // 标签布局属性
-      labelCol: {
-        span: 7
-      },
-      // 输入框布局属性
-      wrapperCol: {
-        span: 13
-      },
-      // modal(对话框)是否可见
-      visible: false,
-      // modal(对话框)确定按钮 loading
-      confirmLoading: false,
-      // 当前表单元素
-      form: this.$form.createForm(this),
-      // 当前记录
-      record: {}
-    }
-  },
-  methods: {
-    // 显示对话框
-    edit (record) {
-      this.getCategoryList()
-      // 显示窗口
-      this.visible = true
-      // 当前分类记录
-      this.record = record
-      // 设置默认值
-      this.setFieldsValue()
-    },
-    // 获取分类列表
-    getCategoryList () {
-      this.isLoading = true
-      Api.categoryList()
-        .then((result) => {
-          this.categoryList = result.data.list
-        })
-        .finally(() => (this.isLoading = false))
-    },
-    // 设置默认值
-    setFieldsValue () {
-      const {
-        form: { setFieldsValue }
-      } = this
-      // 设置表单内容
-      this.$nextTick(() => {
-        setFieldsValue(
-          _.pick(this.record, [
-            'server_name',
-            'image_id',
-            'category_id',
-            'status',
-            'server_price',
-            'cost_price',
-            'sort',
-            'content',
-            'comment_rate',
-            'sold',
-            'comment_num'
-          ])
-        )
-      })
-    },
-    // 确认按钮
-    handleSubmit (e) {
-      e.preventDefault()
-      // 表单验证
-      const {
-        form: { validateFields }
-      } = this
-      validateFields((errors, values) => {
-        // 提交到后端api
-        if (!errors) {
-          this.onFormSubmit(values)
-        }
-      })
-    },
+	components: {
+		SelectImage,
+		Ueditor
+	},
+	props: {
+		// 分类列表
+	},
+	data() {
+		return {
+			categoryList: [],
+			// 对话框标题
+			title: '',
+			// 标签布局属性
+			labelCol: {
+				span: 7
+			},
+			// 输入框布局属性
+			wrapperCol: {
+				span: 13
+			},
+			// modal(对话框)是否可见
+			visible: false,
+			// modal(对话框)确定按钮 loading
+			confirmLoading: false,
+			// 当前表单元素
+			form: this.$form.createForm(this),
+			// 当前记录
+			record: {}
+		}
+	},
+	methods: {
+		// 显示对话框
+		edit(record) {
+			let list = []
+			list.push({
+				preview_url: record.server_image,
+				file_id: 9999
+			})
+			record.server_image = list
+			this.getCategoryList()
+			// 显示窗口
+			this.visible = true
+			// 当前分类记录
+			this.record = record
+			// 设置默认值
+			this.setFieldsValue()
+		},
+		// 获取分类列表
+		getCategoryList() {
+			this.isLoading = true
+			Api.categoryList()
+				.then((result) => {
+					this.categoryList = result.data.list
+				})
+				.finally(() => (this.isLoading = false))
+		},
+		// 设置默认值
+		setFieldsValue() {
+			const {
+				form: { setFieldsValue }
+			} = this
+			// 设置表单内容
+			this.$nextTick(() => {
+				setFieldsValue(
+					_.pick(this.record, [
+						'server_name',
+						'image_id',
+						'category_id',
+						'status',
+						'server_price',
+						'cost_price',
+						'sort',
+						'content',
+						'comment_rate',
+						'sold',
+						'comment_num'
+					])
+				)
+			})
+		},
+		// 确认按钮
+		handleSubmit(e) {
+			e.preventDefault()
+			// 表单验证
+			const {
+				form: { validateFields }
+			} = this
+			validateFields((errors, values) => {
+				// 提交到后端api
+				if (!errors) {
+					this.onFormSubmit(values)
+				}
+			})
+		},
 
-    // 关闭对话框事件
-    handleCancel () {
-      this.visible = false
-      this.form.resetFields()
-    },
+		// 关闭对话框事件
+		handleCancel() {
+			this.visible = false
+			this.form.resetFields()
+		},
 
-    // 提交到后端api
-    onFormSubmit (values) {
-      this.confirmLoading = true
-      Api.editServer({ serverId: this.record['server_id'], form: values })
-        .then((result) => {
-          // 显示成功
-          this.$message.success(result.message, 1.5)
-          // 关闭对话框事件
-          this.handleCancel()
-          // 通知父端组件提交完成了
-          this.$emit('handleSubmit', values)
-        })
-        .finally((result) => {
-          this.confirmLoading = false
-        })
-    }
-  }
+		// 提交到后端api
+		onFormSubmit(values) {
+			this.confirmLoading = true
+			Api.editServer({ serverId: this.record['server_id'], form: values })
+				.then((result) => {
+					// 显示成功
+					this.$message.success(result.message, 1.5)
+					// 关闭对话框事件
+					this.handleCancel()
+					// 通知父端组件提交完成了
+					this.$emit('handleSubmit', values)
+				})
+				.finally((result) => {
+					this.confirmLoading = false
+				})
+		}
+	}
 }
 </script>