修改用户列表

src/api/appManagement/version.js

+import fetch from 'utils/fetch';
+
+export function getList() {
+  return fetch({
+    url: '/api/app/version',
+    method: 'get'
+  });
+}

src/router/index.js

@@ -433,5 +433,20 @@ export const asyncRouterMap = [{
         authority: 'memberManagement'
       }
     ]
+  },
+  {
+    path: '/appManagement',
+    component: Layout,
+    name: 'app版本管理',
+    icon: 'setting',
+    authority: 'appManagement',
+    children: [
+      {
+        path: 'appVersion',
+        component: _import('appManagement/appVersion/index'),
+        name: 'app版本管理',
+        authority: 'appVersion'
+      }
+    ]
   }
 ];

src/views/appManagement/appVersion/index.vue

+<template>
+  <div class="app-container calendar-list-container">
+    <div>
+      <el-button class="filter-item" style="margin-bottom: 10px;" @click="newMembershipGrade"
+                 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%">
+      <el-table-column width="205" align="center" label="等级序号">
+        <template scope="scope">
+          <span>{{scope.row.level}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column width="205" align="center" label="名称">
+        <template scope="scope">
+          <span>{{scope.row.name}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column width="205" align="center" label="图标">
+        <template scope="scope">
+          <span> <img class="image" :src="scope.row.icon"/></span>
+        </template>
+      </el-table-column>
+      <el-table-column width="205" align="center" label="折扣">
+        <template scope="scope">
+          <span>{{scope.row.discount}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column width="205" align="center" label="免费天数">
+        <template scope="scope">
+          <span>{{scope.row.number}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column width="205" align="center" label="价格">
+        <template scope="scope">
+          <span>{{scope.row.price}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column width="205" align="center" label="有效期">
+        <template scope="scope">
+          <span>{{scope.row.endDate}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="操作" width="212">
+        <template scope="scope">
+          <el-button size="small" type="danger" @click="delMembership(scope.row)">删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+<script>
+  import {mapGetters} from 'vuex';
+  import {getToken} from 'src/utils/auth';
+
+  export default {
+    name: 'membershipGrade',
+    data() {
+      return {
+
+      }
+    },
+    created() {
+      this.getList();
+    }
+    ,
+    computed: {
+      ...
+        mapGetters([
+          'elements'
+        ]),
+      /**
+       * 获取token
+       */
+      getHeaderWithToken() {
+        return {Authorization: getToken()};
+      },
+    },
+    methods: {
+      getList() {
+        getMembers().then(
+          res => {
+            for (let dataKey of res.data) {
+              if (dataKey.endDate == 0) {
+                dataKey.endDate = '半年'
+              } else {
+                dataKey.endDate = dataKey.endDate ? this.year[dataKey.endDate] : ''
+              }
+
+            }
+            this.list = res.data
+            this.listLoading = false;
+          }
+        )
+      },
+      /**
+       * 删除会员等级
+       * */
+      delMembership(row) {
+        delMembershipGrade(row.id).then(res => {
+
+          if (res.rel) {
+            this.$notify.success({
+              title: '成功',
+              message: `success`
+            })
+          } else {
+            this.$notify.warning({
+              title: '失败',
+              message: `failed`
+            })
+          }
+          this.getList()
+
+        })
+      },
+      /**
+       * 关闭清除
+       * */
+      cancelSetMemberArea(refName) {
+        this.addMembershipGrade = false
+        if (this.$refs[refName]) {
+          this.$refs[refName].resetFields()
+        }
+      },
+      /**
+       * 显示添加窗
+       * */
+      newMembershipGrade() {
+        this.addMembershipGrade = true
+      },
+      /**
+       * 新建会员等级
+       * **/
+      save(refName) {
+        let membership = JSON.parse(JSON.stringify(this.add))
+        membership.endDate = membership.endDate - 1
+        addMembershipGrade(membership).then(
+          res => {
+
+            if (!res.rel) {
+              this.$notify.success({
+                title: '成功',
+                message: `success`
+              })
+            } else {
+              this.$notify.warning({
+                title: '失败',
+                message: `failed`
+              })
+            }
+            this.getList()
+            if (this.$refs[refName]) {
+              this.$refs[refName].resetFields()
+            }
+            this.addMembershipGrade = false
+          })
+      }
+    }
+  }
+</script>
+<style>
+
+  .image {
+    width: 50px;
+    height: 50px;
+  }
+
+  .mGrade .el-dialog--small {
+    width: 500px;
+  }
+</style>

src/views/appManagement/appVersion/versionPopup.vue

+<template>
+  <el-dialog title="违章查询" :visible.sync="isVisible">
+    <el-form>
+      <el-row>
+        <el-col :span="24">
+          <el-form-item label="订单号">
+            <span>{{row.no}}</span>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="订单金额">
+            <span>{{row.realAmount}}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="车牌号">
+            <span>{{row.vehicleNumberPlat}}</span>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="24">
+          <el-form-item label="用户ID/实名">
+            <span>{{row.userId}}</span>/<span>{{row.username}}</span>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="取车">
+            <span>{{dateFormat(row.orderRentVehicleDetail.startTime)}}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="16">
+          <el-form-item label="交车公司">
+            <span>{{row.startCompanyName}}</span>
+            <span>({{row.orderRentVehicleDetail.startCityName}}{{row.orderRentVehicleDetail.startAddr}})</span>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="还车">
+            <span>{{dateFormat(row.orderRentVehicleDetail.endTime)}}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="16">
+          <el-form-item label="收车公司">
+            <span><span>{{row.endCompanyName}}</span>
+			    <span>({{row.orderRentVehicleDetail.endCityName}}{{row.orderRentVehicleDetail.endAddr}})</span></span>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col>
+          <el-form-item label="违章截图" :style="{display:'block'}">
+            <!--<el-upload-->
+              <!--action="https://xxtest.upyuns.com/api/universal/file/app/unauth/admin/upload"-->
+              <!--list-type="picture-card"-->
+              <!--:headers="getHeaderWithToken"-->
+              <!--:on-success="handleSuccess"-->
+              <!--:on-remove="handleRemove">-->
+              <!--<i class="el-icon-plus"></i>-->
+            <!--</el-upload>-->
+            <!--<el-dialog v-model="dialogVisible" size="tiny">-->
+              <!--<img width="100%" :src="dialogImageUrl" alt="">-->
+            <!--</el-dialog>-->
+            <el-upload
+              class="upload-demo"
+              :headers="getHeaderWithToken"
+              action="https://xxtest.upyuns.com/api/universal/file/app/unauth/admin/upload"
+              :on-remove="handleRemove"
+              :file-list="fileList2"
+              :on-success="handleSuccess"
+              list-type="picture-card">
+              <!--<div slot="tip" class="el-upload__tip">最多上传5张</div>-->
+              <i class="el-icon-plus"></i>
+            </el-upload>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+          <el-form-item label="违章罚款" style="display: inline-block;">
+            <el-input v-model="price" type="number" placeholder="请输入违章罚款金额"></el-input>
+          </el-form-item>
+      </el-row>
+    </el-form>
+
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="cancel">取 消</el-button>
+      <el-button type="primary" @click="okHandler('form')">确 定</el-button>
+    </div>
+  </el-dialog>
+</template>
+<script>
+  import {
+    page,
+    saveOrderViolation
+  } from 'api/order/rentVehicle';
+  import {mapGetters} from 'vuex';
+  import {
+    formatDate
+  } from '../../../utils/dateFormattor';
+  import {
+    getToken
+  } from '../../../utils/auth';
+  import {
+    getOneIllegalRow
+  } from 'api/order/rentVehicle';
+  import ElRow from "element-ui/packages/row/src/row";
+  import ElInput from "../../../../node_modules/element-ui/packages/input/src/input.vue";
+  import ElCol from "element-ui/packages/col/src/col";
+  import ElFormItem from "../../../../node_modules/element-ui/packages/form/src/form-item.vue";
+  import ElForm from "../../../../node_modules/element-ui/packages/form/src/form.vue";
+  export default {
+    props: ["row"],
+    name: 'illegalDialog',
+    components: {
+      ElForm,
+      ElFormItem,
+      ElCol,
+      ElInput,
+      ElRow
+    },
+    data() {
+      return {
+        price: undefined,//违章罚款金额
+        isVisible: false,
+        fileList2:[],//违章截图
+      }
+    },
+    created() {
+
+    },
+    watch: {
+      isVisible(newValue, oldValue){
+        if(!newValue){
+          this.$emit('illegalEvent', false);
+        }
+      },
+    },
+    mounted() {
+      let that = this;
+//      if(that.row.refundStatus == 3) {
+        //refundStatus退款状态  0、未退款  1、已退还所有（取消订单时）2、 已退还部分（保留违章预备金）3、已退还所有押金（扣除该扣除的）
+        that.getOne(that.row.detailId);
+//      }
+      this.isVisible = true;
+    },
+    computed: {
+      ...mapGetters([
+        'elements',
+      ]),
+      getHeaderWithToken() {
+        return {Authorization: getToken()};
+      }
+    },
+    methods: {
+      /**
+       * 根据id查询一条记录
+       * */
+     getOne(id){
+       let t = this;
+        getOneIllegalRow(id).then(response => {
+          if(response.status == 200){
+            let arr = response.data.picture.split(",");
+            let fileList2 = [];
+            let p = {};
+            arr.map(function(item){
+              p = {
+                url: item
+              };
+              fileList2.push(p);
+            });
+            t.price = parseFloat(response.data.price);
+            t.fileList2 = fileList2;
+            t.id = response.data.id?response.data.id: undefined;
+          } else {
+            this.$notify({
+              title: '失败',
+              message: response.menu,
+              type: 'error',
+              duration: 2000
+            });
+          }
+        })
+     },
+      /**
+       * 上传成功
+       * */
+      handleSuccess(res, file) {
+        let c = {url: res.data};
+        this.fileList2.push(c);
+        this.showLoadingBody = false;
+      },
+      /**
+       * 删除违章图片
+       * */
+      handleRemove(file, fileList){
+        this.fileList2 = fileList;
+      },
+      /**
+       * 确定
+       * */
+      okHandler() {
+        let arr = [];
+        this.fileList2.map(function(item){
+          arr.push(item.url);
+        });
+        let params = {
+          picture:arr.join(","),
+          price:this.price,
+          detailId: this.row.detailId,
+          id: this.id
+        };
+        saveOrderViolation(params).then(response => {
+          if (response.status === 200) {
+            this.$notify({
+              title: '成功',
+              message: '创建成功',
+              type: 'success',
+              duration: 2000
+            });
+            this.$emit('illegalEvent', false);
+          } else {
+            this.$notify({
+              title: '创建失败',
+              message: '操作失败！',
+              type: 'error',
+              duration: 2000
+            });
+          }
+        });
+      },
+      /**
+       * 弹框-取消
+       * */
+      cancel() {
+        this.$emit('illegalEvent', false);
+      },
+      /**
+       * 格式化时间
+       * @param timestamp
+       * @returns {*}
+       */
+      dateFormat(timestamp) {
+        let date = new Date(timestamp);//时间戳为10位需*1000，时间戳为13位的话不需乘1000
+        return formatDate(date, 'yyyy-MM-dd hh:mm:ss');
+      },
+    }
+  }
+</script>
+<style>
+  .el-form-item__content{
+    display: inline-block;
+  }
+</style>

src/views/userManagement/userList/index.vue

@@ -132,7 +132,7 @@
     </div>
     <!--    用户详细信息窗口-->
     <el-dialog title="用户详情" :visible.sync="detailsDialogFormVisible" type="text" label-width="95px">
-      <el-form :model="userDetails"  ref="form" label-width="95px">
+      <el-form >
         <el-row>
           <el-row>
             <el-form-item   label="基础信息">
@@ -157,12 +157,12 @@
                     <span>{{userDetails.userId}}</span>
                   </el-form-item>
                 </el-col>
-                <el-col :span="6">
+                <el-col :span="8">
                   <el-form-item label="昵称:">
                     <span>{{userDetails.nickName}}</span>
                   </el-form-item>
                 </el-col>
-                <el-col :span="6">
+                <el-col :span="8">
                   <el-form-item label="手机号:">
                     <span>{{userDetails.username}}</span>
                   </el-form-item>
@@ -174,12 +174,12 @@
                     <span>{{userDetails.channel}}</span>
                   </el-form-item>
                 </el-col>
-                <el-col :span="6">
+                <el-col :span="8">
                   <el-form-item label="注册时间:">
                     <span>{{userDetails.createTime}}</span>
                   </el-form-item>
                 </el-col>
-                <el-col :span="6">
+                <el-col :span="9">
                   <el-form-item label="最近登录时间:">
                     <span>{{userDetails.lastTime}}</span>
                   </el-form-item>
@@ -190,9 +190,9 @@
         </el-row>
         <el-row>
           <el-row>
-            <el-form-item v-if="userManager_btn_del" v label="实名认证状态">
-              <span v-if="userDetails.certificationStatus==1">(状态-未认证)</span>
-              <span v-if="userDetails.certificationStatus!=1">(状态-已认证)</span>
+            <el-form-item   label="实名认证状态">
+              <span v-if="!statusBoolean">(状态-未认证)</span>
+              <span v-if="statusBoolean">(状态-已认证)</span>
             </el-form-item>
           </el-row>
           <el-row>
@@ -656,6 +656,7 @@
         bulkUploadMember: false,
         dialogStatus: '',
         userManager_btn_del: false,
+        statusBoolean:false,
         myGroups: [],
         loading: false,
 
@@ -821,6 +822,7 @@
       viewDetails(row) {
         this.userDetails = row
         this.detailsDialogFormVisible = true
+        this.getBoolean(this.userDetails.certificationStatus)
       }
       ,
       /**
@@ -1048,6 +1050,12 @@
         //   return 'success-row';
         // }
         return '';
+      },
+      getBoolean(bool){
+        if (bool==='1'){
+          this.statusBoolean=true
+        }
+
       }
     }
   }