紧急修复了一些bug

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

@@ -7,7 +7,7 @@
         </el-form-item>
         <el-form-item label="优惠劵类型">
           <el-radio-group v-model="ruleForm.useType">
-            <el-radio :label="1">通用卷</el-radio>
+            <el-radio :label="1">通用券</el-radio>
             <el-radio :label="2">商品券</el-radio>
             <el-radio :label="3">品类券</el-radio>
           </el-radio-group>
@@ -84,8 +84,8 @@
         <el-form-item label="领取方式" prop="resource">
           <el-radio-group v-model="ruleForm.type">
             <el-radio :label="1">手动领取</el-radio>
-            <el-radio :label="2">新人卷</el-radio>
-            <el-radio :label="3">赠送卷</el-radio>
+            <el-radio :label="2">新人券</el-radio>
+            <el-radio :label="3">赠送券</el-radio>
             <!--<el-radio :label="4">付费会员卷</el-radio>-->
           </el-radio-group>
         </el-form-item>

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

@@ -5,19 +5,30 @@
         <div class="filter-container">
           <el-form :inline="true">
             <el-form-item label="使用状态：" class="mr10">
-              <el-select v-model="tableFromIssue.status" placeholder="请选择评价状态" clearable  class="selWidth" @change="seachList">
+              <el-select v-model="tableFromIssue.status" placeholder="请选择使用状态" clearable  class="selWidth" @change="seachList">
                 <el-option label="已使用" value="1" />
                 <el-option label="未使用" value="0" />
                 <el-option label="已过期" value="2" />
               </el-select>
             </el-form-item>
-            <el-form-item label="领取人：" class="mr10">
-              <el-input v-model="tableFromIssue.coupon_id" placeholder="请输入领取人" class="selWidth">
-                <el-button size="mini" slot="append" icon="el-icon-search" @click="seachList"/>
-              </el-input>
+            <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">
+                <el-option
+                  v-for="item in options"
+                  :key="item.uid"
+                  :label="item.nickname"
+                  :value="item.uid">
+                </el-option>
+              </el-select>
             </el-form-item>
+            <!--<el-form-item label="领取人：" class="mr10">-->
+              <!--<el-input v-model="tableFromIssue.uid" placeholder="请输入领取人" class="selWidth">-->
+                <!--<el-button size="mini" slot="append" icon="el-icon-search" @click="seachList"/>-->
+              <!--</el-input>-->
+            <!--</el-form-item>-->
             <el-form-item label="优惠劵：" class="mr10">
-              <el-input v-model="tableFromIssue.name" placeholder="请输入优惠劵" class="selWidth">
+              <el-input v-model="tableFromIssue.name" placeholder="请输入优惠劵" class="selWidth" clearable>
                 <el-button slot="append" icon="el-icon-search"  @click="seachList"/>
               </el-input>
             </el-form-item>
@@ -109,6 +120,7 @@
 <script>
   import { couponUserListApi } from '@/api/marketing'
   import { roterPre } from '@/settings'
+  import { userListApi } from '@/api/user'
   export default {
     name: 'CouponUser',
     filters: {
@@ -139,19 +151,35 @@
         tableFromIssue: {
           page: 1,
           limit: 20,
+          uid: '',
           name: '',
           status: ''
         },
         issueData: {
           data: [],
           total: 0
-        }
+        },
+        loading: false,
+        options: []
       }
     },
     mounted() {
       this.getIssueList()
     },
     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.tableFromIssue.page = 1
         this.getIssueList()

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

@@ -2,7 +2,7 @@
   <div class="divBox">
     <el-card class="box-card">
       <zb-parser
-        :form-id="109"
+        :form-id="formId"
         :is-create="isCreate"
         :edit-data="editData"
         @submit="handlerSubmit"
@@ -13,21 +13,51 @@
 
 <script>
   import zbParser from '@/components/FormGenerator/components/parser/ZBParser'
-  import { smsSaveApi } from '@/api/sms'
+  import { configSaveForm, configInfo } from '@/api/systemConfig.js'
   export default {
     name: "integralconfig",
     components: { zbParser },
     data() {
       return {
         isCreate: 0,
-        editData: {}
+        editData: {},
+        formId: 109
       }
     },
+    mounted() {
+      this.getFormInfo()
+    },
     methods: {
-      handlerSubmit(formValue) {
-        smsSaveApi(formValue).then(data => {
-          this.$message.success('新增成功')
-          this.editData = {}
+      handlerSubmit(data) {
+        const tempArr = []
+        for (var key in data) {
+          const obj = {}
+          obj.name = key
+          obj.title = key
+          obj.value = data[key]
+          tempArr.push(obj)
+        }
+        const _pram = {
+          'fields': tempArr,
+          'id': this.formId,
+          'sort': 0,
+          'status': true
+        }
+        console.log(_pram)
+        configSaveForm(_pram).then(res => {
+          this.getFormInfo()
+          this.$message.success('操作成功')
+        })
+      },
+      // 获取表单详情
+      getFormInfo() {
+        configInfo({ id: this.formId }).then(res => {
+          this.isShow = false
+          this.editData = res
+          this.isCreate = 1
+          setTimeout(() => { // 让表单重复渲染待编辑数据
+            this.isShow = true
+          }, 80)
         })
       }
     }