修改用户,取消设置会员中部分设置

src/views/userManagement/userList/index.vue

@@ -314,7 +314,7 @@
           <el-col :span="16">
             <el-form-item label="会员等级" prop="memberLevel">
               <el-select class="filter-item" v-model="userMembershipInformation.memberLevel" placeholder="请选择会员等级">
-                <el-option :key="undefined" label="无" :value="undefined"></el-option>
+<!--                <el-option :key="undefined" label="无" :value="undefined"></el-option>-->
                 <el-option v-for="(val, key, index) in setMemberLevelList " :key="val.id" :label="val.name"
                            :value="val.id"></el-option>
               </el-select>
@@ -325,7 +325,7 @@
           <el-col :span="24">
             <el-form-item label="有效期" prop="validTime">
               <el-radio-group v-model="validityType">
-                <el-radio-button style="margin-bottom: 10px;" label="无"></el-radio-button>
+<!--                <el-radio-button style="margin-bottom: 10px;" label="无"></el-radio-button>-->
                 <el-radio-button style="margin-bottom: 10px;" label="永久"></el-radio-button>
                 <el-radio-button style="margin-bottom: 10px;" label="自定义"></el-radio-button>
               </el-radio-group>
@@ -531,7 +531,7 @@
     saveNewMemberObject
   } from 'src/api/admin/UserMember/index';
   import {formatDate} from "../../../utils/dateFormattor";
-
+   import {getMembers} from "src/api/admin/member/index"
   export default {
     name: 'appUser',
     data() {
@@ -681,6 +681,7 @@
     },
     created() {
       this.getList();
+      this.getMembersLevel();
     }
     ,
     computed: {
@@ -699,6 +700,18 @@
 
     },
     methods: {
+      getMembersLevel(){
+        getMembers().then(res=>{
+
+        let members = res.data
+          console.log('getMembersLevel:{}'+JSON.stringify(members))
+          members.map(function (ele) {
+           this.queryMemberLevelList.push({id:ele.id,name:ele.name})
+          })
+            console.log('this.queryMemberLevelList'+JSON.stringify(this.queryMemberLevelList))
+         } 
+        )
+      },
 
       /**
        *  上传
@@ -865,15 +878,17 @@
 
         this.saveUserId = row.userId
         getUserMemberByUserId(row.userId).then(response => {
+
           if (response.data){
           if (response.data.validTime == 0) {
             this.validityType = '永久'
-          } else if (response.data.validTime) {
+          } else if (response.data.validTime&&response.data.validTime !=-1) {
             this.validityType = '自定义'
             response.data.validTime = timestamp2Date(response.data.validTime)
-          } else {
-            this.validityType = '无'
           }
+          // else if (response.data.validTime == -1) {
+          //   this.validityType = '无'
+          // }
           this.validTime = response.data.validTime;
           this.userMembershipInformation.memberLevel = response.data.memberLevel;
           this.userMembershipInformation.validTime = response.data.validTime;
@@ -893,15 +908,16 @@
        * @param formName
        */
       saveMember(formName) {
-
         if (this.validityType == '永久') {
           this.userMembershipInformation.validTime = 0
         } else if (this.validityType == '自定义') {
           let date = new Date(this.validTime);
           this.userMembershipInformation.validTime = date.getTime()
-        } else {
-          this.userMembershipInformation.validTime = null
         }
+        // else {
+        //   this.userMembershipInformation.validTime = -1
+        // }
+
         this.userMembershipInformation.userId = this.saveUserId
         this.userMembershipInformation.buyCount=undefined;
         // console.log('userMembershipInformation:' + JSON.stringify(this.userMembershipInformation))