diff --git a/src/views/goods/distributionPrice/Index.vue b/src/views/goods/distributionPrice/Index.vue
index a5b167e..78252d3 100644
--- a/src/views/goods/distributionPrice/Index.vue
+++ b/src/views/goods/distributionPrice/Index.vue
@@ -1,66 +1,111 @@
 <template>
-	<a-card :bordered="false">
-		<div class="card-title">{{ $route.meta.title }}</div>
-		<a-spin :spinning="isLoading">
-			<a-form :form="form" @submit="handleSubmit">
-				<div style="width:1000px">
-					<a-form-item v-bind="formItemLayoutWithOutLabel">
-						<div class="msg">
-							<span>价格区间(元)</span>
-							<span>分销加价率%</span>
-							<span>利润空间(元)</span>
-						</div>
-						<div class="ruleText"><span class="ruleTitle">分销说明：</span>A.当加价率生效后，分销价高于市场价，分销价统一自动按以下标准执行：
-							（市场价-行情价）x_____% +行情价=分销价 _____%为此时的加价率。
-							B.当加价率生效后，分销价高于会员价，分销价进一步统一自动按以下标准执行：（会员价-行情价）x_____% +行情价=分销价 _____%为此时的加价率。</div>
-					</a-form-item>
-					<a-form-item v-bind="formItemLayoutWithOutLabel">
-						<div style="width: 100%;">
-							<a-button type="dashed" style="width: 100%" @click="handleAddCondition">
-								<a-icon type="plus-circle" /> 新增分类模版 </a-button>
-						</div>
-					</a-form-item>
-					<a-form-item v-for="(k, index) in form.getFieldValue('list')" :key="k.id" :label="index === 0 ? '分销模版' : ''" :labelCol="labelCol" v-bind="index === 0 ? { wrapperCol } : formItemLayoutWithOutLabel" required>
-						<div style="width: 100%;display: flex;align-items: center;justify-content: space-between">
-							<div style="width: 700px;">
-								<a-tree-select style="width: 100%; margin-right: 8px; margin-top: 3px" placeholder="请选择商品分类" :dropdownStyle="{ maxHeight: '500px', overflow: 'auto' }" :treeData="formData.categoryList" treeCheckable allowClear
-									treeCheckStrictly @select="onSelect(index, $event)" @focus="handleSelectChange(index)" v-decorator="[`category${k.id}`]"></a-tree-select>
-								<div style="width: 100%">
-									<div class="fan" v-for="(m, index2) in k.price_list" :key="m.id">
-										<a-form-item style="margin-right: 15px; width: 47%; cursor: pointer">
-											<div class="inMax">
-												<input placeholder="最低成本价" @blur="onPrice($event, index, index2)" v-model="m.min" class="input" type="text" />
-												~<input placeholder="最高成本价" @blur="onPrice($event, index, index2)" v-model="m.max" class="input" type="text" />
-												<div class="yuan">元</div>
-											</div>
-										</a-form-item>
-										<a-form-item style="margin-right: 15px; width: 23%">
-											<a-input placeholder="利润率" @input="onRate($event, index, index2)" suffix="%" v-model="m.add_price_rate" style="width: 100%; margin-right: 8px; text-align: center" />
-										</a-form-item>
-										<div style="width: 30%; text-align: center">
-											<span>{{ m.startProfit }}</span> ~ <span>{{ m.endProfit }}</span>
-										</div>
-										<a-button type="dashed" style="width: 120px" @click="handleRemovePriceRate(index,index2)">
-											<a-icon type="minus-circle-o" /> 删除价格区间</a-button>
-									</div>
-									<div style="width: 100%">
-										<a-button type="dashed" style="width: 100%; margin-right: 50px" @click="handleAddPriceRate(index)">
-											<a-icon type="plus-circle" /> 新增价格区间 </a-button>
-									</div>
-								</div>
-							</div>
-							<a-button type="dashed" style="width: 120px;margin-left: 20px;" @click="handleRemoveCondition(index)">
-								<a-icon type="minus-circle-o" /> 删除分类模版
-							</a-button>
-						</div>
-					</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>
-				</div>
-			</a-form>
-		</a-spin>
-	</a-card>
+  <a-card :bordered="false">
+    <div class="card-title">{{ $route.meta.title }}</div>
+    <a-spin :spinning="isLoading">
+      <a-form :form="form" @submit="handleSubmit">
+        <div style="width: 1000px">
+          <a-form-item v-bind="formItemLayoutWithOutLabel">
+            <div class="msg">
+              <span>价格区间(元)</span>
+              <span>分销加价率%</span>
+              <span>利润空间(元)</span>
+            </div>
+            <div class="ruleText">
+              <span class="ruleTitle">分销说明：</span
+              >A.当加价率生效后，分销价高于市场价，分销价统一自动按以下标准执行： （市场价-行情价）x_____%
+              +行情价=分销价 _____%为此时的加价率。
+              B.当加价率生效后，分销价高于会员价，分销价进一步统一自动按以下标准执行：（会员价-行情价）x_____%
+              +行情价=分销价 _____%为此时的加价率。
+            </div>
+          </a-form-item>
+          <a-form-item v-bind="formItemLayoutWithOutLabel">
+            <div style="width: 100%">
+              <a-button type="dashed" style="width: 100%" @click="handleAddCondition">
+                <a-icon type="plus-circle" /> 新增分类模版
+              </a-button>
+            </div>
+          </a-form-item>
+          <a-form-item
+            v-for="(k, index) in form.getFieldValue('list')"
+            :key="k.id"
+            :label="index === 0 ? '分销模版' : ''"
+            :labelCol="labelCol"
+            v-bind="index === 0 ? { wrapperCol } : formItemLayoutWithOutLabel"
+            required
+          >
+            <div style="width: 100%; display: flex; align-items: center; justify-content: space-between">
+              <div style="width: 700px">
+                <a-tree-select
+                  style="width: 100%; margin-right: 8px; margin-top: 3px"
+                  placeholder="请选择商品分类"
+                  :dropdownStyle="{ maxHeight: '500px', overflow: 'auto' }"
+                  :treeData="formData.categoryList"
+                  treeCheckable
+                  allowClear
+                  treeCheckStrictly
+                  @select="onSelect(index, $event)"
+                  @focus="handleSelectChange(index)"
+                  v-decorator="[`category${k.id}`]"
+                ></a-tree-select>
+                <div style="width: 100%">
+                  <div class="fan" v-for="(m, index2) in k.price_list" :key="m.id">
+                    <a-form-item style="margin-right: 15px; width: 47%; cursor: pointer">
+                      <div class="inMax">
+                        <input
+                          placeholder="最低成本价"
+                          @blur="onPrice($event, index, index2)"
+                          v-model="m.min"
+                          class="input"
+                          type="text"
+                        />
+                        ~<input
+                          placeholder="最高成本价"
+                          @blur="onPrice($event, index, index2)"
+                          v-model="m.max"
+                          class="input"
+                          type="text"
+                        />
+                        <div class="yuan">元</div>
+                      </div>
+                    </a-form-item>
+                    <a-form-item style="margin-right: 15px; width: 23%">
+                      <div class="inMax">
+                        <input
+                          placeholder="利润率"
+                          type="text"
+                          @input="onRate($event, index, index2)"
+                          suffix="%"
+                          v-model="m.add_price_rate"
+                          style="width: 100%; margin-right: 8px; text-align: center"
+                        />
+                      </div>
+                    </a-form-item>
+                    <div style="width: 30%; text-align: center">
+                      <span>{{ m.startProfit }}</span> ~ <span>{{ m.endProfit }}</span>
+                    </div>
+                    <a-button type="dashed" style="width: 120px" @click="handleRemovePriceRate(index, index2)">
+                      <a-icon type="minus-circle-o" /> 删除价格区间</a-button
+                    >
+                  </div>
+                  <div style="width: 100%">
+                    <a-button type="dashed" style="width: 100%; margin-right: 50px" @click="handleAddPriceRate(index)">
+                      <a-icon type="plus-circle" /> 新增价格区间
+                    </a-button>
+                  </div>
+                </div>
+              </div>
+              <a-button type="dashed" style="width: 120px; margin-left: 20px" @click="handleRemoveCondition(index)">
+                <a-icon type="minus-circle-o" /> 删除分类模版
+              </a-button>
+            </div>
+          </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>
+        </div>
+      </a-form>
+    </a-spin>
+  </a-card>
 </template>
 
 <script>
@@ -70,479 +115,488 @@ import * as GoodsApi from '@/api/goods'
 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: {},
-			checkList: [],
-			formItemLayoutWithOutLabel: {
-				wrapperCol: { span: 10, offset: 3 },
-			},
-		}
-	},
-	// 初始化数据
-	created() {
-		this.isLoading = true
-		// 获取form所需的数据
-		GoodsModel.getFromData().then(() => {
-			this.isLoading = false
-		})
-		this.form.getFieldDecorator('list', { initialValue: [], preserve: true })
-		this.getDataList() //渠道数据请求
-		// 获取当前详情记录
-		this.getDetail()
-	},
-	methods: {
-		onPrice(e, index_1, index_2, type) {
-			const { form } = this
-			const list = form.getFieldValue('list')
-			if (0 >= list[index_1].price_list[index_2].min) {
-				list[index_1].price_list[index_2].min = null
-				this.$message.warning('最低成本价必须大于0', 1.5)
-				list[index_1].price_list[index_2].startProfit = 0
-				list[index_1].price_list[index_2].endProfit = 0
-				return
-			}
-			if (0 >= list[index_1].price_list[index_2].max) {
-				list[index_1].price_list[index_2].max = null
-				this.$message.warning('最高成本价必须大于0', 1.5)
-				list[index_1].price_list[index_2].startProfit = 0
-				list[index_1].price_list[index_2].endProfit = 0
-				return
-			}
-			if (list[index_1].price_list[index_2].min > list[index_1].price_list[index_2].max) {
-				list[index_1].price_list[index_2].max = null
-				this.$message.warning('最高成本价不能低于最低成本价', 1.5)
-				list[index_1].price_list[index_2].startProfit = 0
-				list[index_1].price_list[index_2].endProfit = 0
-				return
-			}
-			if (!list[index_1].price_list[index_2].min || !list[index_1].price_list[index_2].max || !list[index_1].price_list[index_2].add_price_rate) {
-				list[index_1].price_list[index_2].startProfit = 0
-				list[index_1].price_list[index_2].endProfit = 0
-				return
-			}
-			if (list[index_1].price_list[index_2].min && list[index_1].price_list[index_2].max) {
-				let rate = Number(list[index_1].price_list[index_2].add_price_rate)
-				list[index_1].price_list[index_2].startProfit = Number(
-					(list[index_1].price_list[index_2].min * (rate / 100)).toFixed(2)
-				)
-				list[index_1].price_list[index_2].endProfit = Number(
-					(list[index_1].price_list[index_2].max * (rate / 100)).toFixed(2)
-				)
-				list[index_1].price_list[index_2].add_price_rate = rate
-				form.setFieldsValue({
-					list: list,
-				})
-				this.$forceUpdate()
-			}
-		},
-		// 计算利润率
-		onRate(e, index_1, index_2) {
-			const { form } = this
-			const list = form.getFieldValue('list')
-			let rate = Number(list[index_1].price_list[index_2].add_price_rate)
-			let min = list[index_1].price_list[index_2].min
-			let max = list[index_1].price_list[index_2].max
-			if (!min && !max) {
-				list[index_1].price_list[index_2].add_price_rate = ''
-				this.$message.warning('利润率不能低于为空', 1.5)
-				return
-			}
-			if (0 > rate) {
-				list[index_1].price_list[index_2].add_price_rate = ''
-				this.$message.warning('利润率不能低于等于0', 1.5)
-				return
-			}
-			list[index_1].price_list[index_2].startProfit = Number(
-				(list[index_1].price_list[index_2].min * (rate / 100)).toFixed(2)
-			)
-			list[index_1].price_list[index_2].endProfit = Number(
-				(list[index_1].price_list[index_2].max * (rate / 100)).toFixed(2)
-			)
-			list[index_1].price_list[index_2].add_price_rate = rate
-			form.setFieldsValue({
-				list: list,
-			})
-			this.$forceUpdate()
-		},
-		onSelect(index, event) {
-			const { form, $nextTick } = this
-			const key = form.getFieldValue('list')
-			for (let i = 0; i < key.length; i++) {
-				if (i == index) {
-					key[i].category.push(event.value)
-				}
-			}
-			$nextTick(() => {
-				form.setFieldsValue({
-					list: key,
-				})
-				this.$forceUpdate()
-			})
-		},
-		deleteNodeById(nodes, ids) {
-			let that = this
-			for (let i = 0; i < nodes.length; i++) {
-				nodes[i].disabled = false
-				if (ids.includes(nodes[i].value) == true) {
-					nodes[i].disabled = true
-				}
-				if (nodes[i].children && nodes[i].children.length > 0) {
-					that.deleteNodeById(nodes[i].children, ids) // 递归查找子节点
-				}
-			}
-			return nodes
-		},
-		handleSelectChange(index, event) {
-			const { form, $nextTick } = this
-			const key = form.getFieldValue('list')
-			let category = []
-			for (let i = 0; i < key.length; i++) {
-				if (i !== index) {
-					key[i].category.forEach((item) => {
-						//forEach循环
-						category.push(Number(item))
-					})
-				}
-			}
-			$nextTick(() => {
-				this.formData.categoryList = this.deleteNodeById(this.formData.categoryList, category)
-				this.formData = this.formData
-				this.$forceUpdate()
-			})
-		},
-		// 删除模版列表
-		handleRemoveCondition(index) {
-			const { form } = this
-			const keys = form.getFieldValue('list')
-			keys.splice(index, 1) // 第二个参数1表示删除一个元素
-			form.setFieldsValue({
-				list: keys,
-			})
-			this.$forceUpdate()
-		},
-		// 新增模版列表
-		handleAddCondition() {
-			const { form } = this
-			const key = form.getFieldValue('list')
-			const keys = key ? key : []
-			const nextKeys = keys.concat([{ category: [], price_list: [], id: this.generateRandomString(8) }])
-			form.setFieldsValue({
-				list: nextKeys,
-			})
-		},
-		// 删除值列表
-		handleRemovePriceRate(index1, index2) {
-			const { form } = this
-			const priceList = form.getFieldValue('list')
-			priceList[index1].price_list.splice(index2, 1) // 第二个参数1表示删除一个元素
-			form.setFieldsValue({
-				list: priceList,
-			})
-			this.$forceUpdate()
-		},
-		// 新增值列表
-		handleAddPriceRate(index) {
-			const { form } = this
-			const priceList = form.getFieldValue('list')[index].price_list
-			const addList = priceList ? priceList : []
-			const nextKeys = addList.concat([
-				{ max: '', min: '', add_price_rate: '', startProfit: 0, endProfit: 0, id: this.generateRandomString(8) },
-			])
-			const conditionList = form.getFieldValue('list')
-			conditionList.forEach(function (item, mm) {
-				if (mm == index) {
-					item.price_list = nextKeys
-				}
-			})
-			form.setFieldsValue({
-				list: conditionList,
-			})
-		},
-		generateRandomString(length) {
-			let result = ''
-			const characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'
-			const charactersLength = characters.length
-			for (let i = 0; i < length; i++) {
-				result += characters.charAt(Math.floor(Math.random() * charactersLength))
-			}
-			return result
-		},
-		// 渠道
-		getDataList() {
-			return GoodsApi.getDataList().then((result) => {
-				const obj = result.data
-				Object.keys(obj).forEach((item) => {
-					this.checkList.push({ id: item, name: obj[item] })
-				})
-			})
-		},
-		formatCategoryIds(categoryIds) {
-			return categoryIds.map((id) => {
-				return { value: id }
-			})
-		},
-		convertToString(value) {
-			if (typeof value == 'number') {
-				return String(value);
-			}
-			return value;
-		},
-		// 设置表单默认值
-		setFieldsValue() {
-			const { record, form, $nextTick } = this
-			const categoryAry = []
-			if (record.list) {
-				record.list = record.list.map((x) => {
-					x.id = this.generateRandomString(8)
-					return x
-				})
-				record.list.forEach((x, i) => {
-					record[`category${x.id}`] = this.formatCategoryIds((this.convertToString(x.category)).split(','))
-					categoryAry.push(`category${x.id}`)
-					this.form.getFieldDecorator(`category${x.id}`, { initialValue: '', preserve: true })
-					x.category = (this.convertToString(x.category)).split(',')
-					x.price_list.forEach((m, j) => {
-						m.startProfit = Number((m.min * (Number(m.add_price_rate) / 100)).toFixed(2))
-						m.endProfit = Number((m.max * (Number(m.add_price_rate) / 100)).toFixed(2))
-					})
-				})
-			}
-			// 设置表单内容
-			!isEmpty(form.getFieldsValue()) &&
-				$nextTick(() => {
-					form.setFieldsValue(pick(record, ['list', ...categoryAry]))
-					this.$forceUpdate()
-				})
-		},
-		formatCategoryIds(categoryIds) {
-			return categoryIds.map((id) => {
-				return { value: id }
-			})
-		},
-		// 获取当前详情记录
-		getDetail() {
-			this.isLoading = true
-			GoodsApi.getStorePriceInfo({ type: 1 })
-				.then((result) => {
-					this.record = result.data
-					// 设置默认值
-					this.setFieldsValue()
-				})
-				.finally(() => (this.isLoading = false))
-		},
-		getChannel(val) {
-			this.form.open_channel = val
-		},
-		// 确认按钮
-		handleSubmit(e) {
-			e.preventDefault()
-			// 表单验证
-			const {
-				form: { validateFields },
-				onFormSubmit,
-			} = this
-			validateFields((errors, values) => {
-				!errors && onFormSubmit(values)
-			})
-		},
-		// 提交到后端api
-		onFormSubmit(values) {
-			const params = {}
-			params.list = values.list.map((x, i) => {
-				return {
-					category: values[`category${x.id}`],
-					price_list: x.price_list,
-				}
-			})
-			let step = 0
-			let list = params.list
-			list.forEach((item, index) => {
-				if (Array.isArray(item.category)) {
-					item.category = Array.from(item.category, ({ value }) => value).join(',')
-				}
-				if (!item.category) {
-					step++
-					let name = '请选择第' + (index + 1) + '行分类'
-					this.$message.warning(name, 1.5)
-					return
-				}
-				if (item.price_list.length > 0) {
-					item.price_list.forEach((item_1, index_1) => {
-						item_1.category = item.category
-						if (!item_1.min) {
-							step++
-							let name = '请完善第' + (index + 1) + '行分类模版的' + '第' + (index_1 + 1) + '行分类的最低成本价'
-							this.$message.warning(name, 1.5)
-							return
-						}
-						if (!item_1.max) {
-							step++
-							let name = '请完善第' + (index + 1) + '行分类模版的' + '第' + (index_1 + 1) + '行分类的最高成本价'
-							this.$message.warning(name, 1.5)
-							return
-						}
-						if (!item_1.add_price_rate) {
-							step++
-							let name = '请完善第' + (index + 1) + '行分类模版的' + '第' + (index_1 + 1) + '行分类的会员利润率'
-							this.$message.warning(name, 1.5)
-							return
-						}
-						delete item_1.id
-					})
-				} else {
-					step++
-					let name = '请新增第' + (index + 1) + '行的价格区间'
-					this.$message.warning(name, 1.5)
-					return
-				}
-			})
-			if (step == 0) {
-				this.isLoading = true
-				GoodsApi.setStorePrice({
-					list: list,
-					type: 1,
-				})
-					.then((result) => {
-						// 显示提示信息
-						this.$message.success(result.message, 1.5)
-						this.getDetail()
-					})
-					.catch(() => {
-						this.isLoading = false
-					})
-					.finally(() => (this.isLoading = false))
-			}
-		},
-	},
+  data() {
+    return {
+      // 标签布局属性
+      labelCol: { span: 3 },
+      // 输入框布局属性
+      wrapperCol: { span: 10 },
+      // loading状态
+      isLoading: false,
+      // 当前表单元素
+      form: this.$form.createForm(this),
+      // 当前记录详情分类数据、
+      formData: GoodsModel.formData,
+      record: {},
+      checkList: [],
+      formItemLayoutWithOutLabel: {
+        wrapperCol: { span: 10, offset: 3 },
+      },
+    }
+  },
+  // 初始化数据
+  created() {
+    this.isLoading = true
+    // 获取form所需的数据
+    GoodsModel.getFromData().then(() => {
+      this.isLoading = false
+    })
+    this.form.getFieldDecorator('list', { initialValue: [], preserve: true })
+    this.getDataList() //渠道数据请求
+    // 获取当前详情记录
+    this.getDetail()
+  },
+  methods: {
+    onPrice(e, index_1, index_2, type) {
+      const { form } = this
+      const list = form.getFieldValue('list')
+      if (0 >= list[index_1].price_list[index_2].min) {
+        list[index_1].price_list[index_2].min = null
+        this.$message.warning('最低成本价必须大于0', 1.5)
+        list[index_1].price_list[index_2].startProfit = 0
+        list[index_1].price_list[index_2].endProfit = 0
+        return
+      }
+      if (0 >= list[index_1].price_list[index_2].max) {
+        list[index_1].price_list[index_2].max = null
+        this.$message.warning('最高成本价必须大于0', 1.5)
+        list[index_1].price_list[index_2].startProfit = 0
+        list[index_1].price_list[index_2].endProfit = 0
+        return
+      }
+      if (list[index_1].price_list[index_2].min > list[index_1].price_list[index_2].max) {
+        list[index_1].price_list[index_2].max = null
+        this.$message.warning('最高成本价不能低于最低成本价', 1.5)
+        list[index_1].price_list[index_2].startProfit = 0
+        list[index_1].price_list[index_2].endProfit = 0
+        return
+      }
+      if (
+        !list[index_1].price_list[index_2].min ||
+        !list[index_1].price_list[index_2].max ||
+        !list[index_1].price_list[index_2].add_price_rate
+      ) {
+        list[index_1].price_list[index_2].startProfit = 0
+        list[index_1].price_list[index_2].endProfit = 0
+        return
+      }
+      if (list[index_1].price_list[index_2].min && list[index_1].price_list[index_2].max) {
+        let rate = Number(list[index_1].price_list[index_2].add_price_rate)
+        list[index_1].price_list[index_2].startProfit = Number(
+          (list[index_1].price_list[index_2].min * (rate / 100)).toFixed(2)
+        )
+        list[index_1].price_list[index_2].endProfit = Number(
+          (list[index_1].price_list[index_2].max * (rate / 100)).toFixed(2)
+        )
+        list[index_1].price_list[index_2].add_price_rate = rate
+        form.setFieldsValue({
+          list: list,
+        })
+        this.$forceUpdate()
+      }
+    },
+    // 计算利润率
+    onRate(e, index_1, index_2) {
+      const { form } = this
+      const list = form.getFieldValue('list')
+      let rate = Number(list[index_1].price_list[index_2].add_price_rate)
+      let min = list[index_1].price_list[index_2].min
+      let max = list[index_1].price_list[index_2].max
+      if (!min) {
+        list[index_1].price_list[index_2].add_price_rate = ''
+        this.$message.warning('最低成本价必须大于0', 1.5)
+        return
+      }
+      if (!max) {
+        list[index_1].price_list[index_2].add_price_rate = ''
+        this.$message.warning('最高成本价必须大于0', 1.5)
+        return
+      }
+      if (0 > rate) {
+        list[index_1].price_list[index_2].add_price_rate = ''
+        this.$message.warning('利润率不能低于等于0', 1.5)
+        return
+      }
+      list[index_1].price_list[index_2].startProfit = Number(
+        (list[index_1].price_list[index_2].min * (rate / 100)).toFixed(2)
+      )
+      list[index_1].price_list[index_2].endProfit = Number(
+        (list[index_1].price_list[index_2].max * (rate / 100)).toFixed(2)
+      )
+      list[index_1].price_list[index_2].add_price_rate = rate
+      form.setFieldsValue({
+        list: list,
+      })
+      this.$forceUpdate()
+    },
+    onSelect(index, event) {
+      const { form, $nextTick } = this
+      const key = form.getFieldValue('list')
+      for (let i = 0; i < key.length; i++) {
+        if (i == index) {
+          key[i].category.push(event.value)
+        }
+      }
+      $nextTick(() => {
+        form.setFieldsValue({
+          list: key,
+        })
+        this.$forceUpdate()
+      })
+    },
+    deleteNodeById(nodes, ids) {
+      let that = this
+      for (let i = 0; i < nodes.length; i++) {
+        nodes[i].disabled = false
+        if (ids.includes(nodes[i].value) == true) {
+          nodes[i].disabled = true
+        }
+        if (nodes[i].children && nodes[i].children.length > 0) {
+          that.deleteNodeById(nodes[i].children, ids) // 递归查找子节点
+        }
+      }
+      return nodes
+    },
+    handleSelectChange(index, event) {
+      const { form, $nextTick } = this
+      const key = form.getFieldValue('list')
+      let category = []
+      for (let i = 0; i < key.length; i++) {
+        if (i !== index) {
+          key[i].category.forEach((item) => {
+            //forEach循环
+            category.push(Number(item))
+          })
+        }
+      }
+      $nextTick(() => {
+        this.formData.categoryList = this.deleteNodeById(this.formData.categoryList, category)
+        this.formData = this.formData
+        this.$forceUpdate()
+      })
+    },
+    // 删除模版列表
+    handleRemoveCondition(index) {
+      const { form } = this
+      const keys = form.getFieldValue('list')
+      keys.splice(index, 1) // 第二个参数1表示删除一个元素
+      form.setFieldsValue({
+        list: keys,
+      })
+      this.$forceUpdate()
+    },
+    // 新增模版列表
+    handleAddCondition() {
+      const { form } = this
+      const key = form.getFieldValue('list')
+      const keys = key ? key : []
+      const nextKeys = keys.concat([{ category: [], price_list: [], id: this.generateRandomString(8) }])
+      form.setFieldsValue({
+        list: nextKeys,
+      })
+    },
+    // 删除值列表
+    handleRemovePriceRate(index1, index2) {
+      const { form } = this
+      const priceList = form.getFieldValue('list')
+      priceList[index1].price_list.splice(index2, 1) // 第二个参数1表示删除一个元素
+      form.setFieldsValue({
+        list: priceList,
+      })
+      this.$forceUpdate()
+    },
+    // 新增值列表
+    handleAddPriceRate(index) {
+      const { form } = this
+      const priceList = form.getFieldValue('list')[index].price_list
+      const addList = priceList ? priceList : []
+      const nextKeys = addList.concat([
+        { max: '', min: '', add_price_rate: '', startProfit: 0, endProfit: 0, id: this.generateRandomString(8) },
+      ])
+      const conditionList = form.getFieldValue('list')
+      conditionList.forEach(function (item, mm) {
+        if (mm == index) {
+          item.price_list = nextKeys
+        }
+      })
+      form.setFieldsValue({
+        list: conditionList,
+      })
+    },
+    generateRandomString(length) {
+      let result = ''
+      const characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'
+      const charactersLength = characters.length
+      for (let i = 0; i < length; i++) {
+        result += characters.charAt(Math.floor(Math.random() * charactersLength))
+      }
+      return result
+    },
+    // 渠道
+    getDataList() {
+      return GoodsApi.getDataList().then((result) => {
+        const obj = result.data
+        Object.keys(obj).forEach((item) => {
+          this.checkList.push({ id: item, name: obj[item] })
+        })
+      })
+    },
+    formatCategoryIds(categoryIds) {
+      return categoryIds.map((id) => {
+        return { value: id }
+      })
+    },
+    convertToString(value) {
+      if (typeof value == 'number') {
+        return String(value)
+      }
+      return value
+    },
+    // 设置表单默认值
+    setFieldsValue() {
+      const { record, form, $nextTick } = this
+      const categoryAry = []
+      if (record.list) {
+        record.list = record.list.map((x) => {
+          x.id = this.generateRandomString(8)
+          return x
+        })
+        record.list.forEach((x, i) => {
+          record[`category${x.id}`] = this.formatCategoryIds(this.convertToString(x.category).split(','))
+          categoryAry.push(`category${x.id}`)
+          this.form.getFieldDecorator(`category${x.id}`, { initialValue: '', preserve: true })
+          x.category = this.convertToString(x.category).split(',')
+          x.price_list.forEach((m, j) => {
+            m.startProfit = Number((m.min * (Number(m.add_price_rate) / 100)).toFixed(2))
+            m.endProfit = Number((m.max * (Number(m.add_price_rate) / 100)).toFixed(2))
+          })
+        })
+      }
+      // 设置表单内容
+      !isEmpty(form.getFieldsValue()) &&
+        $nextTick(() => {
+          form.setFieldsValue(pick(record, ['list', ...categoryAry]))
+          this.$forceUpdate()
+        })
+    },
+    formatCategoryIds(categoryIds) {
+      return categoryIds.map((id) => {
+        return { value: id }
+      })
+    },
+    // 获取当前详情记录
+    getDetail() {
+      this.isLoading = true
+      GoodsApi.getStorePriceInfo({ type: 1 })
+        .then((result) => {
+          this.record = result.data
+          // 设置默认值
+          this.setFieldsValue()
+        })
+        .finally(() => (this.isLoading = false))
+    },
+    getChannel(val) {
+      this.form.open_channel = val
+    },
+    // 确认按钮
+    handleSubmit(e) {
+      e.preventDefault()
+      // 表单验证
+      const {
+        form: { validateFields },
+        onFormSubmit,
+      } = this
+      validateFields((errors, values) => {
+        !errors && onFormSubmit(values)
+      })
+    },
+    // 提交到后端api
+    onFormSubmit(values) {
+      const params = {}
+      params.list = values.list.map((x, i) => {
+        return {
+          category: values[`category${x.id}`],
+          price_list: x.price_list,
+        }
+      })
+      let step = 0
+      let list = params.list
+      list.forEach((item, index) => {
+        if (Array.isArray(item.category)) {
+          item.category = Array.from(item.category, ({ value }) => value).join(',')
+        }
+        if (!item.category) {
+          step++
+          let name = '请选择第' + (index + 1) + '行分类'
+          this.$message.warning(name, 1.5)
+          return
+        }
+        if (item.price_list.length > 0) {
+          item.price_list.forEach((item_1, index_1) => {
+            item_1.category = item.category
+            if (!item_1.min) {
+              step++
+              let name = '请完善第' + (index + 1) + '行分类模版的' + '第' + (index_1 + 1) + '行分类的最低成本价'
+              this.$message.warning(name, 1.5)
+              return
+            }
+            if (!item_1.max) {
+              step++
+              let name = '请完善第' + (index + 1) + '行分类模版的' + '第' + (index_1 + 1) + '行分类的最高成本价'
+              this.$message.warning(name, 1.5)
+              return
+            }
+            if (!item_1.add_price_rate) {
+              step++
+              let name = '请完善第' + (index + 1) + '行分类模版的' + '第' + (index_1 + 1) + '行分类的会员利润率'
+              this.$message.warning(name, 1.5)
+              return
+            }
+            delete item_1.id
+          })
+        } else {
+          step++
+          let name = '请新增第' + (index + 1) + '行的价格区间'
+          this.$message.warning(name, 1.5)
+          return
+        }
+      })
+      if (step == 0) {
+        this.isLoading = true
+        GoodsApi.setStorePrice({
+          list: list,
+          type: 1,
+        })
+          .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;
-	}
+  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;
-	}
+  padding-left: 10px;
+  .ant-form-item-control {
+    padding-left: 0;
+  }
 }
 /deep/.ant-input-prefix {
-	font-weight: bold;
+  font-weight: bold;
 }
 /deep/.ant-col-10 {
-	width: 80%;
+  width: 80%;
 }
 .fan {
-	display: flex;
-	align-items: top;
+  display: flex;
+  align-items: top;
 }
 .fan /deep/ .ant-form-item {
-	margin-bottom: 0;
+  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;
-	}
+  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;
+  margin-top: 20px;
 }
 .ruleTitle {
-	font-size: 14px;
-	font-family: PingFang SC, PingFang SC;
-	font-weight: 500;
-	color: #303030;
+  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;
+  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;
-	}
+  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>
diff --git a/src/views/goods/memberPrice/Index.vue b/src/views/goods/memberPrice/Index.vue
index 705f694..a54f156 100644
--- a/src/views/goods/memberPrice/Index.vue
+++ b/src/views/goods/memberPrice/Index.vue
@@ -1,65 +1,108 @@
 <template>
-	<a-card :bordered="false">
-		<div class="card-title">{{ $route.meta.title }}</div>
-		<a-spin :spinning="isLoading">
-			<a-form :form="form" @submit="handleSubmit">
-				<div style="width:1000px">
-					<a-form-item v-bind="formItemLayoutWithOutLabel">
-						<div class="msg">
-							<span>价格区间(元)</span>
-							<span>会员加价率%</span>
-							<span>利润空间(元)</span>
-						</div>
-						<div class="ruleText"><span class="ruleTitle">会员说明：</span>A.当加价率生效后，会员价高于市场价，会员价统一自动按以下标准执行：
-							（市场价-行情价）x_____% +行情价=会员价 _____%为此时的加价率。</div>
-					</a-form-item>
-					<a-form-item v-bind="formItemLayoutWithOutLabel">
-						<div style="width: 100%;">
-							<a-button type="dashed" style="width: 100%" @click="handleAddCondition">
-								<a-icon type="plus-circle" /> 新增分类模版 </a-button>
-						</div>
-					</a-form-item>
-					<a-form-item v-for="(k, index) in form.getFieldValue('list')" :key="k.id" :label="index === 0 ? '会员模版' : ''" :labelCol="labelCol" v-bind="index === 0 ? { wrapperCol } : formItemLayoutWithOutLabel" required>
-						<div style="width: 100%;display: flex;align-items: center;justify-content: space-between">
-							<div style="width: 700px;">
-								<a-tree-select style="width: 100%; margin-right: 8px; margin-top: 3px" placeholder="请选择商品分类" :dropdownStyle="{ maxHeight: '500px', overflow: 'auto' }" :treeData="formData.categoryList" treeCheckable allowClear
-									treeCheckStrictly @select="onSelect(index, $event)" @focus="handleSelectChange(index)" v-decorator="[`category${k.id}`]"></a-tree-select>
-								<div style="width: 100%">
-									<div class="fan" v-for="(m, index2) in k.price_list" :key="m.id">
-										<a-form-item style="margin-right: 15px; width: 47%; cursor: pointer">
-											<div class="inMax">
-												<input placeholder="最低成本价" @blur="onPrice($event, index, index2)" v-model="m.min" class="input" type="text" />
-												~<input placeholder="最高成本价" @blur="onPrice($event, index, index2)" v-model="m.max" class="input" type="text" />
-												<div class="yuan">元</div>
-											</div>
-										</a-form-item>
-										<a-form-item style="margin-right: 15px; width: 23%">
-											<a-input placeholder="利润率" @input="onRate($event, index, index2)" suffix="%" v-model="m.add_price_rate" style="width: 100%; margin-right: 8px; text-align: center" />
-										</a-form-item>
-										<div style="width: 30%; text-align: center">
-											<span>{{ m.startProfit }}</span> ~ <span>{{ m.endProfit }}</span>
-										</div>
-										<a-button type="dashed" style="width: 120px" @click="handleRemovePriceRate(index,index2)">
-											<a-icon type="minus-circle-o" /> 删除价格区间</a-button>
-									</div>
-									<div style="width: 100%">
-										<a-button type="dashed" style="width: 100%; margin-right: 50px" @click="handleAddPriceRate(index)">
-											<a-icon type="plus-circle" /> 新增价格区间 </a-button>
-									</div>
-								</div>
-							</div>
-							<a-button type="dashed" style="width: 120px;margin-left: 20px;" @click="handleRemoveCondition(index)">
-								<a-icon type="minus-circle-o" /> 删除分类模版
-							</a-button>
-						</div>
-					</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>
-				</div>
-			</a-form>
-		</a-spin>
-	</a-card>
+  <a-card :bordered="false">
+    <div class="card-title">{{ $route.meta.title }}</div>
+    <a-spin :spinning="isLoading">
+      <a-form :form="form" @submit="handleSubmit">
+        <div style="width: 1000px">
+          <a-form-item v-bind="formItemLayoutWithOutLabel">
+            <div class="msg">
+              <span>价格区间(元)</span>
+              <span>会员加价率%</span>
+              <span>利润空间(元)</span>
+            </div>
+            <div class="ruleText">
+              <span class="ruleTitle">会员说明：</span
+              >A.当加价率生效后，会员价高于市场价，会员价统一自动按以下标准执行： （市场价-行情价）x_____%
+              +行情价=会员价 _____%为此时的加价率。
+            </div>
+          </a-form-item>
+          <a-form-item v-bind="formItemLayoutWithOutLabel">
+            <div style="width: 100%">
+              <a-button type="dashed" style="width: 100%" @click="handleAddCondition">
+                <a-icon type="plus-circle" /> 新增分类模版
+              </a-button>
+            </div>
+          </a-form-item>
+          <a-form-item
+            v-for="(k, index) in form.getFieldValue('list')"
+            :key="k.id"
+            :label="index === 0 ? '会员模版' : ''"
+            :labelCol="labelCol"
+            v-bind="index === 0 ? { wrapperCol } : formItemLayoutWithOutLabel"
+            required
+          >
+            <div style="width: 100%; display: flex; align-items: center; justify-content: space-between">
+              <div style="width: 700px">
+                <a-tree-select
+                  style="width: 100%; margin-right: 8px; margin-top: 3px"
+                  placeholder="请选择商品分类"
+                  :dropdownStyle="{ maxHeight: '500px', overflow: 'auto' }"
+                  :treeData="formData.categoryList"
+                  treeCheckable
+                  allowClear
+                  treeCheckStrictly
+                  @select="onSelect(index, $event)"
+                  @focus="handleSelectChange(index)"
+                  v-decorator="[`category${k.id}`]"
+                ></a-tree-select>
+                <div style="width: 100%">
+                  <div class="fan" v-for="(m, index2) in k.price_list" :key="m.id">
+                    <a-form-item style="margin-right: 15px; width: 47%; cursor: pointer">
+                      <div class="inMax">
+                        <input
+                          placeholder="最低成本价"
+                          @blur="onPrice($event, index, index2)"
+                          v-model="m.min"
+                          class="input"
+                          type="text"
+                        />
+                        ~<input
+                          placeholder="最高成本价"
+                          @blur="onPrice($event, index, index2)"
+                          v-model="m.max"
+                          class="input"
+                          type="text"
+                        />
+                        <div class="yuan">元</div>
+                      </div>
+                    </a-form-item>
+                    <a-form-item style="margin-right: 15px; width: 23%">
+                      <div class="inMax">
+                        <input
+                          placeholder="利润率"
+                          type="text"
+                          @input="onRate($event, index, index2)"
+                          suffix="%"
+                          v-model="m.add_price_rate"
+                          style="width: 100%; margin-right: 8px; text-align: center"
+                        /></div
+                    ></a-form-item>
+                    <div style="width: 30%; text-align: center">
+                      <span>{{ m.startProfit }}</span> ~ <span>{{ m.endProfit }}</span>
+                    </div>
+                    <a-button type="dashed" style="width: 120px" @click="handleRemovePriceRate(index, index2)">
+                      <a-icon type="minus-circle-o" /> 删除价格区间</a-button
+                    >
+                  </div>
+                  <div style="width: 100%">
+                    <a-button type="dashed" style="width: 100%; margin-right: 50px" @click="handleAddPriceRate(index)">
+                      <a-icon type="plus-circle" /> 新增价格区间
+                    </a-button>
+                  </div>
+                </div>
+              </div>
+              <a-button type="dashed" style="width: 120px; margin-left: 20px" @click="handleRemoveCondition(index)">
+                <a-icon type="minus-circle-o" /> 删除分类模版
+              </a-button>
+            </div>
+          </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>
+        </div>
+      </a-form>
+    </a-spin>
+  </a-card>
 </template>
 
 <script>
@@ -69,479 +112,488 @@ import * as GoodsApi from '@/api/goods'
 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: {},
-			checkList: [],
-			formItemLayoutWithOutLabel: {
-				wrapperCol: { span: 10, offset: 3 },
-			},
-		}
-	},
-	// 初始化数据
-	created() {
-		this.isLoading = true
-		// 获取form所需的数据
-		GoodsModel.getFromData().then(() => {
-			this.isLoading = false
-		})
-		this.form.getFieldDecorator('list', { initialValue: [], preserve: true })
-		this.getDataList() //渠道数据请求
-		// 获取当前详情记录
-		this.getDetail()
-	},
-	methods: {
-		onPrice(e, index_1, index_2, type) {
-			const { form } = this
-			const list = form.getFieldValue('list')
-			if (0 >= list[index_1].price_list[index_2].min) {
-				list[index_1].price_list[index_2].min = null
-				this.$message.warning('最低成本价必须大于0', 1.5)
-				list[index_1].price_list[index_2].startProfit = 0
-				list[index_1].price_list[index_2].endProfit = 0
-				return
-			}
-			if (0 >= list[index_1].price_list[index_2].max) {
-				list[index_1].price_list[index_2].max = null
-				this.$message.warning('最高成本价必须大于0', 1.5)
-				list[index_1].price_list[index_2].startProfit = 0
-				list[index_1].price_list[index_2].endProfit = 0
-				return
-			}
-			if (list[index_1].price_list[index_2].min > list[index_1].price_list[index_2].max) {
-				list[index_1].price_list[index_2].max = null
-				this.$message.warning('最高成本价不能低于最低成本价', 1.5)
-				list[index_1].price_list[index_2].startProfit = 0
-				list[index_1].price_list[index_2].endProfit = 0
-				return
-			}
-			if (!list[index_1].price_list[index_2].min || !list[index_1].price_list[index_2].max || !list[index_1].price_list[index_2].add_price_rate) {
-				list[index_1].price_list[index_2].startProfit = 0
-				list[index_1].price_list[index_2].endProfit = 0
-				return
-			}
-			if (list[index_1].price_list[index_2].min && list[index_1].price_list[index_2].max) {
-				let rate = Number(list[index_1].price_list[index_2].add_price_rate)
-				list[index_1].price_list[index_2].startProfit = Number(
-					(list[index_1].price_list[index_2].min * (rate / 100)).toFixed(2)
-				)
-				list[index_1].price_list[index_2].endProfit = Number(
-					(list[index_1].price_list[index_2].max * (rate / 100)).toFixed(2)
-				)
-				list[index_1].price_list[index_2].add_price_rate = rate
-				form.setFieldsValue({
-					list: list,
-				})
-				this.$forceUpdate()
-			}
-		},
-		// 计算利润率
-		onRate(e, index_1, index_2) {
-			const { form } = this
-			const list = form.getFieldValue('list')
-			let rate = Number(list[index_1].price_list[index_2].add_price_rate)
-			let min = list[index_1].price_list[index_2].min
-			let max = list[index_1].price_list[index_2].max
-			if (!min && !max) {
-				list[index_1].price_list[index_2].add_price_rate = ''
-				this.$message.warning('利润率不能低于为空', 1.5)
-				return
-			}
-			if (0 > rate) {
-				list[index_1].price_list[index_2].add_price_rate = ''
-				this.$message.warning('利润率不能低于等于0', 1.5)
-				return
-			}
-			list[index_1].price_list[index_2].startProfit = Number(
-				(list[index_1].price_list[index_2].min * (rate / 100)).toFixed(2)
-			)
-			list[index_1].price_list[index_2].endProfit = Number(
-				(list[index_1].price_list[index_2].max * (rate / 100)).toFixed(2)
-			)
-			list[index_1].price_list[index_2].add_price_rate = rate
-			form.setFieldsValue({
-				list: list,
-			})
-			this.$forceUpdate()
-		},
-		onSelect(index, event) {
-			const { form, $nextTick } = this
-			const key = form.getFieldValue('list')
-			for (let i = 0; i < key.length; i++) {
-				if (i == index) {
-					key[i].category.push(event.value)
-				}
-			}
-			$nextTick(() => {
-				form.setFieldsValue({
-					list: key,
-				})
-				this.$forceUpdate()
-			})
-		},
-		deleteNodeById(nodes, ids) {
-			let that = this
-			for (let i = 0; i < nodes.length; i++) {
-				nodes[i].disabled = false
-				if (ids.includes(nodes[i].value) == true) {
-					nodes[i].disabled = true
-				}
-				if (nodes[i].children && nodes[i].children.length > 0) {
-					that.deleteNodeById(nodes[i].children, ids) // 递归查找子节点
-				}
-			}
-			return nodes
-		},
-		handleSelectChange(index, event) {
-			const { form, $nextTick } = this
-			const key = form.getFieldValue('list')
-			let category = []
-			for (let i = 0; i < key.length; i++) {
-				if (i !== index) {
-					key[i].category.forEach((item) => {
-						//forEach循环
-						category.push(Number(item))
-					})
-				}
-			}
-			$nextTick(() => {
-				this.formData.categoryList = this.deleteNodeById(this.formData.categoryList, category)
-				this.formData = this.formData
-				this.$forceUpdate()
-			})
-		},
-		// 删除模版列表
-		handleRemoveCondition(index) {
-			const { form } = this
-			const keys = form.getFieldValue('list')
-			keys.splice(index, 1) // 第二个参数1表示删除一个元素
-			form.setFieldsValue({
-				list: keys,
-			})
-			this.$forceUpdate()
-		},
-		// 新增模版列表
-		handleAddCondition() {
-			const { form } = this
-			const key = form.getFieldValue('list')
-			const keys = key ? key : []
-			const nextKeys = keys.concat([{ category: [], price_list: [], id: this.generateRandomString(8) }])
-			form.setFieldsValue({
-				list: nextKeys,
-			})
-		},
-		// 删除值列表
-		handleRemovePriceRate(index1, index2) {
-			const { form } = this
-			const priceList = form.getFieldValue('list')
-			priceList[index1].price_list.splice(index2, 1) // 第二个参数1表示删除一个元素
-			form.setFieldsValue({
-				list: priceList,
-			})
-			this.$forceUpdate()
-		},
-		// 新增值列表
-		handleAddPriceRate(index) {
-			const { form } = this
-			const priceList = form.getFieldValue('list')[index].price_list
-			const addList = priceList ? priceList : []
-			const nextKeys = addList.concat([
-				{ max: '', min: '', add_price_rate: '', startProfit: 0, endProfit: 0, id: this.generateRandomString(8) },
-			])
-			const conditionList = form.getFieldValue('list')
-			conditionList.forEach(function (item, mm) {
-				if (mm == index) {
-					item.price_list = nextKeys
-				}
-			})
-			form.setFieldsValue({
-				list: conditionList,
-			})
-		},
-		generateRandomString(length) {
-			let result = ''
-			const characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'
-			const charactersLength = characters.length
-			for (let i = 0; i < length; i++) {
-				result += characters.charAt(Math.floor(Math.random() * charactersLength))
-			}
-			return result
-		},
-		// 渠道
-		getDataList() {
-			return GoodsApi.getDataList().then((result) => {
-				const obj = result.data
-				Object.keys(obj).forEach((item) => {
-					this.checkList.push({ id: item, name: obj[item] })
-				})
-			})
-		},
-		formatCategoryIds(categoryIds) {
-			return categoryIds.map((id) => {
-				return { value: id }
-			})
-		},
-		convertToString(value) {
-			if (typeof value == 'number') {
-				return String(value);
-			}
-			return value;
-		},
-		// 设置表单默认值
-		setFieldsValue() {
-			const { record, form, $nextTick } = this
-			const categoryAry = []
-			if (record.list) {
-				record.list = record.list.map((x) => {
-					x.id = this.generateRandomString(8)
-					return x
-				})
-				record.list.forEach((x, i) => {
-					record[`category${x.id}`] = this.formatCategoryIds((this.convertToString(x.category)).split(','))
-					categoryAry.push(`category${x.id}`)
-					this.form.getFieldDecorator(`category${x.id}`, { initialValue: '', preserve: true })
-					x.category = (this.convertToString(x.category)).split(',')
-					x.price_list.forEach((m, j) => {
-						m.startProfit = Number((m.min * (Number(m.add_price_rate) / 100)).toFixed(2))
-						m.endProfit = Number((m.max * (Number(m.add_price_rate) / 100)).toFixed(2))
-					})
-				})
-			}
-			// 设置表单内容
-			!isEmpty(form.getFieldsValue()) &&
-				$nextTick(() => {
-					form.setFieldsValue(pick(record, ['list', ...categoryAry]))
-					this.$forceUpdate()
-				})
-		},
-		formatCategoryIds(categoryIds) {
-			return categoryIds.map((id) => {
-				return { value: id }
-			})
-		},
-		// 获取当前详情记录
-		getDetail() {
-			this.isLoading = true
-			GoodsApi.getStorePriceInfo({ type: 0 })
-				.then((result) => {
-					this.record = result.data
-					// 设置默认值
-					this.setFieldsValue()
-				})
-				.finally(() => (this.isLoading = false))
-		},
-		getChannel(val) {
-			this.form.open_channel = val
-		},
-		// 确认按钮
-		handleSubmit(e) {
-			e.preventDefault()
-			// 表单验证
-			const {
-				form: { validateFields },
-				onFormSubmit,
-			} = this
-			validateFields((errors, values) => {
-				!errors && onFormSubmit(values)
-			})
-		},
-		// 提交到后端api
-		onFormSubmit(values) {
-			const params = {}
-			params.list = values.list.map((x, i) => {
-				return {
-					category: values[`category${x.id}`],
-					price_list: x.price_list,
-				}
-			})
-			let step = 0
-			let list = params.list
-			list.forEach((item, index) => {
-				if (Array.isArray(item.category)) {
-					item.category = Array.from(item.category, ({ value }) => value).join(',')
-				}
-				if (!item.category) {
-					step++
-					let name = '请选择第' + (index + 1) + '行分类'
-					this.$message.warning(name, 1.5)
-					return
-				}
-				if (item.price_list.length > 0) {
-					item.price_list.forEach((item_1, index_1) => {
-						item_1.category = item.category
-						if (!item_1.min) {
-							step++
-							let name = '请完善第' + (index + 1) + '行分类模版的' + '第' + (index_1 + 1) + '行分类的最低成本价'
-							this.$message.warning(name, 1.5)
-							return
-						}
-						if (!item_1.max) {
-							step++
-							let name = '请完善第' + (index + 1) + '行分类模版的' + '第' + (index_1 + 1) + '行分类的最高成本价'
-							this.$message.warning(name, 1.5)
-							return
-						}
-						if (!item_1.add_price_rate) {
-							step++
-							let name = '请完善第' + (index + 1) + '行分类模版的' + '第' + (index_1 + 1) + '行分类的利润率'
-							this.$message.warning(name, 1.5)
-							return
-						}
-						delete item_1.id
-					})
-				} else {
-					step++
-					let name = '请新增第' + (index + 1) + '行的价格区间'
-					this.$message.warning(name, 1.5)
-					return
-				}
-			})
-			if (step == 0) {
-				this.isLoading = true
-				GoodsApi.setStorePrice({
-					list: list,
-					type: 0,
-				})
-					.then((result) => {
-						// 显示提示信息
-						this.$message.success(result.message, 1.5)
-						this.getDetail()
-					})
-					.catch(() => {
-						this.isLoading = false
-					})
-					.finally(() => (this.isLoading = false))
-			}
-		},
-	},
+  data() {
+    return {
+      // 标签布局属性
+      labelCol: { span: 3 },
+      // 输入框布局属性
+      wrapperCol: { span: 10 },
+      // loading状态
+      isLoading: false,
+      // 当前表单元素
+      form: this.$form.createForm(this),
+      // 当前记录详情分类数据、
+      formData: GoodsModel.formData,
+      record: {},
+      checkList: [],
+      formItemLayoutWithOutLabel: {
+        wrapperCol: { span: 10, offset: 3 },
+      },
+    }
+  },
+  // 初始化数据
+  created() {
+    this.isLoading = true
+    // 获取form所需的数据
+    GoodsModel.getFromData().then(() => {
+      this.isLoading = false
+    })
+    this.form.getFieldDecorator('list', { initialValue: [], preserve: true })
+    this.getDataList() //渠道数据请求
+    // 获取当前详情记录
+    this.getDetail()
+  },
+  methods: {
+    onPrice(e, index_1, index_2, type) {
+      const { form } = this
+      const list = form.getFieldValue('list')
+      if (0 >= list[index_1].price_list[index_2].min) {
+        list[index_1].price_list[index_2].min = null
+        this.$message.warning('最低成本价必须大于0', 1.5)
+        list[index_1].price_list[index_2].startProfit = 0
+        list[index_1].price_list[index_2].endProfit = 0
+        return
+      }
+      if (0 >= list[index_1].price_list[index_2].max) {
+        list[index_1].price_list[index_2].max = null
+        this.$message.warning('最高成本价必须大于0', 1.5)
+        list[index_1].price_list[index_2].startProfit = 0
+        list[index_1].price_list[index_2].endProfit = 0
+        return
+      }
+      if (list[index_1].price_list[index_2].min > list[index_1].price_list[index_2].max) {
+        list[index_1].price_list[index_2].max = null
+        this.$message.warning('最高成本价不能低于最低成本价', 1.5)
+        list[index_1].price_list[index_2].startProfit = 0
+        list[index_1].price_list[index_2].endProfit = 0
+        return
+      }
+      if (
+        !list[index_1].price_list[index_2].min ||
+        !list[index_1].price_list[index_2].max ||
+        !list[index_1].price_list[index_2].add_price_rate
+      ) {
+        list[index_1].price_list[index_2].startProfit = 0
+        list[index_1].price_list[index_2].endProfit = 0
+        return
+      }
+      if (list[index_1].price_list[index_2].min && list[index_1].price_list[index_2].max) {
+        let rate = Number(list[index_1].price_list[index_2].add_price_rate)
+        list[index_1].price_list[index_2].startProfit = Number(
+          (list[index_1].price_list[index_2].min * (rate / 100)).toFixed(2)
+        )
+        list[index_1].price_list[index_2].endProfit = Number(
+          (list[index_1].price_list[index_2].max * (rate / 100)).toFixed(2)
+        )
+        list[index_1].price_list[index_2].add_price_rate = rate
+        form.setFieldsValue({
+          list: list,
+        })
+        this.$forceUpdate()
+      }
+    },
+    // 计算利润率
+    onRate(e, index_1, index_2) {
+      const { form } = this
+      const list = form.getFieldValue('list')
+      let rate = Number(list[index_1].price_list[index_2].add_price_rate)
+      let min = list[index_1].price_list[index_2].min
+      let max = list[index_1].price_list[index_2].max
+      if (!min) {
+        list[index_1].price_list[index_2].add_price_rate = ''
+        this.$message.warning('最低成本价必须大于0', 1.5)
+        return
+      }
+	   if ( !max) {
+        list[index_1].price_list[index_2].add_price_rate = ''
+        this.$message.warning('最高成本价必须大于0', 1.5)
+        return
+      }
+      if (0 > rate) {
+        list[index_1].price_list[index_2].add_price_rate = ''
+        this.$message.warning('利润率不能低于等于0', 1.5)
+        return
+      }
+      list[index_1].price_list[index_2].startProfit = Number(
+        (list[index_1].price_list[index_2].min * (rate / 100)).toFixed(2)
+      )
+      list[index_1].price_list[index_2].endProfit = Number(
+        (list[index_1].price_list[index_2].max * (rate / 100)).toFixed(2)
+      )
+      list[index_1].price_list[index_2].add_price_rate = rate
+      form.setFieldsValue({
+        list: list,
+      })
+      this.$forceUpdate()
+    },
+    onSelect(index, event) {
+      const { form, $nextTick } = this
+      const key = form.getFieldValue('list')
+      for (let i = 0; i < key.length; i++) {
+        if (i == index) {
+          key[i].category.push(event.value)
+        }
+      }
+      $nextTick(() => {
+        form.setFieldsValue({
+          list: key,
+        })
+        this.$forceUpdate()
+      })
+    },
+    deleteNodeById(nodes, ids) {
+      let that = this
+      for (let i = 0; i < nodes.length; i++) {
+        nodes[i].disabled = false
+        if (ids.includes(nodes[i].value) == true) {
+          nodes[i].disabled = true
+        }
+        if (nodes[i].children && nodes[i].children.length > 0) {
+          that.deleteNodeById(nodes[i].children, ids) // 递归查找子节点
+        }
+      }
+      return nodes
+    },
+    handleSelectChange(index, event) {
+      const { form, $nextTick } = this
+      const key = form.getFieldValue('list')
+      let category = []
+      for (let i = 0; i < key.length; i++) {
+        if (i !== index) {
+          key[i].category.forEach((item) => {
+            //forEach循环
+            category.push(Number(item))
+          })
+        }
+      }
+      $nextTick(() => {
+        this.formData.categoryList = this.deleteNodeById(this.formData.categoryList, category)
+        this.formData = this.formData
+        this.$forceUpdate()
+      })
+    },
+    // 删除模版列表
+    handleRemoveCondition(index) {
+      const { form } = this
+      const keys = form.getFieldValue('list')
+      keys.splice(index, 1) // 第二个参数1表示删除一个元素
+      form.setFieldsValue({
+        list: keys,
+      })
+      this.$forceUpdate()
+    },
+    // 新增模版列表
+    handleAddCondition() {
+      const { form } = this
+      const key = form.getFieldValue('list')
+      const keys = key ? key : []
+      const nextKeys = keys.concat([{ category: [], price_list: [], id: this.generateRandomString(8) }])
+      form.setFieldsValue({
+        list: nextKeys,
+      })
+    },
+    // 删除值列表
+    handleRemovePriceRate(index1, index2) {
+      const { form } = this
+      const priceList = form.getFieldValue('list')
+      priceList[index1].price_list.splice(index2, 1) // 第二个参数1表示删除一个元素
+      form.setFieldsValue({
+        list: priceList,
+      })
+      this.$forceUpdate()
+    },
+    // 新增值列表
+    handleAddPriceRate(index) {
+      const { form } = this
+      const priceList = form.getFieldValue('list')[index].price_list
+      const addList = priceList ? priceList : []
+      const nextKeys = addList.concat([
+        { max: '', min: '', add_price_rate: '', startProfit: 0, endProfit: 0, id: this.generateRandomString(8) },
+      ])
+      const conditionList = form.getFieldValue('list')
+      conditionList.forEach(function (item, mm) {
+        if (mm == index) {
+          item.price_list = nextKeys
+        }
+      })
+      form.setFieldsValue({
+        list: conditionList,
+      })
+    },
+    generateRandomString(length) {
+      let result = ''
+      const characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'
+      const charactersLength = characters.length
+      for (let i = 0; i < length; i++) {
+        result += characters.charAt(Math.floor(Math.random() * charactersLength))
+      }
+      return result
+    },
+    // 渠道
+    getDataList() {
+      return GoodsApi.getDataList().then((result) => {
+        const obj = result.data
+        Object.keys(obj).forEach((item) => {
+          this.checkList.push({ id: item, name: obj[item] })
+        })
+      })
+    },
+    formatCategoryIds(categoryIds) {
+      return categoryIds.map((id) => {
+        return { value: id }
+      })
+    },
+    convertToString(value) {
+      if (typeof value == 'number') {
+        return String(value)
+      }
+      return value
+    },
+    // 设置表单默认值
+    setFieldsValue() {
+      const { record, form, $nextTick } = this
+      const categoryAry = []
+      if (record.list) {
+        record.list = record.list.map((x) => {
+          x.id = this.generateRandomString(8)
+          return x
+        })
+        record.list.forEach((x, i) => {
+          record[`category${x.id}`] = this.formatCategoryIds(this.convertToString(x.category).split(','))
+          categoryAry.push(`category${x.id}`)
+          this.form.getFieldDecorator(`category${x.id}`, { initialValue: '', preserve: true })
+          x.category = this.convertToString(x.category).split(',')
+          x.price_list.forEach((m, j) => {
+            m.startProfit = Number((m.min * (Number(m.add_price_rate) / 100)).toFixed(2))
+            m.endProfit = Number((m.max * (Number(m.add_price_rate) / 100)).toFixed(2))
+          })
+        })
+      }
+      // 设置表单内容
+      !isEmpty(form.getFieldsValue()) &&
+        $nextTick(() => {
+          form.setFieldsValue(pick(record, ['list', ...categoryAry]))
+          this.$forceUpdate()
+        })
+    },
+    formatCategoryIds(categoryIds) {
+      return categoryIds.map((id) => {
+        return { value: id }
+      })
+    },
+    // 获取当前详情记录
+    getDetail() {
+      this.isLoading = true
+      GoodsApi.getStorePriceInfo({ type: 0 })
+        .then((result) => {
+          this.record = result.data
+          // 设置默认值
+          this.setFieldsValue()
+        })
+        .finally(() => (this.isLoading = false))
+    },
+    getChannel(val) {
+      this.form.open_channel = val
+    },
+    // 确认按钮
+    handleSubmit(e) {
+      e.preventDefault()
+      // 表单验证
+      const {
+        form: { validateFields },
+        onFormSubmit,
+      } = this
+      validateFields((errors, values) => {
+        !errors && onFormSubmit(values)
+      })
+    },
+    // 提交到后端api
+    onFormSubmit(values) {
+      const params = {}
+      params.list = values.list.map((x, i) => {
+        return {
+          category: values[`category${x.id}`],
+          price_list: x.price_list,
+        }
+      })
+      let step = 0
+      let list = params.list
+      list.forEach((item, index) => {
+        if (Array.isArray(item.category)) {
+          item.category = Array.from(item.category, ({ value }) => value).join(',')
+        }
+        if (!item.category) {
+          step++
+          let name = '请选择第' + (index + 1) + '行分类'
+          this.$message.warning(name, 1.5)
+          return
+        }
+        if (item.price_list.length > 0) {
+          item.price_list.forEach((item_1, index_1) => {
+            item_1.category = item.category
+            if (!item_1.min) {
+              step++
+              let name = '请完善第' + (index + 1) + '行分类模版的' + '第' + (index_1 + 1) + '行分类的最低成本价'
+              this.$message.warning(name, 1.5)
+              return
+            }
+            if (!item_1.max) {
+              step++
+              let name = '请完善第' + (index + 1) + '行分类模版的' + '第' + (index_1 + 1) + '行分类的最高成本价'
+              this.$message.warning(name, 1.5)
+              return
+            }
+            if (!item_1.add_price_rate) {
+              step++
+              let name = '请完善第' + (index + 1) + '行分类模版的' + '第' + (index_1 + 1) + '行分类的利润率'
+              this.$message.warning(name, 1.5)
+              return
+            }
+            delete item_1.id
+          })
+        } else {
+          step++
+          let name = '请新增第' + (index + 1) + '行的价格区间'
+          this.$message.warning(name, 1.5)
+          return
+        }
+      })
+      if (step == 0) {
+        this.isLoading = true
+        GoodsApi.setStorePrice({
+          list: list,
+          type: 0,
+        })
+          .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;
-	}
+  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;
-	}
+  padding-left: 10px;
+  .ant-form-item-control {
+    padding-left: 0;
+  }
 }
 /deep/.ant-input-prefix {
-	font-weight: bold;
+  font-weight: bold;
 }
 /deep/.ant-col-10 {
-	width: 80%;
+  width: 80%;
 }
 .fan {
-	display: flex;
-	align-items: top;
+  display: flex;
+  align-items: top;
 }
 .fan /deep/ .ant-form-item {
-	margin-bottom: 0;
+  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;
-	}
+  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;
+  margin-top: 20px;
 }
 .ruleTitle {
-	font-size: 14px;
-	font-family: PingFang SC, PingFang SC;
-	font-weight: 500;
-	color: #303030;
+  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;
+  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;
-	}
+  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>
diff --git a/src/views/setting/payment/template/Update.vue b/src/views/setting/payment/template/Update.vue
index 66f0696..ad23168 100644
--- a/src/views/setting/payment/template/Update.vue
+++ b/src/views/setting/payment/template/Update.vue
@@ -2,13 +2,7 @@
   <a-card :bordered="false">
     <div class="card-title">{{ $route.meta.title }}</div>
     <a-spin :spinning="isLoading">
-      <a-form-model
-        ref="myForm"
-        class="my-form"
-        :model="record"
-        :label-col="labelCol"
-        :wrapperCol="wrapperCol"
-      >
+      <a-form-model ref="myForm" class="my-form" :model="record" :label-col="labelCol" :wrapperCol="wrapperCol">
         <a-form-model-item
           label="支付模板名称"
           prop="name"
@@ -33,11 +27,7 @@
             <small>数字越小越靠前</small>
           </div>
         </a-form-model-item>
-        <a-form-model-item
-          label="支付方式"
-          prop="method"
-          :rules="[{ required: true, message: '请选择支付方式' }]"
-        >
+        <a-form-model-item label="支付方式" prop="method" :rules="[{ required: true, message: '请选择支付方式' }]">
           <a-radio-group v-model="record.method" disabled>
             <a-radio :value="PaymentMethodEnum.WECHAT.value">{{ PaymentMethodEnum.WECHAT.name }}</a-radio>
             <a-radio :value="PaymentMethodEnum.ALIPAY.value">{{ PaymentMethodEnum.ALIPAY.name }}</a-radio>
@@ -50,10 +40,7 @@
             </p>
             <p v-if="record.method === PaymentMethodEnum.ALIPAY.value" class="extra">
               支付宝开发者平台：
-              <a
-                href="https://open.alipay.com/dev/workspace"
-                target="_blank"
-              >https://open.alipay.com/dev/workspace</a>
+              <a href="https://open.alipay.com/dev/workspace" target="_blank">https://open.alipay.com/dev/workspace</a>
             </p>
           </div>
         </a-form-model-item>
@@ -88,10 +75,7 @@
             </a-radio-group>
           </a-form-model-item>
 
-          <div
-            v-if="record.config.wechat.mchType === 'normal'"
-            :mchType="record.config.wechat.mchType"
-          >
+          <div v-if="record.config.wechat.mchType === 'normal'" :mchType="record.config.wechat.mchType">
             <a-form-model-item
               label="应用ID (AppID)"
               prop="config.wechat.normal.appId"
@@ -99,7 +83,9 @@
             >
               <a-input v-model="record.config.wechat.normal.appId" autocomplete="off" />
               <div class="form-item-help">
-                <small>微信小程序或者微信公众号的APPID，需要在哪个客户端支付就填写哪个，APP支付需要填写开放平台的应用APPID</small>
+                <small
+                  >微信小程序或者微信公众号的APPID，需要在哪个客户端支付就填写哪个，APP支付需要填写开放平台的应用APPID</small
+                >
               </div>
             </a-form-model-item>
 
@@ -119,11 +105,7 @@
               prop="config.wechat.normal.apiKey"
               :rules="[{ required: true, message: '请填写支付密钥 (APIKEY)' }]"
             >
-              <a-input
-                type="password"
-                v-model="record.config.wechat.normal.apiKey"
-                autocomplete="off"
-              />
+              <a-input type="password" v-model="record.config.wechat.normal.apiKey" autocomplete="off" />
               <div class="form-item-help">
                 <small>"微信支付商户平台"" - "账户中心" - "API安全" - "设置API密钥"</small>
               </div>
@@ -160,10 +142,7 @@
             </a-form-model-item>
           </div>
 
-          <div
-            v-if="record.config.wechat.mchType === 'provider'"
-            :mchType="record.config.wechat.mchType"
-          >
+          <div v-if="record.config.wechat.mchType === 'provider'" :mchType="record.config.wechat.mchType">
             <a-form-model-item
               label="服务商应用ID (AppID)"
               prop="config.wechat.provider.spAppId"
@@ -191,11 +170,7 @@
               prop="config.wechat.provider.spApiKey"
               :rules="[{ required: true, message: '请填写服务商密钥 (APIKEY)' }]"
             >
-              <a-input
-                type="password"
-                v-model="record.config.wechat.provider.spApiKey"
-                autocomplete="off"
-              />
+              <a-input type="password" v-model="record.config.wechat.provider.spApiKey" autocomplete="off" />
               <div class="form-item-help">
                 <small>"微信支付商户平台"" - "账户中心" - "API安全" - "设置API密钥"</small>
               </div>
@@ -208,7 +183,9 @@
             >
               <a-input v-model="record.config.wechat.provider.subAppId" autocomplete="off" />
               <div class="form-item-help">
-                <small>微信小程序或者微信公众号的APPID，需要在哪个客户端支付就填写哪个，APP支付需要填写开放平台的应用APPID</small>
+                <small
+                  >微信小程序或者微信公众号的APPID，需要在哪个客户端支付就填写哪个，APP支付需要填写开放平台的应用APPID</small
+                >
               </div>
             </a-form-model-item>
 
@@ -313,7 +290,7 @@
             </a-form-model-item>
           </div>
 
-          <div v-if="record.config.alipay.signMode ===10" :method="record.method">
+          <div v-if="record.config.alipay.signMode === 10" :method="record.method">
             <a-form-model-item
               label="应用公钥证书"
               prop="config.alipay.appCertPublicKey"
@@ -375,7 +352,7 @@
             </div>
           </a-form-model-item>
         </div>
-  <!-- 汇付支付 -->
+        <!-- 汇付支付 -->
         <div v-if="record.method === PaymentMethodEnum.HUIFU.value" :method="record.method">
           <a-form-model-item
             label="商户号类型"
@@ -384,16 +361,28 @@
           >
             <a-radio-group v-model="record.config.huifu.mchType" @change="clearValidate()">
               <a-radio value="normal">普通商户</a-radio>
-              <a-radio value="provider">子商户 (服务商模式)</a-radio>
+              <!-- <a-radio value="provider">子商户 (服务商模式)</a-radio> -->
             </a-radio-group>
           </a-form-model-item>
           <div v-if="record.config.huifu.mchType === 'normal'" :mchType="record.config.huifu.mchType">
             <a-form-model-item
-              label="汇付商户号"
-              prop="config.huifu.normal.sysId"
-              :rules="[{ required: true, message: '请填写汇付商户号' }]"
+              label="APPID"
+              prop="config.huifu.normal.appid"
+              :rules="[{ required: true, message: '请填写APPID' }]"
+            >
+              <a-input v-model="record.config.huifu.normal.appid" autocomplete="off" />
+              <div class="form-item-help">
+                <small
+                  >微信小程序或者微信公众号的APPID，需要在哪个客户端支付就填写哪个，APP支付需要填写开放平台的应用APPID</small
+                >
+              </div>
+            </a-form-model-item>
+            <a-form-model-item
+              label="APPKEY"
+              prop="config.huifu.normal.appkey"
+              :rules="[{ required: true, message: '请填写APPKEY' }]"
             >
-              <a-input v-model="record.config.huifu.normal.sysId" autocomplete="off" />
+              <a-input v-model="record.config.huifu.normal.appkey" autocomplete="off" />
               <div class="form-item-help">
                 <small
                   >微信小程序或者微信公众号的APPID，需要在哪个客户端支付就填写哪个，APP支付需要填写开放平台的应用APPID</small
@@ -402,36 +391,39 @@
             </a-form-model-item>
 
             <a-form-model-item
-              label="产品编号"
-              prop="config.huifu.normal.productId"
-              :rules="[{ required: true, message: '请填写产品编号' }]"
+              label="商户编号"
+              prop="config.huifu.normal.mid"
+              :rules="[{ required: true, message: '请填写商户编号' }]"
             >
-              <a-input v-model="record.config.huifu.normal.productId" autocomplete="off" />
+              <a-input v-model="record.config.huifu.normal.mid" autocomplete="off" />
             </a-form-model-item>
             <a-form-model-item
-              label="商户私钥"
-              prop="config.huifu.normal.rsaMerchPrivateKey"
-              :rules="[{ required: true, message: '请填写商户私钥' }]"
+              label="终端号"
+              prop="config.huifu.normal.tid"
+              :rules="[{ required: true, message: '请填终端号' }]"
             >
-              <a-textarea
-                v-model="record.config.huifu.normal.rsaMerchPrivateKey"
-                :autoSize="{ minRows: 4, maxRows: 6 }"
-                autocomplete="off"
-              />
-              <div class="form-item-help">
-                <small>"微信支付商户平台"" - "账户中心" - "API安全" - "设置API密钥"</small>
-              </div>
+              <a-input v-model="record.config.huifu.normal.tid" autocomplete="off" />
             </a-form-model-item>
             <a-form-model-item
-              label="汇付公钥"
-              prop="config.huifu.normal.rsaHuifuPublicKey"
-              :rules="[{ required: true, message: '请填写汇付公钥' }]"
+              label="来源编号"
+              prop="config.huifu.normal.msgSrcId"
+              :rules="[{ required: true, message: '请填来源编号' }]"
             >
-              <a-textarea
-                v-model="record.config.huifu.normal.rsaHuifuPublicKey"
-                :autoSize="{ minRows: 4, maxRows: 6 }"
-                autocomplete="off"
-              />
+              <a-input v-model="record.config.huifu.normal.msgSrcId" autocomplete="off" />
+            </a-form-model-item>
+            <a-form-model-item
+              label="消息来源"
+              prop="config.huifu.normal.msgSrc"
+              :rules="[{ required: true, message: '请填消息来源' }]"
+            >
+              <a-input v-model="record.config.huifu.normal.msgSrc" autocomplete="off" />
+            </a-form-model-item>
+            <a-form-model-item
+              label="密钥（网付）"
+              prop="config.huifu.normal.md5Secret"
+              :rules="[{ required: true, message: '请填写支付密钥（网付）' }]"
+            >
+              <a-input type="password" v-model="record.config.huifu.normal.md5Secret" autocomplete="off" />
               <div class="form-item-help">
                 <small>"微信支付商户平台"" - "账户中心" - "API安全" - "设置API密钥"</small>
               </div>
@@ -440,57 +432,71 @@
 
           <div v-if="record.config.huifu.mchType === 'provider'" :mchType="record.config.huifu.mchType">
             <a-form-model-item
-              label="汇付商户号"
-              prop="config.huifu.provider.spSysId"
-              :rules="[{ required: true, message: '请填写汇付商户号' }]"
+              label="APPID"
+              prop="config.huifu.provider.spAppid"
+              :rules="[{ required: true, message: '请填写APPID' }]"
             >
-              <a-input v-model="record.config.huifu.provider.spAppId" autocomplete="off" />
+              <a-input v-model="record.config.huifu.provider.spAppid" autocomplete="off" />
               <div class="form-item-help">
                 <small>请填写微信支付服务商的AppID</small>
               </div>
             </a-form-model-item>
-
             <a-form-model-item
-              label="产品编号"
-              prop="config.huifu.provider.spProductId"
-              :rules="[{ required: true, message: '请填写产品编号' }]"
+              label="APPKEY"
+              prop="config.huifu.provider.syAppkey"
+              :rules="[{ required: true, message: '请填写APPKEY' }]"
             >
-              <a-input v-model="record.config.huifu.provider.spProductId" autocomplete="off" />
+              <a-input v-model="record.config.huifu.provider.syAppkey" autocomplete="off" />
               <div class="form-item-help">
-                <small>微信支付服务商的商户号，纯数字格式；例如：1600000109</small>
+                <small>请填写微信支付服务商的AppID</small>
               </div>
             </a-form-model-item>
-
             <a-form-model-item
-              label="商户私钥"
-              prop="config.huifu.provider.spRsaMerchPrivateKey"
-              :rules="[{ required: true, message: '请填写商户私钥' }]"
+              label="商户编号"
+              prop="config.huifu.provider.syMid"
+              :rules="[{ required: true, message: '请填写商户编号' }]"
             >
-              <a-textarea
-                v-model="record.config.huifu.provider.spRsaMerchPrivateKey"
-                :autoSize="{ minRows: 4, maxRows: 6 }"
-                autocomplete="off"
-              />
-              <div class="form-item-help">
-                <small>"微信支付商户平台"" - "账户中心" - "API安全" - "设置API密钥"</small>
-              </div>
+              <a-input v-model="record.config.huifu.provider.syMid" autocomplete="off" />
+              <!-- <div class="form-item-help">
+                <small>微信支付服务商的商户号，纯数字格式；例如：1600000109</small>
+              </div> -->
             </a-form-model-item>
             <a-form-model-item
-              label="汇付公钥"
-              prop="config.huifu.provider.spRsaHuifuPublicKey"
-              :rules="[{ required: true, message: '请填写汇付公钥' }]"
+              label="终端号"
+              prop="config.huifu.provider.syTid"
+              :rules="[{ required: true, message: '请填写终端号' }]"
             >
-              <a-textarea
-                v-model="record.config.huifu.provider.spRsaHuifuPublicKey"
-                :autoSize="{ minRows: 4, maxRows: 6 }"
-                autocomplete="off"
-              />
+              <a-input v-model="record.config.huifu.provider.syTid" autocomplete="off" />
+            </a-form-model-item>
+            <a-form-model-item
+              label="来源编号"
+              prop="config.huifu.provider.syMsgSrcId"
+              :rules="[{ required: true, message: '请填写来源编号' }]"
+            >
+              <a-input v-model="record.config.huifu.provider.syMsgSrcId" autocomplete="off" />
+            </a-form-model-item>
+            <a-form-model-item
+              label="消息来源"
+              prop="config.huifu.provider.syMsgSrc"
+              :rules="[{ required: true, message: '请填写终端号' }]"
+            >
+              <a-input v-model="record.config.huifu.provider.syMsgSrc" autocomplete="off" />
+              <!-- <div class="form-item-help">
+                <small>微信支付服务商的商户号，纯数字格式；例如：1600000109</small>
+              </div> -->
+            </a-form-model-item>
+            <a-form-model-item
+              label="密钥（网付）"
+              prop="config.huifu.provider.syMd5Secret"
+              :rules="[{ required: true, message: '请填写支付密钥（网付）' }]"
+            >
+              <a-input type="password" v-model="record.config.huifu.normal.syMd5Secret" autocomplete="off" />
               <div class="form-item-help">
                 <small>"微信支付商户平台"" - "账户中心" - "API安全" - "设置API密钥"</small>
               </div>
             </a-form-model-item>
 
-            <a-form-model-item
+            <!-- <a-form-model-item
               label="子商户私钥"
               prop="config.huifu.provider.subAppId"
               :rules="[{ required: true, message: '请填写子商户应用ID (AppID)' }]"
@@ -519,7 +525,7 @@
               <div class="form-item-help">
                 <small>微信支付的商户号，纯数字格式；例如：1600000109</small>
               </div>
-            </a-form-model-item>
+            </a-form-model-item> -->
           </div>
         </div>
         <a-form-model-item :wrapperCol="{ offset: labelCol.span }">
@@ -562,8 +568,8 @@ const defaultData = {
         subAppId: '',
         subMchId: '',
         spApiclientCert: '',
-        spApiclientKey: ''
-      }
+        spApiclientKey: '',
+      },
     },
     [PaymentMethodEnum.ALIPAY.value]: {
       appId: '',
@@ -573,23 +579,29 @@ const defaultData = {
       appCertPublicKey: '',
       alipayCertPublicKey: '',
       alipayRootCert: '',
-      merchantPrivateKey: ''
+      merchantPrivateKey: '',
     },
-     [PaymentMethodEnum.HUIFU.value]: {
+    [PaymentMethodEnum.HUIFU.value]: {
       // 微信商户号类型（normal普通商户 provider子商户）
       mchType: 'normal',
       normal: {
         sysId: '',
-        productId: '',
-        rsaMerchPrivateKey: '',
-        rsaHuifuPublicKey: '',
+        appkey: '',
+        mid: '',
+        tid: '',
+        msgSrcId: '',
+        msgSrc: '',
+        md5Secret: '',
       },
       provider: {
         sysId: '',
-        productId: '',
-        rsaMerchPrivateKey: '',
-        rsaHuifuPublicKey: '',
-        // spSysId: '',
+        syAppkey: '',
+        syMid: '',
+        syTid: '',
+        syMsgSrcId: '',
+        syMsgSrc: '',
+        syMd5Secret: '',
+        // spAppid: '',
         // spProductId: '',
         // spRsaMerchPrivateKey: '',
         // spRsaHuifuPublicKey: '',
@@ -597,14 +609,14 @@ const defaultData = {
         // spApiclientKey: '',
       },
     },
-  }
+  },
 }
 
 export default {
   components: {
-    InputFile
+    InputFile,
   },
-  data () {
+  data() {
     return {
       // 正在加载
       isLoading: false,
@@ -635,48 +647,47 @@ export default {
     '$route.query.templateId': {
       // 首次加载的时候执行函数
       immediate: true,
-      handler (val) {
+      handler(val) {
         // 记录当前模板ID
         this.templateId = val
         // 获取当前记录
         this.getDetail()
-      }
-    }
+      },
+    },
   },
-  created () { },
+  created() {},
   methods: {
-
     // 获取当前记录
-    getDetail () {
+    getDetail() {
       this.isLoading = true
       Api.detail(this.templateId)
-        .then(result => {
+        .then((result) => {
           // 当前记录
           this.record = { ...defaultData, ...result.data.detail }
         })
-        .finally(() => this.isLoading = false)
+        .finally(() => (this.isLoading = false))
     },
 
     // 移除表单项的校验结果
-    clearValidate () {
+    clearValidate() {
       this.$refs.myForm.clearValidate()
     },
 
     // 点击表单提交
-    handleSubmit (e) {
+    handleSubmit(e) {
       e.preventDefault()
-      this.$refs.myForm.validate(valid => {
+      this.$refs.myForm.validate((valid) => {
         if (valid) {
           this.onSubmitForm()
         } else {
           console.log('validate error')
           return false
         }
-      });
+      })
     },
 
     // 上传文件后记录到 uploadFiles中
-    onChangeInputFile (name, args, key) {
+    onChangeInputFile(name, args, key) {
       const { uploadFiles } = this
       if (args[1] !== null) {
         uploadFiles[key] = args[1]
@@ -684,12 +695,12 @@ export default {
     },
 
     // 表单数据提交到后端
-    onSubmitForm () {
+    onSubmitForm() {
       this.isLoading = true
       this.isBtnLoading = true
       const formData = this.buildFormData()
       Api.edit(formData)
-        .then(result => {
+        .then((result) => {
           // 显示成功
           this.$message.success(result.message, 1.5)
           // 跳转到列表页
@@ -697,12 +708,12 @@ export default {
             this.$router.push('./index')
           }, 1500)
         })
-        .catch(() => this.isBtnLoading = false)
-        .finally(() => this.isLoading = false)
+        .catch(() => (this.isBtnLoading = false))
+        .finally(() => (this.isLoading = false))
     },
 
     // 生成表单数据 FormData格式
-    buildFormData () {
+    buildFormData() {
       const { record, uploadFiles, templateId } = this
       const formData = new FormData()
       formData.append('templateId', templateId)
@@ -717,9 +728,8 @@ export default {
         }
       }
       return formData
-    }
-
-  }
+    },
+  },
 }
 </script>