diff --git a/src/api/shop/index.js b/src/api/shop/index.js
index 6996fdb..a735483 100644
--- a/src/api/shop/index.js
+++ b/src/api/shop/index.js
@@ -9,7 +9,28 @@ const api = {
   shopDetail: '/merchant/detail',
   getUser: '/merchant/userinfo'
 }
-
+/**
+ * 商户分类新增
+ * @param {*} data
+ */
+ export function setMerchantGoodsCate(data) {
+  return axios({
+    url: 'merchant/setMerchantGoodsCate',
+    method: 'post',
+    data
+  })
+}
+/**
+ * 商户分类获取
+ * @param {*} data
+ */
+ export function getMerchantGoodsCate(data) {
+  return axios({
+    url: 'merchant/getMerchantGoodsCate',
+    method: 'post',
+    data
+  })
+}
 /**
  * 商户列表
  * @param {*} params
diff --git a/src/common/model/goods/MultiSpec.js b/src/common/model/goods/MultiSpec.js
index bb56dc2..b3b9530 100644
--- a/src/common/model/goods/MultiSpec.js
+++ b/src/common/model/goods/MultiSpec.js
@@ -30,7 +30,7 @@ const defaultColumns = [
     scopedSlots: { customRender: 'goods_price' }
   },
   {
-    title: '成本价',
+    title: '行情价',
     dataIndex: 'cost_price',
     width: 120,
     scopedSlots: { customRender: 'cost_price' }
diff --git a/src/config/router.config.js b/src/config/router.config.js
index 3c88776..1c8da9e 100644
--- a/src/config/router.config.js
+++ b/src/config/router.config.js
@@ -240,6 +240,12 @@ export const asyncRouterMap = [
             component: () => import(/* webpackChunkName: "server" */ '@/views/shop/Index'),
             meta: { title: '商户管理', keepAlive: false, permission: ['/shop/index'] },
           },
+          {
+            path: '/shop/classification',
+            moduleKey: 'merchant-manage',
+            component: () => import(/* webpackChunkName: "server" */ '@/views/shop/classification'),
+            meta: { title: '商户分类', keepAlive: false, permission: ['/shop/classification'] },
+          },
         ],
       },
       // 商品管理
diff --git a/src/views/goods/Copy.vue b/src/views/goods/Copy.vue
index 24e94a6..0c282bf 100644
--- a/src/views/goods/Copy.vue
+++ b/src/views/goods/Copy.vue
@@ -154,10 +154,10 @@
                 <span class="ml-10">元</span>
               </a-form-item>
               <a-form-item
-                label="成本价"
+                label="行情价"
                 :labelCol="labelCol"
                 :wrapperCol="wrapperCol"
-                extra="成本价仅用于商品页展示"
+                extra="行情价仅用于商品页展示"
               >
                 <a-input-number :min="0" :precision="2" v-decorator="['cost_price']" />
                 <span class="ml-10">元</span>
diff --git a/src/views/goods/Create.vue b/src/views/goods/Create.vue
index bf92a06..2c4c08a 100644
--- a/src/views/goods/Create.vue
+++ b/src/views/goods/Create.vue
@@ -160,7 +160,7 @@
                   ]" />
 								<span class="ml-10">元</span>
 							</a-form-item>
-							<a-form-item label="成本价" :labelCol="labelCol" :wrapperCol="wrapperCol" extra="成本价仅用于商品页展示">
+							<a-form-item label="行情价" :labelCol="labelCol" :wrapperCol="wrapperCol" extra="行情价仅用于商品页展示">
 								<a-input-number :min="0" :precision="2" v-decorator="['cost_price']" />
 								<span class="ml-10">元</span>
 							</a-form-item>
diff --git a/src/views/goods/Index.vue b/src/views/goods/Index.vue
index 4b72fe8..e218afe 100644
--- a/src/views/goods/Index.vue
+++ b/src/views/goods/Index.vue
@@ -232,7 +232,7 @@ const columns = [
 		sorter: true,
 	},
 	{
-		title: '成本价',
+		title: '行情价',
 		width: '80px',
 		dataIndex: 'cost_price_min',
 		scopedSlots: { customRender: 'cost_price_min' },
@@ -301,6 +301,12 @@ const columns = [
 		dataIndex: 'sort',
 		sorter: true,
 	},
+	{
+		title: '更新时间',
+		width: '150px',
+		dataIndex: 'update_time',
+		sorter: true,
+	},
 	{
 		title: '添加时间',
 		width: '150px',
diff --git a/src/views/goods/Update.vue b/src/views/goods/Update.vue
index 49664a4..178e7ed 100644
--- a/src/views/goods/Update.vue
+++ b/src/views/goods/Update.vue
@@ -222,7 +222,7 @@
                 />
                 <span class="ml-10">元</span>
               </a-form-item>
-              <a-form-item label="成本价" :labelCol="labelCol" :wrapperCol="wrapperCol" extra="成本价仅用于商品页展示">
+              <a-form-item label="行情价" :labelCol="labelCol" :wrapperCol="wrapperCol" extra="行情价仅用于商品页展示">
                 <a-input-number :min="0.01" :precision="2" v-decorator="['cost_price']" />
                 <span class="ml-10">元</span>
               </a-form-item>
diff --git a/src/views/goods/distributionPrice/Index.vue b/src/views/goods/distributionPrice/Index.vue
index bd36bd6..f382b44 100644
--- a/src/views/goods/distributionPrice/Index.vue
+++ b/src/views/goods/distributionPrice/Index.vue
@@ -11,8 +11,8 @@
 							<span>利润空间(元)</span>
 						</div>
 						<div class="ruleText"><span class="ruleTitle">分销说明：</span>A.当加价率生效后，分销价高于市场价，分销价统一自动按以下标准执行：
-							（市场价-成本价）x_____% +成本价=分销价 _____%为此时的加价率。
-							B.当加价率生效后，分销价高于会员价，分销价进一步统一自动按以下标准执行：（会员价-成本价）x_____% +成本价=分销价 _____%为此时的加价率。</div>
+							（市场价-行情价）x_____% +行情价=分销价 _____%为此时的加价率。
+							B.当加价率生效后，分销价高于会员价，分销价进一步统一自动按以下标准执行：（会员价-行情价）x_____% +行情价=分销价 _____%为此时的加价率。</div>
 					</a-form-item>
 					<a-form-item v-bind="formItemLayoutWithOutLabel">
 						<div style="width: 100%;">
diff --git a/src/views/goods/memberPrice/Index.vue b/src/views/goods/memberPrice/Index.vue
index 990b732..4a9bdc7 100644
--- a/src/views/goods/memberPrice/Index.vue
+++ b/src/views/goods/memberPrice/Index.vue
@@ -11,7 +11,7 @@
 							<span>利润空间(元)</span>
 						</div>
 						<div class="ruleText"><span class="ruleTitle">会员说明：</span>A.当加价率生效后，会员价高于市场价，会员价统一自动按以下标准执行：
-							（市场价-成本价）x_____% +成本价=会员价 _____%为此时的加价率。</div>
+							（市场价-行情价）x_____% +行情价=会员价 _____%为此时的加价率。</div>
 					</a-form-item>
 					<a-form-item v-bind="formItemLayoutWithOutLabel">
 						<div style="width: 100%;">
diff --git a/src/views/goods/modules/MultiSpec.vue b/src/views/goods/modules/MultiSpec.vue
index 06d35a7..c46bac2 100644
--- a/src/views/goods/modules/MultiSpec.vue
+++ b/src/views/goods/modules/MultiSpec.vue
@@ -61,7 +61,7 @@
         />
         <a-input-number
           v-model="multiSpecData.skuBatchForm.cost_price"
-          placeholder="成本价"
+          placeholder="行情价"
           :min="0"
           :precision="2"
         />
@@ -101,7 +101,7 @@
         <template slot="goods_price" slot-scope="text, item">
           {{ item.goods_price }}
         </template>
-        <!-- 成本价 -->
+        <!-- 行情价 -->
         <template slot="cost_price" slot-scope="text, item">
           {{ item.cost_price }}
         </template>
diff --git a/src/views/goods/modules/Update.vue b/src/views/goods/modules/Update.vue
index 482cf93..b6625d2 100644
--- a/src/views/goods/modules/Update.vue
+++ b/src/views/goods/modules/Update.vue
@@ -160,7 +160,7 @@
 									<a-input-number :min="0.01" :precision="2" v-decorator="['goods_price', { rules: [{ required: true, message: '请输入商品价格' }] }]" />
 									<span class="ml-10">元</span>
 								</a-form-item>
-								<a-form-item label="成本价" :labelCol="labelCol" :wrapperCol="wrapperCol" extra="成本价仅用于商品页展示">
+								<a-form-item label="行情价" :labelCol="labelCol" :wrapperCol="wrapperCol" extra="行情价仅用于商品页展示">
 									<a-input-number :min="0.01" :precision="2" v-decorator="['cost_price']" />
 									<span class="ml-10">元</span>
 								</a-form-item>
diff --git a/src/views/server/modules/Add.vue b/src/views/server/modules/Add.vue
index b23768a..a0b14fd 100644
--- a/src/views/server/modules/Add.vue
+++ b/src/views/server/modules/Add.vue
@@ -34,7 +34,7 @@
           />
           <span class="ml-10">元</span>
         </a-form-item>
-        <a-form-item label="成本价" :labelCol="labelCol" :wrapperCol="wrapperCol">
+        <a-form-item label="行情价" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-input-number
             :min="0.01"
             :precision="2"
diff --git a/src/views/shop/classification.vue b/src/views/shop/classification.vue
new file mode 100644
index 0000000..ff14a9b
--- /dev/null
+++ b/src/views/shop/classification.vue
@@ -0,0 +1,243 @@
+<template>
+  <a-card :bordered="false">
+    <div class="card-title">{{ $route.meta.title }}</div>
+    <a-spin :spinning="isLoading">
+      <a-form :form="form" @submit="handleSubmit">
+        <a-form-item label="商户分类" :labelCol="labelCol" required>
+          <a-tree-select
+            style="width: 500px; margin-right: 8px; margin-top: 3px"
+            placeholder="请选择商户分类"
+            :dropdownStyle="{ maxHeight: '500px', overflow: 'auto' }"
+            :treeData="formData.categoryList"
+            treeCheckable
+            allowClear
+            treeCheckStrictly
+            v-decorator="[`category`]"
+          ></a-tree-select>
+        </a-form-item>
+        <a-form-item :wrapperCol="{ span: wrapperCol.span, offset: labelCol.span }">
+          <a-button type="primary" html-type="submit">提交</a-button>
+        </a-form-item>
+      </a-form>
+    </a-spin>
+  </a-card>
+</template>
+
+<script>
+import pick from 'lodash.pick'
+import * as Api from '@/api/shop'
+import GoodsModel from '@/common/model/goods/Index'
+import { isEmpty } from '@/utils/util'
+export default {
+  data() {
+    return {
+      // 标签布局属性
+      labelCol: { span: 3 },
+      // 输入框布局属性
+      wrapperCol: { span: 10 },
+      // loading状态
+      isLoading: false,
+      // 当前表单元素
+      form: this.$form.createForm(this),
+      // 当前记录详情分类数据、
+      formData: GoodsModel.formData,
+      record: {},
+    }
+  },
+  // 初始化数据
+  created() {
+    this.isLoading = true
+    // 获取form所需的数据
+    GoodsModel.getFromData().then(() => {
+      this.isLoading = false
+    })
+    this.form.getFieldDecorator('category', { initialValue: [], preserve: true })
+    this.getDetail()
+  },
+  methods: {
+    // 设置表单默认值
+    setFieldsValue() {
+      const { record, form, $nextTick } = this
+      record[`goods_cate`] = this.formatCategoryIds(record.goods_cate.split(','))
+      // 设置表单内容
+      !isEmpty(form.getFieldsValue()) &&
+        $nextTick(() => {
+          form.setFieldsValue({
+            category: record.goods_cate,
+          })
+          this.$forceUpdate()
+        })
+    },
+    formatCategoryIds(categoryIds) {
+      return categoryIds.map((id) => {
+        return { value: id }
+      })
+    },
+    // 获取当前详情记录
+    getDetail() {
+      this.isLoading = true
+      Api.getMerchantGoodsCate()
+        .then((result) => {
+          this.record = result.data.merchant
+          // 设置默认值
+          if (result.data.merchant) {
+            this.setFieldsValue()
+          }
+        })
+        .finally(() => (this.isLoading = false))
+    },
+    // 确认按钮
+    handleSubmit(e) {
+      e.preventDefault()
+      // 表单验证
+      const {
+        form: { validateFields },
+        onFormSubmit,
+      } = this
+      validateFields((errors, values) => {
+        !errors && onFormSubmit(values)
+      })
+    },
+    // 提交到后端api
+    onFormSubmit(values) {
+      let ids = []
+      if (values.category.length > 0) {
+        values.category.forEach((item) => {
+          ids.push(item.value)
+        })
+      }
+      console.log(values, ids.join(','))
+      this.isLoading = true
+      Api.setMerchantGoodsCate({ form: { goods_cate: ids.length > 0 ? ids.join(',') : '' } })
+        .then((result) => {
+          // 显示提示信息
+          this.$message.success(result.message, 1.5)
+          this.getDetail()
+        })
+        .catch(() => {
+          this.isLoading = false
+        })
+        .finally(() => (this.isLoading = false))
+    },
+  },
+}
+</script>
+<style lang="less" scoped>
+.msg {
+  width: 100%;
+  background: #ffe7e7;
+  border-radius: 0px 0px 0px 0px;
+  opacity: 1;
+  padding: 5px 25px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  font-size: 16px;
+  span {
+    width: 33%;
+    text-align: center;
+  }
+}
+/deep/.ant-form-item-control {
+  padding-left: 10px;
+  .ant-form-item-control {
+    padding-left: 0;
+  }
+}
+/deep/.ant-input-prefix {
+  font-weight: bold;
+}
+/deep/.ant-col-10 {
+  width: 80%;
+}
+.fan {
+  display: flex;
+  align-items: top;
+}
+.fan /deep/ .ant-form-item {
+  margin-bottom: 0;
+}
+.fen {
+  span {
+    color: #555;
+    width: 80px;
+  }
+  .input {
+    background-color: #fff;
+    border: 1px solid #d9d9d9;
+    height: 32px;
+    width: 180px;
+    margin-top: 10px;
+    padding-left: 10px;
+  }
+  input::-webkit-input-placeholder {
+    // 针对 谷歌 内核
+    color: #bfbfbf;
+  }
+  input:-moz-placeholder {
+    // 火狐
+    color: #bfbfbf;
+  }
+  input:-ms-input-placeholder {
+    // 微软ie
+    color: #bfbfbf;
+  }
+}
+.setRule {
+  margin-top: 20px;
+}
+.ruleTitle {
+  font-size: 14px;
+  font-family: PingFang SC, PingFang SC;
+  font-weight: 500;
+  color: #303030;
+}
+.ruleText {
+  margin-top: 8px;
+  font-size: 14px;
+  font-family: PingFang SC, PingFang SC;
+  font-weight: 400;
+  color: #8b8b8b;
+  line-height: 32px;
+}
+.inMax {
+  width: 100%;
+  text-align: center;
+  position: relative;
+  padding: 0;
+  font-variant: tabular-nums;
+  list-style: none;
+  display: inline-block;
+  width: 100%;
+  height: 32px;
+  padding: 0 26px 0 0;
+  color: rgba(0, 0, 0, 0.65);
+  font-size: 13px;
+  line-height: 32px;
+  background-color: #fff;
+  background-image: none;
+  border: 1px solid #d9d9d9;
+  border-radius: 2px;
+  -webkit-transition: all 0.3s;
+  transition: all 0.3s;
+  input {
+    border: none;
+    width: 45%;
+    margin: 0;
+    height: 100%;
+    text-align: center;
+  }
+  input:focus {
+    outline: none;
+    border: none;
+  }
+  input::-webkit-input-placeholder {
+    color: #bfbfbf;
+  }
+  .yuan {
+    position: absolute;
+    right: 10px;
+    top: 0px;
+  }
+}
+</style>