会员

ruoyi-ui/src/views/member/index.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="120px">
-      <el-form-item label="订单号" prop="orderNumber">
+      <el-form-item label="订单号" prop="orderId">
         <el-input
-          v-model="queryParams.orderNumber"
+          v-model="queryParams.orderId"
           placeholder="请输入订单号查找"
           clearable
           style="width: 200px"
@@ -20,8 +20,8 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="选择状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="选择状态" clearable style="width: 150px">
+      <el-form-item label="选择状态" prop="payStatus">
+        <el-select v-model="queryParams.payStatus" placeholder="选择状态" clearable style="width: 150px">
           <el-option
             v-for="item in statusOptions"
             :key="item.value"
@@ -36,55 +36,42 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+         <el-row :gutter="10" class="mb8">
+       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+     </el-row>
 
-    <el-table v-loading="loading" :data="memberList">
-      <el-table-column label="订单号" align="center" prop="orderNumber" :show-overflow-tooltip="true" />
-      <el-table-column label="套餐名称" align="center" prop="packageName" :show-overflow-tooltip="true" />
+         <el-table v-loading="loading" :data="orderList">
+      <el-table-column label="订单号" align="center" prop="orderId" :show-overflow-tooltip="true" />
       <el-table-column label="用户昵称" align="center" prop="userNickname" :show-overflow-tooltip="true" />
-      <el-table-column label="金额" align="center" prop="amount" width="100">
+      <el-table-column label="套餐名称" align="center" prop="packageName" :show-overflow-tooltip="true" />
+      <el-table-column label="金额" align="center" prop="amountYuan" width="100">
         <template slot-scope="scope">
-          <span>¥{{ scope.row.amount }}</span>
+          <span>¥{{ scope.row.amountYuan }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="支付方式" align="center" prop="paymentMethod" width="120" />
-      <el-table-column label="开通时间" align="center" prop="activationTime" width="160">
+      <el-table-column label="支付方式" align="center" prop="payTypeName" width="120" />
+      <el-table-column label="开通时间" align="center" prop="startTime" width="160">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.activationTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          <span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="到期时间" align="center" prop="expirationTime" width="160">
+      <el-table-column label="到期时间" align="center" prop="endTime" width="160">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.expirationTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          <span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="状态" align="center" prop="status" width="100">
+      <el-table-column label="状态" align="center" prop="statusName" width="100">
         <template slot-scope="scope">
-          <el-tag :type="scope.row.status === 1 ? 'success' : 'danger'" size="mini">
-            {{ scope.row.status === 1 ? '正常' : '已过期' }}
+          <el-tag :type="getStatusType(scope.row.statusName)" size="mini">
+            {{ scope.row.statusName }}
           </el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['member:member:edit']"
-          >编辑</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['member:member:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
+             <el-table-column label="创建时间" align="center" prop="createTime" width="160">
+         <template slot-scope="scope">
+           <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+         </template>
+       </el-table-column>
     </el-table>
     
     <pagination
@@ -95,110 +82,41 @@
       @pagination="getList"
     />
 
-    <!-- 添加或修改会员记录对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-        <el-form-item label="订单号" prop="orderNumber" required>
-          <el-input v-model="form.orderNumber" placeholder="请输入订单号" />
-        </el-form-item>
-        <el-form-item label="套餐名称" prop="packageName" required>
-          <el-select v-model="form.packageName" placeholder="请选择套餐" style="width: 100%">
-            <el-option
-              v-for="item in packageOptions"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="用户昵称" prop="userNickname" required>
-          <el-input v-model="form.userNickname" placeholder="请输入用户昵称" />
-        </el-form-item>
-        <el-form-item label="金额" prop="amount" required>
-          <el-input-number v-model="form.amount" :precision="2" :step="0.01" :min="0" style="width: 100%" />
-        </el-form-item>
-        <el-form-item label="支付方式" prop="paymentMethod" required>
-          <el-select v-model="form.paymentMethod" placeholder="请选择支付方式" style="width: 100%">
-            <el-option label="微信支付" value="微信支付" />
-            <el-option label="支付宝支付" value="支付宝支付" />
-            <el-option label="app store" value="app store" />
-            <el-option label="其他" value="其他" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="开通时间" prop="activationTime" required>
-          <el-date-picker
-            v-model="form.activationTime"
-            type="datetime"
-            placeholder="选择开通时间"
-            style="width: 100%"
-            value-format="yyyy-MM-dd HH:mm:ss"
-          />
-        </el-form-item>
-        <el-form-item label="到期时间" prop="expirationTime" required>
-          <el-date-picker
-            v-model="form.expirationTime"
-            type="datetime"
-            placeholder="选择到期时间"
-            style="width: 100%"
-            value-format="yyyy-MM-dd HH:mm:ss"
-          />
-        </el-form-item>
-        <el-form-item label="状态" prop="status" required>
-          <el-select v-model="form.status" placeholder="请选择状态" style="width: 100%">
-            <el-option label="正常" :value="1" />
-            <el-option label="已过期" :value="0" />
-          </el-select>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
+    
   </div>
 </template>
 
 <script>
-import { listMember, getMember, delMember, addMember, updateMember } from "@/api/member/member";
+import { listOrderInfo } from "@/api/system/orderInfo";
 
 export default {
   name: "Member",
   data() {
     return {
-      loading: true,
-      showSearch: true,
-      total: 0,
-      memberList: [],
-      title: "",
-      open: false,
+             loading: true,
+       showSearch: true,
+       total: 0,
+       orderList: [],
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        orderNumber: null,
+        orderId: null,
         packageType: null,
-        status: null
-      },
-      form: {},
-      rules: {
-        orderNumber: [{ required: true, message: "订单号不能为空", trigger: "blur" }],
-        packageName: [{ required: true, message: "套餐名称不能为空", trigger: "change" }],
-        userNickname: [{ required: true, message: "用户昵称不能为空", trigger: "blur" }],
-        amount: [{ required: true, message: "金额不能为空", trigger: "blur" }],
-        paymentMethod: [{ required: true, message: "支付方式不能为空", trigger: "change" }],
-        activationTime: [{ required: true, message: "开通时间不能为空", trigger: "change" }],
-        expirationTime: [{ required: true, message: "到期时间不能为空", trigger: "change" }],
-        status: [{ required: true, message: "状态不能为空", trigger: "change" }]
+        payStatus: null
       },
+      
       packageOptions: [
-        { label: '连续包月', value: '连续包月' },
-        { label: '年卡会员', value: '年卡会员' },
-        { label: '季卡会员', value: '季卡会员' },
-        { label: '月卡会员', value: '月卡会员' },
-        { label: '周卡会员', value: '周卡会员' }
+        { label: '包月', value: '1' },
+        { label: '包季度', value: '3' },
+        { label: '半年', value: '6' },
+        { label: '一年', value: '12' }
       ],
       statusOptions: [
-        { label: '已过期', value: 0 },
-        { label: '正常', value: 1 }
+        { label: '待支付', value: 1 },
+        { label: '待出货', value: 2 },
+        { label: '待退款', value: 3 },
+        { label: '已退款', value: 4 },
+        { label: '已完成', value: 5 }
       ]
     };
   },
@@ -206,81 +124,41 @@ export default {
     this.getList();
   },
   methods: {
+    /** 查询订单列表 */
     getList() {
       this.loading = true;
-      listMember(this.queryParams).then(response => {
-        this.memberList = response.rows;
+      listOrderInfo(this.queryParams).then(response => {
+        this.orderList = response.rows;
         this.total = response.total;
         this.loading = false;
       });
-    },
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    reset() {
-      this.form = {
-        id: null,
-        orderNumber: null,
-        packageName: null,
-        userNickname: null,
-        amount: null,
-        paymentMethod: null,
-        activationTime: null,
-        expirationTime: null,
-        status: 1
-      };
-      this.resetForm("form");
-    },
+         },
+    /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
       this.getList();
     },
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "新增会员记录";
-    },
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getMember(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "编辑会员记录";
-      });
-    },
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            updateMember(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addMember(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除会员记录编号为"' + ids + '"的数据项？').then(function() {
-        return delMember(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+         /** 重置按钮操作 */
+     resetQuery() {
+       this.resetForm("queryForm");
+       this.handleQuery();
+     },
+    /** 获取状态标签类型 */
+    getStatusType(statusName) {
+      switch (statusName) {
+        case '待支付':
+          return 'warning';
+        case '待出货':
+          return 'primary';
+        case '待退款':
+          return 'info';
+        case '已退款':
+          return 'danger';
+        case '已完成':
+          return 'success';
+        default:
+          return 'info';
+      }
     }
   }
 };