From f34ec38611936cc5abb6197470b10d30f2056d81 Mon Sep 17 00:00:00 2001
From: xuwenbo <717567226@qq.com>
Date: Tue, 19 May 2020 09:47:11 +0800
Subject: [PATCH 1/2] =?UTF-8?q?bug:=E4=BF=AE=E6=94=B9=E7=B4=A0=E6=9D=90?=
 =?UTF-8?q?=E7=B4=A2=E5=BC=95=E5=8F=82=E6=95=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/material/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/material/index.vue b/src/components/material/index.vue
index cfaf25c..be4ea41 100644
--- a/src/components/material/index.vue
+++ b/src/components/material/index.vue
@@ -341,7 +341,7 @@ export default {
         size: page.pageSize,
         descs: this.page.descs,
         ascs: this.page.ascs,
-        sort: 'createTime,desc'
+        sort: 'create_time,desc'
       }, {
         groupId: this.groupId
       })).then(response => {

From 597a86f1b64bc723304e94815a5438947c07b4d5 Mon Sep 17 00:00:00 2001
From: hupeng <guchengwuyue@163.com>
Date: Tue, 19 May 2020 10:55:58 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=A0=8D=E4=BB=B7?=
 =?UTF-8?q?=E4=B8=8E=E6=8B=BC=E5=9B=A2=E8=A1=A8=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/activity/bargain/form.vue     | 11 ++---------
 src/views/activity/combination/form.vue | 18 +++++++-----------
 2 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/src/views/activity/bargain/form.vue b/src/views/activity/bargain/form.vue
index e6e60ec..f762655 100644
--- a/src/views/activity/bargain/form.vue
+++ b/src/views/activity/bargain/form.vue
@@ -59,12 +59,9 @@
       <el-form-item label="用户每次砍价的次数">
         <el-input-number v-model="form.bargainNum" />
       </el-form-item>
-      <el-form-item label="反多少积分">
-        <el-input-number v-model="form.giveIntegral" />
-      </el-form-item>
       <el-form-item label="砍价状态">
-        <el-radio v-model="form.status" :label="1">到砍价时间自动开启</el-radio>
-        <el-radio v-model="form.status" :label="0" style="width: 110px;">到砍价时间不自动开启</el-radio>
+        <el-radio v-model="form.status" :label="1">开启</el-radio>
+        <el-radio v-model="form.status" :label="0" style="width: 110px;">关闭</el-radio>
       </el-form-item>
       <el-form-item label="成本价">
         <el-input-number v-model="form.cost" />
@@ -72,10 +69,6 @@
       <el-form-item label="排序">
         <el-input-number v-model="form.sort" />
       </el-form-item>
-      <el-form-item label="是否推荐">
-        <el-radio v-model="form.isHot" :label="1">是</el-radio>
-        <el-radio v-model="form.isHot" :label="0" style="width: 110px;">否</el-radio>
-      </el-form-item>
       <el-form-item label="是否包邮">
         <el-radio v-model="form.isPostage" :label="1">是</el-radio>
         <el-radio v-model="form.isPostage" :label="0" style="width: 110px;">否</el-radio>
diff --git a/src/views/activity/combination/form.vue b/src/views/activity/combination/form.vue
index 63d68a6..e5928b5 100644
--- a/src/views/activity/combination/form.vue
+++ b/src/views/activity/combination/form.vue
@@ -35,34 +35,30 @@
         <MaterialList v-model="form.sliderImageArr" style="width: 500px" type="image" :num="4" :width="150" :height="150" />
       </el-form-item>
       <el-form-item label="拼团时效(单位小时)">
-        <el-input v-model="form.effectiveTime" style="width: 500px;" />
+        <el-input-number v-model="form.effectiveTime" style="width: 500px;" />
       </el-form-item>
       <el-form-item label="拼团价">
-        <el-input v-model="form.price" />
+        <el-input-number v-model="form.price" />
       </el-form-item>
       <el-form-item label="拼团人数">
-        <el-input v-model="form.people" />
+        <el-input-number v-model="form.people" />
       </el-form-item>
       <el-form-item label="库存">
-        <el-input v-model="form.stock" />
+        <el-input-number v-model="form.stock" />
       </el-form-item>
       <el-form-item label="销量">
-        <el-input v-model="form.sales" />
+        <el-input-number v-model="form.sales" />
       </el-form-item>
       <el-form-item label="排序">
-        <el-input v-model="form.sort" />
+        <el-input-number v-model="form.sort" />
       </el-form-item>
       <el-form-item label="邮费">
-        <el-input v-model="form.postage" />
+        <el-input-number v-model="form.postage" />
       </el-form-item>
       <el-form-item label="是否包邮">
         <el-radio v-model="form.isPostage" :label="1">是</el-radio>
         <el-radio v-model="form.isPostage" :label="0" style="width: 110px;">否</el-radio>
       </el-form-item>
-      <el-form-item label="热门推荐">
-        <el-radio v-model="form.isHost" :label="1">是</el-radio>
-        <el-radio v-model="form.isHost" :label="0" style="width: 200px;">否</el-radio>
-      </el-form-item>
       <el-form-item label="活动状态">
         <el-radio v-model="form.isShow" :label="1">开启</el-radio>
         <el-radio v-model="form.isShow" :label="0" style="width: 200px;">关闭</el-radio>