Merge remote-tracking branch 'origin/master'

src/api/cai/memberPrice.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询会员价格列表
+export function listMemberPrice(query) {
+  return request({
+    url: '/cai/memberPrice/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询会员价格详细
+export function getMemberPrice(id) {
+  return request({
+    url: '/cai/memberPrice/' + id,
+    method: 'get'
+  })
+}
+
+// 新增会员价格
+export function addMemberPrice(data) {
+  return request({
+    url: '/cai/memberPrice',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改会员价格
+export function updateMemberPrice(data) {
+  return request({
+    url: '/cai/memberPrice',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除会员价格
+export function delMemberPrice(id) {
+  return request({
+    url: '/cai/memberPrice/' + id,
+    method: 'delete'
+  })
+}

src/api/cai/rechargeOrder.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询充值订单列表
+export function listRechargeOrder(query) {
+  return request({
+    url: '/cai/rechargeOrder/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询充值订单详细
+export function getRechargeOrder(id) {
+  return request({
+    url: '/cai/rechargeOrder/' + id,
+    method: 'get'
+  })
+}
+
+// 新增充值订单
+export function addRechargeOrder(data) {
+  return request({
+    url: '/cai/rechargeOrder',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改充值订单
+export function updateRechargeOrder(data) {
+  return request({
+    url: '/cai/rechargeOrder',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除充值订单
+export function delRechargeOrder(id) {
+  return request({
+    url: '/cai/rechargeOrder/' + id,
+    method: 'delete'
+  })
+}

src/api/cai/userMember.js

@@ -18,20 +18,11 @@ export function getUserMember(id) {
 }
 
 // 新增会员管理
-export function addUserMember(data) {
+export function addUserMember(params) {
   return request({
-    url: '/cai/userMember',
+    url: '/cai/userMember/addVip',
-    method: 'post',
+    method: 'get',
-    data: data
+    params: params
-  })
-}
-
-// 修改会员管理
-export function updateUserMember(data) {
-  return request({
-    url: '/cai/userMember',
-    method: 'put',
-    data: data
   })
 }
 

src/api/cai/vipOrder.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询VIP订单列表
+export function listVipOrder(query) {
+  return request({
+    url: '/cai/vipOrder/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询VIP订单详细
+export function getVipOrder(id) {
+  return request({
+    url: '/cai/vipOrder/' + id,
+    method: 'get'
+  })
+}
+
+// 新增VIP订单
+export function addVipOrder(data) {
+  return request({
+    url: '/cai/vipOrder',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改VIP订单
+export function updateVipOrder(data) {
+  return request({
+    url: '/cai/vipOrder',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除VIP订单
+export function delVipOrder(id) {
+  return request({
+    url: '/cai/vipOrder/' + id,
+    method: 'delete'
+  })
+}

src/constant/statusMap.js

@@ -71,7 +71,7 @@ export const memberTypeList = [
 export const memberStatusList = [
   { value: 0, label: '可用' ,listClass: listClass.info},
   { value: 1, label: '过期' ,listClass: listClass.warning},
-  { value: 1, label: '不可用' ,listClass: listClass.danger},
+  { value: 2, label: '不可用' ,listClass: listClass.danger},
 ]
 
 export const yesOrNoList = [
@@ -174,3 +174,15 @@ export const reportStatusList = [
 ]
 
 
+export const platformTypeList = [
+  { value: 'ALI', label: '支付宝',listClass: listClass.primary},
+  { value: 'WX', label: '微信',listClass: listClass.danger},
+  { value: 'ADMIN', label: '后台操作',listClass: listClass.info},
+]
+
+export const payStatusList = [
+  { value: 0, label: '待支付',listClass: listClass.info},
+  { value: 1, label: '已支付',listClass: listClass.primary},
+  { value: 5, label: '已退款',listClass: listClass.info},
+  { value: 10, label: '无需支付',listClass: listClass.info},
+]

src/views/cai/rechargeOrder/index.vue

@@ -0,0 +1,187 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="蜜瓜号" prop="usercode">
+        <el-input
+            v-model="queryParams.usercode"
+            placeholder="请输入蜜瓜号"
+            clearable
+            @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="手机号" prop="mobile">
+        <el-input
+            v-model="queryParams.mobile"
+            placeholder="请输入手机号"
+            clearable
+            @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="订单号" prop="orderNo">
+        <el-input
+            v-model="queryParams.orderNo"
+            placeholder="请输入订单号"
+            clearable
+            @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="支付状态" prop="payStatus">
+        <el-select v-model="queryParams.payStatus" placeholder="支付状态" clearable size="small">
+          <el-option
+              v-for="dict in payStatusList"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+              @keyup.enter.native="handleQuery"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="rechargeOrderList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="订单号" align="center" prop="orderNo" />
+      <el-table-column label="蜜瓜号" align="center" prop="usercode" />
+      <el-table-column label="昵称" align="center" prop="nickname" />
+      <el-table-column label="手机" align="center" prop="mobile" />
+      <el-table-column label="头像" align="center" prop="avatar" >
+        <template v-slot="scope">
+          <image-avatar :src="scope.row.avatar"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="性别" align="center" prop="gender">
+        <template v-slot="scope">
+          <cai-dict-tag :options="genderList" :value="scope.row.gender" />
+        </template>
+      </el-table-column>
+      <el-table-column label="商品名称" align="center" prop="rechargeName" />
+      <el-table-column label="充值紫贝" align="center" prop="rechargeCoin" />
+      <el-table-column label="价格" align="center" prop="price" />
+      <el-table-column label="平台" align="center" prop="platformType">
+        <template v-slot="scope">
+          <cai-dict-tag :options="platformTypeList" :value="scope.row.platformType" />
+        </template>
+      </el-table-column>
+      <el-table-column label="状态" align="center" prop="payStatus" >
+        <template v-slot="scope">
+          <cai-dict-tag :options="payStatusList" :value="scope.row.payStatus" />
+        </template>
+      </el-table-column>
+      <el-table-column label="操作时间" align="center" prop="createTime" width="160"/>
+      <el-table-column label="后台新增" align="center" prop="admin" >
+        <template v-slot="scope">
+          <cai-dict-tag :options="booleanList" :value="scope.row.admin" />
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template v-slot="scope">
+          <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-info"
+              @click="handleInfo(scope.row)"
+          >详情</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+  </div>
+</template>
+
+<script>
+import { listRechargeOrder, getRechargeOrder, delRechargeOrder, addRechargeOrder, updateRechargeOrder } from "@/api/cai/rechargeOrder";
+import {
+  booleanList,
+  genderList,
+  memberStatusList,
+  memberTypeList, payStatusList,
+  platformTypeList,
+  yesOrNoList
+} from '@/constant/statusMap'
+
+export default {
+  name: "RechargeOrder",
+  data() {
+    return {
+      genderList,memberTypeList,yesOrNoList,memberStatusList,booleanList,platformTypeList,
+      payStatusList,
+      rechargeOrderInfoVisible: false,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 充值订单表格数据
+      rechargeOrderList: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        payStatus: undefined,
+        usercode: undefined,
+        mobile: undefined,
+        orderNo: undefined
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询充值订单列表 */
+    getList() {
+      this.loading = true;
+      listRechargeOrder(this.queryParams).then(response => {
+        this.rechargeOrderList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    handleInfo(row) {
+      this.rechargeOrderInfoVisible = true
+      this.$nextTick(() => {
+        this.$refs.rechargeOrderInfo.init(row.id)
+      })
+    }
+  }
+};
+</script>

src/views/cai/rechargeOrder/recharge-order-info.vue

@@ -0,0 +1,119 @@
+<template>
+  <el-dialog title="充值订单信息" :close-on-click-modal="false" :visible.sync="open" width="1200px" append-to-body>
+    <el-descriptions :contentStyle="CS" :label-style="LS " class="margin-top" :column="3" size="medium" border>
+      <el-descriptions-item label="蜜瓜号">
+        {{info.usercode}}
+      </el-descriptions-item>
+      <el-descriptions-item label="手机号">
+        {{info.mobile}}
+      </el-descriptions-item>
+      <el-descriptions-item label="头像">
+        <image-avatar :src="info.avatar" />
+      </el-descriptions-item>
+      <el-descriptions-item label="性别">
+        <cai-dict-tag :options="genderList" :value="info.gender" />
+      </el-descriptions-item>
+      <el-descriptions-item label="昵称">
+        {{info.nickname}}
+      </el-descriptions-item>
+      <el-descriptions-item label="商品名称">
+        {{info.rechargeName}}
+      </el-descriptions-item>
+      <el-descriptions-item label="充值紫贝">
+        {{info.rechargeCoin}}
+      </el-descriptions-item>
+      <el-descriptions-item label="价格">
+        {{info.price}}
+      </el-descriptions-item>
+      <el-descriptions-item label="平台">
+        <cai-dict-tag :options="platformTypeList" :value="info.platformType" />
+      </el-descriptions-item>
+      <el-descriptions-item label="状态">
+        <cai-dict-tag :options="payStatusList" :value="info.payStatus" />
+      </el-descriptions-item>
+      <el-descriptions-item label="操作时间">
+        {{info.createTime}}
+      </el-descriptions-item>
+      <el-descriptions-item label="后台新增">
+        <cai-dict-tag :options="booleanList" :value="info.admin" />
+      </el-descriptions-item>
+      <el-descriptions-item label="后台ID">
+        {{info.adminId}}
+      </el-descriptions-item>
+      <el-descriptions-item label="操作IP">
+        {{info.operateIp}}
+      </el-descriptions-item>
+      <el-descriptions-item label="appid">
+        {{info.appid}}
+      </el-descriptions-item>
+      <el-descriptions-item label="第三方回调数据" :span="3">
+        {{info.returnContent}}
+      </el-descriptions-item>
+    </el-descriptions>
+  </el-dialog>
+</template>
+
+<script>
+import {
+  booleanList,
+  genderList,
+  memberStatusList,
+  memberTypeList,
+  payStatusList,
+  platformTypeList,
+  yesOrNoList
+} from '@/constant/statusMap'
+import { getRechargeOrder } from '@/api/cai/rechargeOrder'
+
+export default {
+  name: "UserInfo",
+  data() {
+    return {
+      genderList,memberTypeList,yesOrNoList,memberStatusList,booleanList,platformTypeList,
+      payStatusList,
+      activeName:['base','account','userAlbums'],
+      CS: {
+        'text-align': 'center',  //文本居中
+        'min-width': '250px',   //最小宽度
+        'word-break': 'break-all'  //过长时自动换行
+      },
+      LS: {
+        // 'color': '#000',
+        'text-align': 'center',
+        // 'font-weight': '600',
+        'height': '40px',
+        // 'background-color': 'rgba(255, 97, 2, 0.1)',
+        'min-width': '110px',
+        'word-break': 'keep-all'
+      },
+      open:false,
+      info:{},
+    };
+  },
+  created() {
+
+  },
+  methods: {
+    init(id){
+      this.open = true;
+      getRechargeOrder(id).then(response => {
+        this.info = response.data;
+      });
+    },
+  }
+};
+</script>
+<style lang="scss" scoped>
+.el-row {
+  margin-bottom: -15px;
+  display: flex;
+  flex-wrap: wrap
+}
+
+/* .el-card {
+   min-width: 100%;
+   height: 80%;  // 高度要设置百分比才可以
+   margin-right: 20px;
+   transition: all .5s;
+ }*/
+</style>

src/views/cai/user/index.vue

@@ -143,7 +143,7 @@
     />
 
     <user-add-update-dialog v-if="userAddUpdateDialogVisible" ref="userAddUpdateDialog" @refreshDataList="getList" />
-    <user-info-dialog v-if="userInfoDialogVisible" ref="userInfoDialog" @refreshDataList="getList" />
+    <user-info-dialog v-if="userInfoDialogVisible" ref="userInfoDialog" />
   </div>
 </template>
 

src/views/cai/user/user-info-dialog.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog title="技师信息" :close-on-click-modal="false" :visible.sync="open" width="1200px" append-to-body>
+  <el-dialog title="用户信息" :close-on-click-modal="false" :visible.sync="open" width="1200px" append-to-body>
     <el-collapse v-model="activeName" >
       <el-collapse-item title="基本信息" name="base">
         <el-descriptions :contentStyle="CS" :label-style="LS " class="margin-top" :column="3" size="medium" border>
@@ -13,7 +13,7 @@
             {{info.user.mobile}}
           </el-descriptions-item>
           <el-descriptions-item label="头像">
-            <image-preview :src="info.user.avatar" />
+            <image-avatar :src="info.user.avatar" />
           </el-descriptions-item>
           <el-descriptions-item label="性别">
             <cai-dict-tag :options="genderList" :value="info.user.gender" />

src/views/cai/userMember/add-member-dialog.vue

@@ -0,0 +1,116 @@
+<template>
+  <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="700px" append-to-body>
+    <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+      <el-form-item label="开通会员" prop="memberPriceId">
+        <el-select v-model="form.memberPriceId" placeholder="开通会员" clearable size="small">
+          <el-option
+              v-for="dict in memberPriceList"
+              :key="dict.id"
+              :label="dict.name"
+              :value="dict.id"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="蜜瓜号" prop="usercode">
+        <el-autocomplete
+            class="inline-input"
+            v-model="form.usercode"
+            :fetch-suggestions="querySearch"
+            placeholder="请输入内容"
+            @select="handleSelect"
+        ></el-autocomplete>
+      </el-form-item>
+      <el-form-item label="昵称" v-if="info.nickname">
+        {{ info.nickname }} 【{{ info.usercode }}】
+      </el-form-item>
+      <el-form-item label="头像" v-if="info.avatar">
+        <image-avatar :src="info.avatar"/>
+      </el-form-item>
+      <el-form-item>
+        注意：若用户已是会员，再次设置时将会使用最新的会员信息
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="open = false">取 消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import {getUserByUsercode, listUserByUserCode} from "@/api/cai/user";
+import { listMemberPrice } from '@/api/cai/memberPrice'
+import { addUserMember } from '@/api/cai/userMember'
+
+export default {
+  components: {
+  },
+  data () {
+    return {
+      open: false,
+      title: '',
+      form:{
+        usercode: undefined,
+        memberPriceId: undefined
+      },
+      info:{
+      },
+      memberPriceList:[],
+      // 表单校验
+      rules: {
+        usercode: [
+          { required: true, message: "数据不能为空", trigger: "blur" }
+        ],
+        memberPriceId: [
+          { required: true, message: "数据不能为空", trigger: "blur" }
+        ],
+      },
+      buttonLoading: false,
+    }
+  },
+  created() {
+    listMemberPrice().then(response=> {
+      this.memberPriceList = response.rows
+    })
+  },
+  methods: {
+    init () {
+      this.open = true;
+      this.title = "新增工会"
+      this.info = {};
+      this.form.usercode = undefined
+    },
+    querySearch(querySearch,cb){
+      listUserByUserCode(querySearch).then(res => {
+        cb(res.data.map((terminal) => {
+          return {
+            value: terminal,
+            name: terminal,
+          };
+        }))
+      })
+    },
+    handleSelect(item){
+      getUserByUsercode(item.value).then(res => {
+        this.info = res.data
+      })
+    },
+    // 表单提交
+    submitForm () {
+      this.$refs['form'].validate((valid) => {
+        if (valid) {
+          this.buttonLoading = true;
+          addUserMember(this.form).then(data => {
+            this.$modal.msgSuccess("新增工会成功");
+            this.buttonLoading = false;
+            this.open = false
+            this.$emit('refreshDataList')
+          }).finally(() => {
+            this.buttonLoading = false;
+          });
+        }
+      })
+    },
+  }
+}
+</script>

src/views/cai/userMember/index.vue

@@ -1,6 +1,33 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="蜜瓜号" prop="usercode">
+        <el-input
+            v-model="queryParams.usercode"
+            placeholder="请输入蜜瓜号"
+            clearable
+            @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="手机号" prop="mobile">
+        <el-input
+            v-model="queryParams.mobile"
+            placeholder="请输入手机号"
+            clearable
+            @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="会员状态" prop="memberStatus">
+        <el-select v-model="queryParams.memberStatus" placeholder="审核状态" clearable size="small">
+          <el-option
+              v-for="dict in memberStatusList"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+              @keyup.enter.native="handleQuery"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -23,6 +50,11 @@
 
     <el-table v-loading="loading" :data="userMemberList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="会员状态" align="center" prop="memberStatus">
+        <template v-slot="scope">
+          <cai-dict-tag :options="memberStatusList" :value="scope.row.memberStatus" />
+        </template>
+      </el-table-column>
       <el-table-column label="蜜瓜号" align="center" prop="usercode" />
       <el-table-column label="昵称" align="center" prop="nickname" />
       <el-table-column label="手机" align="center" prop="mobile" />
@@ -41,15 +73,20 @@
           <cai-dict-tag :options="memberTypeList" :value="scope.row.memberType" />
         </template>
       </el-table-column>
-      <el-table-column label="永久" align="center" prop="longs" >
+<!--      <el-table-column label="永久" align="center" prop="longs" >
         <template v-slot="scope">
           <cai-dict-tag :options="yesOrNoList" :value="scope.row.longs" />
         </template>
+      </el-table-column>-->
+<!--      <el-table-column label="天数" align="center" prop="expire" />-->
+      <el-table-column label="到期时间" align="center" prop="expireDate" width="150" >
+        <template v-slot="scope">
+          <el-tag v-if="scope.row.longs === 1" type="primary">永久会员</el-tag>
+          <span v-if="scope.row.longs === 0" >{{ scope.row.expireDate }}</span>
+        </template>
       </el-table-column>
-      <el-table-column label="天数" align="center" prop="expire" />
+<!--      <el-table-column label="购买时间" align="center" prop="createTime" width="150" />-->
-      <el-table-column label="到期时间" align="center" prop="expireDate" width="150" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="120">
-      <el-table-column label="购买时间" align="center" prop="createTime" width="150" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="60">
         <template v-slot="scope">
           <el-button
             size="mini"
@@ -57,7 +94,13 @@
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['cai:userMember:remove']"
-          >删除</el-button>
+          >解除</el-button>
+          <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-info"
+              @click="handleVipOrder(scope.row)"
+          >记录</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -69,18 +112,27 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
+
+    <add-member-dialog v-if="addMemberDialogVisible" ref="addMemberDialog" @refreshDataList="getList" />
+    <vip-order-dialog v-if="vipOrderDialogVisible" ref="vipOrderDialog"  />
   </div>
 </template>
 
 <script>
 import { delUserMember, listUserMember } from '@/api/cai/userMember'
-import { genderList, memberTypeList, yesOrNoList } from '@/constant/statusMap'
+import { genderList, memberStatusList, memberTypeList, yesOrNoList } from '@/constant/statusMap'
-
+import AddMemberDialog from '@/views/cai/userMember/add-member-dialog.vue'
+import VipOrderDialog from '@/views/cai/userMember/vip-order-dialog.vue'
 export default {
   name: "UserMember",
+  components: {
+    AddMemberDialog,VipOrderDialog
+  },
   data() {
     return {
-      genderList,memberTypeList,yesOrNoList,
+      genderList,memberTypeList,yesOrNoList,memberStatusList,
+      addMemberDialogVisible: false,
+      vipOrderDialogVisible: false,
       // 遮罩层
       loading: true,
       // 选中数组
@@ -93,12 +145,16 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
+      memberPriceList:[],
       // 会员管理表格数据
       userMemberList: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 10,
+        usercode: undefined,
+        mobile: undefined,
+        memberStatus: 0
       },
     };
   },
@@ -132,18 +188,27 @@ export default {
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
-    handleAdd() {
+    handleAdd(row) {
+      this.addMemberDialogVisible = true
+      this.$nextTick(() => {
+        this.$refs.addMemberDialog.init(row?.usercode)
+      })
+    },
+    handleVipOrder(row){
+      this.vipOrderDialogVisible = true
+      this.$nextTick(() => {
+        this.$refs.vipOrderDialog.init(row)
+      })
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认解除用户"' + row.usercode + '"的会员数据？').then(() => {
-      this.$modal.confirm('是否确认删除会员管理编号为"' + ids + '"的数据项？').then(() => {
         this.loading = true;
-        return delUserMember(ids);
+        return delUserMember(row.id);
       }).then(() => {
         this.loading = false;
         this.getList();
-        this.$modal.msgSuccess("删除成功");
+        this.$modal.msgSuccess("解除成功");
       }).catch(() => {
       }).finally(() => {
         this.loading = false;

src/views/cai/userMember/vip-order-dialog.vue

@@ -0,0 +1,115 @@
+<template>
+  <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="1000px" append-to-body>
+    <el-row :gutter="10" class="mb8">
+      <right-toolbar @queryTable="getList"></right-toolbar>
+    </el-row>
+    <el-table v-loading="loading" :data="vipOrderList" >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="订单号" align="center" prop="orderNo" />
+      <el-table-column label="蜜瓜号" align="center" prop="usercode" />
+      <el-table-column label="VIP名称" align="center" prop="vipName" />
+      <el-table-column label="时长" align="center" prop="vipLongs">
+        <template v-slot="scope">
+          <el-tag v-if="scope.row.vipLongs === 1" type="primary">永久会员</el-tag>
+          <span v-if="scope.row.vipLongs === 0" >{{ scope.row.vipExpire }}天</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="价格" align="center" prop="price" />
+      <el-table-column label="平台" align="center" prop="platformType">
+        <template v-slot="scope">
+          <cai-dict-tag :options="platformTypeList" :value="scope.row.platformType" />
+        </template>
+      </el-table-column>
+      <el-table-column label="状态" align="center" prop="payStatus" >
+        <template v-slot="scope">
+          <cai-dict-tag :options="payStatusList" :value="scope.row.payStatus" />
+        </template>
+      </el-table-column>
+      <el-table-column label="操作时间" align="center" prop="createTime" width="160"/>
+      <el-table-column label="后台新增" align="center" prop="admin" >
+        <template v-slot="scope">
+          <cai-dict-tag :options="booleanList" :value="scope.row.admin" />
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+    />
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="open = false">取 消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import {
+  booleanList,
+  genderList,
+  memberStatusList,
+  memberTypeList, payStatusList,
+  platformTypeList,
+  yesOrNoList
+} from '@/constant/statusMap'
+import { listVipOrder } from '@/api/cai/vipOrder'
+
+export default {
+  components: {
+  },
+  data () {
+    return {
+      genderList,memberTypeList,yesOrNoList,memberStatusList,booleanList,platformTypeList,
+      payStatusList,
+      loading: true,
+      open: false,
+      title: '',
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // VIP订单表格数据
+      vipOrderList: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        usedPay: true,
+        usercode: undefined,
+      },
+    }
+  },
+  created() {
+  },
+  methods: {
+    init (row) {
+      this.open = true;
+      this.queryParams.usercode = row.usercode
+      this.getList()
+      this.title = "会员开通记录"
+    },
+    /** 查询VIP订单列表 */
+    getList() {
+      this.loading = true;
+      listVipOrder(this.queryParams).then(response => {
+        this.vipOrderList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+  }
+}
+</script>

src/views/cai/vipOrder/index.vue

@@ -0,0 +1,198 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="蜜瓜号" prop="usercode">
+        <el-input
+            v-model="queryParams.usercode"
+            placeholder="请输入蜜瓜号"
+            clearable
+            @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="手机号" prop="mobile">
+        <el-input
+            v-model="queryParams.mobile"
+            placeholder="请输入手机号"
+            clearable
+            @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="订单号" prop="orderNo">
+        <el-input
+            v-model="queryParams.orderNo"
+            placeholder="请输入订单号"
+            clearable
+            @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="支付状态" prop="payStatus">
+        <el-select v-model="queryParams.payStatus" placeholder="支付状态" clearable size="small">
+          <el-option
+              v-for="dict in payStatusList"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+              @keyup.enter.native="handleQuery"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="vipOrderList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="订单号" align="center" prop="orderNo" />
+      <el-table-column label="蜜瓜号" align="center" prop="usercode" />
+      <el-table-column label="昵称" align="center" prop="nickname" />
+      <el-table-column label="手机" align="center" prop="mobile" />
+      <el-table-column label="头像" align="center" prop="avatar" >
+        <template v-slot="scope">
+          <image-avatar :src="scope.row.avatar"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="性别" align="center" prop="gender">
+        <template v-slot="scope">
+          <cai-dict-tag :options="genderList" :value="scope.row.gender" />
+        </template>
+      </el-table-column>
+      <el-table-column label="VIP名称" align="center" prop="vipName" />
+      <el-table-column label="时长" align="center" prop="vipLongs">
+        <template v-slot="scope">
+          <el-tag v-if="scope.row.vipLongs === 1" type="primary">永久会员</el-tag>
+          <span v-if="scope.row.vipLongs === 0" >{{ scope.row.vipExpire }}天</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="价格" align="center" prop="price" />
+      <el-table-column label="平台" align="center" prop="platformType">
+        <template v-slot="scope">
+          <cai-dict-tag :options="platformTypeList" :value="scope.row.platformType" />
+        </template>
+      </el-table-column>
+      <el-table-column label="状态" align="center" prop="payStatus" >
+        <template v-slot="scope">
+          <cai-dict-tag :options="payStatusList" :value="scope.row.payStatus" />
+        </template>
+      </el-table-column>
+      <el-table-column label="操作时间" align="center" prop="createTime" width="160"/>
+      <el-table-column label="后台新增" align="center" prop="admin" >
+        <template v-slot="scope">
+          <cai-dict-tag :options="booleanList" :value="scope.row.admin" />
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template v-slot="scope">
+          <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-info"
+              @click="handleInfo(scope.row)"
+          >详情</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <vip-order-info v-if="vipOrderInfoVisible" ref="vipOrderInfo" />
+  </div>
+</template>
+
+<script>
+import { listVipOrder } from '@/api/cai/vipOrder'
+import {
+  booleanList,
+  genderList,
+  memberStatusList,
+  memberTypeList,
+  payStatusList,
+  platformTypeList,
+  yesOrNoList
+} from '@/constant/statusMap'
+import VipOrderInfo from '@/views/cai/vipOrder/vip-order-info.vue'
+
+export default {
+  name: "VipOrder",
+  components:{
+    VipOrderInfo
+  },
+  data() {
+    return {
+      genderList,memberTypeList,yesOrNoList,memberStatusList,booleanList,platformTypeList,
+      payStatusList,
+      vipOrderInfoVisible: false,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // VIP订单表格数据
+      vipOrderList: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        payStatus: undefined,
+        usercode: undefined,
+        mobile: undefined,
+        orderNo: undefined
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询VIP订单列表 */
+    getList() {
+      this.loading = true;
+      listVipOrder(this.queryParams).then(response => {
+        this.vipOrderList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    handleInfo(row) {
+      this.vipOrderInfoVisible = true
+      this.$nextTick(() => {
+        this.$refs.vipOrderInfo.init(row.id)
+      })
+    },
+  }
+};
+</script>

src/views/cai/vipOrder/vip-order-info.vue

@@ -0,0 +1,120 @@
+<template>
+  <el-dialog title="VIP订单信息" :close-on-click-modal="false" :visible.sync="open" width="1200px" append-to-body>
+    <el-descriptions :contentStyle="CS" :label-style="LS " class="margin-top" :column="3" size="medium" border>
+      <el-descriptions-item label="蜜瓜号">
+        {{info.usercode}}
+      </el-descriptions-item>
+      <el-descriptions-item label="手机号">
+        {{info.mobile}}
+      </el-descriptions-item>
+      <el-descriptions-item label="头像">
+        <image-avatar :src="info.avatar" />
+      </el-descriptions-item>
+      <el-descriptions-item label="性别">
+        <cai-dict-tag :options="genderList" :value="info.gender" />
+      </el-descriptions-item>
+      <el-descriptions-item label="昵称">
+        {{info.nickname}}
+      </el-descriptions-item>
+      <el-descriptions-item label="VIP名称">
+        {{info.vipName}}
+      </el-descriptions-item>
+      <el-descriptions-item label="时长">
+        <el-tag v-if="info.vipLongs === 1" type="primary">永久会员</el-tag>
+        <span v-if="info.vipLongs === 0" >{{ info.vipExpire }}天</span>
+      </el-descriptions-item>
+      <el-descriptions-item label="价格">
+        {{info.price}}
+      </el-descriptions-item>
+      <el-descriptions-item label="平台">
+        <cai-dict-tag :options="platformTypeList" :value="info.platformType" />
+      </el-descriptions-item>
+      <el-descriptions-item label="状态">
+        <cai-dict-tag :options="payStatusList" :value="info.payStatus" />
+      </el-descriptions-item>
+      <el-descriptions-item label="操作时间">
+        {{info.createTime}}
+      </el-descriptions-item>
+      <el-descriptions-item label="后台新增">
+        <cai-dict-tag :options="booleanList" :value="info.admin" />
+      </el-descriptions-item>
+      <el-descriptions-item label="后台ID">
+        {{info.adminId}}
+      </el-descriptions-item>
+      <el-descriptions-item label="操作IP">
+        {{info.operateIp}}
+      </el-descriptions-item>
+      <el-descriptions-item label="appid">
+        {{info.appid}}
+      </el-descriptions-item>
+      <el-descriptions-item label="第三方回调数据">
+        {{info.returnContent}}
+      </el-descriptions-item>
+    </el-descriptions>
+  </el-dialog>
+</template>
+
+<script>
+import {
+  booleanList,
+  genderList,
+  memberStatusList,
+  memberTypeList,
+  payStatusList,
+  platformTypeList,
+  yesOrNoList
+} from '@/constant/statusMap'
+import { getVipOrder } from '@/api/cai/vipOrder'
+
+export default {
+  name: "UserInfo",
+  data() {
+    return {
+      genderList,memberTypeList,yesOrNoList,memberStatusList,booleanList,platformTypeList,
+      payStatusList,
+      activeName:['base','account','userAlbums'],
+      CS: {
+        'text-align': 'center',  //文本居中
+        'min-width': '250px',   //最小宽度
+        'word-break': 'break-all'  //过长时自动换行
+      },
+      LS: {
+        // 'color': '#000',
+        'text-align': 'center',
+        // 'font-weight': '600',
+        'height': '40px',
+        // 'background-color': 'rgba(255, 97, 2, 0.1)',
+        'min-width': '110px',
+        'word-break': 'keep-all'
+      },
+      open:false,
+      info:{},
+    };
+  },
+  created() {
+
+  },
+  methods: {
+    init(id){
+      this.open = true;
+      getVipOrder(id).then(response => {
+        this.info = response.data;
+      });
+    },
+  }
+};
+</script>
+<style lang="scss" scoped>
+.el-row {
+  margin-bottom: -15px;
+  display: flex;
+  flex-wrap: wrap
+}
+
+/* .el-card {
+   min-width: 100%;
+   height: 80%;  // 高度要设置百分比才可以
+   margin-right: 20px;
+   transition: all .5s;
+ }*/
+</style>