Merge branch 'dev' of http://39.101.143.165:8090/dong_k/link-wechat-web-pc into dev

src/views/application/form/add.vue

@@ -23,8 +23,8 @@
                     <div style="display: flex;">
                         <div style="width: 100%">
                             <div v-for="(item, index) in addForm.actPrizeList" style="margin-top: 10px;">
-                                <el-input v-model="item.prizeName" placeholder="请输入字段名称" style="margin-right: 10px;"></el-input>
-                                <el-input v-model="item.prizeContent" placeholder="请输入填写内容"></el-input>
+                                <el-input v-model="item.fieldName" placeholder="请输入字段名称" style="margin-right: 10px;"></el-input>
+                                <el-input v-model="item.fieldValue" placeholder="请输入填写内容"></el-input>
                                 <i class="el-icon-circle-close" style="cursor:pointer; margin-left: 10px;" @click="handleDel(item,index)"></i>
                             </div>
                             <el-button type="text" @click="handleAdd">新增字段</el-button>
@@ -82,7 +82,7 @@ export default {
                         actType: `${obj.actType}`,
                         actTime: [obj.actStartTime, obj.actEndTime],
                         actDesc: obj.actDesc,
-                        actPrizeList: obj.actPrizeList?obj.actPrizeLis:[],
+                        actPrizeList: obj.fieldList?obj.fieldList:[],
                         fileUrl: obj.fileUrl
                     }
                 }
@@ -101,6 +101,7 @@ export default {
             let params = {
                 actName: this.addForm.actName,
                 actType: '4',
+                actDesc: this.addForm.actDesc,
                 actStartTime: this.addForm.actTime[0],
                 actEndTime: this.addForm.actTime[1],
                 actPrizeList: this.addForm.actPrizeList,