全新UI视觉体验，移动端API优化降低重复调用，提高并发6倍，修复N多Bug

admin/src/views/marketing/bargain/bargainGoods/creatBargain.vue

@@ -218,9 +218,6 @@
           <el-form-item label="商品详情：">
             <ueditor-from v-model="formValidate.content" :content="formValidate.content" />
           </el-form-item>
-          <el-form-item label="商品规则：">
-            <ueditor-from v-model="formValidate.rule" :content="formValidate.rule" />
-          </el-form-item>
         </div>
         <el-form-item style="margin-top:30px;">
           <el-button
@@ -300,8 +297,7 @@
     startTime: '',
     stopTime: '',
     timeVal: [],
-    status: 0,
-    rule: ''
+    status: 0
   }
   const objTitle = {
     price: {
@@ -565,8 +561,7 @@
             status: 0,
             num : 1,
             bargainNum : 2,
-            peopleNum : 1,
-            rule : ''
+            peopleNum : 1
           }
           if(res.specType){
             res.attrValues.forEach((row) => {
@@ -614,8 +609,7 @@
             status: res.status,
             num : res.num,
             bargainNum : res.bargainNum,
-            peopleNum : res.peopleNum,
-            rule : res.rule
+            peopleNum : res.peopleNum
           }
           if(res.specType){
             this.ManyAttrValue = res.attrValues;

admin/src/views/marketing/coupon/list/index.vue

@@ -108,12 +108,13 @@
             />
           </template>
         </el-table-column>
-        <el-table-column label="操作" min-width="130" fixed="right">
+        <el-table-column label="操作" min-width="180" fixed="right">
           <template slot-scope="scope">
             <el-button type="text" class="mr10" size="small" @click="receive(scope.row)">领取记录</el-button>
             <router-link :to=" { path: '/marketing/coupon/list/save/' + scope.row.id } ">
-              <el-button v-if="scope.row.status" type="text" size="small">复制</el-button>
+              <el-button v-if="scope.row.status" type="text" size="small" class="mr10">复制</el-button>
             </router-link>
+            <el-button type="text" class="mr10" size="small" @click="handleDelMenu(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -179,7 +180,7 @@
 </template>
 
 <script>
-  import { marketingListApi, couponIssueStatusApi, couponUserListApi } from '@/api/marketing'
+  import { marketingListApi, couponIssueStatusApi, couponUserListApi, couponDeleteApi } from '@/api/marketing'
   import { roterPre } from '@/settings'
   export default {
     name: 'CouponList',
@@ -274,7 +275,15 @@
         }).catch(()=>{
           row.status = !row.status
         })
-      }
+      },
+      handleDelMenu(rowData) {
+        this.$confirm('确定删除当前数据?').then(() => {
+          couponDeleteApi({id: rowData.id}).then(data => {
+            this.$message.success('删除成功')
+            this.getList()
+          })
+        })
+      },
     }
   }
 </script>

admin/src/views/marketing/coupon/record/index.vue

@@ -13,7 +13,7 @@
             </el-form-item>
             <el-form-item label="领取人：">
               <el-select v-model="tableFromIssue.uid" class="selWidth" reserve-keyword remote filterable
-                         :remote-method="remoteMethod" :loading="loading" placeholder="请输入用户名称" clearable @change="seachList">
+                         :remote-method="remoteMethod" :loading="loading" placeholder="请输入领取人" clearable @change="seachList">
                 <el-option
                   v-for="item in options"
                   :key="item.uid"

admin/src/views/marketing/integral/integralLog/index.vue

@@ -15,15 +15,9 @@
                               @change="onchangeTime"/>
             </el-form-item>
             <el-form-item label="用户微信昵称：">
-              <el-select v-model="tableFrom.userIdList" style="width: 500px" reserve-keyword multiple remote filterable
-                         :remote-method="remoteMethod" :loading="loading" placeholder="请输入用户微信昵称" clearable @change="seachList">
-                <el-option
-                  v-for="item in options"
-                  :key="item.uid"
-                  :label="item.nickname"
-                  :value="item.uid">
-                </el-option>
-              </el-select>
+              <el-input v-model="tableFrom.keywords" placeholder="请输入用户微信昵称" class="selWidth" size="small">
+                <el-button slot="append" icon="el-icon-search" size="small" @click="getList(1)" />
+              </el-input>
             </el-form-item>
           </el-form>
         </div>
@@ -58,8 +52,8 @@
           sortable
           label="明细数字"
           min-width="120"
-          prop="number"
-          :sort-method="(a,b)=>{return a.number - b.number}"
+          prop="integral"
+          :sort-method="(a,b)=>{return a.integral - b.integral}"
         />
         <el-table-column
           label="备注"
@@ -72,7 +66,7 @@
           prop="nickName"
         />
         <el-table-column
-          prop="createTime"
+          prop="updateTime"
           label="	添加时间"
           min-width="150"
         />
@@ -94,7 +88,6 @@
 
 <script>
   import { integralListApi } from '@/api/marketing'
-  import { userListApi } from '@/api/user'
   import cardsData from '@/components/cards/index'
   export default {
     components: { cardsData },
@@ -111,9 +104,8 @@
         tableFrom: {
           page: 1,
           limit: 20,
-          category: 'integral',
           dateLimit: '',
-          userIdList: []
+          keywords: ''
         },
         userIdList: [],
         userList: [],
@@ -126,19 +118,6 @@
       // this.getUserList()
     },
     methods: {
-      remoteMethod(query) {
-        if (query !== '') {
-          this.loading = true;
-          setTimeout(() => {
-            this.loading = false;
-            userListApi({keywords: query, page: 1, limit: 10}).then(res => {
-              this.options = res.list
-            })
-          }, 200);
-        } else {
-          this.options = [];
-        }
-      },
       seachList() {
         this.tableFrom.page = 1
         this.getList()