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

@@ -221,8 +221,6 @@ 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/infra/file/index.vue

@@ -5,23 +5,22 @@
 		<!-- 菜单区域 -->
 		<div class="menu-area">
 
-			<el-button type="primary" plain @click="createType" style="width: 90;font-size: 12px;">
+			<el-button type="primary" plain @click="createType">
 				<Icon icon="ep:plus" class="mr-5px" /> 新增分类
 			</el-button>
 
-			<el-menu :default-active="targetMenuId" style="width:182px">
+			<el-menu :default-active="targetMenuId">
 				<el-menu-item :index="targetMenuId" :key="targetMenuId" @click="clickMenu(targetMenuId)">
 					全部类型
 				</el-menu-item>
 				<el-menu-item v-for="item in typeMenu" :index="item.value" :key="item.value"
 					@click="clickMenu(item.value)">
 					{{ item.label }}
-					<el-icon style="margin-left: 60px;width: 10px;" @mouseover="showActions = item.value"
+					<el-icon style="margin-left: 40px;" @mouseover="showActions = item.value"
 						@mouseleave="showActions = null">
 						<MoreFilled />
 						<div  v-if="showActions === item.value" class="action-buttons">
 							<el-button size="small" @click.stop="editItem(item.id,item.label)">编辑</el-button>
-							<br />
 							<el-button size="small" @click.stop="deleteItem(item.id)">删除</el-button>
 						</div>
 					</el-icon>
@@ -356,10 +355,9 @@
 	}
 
 	.menu-area {
-		padding: 25px;
+
-		background-color: white;
+		width: 200px;
-		width: 180px;
+		height: 100vh;
-		height: 1000px;
 		/* 固定高度 */
 		overflow-y: hidden;
 		/* 禁止滚动 */

yudao-admin-vue3/src/views/mall/promotion/verbaltrick/index.vue

@@ -3,10 +3,10 @@
 	<div class="flex-container">
 		<!-- 菜单区域 -->
 		<div class="menu-area">
-			<el-button type="primary" plain @click="createType" style="width: 90;font-size: 12px;">
+			<el-button type="primary" plain @click="createType">
 				<Icon icon="ep:plus" class="mr-5px" /> 新增分类
 			</el-button>
-			<el-menu :default-active="targetMenuId" style="width:183px">
+			<el-menu :default-active="targetMenuId">
 				<el-menu-item v-for="item in huashuType" :index="item.value" :key="item.value"
 					@click="clickMenu(item.value)">{{item.label}}</el-menu-item>
 			</el-menu>
@@ -79,11 +79,11 @@
 						</template>
 					</el-table-column>
 				</el-table>
-
-			</ContentWrap>
 				<!-- 分页 -->
 				<Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
 					@pagination="getList" />
+			</ContentWrap>
+
 		</div>
 	</div>
 
@@ -94,7 +94,13 @@
 	
 	
 	<Dialog v-model="dialogVisible" :title="dialogTitle">
-		<el-form ref="formRef" v-loading="formLoading" :model="formData" :rules="formRules" label-width="80px">
+	  <el-form
+	    ref="formRef"
+	    v-loading="formLoading"
+	    :model="formData"
+	    :rules="formRules"
+	    label-width="80px"
+	  >
 
 	    <el-form-item label="数据标签" prop="label">
 	      <el-input v-model="formData.label" placeholder="请输入数据标签" />
@@ -278,10 +284,9 @@
 	}
 
 	.menu-area {
-		padding: 25px;
+
-		background-color: white;
+		width: 200px;
-		width: 180px;
+		height: 100vh;
-		height: 1000px;
 		/* 固定高度 */
 		overflow-y: hidden;
 		/* 禁止滚动 */

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

@@ -9,6 +9,13 @@
       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"
@@ -17,6 +24,13 @@
         </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)"
@@ -26,16 +40,6 @@
           />
         </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"
@@ -72,7 +76,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.MEMBER_USER_PAID" :value="scope.row.paid"/>
+          <dict-tag :type="DICT_TYPE.PAID_MEMBER_USER_PAID" :value="scope.row.paid"/>
         </template>
       </el-table-column>
       <el-table-column label="有效期限(天)" align="center" prop="deadlineDay" />
@@ -159,7 +163,6 @@ 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 {