Merge branch 'dev-td' into master-td

src/views/financialReports/oneDividend.vue

@@ -41,7 +41,7 @@
       </el-table-column>
       <el-table-column align="center" label="分红人">
         <template slot-scope="scope">
-          <span>{{oneRow.levelName}}</span>
+          <span>{{oneRow.realName}}</span>
         </template>
       </el-table-column>
       <el-table-column align="center" label="等级">

src/views/userManagement/memberEnter.vue

@@ -54,7 +54,7 @@
       </el-table-column>
       <el-table-column width="150" align="center" label="会员等级">
         <template slot-scope="scope">
-          <span>{{scope.row.memberLevel==3?"钻石会员": scope.row.memberLevel==2?"黄金会员":scope.row.memberLevel==1?"普通会员":"普通用户"}}</span>
+          <span>{{scope.row.memberLevelName}}</span>
         </template>
       </el-table-column>
       <el-table-column width="150" align="center" label="免费天数">
@@ -152,7 +152,8 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="cancelNewMemberArea('nmo')">取消</el-button>
-        <el-button type="primary" @click="setNewMemberObject('nmo')">确 定</el-button>
+        <el-button type="primary" @click="setNewMemberObject('nmo')" v-if="!isClick">确 定</el-button>
+        <el-button type="primary" v-if="isClick" style="opacity: 0.6;" >确 定</el-button>
       </div>
     </el-dialog>
 
@@ -199,14 +200,11 @@
   } from 'src/api/admin/userManagement/index';
   import {getToken} from 'src/utils/auth';
   import {mapGetters} from 'vuex';
-  import {getUserMemberByUserId} from 'src/api/admin/baseUserMember/index';
   import {timestamp2Date} from 'src/utils/dateUtils';
-  import {page} from 'src/api/order/memeber';
   import {
     UploadMembershipList,
     saveNewMemberObject
   } from 'src/api/admin/UserMember/index';
-  import {formatDate} from "../../utils/dateFormattor";
   import ElRow from "element-ui/packages/row/src/row";
   import ElCol from "element-ui/packages/col/src/col";
   import {getMembers} from "src/api/admin/member/index"
@@ -228,6 +226,7 @@
           id: undefined,
           userId: undefined
         },
+        isClick: false, // 是否已点击，防二次触发
         memberLevelList: [],
         saveUserId: undefined,
         validityType: '无',
@@ -268,28 +267,28 @@
           phone: [
             {
               required: true,
-              message: '手机号',
+              message: '请输入手机号',
               trigger: 'blur'
             },
           ],
           memberLevel: [
             {
               required: true,
-              message: '会员等级',
+              message: '请输入会员等级',
               trigger: 'blur'
             },
           ],
           totalNumber: [
             {
               required: true,
-              message: '免费天数',
+              message: '请输入免费天数',
               trigger: 'blur'
             },
           ],
           rentFreeDays: [
             {
               required: true,
-              message: '剩余总天天数',
+              message: '请输入剩余总天天数',
               trigger: 'blur'
             },
           ],
@@ -299,7 +298,7 @@
           limit: 20,
           startTime: undefined,
           username: undefined,
-          endTime: undefined,
+          endTime: undefined
         },
         newMemberArea: false,
         bulkUploadMember: false,
@@ -327,8 +326,7 @@
       if(query !="null" && query){
         this.listQuery = JSON.parse(query);
       }
-      this.getList();
-     this. getMembersLevel()
+      this. getMembersLevel()
     } ,
     computed: {
       ...
@@ -343,6 +341,9 @@
       },
     },
     methods: {
+      /**
+       * 会员等级
+       */
       getMembersLevel() {
         var _this = this;
         getMembers().then(res => {
@@ -353,6 +354,7 @@
 
               _this.memberLevelList.push({id: ele.level, name: ele.name})
             })
+          _this.getList();
             // console.log('this.queryMemberLevelList'+JSON.stringify(this.queryMemberLevelList))
           }
         )
@@ -483,7 +485,6 @@
        */
       getList() {
         let query = this.listQuery;
-        console.log(typeof this.listQuery.startTime);
         if(this.listQuery.startTime && (typeof this.listQuery.startTime == "object")){
           this.listQuery.startTime = this.listQuery.startTime.getTime();
         }
@@ -495,12 +496,18 @@
         }
         getMemberEntryList(query)
           .then(response => {
+            let _this = this
             let totalCountRs = undefined;
             let listRs = undefined;
             if (!this.$utils.isEmpty(response.data.data) && this.$utils.isInteger(response.data.totalCount)) {
               listRs = response.data.data;
               totalCountRs = response.data.totalCount;
               listRs.map(function(item){
+                _this.memberLevelList.map(function(iitem){
+                  if(iitem.id == item.memberLevel){
+                    item.memberLevelName = iitem.name
+                  }
+                })
                 item.visible2 = false;
                 item.crtTimeStr = timestamp2Date(item.crtTime);
               });
@@ -570,29 +577,35 @@
        * 提交新增会员/编辑会员
        */
       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) {
-                this.$notify.success({
-                  title: '操作成功',
-                  message: `success`
-                })
-              } else {
-                this.$notify.warning({
-                  title: '操作失败',
-                  message: `failed`
-                })
-              }
-              this.newMemberArea = false
-              this.$refs[formName].resetFields()
-              this.getList();
-            })
+          let _this = this
+          const set = this.$refs;
+          if (this.isClick) {
+            return;
+          }
+          this.isClick = true;
+          setTimeout(function(){
+            _this.isClick = false
+          }, 2000)
+          set[formName].validate((valid) => {
+            if (valid) {
+              saveNewMemberObject(this.newMemberObject).then(res => {
+                if (res.rel) {
+                  this.$notify.success({
+                    title: '操作成功',
+                    message: `success`
+                  })
+                } else {
+                  this.$notify.warning({
+                    title: '操作失败',
+                    message: `failed`
+                  })
+                }
+                _this.newMemberArea = false
+                _this.$refs[formName].resetFields()
+                _this.getList();
+              })
+            }
+          })
         },
         /**
          * 关闭窗口,清除批量上传

src/views/userManagement/memberManagement/index.vue

@@ -71,7 +71,7 @@
           <span>{{ scope.row.extract }}</span>
         </template>
       </el-table-column>
-      <el-table-column align="center" label="分红金额">
+      <el-table-column align="center" label="分红比例">
         <template slot-scope="scope">
           <span>{{ scope.row.shareAmount }}</span>
         </template>
@@ -223,12 +223,12 @@
           </el-row>
           <el-row>
             <el-col :span="16">
-              <el-form-item label="分红金额">
+              <el-form-item label="分红比例">
                 <el-input
                   type="number"
                   min="0"
                   v-model="add.shareAmount"
-                  placeholder="分红金额"
+                  placeholder="请输入0-100，例：80%输入80"
                 ></el-input>
               </el-form-item>
             </el-col>