修改用户后台管理后台,设置会员

config/dev.env.js

 module.exports = {
     NODE_ENV: '"development"',
-  BASE_API: '"http://10.1.37.244:8765"',//'"https://xxfcmgmt.upyuns.com"（正）',//http://10.1.37.192:9527（何）, //https://xxtest.upyuns.com（测）,10.1.37.246:9527(韩), 10.1.37.244(李斌)10.1.37.248:8765(小威)
+  BASE_API: '"http://10.1.37.246:8765"',//'"https://xxfcmgmt.upyuns.com"（正）',//http://10.1.37.192:9527（何）, //https://xxtest.upyuns.com（测）,10.1.37.246:9527(韩), 10.1.37.244(李斌)10.1.37.248:8765(小威)
     APP_ORIGIN: '"https://wallstreetcn.com"'
 }

src/api/admin/userManagement/index.js

@@ -32,7 +32,7 @@ export function setDisable(id) {
 
 export function seveObj(obj) {
   return fetch({
-    url: '/api/admin/baseUserMember/setUserMember/',
+    url: '/api/admin/baseUserMember/setUserMember',
     method: 'put',
     data:obj
   });

src/router/index.js

@@ -336,12 +336,12 @@ export const asyncRouterMap = [{
       name: '车辆保养记录',
       authority: 'vehicleUpkeepLog'
     },
-    {
-      path: 'vehicleSchedulManage',
-      component: _import('vehicle/vehicleSchedulManage/index'),
-      name: '车辆排班管理',
-      authority: 'vehicleSchedulManage'
-    }
+    // {
+    //   path: 'vehicleSchedulManage',
+    //   component: _import('vehicle/vehicleSchedulManage/index'),
+    //   name: '车辆排班管理',
+    //   authority: 'vehicleSchedulManage'
+    // }
   ]
 },
 {

src/views/userManagement/userList/index.vue

@@ -49,13 +49,14 @@
         </el-row>
       </el-form>
       <el-button class="filter-item" type="primary" v-waves icon="search" @click="handleFilter">搜索</el-button>
-      <el-button class="filter-item"  style="margin-left: 10px;" @click="newMember"
-                 type="primary" icon="edit">新增会员
-      </el-button>
+      <el-button class="filter-item" type="primary" v-waves icon="delete" @click="cleaningQuery">清除搜索条件</el-button>
+      <!--      <el-button class="filter-item"  style="margin-left: 10px;" @click="newMember"-->
+      <!--                 type="primary" icon="edit">新增会员-->
+      <!--      </el-button>-->
 
-      <el-button class="filter-item"  style="margin-left: 10px;" @click="bulkUpload"
-                 type="primary" icon="edit">批量导入会员
-      </el-button>
+      <!--      <el-button class="filter-item"  style="margin-left: 10px;" @click="bulkUpload"-->
+      <!--                 type="primary" icon="edit">批量导入会员-->
+      <!--      </el-button>-->
     </div>
     <el-table :key='tableKey' :data="list" v-loading.body="listLoading" border fit highlight-current-row
               style="width: 100%">
@@ -132,7 +133,7 @@
     </div>
     <!--    用户详细信息窗口-->
     <el-dialog title="用户详情" :visible.sync="detailsDialogFormVisible" type="text" label-width="95px">
-      <el-form >
+      <el-form>
         <el-row>
           <el-row>
             <el-form-item label="基础信息">
@@ -306,6 +307,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 v-for="(val, key, index) in memberLevelist " :key="val.id" :label="val.name"
                            :value="val.id"></el-option>
               </el-select>
@@ -317,8 +319,8 @@
             <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-button style="margin-bottom: 10px;" label="自定义"></el-radio-button>
               </el-radio-group>
               <dir></dir>
               <div class="block" v-if="validityType=='自定义'">
@@ -419,7 +421,7 @@
         </el-form>
 
       </div>
-<!--      <el-form :model="userOrderMessage" ref="alterUserOrder" label-width="100px">-->
+      <!--      <el-form :model="userOrderMessage" ref="alterUserOrder" label-width="100px">-->
 
       <el-table
         :data="orderData"
@@ -454,7 +456,7 @@
           </el-button>
         </el-table-column>
       </el-table>
-<!--      </el-form>-->
+      <!--      </el-form>-->
       <div v-show="!orderListLoading" class="pagination-container">
         <el-pagination @size-change="orderSizeChange" @current-change="orderCurrentChange"
                        :current-page.sync="orderQuery.page" :page-sizes="[10,20,30, 50]" :page-size="orderQuery.limit"
@@ -657,10 +659,10 @@
         bulkUploadMember: false,
         dialogStatus: '',
         userManager_btn_del: false,
-        statusBoolean:false,
+        statusBoolean: false,
         myGroups: [],
         loading: false,
-
+        HeaderWithToken: undefined,
         tableKey: 0,
         selectedAccItem: undefined
       }
@@ -677,11 +679,19 @@
       /**
        * 获取token
        */
+
+
       getHeaderWithToken() {
         return {Authorization: getToken()};
       },
+
+    },
+    watch: {
+      'userMembershipInformation.memberLevel'(newValue, oldValue) {
+       
+        console.log('userMembershipInformation.memberLevel='+newValue)
       }
-    ,
+    },
     methods: {
 
       /**
@@ -830,15 +840,16 @@
        * @param row
        */
       setMember(row) {
+
         this.userMembershipInformation = {}
         this.saveUserId = row.userId
         getUserMemberByUserId(row.userId).then(response => {
+          console.log(JSON.stringify(response))
           if (response.data.validTime == 0) {
             this.validityType = '永久'
           } else if (response.data.validTime) {
             this.validityType = '自定义'
-            response.data.validTime = timestamp2Date(response.data.validTime);
-
+            response.data.validTime = timestamp2Date(response.data.validTime)
           } else {
             this.validityType = '无'
           }
@@ -854,10 +865,17 @@
        * @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()
-
-        console.log(this.userMembershipInformation)
+        } else {
+          this.userMembershipInformation.validTime = null
+        }
+        this.userMembershipInformation.userId = this.saveUserId
+        console.log('userMembershipInformation:' + JSON.stringify(this.userMembershipInformation))
         seveObj(this.userMembershipInformation).then(res => {
           if (res.rel) {
             this.$notify.success({
@@ -1004,14 +1022,14 @@
         this.orderQuery.page = val;
         this.userOrder(this.orderQuery);
       },
-      disable(obj){
-        setDisable(obj.userId).then(res=> {
-            if (res.rel){
+      disable(obj) {
+        setDisable(obj.userId).then(res => {
+          if (res.rel) {
             this.$notify.success({
               title: '成功',
               message: `success`
             })
-            }else {
+          } else {
             this.$notify.warning({
               title: '失败',
               message: `failed`
@@ -1025,14 +1043,14 @@
       /**
        * 设置为禁用取消禁用
        */
-      available(obj){
-        setAvailable(obj.userId).then(res=>{
-            if (res.rel){
+      available(obj) {
+        setAvailable(obj.userId).then(res => {
+          if (res.rel) {
             this.$notify.success({
               title: '成功',
               message: `success`
             })
-            }else {
+          } else {
             this.$notify.warning({
               title: '失败',
               message: `failed`
@@ -1042,24 +1060,35 @@
         })
       },
       tableRowClassName({row, rowIndex}) {
-        if (rowIndex/2==0) {
+        if (rowIndex / 2 == 0) {
           return 'warning-row';
         }
-        // else if (rowIndex === 3) {
-        //   return 'success-row';
-        // }
+
         return '';
       },
-      getBoolean(bool){
-        if (bool==='1'){
-          this.statusBoolean=true
+      getBoolean(bool) {
+        if (bool === '1') {
+          this.statusBoolean = true
         }
       },
-      setDate(){
-        alert(this.validTime)
-        if(!this.validTime){
+      setDate() {
+        if (!this.validTime) {
           let date = new Date();//时间戳为10位需*1000，时间戳为13位的话不需乘1000
-          this.validTime= formatDate(date, 'yyyy-MM-dd hh:mm:ss');
+          this.validTime = formatDate(date, 'yyyy-MM-dd hh:mm:ss');
+        }
+      },
+      cleaningQuery() {
+        this.listQuery = {
+          page: 1,
+          limit: 20,
+          mobileList: undefined,
+          mobile: undefined,
+          memberLevel: undefined,
+          source: undefined,
+          channel: undefined,
+          registrationTimeEnd: undefined,
+          registrationTimeBegin: undefined,
+          registrationDate: undefined
         }
 
       }