From 4a6067bcbd43b3fc03aea3b82f03ffcb994be4e8 Mon Sep 17 00:00:00 2001
From: chenjiajun <chenjiajun@hxiaolian.com>
Date: Sat, 3 Jul 2021 01:29:36 +0800
Subject: [PATCH 1/6] update

---
 src/layout/components/Sidebar/Logo.vue | 2 +-
 src/settings.js                        | 6 +++---
 src/views/login.vue                    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue
index 7a68286..f38c126 100644
--- a/src/layout/components/Sidebar/Logo.vue
+++ b/src/layout/components/Sidebar/Logo.vue
@@ -25,7 +25,7 @@ export default {
   },
   data() {
     return {
-      title: '乐享美酒-后台管理',
+      title: 'YSHOP-后台管理',
       logo: Logo
     }
   }
diff --git a/src/settings.js b/src/settings.js
index d43aad9..8f5570b 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -2,7 +2,7 @@ module.exports = {
   /**
    * @description 网站标题
    */
-  title: '乐享美酒',
+  title: 'YSHOP-3.2',
   /**
    * @description 是否显示 tagsView
    */
@@ -42,9 +42,9 @@ module.exports = {
   /**
    * 底部文字，支持html语法
    */
-  footerTxt: '',
+  footerTxt: '© 2019-2021 YSHOP <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">All Rights Reserved</a>',
   /**
    * 备案号
    */
-  caseNumber: ''
+  caseNumber: '豫ICP备17049587-2号'
 }
diff --git a/src/views/login.vue b/src/views/login.vue
index e2cdbe3..bf6b3dd 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -6,7 +6,7 @@
       </div>
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" label-position="left" label-width="0px" class="login-form">
       <h3 class="title">
-       乐享美酒管理后台
+       YSHOP后台管理系统-3.2
       </h3>
       <el-form-item prop="username">
         <el-input v-model="loginForm.username" type="text" auto-complete="off" placeholder="账号">

From 0c28de8318893189f45775939b8f1627dab66633 Mon Sep 17 00:00:00 2001
From: chenjiajun <chenjiajun@hxiaolian.com>
Date: Sat, 3 Jul 2021 01:35:03 +0800
Subject: [PATCH 2/6] update

---
 src/layout/components/Navbar.vue |  4 ++++
 src/views/login.vue              | 17 +++++++++++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index eccc7d2..9100591 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -8,6 +8,10 @@
       <template v-if="device!=='mobile'">
         <search id="header-search" class="right-menu-item" />
 
+        <el-tooltip content="源码地址" effect="dark" placement="bottom">
+          <Github class="right-menu-item hover-effect" />
+        </el-tooltip>
+
         <el-tooltip content="全屏缩放" effect="dark" placement="bottom">
           <screenfull id="screenfull" class="right-menu-item hover-effect" />
         </el-tooltip>
diff --git a/src/views/login.vue b/src/views/login.vue
index bf6b3dd..95473d7 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -2,11 +2,24 @@
   <div class="login">
     <div style="display:flex;justify-content:space-between;align-items: center;">
       <div style="padding: 0 60px 0 0">
-
+        <h3 style="color: #ffffff;font-size: 24px;padding: 0;margin-bottom: 10px">
+          YSHOP单商户B2C电商系统
+        </h3>
+        <ul style="margin: 0;color: #ffffff;font-size: 15px;line-height: 25px;padding-left: 20px">
+          <li>Springboot2</li>
+          <li>MybatisPlus</li>
+          <li>SpringSecurity</li>
+          <li>Jwt</li>
+          <li>Redis</li>
+          <li>Vue</li>
+        </ul>
+        <h3 style="color: #ffffff;">
+          官网:https://www.yixiang.co
+        </h3>
       </div>
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" label-position="left" label-width="0px" class="login-form">
       <h3 class="title">
-       YSHOP后台管理系统-3.2
+        YSHOP后台管理系统-3.2
       </h3>
       <el-form-item prop="username">
         <el-input v-model="loginForm.username" type="text" auto-complete="off" placeholder="账号">

From e315565338a3c30db66da69e5633eb7bd1f35e49 Mon Sep 17 00:00:00 2001
From: kahu474 <kahu474@163.com>
Date: Mon, 12 Jul 2021 16:08:45 +0800
Subject: [PATCH 3/6] bug

---
 .env.development                        |   2 +-
 src/views/activity/combination/form.vue | 309 +++++++++++++-----------
 src/views/shop/set/seckillform.vue      |   8 +
 3 files changed, 176 insertions(+), 143 deletions(-)

diff --git a/.env.development b/.env.development
index 996508b..10763e2 100644
--- a/.env.development
+++ b/.env.development
@@ -2,7 +2,7 @@ ENV = 'development'
 
 # 接口地址
 # VUE_APP_BASE_API  = 'http://8.129.208.109:8001'
-VUE_APP_BASE_API  = 'http://www.itxzz.top'
+VUE_APP_BASE_API  = 'http://itxzz.51vip.biz'
 VUE_APP_WS_API = 'ws://8.129.208.109:8001'
 
 
diff --git a/src/views/activity/combination/form.vue b/src/views/activity/combination/form.vue
index 8936356..94933b6 100644
--- a/src/views/activity/combination/form.vue
+++ b/src/views/activity/combination/form.vue
@@ -1,12 +1,12 @@
 <template>
   <div class="app-container">
     <el-card :bordered="false">
-      <el-form  ref="formValidate" :rules="ruleValidate" :model="formValidate" label-width="130px" >
+      <el-form ref="formValidate" :rules="ruleValidate" :model="formValidate" label-width="130px">
         <el-row :gutter="24">
           <!-- 商品信息-->
           <el-col :span="24">
             <el-form-item label="选择商品：" prop="good">
-              <cgood v-model="form1.good" ></cgood>
+              <cgood v-model="form1.good"></cgood>
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -16,7 +16,7 @@
           </el-col>
           <el-col :span="24">
             <el-form-item label="拼团简介" prop="info">
-              <el-input v-model="formValidate.info"  @input="onInput()" style="width: 500px;" placeholder="请输入拼团简介"/>
+              <el-input v-model="formValidate.info" @input="onInput()" style="width: 500px;" placeholder="请输入拼团简介"/>
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -24,13 +24,19 @@
               <el-input v-model="formValidate.unitName" @input="onInput()" style="width: 500px;" placeholder="请输入单位"/>
             </el-form-item>
           </el-col>
+          <el-col :span="24">
+            <el-form-item label="商品原价">
+<!--              oneFormValidate[0].cost-->
+              <el-input type="text" style="width: 500px;" disabled v-model="formValidate.productPrice" />
+            </el-form-item>
+          </el-col>
           <el-col :span="24">
             <el-form-item label="拼团开始时间" prop="startTime">
               <template>
                 <el-date-picker
-                  v-model="formValidate.startTime"
-                  type="datetime"
-                  placeholder="选择日期时间"
+                    v-model="formValidate.startTime"
+                    type="datetime"
+                    placeholder="选择日期时间"
                 />
               </template>
             </el-form-item>
@@ -39,84 +45,89 @@
             <el-form-item label="拼团结束时间" prop="stopTime">
               <template>
                 <el-date-picker
-                  v-model="formValidate.stopTime"
-                  type="datetime"
-                  placeholder="选择日期时间"
+                    v-model="formValidate.stopTime"
+                    type="datetime"
+                    placeholder="选择日期时间"
                 />
               </template>
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="活动状态"  prop="isShow">
+            <el-form-item label="活动状态" prop="isShow">
               <el-radio v-model="formValidate.isShow" :label="1">开启</el-radio>
               <el-radio v-model="formValidate.isShow" :label="0" style="width: 200px;">关闭</el-radio>
             </el-form-item>
           </el-col>
           <el-col :span="24">
             <el-form-item label="产品主图片" prop="image">
-              <single-pic v-model="formValidate.image" style="width: 500px" type="image" :num="1" :width="150" :height="150" />
+              <single-pic v-model="formValidate.image" style="width: 500px" type="image" :num="1" :width="150"
+                          :height="150"/>
             </el-form-item>
           </el-col>
           <el-col :span="24">
             <el-form-item label="产品轮播图" prop="slider_image">
-              <MaterialList v-model="formValidate.slider_image" style="width: 500px" type="image" :num="4" :width="150" :height="150" />
+              <MaterialList v-model="formValidate.slider_image" style="width: 500px" type="image" :num="4" :width="150"
+                            :height="150"/>
             </el-form-item>
           </el-col>
           <el-col :span="24">
             <el-form-item label="拼团时效(小时)" prop="effectiveTime">
-              <el-input-number v-model="formValidate.effectiveTime" style="width: 500px;" />
+              <el-input-number v-model="formValidate.effectiveTime" style="width: 500px;"/>
             </el-form-item>
           </el-col>
           <el-col :span="24">
             <el-form-item label="拼团人数" prop="people">
-              <el-input-number  :min="1" :max="99" v-model="formValidate.people" />
+              <el-input-number :min="1" :max="99" v-model="formValidate.people"/>
             </el-form-item>
           </el-col>
 
           <el-col :span="24">
             <el-form-item label="商品规格：" props="spec_type">
-              <el-radio-group v-model="formValidate.spec_type"  @change="changeSpec" :disabled="true">
+              <el-radio-group v-model="formValidate.spec_type" @change="changeSpec" :disabled="true">
                 <el-radio :label="0" class="radio">单规格</el-radio>
-                <el-radio :label="1">多规格{{formValidate.spec_typ}}</el-radio>
+                <el-radio :label="1">多规格{{ formValidate.spec_typ }}</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
           <!-- 多规格设置-->
-          <el-col :xl="24" :lg="24" :md="24" :sm="24" :xs="24" v-if="manyFormValidate.length && formValidate.header.length!==0 && attrs.length!==0">
+          <el-col :xl="24" :lg="24" :md="24" :sm="24" :xs="24"
+                  v-if="manyFormValidate.length && formValidate.header.length!==0 && attrs.length!==0">
             <!-- 多规格表格-->
             <el-col :span="24">
               <el-form-item label="商品属性：" class="labeltop">
-                <el-table :data="manyFormValidate"   size="small" style="width: 90%;">
-                  <el-table-column type="myindex" v-for="(item,index) in formValidate.header" :key="index" :label="item.title" :property="item.slot" align="center">
+                <el-table :data="manyFormValidate" size="small" style="width: 90%;">
+                  <el-table-column type="myindex" v-for="(item,index) in formValidate.header" :key="index"
+                                   :label="item.title" :property="item.slot" align="center">
                     <template slot-scope="scope">
                       <div v-if="scope.column.property == 'pic'">
-                        <single-pic v-model="scope.row[scope.column.property]" type="image" :num="1" :width="60" :height="60" align="center"/>
+                        <single-pic v-model="scope.row[scope.column.property]" type="image" :num="1" :width="60"
+                                    :height="60" align="center"/>
                       </div>
-                      <div v-else-if="scope.column.property.indexOf('value') != -1" >
-                       {{ scope.row[scope.column.property] }}
+                      <div v-else-if="scope.column.property.indexOf('value') != -1">
+                        {{ scope.row[scope.column.property] }}
                       </div>
-                      <div v-else-if="scope.column.property == 'pink_price'||scope.column.property == 'pink_stock'"  >
-                        <el-input  v-model="scope.row[scope.column.property]" align="center"/>
+                      <div v-else-if="scope.column.property == 'pink_price'||scope.column.property == 'pink_stock'">
+                        <el-input v-model="scope.row[scope.column.property]" align="center"/>
                       </div>
-                      <div v-else-if="scope.column.property == 'action'" align="center" >
-                        <a  :disabled="true" align="center">不可删除</a>
+                      <div v-else-if="scope.column.property == 'action'" align="center">
+                        <a :disabled="true" align="center">不可删除</a>
                       </div>
                       <div v-else>
-                        <el-input  v-model="scope.row[scope.column.property]" :disabled="true" align="center"/>
+                        <el-input v-model="scope.row[scope.column.property]" :disabled="true" align="center"/>
                       </div>
                     </template>
                   </el-table-column>
                 </el-table>
               </el-form-item>
-          </el-col>
+            </el-col>
           </el-col>
           <!-- 单规格表格-->
           <el-col :xl="23" :lg="24" :md="24" :sm="24" :xs="24" v-if="formValidate.spec_type === 0">
-            <el-form-item >
-              <el-table :data="oneFormValidate"  size="small" style="width: 90%;">
+            <el-form-item>
+              <el-table :data="oneFormValidate" size="small" style="width: 90%;">
                 <el-table-column prop="pic" label="图片" align="center">
                   <template slot-scope="scope">
-                    <single-pic v-model="scope.row.pic" type="image" :num="1" :width="60" :height="60" />
+                    <single-pic v-model="scope.row.pic" type="image" :num="1" :width="60" :height="60"/>
                   </template>
                 </el-table-column>
                 <el-table-column prop="bar_code" label="商品编号" align="center">
@@ -147,12 +158,12 @@
 
                 <el-table-column prop="stock" label="拼团价" align="center">
                   <template slot-scope="scope">
-                    <el-input type="text" v-model="scope.row.pink_price" />
+                    <el-input type="text" v-model="scope.row.pink_price"/>
                   </template>
                 </el-table-column>
                 <el-table-column prop="stock" label="拼团库存" align="center">
                   <template slot-scope="scope">
-                    <el-input type="text" v-model="scope.row.pink_stock" />
+                    <el-input type="text" v-model="scope.row.pink_stock"/>
                   </template>
                 </el-table-column>
                 <el-table-column prop="weight" label="重量（KG）" align="center ">
@@ -176,7 +187,7 @@
           <el-col :span="24">
             <el-form-item label="运费模板：" prop="temp_id">
               <div class="acea-row">
-                <el-select v-model="formValidate.temp_id"  class="mr20" :disabled="true">
+                <el-select v-model="formValidate.temp_id" class="mr20" :disabled="true">
                   <el-option v-for="(item,index) in templateList" :value="item.id" :key="index" :label="item.name">
                   </el-option>
                 </el-select>
@@ -187,7 +198,8 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="商品详情：">
-              <ueditor-wrap v-model="formValidate.description" :config="myConfig"  @beforeInit="addCustomDialog"  style="width: 90%;"></ueditor-wrap>
+              <ueditor-wrap v-model="formValidate.description" :config="myConfig" @beforeInit="addCustomDialog"
+                            style="width: 90%;"></ueditor-wrap>
             </el-form-item>
           </el-col>
         </el-row>
@@ -201,8 +213,8 @@
 
 <script>
 import cgood from '@/views/components/good'
-import { getInfo, isFormatAttrForActivity } from '@/api/yxStoreProduct'
-import { add, edit,getCombinationInfo, onsaleCombination, delCombination } from '@/api/yxStoreCombination'
+import {getInfo, isFormatAttrForActivity} from '@/api/yxStoreProduct'
+import {add, edit, getCombinationInfo, onsaleCombination, delCombination} from '@/api/yxStoreCombination'
 import editor from '../../components/Editor'
 import picUpload from '@/components/pic-upload'
 import mulpicUpload from '@/components/mul-pic-upload'
@@ -211,8 +223,9 @@ import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 import MaterialList from '@/components/material'
 import singlePic from '@/components/singlematerial'
 import UeditorWrap from 'vue-ueditor-wrap';
+
 export default {
-  components: { editor, picUpload, mulpicUpload, Treeselect, MaterialList, UeditorWrap, singlePic,cgood },
+  components: {editor, picUpload, mulpicUpload, Treeselect, MaterialList, UeditorWrap, singlePic, cgood},
   data() {
     return {
       spinShow: false,
@@ -229,7 +242,7 @@ export default {
           pink_price: 0,
           weight: 0,
           volume: 0,
-          integral:0
+          integral: 0
         }
       ],
       // 规格数据
@@ -247,13 +260,13 @@ export default {
         serverUrl: ''
       },
       form1: {
-        good:{
-         productId: null,
-         storeName: null,
-         image: null,
-         otPrice: null,
-         price: null,
-        
+        good: {
+          productId: null,
+          storeName: null,
+          image: null,
+          otPrice: null,
+          price: null,
+
         }
       },
       formValidate: {
@@ -265,8 +278,9 @@ export default {
         merId: '',
         image: '',
         images: '',
-        imageArr:[],
+        imageArr: [],
         sliderImageArr: [],
+        productPrice:0,
         title: '',
         attr: '',
         people: 1,
@@ -308,7 +322,7 @@ export default {
             ot_price: 0,
             stock: 0,
             bar_code: '',
-            integral:0
+            integral: 0
           }
         ],
         header: [],
@@ -337,7 +351,7 @@ export default {
           volume: 0,
           brokerage: 0,
           brokerage_two: 0,
-          integral:0
+          integral: 0
         }
       ],
       images: [],
@@ -346,37 +360,37 @@ export default {
       tableIndex: 0,
       ruleValidate: {
         title: [
-          { required: true, message: '请输入拼团名称', trigger: 'blur' }
+          {required: true, message: '请输入拼团名称', trigger: 'blur'}
         ],
         info: [
-          { required: true, message: '请输入拼团简介', trigger: 'blur' }
+          {required: true, message: '请输入拼团简介', trigger: 'blur'}
         ],
         unitName: [
-          { required: true, message: '请输入单位', trigger: 'blur' }
+          {required: true, message: '请输入单位', trigger: 'blur'}
         ],
         startTime: [
-          { required: true, message: '请选择开团时间', trigger: 'blur' }
+          {required: true, message: '请选择开团时间', trigger: 'blur'}
         ],
         stopTime: [
-          { required: true, message: '请选择开团结束时间', trigger: 'blur' }
+          {required: true, message: '请选择开团结束时间', trigger: 'blur'}
         ],
         isShow: [
-          { required: true, message: '请选择活动状态', trigger: 'change' }
+          {required: true, message: '请选择活动状态', trigger: 'change'}
         ],
         temp_id: [
-          { required: true, message: '请选择运费模板', trigger: 'change', type: 'number' }
+          {required: true, message: '请选择运费模板', trigger: 'change', type: 'number'}
         ],
         price: [
-          { required: true, message: '请输入拼团价格', trigger: 'blur' }
+          {required: true, message: '请输入拼团价格', trigger: 'blur'}
         ],
         people: [
-          { required: true, message: '请选择拼团人数', trigger: 'change', type: 'number' }
+          {required: true, message: '请选择拼团人数', trigger: 'change', type: 'number'}
         ],
         spec_type: [
-          { required: true, message: '请选择商品规格', trigger: 'change'}
+          {required: true, message: '请选择商品规格', trigger: 'change'}
         ],
         effectiveTime: [
-          { required: true, message: '请选择拼团时效', trigger: 'blur'}
+          {required: true, message: '请选择拼团时效', trigger: 'blur'}
         ]
       },
       attrs: []
@@ -389,34 +403,34 @@ export default {
     //   }
     // },
 
-    'formValidate.slider_image': function(val) {
+    'formValidate.slider_image': function (val) {
       if (val && Array.isArray(val)) {
         this.formValidate.images = val.join(',')
       }
     },
     'form1.good.productId': {
-      handler(val,oldVal){
-        console.info("val:"+val)
-        console.info("oldval:"+oldVal)
-        if(val){
-          this.getInfoChooseGood (val)
+      handler(val, oldVal) {
+        console.info("val:" + val)
+        console.info("oldval:" + oldVal)
+        if (val) {
+          this.getInfoChooseGood(val)
         }
       },
     },
   },
-  mounted () {
+  mounted() {
     this.getInfo();
   },
   methods: {
-    onInput(){
+    onInput() {
       this.$forceUpdate();
     },
-    confirm () {
+    confirm() {
       let that = this;
       that.createBnt = true;
       if (that.formValidate.selectRule.trim().length <= 0) {
         return this.$message({
-          message:'请选择属性',
+          message: '请选择属性',
           type: 'error'
         });
       }
@@ -427,19 +441,19 @@ export default {
       });
     },
     // 删除表格中的属性
-    delAttrTable (index) {
+    delAttrTable(index) {
       this.manyFormValidate.splice(index, 1);
     },
 
     // 添加按钮
-    addBtn () {
+    addBtn() {
       this.clearAttr();
       this.createBnt = false;
       this.showIput = true;
     },
     // 立即生成
-    generate (data) {
-      isFormatAttrForActivity(data===null?this.formValidate.productId:data, { attrs: this.attrs }).then(res => {
+    generate(data) {
+      isFormatAttrForActivity(data === null ? this.formValidate.productId : data, {attrs: this.attrs}).then(res => {
         this.manyFormValidate = res.value;
         let headerdel = {
           title: '操作',
@@ -463,25 +477,25 @@ export default {
       })
     },
     // 取消
-    offAttrName () {
+    offAttrName() {
       this.showIput = false;
       this.createBnt = true;
     },
-    clearAttr () {
+    clearAttr() {
       this.formDynamic.attrsName = '';
       this.formDynamic.attrsVal = '';
     },
     // 删除规格
-    handleRemoveRole (index) {
+    handleRemoveRole(index) {
       this.attrs.splice(index, 1);
       this.manyFormValidate.splice(index, 1);
     },
     // 删除属性
-    handleRemove2 (item, index) {
+    handleRemove2(item, index) {
       item.splice(index, 1);
     },
     // 添加规则名称
-    createAttrName () {
+    createAttrName() {
       if (this.formDynamic.attrsName && this.formDynamic.attrsVal) {
         let data = {
           value: this.formDynamic.attrsName,
@@ -503,7 +517,7 @@ export default {
       }
     },
     // 添加属性
-    createAttr (num, idx) {
+    createAttr(num, idx) {
       if (num) {
         this.attrs[idx].detail.push(num);
         var hash = {};
@@ -517,21 +531,21 @@ export default {
     },
 
     // 改变规格
-    changeSpec () {
+    changeSpec() {
     },
 
     // 详情选择商品生成规格用
-    getInfoChooseGood (id) {
+    getInfoChooseGood(id) {
       let that = this;
       let cid = that.$route.params.id || 0;
-      
-      getInfo(id==null?0:id).then(async res => {
+
+      getInfo(id == null ? 0 : id).then(async res => {
         let data = res.productInfo;
-        if(data){
+        if (data) {
           that.attrs = data.items || [];
           //that.formValidate = data;
-          Object.keys(that.formValidate).forEach(key=>{
-                if(data[key]) that.formValidate[key] = data[key];
+          Object.keys(that.formValidate).forEach(key => {
+            if (data[key]) that.formValidate[key] = data[key];
           })
           that.formValidate.id = cid;
           //that.formValidate.id = 0;
@@ -543,12 +557,13 @@ export default {
           // that.formValidate.people = 0
           // that.formValidate.effectiveTime = 0
           that.oneFormValidate = [data.attr];
+          that.formValidate.productPrice =  that.oneFormValidate[0].cost
           that.formValidate.header = [];
           that.generate(null);
           that.manyFormValidate = data.attrs;
-          if(data.spec_type === 0){
+          if (data.spec_type === 0) {
             that.manyFormValidate = [];
-          }else {
+          } else {
             that.createBnt = true;
             that.oneFormValidate = [
               {
@@ -562,10 +577,10 @@ export default {
                 ot_price: 0,
                 stock: 0,
                 bar_code: '',
-                weight:0,
-                volume:0,
-                brokerage:0,
-                brokerage_two:0
+                weight: 0,
+                volume: 0,
+                brokerage: 0,
+                brokerage_two: 0
               }
             ]
           }
@@ -580,26 +595,27 @@ export default {
     },
 
     // 详情
-    getInfo () {
+    getInfo() {
       let that = this;
       let id = that.$route.params.id || 0;
       that.formValidate.id = id;
       getCombinationInfo(id).then(async res => {
         let data = res.productInfo;
-        if(data){
+        if (data) {
           let cate_id = parseInt(data.cate_id) || 0;
           this.attrs = data.items || [];
           that.formValidate = data;
           that.formValidate.cate_id = cate_id;
           that.oneFormValidate = [data.attr];
+          that.formValidate.productPrice = that.oneFormValidate[0].cost
           that.formValidate.header = [];
           that.generate(data.productId);
           that.manyFormValidate = data.attrs;
           that.form1.good.productId = data.productId;
           that.form1.good.image = data.image
-          if(data.spec_type === 0){
+          if (data.spec_type === 0) {
             that.manyFormValidate = [];
-          }else {
+          } else {
             that.createBnt = true;
             that.oneFormValidate = [
               {
@@ -613,10 +629,10 @@ export default {
                 ot_price: 0,
                 stock: 0,
                 bar_code: '',
-                weight:0,
-                volume:0,
-                brokerage:0,
-                brokerage_two:0
+                weight: 0,
+                volume: 0,
+                brokerage: 0,
+                brokerage_two: 0
               }
             ]
           }
@@ -632,35 +648,35 @@ export default {
 
 
     // 提交
-    handleSubmit (name) {
+    handleSubmit(name) {
       this.$refs[name].validate((valid) => {
         if (valid) {
-          if(this.formValidate.spec_type ===0 ){
+          if (this.formValidate.spec_type === 0) {
             this.formValidate.attrs = this.oneFormValidate;
             this.formValidate.header = [];
             this.formValidate.items = [];
-          }else{
+          } else {
             this.formValidate.items = this.attrs;
             this.formValidate.attrs = this.manyFormValidate;
           }
-          if(this.formValidate.spec_type === 1 && this.manyFormValidate.length===0){
+          if (this.formValidate.spec_type === 1 && this.manyFormValidate.length === 0) {
             return this.$message.warning('请点击生成规格！');
           }
           edit(this.formValidate).then(async res => {
             this.$message({
-              message:'操作成功',
+              message: '操作成功',
               type: 'success'
             });
             setTimeout(() => {
-              this.$router.push({ path: '/activity/combination' });
+              this.$router.push({path: '/activity/combination'});
             }, 500);
           }).catch(res => {
             this.$message.error(res.msg);
           })
         } else {
-          if(!this.formValidate.store_name || !this.formValidate.cate_id || !this.formValidate.keyword
-            || !this.formValidate.unit_name || !this.formValidate.store_info
-            || !this.formValidate.image || !this.formValidate.slider_image){
+          if (!this.formValidate.store_name || !this.formValidate.cate_id || !this.formValidate.keyword
+              || !this.formValidate.unit_name || !this.formValidate.store_info
+              || !this.formValidate.image || !this.formValidate.slider_image) {
             this.$message.warning("请填写完整商品信息！");
           }
         }
@@ -668,12 +684,12 @@ export default {
     },
 
     // 表单验证
-    validate (prop, status, error) {
+    validate(prop, status, error) {
       if (status === false) {
         this.$message.warning(error);
       }
     },
-    addCustomDialog () {
+    addCustomDialog() {
       window.UE.registerUI('yshop', function (editor, uiName) {
         let dialog = new window.UE.ui.Dialog({
           iframeUrl: '/yshop/materia/index',
@@ -707,34 +723,43 @@ export default {
 </script>
 
 <style scoped lang="stylus">
-  .submission
-    margin-left 10px;
-  .color-list .tip{
-    color: #c9c9c9;
-  }
-  .color-list .color-item{
-    height: 30px;
-    line-height: 30px;
-    padding: 0 10px;
-    color:#fff;
-    margin-right :10px;
-  }
-  .color-list .color-item.blue{
-    background-color: #1E9FFF;
-  }
-  .color-list .color-item.yellow{
-    background-color: rgb(254, 185, 0);
-  }
-  .color-list .color-item.green{
-    background-color: #009688;
-  }
-  .columnsBox
-    margin-right 10px
-  .priceBox
-    width 100%
-  .rulesBox
-    display flex
-    flex-wrap: wrap;
-  .curs
-    cursor pointer
+.submission
+  margin-left 10px;
+
+.color-list .tip {
+  color: #c9c9c9;
+}
+
+.color-list .color-item {
+  height: 30px;
+  line-height: 30px;
+  padding: 0 10px;
+  color: #fff;
+  margin-right: 10px;
+}
+
+.color-list .color-item.blue {
+  background-color: #1E9FFF;
+}
+
+.color-list .color-item.yellow {
+  background-color: rgb(254, 185, 0);
+}
+
+.color-list .color-item.green {
+  background-color: #009688;
+}
+
+.columnsBox
+  margin-right 10px
+
+.priceBox
+  width 100%
+
+.rulesBox
+  display flex
+  flex-wrap: wrap;
+
+.curs
+  cursor pointer
 </style>
diff --git a/src/views/shop/set/seckillform.vue b/src/views/shop/set/seckillform.vue
index 4c33b2e..5b282a0 100644
--- a/src/views/shop/set/seckillform.vue
+++ b/src/views/shop/set/seckillform.vue
@@ -51,6 +51,10 @@ export default {
       } else this.doEdit()
     },
     doAdd() {
+      if(this.form.continued + this.form.time　> 24){
+        this.loading = false
+        return  this.$message.error("开启+持续时间不能超过24小时")
+      }
       add(this.form).then(res => {
         this.resetForm()
         this.$notify({
@@ -66,6 +70,10 @@ export default {
       })
     },
     doEdit() {
+      if(this.form.continued + this.form.time　> 24){
+        this.loading = false
+        return  this.$message.error("开启+持续时间不能超过24小时")
+      }
       edit(this.form).then(res => {
         this.resetForm()
         this.$notify({

From 0b560fdc615f35a028437014113b2d6ef8613355 Mon Sep 17 00:00:00 2001
From: kahu474 <kahu474@163.com>
Date: Mon, 12 Jul 2021 19:20:21 +0800
Subject: [PATCH 4/6] bug

---
 src/mixins/crud.js                   |  2 +-
 src/views/activity/seckill/form.vue  |  5 ++--
 src/views/activity/seckill/index.vue |  2 +-
 src/views/shop/set/seckill.vue       | 11 +++++++--
 src/views/shop/set/seckillform.vue   | 36 +++++++++++++++-------------
 5 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/src/mixins/crud.js b/src/mixins/crud.js
index 8ed7fe1..adc1ebc 100644
--- a/src/mixins/crud.js
+++ b/src/mixins/crud.js
@@ -78,7 +78,7 @@ export default {
     beforeInit() {
       return true
     },
-    getQueryParame: function() {
+    getQueryParame() {
       return {
         page: this.page,
         size: this.size,
diff --git a/src/views/activity/seckill/form.vue b/src/views/activity/seckill/form.vue
index 31008d4..9f4df88 100644
--- a/src/views/activity/seckill/form.vue
+++ b/src/views/activity/seckill/form.vue
@@ -401,13 +401,13 @@ export default {
         if(val){
           this.getInfoChooseGood (val)
         }
-      
+
       },
     },
   },
   mounted () {
     this.getInfo(),
-    initData('api/yxSystemGroupData',{ groupName: 'yshop_seckill_time' }).then(res => {
+    initData('api/yxSystemGroupData',{ groupName: 'yshop_seckill_time',status:1 }).then(res => {
       this.myTimes = res.content
     })
   },
@@ -604,6 +604,7 @@ export default {
           that.form1.good.image = data.image
           that.generate(data.productId);
           that.manyFormValidate = data.attrs;
+          console.log(data)
           if(data.spec_type === 0){
             that.manyFormValidate = [];
           }else {
diff --git a/src/views/activity/seckill/index.vue b/src/views/activity/seckill/index.vue
index 867fca0..e9b817d 100644
--- a/src/views/activity/seckill/index.vue
+++ b/src/views/activity/seckill/index.vue
@@ -17,7 +17,7 @@
           icon="el-icon-plus"
           @click="toAddURL"
         >
-            新增
+            新增312
         </el-button>
       </div>
     </div>
diff --git a/src/views/shop/set/seckill.vue b/src/views/shop/set/seckill.vue
index f6c4e74..0c2d823 100644
--- a/src/views/shop/set/seckill.vue
+++ b/src/views/shop/set/seckill.vue
@@ -21,6 +21,12 @@
       <el-table-column prop="id" label="ID" />
       <el-table-column prop="map.time" label="开启时间(整数小时)" />
       <el-table-column prop="map.continued" label="持续时间(整数小时)" />
+      <el-table-column prop="map.status" label="状态">
+        <template slot-scope="scope">
+          <el-tag v-show="scope.row.status == 1" type="success">开启</el-tag>
+          <el-tag v-show="scope.row.status == 2" type="danger">关闭</el-tag>
+        </template>
+      </el-table-column>
       <el-table-column v-if="checkPermission(['admin','YXSYSTEMGROUPDATA_ALL','YXSYSTEMGROUPDATA_EDIT','YXSYSTEMGROUPDATA_DELETE'])" label="操作" width="150px" align="center">
         <template slot-scope="scope">
           <el-button v-permission="['admin','YXSYSTEMGROUPDATA_ALL','YXSYSTEMGROUPDATA_EDIT']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)" />
@@ -75,7 +81,7 @@ export default {
     beforeInit() {
       this.url = 'api/yxSystemGroupData'
       const sort = 'id,desc'
-      this.params = { page: this.page, size: this.size, sort: sort, groupName: 'yshop_seckill_time' }
+      this.params = { page: this.page, size: this.size, sort: sort, groupName: 'yshop_seckill_time'}
       return true
     },
     subDelete(id) {
@@ -107,7 +113,8 @@ export default {
         id: data.id,
         groupName: data.groupName,
         time: data.map.time,
-        continued: data.map.continued
+        continued: data.map.continued,
+        status:data.map.status
       }
       _this.dialog = true
     }
diff --git a/src/views/shop/set/seckillform.vue b/src/views/shop/set/seckillform.vue
index 5b282a0..287ecd0 100644
--- a/src/views/shop/set/seckillform.vue
+++ b/src/views/shop/set/seckillform.vue
@@ -1,11 +1,18 @@
 <template>
-  <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="isAdd ? '新增' : '编辑'" width="500px">
+  <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog"
+             :title="isAdd ? '新增' : '编辑'" width="500px">
     <el-form ref="form" :model="form" :rules="rules" size="small" label-width="150px">
       <el-form-item label="开启时间(整数小时)">
-        <el-input v-model="form.time" style="width: 270px;" />
+        <el-input v-model="form.time" style="width: 270px;"/>
       </el-form-item>
       <el-form-item label="持续时间(整数小时)">
-        <el-input v-model="form.continued" style="width: 270px;" />
+        <el-input v-model="form.continued" style="width: 270px;"/>
+      </el-form-item>
+      <el-form-item label="是否开启">
+        <el-radio-group v-model="form.status">
+          <el-radio :label="1">开启</el-radio>
+          <el-radio :label="2">关闭</el-radio>
+        </el-radio-group>
       </el-form-item>
     </el-form>
     <div slot="footer" class="dialog-footer">
@@ -17,10 +24,11 @@
 </template>
 
 <script>
-import { add, edit } from '@/api/yxSystemGroupData'
+import {add, edit} from '@/api/yxSystemGroupData'
 import picUpload from '@/components/pic-upload'
+
 export default {
-  components: { picUpload },
+  components: {picUpload},
   props: {
     isAdd: {
       type: Boolean,
@@ -34,10 +42,10 @@ export default {
         id: '',
         groupName: 'yshop_seckill_time',
         time: 5,
+        status:2, //默认关闭
         continued: 2
       },
-      rules: {
-      }
+      rules: {}
     }
   },
   methods: {
@@ -45,16 +53,15 @@ export default {
       this.resetForm()
     },
     doSubmit() {
+      if (parseInt(this.form.continued) + parseInt(this.form.time) > 24) {
+        return this.$message.error("开启+持续时间不能超过24小时")
+      }
       this.loading = true
       if (this.isAdd) {
         this.doAdd()
       } else this.doEdit()
     },
     doAdd() {
-      if(this.form.continued + this.form.time　> 24){
-        this.loading = false
-        return  this.$message.error("开启+持续时间不能超过24小时")
-      }
       add(this.form).then(res => {
         this.resetForm()
         this.$notify({
@@ -70,10 +77,6 @@ export default {
       })
     },
     doEdit() {
-      if(this.form.continued + this.form.time　> 24){
-        this.loading = false
-        return  this.$message.error("开启+持续时间不能超过24小时")
-      }
       edit(this.form).then(res => {
         this.resetForm()
         this.$notify({
@@ -95,7 +98,8 @@ export default {
         id: '',
         groupName: 'yshop_seckill_time',
         time: 5,
-        continued: 2
+        continued: 2,
+        status:2 //默认关闭
       }
     }
   }

From 6014d686b52d85e55615cb54e4ca8c5d3dc663f5 Mon Sep 17 00:00:00 2001
From: kahu474 <kahu474@163.com>
Date: Tue, 13 Jul 2021 18:45:05 +0800
Subject: [PATCH 5/6] bug

---
 src/views/activity/combination/form.vue |  2 +-
 src/views/activity/seckill/form.vue     | 46 +++++++++---
 src/views/activity/seckill/index.vue    |  2 +-
 src/views/shop/cate/index.vue           |  1 -
 src/views/tools/email/send.vue          | 98 ++++++++++++++++++-------
 5 files changed, 108 insertions(+), 41 deletions(-)

diff --git a/src/views/activity/combination/form.vue b/src/views/activity/combination/form.vue
index 94933b6..6204b09 100644
--- a/src/views/activity/combination/form.vue
+++ b/src/views/activity/combination/form.vue
@@ -662,7 +662,7 @@ export default {
           if (this.formValidate.spec_type === 1 && this.manyFormValidate.length === 0) {
             return this.$message.warning('请点击生成规格！');
           }
-          edit(this.formValidate).then(async res => {
+          add(this.formValidate).then(async res => {
             this.$message({
               message: '操作成功',
               type: 'success'
diff --git a/src/views/activity/seckill/form.vue b/src/views/activity/seckill/form.vue
index 9f4df88..759a845 100644
--- a/src/views/activity/seckill/form.vue
+++ b/src/views/activity/seckill/form.vue
@@ -222,6 +222,7 @@ export default {
   components: { editor, picUpload, mulpicUpload, Treeselect, MaterialList, UeditorWrap, singlePic,cgood },
   data() {
     return {
+      isAdd:false,// 是否是添加
       spinShow: false,myTimes: [],
       // 批量设置表格data
       oneFormBatch: [
@@ -410,6 +411,11 @@ export default {
     initData('api/yxSystemGroupData',{ groupName: 'yshop_seckill_time',status:1 }).then(res => {
       this.myTimes = res.content
     })
+    if(this.$route.params.id){
+      this.isAdd = false
+    } else {
+      this.isAdd = true
+    }
   },
   methods: {
     onInput(){
@@ -654,17 +660,35 @@ export default {
           if(this.formValidate.spec_type === 1 && this.manyFormValidate.length===0){
             return this.$message.warning('请点击生成规格！');
           }
-          edit(this.formValidate).then(async res => {
-            this.$message({
-              message:'操作成功',
-              type: 'success'
-            });
-            setTimeout(() => {
-              this.$router.push({ path: '/activity/seckill' });
-            }, 500);
-          }).catch(res => {
-            this.$message.error(res.msg);
-          })
+
+
+          // 判断是否是添加
+          if(this.isAdd){
+            console.log(this.formValidate)
+            add(this.formValidate).then(res=>{
+              this.$message({
+                message:'操作成功',
+                type: 'success'
+              });
+              setTimeout(() => {
+                this.$router.push({ path: '/activity/seckill' });
+              }, 500);
+            }).catch(res => {
+              this.$message.error(res.msg);
+            })
+          }else{
+            add(this.formValidate).then(async res => {
+              this.$message({
+                message:'操作成功',
+                type: 'success'
+              });
+              setTimeout(() => {
+                this.$router.push({ path: '/activity/seckill' });
+              }, 500);
+            }).catch(res => {
+              this.$message.error(res.msg);
+            })
+          }
         } else {
           if(!this.formValidate.store_name || !this.formValidate.cate_id || !this.formValidate.keyword
             || !this.formValidate.unit_name || !this.formValidate.store_info
diff --git a/src/views/activity/seckill/index.vue b/src/views/activity/seckill/index.vue
index e9b817d..867fca0 100644
--- a/src/views/activity/seckill/index.vue
+++ b/src/views/activity/seckill/index.vue
@@ -17,7 +17,7 @@
           icon="el-icon-plus"
           @click="toAddURL"
         >
-            新增312
+            新增
         </el-button>
       </div>
     </div>
diff --git a/src/views/shop/cate/index.vue b/src/views/shop/cate/index.vue
index bc2028f..b1a0322 100644
--- a/src/views/shop/cate/index.vue
+++ b/src/views/shop/cate/index.vue
@@ -54,7 +54,6 @@
           <udOperation
             :data="scope.row"
             :permission="permission"
-            :disabled-dle="scope.row.id === 1"
             msg="确定删除吗,如果存在下级节点则一并删除，此操作不能撤销！"
           />
         </template>
diff --git a/src/views/tools/email/send.vue b/src/views/tools/email/send.vue
index 4690100..6af5a89 100644
--- a/src/views/tools/email/send.vue
+++ b/src/views/tools/email/send.vue
@@ -2,44 +2,61 @@
   <div>
     <el-form ref="form" :model="form" :rules="rules" style="margin-top: 6px;" size="small" label-width="100px">
       <el-form-item label="邮件标题" prop="subject">
-        <el-input v-model="form.subject" style="width: 646px" />
+        <el-input v-model="form.subject" style="width: 646px"/>
       </el-form-item>
       <el-form-item
-        v-for="(domain, index) in tos"
-        :key="domain.key"
-        :label="'收件邮箱' + (index === 0 ? '': index)"
+          v-for="(domain, index) in tos"
+          :key="domain.key"
+          :label="'收件邮箱' + (index === 0 ? '': index)"
       >
-        <el-input v-model="domain.value" style="width: 550px" />
-        <el-button icon="el-icon-plus" @click="addDomain" />
-        <el-button style="margin-left:0;" icon="el-icon-minus" @click.prevent="removeDomain(domain)" />
+        <el-input v-model="domain.value" style="width: 550px"/>
+        <el-button icon="el-icon-plus" @click="addDomain"/>
+        <el-button style="margin-left:0;" icon="el-icon-minus" @click.prevent="removeDomain(domain)"/>
       </el-form-item>
-      <div ref="editor" class="editor" />
-      <el-button :loading="loading" style="margin-left:1.6%;" size="medium" type="primary" @click="doSubmit">发送邮件</el-button>
+      <el-form-item label="邮件内容">
+        <ueditor-wrap v-model="form.content" :config="myConfig" @beforeInit="addCustomDialog"
+                      style="width: 90%;"></ueditor-wrap>
+      </el-form-item>
+
+      <div ref="editor" class="editor"/>
+      <el-button :loading="loading" style="margin-left:1.6%;" size="medium" type="primary" @click="doSubmit">发送邮件
+      </el-button>
     </el-form>
   </div>
 </template>
 
 <script>
-import { send } from '@/api/tools/email'
-import { upload } from '@/utils/upload'
-import { validEmail } from '@/utils/validate'
-import { mapGetters } from 'vuex'
-import E from 'wangeditor'
+import {send} from '@/api/tools/email'
+import {upload} from '@/utils/upload'
+import {validEmail} from '@/utils/validate'
+import {mapGetters} from 'vuex'
+import UeditorWrap from 'vue-ueditor-wrap';
+
 export default {
   name: 'Index',
   data() {
     return {
-      loading: false, form: { subject: '', tos: [], content: '' },
+      myConfig: {
+        autoHeightEnabled: false, // 编辑器不自动被内容撑高
+        initialFrameHeight: 500, // 初始容器高度
+        initialFrameWidth: '100%', // 初始容器宽度
+        UEDITOR_HOME_URL: '/UEditor/',
+        serverUrl: ''
+      },
+      loading: false, form: {subject: '', tos: [], content: ''},
       tos: [{
         value: ''
       }],
       rules: {
         subject: [
-          { required: true, message: '标题不能为空', trigger: 'blur' }
+          {required: true, message: '标题不能为空', trigger: 'blur'}
         ]
       }
     }
   },
+  components: {
+    UeditorWrap
+  },
   computed: {
     ...mapGetters([
       'imagesUploadApi'
@@ -51,7 +68,7 @@ export default {
     // 自定义菜单配置
     editor.customConfig.zIndex = 10
     // 文件上传
-    editor.customConfig.customUploadImg = function(files, insert) {
+    editor.customConfig.customUploadImg = function (files, insert) {
       // files 是 input 中选中的文件列表
       // insert 是获取图片 url 后，插入到编辑器的方法
       files.forEach(image => {
@@ -68,6 +85,30 @@ export default {
     editor.create()
   },
   methods: {
+    addCustomDialog () {
+      window.UE.registerUI('yshop', function (editor, uiName) {
+        let dialog = new window.UE.ui.Dialog({
+          iframeUrl: '/yshop/materia/index',
+          editor: editor,
+          name: uiName,
+          title: '上传图片',
+          cssRules: 'width:1200px;height:500px;padding:20px;'
+        });
+        this.dialog = dialog;
+
+        var btn = new window.UE.ui.Button({
+          name: 'dialog-button',
+          title: '上传图片',
+          cssRules: `background-image: url(../../../assets/images/icons.png);background-position: -726px -77px;`,
+          onclick: function () {
+            dialog.render();
+            dialog.open();
+          }
+        });
+
+        return btn;
+      }, 37);
+    },
     removeDomain(item) {
       var index = this.tos.indexOf(item)
       if (index !== -1 && this.tos.length !== 1) {
@@ -91,7 +132,7 @@ export default {
         this.form.tos = []
         if (valid) {
           let sub = false
-          this.tos.forEach(function(data, index) {
+          this.tos.forEach(function (data, index) {
             if (data.value === '') {
               _this.$message({
                 message: '收件邮箱不能为空',
@@ -108,7 +149,9 @@ export default {
               sub = true
             }
           })
-          if (sub) { return false }
+          if (sub) {
+            return false
+          }
           this.loading = true
           send(this.form).then(res => {
             this.$notify({
@@ -131,12 +174,13 @@ export default {
 </script>
 
 <style scoped>
-  .editor{
-    text-align:left;
-    margin: 20px;
-    width: 730px;
-  }
-  ::v-deep .w-e-text-container {
-    height: 360px !important;
-  }
+.editor {
+  text-align: left;
+  margin: 20px;
+  width: 730px;
+}
+
+::v-deep .w-e-text-container {
+  height: 360px !important;
+}
 </style>

From a354b7014da7797dd97610eeaf474818cb1e8f40 Mon Sep 17 00:00:00 2001
From: kahu474 <kahu474@163.com>
Date: Tue, 13 Jul 2021 19:03:47 +0800
Subject: [PATCH 6/6] bug

---
 src/views/monitor/online/indext.vue | 73 ++++++++++++++++-------------
 1 file changed, 40 insertions(+), 33 deletions(-)

diff --git a/src/views/monitor/online/indext.vue b/src/views/monitor/online/indext.vue
index 782ef7c..2b1888c 100644
--- a/src/views/monitor/online/indext.vue
+++ b/src/views/monitor/online/indext.vue
@@ -2,32 +2,34 @@
   <div class="app-container">
     <div class="head-container">
       <div v-if="crud.props.searchToggle">
-        <el-input v-model="query.filter" clearable size="small" placeholder="全表模糊搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
-        <rrOperation :crud="crud" />
+        <el-input v-model="query.filter" clearable size="small" placeholder="全表模糊搜索" style="width: 200px;"
+                  class="filter-item" @keyup.enter.native="crud.toQuery"/>
+        <rrOperation :crud="crud"/>
       </div>
       <crudOperation>
         <el-button
-          slot="left"
-          class="filter-item"
-          type="danger"
-          icon="el-icon-delete"
-          size="mini"
-          :loading="delLoading"
-          :disabled="crud.selections.length === 0"
-          @click="doDelete(crud.selections)"
+            slot="left"
+            class="filter-item"
+            type="danger"
+            icon="el-icon-delete"
+            size="mini"
+            :loading="delLoading"
+            :disabled="crud.selections.length === 0"
+            @click="doDelete(crud.selections)"
         >
           强退
         </el-button>
       </crudOperation>
     </div>
     <!--表格渲染-->
-    <el-table ref="table" v-loading="crud.loading" :data="crud.data" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
-      <el-table-column type="selection" width="55" />
-      <el-table-column v-if="columns.visible('userName')" prop="userName" label="用户名" />
-      <el-table-column v-if="columns.visible('nickName')" prop="nickName" label="用户昵称" />
-      <el-table-column v-if="columns.visible('ip')" prop="ip" label="登录IP" />
-      <el-table-column v-if="columns.visible('address')" :show-overflow-tooltip="true" prop="address" label="登录地点" />
-      <el-table-column v-if="columns.visible('browser')" prop="browser" label="浏览器" />
+    <el-table ref="table" v-loading="crud.loading" :data="crud.data" style="width: 100%;"
+              @selection-change="crud.selectionChangeHandler">
+      <el-table-column type="selection" width="55"/>
+      <el-table-column v-if="columns.visible('userName')" prop="userName" label="用户名"/>
+      <el-table-column v-if="columns.visible('nickName')" prop="nickName" label="用户昵称"/>
+      <el-table-column v-if="columns.visible('ip')" prop="ip" label="登录IP"/>
+      <el-table-column v-if="columns.visible('address')" :show-overflow-tooltip="true" prop="address" label="登录地点"/>
+      <el-table-column v-if="columns.visible('browser')" prop="browser" label="浏览器"/>
       <el-table-column v-if="columns.visible('loginTime')" prop="loginTime" label="登录时间">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.loginTime) }}</span>
@@ -36,15 +38,17 @@
       <el-table-column label="操作" width="100px" fixed="right">
         <template slot-scope="scope">
           <el-popover
-            :ref="scope.$index"
-            v-permission="['admin']"
-            placement="top"
-            width="180"
+              :ref="scope.$index"
+              v-permission="['admin']"
+              placement="top"
+              width="180"
           >
             <p>确定强制退出该用户吗？</p>
             <div style="text-align: right; margin: 0">
               <el-button size="mini" type="text" @click="$refs[scope.$index].doClose()">取消</el-button>
-              <el-button :loading="delLoading" type="primary" size="mini" @click="delMethod(scope.row.key, scope.$index)">确定</el-button>
+              <el-button :loading="delLoading" type="primary" size="mini" @click="delMethod(scope.row, scope.$index)">
+                确定
+              </el-button>
             </div>
             <el-button slot="reference" size="mini" type="text">强退</el-button>
           </el-popover>
@@ -52,22 +56,22 @@
       </el-table-column>
     </el-table>
     <!--分页组件-->
-    <pagination />
+    <pagination/>
   </div>
 </template>
 
 <script>
-import { delT } from '@/api/monitor/online'
-import CRUD, { presenter, header, crud } from '@crud/crud'
+import {delT} from '@/api/monitor/online'
+import CRUD, {presenter, header, crud} from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import pagination from '@crud/Pagination'
 
 // crud交由presenter持有
-const defaultCrud = CRUD({ url: 'auth/online', title: '在线用户', query: { type: 1 }})
+const defaultCrud = CRUD({url: 'auth/online', title: '在线用户', query: {type: 1}})
 export default {
   name: 'OnlineUser',
-  components: { pagination, crudOperation, rrOperation },
+  components: {pagination, crudOperation, rrOperation},
   mixins: [presenter(defaultCrud), header(), crud()],
   data() {
     return {
@@ -97,16 +101,19 @@ export default {
         type: 'warning'
       }).then(() => {
         this.delMethod(datas)
-      }).catch(() => {})
+      }).catch(() => {
+      })
     },
     // 踢出用户
-    delMethod(key, index) {
+    delMethod(data, index) {
       const ids = []
-      if (key instanceof Array) {
-        key.forEach(val => {
-          ids.push(val.key)
+      if (data instanceof Array) {
+        data.forEach(val => {
+          ids.push(data.nickName + ":" + data.key)
         })
-      } else ids.push(key)
+      } else {
+        ids.push(data.nickName + ":" + data.key)
+      }
       this.delLoading = true
       delT(ids).then(() => {
         this.delLoading = false