修改用户列表

src/api/appManagement/version.js

@@ -28,21 +28,21 @@ export function updateAppVersion(obj) {
 export function removeAppVersion(id) {
   return fetch({
     url: '/api/app/version/background/remove/'+id,
-    method: 'post',
+    method: 'delete',
   });
 }
 
 
-export function getAppVersion(id) {
+export function uploadInstallationPackage(id) {
   return fetch({
-    url: '/api/app/version/background/getAppVersion/'+id,
-    method: 'get',
+    url: '/api/app/version/upload/installationPackage',
+    method: 'post',
   });
 }
 
-export function uploadInstallationPackage(id) {
+export function getOne(id) {
   return fetch({
-    url: '/api/app/version/upload/installationPackage',
-    method: 'post',
+    url: '/api/app/version/background/getAppVersion/'+id,
+    method: 'get',
   });
 }

src/views/appManagement/appVersion/index.vue

@@ -72,8 +72,18 @@
         <template scope="scope">
           <el-button size="small" type="primary" @click="compileAppUpload(scope.row)">编辑
           </el-button>
-          <el-button size="small" type="danger" @click="delMembership(scope.row)">删除
-          </el-button>
+          <el-popover
+            ref="popover5"
+            placement="top"
+            width="160"
+            v-model="scope.row.visible2">
+            <p>确定删除吗？</p>
+            <div style="text-align: right; margin: 0">
+              <el-button size="mini" type="text" @click="scope.row.visible2 = false">取消</el-button>
+              <el-button type="primary" size="mini" @click="deleteApp(scope.row)">确定</el-button>
+            </div>
+          </el-popover>
+          <el-button type="danger" size="small" v-popover:popover5>删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -170,7 +180,7 @@
                   :on-success="handleAvatarSuccess"
                   :file-list="fileList">
                   <el-button size="small" type="primary">点击上传</el-button>
-                  <div slot="tip" class="el-upload__tip">只能上传apk/ipa文件，且不超过500kb</div>
+                  <div slot="tip" class="el-upload__tip">只能上传apk/ipa文件，且不超过50Mb</div>
                 </el-upload>
               </el-form-item>
             </el-col>
@@ -201,9 +211,9 @@
   import {
     getAppVersions,
     insertAppVersion,
+    getOne,
     updateAppVersion,
-    removeAppVersion,
-    getAppVersion
+    removeAppVersion
   } from 'src/api/appManagement/version'
   import {timestamp2Date} from 'src/utils/dateUtils';
   import UE from '../../modal/Ueditor';//百度ue富文本
@@ -215,8 +225,8 @@
     },
     data() {
       return {
-        fileList:[],
-        multipleb:false,
+        fileList: [],
+        multipleb: false,
         BASE_API: process.env.BASE_API,
         versionRow: {
           sysType: 0,
@@ -293,10 +303,11 @@
       },
       traverse(list) {
         for (let key of list) {
-          key.crtTime = key.crtTime ? null : timestamp2Date(key.crtTime)
+          key.crtTime = key.crtTime ? timestamp2Date(key.crtTime) : null
           key.downloadSwitch = this.downloadSwitchObj[key.downloadSwitch]
           key.isCompel = this.isCompelObj[key.isCompel]
           key.sysType = this.sysTypeObj[key.sysType]
+          key.visible2 =false
         }
       },
       handleSizeChange(val) {
@@ -315,9 +326,7 @@
        * 新建app版本
        */
       newAppVersion() {
-        if (this.$refs.appVersion) {
-          this.$refs.appVersion.resetFields()
-        }
+        this.template()
         this.modalTitle = '创建'
         this.activeName = 'first'
         this.versionPopup = true
@@ -326,10 +335,12 @@
        *  编辑窗口
        */
       compileAppUpload(row) {
-        this.versionRow = row;
+        getOne(row.id).then(res => {
+          this.versionRow = res.data;
           this.modalTitle = '编辑';
           this.activeName = 'first';
           this.versionPopup = true
+        })
       },
       /**
        * 点击 X 关闭对话框的回调
@@ -339,7 +350,7 @@
         this.versionPopup = false;
       },
       /**
-       * 富文本  营地详情
+       * 富文本
        * */
       editorReadyEvent(instance) {
         let t = this;
@@ -349,17 +360,78 @@
           }
         });
       },
+      /**
+       *  取消保存
+       */
       cancelSetAppVersion() {
-        this.initialize
-      },
-      initialize() {
+        this.template()
         this.versionPopup = false;
-        this.versionRow = {};
         this.activeName = "";
       },
+      /**
+       *  添加
+       *
+       */
       insertAppVersion() {
-        insertAppVersion(this.versionRow).then(res=>{
-
+        insertAppVersion(this.versionRow).then(res => {
+          if (res.status === 200) {
+            this.$notify({
+              title: '成功',
+              message: '添加成功',
+              type: 'success',
+              duration: 2000
+            });
+            this.getList();
+          } else {
+            this.$notify({
+              title: '失败',
+              message: '添加失败！',
+              type: 'error',
+              duration: 2000
+            });
+          }
+          this.versionPopup = false
+        })
+      },
+      /**
+       * 修改
+       */
+      updateAppVersion() {
+        updateAppVersion( this.versionRow).then(res=>{
+          if (res.status === 200) {
+            this.$notify({
+              title: '成功',
+              message: '修改成功',
+              type: 'success',
+              duration: 2000
+            });
+            this.getList();
+          } else {
+            this.$notify({
+              title: '失败',
+              message: '修改失败！',
+              type: 'error',
+              duration: 2000
+            });
+          }
+          this.versionPopup = false
+        })
+      },
+      deleteApp(row){
+        console.log(JSON.stringify(row))
+        removeAppVersion(row.id).then(res=>{
+            if (res.rel) {
+              this.$notify.success({
+                title: '删除成功',
+                message: `success`
+              })
+            } else {
+              this.$notify.warning({
+                title: '删除失败',
+                message: `failed`
+              })
+            }
+            this.getList()
           })
       },
       handleRemove(file, fileList) {
@@ -368,21 +440,35 @@
       handlePreview(file) {
         console.log(file);
       },
-      updateAppVersionupdateAppVersion() {
+      handleAvatarSuccess(res, file) {
+        console.log('handleAvatarSuccess:res' + res.data);
+        console.log('handleAvatarSuccess:file' + file);
 
+        this.versionRow.downloadUrl = this.BASE_API + res.data;
       },
-      handleAvatarSuccess(res, file){
-        console.log('handleAvatarSuccess:res'+res.data);
-        console.log('handleAvatarSuccess:file'+file);
-
-        this.versionRow.downloadUrl=this.BASE_API+res.data;
+      template() {
+        this.fileList=[]
+        this.versionRow =
+          {
+            sysType: 0,
+            version: undefined,
+            versionName: undefined,
+            weigh: undefined,
+            downloadUrl: undefined,
+            packagesize: undefined,
+            downloadSwitch: 1,
+            isCompel: 0,
+            content: ""
+          }
       }
     }
   }
 </script>
 <style>
-
-  .mGrade .el-dialog--small {
-    width: 500px;
+  .v-modal{
+    z-index: 1000 !important;
+  }
+  .el-dialog__wrapper{
+    z-index: 1008 !important;
   }
 </style>

src/views/userManagement/memberEnter.vue

@@ -44,6 +44,11 @@
           <span>{{scope.row.username}}</span>
         </template>
       </el-table-column>
+      <el-table-column width="150" align="center" label="会员名">
+        <template scope="scope">
+          <span>{{scope.row.memberName}}</span>
+        </template>
+      </el-table-column>
       <el-table-column width="150" align="center" label="会员等级">
         <template scope="scope">
           <span>{{scope.row.memberLevel==3?"钻石会员": scope.row.memberLevel==2?"黄金会员":scope.row.memberLevel==1?"普通会员":"普通用户"}}</span>
@@ -112,6 +117,13 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="会员名" placeholder="会员名" prop="memberName">
+              <el-input size="small " type="text" v-model="newMemberObject.memberName"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="8">
             <el-form-item label="手机号" placeholder="手机号" prop="phone">
@@ -230,6 +242,7 @@
         listLoading: true,
         orderListLoading: true,
         newMemberObject: {
+          memberName:undefined,
           phone: undefined,
           memberLevel: undefined,
           totalNumber: undefined,
@@ -463,6 +476,7 @@
        * 提交新增会员
        */
       setNewMemberObject(formName) {
+       console.log(JSON.stringify(this.newMemberObject))
         saveNewMemberObject(this.newMemberObject)
           .then(res => {
               if (res.rel) {

src/views/userManagement/userList/index.vue

@@ -57,7 +57,7 @@
           <el-col :span="4">
             <el-form-item label="用户来源">
               <el-select class="filter-item" v-model="listQuery.source" 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 sourceList" :key="val.id" :label="val.name"
                            :value="val.id"></el-option>
               </el-select>
@@ -398,7 +398,7 @@
         <el-form-item label="会员等级">
           <el-select class="filter-item" v-model="newMemberObject.memberLevel" placeholder="选择会员等级">
             <el-option :key="undefined" label="无" :value="undefined"></el-option>
-            <el-option v-for="(val, key, index) in memberLevelist " :key="val.id" :label="val.name"
+            <el-option v-for="(val, key, index) in setMemberLevelList " :key="val.id" :label="val.name"
                        :value="val.id"></el-option>
           </el-select>
         </el-form-item>
@@ -660,7 +660,10 @@
           registrationTimeBegin: undefined,
 
         },
-
+        sexObj:{
+          0:'女',
+          1:'男'
+        },
         source: {
           0: '自来',
           1: '用户邀请'
@@ -832,6 +835,7 @@
         listKey.source = this.source[listKey.source];
         listKey.validTime = listKey.validTime ? ((listKey.validTime == 0) ? '永久' : listKey.validTime) : '无';
         listKey.visible2 =false
+        listKey.sex=listKey.sex?this.sexObj[listKey.sex]:''
       },
 
       /**
@@ -920,6 +924,7 @@
           this.userMembershipInformation.validTime = null
         }
         this.userMembershipInformation.userId = this.saveUserId
+        this.userMembershipInformation.buyCount=undefined;
         console.log('userMembershipInformation:' + JSON.stringify(this.userMembershipInformation))
         seveObj(this.userMembershipInformation).then(res => {
           if (res.rel) {