优化客服话术和图片素材界面

Reviewed-on: #88

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

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

@@ -5,22 +5,23 @@
 		<!-- 菜单区域 -->
 		<div class="menu-area">
 
-			<el-button type="primary" plain @click="createType">
+			<el-button type="primary" plain @click="createType" style="width: 90;font-size: 12px;">
 				<Icon icon="ep:plus" class="mr-5px" /> 新增分类
 			</el-button>
 
-			<el-menu :default-active="targetMenuId">
+			<el-menu :default-active="targetMenuId" style="width:182px">
 				<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: 40px;" @mouseover="showActions = item.value"
+					<el-icon style="margin-left: 60px;width: 10px;" @mouseover="showActions = item.value"
 						@mouseleave="showActions = null">
 						<MoreFilled />
-						<div  v-if="showActions === item.value" class="action-buttons">
+						<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>
@@ -355,9 +356,10 @@
 	}
 
 	.menu-area {
-
-		width: 200px;
-		height: 100vh;
+		padding: 25px;
+		background-color: white;
+		width: 180px;
+		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">
+			<el-button type="primary" plain @click="createType" style="width: 90;font-size: 12px;">
 				<Icon icon="ep:plus" class="mr-5px" /> 新增分类
 			</el-button>
-			<el-menu :default-active="targetMenuId">
+			<el-menu :default-active="targetMenuId" style="width:183px">
 				<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>
-				<!-- 分页 -->
-				<Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
-					@pagination="getList" />
-			</ContentWrap>
 
+			</ContentWrap>
+			<!-- 分页 -->
+			<Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
+				@pagination="getList" />
 		</div>
 	</div>
 
@@ -94,26 +94,20 @@
 
 
 	<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="请输入数据标签" />
-	    </el-form-item>
-	    <el-form-item label="显示排序" prop="sort">
-	      <el-input-number v-model="formData.sort" :min="0" controls-position="right" />
-	    </el-form-item>
+			<el-form-item label="数据标签" prop="label">
+				<el-input v-model="formData.label" placeholder="请输入数据标签" />
+			</el-form-item>
+			<el-form-item label="显示排序" prop="sort">
+				<el-input-number v-model="formData.sort" :min="0" controls-position="right" />
+			</el-form-item>
 
-	  </el-form>
-	  <template #footer>
-	    <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
-	    <el-button @click="dialogVisible = false">取 消</el-button>
-	  </template>
+		</el-form>
+		<template #footer>
+			<el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
+			<el-button @click="dialogVisible = false">取 消</el-button>
+		</template>
 	</Dialog>
 
 
@@ -133,19 +127,19 @@
 	const dialogTitle = ref('新增分类') // 弹窗的标题
 	const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 	const formData = ref({
-	  id: undefined,
-	  sort: undefined,
-	  label: '',
-	  value: '',
-	  dictType: '',
-	  // status: CommonStatusEnum.ENABLE,
-	  colorType: '',
-	  cssClass: '',
-	  remark: ''
+		id: undefined,
+		sort: undefined,
+		label: '',
+		value: '',
+		dictType: '',
+		// status: CommonStatusEnum.ENABLE,
+		colorType: '',
+		cssClass: '',
+		remark: ''
 	})
 	const formRules = reactive({
-	  label: [{ required: true, message: '数据标签不能为空', trigger: 'blur' }],
-	  sort: [{ required: true, message: '数据顺序不能为空', trigger: 'blur' }],
+		label: [{ required: true, message: '数据标签不能为空', trigger: 'blur' }],
+		sort: [{ required: true, message: '数据顺序不能为空', trigger: 'blur' }],
 	})
 
 	/** 客服话术 列表 */
@@ -181,32 +175,32 @@
 	}
 
 	//新增分类
-	const createType = () =>{
+	const createType = () => {
 		dialogVisible.value = true
 	}
 
 	/** 提交表单 */
 	const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
 	const submitForm = async () => {
-	  // 校验表单
-	  if (!formRef) return
-	  const valid = await formRef.value.validate()
-	  if (!valid) return
-	  // 提交请求
-	  formLoading.value = true
-	  try {
-	    const data = formData.value as DictDataApi.DictDataVO
-		await DictDataApi.createType(data)
-	    message.success(t('common.createSuccess'))
-	    dialogVisible.value = false
-	    // 发送操作成功的事件
-	    emit('success')
-		queryParams.type = targetMenuId.value
-		getList()
-		getHuaShuTypeList()
-	  } finally {	
-	    formLoading.value = false
-	  }
+		// 校验表单
+		if (!formRef) return
+		const valid = await formRef.value.validate()
+		if (!valid) return
+		// 提交请求
+		formLoading.value = true
+		try {
+			const data = formData.value as DictDataApi.DictDataVO
+			await DictDataApi.createType(data)
+			message.success(t('common.createSuccess'))
+			dialogVisible.value = false
+			// 发送操作成功的事件
+			emit('success')
+			queryParams.type = targetMenuId.value
+			getList()
+			getHuaShuTypeList()
+		} finally {
+			formLoading.value = false
+		}
 	}
 
 
@@ -284,9 +278,10 @@
 	}
 
 	.menu-area {
-
-		width: 200px;
-		height: 100vh;
+		padding: 25px;
+		background-color: white;
+		width: 180px;
+		height: 1000px;
 		/* 固定高度 */
 		overflow-y: hidden;
 		/* 禁止滚动 */

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 {