From 26f286a23f94c7ad9520e1c95c96fc0a814d818b Mon Sep 17 00:00:00 2001
From: xuwenbo <717567226@qq.com>
Date: Tue, 1 Sep 2020 10:18:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A7=92=E6=9D=80=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99=E5=8F=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production                     |  4 +--
 src/views/activity/seckill/form.vue |  4 ++-
 src/views/shop/goods/index.vue      | 42 -----------------------------
 3 files changed, 5 insertions(+), 45 deletions(-)

diff --git a/.env.production b/.env.production
index b8dc239..e1465ff 100644
--- a/.env.production
+++ b/.env.production
@@ -1,5 +1,5 @@
 ENV = 'production'
 
 # 接口地址
-VUE_APP_BASE_API  = 'https://app2.yixiang.co'
-VUE_APP_WS_API = 'ws://app2.yixiang.co'
+VUE_APP_BASE_API  = 'https://consoleapi.xinxintuan.co'
+VUE_APP_WS_API = 'ws://consoleapi.xinxintuan.co'
diff --git a/src/views/activity/seckill/form.vue b/src/views/activity/seckill/form.vue
index b20240e..12b0df9 100644
--- a/src/views/activity/seckill/form.vue
+++ b/src/views/activity/seckill/form.vue
@@ -50,6 +50,9 @@
           <el-form-item label="秒杀价">
             <el-input-number v-model="formValidate.price" />
           </el-form-item>
+          <el-form-item label="返积分">
+            <el-input-number v-model="formValidate.giveIntegral" />
+          </el-form-item>
           <el-form-item label="活动状态">
             <el-radio v-model="formValidate.status" :label="1">开启</el-radio>
             <el-radio v-model="formValidate.status" :label="0" style="width: 200px;">关闭</el-radio>
@@ -139,7 +142,6 @@
                     <el-input type="text" v-model="scope.row.sekill_stock" />
                   </template>
                 </el-table-column>
-
                 <el-table-column prop="bar_code" label="商品编号" align="center">
                   <template slot-scope="scope">
                     <el-input type="text" v-model="scope.row.bar_code" :disabled="true"/>
diff --git a/src/views/shop/goods/index.vue b/src/views/shop/goods/index.vue
index b6e4d3d..f4129d9 100644
--- a/src/views/shop/goods/index.vue
+++ b/src/views/shop/goods/index.vue
@@ -36,7 +36,6 @@
       </div>
     </div>
     <!--表单组件-->
-    <killForm ref="form4" :is-add="isAdd" />
     <bargainForm ref="form5" :is-add="isAdd" />
     <!--表格渲染-->
     <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
@@ -85,13 +84,6 @@
           <el-dropdown size="mini" split-button type="primary" trigger="click">
             操作
             <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item>
-                <el-button
-                  size="mini"
-                  type="primary"
-                  @click="editD(scope.row)"
-                >开启秒杀</el-button>
-              </el-dropdown-item>
               <el-dropdown-item>
                 <el-button
                   size="mini"
@@ -292,40 +284,6 @@ export default {
       }
       _this.dialog = true
     },
-    editD(data) {
-      this.isAdd = false
-      const _this = this.$refs.form4
-      _this.form = {
-        productId: data.id,
-        merId: data.merId,
-        image: data.image,
-        images: data.sliderImage,
-        imageArr: data.image.split(','),
-        sliderImageArr: data.sliderImage.split(','),
-        title: data.storeName,
-        info: data.storeInfo,
-        postage: data.postage,
-        unitName: data.unitName,
-        sort: data.sort,
-        sales: data.sales,
-        stock: data.stock,
-        isShow: data.isShow,
-        status: 1,
-        isHot: data.isHot,
-        description: data.description,
-        isPostage: data.isPostage,
-        people: 0,
-        price: 0.01,
-        effectiveTime: 24,
-        otPrice: data.otPrice,
-        cost: data.cost,
-        num: 1,
-        giveIntegral: 0,
-        isDel: 0,
-        browse: 0
-      }
-      _this.dialog = true
-    },
     editE(data) {
       this.isAdd = false
       const _this = this.$refs.form5