diff --git a/src/views/cai/rechargeOrder/index.vue b/src/views/cai/rechargeOrder/index.vue
index 0ec96a1..1caca47 100644
--- a/src/views/cai/rechargeOrder/index.vue
+++ b/src/views/cai/rechargeOrder/index.vue
@@ -1,77 +1,40 @@
 <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="用户ID" prop="userId">
+      <el-form-item label="蜜瓜号" prop="usercode">
         <el-input
-          v-model="queryParams.userId"
-          placeholder="请输入用户ID"
-          clearable
-          @keyup.enter.native="handleQuery"
+            v-model="queryParams.usercode"
+            placeholder="请输入蜜瓜号"
+            clearable
+            @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="商品ID" prop="rechargeId">
+      <el-form-item label="手机号" prop="mobile">
         <el-input
-          v-model="queryParams.rechargeId"
-          placeholder="请输入商品ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="商品名称" prop="rechargeName">
-        <el-input
-          v-model="queryParams.rechargeName"
-          placeholder="请输入商品名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="充值紫贝" prop="rechargeCoin">
-        <el-input
-          v-model="queryParams.rechargeCoin"
-          placeholder="请输入充值紫贝"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="价格" prop="price">
-        <el-input
-          v-model="queryParams.price"
-          placeholder="请输入价格"
-          clearable
-          @keyup.enter.native="handleQuery"
+            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"
+            v-model="queryParams.orderNo"
+            placeholder="请输入订单号"
+            clearable
+            @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="appId" prop="appid">
-        <el-input
-          v-model="queryParams.appid"
-          placeholder="请输入appId"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="operateIp">
-        <el-input
-          v-model="queryParams.operateIp"
-          placeholder="请输入"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="是否为后台管理新增" prop="admin">
-        <el-input
-          v-model="queryParams.admin"
-          placeholder="请输入是否为后台管理新增"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <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>
@@ -80,82 +43,52 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['cai:rechargeOrder:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['cai:rechargeOrder:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['cai:rechargeOrder:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['cai:rechargeOrder:export']"
-        >导出</el-button>
-      </el-col>
       <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="id" v-if="true"/>
-      <el-table-column label="用户ID" align="center" prop="userId" />
-      <el-table-column label="商品ID" align="center" prop="rechargeId" />
+      <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="orderNo" />
-      <el-table-column label="平台" align="center" prop="platformType" />
-      <el-table-column label="状态 0-待支付 1-已支付 2-已退款 10-无需支付" align="center" prop="payStatus" />
-      <el-table-column label="appId" align="center" prop="appid" />
-      <el-table-column label="" align="center" prop="returnContent" />
-      <el-table-column label="" align="center" prop="operateIp" />
-      <el-table-column label="是否为后台管理新增" align="center" prop="admin" />
+      <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 slot-scope="scope">
+        <template v-slot="scope">
           <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['cai:rechargeOrder:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['cai:rechargeOrder:remove']"
-          >删除</el-button>
+              size="mini"
+              type="text"
+              icon="el-icon-info"
+              @click="handleInfo(scope.row)"
+          >详情</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -168,57 +101,27 @@
       @pagination="getList"
     />
 
-    <!-- 添加或修改充值订单对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="用户ID" prop="userId">
-          <el-input v-model="form.userId" placeholder="请输入用户ID" />
-        </el-form-item>
-        <el-form-item label="商品ID" prop="rechargeId">
-          <el-input v-model="form.rechargeId" placeholder="请输入商品ID" />
-        </el-form-item>
-        <el-form-item label="商品名称" prop="rechargeName">
-          <el-input v-model="form.rechargeName" placeholder="请输入商品名称" />
-        </el-form-item>
-        <el-form-item label="充值紫贝" prop="rechargeCoin">
-          <el-input v-model="form.rechargeCoin" placeholder="请输入充值紫贝" />
-        </el-form-item>
-        <el-form-item label="价格" prop="price">
-          <el-input v-model="form.price" placeholder="请输入价格" />
-        </el-form-item>
-        <el-form-item label="订单号" prop="orderNo">
-          <el-input v-model="form.orderNo" placeholder="请输入订单号" />
-        </el-form-item>
-        <el-form-item label="appId" prop="appid">
-          <el-input v-model="form.appid" placeholder="请输入appId" />
-        </el-form-item>
-        <el-form-item label="">
-          <editor v-model="form.returnContent" :min-height="192"/>
-        </el-form-item>
-        <el-form-item label="" prop="operateIp">
-          <el-input v-model="form.operateIp" placeholder="请输入" />
-        </el-form-item>
-        <el-form-item label="是否为后台管理新增" prop="admin">
-          <el-input v-model="form.admin" placeholder="请输入是否为后台管理新增" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
   </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 {
-      // 按钮loading
-      buttonLoading: false,
+      genderList,memberTypeList,yesOrNoList,memberStatusList,booleanList,platformTypeList,
+      payStatusList,
+      rechargeOrderInfoVisible: false,
       // 遮罩层
       loading: true,
       // 选中数组
@@ -233,71 +136,15 @@ export default {
       total: 0,
       // 充值订单表格数据
       rechargeOrderList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        userId: undefined,
-        rechargeId: undefined,
-        rechargeName: undefined,
-        rechargeCoin: undefined,
-        price: undefined,
-        orderNo: undefined,
-        platformType: undefined,
         payStatus: undefined,
-        appid: undefined,
-        returnContent: undefined,
-        operateIp: undefined,
-        admin: undefined
+        usercode: undefined,
+        mobile: undefined,
+        orderNo: undefined
       },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        id: [
-          { required: true, message: "不能为空", trigger: "blur" }
-        ],
-        userId: [
-          { required: true, message: "用户ID不能为空", trigger: "blur" }
-        ],
-        rechargeId: [
-          { required: true, message: "商品ID不能为空", trigger: "blur" }
-        ],
-        rechargeName: [
-          { required: true, message: "商品名称不能为空", trigger: "blur" }
-        ],
-        rechargeCoin: [
-          { required: true, message: "充值紫贝不能为空", trigger: "blur" }
-        ],
-        price: [
-          { required: true, message: "价格不能为空", trigger: "blur" }
-        ],
-        orderNo: [
-          { required: true, message: "订单号不能为空", trigger: "blur" }
-        ],
-        platformType: [
-          { required: true, message: "平台不能为空", trigger: "change" }
-        ],
-        payStatus: [
-          { required: true, message: "状态 0-待支付 1-已支付 2-已退款 10-无需支付不能为空", trigger: "change" }
-        ],
-        appid: [
-          { required: true, message: "appId不能为空", trigger: "blur" }
-        ],
-        returnContent: [
-          { required: true, message: "不能为空", trigger: "blur" }
-        ],
-        operateIp: [
-          { required: true, message: "不能为空", trigger: "blur" }
-        ],
-        admin: [
-          { required: true, message: "是否为后台管理新增不能为空", trigger: "blur" }
-        ]
-      }
     };
   },
   created() {
@@ -313,31 +160,6 @@ export default {
         this.loading = false;
       });
     },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: undefined,
-        userId: undefined,
-        rechargeId: undefined,
-        rechargeName: undefined,
-        rechargeCoin: undefined,
-        price: undefined,
-        orderNo: undefined,
-        platformType: undefined,
-        payStatus: undefined,
-        appid: undefined,
-        returnContent: undefined,
-        createTime: undefined,
-        operateIp: undefined,
-        admin: undefined
-      };
-      this.resetForm("form");
-    },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
@@ -354,69 +176,11 @@ export default {
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加充值订单";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.loading = true;
-      this.reset();
-      const id = row.id || this.ids
-      getRechargeOrder(id).then(response => {
-        this.loading = false;
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改充值订单";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          this.buttonLoading = true;
-          if (this.form.id != null) {
-            updateRechargeOrder(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            }).finally(() => {
-              this.buttonLoading = false;
-            });
-          } else {
-            addRechargeOrder(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            }).finally(() => {
-              this.buttonLoading = false;
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除充值订单编号为"' + ids + '"的数据项？').then(() => {
-        this.loading = true;
-        return delRechargeOrder(ids);
-      }).then(() => {
-        this.loading = false;
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {
-      }).finally(() => {
-        this.loading = false;
-      });
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('cai/rechargeOrder/export', {
-        ...this.queryParams
-      }, `rechargeOrder_${new Date().getTime()}.xlsx`)
+    handleInfo(row) {
+      this.rechargeOrderInfoVisible = true
+      this.$nextTick(() => {
+        this.$refs.rechargeOrderInfo.init(row.id)
+      })
     }
   }
 };
diff --git a/src/views/cai/rechargeOrder/recharge-order-info.vue b/src/views/cai/rechargeOrder/recharge-order-info.vue
new file mode 100644
index 0000000..72cdabf
--- /dev/null
+++ b/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>
diff --git a/src/views/cai/vipOrder/index.vue b/src/views/cai/vipOrder/index.vue
index 0692210..eed4b72 100644
--- a/src/views/cai/vipOrder/index.vue
+++ b/src/views/cai/vipOrder/index.vue
@@ -17,6 +17,14 @@
             @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
@@ -146,6 +154,7 @@ export default {
         payStatus: undefined,
         usercode: undefined,
         mobile: undefined,
+        orderNo: undefined
       },
     };
   },