v2.2 正式发布

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 => {

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>

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>