Merge branch 'dev-td' into master-td

src/views/userManagement/memberEnter.vue

@@ -96,21 +96,19 @@
                      layout="total, sizes, prev, pager, next, jumper" :total="total"></el-pagination>
     </div>
 
-    <!--    新建会员窗口-->
+    <!--    新建、编辑会员窗口-->
     <el-dialog :title="title" :visible.sync="newMemberArea">
       <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="16">-->
+<!--				    <el-form-item label="会员类型" prop="memberType">-->
+<!--								<el-radio-group v-model="memberTypeName">-->
+<!--								  <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="会员等级">
@@ -573,11 +571,11 @@
        */
       setNewMemberObject(formName) {
        console.log(JSON.stringify(this.newMemberObject))
-			 	if (this.memberTypeName = '付费会员') {
-			 	this.newMemberObject.memberType = 2
-			 } else {
-			 	this.newMemberObject.memberType = 3
-			 }
+			 // 	if (this.memberTypeName = '付费会员') {
+			 // 	this.newMemberObject.memberType = 2
+			 // } else {
+			 // 	this.newMemberObject.memberType = 3
+			 // }
         saveNewMemberObject(this.newMemberObject)
           .then(res => {
               if (res.rel) {