update: update

src/api/operation.js

@@ -6,29 +6,32 @@ let marketingApi = {
   // 获取模板管理列表
   getTemplateList: {
     method: 'post',
-    url: '/sms/page-sms-setting'
+    url: '/sms/page-sms-setting',
+    useFormData: true
   },
   // 获取模板管理列表详情表格
   getTemplateDetailList: {
     method: 'post',
     url: '/sms/page-template',
+    useFormData: true
   },
   // 提审模板
   sendExamine: {
     method: 'post',
     url: '/sms/audit-template',
+    useFormData: true
   },
   // 获取通道详情
   getSmsSetting: {
     method: 'post',
     url: '/sms/sms-setting-detail',
-    // useFormData: true
+    useFormData: true
   },
   // 修改通道
   updateSms: {
     method: 'post',
     url: '/sms/update-sms-setting',
-    // useFormData: true
+    useFormData: true
   },
   getSystemTemplate: '/sms/page-system-template',
   // 生成appid
@@ -37,6 +40,10 @@ let marketingApi = {
   activityCategoryGetList: '/operation/activity/category/getList',
   activityRightMenuList: '/operation/activity/rightMenuList',
   activityUpdate: '/operation/activity/update',
+  activityCategoryUpdate: {
+    method: 'post',
+    url: '/operation/activity/category/addOrUpdate'
+  }
 };
 
 let authApi = {

src/utils/request.js

@@ -6,7 +6,7 @@ import { origin } from '@/config/index.js';
 axios.defaults.baseURL = origin;
 
 const request = (opt, params) => {
-  params = Object.assign({}, params);
+  params = typeof params === 'object' ? JSON.parse(JSON.stringify(params)) : params;
   opt = Object.assign({}, opt);
   let requestConfig = {
     // 请求路径
@@ -29,7 +29,7 @@ const request = (opt, params) => {
       requestConfig.params = params;
       break;
     case 'post':
-      requestConfig.data = qs.stringify(params);
+      requestConfig.data = params;
       break;
     default:
       requestConfig.data = params;

src/views/activity/component/CategoryDialog.vue

@@ -45,7 +45,7 @@
 </template>
 <script>
 import requestApi from '@/api/operation';
-const { activityCategoryGetList } = requestApi;
+const { activityCategoryGetList, activityCategoryUpdate } = requestApi;
 import draggable from 'vuedraggable';
 export default {
   name: 'CategoryDialog',
@@ -103,15 +103,17 @@ export default {
       this.loading = true;
       this.$refs.form.validate(async valid => {
         if (valid) {
-          this.list = this.list.map((el, idx) => el = {
-            categorySort: idx,
-            categoryName: el.categoryName,
-            activityCategoryId: el.activityCategoryId || ''
+          let list = [];
+          list = this.list.map((el, idx) =>{
+            el = {
+              categorySort: idx,
+              categoryName: el.categoryName,
+              activityCategoryId: el.activityCategoryId || ''
+            };
+            return el;
           });
-          console.log(this.list);
-          // const { code } = await saveItem({ ...this.form }).finally(() => this.loading = false);
-          // if (code === '0') this.$message.success('提交成功');
-
+          const { code } = await activityCategoryUpdate(list).finally(() => this.loading = false);
+          if (code === '0') this.$message.success('提交成功');
           this.handleClose();
           this.$emit('refresh');
         } else {
@@ -214,6 +216,9 @@ export default {
       }
     }
   }
+  .el-dialog__footer{
+    padding: 20px 0;
+  }
 }
 .el-tooltip__popper.category-dialog-tooltip {
   line-height: 22px;

src/views/activity/component/NewActivity.vue

@@ -3,7 +3,7 @@
     width="600px" :close-on-click-modal="false" :close-on-press-escape="false">
     <div v-loading="loading">
       <el-row type="flex" justify="space-between">
-        <h1 class="el-dialog__title">{{form.activityConfigId?'编辑活动':'新建活动'}}</h1>
+        <h1 class="el-dialog__title">编辑活动</h1>
         <i class="iconfont-components3 icon-cp-close" @click="handleClose"></i>
       </el-row>
       <div class="tip-message-wrap">
@@ -34,9 +34,6 @@
             placeholder="请输入活动说明，不超过 2 个字">
           </el-input>
         </el-form-item>
-        <el-form-item label="跳转路径" prop="jumpUrl">
-          <el-input v-model="form.jumpUrl" placeholder="请输入按钮跳转路径"></el-input>
-        </el-form-item>
         <el-form-item label="排序号" prop="activitySort">
           <el-input-number v-model="form.activitySort" :max="1000" :min="1"
             controls-position="right" placeholder="请输入排序号，1-1000" style="width:460px;" />
@@ -95,7 +92,6 @@ export default {
         activityName: '',
         activityExplain: '',
         activityRemark: '',
-        jumpUrl: '',
         activitySort: undefined
       },
       rules: {

src/views/activity/index.vue

@@ -5,7 +5,7 @@
         <el-input v-model="search.search" @change="getList" prefix-icon="el-icon-search"
           placeholder="请输入活动名称" style="width: 260px" clearable />
         <el-select v-model="search.activityCategoryId" @change="getList" placeholder="全部分类"
-          class="ml10">
+          class="ml10" clearable>
           <el-option v-for="item in categoryList" :key="item.activityCategoryId"
             :value="item.activityCategoryId" :label="item.categoryName" />
         </el-select>
@@ -22,7 +22,9 @@
           show-overflow-tooltip>
           <template slot-scope="scope">
             <span v-if="v.formatter" v-html="v.formatter(scope.row)"></span>
-            <el-image v-else-if="v.isImage&&scope.row.activityImage" style="width: 40px; height: 40px" :src="scope.row.activityImage" :preview-src-list="[scope.row.activityImage]"/>
+            <el-image v-else-if="v.isImage&&scope.row.activityImage"
+              style="width: 40px; height: 40px" :src="scope.row.activityImage"
+              :preview-src-list="[scope.row.activityImage]" />
             <span v-else>{{ scope.row[v.prop] || '--' }}</span>
           </template>
         </el-table-column>
@@ -36,8 +38,9 @@
         </el-table-column>
       </el-table>
     </div>
-    <category-dialog :visible.sync="categoryVisible" />
-    <new-activity :visible.sync="activityVisible" :category-list="categoryList" :item="editItem" @refresh="getList"/>
+    <category-dialog :visible.sync="categoryVisible" @refresh="init"/>
+    <new-activity :visible.sync="activityVisible" :category-list="categoryList" :item="editItem"
+      @refresh="getList" />
   </div>
 </template>
 
@@ -74,7 +77,7 @@ export default {
   methods: {
     getTableHeader() {
       this.tableHeader = [
-        { label: '活动分类', prop: 'activityCategoryId', width: '120', formatter: ({ activityCategoryId = '' }) => this.categoryFilter[activityCategoryId] },
+        { label: '活动分类', prop: 'activityCategoryId', width: '120', formatter: ({ activityCategoryId = '' }) => (activityCategoryId ? this.categoryFilter[ activityCategoryId ] : '--') },
         { label: '活动名称', prop: 'activityName', 'min-width': '100' },
         { label: '活动说明', prop: 'activityExplain', 'min-width': '100' },
         { label: '标签文案', prop: 'activityRemark', 'min-width': '50' },
@@ -107,7 +110,7 @@ export default {
       let { result = [] } = await activityCategoryGetList();
       let categoryFilter = {};
       result = result.map(el => {
-        categoryFilter[el.activityCategoryId] = el.categoryName;
+        categoryFilter[ el.activityCategoryId ] = el.categoryName;
         return el;
       });
       this.categoryFilter = { ...categoryFilter };