修改会员类型

src/views/userManagement/memberEnter.vue

@@ -98,6 +98,18 @@
     <!--    新建会员窗口-->
     <el-dialog title="新建会员" :visible.sync="newMemberArea" width="10%">
       <el-form :model="newMemberObject" :rules="newMemberObjectVerify" ref="nmo" label-width="100px">
+        
+				<el-row>
+				  <el-col :span="16">
+				    <el-form-item label="会员类型" prop="memberType">
+								<el-radio-group v-model="memberTypeName">
+								  <!--                <el-radio-button style="margin-bottom: 10px;" label="无"></el-radio-button>-->
+								  <el-radio-button style="margin-bottom: 10px;" label="付费会员" :value="2"></el-radio-button>
+								  <el-radio-button style="margin-bottom: 10px;" label="兑换会员" :value="3"></el-radio-button>
+								</el-radio-group>
+				    </el-form-item>
+				  </el-col>
+				</el-row>
 				<el-row>
           <el-col :span="8">
             <el-form-item label="会员等级">
@@ -109,16 +121,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-				 <el-row>
-				  <el-col :span="8">
-				    <el-form-item label="会员类型" prop="memberLevel">
-				      <el-select class="filter-item" v-model="newMemberObject.memberType" placeholder="请选择会员类型">
-				                       <el-option key="2" label="充值会员" :value="2"></el-option>
-															 <el-option key="3" label="兑换会员" :value="3"></el-option>
-				      </el-select>
-				    </el-form-item>
-				  </el-col>
-				</el-row>
+				
         <el-row>
           <el-col :span="8">
             <el-form-item label="会员名" placeholder="会员名" prop="memberName">
@@ -229,6 +232,7 @@
         memberLevelList: [],
         saveUserId: undefined,
         validityType: '无',
+				memberTypeName:'兑换会员',
         userOrderMessage: {},
         BASE_API: process.env.BASE_API,
         userDetails: {},
@@ -538,6 +542,11 @@
        */
       setNewMemberObject(formName) {
        console.log(JSON.stringify(this.newMemberObject))
+			 	if (this.memberTypeName = '付费会员') {
+			 	this.newMemberObject.memberType = 2
+			 } else {
+			 	this.newMemberObject.memberType = 3
+			 }
         saveNewMemberObject(this.newMemberObject)
           .then(res => {
               if (res.rel) {

src/views/userManagement/userList/index.vue

@@ -278,7 +278,7 @@
           </el-col>
 					  <el-col :span="6">
 					  <el-form-item label="会员类型:">
-					    <span v-if="userDetails.memberType == '2' && userDetails.memberType != undefined">充值会员</span>
+					    <span v-if="userDetails.memberType == '2' && userDetails.memberType != undefined">付费会员</span>
 							<span v-if="userDetails.memberType == '3' && userDetails.memberType != undefined">兑换会员</span>
 					  </el-form-item>
 					</el-col>
@@ -353,27 +353,30 @@
     <!--    设置会员信息窗口-->
     <el-dialog title="设置会员信息" @change="change" :visible.sync="setMemberArea" class="member">
       <el-form :model="userMembershipInformation" :rules="rules" ref="userMembership" label-width="100px">
+				
 				<el-row>
 				  <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 v-for="(val,index) in setMemberLevelList " :key="index" :label="val.name"
-                           :value="val.id"></el-option>
-              </el-select>
+				    <el-form-item label="会员类型" prop="memberType">
+								<el-radio-group v-model="memberTypeName">
+								  <!--                <el-radio-button style="margin-bottom: 10px;" label="无"></el-radio-button>-->
+								  <el-radio-button style="margin-bottom: 10px;" label="付费会员" :value="2"></el-radio-button>
+								  <el-radio-button style="margin-bottom: 10px;" label="兑换会员" :value="3"></el-radio-button>
+								</el-radio-group>
 				    </el-form-item>
 				  </el-col>
 				</el-row>
         <el-row>
           <el-col :span="16">
-				    <el-form-item label="会员类型" prop="memberLevel">
-				      <el-select class="filter-item" v-model="userMembershipInformation.memberType" placeholder="请选择会员类型">
-				                       <el-option key="2" label="充值会员" :value="2"></el-option>
-															 <el-option key="3" label="兑换会员" :value="3"></el-option>
+            <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 v-for="(val,index) in setMemberLevelList " :key="index" :label="val.name"
+                           :value="val.id"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
         </el-row>
+		
         <el-row>
           <el-col :span="24">
             <el-form-item label="有效期" prop="validTime">
@@ -442,6 +445,13 @@
     <!--    新建会员窗口-->
     <el-dialog title="新建会员" :visible.sync="newMemberArea" width="10%">
       <el-form :model="newMemberObject" :rules="newMemberObjectVerify" ref="nmo" label-width="100px">
+				    <el-form-item label="会员类型" prop="memberType">
+								<el-radio-group v-model="memberTypeName">
+								  <!--                <el-radio-button style="margin-bottom: 10px;" label="无"></el-radio-button>-->
+								  <el-radio-button style="margin-bottom: 10px;" label="付费会员" :value="2"></el-radio-button>
+								  <el-radio-button style="margin-bottom: 10px;" label="兑换会员" :value="3"></el-radio-button>
+								</el-radio-group>
+				    </el-form-item>
 				<el-form-item label="会员等级">
           <el-select class="filter-item" v-model="newMemberObject.memberLevel" placeholder="选择会员等级">
             <el-option :key="undefined" label="无" :value="undefined"></el-option>
@@ -449,12 +459,7 @@
                        :value="val.id"></el-option>
           </el-select>
         </el-form-item>
-				<el-form-item label="会员类型">
-				  <el-select class="filter-item" v-model="newMemberObject.memberLevel" placeholder="选择会员类型">
-				    <el-option :key="2" label="充值会员" :value="2"></el-option>
-				   <el-option :key="3" label="兑换会员" :value="3"></el-option>
-				  </el-select>
-				</el-form-item>
+			
         <el-form-item label="手机号" placeholder="手机号" prop="phone">
           <el-input size="small " type="text" v-model="newMemberObject.phone"></el-input>
         </el-form-item>
@@ -630,6 +635,7 @@
         },
         saveUserId: undefined,
         validityType: '无',
+				memberTypeName:'兑换会员',
         userOrderMessage: {},
         mobileList: [],
         queryMemberLevelList: [{id: -1, name: '全部会员'}],
@@ -680,6 +686,7 @@
         newMemberObject: {
           phone: undefined,
           memberLevel: undefined,
+					memberType: undefined,
           totalNumber: undefined,
           rentFreeDays: undefined
         },
@@ -1247,6 +1254,11 @@
             this.userMembershipInformation.buyCount = response.data.buyCount;
             this.userMembershipInformation.id = response.data.id;
 						 this.userMembershipInformation.memberType = response.data.memberType
+						 if (response.data.memberType == 2) {
+							 this.memberTypeName = '付费会员'
+						 } else {
+							 this.memberTypeName = '兑换会员'
+						 }
             // this.userMembershipInformation.memberLevel= this.userMembershipInformation.memberLevel?this.userMembershipInformation.memberLevel:undefined
           }
           this.setMemberArea = true
@@ -1278,6 +1290,12 @@
           let date = new Date(this.validTime);
           this.userMembershipInformation.validTime = date.getTime()
         }
+				if (this.memberTypeName = '付费会员') {
+					this.userMembershipInformation.memberType = 2
+				} else {
+					this.userMembershipInformation.memberType = 3
+				}
+				
         // else {
         //   this.userMembershipInformation.validTime = -1
         // }
@@ -1315,6 +1333,11 @@
        *
        */
       setNewMemberObject(formName) {
+				if (this.memberTypeName = '付费会员') {
+					this.newMemberObject.memberType = 2
+				} else {
+					this.newMemberObject.memberType = 3
+				}
         saveNewMemberObject(this.newMemberObject)
           .then(res => {
               if (res.rel) {

src/views/vehicle/vehicleInfo/index.vue

@@ -518,7 +518,24 @@
 						</el-form-item>
 					</el-col>
 				</el-row>
-
+				<el-row>
+					<el-col>
+						<el-form-item label="免费天数" prop="memberUse">
+							<el-select
+								class="filter-item"
+								v-model="form.memberUse"
+								placeholder="请选择会员类型"
+								style="width:30%"
+								@change="handlerChange()"
+							>
+								<el-option key="1" label="所有会员可用" :value="1"></el-option>
+								<el-option key="2" label="付费会员可用" :value="2"></el-option>
+								<el-option key="3" label="兑换会员可用" :value="3"></el-option>
+								<el-option key="4" label="不可使用会员天数" :value="4"></el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+				</el-row>
 				<p style="border-bottom:1px solid #bfcbd9;padding-bottom:10px">用途、位置及里程</p>
 
 				<el-row>
@@ -792,24 +809,7 @@
 					</el-col>
 				</el-row>
 				
-				<el-row>
-					<el-col>
-						<el-form-item label="可使用会员" prop="memberUse">
-							<el-select
-								class="filter-item"
-								v-model="form.memberUse"
-								placeholder="请选择会员类型"
-								style="width:30%"
-								@change="handlerChange()"
-							>
-								<el-option key="1" label="所有会员" :value="1"></el-option>
-								<el-option key="2" label="充值会员" :value="2"></el-option>
-								<el-option key="3" label="兑换会员" :value="3"></el-option>
-								<el-option key="4" label="禁用会员" :value="4"></el-option>
-							</el-select>
-						</el-form-item>
-					</el-col>
-				</el-row>
+				
 				
 				<el-row>
 					<el-col :span="24">