Merge remote-tracking branch 'origin/master'

src/views/operationsManagement/memFeedBack/index.vue

@@ -35,7 +35,6 @@
         <el-select
           v-model="queryParams.status"
           placeholder="请选择处理状态"
-          clearable
           size="small"
           style="width: 150px"
         >
@@ -137,7 +136,7 @@
     />
     <!-- 添加或修改意见反馈配置对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" size="small" >
+      <el-form ref="form" :model="form" :rules="rules" size="small">
         <el-form-item label="备注" prop="remarks">
           <el-input v-model.trim="form.remarks" maxlength="200" show-word-limit type="textarea" placeholder="请输入内容" />
         </el-form-item>
@@ -190,7 +189,8 @@ export default {
         rows: 10,
         feedbackType: undefined,
         title: undefined,
-        content: undefined
+        content: undefined,
+        status: '0'
       },
       // 表单参数
       form: {},

src/views/operationsManagement/member/info/index.vue

@@ -567,7 +567,6 @@
 import {
   addCmsActivity
 } from '@/api/contentManagement/activity'
-import { updateResponseUrl } from '@/utils/updateUrl'
 import { getOptions } from '@/utils/options'
 import { getMemInfo, getPrivateInfo, updateMemInfo } from '@/api/contentManagement/memInfo'
 import { uploadPublic } from '@/api/system/ossInfo'
@@ -895,6 +894,9 @@ export default {
       if (this.form.memIdcard === '' || this.form.memIdcard === null) {
         form.memIdcard = undefined
       }
+      if (this.form.memPictureId === '' || this.form.memPictureId === null) {
+        form.memPictureId = undefined
+      }
       form.pictureUrls = null
       // 转换时间格式
       this.$refs.deviceFormRef.validate(valid => {