Merge pull request '会员记录支付状态' (#89) from khy1 into master

Reviewed-on: #89

yudao-admin-vue3/src/utils/dict.ts

@@ -219,6 +219,8 @@ export enum DICT_TYPE {
 
   PAID_MEMBER_USER_PAID = 'paid_member_user_paid', //付费会员支付状态
 
+  MEMBER_USER_PAID = 'member_user_paid', //会员支付状态
+
   MEMBER_USER_PAY_TYPE = 'member_user_pay_type',// 会员记录支付方式
 
   // ========== MALL - 商品模块 ==========

yudao-admin-vue3/src/views/member/memberuser/index.vue

@@ -9,13 +9,6 @@
       label-width="68px"
     >
       <el-form-item label="会员类型" prop="payMemberType">
-<!--        <el-input-->
-<!--          v-model="queryParams.payMemberType"-->
-<!--          placeholder="请输入用户会员类型"-->
-<!--          clearable-->
-<!--          @keyup.enter="handleQuery"-->
-<!--          class="!w-240px"-->
-<!--        />-->
         <el-select v-model ="queryParams.payMemberType" placeholder="请选择会员类型" @keyup.enter="handleQuery" class="!w-240px">
           <el-option v-for ="item in cardlist"
                      :key="item.id"
@@ -24,13 +17,6 @@
         </el-select>
       </el-form-item>
       <el-form-item label="支付方式" prop="payType">
-<!--        <el-input-->
-<!--          v-model="queryParams.payType"-->
-<!--          placeholder="请输入支付方式"-->
-<!--          clearable-->
-<!--          @keyup.enter="handleQuery"-->
-<!--          class="!w-240px"-->
-<!--        />-->
         <el-select v-model="queryParams.payType" class="!w-240px" clearable placeholder="请选择状态">
           <el-option
             v-for="dict in getIntDictOptions(DICT_TYPE.MEMBER_USER_PAY_TYPE)"
@@ -40,6 +26,16 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="支付状态" prop="paid">
+        <el-select v-model="queryParams.paid" class="!w-240px" clearable placeholder="请选择状态">
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.PAID_MEMBER_USER_PAID)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="支付时间" prop="payTime">
         <el-date-picker
           v-model="queryParams.payTime"
@@ -76,7 +72,7 @@
       <el-table-column label="会员类型" align="center" prop="payMemberType" />
       <el-table-column label="是否支付" align="center" prop="paid">
         <template #default="scope">
-          <dict-tag :type="DICT_TYPE.PAID_MEMBER_USER_PAID" :value="scope.row.paid"/>
+          <dict-tag :type="DICT_TYPE.MEMBER_USER_PAID" :value="scope.row.paid"/>
         </template>
       </el-table-column>
       <el-table-column label="有效期限(天)" align="center" prop="deadlineDay" />
@@ -163,6 +159,7 @@ const getList = async () => {
   loading.value = true
   try {
     const data = await PaidMemberUserApi.getPaidMemberUserPage(queryParams)
+    console.log("query：",queryParams)
     list.value = data.list
     total.value = data.total
   } finally {