From 06681658fc33456d6bea00d679356a1a23234dda Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Mon, 24 Feb 2025 10:31:41 +0800
Subject: [PATCH 01/11] sc

---
 src/views/Clue/Pool/Comp/DialogBatchChangeFollow.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/Clue/Pool/Comp/DialogBatchChangeFollow.vue b/src/views/Clue/Pool/Comp/DialogBatchChangeFollow.vue
index c52fed4..fd0b318 100644
--- a/src/views/Clue/Pool/Comp/DialogBatchChangeFollow.vue
+++ b/src/views/Clue/Pool/Comp/DialogBatchChangeFollow.vue
@@ -52,7 +52,7 @@ const form = ref({
 })
 
 const rules = ref({
-  originFollowUserId: { required: true, message: '原跟进人不可为空', trigger: 'change' }
+  // originFollowUserId: { required: true, message: '原跟进人不可为空', trigger: 'change' }
   // newFollowUserId: { required: true, message: '新跟进人不可为空', trigger: 'change' }
 })
 

From 0d99fbac80cb8bf4dfea2ea7584b1519982151e5 Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Fri, 28 Feb 2025 19:09:18 +0800
Subject: [PATCH 02/11] sc

---
 .env.base                                     |   5 +
 src/api/xjapplet/vip.js                       |   8 +
 src/api/xjapplet/xjdatabase.js                |  87 +++++
 src/config/axios/service.ts                   |   6 +-
 src/styles/index.scss                         |  14 +
 src/views/Clue/Pool/Comp/DialogClue.vue       |   2 +-
 src/views/XjApplet/Resell/index.vue           | 118 +++++++
 .../XjApplet/Vip/components/UserDiscount.vue  | 120 +++++++
 .../XjApplet/Vip/components/VipDiscount.vue   | 219 ++++++++++++
 src/views/XjApplet/Vip/components/VipType.vue | 204 +++++++++++
 src/views/XjApplet/Vip/components/VipUser.vue | 135 ++++++++
 src/views/XjApplet/Vip/index.vue              |  29 ++
 .../VipData/conponents/SecretData.vue         | 257 ++++++++++++++
 .../VipData/conponents/SimpleData.vue         | 177 ++++++++++
 src/views/XjApplet/VipData/index.vue          |  19 ++
 .../XjDatabase/Components/QuestionAddForm.vue | 317 ++++++++++++++++++
 src/views/XjApplet/XjDatabase/index.vue       | 156 +++++++++
 vite.config.js                                |  12 +
 18 files changed, 1883 insertions(+), 2 deletions(-)
 create mode 100644 src/api/xjapplet/vip.js
 create mode 100644 src/api/xjapplet/xjdatabase.js
 create mode 100644 src/views/XjApplet/Resell/index.vue
 create mode 100644 src/views/XjApplet/Vip/components/UserDiscount.vue
 create mode 100644 src/views/XjApplet/Vip/components/VipDiscount.vue
 create mode 100644 src/views/XjApplet/Vip/components/VipType.vue
 create mode 100644 src/views/XjApplet/Vip/components/VipUser.vue
 create mode 100644 src/views/XjApplet/Vip/index.vue
 create mode 100644 src/views/XjApplet/VipData/conponents/SecretData.vue
 create mode 100644 src/views/XjApplet/VipData/conponents/SimpleData.vue
 create mode 100644 src/views/XjApplet/VipData/index.vue
 create mode 100644 src/views/XjApplet/XjDatabase/Components/QuestionAddForm.vue
 create mode 100644 src/views/XjApplet/XjDatabase/index.vue

diff --git a/.env.base b/.env.base
index b46d28e..a466367 100644
--- a/.env.base
+++ b/.env.base
@@ -7,6 +7,11 @@ VITE_DEV=true
 # VITE_BASE_URL='http://47.98.161.246:48080'
 VITE_BASE_URL='http://114.55.169.15:48080'
 
+# 小程序接口请求路劲
+VITE_APPLET_URL='https://cloud.ahduima.com'
+# 题库路径
+VITE_TIKU_URL = 'http://47.98.161.246'
+
 # 上传路径
 VITE_UPLOAD_URL='http://47.98.161.246:48080/admin-api/system/file/upload'
 # VITE_UPLOAD_URL='http://114.55.169.15:48080/admin-api/system/file/upload'
diff --git a/src/api/xjapplet/vip.js b/src/api/xjapplet/vip.js
new file mode 100644
index 0000000..ee97ced
--- /dev/null
+++ b/src/api/xjapplet/vip.js
@@ -0,0 +1,8 @@
+import request from '@/config/axios'
+
+export const getUserMemberList = async (params) => {
+  return await request.get({
+    url: 'http://xj.ahduima.com/xunjia/driver-api/tdSysUserMember/duima/user/member/list',
+    params: params
+  })
+}
diff --git a/src/api/xjapplet/xjdatabase.js b/src/api/xjapplet/xjdatabase.js
new file mode 100644
index 0000000..31cee6a
--- /dev/null
+++ b/src/api/xjapplet/xjdatabase.js
@@ -0,0 +1,87 @@
+import request from '@/config/axios'
+export const searchQuestion = async (param) => {
+  return await request.get({
+    url: 'http://localhost/tiku-api/tiku/xunjia/question/list',
+    params: param
+  })
+}
+
+export const updateQuestion = async (data) => {
+  return await request.put({
+    url: 'http://localhost/tiku-api/tiku/xunjia/question/update',
+    data: data
+  })
+}
+
+export const addQuestion = async (data) => {
+  return await request.post({
+    url: 'http://localhost/tiku-api/tiku/xunjia/question/add',
+    data: data
+  })
+}
+
+export const deleteQuestion = async (id) => {
+  return await request.delete({
+    url: 'http://localhost/tiku-api/tiku/xunjia/question/delete?id=' + id
+  })
+}
+
+export const uploadFile = async (data) => {
+  return await request.post({
+    url: 'http://localhost/tiku-api/tiku/xunjia/question/upload',
+    data: data
+  })
+}
+
+export const getQuestionSort = async (param) => {
+  return await request.get({
+    url: 'http://localhost/tiku-api/tiku/xunjia/question/sort/list',
+    params: param
+  })
+}
+
+export const getMjList = async (params) => {
+  return await request.get({
+    url: 'http://localhost/tiku-api/tiku/xunjia/secret/list',
+    params: params
+  })
+}
+
+export const addMj = async (data) => {
+  return await request.post({
+    url: 'http://localhost/tiku-api/tiku/xunjia/secret/add',
+    data: data
+  })
+}
+
+export const delMj = async (secretId) => {
+  return await request.delete({
+    url: `http://localhost/tiku-api/tiku/xunjia/secret/delete?secretId=${secretId}`
+  })
+}
+
+export const clearMj = async (secretId) => {
+  return await request.delete({
+    url: `http://localhost/tiku-api/tiku/xunjia/secret/clear?secretId=${secretId}`
+  })
+}
+
+export const getMjQuestionList = async (params) => {
+  return await request.get({
+    url: 'http://localhost/tiku-api/tiku/xunjia/secret/question/list',
+    params: params
+  })
+}
+
+export const addMjQuestion = async (data) => {
+  return await request.post({
+    url: 'http://localhost/tiku-api/tiku/xunjia/secret/question/add',
+    data: data
+  })
+}
+
+export const delMjQuestion = async (id) => {
+  return await request.delete({
+    url: `http://localhost/tiku-api/tiku/xunjia/secret/question/delete?id=${id}`
+  })
+}
diff --git a/src/config/axios/service.ts b/src/config/axios/service.ts
index e11c1e1..cb8a704 100644
--- a/src/config/axios/service.ts
+++ b/src/config/axios/service.ts
@@ -132,12 +132,16 @@ service.interceptors.response.use(
       throw new Error()
     }
     const { t } = useI18n()
+    // if (data.code === undefined) {
+    //   return response
+    // }
     // 未设置状态码则默认成功状态
     const code = data.code || result_code
     // 二进制数据则直接返回
     if (
       response.request.responseType === 'blob' ||
-      response.request.responseType === 'arraybuffer'
+      response.request.responseType === 'arraybuffer' ||
+      !data.code
     ) {
       return response.data
     }
diff --git a/src/styles/index.scss b/src/styles/index.scss
index 4e64725..f471a55 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -82,3 +82,17 @@
 .el-table--default .cell {
   padding: 0 5px;
 }
+
+.flex-radio{
+  display: flex;
+  width: 100%;
+  align-items: center;
+  line-height: 40px;
+  height: 40px;
+  .el-radio__label {
+    display: flex;
+    width: 100%;
+    align-items: center;
+    font-size: 16px;
+  }
+}
\ No newline at end of file
diff --git a/src/views/Clue/Pool/Comp/DialogClue.vue b/src/views/Clue/Pool/Comp/DialogClue.vue
index a5bd51a..2c5502d 100644
--- a/src/views/Clue/Pool/Comp/DialogClue.vue
+++ b/src/views/Clue/Pool/Comp/DialogClue.vue
@@ -330,7 +330,7 @@ const emit = defineEmits(['success'])
 async function handleSave() {
   // 校验表单
   if (!formRef.value) return
-  const valid = await formRef.value.getElFormRef().validate()
+  const valid = await formRef.value.getElFormRef.validate()
   if (!valid) return
   if (!followList.value || followList.value.length == 0) {
     message.info('请添加跟进人')
diff --git a/src/views/XjApplet/Resell/index.vue b/src/views/XjApplet/Resell/index.vue
new file mode 100644
index 0000000..5096ea0
--- /dev/null
+++ b/src/views/XjApplet/Resell/index.vue
@@ -0,0 +1,118 @@
+<template>
+  <div>
+    <el-form :model="searchForm" label-width="0" inline>
+      <el-form-item>
+        <el-input v-model="searchForm.phone" placeholder="请输入手机号" />
+      </el-form-item>
+      <el-form-item>
+        <el-input v-model="searchForm.name" placeholder="请输入姓名" />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="searchList">查询</el-button>
+        <el-button type="primary" @click="handleAdd">新增</el-button>
+      </el-form-item>
+    </el-form>
+    <el-table :data="tableData">
+      <el-table-column type="index" width="50" />
+      <el-table-column prop="phone" label="手机号" />
+      <el-table-column prop="name" label="姓名" />
+      <el-table-column prop="mark" label="标记" />
+      <el-table-column label="小程序码" align="center" width="140px">
+        <template #default="{ row }">
+          <img :src="row.qrCode" style="width: 100px; height: 100px" />
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" width="120px">
+        <template #default="{ row }">
+          <el-button type="primary" link @click="handleEdit(row)">修改</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      v-model:page="searchForm.pageNo"
+      v-model:limit="searchForm.pageSize"
+      @pagination="getList"
+    />
+
+    <el-dialog title="分销配置" v-model="showDialog" width="500px">
+      <el-form :model="form" ref="formRef" :rules="rules" label-width="80px">
+        <el-form-item label="手机号" prop="phone">
+          <el-input v-model="form.phone" maxlength="11" />
+        </el-form-item>
+        <el-form-item label="姓名" prop="name">
+          <el-input v-model="form.name" />
+        </el-form-item>
+        <el-form-item label="标记" prop="mark">
+          <el-input v-model="form.mark" />
+        </el-form-item>
+      </el-form>
+
+      <template #footer>
+        <span>
+          <el-button @click="showDialog = false">取消</el-button>
+          <el-button type="primary" @click="handleSave">确认</el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="Resell">
+const message = useMessage()
+
+const searchForm = ref({
+  pageNo: 1,
+  pageSize: 10,
+  phone: '',
+  name: ''
+})
+
+const tableData = ref([])
+const total = ref(0)
+
+const showDialog = ref(false)
+
+const form = ref({
+  phone: '',
+  name: '',
+  mark: ''
+})
+
+const rules = {
+  phone: [{ required: true, message: '请输入手机号', trigger: 'blur' }],
+  name: [{ required: true, message: '请输入姓名', trigger: 'blur' }]
+}
+
+function searchList() {
+  searchForm.value.pageNo = 1
+  getList()
+}
+
+function getList() {
+  console.log(searchForm.value)
+}
+
+function handleAdd() {
+  showDialog.value = true
+}
+function handleEdit(row) {
+  form.value = { ...row }
+  showDialog.value = true
+}
+
+const formRef = ref(null)
+async function handleSave() {
+  if (!formRef.value) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+
+  // 调用接口
+  showDialog.value = false
+  message.success('成功')
+  searchList()
+}
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/XjApplet/Vip/components/UserDiscount.vue b/src/views/XjApplet/Vip/components/UserDiscount.vue
new file mode 100644
index 0000000..bcdce40
--- /dev/null
+++ b/src/views/XjApplet/Vip/components/UserDiscount.vue
@@ -0,0 +1,120 @@
+<template>
+  <div>
+    <el-form :model="searchForm" inline>
+      <el-form-item>
+        <el-input v-model="searchForm.phone" placeholder="学员手机号" />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="searchList">查询</el-button>
+        <el-button type="primary" @click="addVipUser">赠送折扣</el-button>
+      </el-form-item>
+    </el-form>
+    <el-table v-loading="loading" :data="tableList">
+      <el-table-column type="index" width="55" align="center" />
+      <el-table-column label="手机号" align="center" prop="phone" min-width="140" />
+      <el-table-column label="折扣描述" align="center" prop="memberName" min-width="140" />
+      <el-table-column label="折后价格" align="center" prop="carName" min-width="100" />
+      <el-table-column label="有效期至" align="center" prop="subjects" min-width="100" />
+      <el-table-column label="截止时间" align="center" prop="endDate" min-width="100" />
+      <el-table-column label="操作人" align="center" prop="" min-width="100" />
+      <el-table-column label="操作时间" align="center" prop="" min-width="100" />
+    </el-table>
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      v-model:page="searchForm.pageNo"
+      v-model:limit="searchForm.pageSize"
+      @pagination="getList"
+    />
+
+    <el-dialog title="赠送折扣" v-model="showDialog" width="500px">
+      <el-form :model="form" ref="formRef" :rules="rules" label-width="80px">
+        <el-form-item label="手机号" prop="phone">
+          <el-input v-model="form.phone" maxlength="11" />
+        </el-form-item>
+        <el-form-item label="会员描述" prop="vipType">
+          <el-select v-model="form.vipType" clearable filterable style="width: 100%">
+            <el-option
+              v-for="item in vipTypeOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+      </el-form>
+
+      <template #footer>
+        <span>
+          <el-button @click="showDialog = false">取消</el-button>
+          <el-button type="primary" @click="sureAdd">确定</el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="UserDiscount">
+import { getUserMemberList } from '@/api/xjapplet/vip'
+
+const message = useMessage()
+
+const searchForm = ref({
+  phone: '',
+  pageNo: 1,
+  pageSize: 50
+})
+
+const loading = ref(false)
+const tableList = ref([])
+const total = ref(0)
+
+const vipTypeOptions = ref([
+  { label: '普通会员', value: '1' },
+  { label: 'VIP会员', value: '2' }
+])
+
+function searchList() {
+  searchForm.value.pageNo = 1
+  getList()
+}
+
+function getList() {
+  loading.value = true
+  getUserMemberList(searchForm.value).then((response) => {
+    if (response.code === 200) {
+      tableList.value = response.data
+      total.value = response.total
+      loading.value = false
+    }
+  })
+}
+
+const showDialog = ref(false)
+const form = ref({
+  phone: '',
+  vipType: ''
+})
+const rules = ref({
+  phone: [{ required: true, message: '请输入用户手机号', trigger: 'blur' }],
+  vipType: [{ required: true, message: '请选择会员类型', trigger: 'change' }]
+})
+
+function addVipUser() {
+  showDialog.value = true
+}
+
+const formRef = ref(null)
+async function sureAdd() {
+  if (!formRef.value) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+
+  // 调用接口
+  showDialog.value = false
+  message.success('赠送成功')
+  searchList()
+}
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/XjApplet/Vip/components/VipDiscount.vue b/src/views/XjApplet/Vip/components/VipDiscount.vue
new file mode 100644
index 0000000..677c493
--- /dev/null
+++ b/src/views/XjApplet/Vip/components/VipDiscount.vue
@@ -0,0 +1,219 @@
+<template>
+  <div>
+    <el-row>
+      <el-button @click="searchList">查询</el-button>
+      <el-button type="primary" @click="addDiscount">新增折扣</el-button>
+    </el-row>
+
+    <el-table v-loading="loading" :data="tableList">
+      <el-table-column type="index" width="55" align="center" />
+      <el-table-column label="折扣描述" align="center" prop="desc" min-width="140" />
+      <el-table-column label="折扣价" align="center" prop="discount" />
+      <el-table-column label="有效期" align="center" prop="duration" />
+      <el-table-column label="单位" align="center" prop="unit" />
+      <el-table-column label="状态" align="center">
+        <template #default="{ row }">
+          <el-switch
+            v-model="row.isActive"
+            :active-value="0"
+            :inactive-value="1"
+            active-text="启用"
+            inactive-text="禁用"
+            disabled
+          />
+        </template>
+      </el-table-column>
+    </el-table>
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      v-model:page="searchForm.pageNo"
+      v-model:limit="searchForm.pageSize"
+      @pagination="getList"
+    />
+
+    <el-dialog title="折扣详情" v-model="showDialog" width="500px">
+      <el-form :model="form" ref="formRef" :rules="rules" label-width="80px">
+        <el-form-item label="折扣类型" prop="type">
+          <el-select v-model="form.type" style="width: 100%">
+            <el-option
+              v-for="item in discountTypeOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="折扣描述">
+          {{ discountDesc }}
+        </el-form-item>
+        <el-form-item v-if="form.type == 1" label="科目" prop="subject">
+          <el-select v-model="form.subject" style="width: 100%">
+            <el-option
+              v-for="item in subjectOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="变量1" prop="param1">
+          <el-select v-model="form.param1" style="width: 100%" clearable>
+            <el-option
+              v-for="item in vipTypeOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="变量2" prop="param2">
+          <el-select v-model="form.param2" style="width: 100%">
+            <el-option
+              v-for="item in vipTypeOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="折扣价" prop="discount">
+          <el-input v-model="form.discount" type="number" />
+        </el-form-item>
+        <el-form-item label="有效期" prop="duration">
+          <el-input v-model="form.duration" type="number" />
+        </el-form-item>
+        <el-form-item label="单位" prop="unit">
+          <el-radio-group v-model="form.unit">
+            <el-radio v-for="(item, index) in unitOptions" :key="index" :label="item.value">{{
+              item.label
+            }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="状态" prop="isActive">
+          <el-switch
+            v-model="form.isActive"
+            :active-value="0"
+            :inactive-value="1"
+            active-text="启用"
+            inactive-text="禁用"
+          />
+        </el-form-item>
+      </el-form>
+
+      <template #footer>
+        <span>
+          <el-button @click="showDialog = false">取消</el-button>
+          <el-button type="primary" @click="sureAdd">确定</el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="VipDiscount">
+import { getUserMemberList } from '@/api/xjapplet/vip'
+
+const message = useMessage()
+
+const searchForm = ref({
+  phone: '',
+  pageNo: 1,
+  pageSize: 50
+})
+
+const loading = ref(false)
+const tableList = ref([])
+const total = ref(0)
+
+const discountTypeOptions = [
+  {
+    label: '【$科目】模考首次通过后，在拥有【$会员名1】的情况下，购买【$会员名2】，享折扣价',
+    value: 1
+  },
+  { label: '之前拥有过【$会员名1】，购买【$会员名2】，享折扣价', value: 2 }
+]
+
+const subjectOptions = [
+  { label: '科一', value: '1' },
+  { label: '科四', value: '4' }
+]
+
+const unitOptions = [
+  { label: '天', value: 1 },
+  { label: '年', value: 3 }
+]
+
+const discountDesc = computed(() => {
+  const { type, subject, param1, param2, discount, duration, unit } = form.value
+  let baseStr = discountTypeOptions.find((item) => item.value === type).label
+  return baseStr
+    .replace('$科目', subjectOptions.find((item) => item.value === subject).label)
+    .replace(
+      '$会员名1',
+      vipTypeOptions.value.find((item) => item.value === param1)?.label || '无需会员'
+    )
+    .replace('$会员名2', vipTypeOptions.value.find((item) => item.value === param2).label)
+    .concat(
+      `${discount || ''}，有效期${duration || 0}${
+        unitOptions.find((item) => item.value === unit).label
+      }`
+    )
+})
+
+const vipTypeOptions = ref([
+  { label: '普通会员', value: '1' },
+  { label: 'VIP会员', value: '2' }
+])
+
+function searchList() {
+  searchForm.value.pageNo = 1
+  getList()
+}
+
+function getList() {
+  loading.value = true
+  getUserMemberList(searchForm.value).then((response) => {
+    if (response.code === 200) {
+      tableList.value = response.data
+      total.value = response.total
+      loading.value = false
+    }
+  })
+}
+
+const showDialog = ref(false)
+const form = ref({
+  type: 1,
+  subject: '1',
+  param1: '1',
+  param2: '2',
+  discount: undefined,
+  duration: undefined,
+  unit: 1,
+  isActive: 0
+})
+const rules = ref({
+  param2: [{ required: true, message: '请选择变量2', trigger: 'change' }],
+  discount: [{ required: true, message: '请输入折扣价', trigger: 'blur' }],
+  duration: [{ required: true, message: '请输入有效期', trigger: 'blur' }]
+})
+
+function addDiscount() {
+  showDialog.value = true
+}
+
+const formRef = ref(null)
+async function sureAdd() {
+  if (!formRef.value) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+
+  // 调用接口
+  showDialog.value = false
+  message.success('成功')
+  searchList()
+}
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/XjApplet/Vip/components/VipType.vue b/src/views/XjApplet/Vip/components/VipType.vue
new file mode 100644
index 0000000..b912f3a
--- /dev/null
+++ b/src/views/XjApplet/Vip/components/VipType.vue
@@ -0,0 +1,204 @@
+<template>
+  <div>
+    <el-form :model="searchForm" inline>
+      <el-form-item>
+        <el-input v-model="searchForm.phone" placeholder="学员手机号" />
+      </el-form-item>
+      <el-form-item>
+        <el-select v-model="searchForm.cartype" placeholder="选择车型" clearable filterable>
+          <el-option label="小车" value="1001" />
+          <el-option label="摩托车" value="1002" />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-select v-model="searchForm.vipType" placeholder="选择会员类型" clearable filterable>
+          <el-option
+            v-for="item in vipTypeOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="searchList">查询</el-button>
+        <el-button type="primary" @click="addVip">新增会员类型</el-button>
+      </el-form-item>
+    </el-form>
+    <el-table v-loading="loading" :data="tableList">
+      <el-table-column type="index" width="55" align="center" />
+      <el-table-column label="会员名" align="center" prop="memberName" min-width="140" />
+      <el-table-column label="车型" align="center" prop="carName" />
+      <el-table-column label="科目" align="center" prop="subjects" />
+      <el-table-column label="原价" align="center" prop="price" />
+      <el-table-column label="折扣价" align="center" prop="discount" />
+      <el-table-column label="有效期" align="center" prop="duration" />
+      <el-table-column label="单位" align="center" prop="unit" />
+      <el-table-column label="状态" align="center">
+        <template #default="{ row }">
+          <el-switch
+            v-model="row.isActive"
+            :active-value="0"
+            :inactive-value="1"
+            active-text="启用"
+            inactive-text="禁用"
+            disabled
+          />
+        </template>
+      </el-table-column>
+      <el-table-column label="客服赠送" align="center">
+        <template #default="{ row }">
+          <el-switch
+            v-model="row.canGive"
+            :active-value="0"
+            :inactive-value="1"
+            active-text="可赠送"
+            inactive-text="不可赠送"
+            disabled
+          />
+        </template>
+      </el-table-column>
+    </el-table>
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      v-model:page="searchForm.pageNo"
+      v-model:limit="searchForm.pageSize"
+      @pagination="getList"
+    />
+
+    <el-dialog title="会员详情" v-model="showDialog" width="500px">
+      <el-form :model="form" ref="formRef" :rules="rules" label-width="80px">
+        <el-form-item label="会员名称" prop="memberName">
+          <el-input v-model="form.memberName" />
+        </el-form-item>
+        <el-form-item label="车型" prop="cartype">
+          <el-select v-model="form.cartype" style="width: 100%">
+            <el-option label="小车" value="1001" />
+            <el-option label="摩托车" value="1002" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="科目" prop="subjects">
+          <el-select v-model="searchForm.subjects" placeholder="多选" multiple style="width: 100%">
+            <el-option label="科一" value="4" />
+            <el-option label="科四" value="1" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="原价" prop="price">
+          <el-input v-model="form.price" type="number" />
+        </el-form-item>
+        <el-form-item label="折扣价" prop="discount">
+          <el-input v-model="form.discount" type="number" />
+        </el-form-item>
+        <el-form-item label="有效期" prop="duration">
+          <el-input v-model="form.duration" type="number" />
+        </el-form-item>
+        <el-form-item label="单位" prop="unit">
+          <el-radio-group v-model="form.unit">
+            <el-radio :label="1">天</el-radio>
+            <el-radio :label="3">年</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="状态" prop="isActive">
+          <el-switch
+            v-model="form.isActive"
+            :active-value="0"
+            :inactive-value="1"
+            active-text="启用"
+            inactive-text="禁用"
+          />
+        </el-form-item>
+        <el-form-item label="客服赠送" prop="canGive">
+          <el-switch
+            v-model="form.canGive"
+            :active-value="0"
+            :inactive-value="1"
+            active-text="可赠送"
+            inactive-text="不可赠送"
+          />
+        </el-form-item>
+      </el-form>
+
+      <template #footer>
+        <span>
+          <el-button @click="showDialog = false">取消</el-button>
+          <el-button type="primary" @click="sureAdd">确定</el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="VipType">
+import { getUserMemberList } from '@/api/xjapplet/vip'
+const message = useMessage()
+const searchForm = ref({
+  phone: '',
+  pageNo: 1,
+  pageSize: 50
+})
+
+const loading = ref(false)
+const tableList = ref([])
+const total = ref(0)
+
+const vipTypeOptions = ref([
+  { label: '普通会员', value: '1' },
+  { label: 'VIP会员', value: '2' }
+])
+
+function searchList() {
+  searchForm.value.pageNo = 1
+  getList()
+}
+
+function getList() {
+  loading.value = true
+  getUserMemberList(searchForm.value).then((response) => {
+    if (response.code === 200) {
+      tableList.value = response.data
+      total.value = response.total
+      loading.value = false
+    }
+  })
+}
+
+const showDialog = ref(false)
+const form = ref({
+  memberName: '',
+  cartype: '',
+  subjects: [],
+  price: '',
+  discount: '',
+  duration: '',
+  unit: 1,
+  isActive: 0,
+  canGive: 1
+})
+const rules = ref({
+  memberName: [{ required: true, message: '请输入会员名称', trigger: 'blur' }],
+  cartype: [{ required: true, message: '请输入车型', trigger: 'change' }],
+  subjects: [{ required: true, message: '请输入科目', trigger: 'blur' }],
+  price: [{ required: true, message: '请输入价格', trigger: 'blur' }],
+  discount: [{ required: true, message: '请输入折扣价', trigger: 'blur' }],
+  duration: [{ required: true, message: '请输入有效期', trigger: 'blur' }]
+})
+
+function addVip() {
+  showDialog.value = true
+}
+
+const formRef = ref(null)
+async function sureAdd() {
+  if (!formRef.value) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+
+  // 调用接口
+  showDialog.value = false
+  message.success('赠送成功')
+  searchList()
+}
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/XjApplet/Vip/components/VipUser.vue b/src/views/XjApplet/Vip/components/VipUser.vue
new file mode 100644
index 0000000..2966c87
--- /dev/null
+++ b/src/views/XjApplet/Vip/components/VipUser.vue
@@ -0,0 +1,135 @@
+<template>
+  <div>
+    <el-form :model="searchForm" inline>
+      <el-form-item>
+        <el-input v-model="searchForm.phone" placeholder="学员手机号" />
+      </el-form-item>
+      <el-form-item>
+        <el-select v-model="searchForm.cartype" placeholder="选择车型" clearable filterable>
+          <el-option label="小车" value="1001" />
+          <el-option label="摩托车" value="1002" />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-select v-model="searchForm.vipType" placeholder="选择会员类型" clearable filterable>
+          <el-option
+            v-for="item in vipTypeOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="searchList">查询</el-button>
+        <el-button type="primary" @click="addVipUser">赠送会员</el-button>
+      </el-form-item>
+    </el-form>
+    <el-table v-loading="loading" :data="tableList">
+      <el-table-column type="index" width="55" align="center" />
+      <el-table-column label="手机号" align="center" prop="phone" min-width="140" />
+      <el-table-column label="会员名" align="center" prop="memberName" min-width="140" />
+      <el-table-column label="车型" align="center" prop="carName" min-width="100" />
+      <el-table-column label="科目" align="center" prop="subjects" min-width="100" />
+      <el-table-column label="开始时间" align="center" prop="startDate" min-width="100" />
+      <el-table-column label="结束时间" align="center" prop="endDate" min-width="100" />
+      <el-table-column label="操作人" align="center" prop="" min-width="100" />
+      <el-table-column label="操作时间" align="center" prop="" min-width="100" />
+    </el-table>
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      v-model:page="searchForm.pageNo"
+      v-model:limit="searchForm.pageSize"
+      @pagination="getList"
+    />
+
+    <el-dialog title="赠送会员" v-model="showDialog" width="500px">
+      <el-form :model="form" ref="formRef" :rules="rules" label-width="80px">
+        <el-form-item label="手机号" prop="phone">
+          <el-input v-model="form.phone" maxlength="11" />
+        </el-form-item>
+        <el-form-item label="会员类型" prop="vipType">
+          <el-select v-model="form.vipType" clearable filterable style="width: 100%">
+            <el-option
+              v-for="item in vipTypeOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+      </el-form>
+
+      <template #footer>
+        <span>
+          <el-button @click="showDialog = false">取消</el-button>
+          <el-button type="primary" @click="sureAdd">确定</el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="VipUser">
+import { getUserMemberList } from '@/api/xjapplet/vip'
+const message = useMessage()
+const searchForm = ref({
+  phone: '',
+  pageNo: 1,
+  pageSize: 50
+})
+
+const loading = ref(false)
+const tableList = ref([])
+const total = ref(0)
+
+const vipTypeOptions = ref([
+  { label: '普通会员', value: '1' },
+  { label: 'VIP会员', value: '2' }
+])
+
+function searchList() {
+  searchForm.value.pageNo = 1
+  getList()
+}
+
+function getList() {
+  loading.value = true
+  getUserMemberList(searchForm.value).then((response) => {
+    if (response.code === 200) {
+      tableList.value = response.data
+      total.value = response.total
+      loading.value = false
+    }
+  })
+}
+
+const showDialog = ref(false)
+const form = ref({
+  phone: '',
+  vipType: ''
+})
+const rules = ref({
+  phone: [{ required: true, message: '请输入用户手机号', trigger: 'blur' }],
+  vipType: [{ required: true, message: '请选择会员类型', trigger: 'change' }]
+})
+
+function addVipUser() {
+  showDialog.value = true
+}
+
+const formRef = ref(null)
+async function sureAdd() {
+  if (!formRef.value) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+
+  // 调用接口
+  showDialog.value = false
+  message.success('赠送成功')
+  searchList()
+}
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/XjApplet/Vip/index.vue b/src/views/XjApplet/Vip/index.vue
new file mode 100644
index 0000000..b936912
--- /dev/null
+++ b/src/views/XjApplet/Vip/index.vue
@@ -0,0 +1,29 @@
+<template>
+  <div>
+    <el-tabs v-model="tabIndex">
+      <el-tab-pane label="会员用户" :name="1">
+        <VipUser v-if="tabIndex == 1" />
+      </el-tab-pane>
+      <el-tab-pane label="会员类型" :name="2">
+        <VipType v-if="tabIndex == 2" />
+      </el-tab-pane>
+      <el-tab-pane label="会员折扣" :name="3">
+        <VipDiscount v-if="tabIndex == 3" />
+      </el-tab-pane>
+      <el-tab-pane label="用户折扣" :name="4">
+        <UserDiscount v-if="tabIndex == 4" />
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script setup name="Vip">
+import UserDiscount from './components/UserDiscount.vue'
+import VipDiscount from './components/VipDiscount.vue'
+import VipType from './components/VipType.vue'
+import VipUser from './components/VipUser.vue'
+
+const tabIndex = ref(1)
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/XjApplet/VipData/conponents/SecretData.vue b/src/views/XjApplet/VipData/conponents/SecretData.vue
new file mode 100644
index 0000000..cc2abe8
--- /dev/null
+++ b/src/views/XjApplet/VipData/conponents/SecretData.vue
@@ -0,0 +1,257 @@
+<template>
+  <div>
+    <div>
+      <el-form size="small" inline label-width="68px" @submit.prevent>
+        <el-row :gutter="20">
+          <el-form-item label="车型">
+            <el-radio-group v-model="queryParams.chexing" @change="searchMj">
+              <el-radio label="C1">小车</el-radio>
+              <el-radio label="D">摩托车</el-radio>
+              <!-- <el-radio label="B2">货车</el-radio> -->
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="科目">
+            <el-radio-group v-model="queryParams.examType" @change="searchMj">
+              <el-radio label="1">科一</el-radio>
+              <el-radio label="4">科四</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-row>
+      </el-form>
+    </div>
+    <div style="display: flex; padding: 10px; border: 1px solid #eee; height: calc(100vh - 80px)">
+      <div style="width: 350px; border-right: 1px solid #eee">
+        <div style="display: flex; justify-content: space-between; padding-right: 20px">
+          <div style="font-size: 18px; font-weight: bold">密卷</div>
+          <el-button type="text" @click="addMjItem">新增</el-button>
+        </div>
+        <el-radio-group
+          v-model="mjIndex"
+          style="width: 100%; display: block; margin-top: 20px"
+          @change="getQuestionList"
+        >
+          <el-radio v-for="(item, index) in mjList" :key="index" :label="index" class="flex-radio">
+            <div style="flex: 1; width: 100px">{{ getMjTitle(index) }}</div>
+            <div style="padding-right: 15px">
+              <el-button type="text" @click="removeMj(item)">删除</el-button>
+              <el-button type="text" @click="clearMjDetail(item)">清空</el-button>
+            </div>
+          </el-radio>
+        </el-radio-group>
+      </div>
+      <div style="flex: 1; padding-left: 20px; padding-right: 20px">
+        <div
+          v-if="mjList.length > 0"
+          style="display: flex; justify-content: space-between; align-items: center"
+        >
+          <div style="font-size: 20px; font-weight: bold">
+            当前密卷：{{ getMjTitle(mjIndex) }}
+          </div>
+          <div style="margin-left: 10px; margin-right: 10px"> 题目数：{{ tableList.length }} </div>
+          <el-button type="primary" @click="addMjDetail">新增密卷试题</el-button>
+        </div>
+        <el-table v-loading="loading" :data="tableList" style="margin-top: 20px">
+          <el-table-column type="index" width="55" align="center" />
+          <el-table-column label="题目" align="left" prop="subTitle" min-width="140" />
+          <el-table-column label="选项" align="left" min-width="140">
+            <template #default="{ row }">
+              <p v-if="row.optA">A:{{ row.optA }}</p>
+              <p v-if="row.optB">B:{{ row.optB }}</p>
+              <p v-if="row.optC">C:{{ row.optC }}</p>
+              <p v-if="row.optD">D:{{ row.optD }}</p>
+            </template>
+          </el-table-column>
+          <el-table-column label="答案" align="center" prop="answer" width="100" />
+          <el-table-column label="章节" align="center" prop="sortName" min-width="100" />
+          <el-table-column label="专项" align="center" prop="categoryTitle" width="100" />
+          <el-table-column label="图片" align="center" width="100">
+            <template #default="{ row }">
+              <img
+                v-if="row.subPic"
+                :src="`https://ss-cloud.ahduima.com/xjxc/pic/${row.subPic}`"
+                width="80px"
+              />
+            </template>
+          </el-table-column>
+
+          <el-table-column label="操作" align="center" width="100px">
+            <template #default="{ row }">
+              <el-button size="mini" type="text" @click="takeoutMj(row)">移出密卷</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+    </div>
+
+    <el-dialog v-model:visible="showDialog" title="新增试题" width="80%">
+      <div style="display: flex; align-items: center; margin-bottom: 20px">
+        <el-input v-model="quesName" placeholder="请输入题目" clearable @keyup.enter="searchQues" />
+        <el-button style="margin-left: 20px" type="primary" @click="searchQues">搜索</el-button>
+      </div>
+      <el-table :data="quesLit" highlight-current-row height="calc(100vh - 260px)">
+        <el-table-column label="题目" align="left" prop="subTitle" min-width="140" />
+        <el-table-column label="选项" align="left" min-width="140">
+          <template #default="{ row }">
+            <p v-if="row.optA">A:{{ row.optA }}</p>
+            <p v-if="row.optB">B:{{ row.optB }}</p>
+            <p v-if="row.optC">C:{{ row.optC }}</p>
+            <p v-if="row.optD">D:{{ row.optD }}</p>
+          </template>
+        </el-table-column>
+        <el-table-column label="答案" align="center" prop="answer" width="100" />
+        <el-table-column label="章节" align="center" prop="sortName" width="180" />
+        <el-table-column label="专项" align="center" prop="categoryTitle" width="100" />
+        <el-table-column label="图片" align="center" width="100">
+          <template #default="{ row }">
+            <el-image
+              v-if="row.subPic"
+              :src="`https://ss-cloud.ahduima.com/xjxc/pic/${row.subPic}`"
+              :preview-src-list="[`https://ss-cloud.ahduima.com/xjxc/pic/${row.subPic}`]"
+              style="width: 80px"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" width="100px">
+          <template #default="{ row }">
+            <el-button type="text" @click="sureAddQues(row)">加入密卷</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="SimpleData">
+import {
+  getMjList,
+  addMj,
+  delMj,
+  clearMj,
+  getMjQuestionList,
+  addMjQuestion,
+  delMjQuestion,
+  searchQuestion
+} from '@/api/xjapplet/xjdatabase'
+
+const message = useMessage() // 消息弹窗
+
+const queryParams = ref({
+  chexing: 'C1',
+  examType: '1'
+})
+const mjIndex = ref(0)
+const mjList = ref([])
+const loading = ref(false)
+const tableList = ref([])
+const showDialog = ref(false)
+const quesName = ref('')
+const quesLit = ref([])
+
+onMounted(() => {
+  searchMj()
+})
+
+function addMjItem() {
+  addMj(queryParams.value).then((res) => {
+    if (res) {
+      searchMj()
+      message.success('添加成功')
+    } else {
+      message.error('添加失败')
+    }
+  })
+}
+function getMjTitle(idx) {
+  const cjObj = {
+    C1: '小车',
+    D: '摩托车'
+  }
+  const kmObj = {
+    1: '科一',
+    4: '科四'
+  }
+  return `${cjObj[queryParams.value.chexing]}${kmObj[queryParams.value.examType]}考前密卷 第${
+    idx + 1
+  }套`
+}
+function removeMj(item) {
+  message
+    .confirm('是否确认删除密卷？')
+    .then(function () {
+      return delMj(item.secretId)
+    })
+    .then(() => {
+      searchMj()
+      message.success('删除成功')
+    })
+    .catch(() => {})
+}
+function clearMjDetail(item) {
+  message
+    .confirm('是否确认清空密卷题目？')
+    .then(function () {
+      return clearMj(item.secretId)
+    })
+    .then(() => {
+      getQuestionList()
+      message.success('清空题目成功')
+    })
+    .catch(() => {})
+}
+function searchMj() {
+  getMjList(queryParams.value).then((resp) => {
+    mjList.value = resp || []
+    if (mjList.value.length > 0) {
+      mjIndex.value = 0
+      getQuestionList()
+    }
+  })
+}
+function addMjDetail() {
+  showDialog.value = true
+}
+function searchQues() {
+  searchQuestion({
+    ...queryParams.value,
+    pageNo: 1,
+    pageSize: 1000,
+    subTitle: quesName.value
+  }).then((response) => {
+    quesLit.value = response
+  })
+}
+function takeoutMj(row) {
+  message
+    .confirm('是否确认将该题移出密卷？')
+    .then(function () {
+      return delMjQuestion(row.id)
+    })
+    .then(() => {
+      getQuestionList()
+      message.success('清空题目成功')
+    })
+    .catch(() => {})
+}
+function getQuestionList() {
+  getMjQuestionList({
+    secretId: mjList.value[mjIndex.value].secretId
+  }).then((resp) => {
+    tableList.value = resp?.sort((pre, cur) => pre.id - cur.id) || []
+  })
+}
+function sureAddQues(row) {
+  addMjQuestion({
+    secretId: mjList.value[mjIndex.value].secretId,
+    subId: row.subId
+  })
+    .then((resp) => {
+      if (resp) {
+        message.success('添加成功')
+        getQuestionList()
+      }
+    })
+    .catch(() => {})
+}
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/XjApplet/VipData/conponents/SimpleData.vue b/src/views/XjApplet/VipData/conponents/SimpleData.vue
new file mode 100644
index 0000000..4bcdda3
--- /dev/null
+++ b/src/views/XjApplet/VipData/conponents/SimpleData.vue
@@ -0,0 +1,177 @@
+<template>
+  <div>
+    <el-form inline label-width="68px" @submit.prevent>
+      <el-row :gutter="20">
+        <el-form-item label="车型">
+          <el-radio-group v-model="queryParams.chexing">
+            <el-radio label="C1">小车</el-radio>
+            <el-radio label="D">摩托车</el-radio>
+            <!-- <el-radio label="B2">货车</el-radio> -->
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="科目">
+          <el-radio-group v-model="queryParams.examType">
+            <el-radio label="1">科一</el-radio>
+            <el-radio label="4">科四</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item>
+          <el-button
+            type="primary"
+            @click="
+              () => {
+                queryParams.pageNo = 1
+                getQuestionList()
+              }
+            "
+            >查询</el-button
+          >
+          <el-button type="primary" @click="addMjDetail">新增精选试题</el-button>
+        </el-form-item>
+      </el-row>
+    </el-form>
+    <el-table v-loading="loading" :data="tableList">
+      <el-table-column type="index" width="55" align="center" />
+      <el-table-column label="题目" align="left" prop="subTitle" min-width="140" />
+      <el-table-column label="选项" align="left" min-width="140">
+        <template #default="{ row }">
+          <p v-if="row.optA">A:{{ row.optA }}</p>
+          <p v-if="row.optB">B:{{ row.optB }}</p>
+          <p v-if="row.optC">C:{{ row.optC }}</p>
+          <p v-if="row.optD">D:{{ row.optD }}</p>
+        </template>
+      </el-table-column>
+      <el-table-column label="答案" align="center" prop="answer" width="100" />
+      <el-table-column label="章节" align="center" prop="sortName" min-width="100" />
+      <el-table-column label="专项" align="center" prop="categoryTitle" width="100" />
+      <el-table-column label="图片" align="center" width="100">
+        <template #default="{ row }">
+          <img
+            v-if="row.subPic"
+            :src="`https://ss-cloud.ahduima.com/xjxc/pic/${row.subPic}`"
+            width="80px"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" width="100px">
+        <template #default="{ row }">
+          <el-button size="small" type="primary" link @click="takeoutMj(row)">移出精选</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getQuestionList"
+    />
+
+    <el-dialog v-model="showDialog" title="新增试题" width="80%">
+      <div style="display: flex; align-items: center; margin-bottom: 20px">
+        <el-input v-model="quesName" placeholder="请输入题目" clearable @keyup.enter="searchQues" />
+        <el-button style="margin-left: 20px" type="primary" @click="searchQues">搜索</el-button>
+      </div>
+      <el-table :data="quesLit" highlight-current-row height="calc(100vh - 260px)">
+        <el-table-column label="题目" align="left" prop="subTitle" min-width="140" />
+        <el-table-column label="选项" align="left" min-width="140">
+          <template #default="{ row }">
+            <p v-if="row.optA">A:{{ row.optA }}</p>
+            <p v-if="row.optB">B:{{ row.optB }}</p>
+            <p v-if="row.optC">C:{{ row.optC }}</p>
+            <p v-if="row.optD">D:{{ row.optD }}</p>
+          </template>
+        </el-table-column>
+        <el-table-column label="答案" align="center" prop="answer" width="100" />
+        <el-table-column label="章节" align="center" prop="sortName" width="180" />
+        <el-table-column label="专项" align="center" prop="categoryTitle" width="100" />
+        <el-table-column label="图片" align="center" width="100">
+          <template #default="{ row }">
+            <el-image
+              v-if="row.subPic"
+              :src="`https://ss-cloud.ahduima.com/xjxc/pic/${row.subPic}`"
+              :preview-src-list="[`https://ss-cloud.ahduima.com/xjxc/pic/${row.subPic}`]"
+              style="width: 80px"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" width="100px">
+          <template #default="{ row }">
+            <el-button type="primary" link @click="sureAddQues(row)">加入精选</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="SimpleData">
+import {
+  getMjQuestionList,
+  addMjQuestion,
+  delMjQuestion,
+  searchQuestion
+} from '@/api/xjapplet/xjdatabase'
+
+const message = useMessage() // 消息弹窗
+
+const queryParams = ref({
+  chexing: 'C1',
+  examType: '1',
+  pageNo: 1,
+  pageSize: 10
+})
+
+const total = ref(0)
+
+const loading = ref(false)
+const tableList = ref([])
+const showDialog = ref(false)
+const quesName = ref('')
+const quesLit = ref([])
+
+function addMjDetail() {
+  showDialog.value = true
+}
+function searchQues() {
+  searchQuestion({
+    ...queryParams.value,
+    pageNo: 1,
+    pageSize: 1000,
+    subTitle: quesName.value
+  }).then((response) => {
+    quesLit.value = response.list
+  })
+}
+function takeoutMj(row) {
+  message
+    .confirm('是否确认将该题移出精选？')
+    .then(function () {
+      return delMjQuestion(row.id)
+    })
+    .then(() => {
+      getQuestionList()
+      message.success('清空题目成功')
+    })
+    .catch(() => {})
+}
+function getQuestionList() {
+  getMjQuestionList().then((resp) => {
+    tableList.value = resp?.sort((pre, cur) => pre.id - cur.id) || []
+  })
+}
+function sureAddQues(row) {
+  addMjQuestion({
+    subId: row.subId
+  })
+    .then((resp) => {
+      if (resp) {
+        message.success('添加成功')
+        getQuestionList()
+      }
+    })
+    .catch(() => {})
+}
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/XjApplet/VipData/index.vue b/src/views/XjApplet/VipData/index.vue
new file mode 100644
index 0000000..7321632
--- /dev/null
+++ b/src/views/XjApplet/VipData/index.vue
@@ -0,0 +1,19 @@
+<template>
+  <el-tabs v-model="tabIndex">
+    <el-tab-pane label="精选题" :name="1">
+      <SimpleData v-if="tabIndex == 1" />
+    </el-tab-pane>
+    <el-tab-pane label="密卷" :name="2">
+      <SecretData v-if="tabIndex == 2" />
+    </el-tab-pane>
+  </el-tabs>
+</template>
+
+<script setup name="VipData">
+import SimpleData from './conponents/SimpleData.vue'
+import SecretData from './conponents/SecretData.vue'
+
+const tabIndex = ref(1)
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/XjApplet/XjDatabase/Components/QuestionAddForm.vue b/src/views/XjApplet/XjDatabase/Components/QuestionAddForm.vue
new file mode 100644
index 0000000..8735fc6
--- /dev/null
+++ b/src/views/XjApplet/XjDatabase/Components/QuestionAddForm.vue
@@ -0,0 +1,317 @@
+<template>
+  <el-dialog
+    title="试题"
+    :close-on-click-modal="false"
+    append-to-body
+    v-model="visible"
+    width="900px"
+  >
+    <div>
+      <el-form
+        ref="dialogFormRef"
+        :model="dialogForm"
+        :rules="dataRule"
+        label-width="auto"
+        label-position="right"
+        @keyup.enter="dialogFormSubmit()"
+      >
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="题目" prop="subTitle">
+              <el-input
+                v-model="dialogForm.subTitle"
+                maxlength="200"
+                placeholder="请输入题目"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="题目关键字" prop="titleWords">
+              <el-input
+                v-model="dialogForm.titleWords"
+                maxlength="1000"
+                placeholder="请输入"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="专项" prop="categoryTitle">
+              <el-input
+                v-model="dialogForm.categoryTitle"
+                maxlength="1000"
+                placeholder="请输入"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="章节" prop="sortId">
+              <el-select v-model="dialogForm.sortId" style="width: 100%">
+                <el-option
+                  v-for="dict in sortOptions"
+                  :key="dict.sortId"
+                  :label="dict.sortName"
+                  :value="dict.sortId"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="题型" prop="subType">
+              <el-radio-group v-model="dialogForm.subType">
+                <el-radio label="1">判断题</el-radio>
+                <el-radio label="2">单选题</el-radio>
+                <el-radio label="3">多选题</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="排序" prop="sort">
+              <el-input v-model="dialogForm.sort" maxlength="20" placeholder="请输入" clearable />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="选项A" prop="subTitle">
+              <el-input v-model="dialogForm.optA" maxlength="200" placeholder="请输入" clearable />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="选项B" prop="subTitle">
+              <el-input v-model="dialogForm.optB" maxlength="200" placeholder="请输入" clearable />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="选项C" prop="subTitle">
+              <el-input v-model="dialogForm.optC" maxlength="200" placeholder="请输入" clearable />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="选项D" prop="subTitle">
+              <el-input v-model="dialogForm.optD" maxlength="200" placeholder="请输入" clearable />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="答案" prop="answer">
+              <el-input
+                v-model="dialogForm.answer"
+                maxlength="200"
+                placeholder="请输入"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="难点分析" prop="infos">
+              <el-input
+                v-model="dialogForm.infos"
+                maxlength="1000"
+                placeholder="请输入"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="答题技巧" prop="dtjq">
+              <el-input v-model="dialogForm.dtjq" maxlength="1000" placeholder="请输入" clearable />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="技巧关键字" prop="jqWords">
+              <el-input
+                v-model="dialogForm.jqWords"
+                maxlength="1000"
+                placeholder="请输入"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="车型" prop="chexing">
+              <span v-if="dialogForm.chexing == 'C1'">小车</span>
+              <span v-if="dialogForm.chexing == 'D'">摩托车</span>
+              <span v-if="dialogForm.chexing == 'B2'">货车</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="科目" prop="examType">
+              <span v-if="dialogForm.examType == '1'">科一</span>
+              <span v-if="dialogForm.examType == '4'">科四</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-form-item label="题目图片" prop="imageUrl">
+            <el-upload
+              action="#"
+              accept=".png,.jpg,.jpeg,.gif"
+              :limit="1"
+              :http-request="handleImport"
+              :on-exceed="handleExceed"
+              :show-file-list="false"
+            >
+              <img v-if="imgUrl" :src="imgUrl" style="width: 200px" />
+              <i v-else class="el-icon-plus"></i>
+            </el-upload>
+          </el-form-item>
+        </el-row>
+      </el-form>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button plain @click="visible = false">取消</el-button>
+        <el-button type="primary" :disabled="!canSubmit" @click="dialogFormSubmit()"
+          >确定</el-button
+        >
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<script setup name="QuesAddForm">
+import { addQuestion, updateQuestion, uploadFile, getQuestionSort } from '@/api/xjapplet/xjdatabase'
+
+const message = useMessage() // 消息弹窗
+
+const emit = defineEmits(['update'])
+
+const visible = ref(false)
+const canSubmit = ref(true)
+const imgUrl = ref(undefined)
+const sortOptions = ref([])
+const dialogForm = ref({
+  id: undefined,
+  sort: 0,
+  categoryTitle: undefined,
+  subTitle: undefined,
+  infos: undefined,
+  optA: undefined,
+  optB: undefined,
+  optC: undefined,
+  optD: undefined,
+  subPic: undefined,
+  subType: undefined,
+  answer: undefined,
+  examType: undefined,
+  dtjqPic: undefined
+})
+
+const dataRule = {
+  schoolName: [{ required: true, message: '驾校名称不能为空', trigger: 'blur' }],
+  status: [{ required: true, message: '状态不能为空', trigger: 'blur' }]
+}
+
+const open = (info = undefined) => {
+  visible.value = true
+  getQuestionChapter(info)
+  resetDialogForm()
+  if (info) {
+    dialogForm.value = { ...info }
+    if (dialogForm.value.subPic) {
+      imgUrl.value = 'https://ss-cloud.ahduima.com/xjxc/pic/' + dialogForm.value.subPic
+    }
+  }
+}
+
+defineExpose({
+  open
+})
+
+const getQuestionChapter = (info) => {
+  getQuestionSort({ chexing: info.chexing, examType: info.examType }).then((data) => {
+    sortOptions.value = data
+  })
+}
+const resetDialogForm = () => {
+  dialogForm.value = {
+    id: undefined,
+    sort: 0,
+    subTitle: undefined,
+    infos: undefined,
+    optA: undefined,
+    optB: undefined,
+    optC: undefined,
+    optD: undefined,
+    subPic: undefined,
+    subType: undefined,
+    answer: undefined,
+    examType: undefined,
+    dtjqPic: undefined,
+    dtjq: undefined,
+    jqtp: undefined,
+    biaoji: undefined,
+    titleWords: undefined,
+    jqWords: undefined,
+    optaWords: undefined,
+    optbWords: undefined,
+    optcWords: undefined,
+    optdWords: undefined,
+    chexing: undefined
+  }
+}
+const dialogFormRef = ref(null)
+// 表单提交
+const dialogFormSubmit = async () => {
+  if (!dialogFormRef.value) return
+  const valid = await dialogFormRef.value.validate()
+  if (!valid) return
+
+  if (dialogForm.value.id) {
+    updateQuestion(dialogForm.value).then((response) => {
+      if (response) {
+        message.success('修改成功')
+        emit('update')
+        visible.value = false
+      }
+    })
+  } else {
+    addQuestion(dialogForm.value).then((response) => {
+      if (response) {
+        message.success('新增成功')
+        visible.value = false
+        emit('update')
+      }
+    })
+  }
+}
+const handleImport = (opt) => {
+  const data = new FormData()
+  data.append('file', opt.file)
+  uploadFile(data).then((resp) => {
+    if (resp.code == 200) {
+      message.success('文件上传成功')
+      dialogForm.value.subPic = resp.data
+      imgUrl.value = 'https://ss-cloud.ahduima.com/xjxc/pic/' + dialogForm.value.subPic
+    }
+  })
+}
+const handleExceed = (files) => {
+  handleImport({ file: files[0] })
+}
+</script>
diff --git a/src/views/XjApplet/XjDatabase/index.vue b/src/views/XjApplet/XjDatabase/index.vue
new file mode 100644
index 0000000..54424f2
--- /dev/null
+++ b/src/views/XjApplet/XjDatabase/index.vue
@@ -0,0 +1,156 @@
+<template>
+  <div class="app-container" style="text-align: center">
+    <el-form size="small" :inline="true" label-width="68px" @submit.prevent>
+      <el-row :gutter="20">
+        <el-form-item label="车型">
+          <el-radio-group v-model="queryParams.chexing">
+            <el-radio label="C1">小车</el-radio>
+            <el-radio label="D">摩托车</el-radio>
+            <el-radio label="B2">货车</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="科目">
+          <el-radio-group v-model="queryParams.examType">
+            <el-radio label="1">科一</el-radio>
+            <el-radio label="4">科四</el-radio>
+          </el-radio-group>
+        </el-form-item>
+
+        <el-form-item label="有图片">
+          <el-radio-group v-model="queryParams.isPic">
+            <el-radio :label="true">有</el-radio>
+            <el-radio :label="false">无</el-radio>
+          </el-radio-group>
+        </el-form-item>
+      </el-row>
+      <el-row :gutter="20">
+        <el-form-item label="题目">
+          <el-input
+            v-model="queryParams.subTitle"
+            placeholder="请输入题目"
+            clearable
+            style="width: 400px"
+            @keyup.enter="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="handleQuery">搜索</el-button>
+          <el-button @click="resetQuery">重置</el-button>
+          <el-button type="primary" @click="handleAdd">新增</el-button>
+        </el-form-item>
+      </el-row>
+    </el-form>
+
+    <el-table v-loading="loading" :data="tableList" highlight-current-row>
+      <el-table-column type="index" width="55" align="center" />
+      <el-table-column label="题目" align="left" prop="subTitle" min-width="140" />
+      <el-table-column label="选项" align="left" min-width="140">
+        <template #default="{ row }">
+          <p v-if="row.optA">A:{{ row.optA }}</p>
+          <p v-if="row.optB">B:{{ row.optB }}</p>
+          <p v-if="row.optC">C:{{ row.optC }}</p>
+          <p v-if="row.optD">D:{{ row.optD }}</p>
+        </template>
+      </el-table-column>
+      <el-table-column label="答案" align="center" prop="answer" width="100" />
+      <el-table-column label="车型" align="center" prop="chexing" width="100">
+        <template #default="{ row }">
+          <span v-if="row.chexing == 'C1'">小车</span>
+          <span v-if="row.chexing == 'D'">摩托车</span>
+          <span v-if="row.chexing == 'B2'">货车</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="科目" align="center" prop="examType" width="100">
+        <template #default="{ row }">
+          <span v-if="row.examType == '1'">科一</span>
+          <span v-if="row.examType == '4'">科四</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="章节" align="center" prop="sortName" min-width="100" />
+      <el-table-column label="专项" align="center" prop="categoryTitle" width="100" />
+      <el-table-column label="图片" align="center" width="100">
+        <template #default="{ row }">
+          <!-- <img v-if="row.subPic" :src="`https://ss-cloud.ahduima.com/xjxc/pic/${row.subPic}`" width="80px"> -->
+          <el-image
+            v-if="row.subPic"
+            :src="`https://ss-cloud.ahduima.com/xjxc/pic/${row.subPic}`"
+            :preview-src-list="[`https://ss-cloud.ahduima.com/xjxc/pic/${row.subPic}`]"
+            :lazy="true"
+            style="width: 80px"
+          />
+        </template>
+      </el-table-column>
+
+      <el-table-column label="操作" align="center" width="140">
+        <template #default="scope">
+          <el-button type="primary" link @click="handleEdit(scope.row)">编辑</el-button>
+          <el-button type="primary" link @click="handleDelete(scope.row.id)">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+    <QuestionAddForm ref="dialogAddForm" @update="getList" />
+  </div>
+</template>
+
+<script setup name="XjDatabase">
+import { searchQuestion, deleteQuestion } from '@/api/xjapplet/xjdatabase'
+import QuestionAddForm from './components/QuestionAddForm.vue'
+
+const loading = ref(false)
+const total = ref(0)
+const tableList = ref([])
+const queryParams = reactive({
+  subTitle: '',
+  chexing: 'C1',
+  examType: '1',
+  isPic: undefined,
+  pageNo: 1,
+  pageSize: 100
+})
+
+function getList() {
+  loading.value = true
+  searchQuestion(queryParams).then((response) => {
+    tableList.value = response.list
+    total.value = response.total
+    loading.value = false
+  })
+}
+
+function handleQuery() {
+  getList()
+}
+
+function resetQuery() {
+  queryParams.subTitle = ''
+  handleQuery()
+}
+
+const dialogAddForm = ref(null)
+function handleEdit(item) {
+  dialogAddForm.value.open(item)
+}
+
+function handleAdd() {
+  dialogAddForm.value.open({
+    examType: queryParams.examType,
+    chexing: queryParams.chexing
+  })
+}
+
+function handleDelete(id) {
+  deleteQuestion(id).then(() => {
+    getList()
+  })
+}
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/vite.config.js b/vite.config.js
index ac78303..7331f10 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -45,6 +45,18 @@ export default ({ command, mode }) => {
           ws: false,
           changeOrigin: true,
           rewrite: (path) => path.replace(new RegExp(`^/crm-api`), '')
+        },
+        ['/applet-api']: {
+          target: env.VITE_APPLET_URL,
+          ws: false,
+          changeOrigin: true,
+          rewrite: (path) => path.replace(new RegExp(`^/applet-api`), '')
+        },
+        ['/tiku-api']: {
+          target: env.VITE_TIKU_URL,
+          ws: false,
+          changeOrigin: true,
+          rewrite: (path) => path.replace(new RegExp(`^/tiku-api`), '')
         }
       }
     },

From ce0da69b5f08254fc25da325771a5ecf10be3eb1 Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Sun, 2 Mar 2025 13:25:35 +0800
Subject: [PATCH 03/11] sc

---
 .env.base                                     |   4 +-
 src/api/xjapplet/discount.js                  |  42 +++++
 src/api/xjapplet/resell.js                    |  32 ++++
 src/api/xjapplet/vip.js                       |  43 ++++-
 src/api/xjapplet/vipdatabase.js               |  67 +++++++
 src/api/xjapplet/xjdatabase.js                |  51 +----
 src/components/Pagination/index.vue           |   2 +-
 src/config/axios/service.ts                   |   3 +-
 src/views/XjApplet/Resell/index.vue           |  41 +++-
 .../XjApplet/Vip/components/UserDiscount.vue  |  24 ++-
 .../XjApplet/Vip/components/VipDiscount.vue   | 163 +++++++++-------
 src/views/XjApplet/Vip/components/VipType.vue | 128 ++++++-------
 src/views/XjApplet/Vip/components/VipUser.vue |  74 ++++----
 .../VipData/conponents/SecretData.vue         | 123 ++++++------
 .../VipData/conponents/SimpleData.vue         |  97 +++++-----
 .../XjDatabase/Components/QuestionAddForm.vue | 178 ++++++++++--------
 src/views/XjApplet/XjDatabase/index.vue       |  96 +++++-----
 17 files changed, 709 insertions(+), 459 deletions(-)
 create mode 100644 src/api/xjapplet/discount.js
 create mode 100644 src/api/xjapplet/resell.js
 create mode 100644 src/api/xjapplet/vipdatabase.js

diff --git a/.env.base b/.env.base
index a466367..7e7deac 100644
--- a/.env.base
+++ b/.env.base
@@ -4,8 +4,8 @@ VITE_NODE_ENV=development
 VITE_DEV=true
 
 # 请求路径
-# VITE_BASE_URL='http://47.98.161.246:48080'
-VITE_BASE_URL='http://114.55.169.15:48080'
+VITE_BASE_URL='http://47.98.161.246:48080'
+# VITE_BASE_URL='http://114.55.169.15:48080'
 
 # 小程序接口请求路劲
 VITE_APPLET_URL='https://cloud.ahduima.com'
diff --git a/src/api/xjapplet/discount.js b/src/api/xjapplet/discount.js
new file mode 100644
index 0000000..6cba610
--- /dev/null
+++ b/src/api/xjapplet/discount.js
@@ -0,0 +1,42 @@
+import request from '@/config/axios'
+
+export const getVipDiscountList = async (params) => {
+  return await request.get({
+    url: '/admin-api/applet/xunjia/member/discount/list',
+    params: params
+  })
+}
+
+export const addVipDiscount = async (data) => {
+  return await request.post({
+    url: '/admin-api/applet/xunjia/member/discount/add',
+    data
+  })
+}
+
+export const updateVipDiscount = async (data) => {
+  return await request.post({
+    url: '/admin-api/applet/xunjia/member/discount/update',
+    data
+  })
+}
+
+export const deleteVipDiscount = async (id) => {
+  return await request.delete({
+    url: '/admin-api/applet/xunjia/member/discount/delete?discountId=' + id
+  })
+}
+
+export const getUserDiscountList = async (params) => {
+  return await request.get({
+    url: '/admin-api/applet/xunjia/user/discount/list',
+    params: params
+  })
+}
+
+export const giveUserDiscount = async (data) => {
+  return await request.post({
+    url: '/admin-api/applet/xunjia/user/discount/add',
+    data
+  })
+}
diff --git a/src/api/xjapplet/resell.js b/src/api/xjapplet/resell.js
new file mode 100644
index 0000000..4042167
--- /dev/null
+++ b/src/api/xjapplet/resell.js
@@ -0,0 +1,32 @@
+import request from '@/config/axios'
+
+export const getResellList = async (params) => {
+  return await request.get({
+    url: '/admin-api/applet/xunjia/distribution/list',
+    params: params
+  })
+}
+
+export const addResell = async (data) => {
+  return await request.post({
+    url: '/admin-api/applet/xunjia/distribution/add',
+    data
+  })
+}
+
+export const updateResell = async (data) => {
+  return await request.put({
+    url: '/admin-api/applet/xunjia/distribution/update',
+    data
+  })
+}
+export const deleteResell = async (id) => {
+  return await request.delete({
+    url: '/admin-api/applet/xunjia/distribution/delete?distributionId=' + id
+  })
+}
+export const getResellDetail = async (id) => {
+  return await request.get({
+    url: '/admin-api/applet/xunjia/distribution/' + id
+  })
+}
diff --git a/src/api/xjapplet/vip.js b/src/api/xjapplet/vip.js
index ee97ced..5581edd 100644
--- a/src/api/xjapplet/vip.js
+++ b/src/api/xjapplet/vip.js
@@ -2,7 +2,48 @@ import request from '@/config/axios'
 
 export const getUserMemberList = async (params) => {
   return await request.get({
-    url: 'http://xj.ahduima.com/xunjia/driver-api/tdSysUserMember/duima/user/member/list',
+    url: '/admin-api/applet/xunjia/user/member/list',
+    params: params
+  })
+}
+
+export const giveUserMember = async (data) => {
+  return await request.post({
+    url: '/admin-api/applet/xunjia/user/member/add',
+    data
+  })
+}
+
+export const getVipTypeList = async (params) => {
+  return await request.get({
+    url: '/admin-api/applet/xunjia/member/list',
+    params: params
+  })
+}
+
+export const addVipType = async (data) => {
+  return await request.post({
+    url: '/admin-api/applet/xunjia/member/add',
+    data
+  })
+}
+
+export const updateVipType = async (data) => {
+  return await request.post({
+    url: '/admin-api/applet/xunjia/member/update',
+    data
+  })
+}
+
+export const deleteVipType = async (id) => {
+  return await request.delete({
+    url: '/admin-api/applet/xunjia/member/memberId?id=' + id
+  })
+}
+
+export const getVipTypeOptions = async (params) => {
+  return await request.get({
+    url: '/admin-api/applet/xunjia/member/simple-list',
     params: params
   })
 }
diff --git a/src/api/xjapplet/vipdatabase.js b/src/api/xjapplet/vipdatabase.js
new file mode 100644
index 0000000..2eca4d0
--- /dev/null
+++ b/src/api/xjapplet/vipdatabase.js
@@ -0,0 +1,67 @@
+import request from '@/config/axios'
+
+export const addJx = async (data) => {
+  return await request.post({
+    url: '/admin-api/applet/xunjia/question/jx/add',
+    data: data
+  })
+}
+
+export const getJxQuestionList = async (params) => {
+  return await request.get({
+    url: '/admin-api/applet/xunjia/question/jx/list',
+    params: params
+  })
+}
+
+export const delJxData = async (id) => {
+  return await request.delete({
+    url: `/admin-api/applet/xunjia/question/jx/delete?id=${id}`
+  })
+}
+
+export const addMj = async (data) => {
+  return await request.post({
+    url: '/admin-api/applet/xunjia/secret/add',
+    data: data
+  })
+}
+
+export const getMjList = async (params) => {
+  return await request.get({
+    url: '/admin-api/applet/xunjia/secret/list',
+    params: params
+  })
+}
+
+export const delMj = async (secretId) => {
+  return await request.delete({
+    url: `/admin-api/applet/xunjia/secret/delete?secretId=${secretId}`
+  })
+}
+
+export const clearMj = async (secretId) => {
+  return await request.delete({
+    url: `/admin-api/applet/xunjia/secret/clear?secretId=${secretId}`
+  })
+}
+
+export const getMjQuestionList = async (params) => {
+  return await request.get({
+    url: '/admin-api/applet/xunjia/secret/question/list',
+    params: params
+  })
+}
+
+export const addMjQuestion = async (data) => {
+  return await request.post({
+    url: '/admin-api/applet/xunjia/secret/question/add',
+    data: data
+  })
+}
+
+export const delMjQuestion = async (id) => {
+  return await request.delete({
+    url: `/admin-api/applet/xunjia/secret/question/delete?id=${id}`
+  })
+}
diff --git a/src/api/xjapplet/xjdatabase.js b/src/api/xjapplet/xjdatabase.js
index 31cee6a..3cebccf 100644
--- a/src/api/xjapplet/xjdatabase.js
+++ b/src/api/xjapplet/xjdatabase.js
@@ -1,41 +1,41 @@
 import request from '@/config/axios'
 export const searchQuestion = async (param) => {
   return await request.get({
-    url: 'http://localhost/tiku-api/tiku/xunjia/question/list',
+    url: '/admin-api/applet/xunjia/question/list',
     params: param
   })
 }
 
 export const updateQuestion = async (data) => {
   return await request.put({
-    url: 'http://localhost/tiku-api/tiku/xunjia/question/update',
+    url: '/admin-api/applet/xunjia/question/update',
     data: data
   })
 }
 
 export const addQuestion = async (data) => {
   return await request.post({
-    url: 'http://localhost/tiku-api/tiku/xunjia/question/add',
+    url: '/admin-api/applet/xunjia/question/add',
     data: data
   })
 }
 
 export const deleteQuestion = async (id) => {
   return await request.delete({
-    url: 'http://localhost/tiku-api/tiku/xunjia/question/delete?id=' + id
+    url: '/admin-api/applet/xunjia/question/delete?id=' + id
   })
 }
 
 export const uploadFile = async (data) => {
   return await request.post({
-    url: 'http://localhost/tiku-api/tiku/xunjia/question/upload',
+    url: '/admin-api/applet/xunjia/question/upload',
     data: data
   })
 }
 
 export const getQuestionSort = async (param) => {
   return await request.get({
-    url: 'http://localhost/tiku-api/tiku/xunjia/question/sort/list',
+    url: '/admin-api/applet/xunjia/question/sort/list',
     params: param
   })
 }
@@ -46,42 +46,3 @@ export const getMjList = async (params) => {
     params: params
   })
 }
-
-export const addMj = async (data) => {
-  return await request.post({
-    url: 'http://localhost/tiku-api/tiku/xunjia/secret/add',
-    data: data
-  })
-}
-
-export const delMj = async (secretId) => {
-  return await request.delete({
-    url: `http://localhost/tiku-api/tiku/xunjia/secret/delete?secretId=${secretId}`
-  })
-}
-
-export const clearMj = async (secretId) => {
-  return await request.delete({
-    url: `http://localhost/tiku-api/tiku/xunjia/secret/clear?secretId=${secretId}`
-  })
-}
-
-export const getMjQuestionList = async (params) => {
-  return await request.get({
-    url: 'http://localhost/tiku-api/tiku/xunjia/secret/question/list',
-    params: params
-  })
-}
-
-export const addMjQuestion = async (data) => {
-  return await request.post({
-    url: 'http://localhost/tiku-api/tiku/xunjia/secret/question/add',
-    data: data
-  })
-}
-
-export const delMjQuestion = async (id) => {
-  return await request.delete({
-    url: `http://localhost/tiku-api/tiku/xunjia/secret/question/delete?id=${id}`
-  })
-}
diff --git a/src/components/Pagination/index.vue b/src/components/Pagination/index.vue
index cb9cb9e..31d41fc 100644
--- a/src/components/Pagination/index.vue
+++ b/src/components/Pagination/index.vue
@@ -6,7 +6,7 @@
     v-model:page-size="pageSize"
     :small="small"
     :background="true"
-    :page-sizes="[10, 20, 30, 50, 100]"
+    :page-sizes="[10, 50, 100, 500, 1000]"
     :pager-count="pagerCount"
     :total="total"
     class="float-right mt-15px mb-15px"
diff --git a/src/config/axios/service.ts b/src/config/axios/service.ts
index cb8a704..5663222 100644
--- a/src/config/axios/service.ts
+++ b/src/config/axios/service.ts
@@ -140,8 +140,7 @@ service.interceptors.response.use(
     // 二进制数据则直接返回
     if (
       response.request.responseType === 'blob' ||
-      response.request.responseType === 'arraybuffer' ||
-      !data.code
+      response.request.responseType === 'arraybuffer'
     ) {
       return response.data
     }
diff --git a/src/views/XjApplet/Resell/index.vue b/src/views/XjApplet/Resell/index.vue
index 5096ea0..89a2f88 100644
--- a/src/views/XjApplet/Resell/index.vue
+++ b/src/views/XjApplet/Resell/index.vue
@@ -12,14 +12,17 @@
         <el-button type="primary" @click="handleAdd">新增</el-button>
       </el-form-item>
     </el-form>
-    <el-table :data="tableData">
+    <el-table v-loading="loading" :data="tableData" max-height="calc(100vh - 200px)">
       <el-table-column type="index" width="50" />
       <el-table-column prop="phone" label="手机号" />
       <el-table-column prop="name" label="姓名" />
       <el-table-column prop="mark" label="标记" />
-      <el-table-column label="小程序码" align="center" width="140px">
+      <el-table-column label="小程序码" align="center" width="120px">
         <template #default="{ row }">
-          <img :src="row.qrCode" style="width: 100px; height: 100px" />
+          <img
+            :src="`https://ss-cloud.ahduima.com/xjxc/pic/${row.appletUrl}`"
+            style="width: 80px; height: 80px"
+          />
         </template>
       </el-table-column>
       <el-table-column label="操作" width="120px">
@@ -60,11 +63,13 @@
 </template>
 
 <script setup name="Resell">
+import { getResellList, addResell, updateResell } from '@/api/xjapplet/resell'
+
 const message = useMessage()
 
 const searchForm = ref({
   pageNo: 1,
-  pageSize: 10,
+  pageSize: 50,
   phone: '',
   name: ''
 })
@@ -72,6 +77,7 @@ const searchForm = ref({
 const tableData = ref([])
 const total = ref(0)
 
+const loading = ref(false)
 const showDialog = ref(false)
 
 const form = ref({
@@ -85,13 +91,22 @@ const rules = {
   name: [{ required: true, message: '请输入姓名', trigger: 'blur' }]
 }
 
+onMounted(() => {
+  searchList()
+})
+
 function searchList() {
   searchForm.value.pageNo = 1
   getList()
 }
 
 function getList() {
-  console.log(searchForm.value)
+  loading.value = true
+  getResellList(searchForm.value).then((response) => {
+    tableData.value = response.list
+    total.value = response.total
+    loading.value = false
+  })
 }
 
 function handleAdd() {
@@ -109,9 +124,19 @@ async function handleSave() {
   if (!valid) return
 
   // 调用接口
-  showDialog.value = false
-  message.success('成功')
-  searchList()
+  if (form.value.id) {
+    updateResell(form.value).then(() => {
+      message.success('修改成功')
+      showDialog.value = false
+      searchList()
+    })
+  } else {
+    addResell(form.value).then(() => {
+      message.success('新增成功')
+      showDialog.value = false
+      searchList()
+    })
+  }
 }
 </script>
 
diff --git a/src/views/XjApplet/Vip/components/UserDiscount.vue b/src/views/XjApplet/Vip/components/UserDiscount.vue
index bcdce40..dc8e04f 100644
--- a/src/views/XjApplet/Vip/components/UserDiscount.vue
+++ b/src/views/XjApplet/Vip/components/UserDiscount.vue
@@ -55,7 +55,7 @@
 </template>
 
 <script setup name="UserDiscount">
-import { getUserMemberList } from '@/api/xjapplet/vip'
+import { getUserDiscountList, giveUserDiscount } from '@/api/xjapplet/discount'
 
 const message = useMessage()
 
@@ -81,12 +81,10 @@ function searchList() {
 
 function getList() {
   loading.value = true
-  getUserMemberList(searchForm.value).then((response) => {
-    if (response.code === 200) {
-      tableList.value = response.data
-      total.value = response.total
-      loading.value = false
-    }
+  getUserDiscountList(searchForm.value).then((response) => {
+    tableList.value = response.list
+    total.value = response.total
+    loading.value = false
   })
 }
 
@@ -111,9 +109,15 @@ async function sureAdd() {
   if (!valid) return
 
   // 调用接口
-  showDialog.value = false
-  message.success('赠送成功')
-  searchList()
+  giveUserDiscount(form.value).then((response) => {
+    if (response) {
+      message.success('赠送成功')
+      showDialog.value = false
+      searchList()
+    } else {
+      message.error('赠送失败')
+    }
+  })
 }
 </script>
 
diff --git a/src/views/XjApplet/Vip/components/VipDiscount.vue b/src/views/XjApplet/Vip/components/VipDiscount.vue
index 677c493..264bee6 100644
--- a/src/views/XjApplet/Vip/components/VipDiscount.vue
+++ b/src/views/XjApplet/Vip/components/VipDiscount.vue
@@ -7,20 +7,19 @@
 
     <el-table v-loading="loading" :data="tableList">
       <el-table-column type="index" width="55" align="center" />
-      <el-table-column label="折扣描述" align="center" prop="desc" min-width="140" />
+      <el-table-column label="折扣描述" align="center" prop="description" min-width="140" />
       <el-table-column label="折扣价" align="center" prop="discount" />
       <el-table-column label="有效期" align="center" prop="duration" />
-      <el-table-column label="单位" align="center" prop="unit" />
-      <el-table-column label="状态" align="center">
+      <el-table-column label="单位" align="center">
         <template #default="{ row }">
-          <el-switch
-            v-model="row.isActive"
-            :active-value="0"
-            :inactive-value="1"
-            active-text="启用"
-            inactive-text="禁用"
-            disabled
-          />
+          <el-tag v-if="row.unit == 1">天</el-tag>
+          <el-tag v-else type="danger">年</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center">
+        <template #default="{ row }">
+          <el-button type="primary" link @click="editDiscount(row)">修改</el-button>
+          <el-button type="primary" link @click="deleteDiscount(row)">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -34,8 +33,8 @@
 
     <el-dialog title="折扣详情" v-model="showDialog" width="500px">
       <el-form :model="form" ref="formRef" :rules="rules" label-width="80px">
-        <el-form-item label="折扣类型" prop="type">
-          <el-select v-model="form.type" style="width: 100%">
+        <el-form-item label="折扣类型" prop="discountType">
+          <el-select v-model="form.discountType" style="width: 100%" :disabled="form.id">
             <el-option
               v-for="item in discountTypeOptions"
               :key="item.value"
@@ -47,7 +46,7 @@
         <el-form-item label="折扣描述">
           {{ discountDesc }}
         </el-form-item>
-        <el-form-item v-if="form.type == 1" label="科目" prop="subject">
+        <el-form-item v-if="form.discountType == 1" label="科目" prop="subject" :disabled="form.id">
           <el-select v-model="form.subject" style="width: 100%">
             <el-option
               v-for="item in subjectOptions"
@@ -58,22 +57,22 @@
           </el-select>
         </el-form-item>
         <el-form-item label="变量1" prop="param1">
-          <el-select v-model="form.param1" style="width: 100%" clearable>
+          <el-select v-model="form.param1" style="width: 100%" clearable :disabled="form.id">
             <el-option
               v-for="item in vipTypeOptions"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
+              :key="item.memberId"
+              :label="item.memberName"
+              :value="item.memberId"
             />
           </el-select>
         </el-form-item>
         <el-form-item label="变量2" prop="param2">
-          <el-select v-model="form.param2" style="width: 100%">
+          <el-select v-model="form.param2" style="width: 100%" :disabled="form.id">
             <el-option
               v-for="item in vipTypeOptions"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
+              :key="item.memberId"
+              :label="item.memberName"
+              :value="item.memberId"
             />
           </el-select>
         </el-form-item>
@@ -90,15 +89,6 @@
             }}</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="状态" prop="isActive">
-          <el-switch
-            v-model="form.isActive"
-            :active-value="0"
-            :inactive-value="1"
-            active-text="启用"
-            inactive-text="禁用"
-          />
-        </el-form-item>
       </el-form>
 
       <template #footer>
@@ -112,16 +102,30 @@
 </template>
 
 <script setup name="VipDiscount">
-import { getUserMemberList } from '@/api/xjapplet/vip'
+import {
+  getVipDiscountList,
+  addVipDiscount,
+  updateVipDiscount,
+  deleteVipDiscount
+} from '@/api/xjapplet/discount'
+
+import { getVipTypeOptions } from '@/api/xjapplet/vip'
 
 const message = useMessage()
 
 const searchForm = ref({
-  phone: '',
   pageNo: 1,
   pageSize: 50
 })
 
+onMounted(() => {
+  searchList()
+
+  getVipTypeOptions().then((response) => {
+    vipTypeOptions.value = response
+  })
+})
+
 const loading = ref(false)
 const tableList = ref([])
 const total = ref(0)
@@ -129,9 +133,9 @@ const total = ref(0)
 const discountTypeOptions = [
   {
     label: '【$科目】模考首次通过后，在拥有【$会员名1】的情况下，购买【$会员名2】，享折扣价',
-    value: 1
+    value: '1'
   },
-  { label: '之前拥有过【$会员名1】，购买【$会员名2】，享折扣价', value: 2 }
+  { label: '之前拥有过【$会员名1】，购买【$会员名2】，享折扣价', value: '2' }
 ]
 
 const subjectOptions = [
@@ -140,32 +144,35 @@ const subjectOptions = [
 ]
 
 const unitOptions = [
-  { label: '天', value: 1 },
-  { label: '年', value: 3 }
+  { label: '天', value: '1' },
+  { label: '年', value: '3' }
 ]
 
 const discountDesc = computed(() => {
-  const { type, subject, param1, param2, discount, duration, unit } = form.value
-  let baseStr = discountTypeOptions.find((item) => item.value === type).label
+  const vipTypeObj = {}
+  vipTypeOptions.value.forEach((item) => {
+    vipTypeObj[item.memberId] = item.memberName
+  })
+  const { discountType, subject, param1, param2, discount, duration, unit } = form.value
+  let baseStr = discountTypeOptions.find((item) => item.value == discountType).label
+  const vip1 = param1 ? vipTypeObj[param1] : '无需会员'
+  const vip2 = param2 ? vipTypeObj[param2] : '会员名2'
   return baseStr
-    .replace('$科目', subjectOptions.find((item) => item.value === subject).label)
-    .replace(
-      '$会员名1',
-      vipTypeOptions.value.find((item) => item.value === param1)?.label || '无需会员'
-    )
-    .replace('$会员名2', vipTypeOptions.value.find((item) => item.value === param2).label)
+    .replace('$科目', subjectOptions.find((item) => item.value == subject).label)
+    .replace('$会员名1', vip1)
+    .replace('$会员名2', vip2)
     .concat(
       `${discount || ''}，有效期${duration || 0}${
-        unitOptions.find((item) => item.value === unit).label
+        unitOptions.find((item) => item.value == unit).label
       }`
     )
 })
 
-const vipTypeOptions = ref([
-  { label: '普通会员', value: '1' },
-  { label: 'VIP会员', value: '2' }
-])
+onMounted(() => {
+  searchList()
+})
 
+const vipTypeOptions = ref([])
 function searchList() {
   searchForm.value.pageNo = 1
   getList()
@@ -173,25 +180,23 @@ function searchList() {
 
 function getList() {
   loading.value = true
-  getUserMemberList(searchForm.value).then((response) => {
-    if (response.code === 200) {
-      tableList.value = response.data
-      total.value = response.total
-      loading.value = false
-    }
+  getVipDiscountList(searchForm.value).then((response) => {
+    tableList.value = response.list
+    total.value = response.total
+    loading.value = false
   })
 }
 
 const showDialog = ref(false)
 const form = ref({
-  type: 1,
+  discountType: '1',
   subject: '1',
-  param1: '1',
-  param2: '2',
+  param1: undefined,
+  param2: undefined,
   discount: undefined,
   duration: undefined,
-  unit: 1,
-  isActive: 0
+  unit: '1',
+  description: undefined
 })
 const rules = ref({
   param2: [{ required: true, message: '请选择变量2', trigger: 'change' }],
@@ -203,16 +208,46 @@ function addDiscount() {
   showDialog.value = true
 }
 
+function editDiscount(row) {
+  form.value = {
+    ...row,
+    param1: row.param1 ? Number(row.param1) : undefined,
+    param2: row.param2 ? Number(row.param2) : undefined
+  }
+  showDialog.value = true
+}
+
+function deleteDiscount(row) {
+  message.confirm('确定删除该折扣？').then(() => {
+    deleteVipDiscount(row.id).then(() => {
+      message.success('删除成功')
+      searchList()
+    })
+  })
+}
+
 const formRef = ref(null)
 async function sureAdd() {
   if (!formRef.value) return
   const valid = await formRef.value.validate()
   if (!valid) return
 
+  form.value.description = discountDesc.value
+
   // 调用接口
-  showDialog.value = false
-  message.success('成功')
-  searchList()
+  if (form.value.id) {
+    updateVipDiscount(form.value).then(() => {
+      showDialog.value = false
+      message.success('修改成功')
+      searchList()
+    })
+  } else {
+    addVipDiscount(form.value).then(() => {
+      showDialog.value = false
+      message.success('新增成功')
+      searchList()
+    })
+  }
 }
 </script>
 
diff --git a/src/views/XjApplet/Vip/components/VipType.vue b/src/views/XjApplet/Vip/components/VipType.vue
index b912f3a..45731ea 100644
--- a/src/views/XjApplet/Vip/components/VipType.vue
+++ b/src/views/XjApplet/Vip/components/VipType.vue
@@ -2,30 +2,20 @@
   <div>
     <el-form :model="searchForm" inline>
       <el-form-item>
-        <el-input v-model="searchForm.phone" placeholder="学员手机号" />
+        <el-input v-model="searchForm.memberName" placeholder="会员名称" />
       </el-form-item>
       <el-form-item>
-        <el-select v-model="searchForm.cartype" placeholder="选择车型" clearable filterable>
+        <el-select v-model="searchForm.carTypeId" placeholder="选择车型" clearable filterable>
           <el-option label="小车" value="1001" />
           <el-option label="摩托车" value="1002" />
         </el-select>
       </el-form-item>
-      <el-form-item>
-        <el-select v-model="searchForm.vipType" placeholder="选择会员类型" clearable filterable>
-          <el-option
-            v-for="item in vipTypeOptions"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
-        </el-select>
-      </el-form-item>
       <el-form-item>
         <el-button @click="searchList">查询</el-button>
         <el-button type="primary" @click="addVip">新增会员类型</el-button>
       </el-form-item>
     </el-form>
-    <el-table v-loading="loading" :data="tableList">
+    <el-table v-loading="loading" :data="tableList" height="calc(100vh - 260px)">
       <el-table-column type="index" width="55" align="center" />
       <el-table-column label="会员名" align="center" prop="memberName" min-width="140" />
       <el-table-column label="车型" align="center" prop="carName" />
@@ -33,29 +23,17 @@
       <el-table-column label="原价" align="center" prop="price" />
       <el-table-column label="折扣价" align="center" prop="discount" />
       <el-table-column label="有效期" align="center" prop="duration" />
-      <el-table-column label="单位" align="center" prop="unit" />
-      <el-table-column label="状态" align="center">
+      <el-table-column label="单位" align="center">
         <template #default="{ row }">
-          <el-switch
-            v-model="row.isActive"
-            :active-value="0"
-            :inactive-value="1"
-            active-text="启用"
-            inactive-text="禁用"
-            disabled
-          />
+          <el-tag v-if="row.unit == 1">天</el-tag>
+          <el-tag v-else type="danger">年</el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="客服赠送" align="center">
+      <el-table-column label="使用方式" align="center" prop="typeName" />
+      <el-table-column label="操作" width="160">
         <template #default="{ row }">
-          <el-switch
-            v-model="row.canGive"
-            :active-value="0"
-            :inactive-value="1"
-            active-text="可赠送"
-            inactive-text="不可赠送"
-            disabled
-          />
+          <el-button type="primary" link @click="editVip(row)">修改</el-button>
+          <el-button type="primary" link @click="handleDelete(row.memberId)">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -72,8 +50,8 @@
         <el-form-item label="会员名称" prop="memberName">
           <el-input v-model="form.memberName" />
         </el-form-item>
-        <el-form-item label="车型" prop="cartype">
-          <el-select v-model="form.cartype" style="width: 100%">
+        <el-form-item label="车型" prop="carTypeId">
+          <el-select v-model="form.carTypeId" style="width: 100%">
             <el-option label="小车" value="1001" />
             <el-option label="摩托车" value="1002" />
           </el-select>
@@ -99,23 +77,11 @@
             <el-radio :label="3">年</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="状态" prop="isActive">
-          <el-switch
-            v-model="form.isActive"
-            :active-value="0"
-            :inactive-value="1"
-            active-text="启用"
-            inactive-text="禁用"
-          />
-        </el-form-item>
-        <el-form-item label="客服赠送" prop="canGive">
-          <el-switch
-            v-model="form.canGive"
-            :active-value="0"
-            :inactive-value="1"
-            active-text="可赠送"
-            inactive-text="不可赠送"
-          />
+        <el-form-item label="使用方式" prop="type">
+          <el-checkbox-group v-model="form.type">
+            <el-checkbox :label="1"> 用户购买 </el-checkbox>
+            <el-checkbox :label="2"> 客服赠送 </el-checkbox>
+          </el-checkbox-group>
         </el-form-item>
       </el-form>
 
@@ -130,10 +96,11 @@
 </template>
 
 <script setup name="VipType">
-import { getUserMemberList } from '@/api/xjapplet/vip'
+import { getVipTypeList, addVipType, updateVipType, deleteVipType } from '@/api/xjapplet/vip'
 const message = useMessage()
 const searchForm = ref({
-  phone: '',
+  memberName: '',
+  carTypeId: undefined,
   pageNo: 1,
   pageSize: 50
 })
@@ -142,11 +109,9 @@ const loading = ref(false)
 const tableList = ref([])
 const total = ref(0)
 
-const vipTypeOptions = ref([
-  { label: '普通会员', value: '1' },
-  { label: 'VIP会员', value: '2' }
-])
-
+onMounted(() => {
+  searchList()
+})
 function searchList() {
   searchForm.value.pageNo = 1
   getList()
@@ -154,30 +119,27 @@ function searchList() {
 
 function getList() {
   loading.value = true
-  getUserMemberList(searchForm.value).then((response) => {
-    if (response.code === 200) {
-      tableList.value = response.data
-      total.value = response.total
-      loading.value = false
-    }
+  getVipTypeList(searchForm.value).then((response) => {
+    tableList.value = response.list
+    total.value = response.total
+    loading.value = false
   })
 }
 
 const showDialog = ref(false)
 const form = ref({
   memberName: '',
-  cartype: '',
+  carTypeId: '',
   subjects: [],
   price: '',
   discount: '',
   duration: '',
   unit: 1,
-  isActive: 0,
-  canGive: 1
+  type: [1]
 })
 const rules = ref({
   memberName: [{ required: true, message: '请输入会员名称', trigger: 'blur' }],
-  cartype: [{ required: true, message: '请输入车型', trigger: 'change' }],
+  carTypeId: [{ required: true, message: '请输入车型', trigger: 'change' }],
   subjects: [{ required: true, message: '请输入科目', trigger: 'blur' }],
   price: [{ required: true, message: '请输入价格', trigger: 'blur' }],
   discount: [{ required: true, message: '请输入折扣价', trigger: 'blur' }],
@@ -188,6 +150,11 @@ function addVip() {
   showDialog.value = true
 }
 
+function editVip(row) {
+  form.value = { ...row }
+  showDialog.value = true
+}
+
 const formRef = ref(null)
 async function sureAdd() {
   if (!formRef.value) return
@@ -195,9 +162,28 @@ async function sureAdd() {
   if (!valid) return
 
   // 调用接口
-  showDialog.value = false
-  message.success('赠送成功')
-  searchList()
+  if (form.value.memberId) {
+    updateVipType(form.value).then(() => {
+      message.success('修改成功')
+      showDialog.value = false
+      searchList()
+    })
+  } else {
+    addVipType(form.value).then(() => {
+      message.success('添加成功')
+      showDialog.value = false
+      searchList()
+    })
+  }
+}
+
+function handleDelete(id) {
+  message.confirm('是否确认删除该会员？').then(() => {
+    deleteVipType(id).then(() => {
+      message.success('删除成功')
+      searchList()
+    })
+  })
 }
 </script>
 
diff --git a/src/views/XjApplet/Vip/components/VipUser.vue b/src/views/XjApplet/Vip/components/VipUser.vue
index 2966c87..82f6716 100644
--- a/src/views/XjApplet/Vip/components/VipUser.vue
+++ b/src/views/XjApplet/Vip/components/VipUser.vue
@@ -5,36 +5,36 @@
         <el-input v-model="searchForm.phone" placeholder="学员手机号" />
       </el-form-item>
       <el-form-item>
-        <el-select v-model="searchForm.cartype" placeholder="选择车型" clearable filterable>
+        <el-select v-model="searchForm.carTypeId" placeholder="选择车型" clearable filterable>
           <el-option label="小车" value="1001" />
           <el-option label="摩托车" value="1002" />
         </el-select>
       </el-form-item>
-      <el-form-item>
-        <el-select v-model="searchForm.vipType" placeholder="选择会员类型" clearable filterable>
+      <!-- <el-form-item>
+        <el-select v-model="searchForm.memberId" placeholder="选择会员类型" clearable filterable>
           <el-option
-            v-for="item in vipTypeOptions"
+            v-for="item in vipOptions"
             :key="item.value"
             :label="item.label"
             :value="item.value"
           />
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
         <el-button @click="searchList">查询</el-button>
         <el-button type="primary" @click="addVipUser">赠送会员</el-button>
       </el-form-item>
     </el-form>
-    <el-table v-loading="loading" :data="tableList">
+    <el-table v-loading="loading" :data="tableList" height="calc(100vh - 260px)">
       <el-table-column type="index" width="55" align="center" />
       <el-table-column label="手机号" align="center" prop="phone" min-width="140" />
       <el-table-column label="会员名" align="center" prop="memberName" min-width="140" />
-      <el-table-column label="车型" align="center" prop="carName" min-width="100" />
+      <el-table-column label="车型" align="center" prop="carTypeId" min-width="100" />
       <el-table-column label="科目" align="center" prop="subjects" min-width="100" />
-      <el-table-column label="开始时间" align="center" prop="startDate" min-width="100" />
-      <el-table-column label="结束时间" align="center" prop="endDate" min-width="100" />
+      <el-table-column label="开始时间" align="center" prop="startDate" min-width="120" />
+      <el-table-column label="结束时间" align="center" prop="endDate" min-width="120" />
       <el-table-column label="操作人" align="center" prop="" min-width="100" />
-      <el-table-column label="操作时间" align="center" prop="" min-width="100" />
+      <el-table-column label="操作时间" align="center" prop="" min-width="120" />
     </el-table>
     <pagination
       v-show="total > 0"
@@ -49,13 +49,13 @@
         <el-form-item label="手机号" prop="phone">
           <el-input v-model="form.phone" maxlength="11" />
         </el-form-item>
-        <el-form-item label="会员类型" prop="vipType">
-          <el-select v-model="form.vipType" clearable filterable style="width: 100%">
+        <el-form-item label="会员类型" prop="memberId">
+          <el-select v-model="form.memberId" clearable filterable style="width: 100%">
             <el-option
-              v-for="item in vipTypeOptions"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
+              v-for="item in vipOptions"
+              :key="item.memberId"
+              :label="item.memberName"
+              :value="item.memberId"
             />
           </el-select>
         </el-form-item>
@@ -72,9 +72,11 @@
 </template>
 
 <script setup name="VipUser">
-import { getUserMemberList } from '@/api/xjapplet/vip'
+import { getUserMemberList, giveUserMember, getVipTypeOptions } from '@/api/xjapplet/vip'
 const message = useMessage()
 const searchForm = ref({
+  carTypeId: undefined,
+  memberId: undefined,
   phone: '',
   pageNo: 1,
   pageSize: 50
@@ -84,10 +86,15 @@ const loading = ref(false)
 const tableList = ref([])
 const total = ref(0)
 
-const vipTypeOptions = ref([
-  { label: '普通会员', value: '1' },
-  { label: 'VIP会员', value: '2' }
-])
+const vipOptions = ref([])
+
+onMounted(() => {
+  getList()
+
+  getVipTypeOptions().then((response) => {
+    vipOptions.value = response
+  })
+})
 
 function searchList() {
   searchForm.value.pageNo = 1
@@ -97,22 +104,20 @@ function searchList() {
 function getList() {
   loading.value = true
   getUserMemberList(searchForm.value).then((response) => {
-    if (response.code === 200) {
-      tableList.value = response.data
-      total.value = response.total
-      loading.value = false
-    }
+    tableList.value = response.list
+    total.value = response.total
+    loading.value = false
   })
 }
 
 const showDialog = ref(false)
 const form = ref({
   phone: '',
-  vipType: ''
+  memberId: ''
 })
 const rules = ref({
   phone: [{ required: true, message: '请输入用户手机号', trigger: 'blur' }],
-  vipType: [{ required: true, message: '请选择会员类型', trigger: 'change' }]
+  memberId: [{ required: true, message: '请选择会员类型', trigger: 'change' }]
 })
 
 function addVipUser() {
@@ -125,10 +130,15 @@ async function sureAdd() {
   const valid = await formRef.value.validate()
   if (!valid) return
 
-  // 调用接口
-  showDialog.value = false
-  message.success('赠送成功')
-  searchList()
+  giveUserMember(form.value).then((response) => {
+    if (response) {
+      message.success('赠送成功')
+      showDialog.value = false
+      searchList()
+    } else {
+      message.error('赠送失败')
+    }
+  })
 }
 </script>
 
diff --git a/src/views/XjApplet/VipData/conponents/SecretData.vue b/src/views/XjApplet/VipData/conponents/SecretData.vue
index cc2abe8..64822f8 100644
--- a/src/views/XjApplet/VipData/conponents/SecretData.vue
+++ b/src/views/XjApplet/VipData/conponents/SecretData.vue
@@ -1,29 +1,26 @@
 <template>
   <div>
-    <div>
-      <el-form size="small" inline label-width="68px" @submit.prevent>
-        <el-row :gutter="20">
-          <el-form-item label="车型">
-            <el-radio-group v-model="queryParams.chexing" @change="searchMj">
-              <el-radio label="C1">小车</el-radio>
-              <el-radio label="D">摩托车</el-radio>
-              <!-- <el-radio label="B2">货车</el-radio> -->
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item label="科目">
-            <el-radio-group v-model="queryParams.examType" @change="searchMj">
-              <el-radio label="1">科一</el-radio>
-              <el-radio label="4">科四</el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-row>
-      </el-form>
-    </div>
+    <el-form inline label-width="68px" @submit.prevent>
+      <el-row :gutter="20">
+        <el-form-item label="车型" @change="searchMj">
+          <el-radio-group v-model="queryParams.carTypeId">
+            <el-radio label="1001">小车</el-radio>
+            <el-radio label="1002">摩托车</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="科目">
+          <el-radio-group v-model="queryParams.subject" @change="searchMj">
+            <el-radio label="1">科一</el-radio>
+            <el-radio label="4">科四</el-radio>
+          </el-radio-group>
+        </el-form-item>
+      </el-row>
+    </el-form>
     <div style="display: flex; padding: 10px; border: 1px solid #eee; height: calc(100vh - 80px)">
       <div style="width: 350px; border-right: 1px solid #eee">
         <div style="display: flex; justify-content: space-between; padding-right: 20px">
           <div style="font-size: 18px; font-weight: bold">密卷</div>
-          <el-button type="text" @click="addMjItem">新增</el-button>
+          <el-button type="primary" link @click="addMjItem">新增</el-button>
         </div>
         <el-radio-group
           v-model="mjIndex"
@@ -33,8 +30,8 @@
           <el-radio v-for="(item, index) in mjList" :key="index" :label="index" class="flex-radio">
             <div style="flex: 1; width: 100px">{{ getMjTitle(index) }}</div>
             <div style="padding-right: 15px">
-              <el-button type="text" @click="removeMj(item)">删除</el-button>
-              <el-button type="text" @click="clearMjDetail(item)">清空</el-button>
+              <el-button type="primary" link @click="removeMj(item)">删除</el-button>
+              <el-button type="primary" link @click="clearMjDetail(item)">清空</el-button>
             </div>
           </el-radio>
         </el-radio-group>
@@ -52,68 +49,75 @@
         </div>
         <el-table v-loading="loading" :data="tableList" style="margin-top: 20px">
           <el-table-column type="index" width="55" align="center" />
-          <el-table-column label="题目" align="left" prop="subTitle" min-width="140" />
+          <el-table-column label="题目" align="left" prop="question" min-width="140" />
           <el-table-column label="选项" align="left" min-width="140">
             <template #default="{ row }">
-              <p v-if="row.optA">A:{{ row.optA }}</p>
-              <p v-if="row.optB">B:{{ row.optB }}</p>
-              <p v-if="row.optC">C:{{ row.optC }}</p>
-              <p v-if="row.optD">D:{{ row.optD }}</p>
+              <p v-if="row.chooseA">A:{{ row.chooseA }}</p>
+              <p v-if="row.chooseB">B:{{ row.chooseB }}</p>
+              <p v-if="row.chooseC">C:{{ row.chooseC }}</p>
+              <p v-if="row.chooseD">D:{{ row.chooseD }}</p>
             </template>
           </el-table-column>
-          <el-table-column label="答案" align="center" prop="answer" width="100" />
-          <el-table-column label="章节" align="center" prop="sortName" min-width="100" />
-          <el-table-column label="专项" align="center" prop="categoryTitle" width="100" />
+          <el-table-column label="答案" align="center" prop="trueAnswer" width="100" />
+          <el-table-column label="科目" align="center" prop="subject" width="100">
+            <template #default="{ row }">
+              <span v-if="row.subject == '1'">科一</span>
+              <span v-if="row.subject == '4'">科四</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="章节" align="center" prop="chapterName" min-width="100" />
           <el-table-column label="图片" align="center" width="100">
             <template #default="{ row }">
-              <img
-                v-if="row.subPic"
-                :src="`https://ss-cloud.ahduima.com/xjxc/pic/${row.subPic}`"
-                width="80px"
+              <el-image
+                v-if="row.imageUrl"
+                :src="`https://ss-cloud.ahduima.com/xjxc/pic/${row.imageUrl}`"
+                :preview-src-list="[`https://ss-cloud.ahduima.com/xjxc/pic/${row.imageUrl}`]"
+                :lazy="true"
+                style="width: 80px"
               />
             </template>
           </el-table-column>
 
           <el-table-column label="操作" align="center" width="100px">
             <template #default="{ row }">
-              <el-button size="mini" type="text" @click="takeoutMj(row)">移出密卷</el-button>
+              <el-button type="primary" link @click="takeoutMj(row)">移出密卷</el-button>
             </template>
           </el-table-column>
         </el-table>
       </div>
     </div>
 
-    <el-dialog v-model:visible="showDialog" title="新增试题" width="80%">
+    <el-dialog v-model="showDialog" title="新增试题" width="80%">
       <div style="display: flex; align-items: center; margin-bottom: 20px">
         <el-input v-model="quesName" placeholder="请输入题目" clearable @keyup.enter="searchQues" />
         <el-button style="margin-left: 20px" type="primary" @click="searchQues">搜索</el-button>
       </div>
       <el-table :data="quesLit" highlight-current-row height="calc(100vh - 260px)">
-        <el-table-column label="题目" align="left" prop="subTitle" min-width="140" />
+        <el-table-column label="题目" align="left" prop="question" min-width="140" />
         <el-table-column label="选项" align="left" min-width="140">
           <template #default="{ row }">
-            <p v-if="row.optA">A:{{ row.optA }}</p>
-            <p v-if="row.optB">B:{{ row.optB }}</p>
-            <p v-if="row.optC">C:{{ row.optC }}</p>
-            <p v-if="row.optD">D:{{ row.optD }}</p>
+            <p v-if="row.chooseA">A:{{ row.chooseA }}</p>
+            <p v-if="row.chooseB">B:{{ row.chooseB }}</p>
+            <p v-if="row.chooseC">C:{{ row.chooseC }}</p>
+            <p v-if="row.chooseD">D:{{ row.chooseD }}</p>
           </template>
         </el-table-column>
-        <el-table-column label="答案" align="center" prop="answer" width="100" />
-        <el-table-column label="章节" align="center" prop="sortName" width="180" />
-        <el-table-column label="专项" align="center" prop="categoryTitle" width="100" />
+        <el-table-column label="答案" align="center" prop="trueAnswer" width="100" />
+        <el-table-column label="章节" align="center" prop="chapterName" min-width="100" />
         <el-table-column label="图片" align="center" width="100">
           <template #default="{ row }">
             <el-image
-              v-if="row.subPic"
-              :src="`https://ss-cloud.ahduima.com/xjxc/pic/${row.subPic}`"
-              :preview-src-list="[`https://ss-cloud.ahduima.com/xjxc/pic/${row.subPic}`]"
+              v-if="row.imageUrl"
+              :src="`https://ss-cloud.ahduima.com/xjxc/pic/${row.imageUrl}`"
+              :preview-src-list="[`https://ss-cloud.ahduima.com/xjxc/pic/${row.imageUrl}`]"
+              :lazy="true"
               style="width: 80px"
             />
           </template>
         </el-table-column>
         <el-table-column label="操作" width="100px">
           <template #default="{ row }">
-            <el-button type="text" @click="sureAddQues(row)">加入密卷</el-button>
+            <el-button type="primary" link @click="sureAddQues(row)">加入密卷</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -129,15 +133,14 @@ import {
   clearMj,
   getMjQuestionList,
   addMjQuestion,
-  delMjQuestion,
-  searchQuestion
-} from '@/api/xjapplet/xjdatabase'
-
+  delMjQuestion
+} from '@/api/xjapplet/vipdatabase.js'
+import { searchQuestion } from '@/api/xjapplet/xjdatabase.js'
 const message = useMessage() // 消息弹窗
 
 const queryParams = ref({
-  chexing: 'C1',
-  examType: '1'
+  carTypeId: '1001',
+  subject: '1'
 })
 const mjIndex = ref(0)
 const mjList = ref([])
@@ -163,14 +166,14 @@ function addMjItem() {
 }
 function getMjTitle(idx) {
   const cjObj = {
-    C1: '小车',
-    D: '摩托车'
+    1001: '小车',
+    1002: '摩托车'
   }
   const kmObj = {
     1: '科一',
     4: '科四'
   }
-  return `${cjObj[queryParams.value.chexing]}${kmObj[queryParams.value.examType]}考前密卷 第${
+  return `${cjObj[queryParams.value.carTypeId]}${kmObj[queryParams.value.subject]}考前密卷 第${
     idx + 1
   }套`
 }
@@ -215,9 +218,9 @@ function searchQues() {
     ...queryParams.value,
     pageNo: 1,
     pageSize: 1000,
-    subTitle: quesName.value
+    question: quesName.value
   }).then((response) => {
-    quesLit.value = response
+    quesLit.value = response.list
   })
 }
 function takeoutMj(row) {
@@ -236,7 +239,7 @@ function getQuestionList() {
   getMjQuestionList({
     secretId: mjList.value[mjIndex.value].secretId
   }).then((resp) => {
-    tableList.value = resp?.sort((pre, cur) => pre.id - cur.id) || []
+    tableList.value = resp
   })
 }
 function sureAddQues(row) {
diff --git a/src/views/XjApplet/VipData/conponents/SimpleData.vue b/src/views/XjApplet/VipData/conponents/SimpleData.vue
index 4bcdda3..9da8811 100644
--- a/src/views/XjApplet/VipData/conponents/SimpleData.vue
+++ b/src/views/XjApplet/VipData/conponents/SimpleData.vue
@@ -3,14 +3,14 @@
     <el-form inline label-width="68px" @submit.prevent>
       <el-row :gutter="20">
         <el-form-item label="车型">
-          <el-radio-group v-model="queryParams.chexing">
-            <el-radio label="C1">小车</el-radio>
-            <el-radio label="D">摩托车</el-radio>
+          <el-radio-group v-model="queryParams.carTypeId">
+            <el-radio label="1001">小车</el-radio>
+            <el-radio label="1002">摩托车</el-radio>
             <!-- <el-radio label="B2">货车</el-radio> -->
           </el-radio-group>
         </el-form-item>
         <el-form-item label="科目">
-          <el-radio-group v-model="queryParams.examType">
+          <el-radio-group v-model="queryParams.subject">
             <el-radio label="1">科一</el-radio>
             <el-radio label="4">科四</el-radio>
           </el-radio-group>
@@ -24,32 +24,39 @@
                 getQuestionList()
               }
             "
-            >查询</el-button
           >
+            查询
+          </el-button>
           <el-button type="primary" @click="addMjDetail">新增精选试题</el-button>
         </el-form-item>
       </el-row>
     </el-form>
-    <el-table v-loading="loading" :data="tableList">
+    <el-table v-loading="loading" :data="tableList" height="calc(100vh - 250px)">
       <el-table-column type="index" width="55" align="center" />
-      <el-table-column label="题目" align="left" prop="subTitle" min-width="140" />
+      <el-table-column label="题目" align="left" prop="question" min-width="140" />
       <el-table-column label="选项" align="left" min-width="140">
         <template #default="{ row }">
-          <p v-if="row.optA">A:{{ row.optA }}</p>
-          <p v-if="row.optB">B:{{ row.optB }}</p>
-          <p v-if="row.optC">C:{{ row.optC }}</p>
-          <p v-if="row.optD">D:{{ row.optD }}</p>
+          <p v-if="row.chooseA">A:{{ row.chooseA }}</p>
+          <p v-if="row.chooseB">B:{{ row.chooseB }}</p>
+          <p v-if="row.chooseC">C:{{ row.chooseC }}</p>
+          <p v-if="row.chooseD">D:{{ row.chooseD }}</p>
+        </template>
+      </el-table-column>
+      <el-table-column label="答案" align="center" prop="trueAnswer" width="100" />
+      <el-table-column label="科目" align="center" prop="subject" width="100">
+        <template #default="{ row }">
+          <span v-if="row.subject == '1'">科一</span>
+          <span v-if="row.subject == '4'">科四</span>
         </template>
       </el-table-column>
-      <el-table-column label="答案" align="center" prop="answer" width="100" />
-      <el-table-column label="章节" align="center" prop="sortName" min-width="100" />
-      <el-table-column label="专项" align="center" prop="categoryTitle" width="100" />
       <el-table-column label="图片" align="center" width="100">
         <template #default="{ row }">
-          <img
-            v-if="row.subPic"
-            :src="`https://ss-cloud.ahduima.com/xjxc/pic/${row.subPic}`"
-            width="80px"
+          <el-image
+            v-if="row.imageUrl"
+            :src="`https://ss-cloud.ahduima.com/xjxc/pic/${row.imageUrl}`"
+            :preview-src-list="[`https://ss-cloud.ahduima.com/xjxc/pic/${row.imageUrl}`]"
+            :lazy="true"
+            style="width: 80px"
           />
         </template>
       </el-table-column>
@@ -73,24 +80,24 @@
         <el-button style="margin-left: 20px" type="primary" @click="searchQues">搜索</el-button>
       </div>
       <el-table :data="quesLit" highlight-current-row height="calc(100vh - 260px)">
-        <el-table-column label="题目" align="left" prop="subTitle" min-width="140" />
+        <el-table-column label="题目" align="left" prop="question" min-width="140" />
         <el-table-column label="选项" align="left" min-width="140">
           <template #default="{ row }">
-            <p v-if="row.optA">A:{{ row.optA }}</p>
-            <p v-if="row.optB">B:{{ row.optB }}</p>
-            <p v-if="row.optC">C:{{ row.optC }}</p>
-            <p v-if="row.optD">D:{{ row.optD }}</p>
+            <p v-if="row.chooseA">A:{{ row.chooseA }}</p>
+            <p v-if="row.chooseB">B:{{ row.chooseB }}</p>
+            <p v-if="row.chooseC">C:{{ row.chooseC }}</p>
+            <p v-if="row.chooseD">D:{{ row.chooseD }}</p>
           </template>
         </el-table-column>
-        <el-table-column label="答案" align="center" prop="answer" width="100" />
-        <el-table-column label="章节" align="center" prop="sortName" width="180" />
-        <el-table-column label="专项" align="center" prop="categoryTitle" width="100" />
+        <el-table-column label="答案" align="center" prop="trueAnswer" width="100" />
+        <el-table-column label="章节" align="center" prop="chapterName" min-width="100" />
         <el-table-column label="图片" align="center" width="100">
           <template #default="{ row }">
             <el-image
-              v-if="row.subPic"
-              :src="`https://ss-cloud.ahduima.com/xjxc/pic/${row.subPic}`"
-              :preview-src-list="[`https://ss-cloud.ahduima.com/xjxc/pic/${row.subPic}`]"
+              v-if="row.imageUrl"
+              :src="`https://ss-cloud.ahduima.com/xjxc/pic/${row.imageUrl}`"
+              :preview-src-list="[`https://ss-cloud.ahduima.com/xjxc/pic/${row.imageUrl}`]"
+              :lazy="true"
               style="width: 80px"
             />
           </template>
@@ -106,20 +113,16 @@
 </template>
 
 <script setup name="SimpleData">
-import {
-  getMjQuestionList,
-  addMjQuestion,
-  delMjQuestion,
-  searchQuestion
-} from '@/api/xjapplet/xjdatabase'
+import { getJxQuestionList, addJx, delJxData } from '@/api/xjapplet/vipdatabase.js'
+import { searchQuestion } from '@/api/xjapplet/xjdatabase.js'
 
 const message = useMessage() // 消息弹窗
 
 const queryParams = ref({
-  chexing: 'C1',
-  examType: '1',
+  carTypeId: '1001',
+  subject: '1',
   pageNo: 1,
-  pageSize: 10
+  pageSize: 100
 })
 
 const total = ref(0)
@@ -130,6 +133,9 @@ const showDialog = ref(false)
 const quesName = ref('')
 const quesLit = ref([])
 
+onMounted(() => {
+  getQuestionList()
+})
 function addMjDetail() {
   showDialog.value = true
 }
@@ -138,7 +144,7 @@ function searchQues() {
     ...queryParams.value,
     pageNo: 1,
     pageSize: 1000,
-    subTitle: quesName.value
+    question: quesName.value
   }).then((response) => {
     quesLit.value = response.list
   })
@@ -147,7 +153,7 @@ function takeoutMj(row) {
   message
     .confirm('是否确认将该题移出精选？')
     .then(function () {
-      return delMjQuestion(row.id)
+      return delJxData(row.id)
     })
     .then(() => {
       getQuestionList()
@@ -156,13 +162,16 @@ function takeoutMj(row) {
     .catch(() => {})
 }
 function getQuestionList() {
-  getMjQuestionList().then((resp) => {
-    tableList.value = resp?.sort((pre, cur) => pre.id - cur.id) || []
+  getJxQuestionList(queryParams.value).then((resp) => {
+    tableList.value = resp.list
+    total.value = resp.total
   })
 }
 function sureAddQues(row) {
-  addMjQuestion({
-    subId: row.subId
+  addJx({
+    questionId: row.questionId,
+    carTypeId: queryParams.value.carTypeId,
+    subject: queryParams.value.subject
   })
     .then((resp) => {
       if (resp) {
diff --git a/src/views/XjApplet/XjDatabase/Components/QuestionAddForm.vue b/src/views/XjApplet/XjDatabase/Components/QuestionAddForm.vue
index 8735fc6..d038ada 100644
--- a/src/views/XjApplet/XjDatabase/Components/QuestionAddForm.vue
+++ b/src/views/XjApplet/XjDatabase/Components/QuestionAddForm.vue
@@ -17,9 +17,9 @@
       >
         <el-row>
           <el-col :span="24">
-            <el-form-item label="题目" prop="subTitle">
+            <el-form-item label="题目" prop="question">
               <el-input
-                v-model="dialogForm.subTitle"
+                v-model="dialogForm.question"
                 maxlength="200"
                 placeholder="请输入题目"
                 clearable
@@ -51,13 +51,13 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="章节" prop="sortId">
-              <el-select v-model="dialogForm.sortId" style="width: 100%">
+            <el-form-item label="章节" prop="chapter">
+              <el-select v-model="dialogForm.chapter" style="width: 100%">
                 <el-option
-                  v-for="dict in sortOptions"
-                  :key="dict.sortId"
-                  :label="dict.sortName"
-                  :value="dict.sortId"
+                  v-for="dict in chapterOptions"
+                  :key="dict.chapterId"
+                  :label="dict.chapterName"
+                  :value="dict.chapterId"
                 />
               </el-select>
             </el-form-item>
@@ -66,8 +66,8 @@
 
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="题型" prop="subType">
-              <el-radio-group v-model="dialogForm.subType">
+            <el-form-item label="题型" prop="type">
+              <el-radio-group v-model="dialogForm.type">
                 <el-radio label="1">判断题</el-radio>
                 <el-radio label="2">单选题</el-radio>
                 <el-radio label="3">多选题</el-radio>
@@ -76,40 +76,65 @@
           </el-col>
 
           <el-col :span="12">
-            <el-form-item label="排序" prop="sort">
-              <el-input v-model="dialogForm.sort" maxlength="20" placeholder="请输入" clearable />
+            <el-form-item label="排序" prop="showOrder">
+              <el-input
+                v-model="dialogForm.showOrder"
+                maxlength="20"
+                placeholder="请输入"
+                clearable
+              />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="选项A" prop="subTitle">
-              <el-input v-model="dialogForm.optA" maxlength="200" placeholder="请输入" clearable />
+            <el-form-item label="选项A" prop="chooseA">
+              <el-input
+                v-model="dialogForm.chooseA"
+                maxlength="200"
+                placeholder="请输入"
+                clearable
+              />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="选项B" prop="subTitle">
-              <el-input v-model="dialogForm.optB" maxlength="200" placeholder="请输入" clearable />
+            <el-form-item label="选项B" prop="chooseB">
+              <el-input
+                v-model="dialogForm.chooseB"
+                maxlength="200"
+                placeholder="请输入"
+                clearable
+              />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="选项C" prop="subTitle">
-              <el-input v-model="dialogForm.optC" maxlength="200" placeholder="请输入" clearable />
+            <el-form-item label="选项C" prop="chooseC">
+              <el-input
+                v-model="dialogForm.chooseC"
+                maxlength="200"
+                placeholder="请输入"
+                clearable
+              />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="选项D" prop="subTitle">
-              <el-input v-model="dialogForm.optD" maxlength="200" placeholder="请输入" clearable />
+            <el-form-item label="选项D" prop="chooseD">
+              <el-input
+                v-model="dialogForm.chooseD"
+                maxlength="200"
+                placeholder="请输入"
+                clearable
+              />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="24">
-            <el-form-item label="答案" prop="answer">
+            <el-form-item label="答案" prop="trueAnswer">
               <el-input
-                v-model="dialogForm.answer"
+                v-model="dialogForm.trueAnswer"
                 maxlength="200"
                 placeholder="请输入"
                 clearable
@@ -119,9 +144,9 @@
         </el-row>
         <el-row>
           <el-col :span="24">
-            <el-form-item label="难点分析" prop="infos">
+            <el-form-item label="难点分析" prop="bestAnswer">
               <el-input
-                v-model="dialogForm.infos"
+                v-model="dialogForm.bestAnswer"
                 maxlength="1000"
                 placeholder="请输入"
                 clearable
@@ -131,17 +156,22 @@
         </el-row>
         <el-row>
           <el-col :span="24">
-            <el-form-item label="答题技巧" prop="dtjq">
-              <el-input v-model="dialogForm.dtjq" maxlength="1000" placeholder="请输入" clearable />
+            <el-form-item label="答题技巧" prop="skillInfo">
+              <el-input
+                v-model="dialogForm.skillInfo"
+                maxlength="1000"
+                placeholder="请输入"
+                clearable
+              />
             </el-form-item>
           </el-col>
         </el-row>
 
         <el-row>
           <el-col :span="24">
-            <el-form-item label="技巧关键字" prop="jqWords">
+            <el-form-item label="技巧关键字" prop="skillWords">
               <el-input
-                v-model="dialogForm.jqWords"
+                v-model="dialogForm.skillWords"
                 maxlength="1000"
                 placeholder="请输入"
                 clearable
@@ -151,18 +181,17 @@
         </el-row>
         <el-row>
           <el-col :span="24">
-            <el-form-item label="车型" prop="chexing">
-              <span v-if="dialogForm.chexing == 'C1'">小车</span>
-              <span v-if="dialogForm.chexing == 'D'">摩托车</span>
-              <span v-if="dialogForm.chexing == 'B2'">货车</span>
+            <el-form-item label="车型" prop="carTypeId">
+              <span v-if="dialogForm.carTypeId == '1001'">小车</span>
+              <span v-if="dialogForm.carTypeId == '1002'">摩托车</span>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="24">
-            <el-form-item label="科目" prop="examType">
-              <span v-if="dialogForm.examType == '1'">科一</span>
-              <span v-if="dialogForm.examType == '4'">科四</span>
+            <el-form-item label="科目" prop="subject">
+              <span v-if="dialogForm.subject == '1'">科一</span>
+              <span v-if="dialogForm.subject == '4'">科四</span>
             </el-form-item>
           </el-col>
         </el-row>
@@ -195,7 +224,7 @@
 </template>
 
 <script setup name="QuesAddForm">
-import { addQuestion, updateQuestion, uploadFile, getQuestionSort } from '@/api/xjapplet/xjdatabase'
+import { addQuestion, updateQuestion, uploadFile } from '@/api/xjapplet/xjdatabase'
 
 const message = useMessage() // 消息弹窗
 
@@ -204,22 +233,22 @@ const emit = defineEmits(['update'])
 const visible = ref(false)
 const canSubmit = ref(true)
 const imgUrl = ref(undefined)
-const sortOptions = ref([])
+const chapterOptions = ref([])
 const dialogForm = ref({
   id: undefined,
-  sort: 0,
+  showOrder: 0,
   categoryTitle: undefined,
-  subTitle: undefined,
-  infos: undefined,
-  optA: undefined,
-  optB: undefined,
-  optC: undefined,
-  optD: undefined,
-  subPic: undefined,
-  subType: undefined,
-  answer: undefined,
-  examType: undefined,
-  dtjqPic: undefined
+  question: undefined,
+  bestAnswer: undefined,
+  chooseA: undefined,
+  chooseB: undefined,
+  chooseC: undefined,
+  chooseD: undefined,
+  imageUrl: undefined,
+  type: undefined,
+  trueAnswer: undefined,
+  carTypeId: undefined,
+  skillInfoPic: undefined
 })
 
 const dataRule = {
@@ -227,14 +256,14 @@ const dataRule = {
   status: [{ required: true, message: '状态不能为空', trigger: 'blur' }]
 }
 
-const open = (info = undefined) => {
+const open = (info = undefined, opts) => {
   visible.value = true
-  getQuestionChapter(info)
+  chapterOptions.value = opts
   resetDialogForm()
   if (info) {
-    dialogForm.value = { ...info }
-    if (dialogForm.value.subPic) {
-      imgUrl.value = 'https://ss-cloud.ahduima.com/xjxc/pic/' + dialogForm.value.subPic
+    dialogForm.value = { ...info, chapter: parseInt(info.chapter) }
+    if (dialogForm.value.imageUrl) {
+      imgUrl.value = 'https://ss-cloud.ahduima.com/xjxc/pic/' + dialogForm.value.imageUrl
     }
   }
 }
@@ -243,36 +272,31 @@ defineExpose({
   open
 })
 
-const getQuestionChapter = (info) => {
-  getQuestionSort({ chexing: info.chexing, examType: info.examType }).then((data) => {
-    sortOptions.value = data
-  })
-}
 const resetDialogForm = () => {
   dialogForm.value = {
     id: undefined,
-    sort: 0,
-    subTitle: undefined,
-    infos: undefined,
-    optA: undefined,
-    optB: undefined,
-    optC: undefined,
-    optD: undefined,
-    subPic: undefined,
-    subType: undefined,
-    answer: undefined,
-    examType: undefined,
-    dtjqPic: undefined,
-    dtjq: undefined,
+    showOrder: 0,
+    question: undefined,
+    bestAnswer: undefined,
+    chooseA: undefined,
+    chooseB: undefined,
+    chooseC: undefined,
+    chooseD: undefined,
+    imageUrl: undefined,
+    type: undefined,
+    trueAnswer: undefined,
+    carTypeId: undefined,
+    skillInfoPic: undefined,
+    skillInfo: undefined,
     jqtp: undefined,
     biaoji: undefined,
     titleWords: undefined,
-    jqWords: undefined,
+    skillWords: undefined,
     optaWords: undefined,
     optbWords: undefined,
     optcWords: undefined,
     optdWords: undefined,
-    chexing: undefined
+    carTypeId: undefined
   }
 }
 const dialogFormRef = ref(null)
@@ -282,7 +306,7 @@ const dialogFormSubmit = async () => {
   const valid = await dialogFormRef.value.validate()
   if (!valid) return
 
-  if (dialogForm.value.id) {
+  if (dialogForm.value.questionId) {
     updateQuestion(dialogForm.value).then((response) => {
       if (response) {
         message.success('修改成功')
@@ -306,8 +330,8 @@ const handleImport = (opt) => {
   uploadFile(data).then((resp) => {
     if (resp.code == 200) {
       message.success('文件上传成功')
-      dialogForm.value.subPic = resp.data
-      imgUrl.value = 'https://ss-cloud.ahduima.com/xjxc/pic/' + dialogForm.value.subPic
+      dialogForm.value.imageUrl = resp.data
+      imgUrl.value = 'https://ss-cloud.ahduima.com/xjxc/pic/' + dialogForm.value.imageUrl
     }
   })
 }
diff --git a/src/views/XjApplet/XjDatabase/index.vue b/src/views/XjApplet/XjDatabase/index.vue
index 54424f2..89ffc59 100644
--- a/src/views/XjApplet/XjDatabase/index.vue
+++ b/src/views/XjApplet/XjDatabase/index.vue
@@ -1,16 +1,15 @@
 <template>
   <div class="app-container" style="text-align: center">
-    <el-form size="small" :inline="true" label-width="68px" @submit.prevent>
+    <el-form :inline="true" label-width="68px" @submit.prevent>
       <el-row :gutter="20">
         <el-form-item label="车型">
-          <el-radio-group v-model="queryParams.chexing">
-            <el-radio label="C1">小车</el-radio>
-            <el-radio label="D">摩托车</el-radio>
-            <el-radio label="B2">货车</el-radio>
+          <el-radio-group v-model="queryParams.carTypeId" @change="getQuestionChapter">
+            <el-radio label="1001">小车</el-radio>
+            <el-radio label="1002">摩托车</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="科目">
-          <el-radio-group v-model="queryParams.examType">
+          <el-radio-group v-model="queryParams.subject" @change="getQuestionChapter">
             <el-radio label="1">科一</el-radio>
             <el-radio label="4">科四</el-radio>
           </el-radio-group>
@@ -26,7 +25,7 @@
       <el-row :gutter="20">
         <el-form-item label="题目">
           <el-input
-            v-model="queryParams.subTitle"
+            v-model="queryParams.question"
             placeholder="请输入题目"
             clearable
             style="width: 400px"
@@ -41,40 +40,36 @@
       </el-row>
     </el-form>
 
-    <el-table v-loading="loading" :data="tableList" highlight-current-row>
+    <el-table
+      v-loading="loading"
+      :data="tableList"
+      highlight-current-row
+      max-height="calc(100vh - 260px)"
+    >
       <el-table-column type="index" width="55" align="center" />
-      <el-table-column label="题目" align="left" prop="subTitle" min-width="140" />
+      <el-table-column label="题目" align="left" prop="question" min-width="140" />
       <el-table-column label="选项" align="left" min-width="140">
         <template #default="{ row }">
-          <p v-if="row.optA">A:{{ row.optA }}</p>
-          <p v-if="row.optB">B:{{ row.optB }}</p>
-          <p v-if="row.optC">C:{{ row.optC }}</p>
-          <p v-if="row.optD">D:{{ row.optD }}</p>
+          <p v-if="row.chooseA">A:{{ row.chooseA }}</p>
+          <p v-if="row.chooseB">B:{{ row.chooseB }}</p>
+          <p v-if="row.chooseC">C:{{ row.chooseC }}</p>
+          <p v-if="row.chooseD">D:{{ row.chooseD }}</p>
         </template>
       </el-table-column>
-      <el-table-column label="答案" align="center" prop="answer" width="100" />
-      <el-table-column label="车型" align="center" prop="chexing" width="100">
+      <el-table-column label="答案" align="center" prop="trueAnswer" width="100" />
+      <el-table-column label="科目" align="center" prop="subject" width="100">
         <template #default="{ row }">
-          <span v-if="row.chexing == 'C1'">小车</span>
-          <span v-if="row.chexing == 'D'">摩托车</span>
-          <span v-if="row.chexing == 'B2'">货车</span>
+          <span v-if="row.subject == '1'">科一</span>
+          <span v-if="row.subject == '4'">科四</span>
         </template>
       </el-table-column>
-      <el-table-column label="科目" align="center" prop="examType" width="100">
-        <template #default="{ row }">
-          <span v-if="row.examType == '1'">科一</span>
-          <span v-if="row.examType == '4'">科四</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="章节" align="center" prop="sortName" min-width="100" />
-      <el-table-column label="专项" align="center" prop="categoryTitle" width="100" />
+      <el-table-column label="章节" align="center" prop="chapterName" min-width="100" />
       <el-table-column label="图片" align="center" width="100">
         <template #default="{ row }">
-          <!-- <img v-if="row.subPic" :src="`https://ss-cloud.ahduima.com/xjxc/pic/${row.subPic}`" width="80px"> -->
           <el-image
-            v-if="row.subPic"
-            :src="`https://ss-cloud.ahduima.com/xjxc/pic/${row.subPic}`"
-            :preview-src-list="[`https://ss-cloud.ahduima.com/xjxc/pic/${row.subPic}`]"
+            v-if="row.imageUrl"
+            :src="`https://ss-cloud.ahduima.com/xjxc/pic/${row.imageUrl}`"
+            :preview-src-list="[`https://ss-cloud.ahduima.com/xjxc/pic/${row.imageUrl}`]"
             :lazy="true"
             style="width: 80px"
           />
@@ -101,24 +96,38 @@
 </template>
 
 <script setup name="XjDatabase">
-import { searchQuestion, deleteQuestion } from '@/api/xjapplet/xjdatabase'
+import { searchQuestion, deleteQuestion, getQuestionSort } from '@/api/xjapplet/xjdatabase'
 import QuestionAddForm from './components/QuestionAddForm.vue'
 
 const loading = ref(false)
 const total = ref(0)
 const tableList = ref([])
-const queryParams = reactive({
-  subTitle: '',
-  chexing: 'C1',
-  examType: '1',
+const queryParams = ref({
+  question: '',
+  carTypeId: '1001',
+  subject: '1',
   isPic: undefined,
   pageNo: 1,
   pageSize: 100
 })
 
+onMounted(() => {
+  getQuestionChapter()
+})
+
+const chapterOptions = ref([])
+const getQuestionChapter = () => {
+  getQuestionSort({
+    carTypeId: queryParams.value.carTypeId,
+    subject: queryParams.value.subject
+  }).then((data) => {
+    chapterOptions.value = data
+  })
+}
+
 function getList() {
   loading.value = true
-  searchQuestion(queryParams).then((response) => {
+  searchQuestion(queryParams.value).then((response) => {
     tableList.value = response.list
     total.value = response.total
     loading.value = false
@@ -130,20 +139,23 @@ function handleQuery() {
 }
 
 function resetQuery() {
-  queryParams.subTitle = ''
+  queryParams.value.question = ''
   handleQuery()
 }
 
 const dialogAddForm = ref(null)
 function handleEdit(item) {
-  dialogAddForm.value.open(item)
+  dialogAddForm.value.open(item, chapterOptions.value)
 }
 
 function handleAdd() {
-  dialogAddForm.value.open({
-    examType: queryParams.examType,
-    chexing: queryParams.chexing
-  })
+  dialogAddForm.value.open(
+    {
+      subject: queryParams.value.subject,
+      carTypeId: queryParams.value.carTypeId
+    },
+    chapterOptions.value
+  )
 }
 
 function handleDelete(id) {

From 47bac0315f6b7f3631467049372bcbf961a1913a Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Sun, 2 Mar 2025 15:05:34 +0800
Subject: [PATCH 04/11] sc

---
 .../XjApplet/Vip/components/UserDiscount.vue  |  2 +-
 .../XjApplet/Vip/components/VipDiscount.vue   | 12 +++----
 src/views/XjApplet/Vip/components/VipType.vue | 25 +++++++-------
 src/views/XjApplet/Vip/components/VipUser.vue | 34 ++++++++++++-------
 .../VipData/conponents/SecretData.vue         | 32 ++++++++++-------
 5 files changed, 61 insertions(+), 44 deletions(-)

diff --git a/src/views/XjApplet/Vip/components/UserDiscount.vue b/src/views/XjApplet/Vip/components/UserDiscount.vue
index dc8e04f..5bd272b 100644
--- a/src/views/XjApplet/Vip/components/UserDiscount.vue
+++ b/src/views/XjApplet/Vip/components/UserDiscount.vue
@@ -27,7 +27,7 @@
       @pagination="getList"
     />
 
-    <el-dialog title="赠送折扣" v-model="showDialog" width="500px">
+    <el-dialog title="赠送折扣" v-model="showDialog" width="500px" :close-on-click-modal="false">
       <el-form :model="form" ref="formRef" :rules="rules" label-width="80px">
         <el-form-item label="手机号" prop="phone">
           <el-input v-model="form.phone" maxlength="11" />
diff --git a/src/views/XjApplet/Vip/components/VipDiscount.vue b/src/views/XjApplet/Vip/components/VipDiscount.vue
index 264bee6..016a7d1 100644
--- a/src/views/XjApplet/Vip/components/VipDiscount.vue
+++ b/src/views/XjApplet/Vip/components/VipDiscount.vue
@@ -31,10 +31,10 @@
       @pagination="getList"
     />
 
-    <el-dialog title="折扣详情" v-model="showDialog" width="500px">
+    <el-dialog title="折扣详情" v-model="showDialog" width="500px" :close-on-click-modal="false">
       <el-form :model="form" ref="formRef" :rules="rules" label-width="80px">
         <el-form-item label="折扣类型" prop="discountType">
-          <el-select v-model="form.discountType" style="width: 100%" :disabled="form.id">
+          <el-select v-model="form.discountType" style="width: 100%" :disabled="!!form.id">
             <el-option
               v-for="item in discountTypeOptions"
               :key="item.value"
@@ -46,8 +46,8 @@
         <el-form-item label="折扣描述">
           {{ discountDesc }}
         </el-form-item>
-        <el-form-item v-if="form.discountType == 1" label="科目" prop="subject" :disabled="form.id">
-          <el-select v-model="form.subject" style="width: 100%">
+        <el-form-item v-if="form.discountType == 1" label="科目" prop="subject">
+          <el-select v-model="form.subject" style="width: 100%" :disabled="!!form.id">
             <el-option
               v-for="item in subjectOptions"
               :key="item.value"
@@ -57,7 +57,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="变量1" prop="param1">
-          <el-select v-model="form.param1" style="width: 100%" clearable :disabled="form.id">
+          <el-select v-model="form.param1" style="width: 100%" clearable :disabled="!!form.id">
             <el-option
               v-for="item in vipTypeOptions"
               :key="item.memberId"
@@ -67,7 +67,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="变量2" prop="param2">
-          <el-select v-model="form.param2" style="width: 100%" :disabled="form.id">
+          <el-select v-model="form.param2" style="width: 100%" :disabled="!!form.id">
             <el-option
               v-for="item in vipTypeOptions"
               :key="item.memberId"
diff --git a/src/views/XjApplet/Vip/components/VipType.vue b/src/views/XjApplet/Vip/components/VipType.vue
index 45731ea..b9a26b2 100644
--- a/src/views/XjApplet/Vip/components/VipType.vue
+++ b/src/views/XjApplet/Vip/components/VipType.vue
@@ -5,10 +5,10 @@
         <el-input v-model="searchForm.memberName" placeholder="会员名称" />
       </el-form-item>
       <el-form-item>
-        <el-select v-model="searchForm.carTypeId" placeholder="选择车型" clearable filterable>
-          <el-option label="小车" value="1001" />
-          <el-option label="摩托车" value="1002" />
-        </el-select>
+        <el-radio-group v-model="searchForm.carTypeId" @change="searchList">
+          <el-radio label="1001">小车</el-radio>
+          <el-radio label="1002">摩托车</el-radio>
+        </el-radio-group>
       </el-form-item>
       <el-form-item>
         <el-button @click="searchList">查询</el-button>
@@ -29,7 +29,7 @@
           <el-tag v-else type="danger">年</el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="使用方式" align="center" prop="typeName" />
+      <el-table-column label="使用方式" align="center" prop="useTypeName" />
       <el-table-column label="操作" width="160">
         <template #default="{ row }">
           <el-button type="primary" link @click="editVip(row)">修改</el-button>
@@ -45,7 +45,7 @@
       @pagination="getList"
     />
 
-    <el-dialog title="会员详情" v-model="showDialog" width="500px">
+    <el-dialog title="会员详情" v-model="showDialog" width="500px" :close-on-click-modal="false">
       <el-form :model="form" ref="formRef" :rules="rules" label-width="80px">
         <el-form-item label="会员名称" prop="memberName">
           <el-input v-model="form.memberName" />
@@ -77,8 +77,8 @@
             <el-radio :label="3">年</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="使用方式" prop="type">
-          <el-checkbox-group v-model="form.type">
+        <el-form-item label="使用方式" prop="useTypes">
+          <el-checkbox-group v-model="form.useTypes">
             <el-checkbox :label="1"> 用户购买 </el-checkbox>
             <el-checkbox :label="2"> 客服赠送 </el-checkbox>
           </el-checkbox-group>
@@ -99,8 +99,8 @@
 import { getVipTypeList, addVipType, updateVipType, deleteVipType } from '@/api/xjapplet/vip'
 const message = useMessage()
 const searchForm = ref({
-  memberName: '',
-  carTypeId: undefined,
+  memberName: undefined,
+  carTypeId: '1001',
   pageNo: 1,
   pageSize: 50
 })
@@ -129,13 +129,13 @@ function getList() {
 const showDialog = ref(false)
 const form = ref({
   memberName: '',
-  carTypeId: '',
+  carTypeId: undefined,
   subjects: [],
   price: '',
   discount: '',
   duration: '',
   unit: 1,
-  type: [1]
+  useTypes: [1]
 })
 const rules = ref({
   memberName: [{ required: true, message: '请输入会员名称', trigger: 'blur' }],
@@ -148,6 +148,7 @@ const rules = ref({
 
 function addVip() {
   showDialog.value = true
+  form.value.carTypeId = searchForm.value.carTypeId
 }
 
 function editVip(row) {
diff --git a/src/views/XjApplet/Vip/components/VipUser.vue b/src/views/XjApplet/Vip/components/VipUser.vue
index 82f6716..fa4c330 100644
--- a/src/views/XjApplet/Vip/components/VipUser.vue
+++ b/src/views/XjApplet/Vip/components/VipUser.vue
@@ -5,10 +5,10 @@
         <el-input v-model="searchForm.phone" placeholder="学员手机号" />
       </el-form-item>
       <el-form-item>
-        <el-select v-model="searchForm.carTypeId" placeholder="选择车型" clearable filterable>
-          <el-option label="小车" value="1001" />
-          <el-option label="摩托车" value="1002" />
-        </el-select>
+        <el-radio-group v-model="searchForm.carTypeId" @change="changeCarType">
+          <el-radio label="1001">小车</el-radio>
+          <el-radio label="1002">摩托车</el-radio>
+        </el-radio-group>
       </el-form-item>
       <!-- <el-form-item>
         <el-select v-model="searchForm.memberId" placeholder="选择会员类型" clearable filterable>
@@ -29,7 +29,11 @@
       <el-table-column type="index" width="55" align="center" />
       <el-table-column label="手机号" align="center" prop="phone" min-width="140" />
       <el-table-column label="会员名" align="center" prop="memberName" min-width="140" />
-      <el-table-column label="车型" align="center" prop="carTypeId" min-width="100" />
+      <el-table-column label="车型" align="center" min-width="100">
+        <template #default="{ row }">
+          {{ row.carTypeId == 1001 ? '小车' : '摩托车' }}
+        </template>
+      </el-table-column>
       <el-table-column label="科目" align="center" prop="subjects" min-width="100" />
       <el-table-column label="开始时间" align="center" prop="startDate" min-width="120" />
       <el-table-column label="结束时间" align="center" prop="endDate" min-width="120" />
@@ -44,7 +48,7 @@
       @pagination="getList"
     />
 
-    <el-dialog title="赠送会员" v-model="showDialog" width="500px">
+    <el-dialog title="赠送会员" v-model="showDialog" width="500px" :close-on-click-modal="false">
       <el-form :model="form" ref="formRef" :rules="rules" label-width="80px">
         <el-form-item label="手机号" prop="phone">
           <el-input v-model="form.phone" maxlength="11" />
@@ -56,7 +60,10 @@
               :key="item.memberId"
               :label="item.memberName"
               :value="item.memberId"
-            />
+            >
+              <span style="float: left">{{ item.memberName }}</span>
+              <span style="float: right; color: #aaa">{{ item.carName }}</span>
+            </el-option>
           </el-select>
         </el-form-item>
       </el-form>
@@ -75,9 +82,9 @@
 import { getUserMemberList, giveUserMember, getVipTypeOptions } from '@/api/xjapplet/vip'
 const message = useMessage()
 const searchForm = ref({
-  carTypeId: undefined,
+  carTypeId: '1001',
   memberId: undefined,
-  phone: '',
+  phone: undefined,
   pageNo: 1,
   pageSize: 50
 })
@@ -89,12 +96,15 @@ const total = ref(0)
 const vipOptions = ref([])
 
 onMounted(() => {
-  getList()
+  changeCarType()
+})
 
-  getVipTypeOptions().then((response) => {
+function changeCarType() {
+  getVipTypeOptions({ carTypeId: searchForm.value.carTypeId }).then((response) => {
     vipOptions.value = response
   })
-})
+  searchList()
+}
 
 function searchList() {
   searchForm.value.pageNo = 1
diff --git a/src/views/XjApplet/VipData/conponents/SecretData.vue b/src/views/XjApplet/VipData/conponents/SecretData.vue
index 64822f8..e7875a8 100644
--- a/src/views/XjApplet/VipData/conponents/SecretData.vue
+++ b/src/views/XjApplet/VipData/conponents/SecretData.vue
@@ -17,7 +17,7 @@
       </el-row>
     </el-form>
     <div style="display: flex; padding: 10px; border: 1px solid #eee; height: calc(100vh - 80px)">
-      <div style="width: 350px; border-right: 1px solid #eee">
+      <div style="width: 300px; border-right: 1px solid #eee">
         <div style="display: flex; justify-content: space-between; padding-right: 20px">
           <div style="font-size: 18px; font-weight: bold">密卷</div>
           <el-button type="primary" link @click="addMjItem">新增</el-button>
@@ -47,7 +47,12 @@
           <div style="margin-left: 10px; margin-right: 10px"> 题目数：{{ tableList.length }} </div>
           <el-button type="primary" @click="addMjDetail">新增密卷试题</el-button>
         </div>
-        <el-table v-loading="loading" :data="tableList" style="margin-top: 20px">
+        <el-table
+          v-loading="loading"
+          :data="tableList"
+          style="margin-top: 10px"
+          max-height="calc(100vh - 280px)"
+        >
           <el-table-column type="index" width="55" align="center" />
           <el-table-column label="题目" align="left" prop="question" min-width="140" />
           <el-table-column label="选项" align="left" min-width="140">
@@ -165,17 +170,18 @@ function addMjItem() {
   })
 }
 function getMjTitle(idx) {
-  const cjObj = {
-    1001: '小车',
-    1002: '摩托车'
-  }
-  const kmObj = {
-    1: '科一',
-    4: '科四'
-  }
-  return `${cjObj[queryParams.value.carTypeId]}${kmObj[queryParams.value.subject]}考前密卷 第${
-    idx + 1
-  }套`
+  // const cjObj = {
+  //   1001: '小车',
+  //   1002: '摩托车'
+  // }
+  // const kmObj = {
+  //   1: '科一',
+  //   4: '科四'
+  // }
+  // return `${cjObj[queryParams.value.carTypeId]}${kmObj[queryParams.value.subject]}考前密卷 第${
+  //   idx + 1
+  // }套`
+  return `考前密卷 第${idx + 1}套`
 }
 function removeMj(item) {
   message

From 467e1eceb7d7685ecd772f08830c63e8618a2556 Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Sun, 2 Mar 2025 16:36:18 +0800
Subject: [PATCH 05/11] sc

---
 src/api/xjapplet/discount.js                  |  8 ++-
 src/views/XjApplet/Resell/index.vue           |  5 +-
 .../XjApplet/Vip/components/UserDiscount.vue  | 53 ++++++++++++-------
 src/views/XjApplet/Vip/components/VipType.vue |  4 +-
 src/views/XjApplet/Vip/components/VipUser.vue | 16 +++---
 5 files changed, 51 insertions(+), 35 deletions(-)

diff --git a/src/api/xjapplet/discount.js b/src/api/xjapplet/discount.js
index 6cba610..0956658 100644
--- a/src/api/xjapplet/discount.js
+++ b/src/api/xjapplet/discount.js
@@ -27,6 +27,12 @@ export const deleteVipDiscount = async (id) => {
   })
 }
 
+export const getVipDiscountOptions = async () => {
+  return await request.get({
+    url: '/admin-api/applet/xunjia/member/discount/simple-list'
+  })
+}
+
 export const getUserDiscountList = async (params) => {
   return await request.get({
     url: '/admin-api/applet/xunjia/user/discount/list',
@@ -36,7 +42,7 @@ export const getUserDiscountList = async (params) => {
 
 export const giveUserDiscount = async (data) => {
   return await request.post({
-    url: '/admin-api/applet/xunjia/user/discount/add',
+    url: '/admin-api/applet/xunjia/user/discount/send',
     data
   })
 }
diff --git a/src/views/XjApplet/Resell/index.vue b/src/views/XjApplet/Resell/index.vue
index 89a2f88..51510b7 100644
--- a/src/views/XjApplet/Resell/index.vue
+++ b/src/views/XjApplet/Resell/index.vue
@@ -19,10 +19,7 @@
       <el-table-column prop="mark" label="标记" />
       <el-table-column label="小程序码" align="center" width="120px">
         <template #default="{ row }">
-          <img
-            :src="`https://ss-cloud.ahduima.com/xjxc/pic/${row.appletUrl}`"
-            style="width: 80px; height: 80px"
-          />
+          <img :src="row.appletUrl" style="width: 80px; height: 80px" />
         </template>
       </el-table-column>
       <el-table-column label="操作" width="120px">
diff --git a/src/views/XjApplet/Vip/components/UserDiscount.vue b/src/views/XjApplet/Vip/components/UserDiscount.vue
index 5bd272b..1ff621e 100644
--- a/src/views/XjApplet/Vip/components/UserDiscount.vue
+++ b/src/views/XjApplet/Vip/components/UserDiscount.vue
@@ -11,13 +11,18 @@
     </el-form>
     <el-table v-loading="loading" :data="tableList">
       <el-table-column type="index" width="55" align="center" />
-      <el-table-column label="手机号" align="center" prop="phone" min-width="140" />
-      <el-table-column label="折扣描述" align="center" prop="memberName" min-width="140" />
-      <el-table-column label="折后价格" align="center" prop="carName" min-width="100" />
-      <el-table-column label="有效期至" align="center" prop="subjects" min-width="100" />
-      <el-table-column label="截止时间" align="center" prop="endDate" min-width="100" />
-      <el-table-column label="操作人" align="center" prop="" min-width="100" />
-      <el-table-column label="操作时间" align="center" prop="" min-width="100" />
+      <el-table-column label="手机号" align="left" prop="phone" width="140" />
+      <el-table-column label="折扣描述" align="left" prop="description" min-width="140" />
+      <el-table-column label="折后价格" align="center" prop="discount" width="100" />
+      <el-table-column
+        label="截止时间"
+        align="left"
+        prop="endTime"
+        :formatter="dateFormatter"
+        width="150"
+      />
+      <el-table-column label="操作人" align="left" prop="operUser" width="100" />
+      <el-table-column label="操作时间" align="left" prop="operTime" width="150" />
     </el-table>
     <pagination
       v-show="total > 0"
@@ -32,13 +37,13 @@
         <el-form-item label="手机号" prop="phone">
           <el-input v-model="form.phone" maxlength="11" />
         </el-form-item>
-        <el-form-item label="会员描述" prop="vipType">
-          <el-select v-model="form.vipType" clearable filterable style="width: 100%">
+        <el-form-item label="会员描述" prop="discountId">
+          <el-select v-model="form.discountId" clearable filterable style="width: 100%">
             <el-option
-              v-for="item in vipTypeOptions"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
+              v-for="item in discountOptions"
+              :key="item.id"
+              :label="item.description"
+              :value="item.id"
             />
           </el-select>
         </el-form-item>
@@ -55,7 +60,12 @@
 </template>
 
 <script setup name="UserDiscount">
-import { getUserDiscountList, giveUserDiscount } from '@/api/xjapplet/discount'
+import {
+  getUserDiscountList,
+  giveUserDiscount,
+  getVipDiscountOptions
+} from '@/api/xjapplet/discount'
+import { dateFormatter } from '@/utils/formatTime'
 
 const message = useMessage()
 
@@ -69,11 +79,14 @@ const loading = ref(false)
 const tableList = ref([])
 const total = ref(0)
 
-const vipTypeOptions = ref([
-  { label: '普通会员', value: '1' },
-  { label: 'VIP会员', value: '2' }
-])
+const discountOptions = ref([])
 
+onMounted(() => {
+  searchList()
+  getVipDiscountOptions().then((response) => {
+    discountOptions.value = response
+  })
+})
 function searchList() {
   searchForm.value.pageNo = 1
   getList()
@@ -91,11 +104,11 @@ function getList() {
 const showDialog = ref(false)
 const form = ref({
   phone: '',
-  vipType: ''
+  discountId: ''
 })
 const rules = ref({
   phone: [{ required: true, message: '请输入用户手机号', trigger: 'blur' }],
-  vipType: [{ required: true, message: '请选择会员类型', trigger: 'change' }]
+  discountId: [{ required: true, message: '请选择会员类型', trigger: 'change' }]
 })
 
 function addVipUser() {
diff --git a/src/views/XjApplet/Vip/components/VipType.vue b/src/views/XjApplet/Vip/components/VipType.vue
index b9a26b2..e1e09fd 100644
--- a/src/views/XjApplet/Vip/components/VipType.vue
+++ b/src/views/XjApplet/Vip/components/VipType.vue
@@ -57,7 +57,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="科目" prop="subjects">
-          <el-select v-model="searchForm.subjects" placeholder="多选" multiple style="width: 100%">
+          <el-select v-model="form.subjects" placeholder="多选" multiple style="width: 100%">
             <el-option label="科一" value="4" />
             <el-option label="科四" value="1" />
           </el-select>
@@ -152,7 +152,7 @@ function addVip() {
 }
 
 function editVip(row) {
-  form.value = { ...row }
+  form.value = { ...row, subjects: row.subjects.split(','), unit: Number(row.unit) }
   showDialog.value = true
 }
 
diff --git a/src/views/XjApplet/Vip/components/VipUser.vue b/src/views/XjApplet/Vip/components/VipUser.vue
index fa4c330..b0c84f4 100644
--- a/src/views/XjApplet/Vip/components/VipUser.vue
+++ b/src/views/XjApplet/Vip/components/VipUser.vue
@@ -27,18 +27,18 @@
     </el-form>
     <el-table v-loading="loading" :data="tableList" height="calc(100vh - 260px)">
       <el-table-column type="index" width="55" align="center" />
-      <el-table-column label="手机号" align="center" prop="phone" min-width="140" />
-      <el-table-column label="会员名" align="center" prop="memberName" min-width="140" />
-      <el-table-column label="车型" align="center" min-width="100">
+      <el-table-column label="手机号" align="left" prop="phone" min-width="140" />
+      <el-table-column label="会员名" align="left" prop="memberName" min-width="140" />
+      <el-table-column label="车型" align="left" min-width="100">
         <template #default="{ row }">
           {{ row.carTypeId == 1001 ? '小车' : '摩托车' }}
         </template>
       </el-table-column>
-      <el-table-column label="科目" align="center" prop="subjects" min-width="100" />
-      <el-table-column label="开始时间" align="center" prop="startDate" min-width="120" />
-      <el-table-column label="结束时间" align="center" prop="endDate" min-width="120" />
-      <el-table-column label="操作人" align="center" prop="" min-width="100" />
-      <el-table-column label="操作时间" align="center" prop="" min-width="120" />
+      <el-table-column label="科目" align="left" prop="subjects" min-width="100" />
+      <el-table-column label="来源" align="left" prop="useType" min-width="100" />
+      <el-table-column label="截止日期" align="left" prop="endDate" min-width="120" />
+      <el-table-column label="操作人" align="left" prop="operUser" min-width="100" />
+      <el-table-column label="操作时间" align="left" prop="createTime" min-width="120" />
     </el-table>
     <pagination
       v-show="total > 0"

From f75140e13568b7a70232e88876fd8c9404feadaa Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Sun, 2 Mar 2025 23:08:12 +0800
Subject: [PATCH 06/11] sc

---
 src/views/XjApplet/Resell/index.vue                |  2 +-
 src/views/XjApplet/Vip/components/UserDiscount.vue |  2 +-
 src/views/XjApplet/Vip/components/VipDiscount.vue  | 12 +++++++++---
 src/views/XjApplet/Vip/components/VipType.vue      |  2 +-
 src/views/XjApplet/Vip/components/VipUser.vue      |  2 +-
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/views/XjApplet/Resell/index.vue b/src/views/XjApplet/Resell/index.vue
index 51510b7..d156105 100644
--- a/src/views/XjApplet/Resell/index.vue
+++ b/src/views/XjApplet/Resell/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-form :model="searchForm" label-width="0" inline>
+    <el-form :model="searchForm" label-width="0" inline @submit.prevent>
       <el-form-item>
         <el-input v-model="searchForm.phone" placeholder="请输入手机号" />
       </el-form-item>
diff --git a/src/views/XjApplet/Vip/components/UserDiscount.vue b/src/views/XjApplet/Vip/components/UserDiscount.vue
index 1ff621e..6a544a7 100644
--- a/src/views/XjApplet/Vip/components/UserDiscount.vue
+++ b/src/views/XjApplet/Vip/components/UserDiscount.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-form :model="searchForm" inline>
+    <el-form :model="searchForm" inline @submit.prevent>
       <el-form-item>
         <el-input v-model="searchForm.phone" placeholder="学员手机号" />
       </el-form-item>
diff --git a/src/views/XjApplet/Vip/components/VipDiscount.vue b/src/views/XjApplet/Vip/components/VipDiscount.vue
index 016a7d1..9741dc5 100644
--- a/src/views/XjApplet/Vip/components/VipDiscount.vue
+++ b/src/views/XjApplet/Vip/components/VipDiscount.vue
@@ -63,7 +63,10 @@
               :key="item.memberId"
               :label="item.memberName"
               :value="item.memberId"
-            />
+            >
+              <span style="float: left">{{ item.memberName }}</span>
+              <span style="float: right; color: #aaa">{{ item.carName }}</span>
+            </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="变量2" prop="param2">
@@ -73,7 +76,10 @@
               :key="item.memberId"
               :label="item.memberName"
               :value="item.memberId"
-            />
+            >
+              <span style="float: left">{{ item.memberName }}</span>
+              <span style="float: right; color: #aaa">{{ item.carName }}</span>
+            </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="折扣价" prop="discount">
@@ -151,7 +157,7 @@ const unitOptions = [
 const discountDesc = computed(() => {
   const vipTypeObj = {}
   vipTypeOptions.value.forEach((item) => {
-    vipTypeObj[item.memberId] = item.memberName
+    vipTypeObj[item.memberId] = `${item.memberName}(${item.carName})`
   })
   const { discountType, subject, param1, param2, discount, duration, unit } = form.value
   let baseStr = discountTypeOptions.find((item) => item.value == discountType).label
diff --git a/src/views/XjApplet/Vip/components/VipType.vue b/src/views/XjApplet/Vip/components/VipType.vue
index e1e09fd..3372a2b 100644
--- a/src/views/XjApplet/Vip/components/VipType.vue
+++ b/src/views/XjApplet/Vip/components/VipType.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-form :model="searchForm" inline>
+    <el-form :model="searchForm" inline @submit.prevent>
       <el-form-item>
         <el-input v-model="searchForm.memberName" placeholder="会员名称" />
       </el-form-item>
diff --git a/src/views/XjApplet/Vip/components/VipUser.vue b/src/views/XjApplet/Vip/components/VipUser.vue
index b0c84f4..c85d6d7 100644
--- a/src/views/XjApplet/Vip/components/VipUser.vue
+++ b/src/views/XjApplet/Vip/components/VipUser.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-form :model="searchForm" inline>
+    <el-form :model="searchForm" inline @submit.prevent>
       <el-form-item>
         <el-input v-model="searchForm.phone" placeholder="学员手机号" />
       </el-form-item>

From 039ab28c15b5ed627aba9aaee0e1c0265213e2c3 Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Mon, 3 Mar 2025 11:27:47 +0800
Subject: [PATCH 07/11] sc

---
 src/views/Clue/Pool/Comp/DialogClue.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/Clue/Pool/Comp/DialogClue.vue b/src/views/Clue/Pool/Comp/DialogClue.vue
index 2c5502d..a5bd51a 100644
--- a/src/views/Clue/Pool/Comp/DialogClue.vue
+++ b/src/views/Clue/Pool/Comp/DialogClue.vue
@@ -330,7 +330,7 @@ const emit = defineEmits(['success'])
 async function handleSave() {
   // 校验表单
   if (!formRef.value) return
-  const valid = await formRef.value.getElFormRef.validate()
+  const valid = await formRef.value.getElFormRef().validate()
   if (!valid) return
   if (!followList.value || followList.value.length == 0) {
     message.info('请添加跟进人')

From 770d700ba1d910078c67b91253e30ebf4264893a Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Mon, 3 Mar 2025 17:44:39 +0800
Subject: [PATCH 08/11] sc

---
 src/router/modules/remaining.ts               | 42 +++++++--------
 src/views/XjApplet/Resell/index.vue           | 52 +++++++++++++++++--
 .../XjApplet/Vip/components/UserDiscount.vue  | 13 +++--
 .../XjApplet/Vip/components/VipDiscount.vue   | 24 +++++++--
 src/views/XjApplet/Vip/components/VipType.vue | 24 +++++++--
 src/views/XjApplet/Vip/components/VipUser.vue |  8 ++-
 src/views/XjApplet/Vip/index.vue              |  9 ++--
 .../VipData/conponents/SecretData.vue         | 39 ++++++++++++--
 .../VipData/conponents/SimpleData.vue         | 15 +++++-
 src/views/XjApplet/VipData/index.vue          |  5 +-
 src/views/XjApplet/XjDatabase/index.vue       | 35 +++++++++----
 11 files changed, 205 insertions(+), 61 deletions(-)

diff --git a/src/router/modules/remaining.ts b/src/router/modules/remaining.ts
index fdd7af5..348d8ae 100644
--- a/src/router/modules/remaining.ts
+++ b/src/router/modules/remaining.ts
@@ -129,27 +129,27 @@ const remainingRouter: AppRouteRecordRaw[] = [
   //     }
   //   ]
   // },
-  // {
-  //   path: '/Basic',
-  //   component: Layout,
-  //   name: 'Basic',
-  //   meta: { title: '菜单管理' },
-  //   redirect: '/Basic/menu',
-  //   children: [
-  //     {
-  //       path: 'menu',
-  //       component: () => import('@/views/Basic/Menu/index.vue'),
-  //       name: 'Menu',
-  //       meta: {
-  //         canTo: true,
-  //         hidden: true,
-  //         noTagsView: false,
-  //         icon: 'ep:user',
-  //         title: '菜单管理'
-  //       }
-  //     }
-  //   ]
-  // },
+  {
+    path: '/Basic',
+    component: Layout,
+    name: 'Basic',
+    meta: { title: '菜单管理' },
+    redirect: '/Basic/menu',
+    children: [
+      {
+        path: 'menu',
+        component: () => import('@/views/Basic/Menu/index.vue'),
+        name: 'Menu',
+        meta: {
+          canTo: true,
+          hidden: true,
+          noTagsView: false,
+          icon: 'ep:user',
+          title: '菜单管理'
+        }
+      }
+    ]
+  },
   {
     path: '/login',
     component: () => import('@/views/Login/Login.vue'),
diff --git a/src/views/XjApplet/Resell/index.vue b/src/views/XjApplet/Resell/index.vue
index d156105..884bf00 100644
--- a/src/views/XjApplet/Resell/index.vue
+++ b/src/views/XjApplet/Resell/index.vue
@@ -8,8 +8,10 @@
         <el-input v-model="searchForm.name" placeholder="请输入姓名" />
       </el-form-item>
       <el-form-item>
-        <el-button @click="searchList">查询</el-button>
-        <el-button type="primary" @click="handleAdd">新增</el-button>
+        <el-button @click="searchList" v-hasPermi="['xj-applet:resell:search']">查询</el-button>
+        <el-button type="primary" @click="handleAdd" v-hasPermi="['xj-applet:resell:add']"
+          >新增</el-button
+        >
       </el-form-item>
     </el-form>
     <el-table v-loading="loading" :data="tableData" max-height="calc(100vh - 200px)">
@@ -24,7 +26,13 @@
       </el-table-column>
       <el-table-column label="操作" width="120px">
         <template #default="{ row }">
-          <el-button type="primary" link @click="handleEdit(row)">修改</el-button>
+          <el-button
+            type="primary"
+            link
+            @click="handleEdit(row)"
+            v-hasPermi="['xj-applet:resell:update']"
+            >修改</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
@@ -47,6 +55,29 @@
         <el-form-item label="标记" prop="mark">
           <el-input v-model="form.mark" />
         </el-form-item>
+        <el-form-item label="赠送会员" prop="memberId">
+          <el-select v-model="form.memberId" clearable filterable style="width: 100%">
+            <el-option
+              v-for="item in vipOptions"
+              :key="item.memberId"
+              :label="item.memberName"
+              :value="item.memberId"
+            >
+              <span style="float: left">{{ item.memberName }}</span>
+              <span style="float: right; color: #aaa">{{ item.carName }}</span>
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="赠送折扣" prop="discountId">
+          <el-select v-model="form.discountId" clearable filterable style="width: 100%">
+            <el-option
+              v-for="item in discountOptions"
+              :key="item.id"
+              :label="item.description"
+              :value="item.id"
+            />
+          </el-select>
+        </el-form-item>
       </el-form>
 
       <template #footer>
@@ -61,6 +92,8 @@
 
 <script setup name="Resell">
 import { getResellList, addResell, updateResell } from '@/api/xjapplet/resell'
+import { getVipDiscountOptions } from '@/api/xjapplet/discount'
+import { getVipTypeOptions } from '@/api/xjapplet/vip'
 
 const message = useMessage()
 
@@ -80,7 +113,9 @@ const showDialog = ref(false)
 const form = ref({
   phone: '',
   name: '',
-  mark: ''
+  mark: '',
+  discountId: undefined,
+  memberId: undefined
 })
 
 const rules = {
@@ -88,8 +123,17 @@ const rules = {
   name: [{ required: true, message: '请输入姓名', trigger: 'blur' }]
 }
 
+const vipOptions = ref([])
+const discountOptions = ref([])
+
 onMounted(() => {
   searchList()
+  getVipDiscountOptions().then((response) => {
+    discountOptions.value = response
+  })
+  getVipTypeOptions({ carTypeId: searchForm.value.carTypeId }).then((response) => {
+    vipOptions.value = response
+  })
 })
 
 function searchList() {
diff --git a/src/views/XjApplet/Vip/components/UserDiscount.vue b/src/views/XjApplet/Vip/components/UserDiscount.vue
index 6a544a7..bee8940 100644
--- a/src/views/XjApplet/Vip/components/UserDiscount.vue
+++ b/src/views/XjApplet/Vip/components/UserDiscount.vue
@@ -5,8 +5,15 @@
         <el-input v-model="searchForm.phone" placeholder="学员手机号" />
       </el-form-item>
       <el-form-item>
-        <el-button @click="searchList">查询</el-button>
-        <el-button type="primary" @click="addVipUser">赠送折扣</el-button>
+        <el-button @click="searchList" v-hasPermi="['xj-applet:vip:user-discount:search']"
+          >查询</el-button
+        >
+        <el-button
+          type="primary"
+          @click="addVipUser"
+          v-hasPermi="['xj-applet:vip:user-discount:send']"
+          >赠送折扣</el-button
+        >
       </el-form-item>
     </el-form>
     <el-table v-loading="loading" :data="tableList">
@@ -37,7 +44,7 @@
         <el-form-item label="手机号" prop="phone">
           <el-input v-model="form.phone" maxlength="11" />
         </el-form-item>
-        <el-form-item label="会员描述" prop="discountId">
+        <el-form-item label="折扣描述" prop="discountId">
           <el-select v-model="form.discountId" clearable filterable style="width: 100%">
             <el-option
               v-for="item in discountOptions"
diff --git a/src/views/XjApplet/Vip/components/VipDiscount.vue b/src/views/XjApplet/Vip/components/VipDiscount.vue
index 9741dc5..0a62e5a 100644
--- a/src/views/XjApplet/Vip/components/VipDiscount.vue
+++ b/src/views/XjApplet/Vip/components/VipDiscount.vue
@@ -1,8 +1,12 @@
 <template>
   <div>
     <el-row>
-      <el-button @click="searchList">查询</el-button>
-      <el-button type="primary" @click="addDiscount">新增折扣</el-button>
+      <el-button @click="searchList" v-hasPermi="['xj-applet:vip:vip-discount:search']"
+        >查询</el-button
+      >
+      <el-button type="primary" @click="addDiscount" v-hasPermi="['xj-applet:vip:vip-discount:add']"
+        >新增折扣</el-button
+      >
     </el-row>
 
     <el-table v-loading="loading" :data="tableList">
@@ -18,8 +22,20 @@
       </el-table-column>
       <el-table-column label="操作" align="center">
         <template #default="{ row }">
-          <el-button type="primary" link @click="editDiscount(row)">修改</el-button>
-          <el-button type="primary" link @click="deleteDiscount(row)">删除</el-button>
+          <el-button
+            type="primary"
+            link
+            @click="editDiscount(row)"
+            v-hasPermi="['xj-applet:vip:vip-discount:update']"
+            >修改</el-button
+          >
+          <el-button
+            type="primary"
+            link
+            @click="deleteDiscount(row)"
+            v-hasPermi="['xj-applet:vip:vip-discount:delete']"
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/XjApplet/Vip/components/VipType.vue b/src/views/XjApplet/Vip/components/VipType.vue
index 3372a2b..0ebed54 100644
--- a/src/views/XjApplet/Vip/components/VipType.vue
+++ b/src/views/XjApplet/Vip/components/VipType.vue
@@ -11,8 +11,12 @@
         </el-radio-group>
       </el-form-item>
       <el-form-item>
-        <el-button @click="searchList">查询</el-button>
-        <el-button type="primary" @click="addVip">新增会员类型</el-button>
+        <el-button @click="searchList" v-hasPermi="['xj-applet:vip:vip-type:search']"
+          >查询</el-button
+        >
+        <el-button type="primary" @click="addVip" v-hasPermi="['xj-applet:vip:vip-type:add']"
+          >新增会员类型</el-button
+        >
       </el-form-item>
     </el-form>
     <el-table v-loading="loading" :data="tableList" height="calc(100vh - 260px)">
@@ -32,8 +36,20 @@
       <el-table-column label="使用方式" align="center" prop="useTypeName" />
       <el-table-column label="操作" width="160">
         <template #default="{ row }">
-          <el-button type="primary" link @click="editVip(row)">修改</el-button>
-          <el-button type="primary" link @click="handleDelete(row.memberId)">删除</el-button>
+          <el-button
+            type="primary"
+            link
+            @click="editVip(row)"
+            v-hasPermi="['xj-applet:vip:vip-type:update']"
+            >修改</el-button
+          >
+          <el-button
+            type="primary"
+            link
+            @click="handleDelete(row.memberId)"
+            v-hasPermi="['xj-applet:vip:vip-type:delete']"
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/XjApplet/Vip/components/VipUser.vue b/src/views/XjApplet/Vip/components/VipUser.vue
index c85d6d7..b25e95a 100644
--- a/src/views/XjApplet/Vip/components/VipUser.vue
+++ b/src/views/XjApplet/Vip/components/VipUser.vue
@@ -21,8 +21,12 @@
         </el-select>
       </el-form-item> -->
       <el-form-item>
-        <el-button @click="searchList">查询</el-button>
-        <el-button type="primary" @click="addVipUser">赠送会员</el-button>
+        <el-button @click="searchList" v-hasPermi="['xj-applet:vip:vip-user:search']"
+          >查询</el-button
+        >
+        <el-button type="primary" @click="addVipUser" v-hasPermi="['xj-applet:vip:vip-user:send']"
+          >赠送会员</el-button
+        >
       </el-form-item>
     </el-form>
     <el-table v-loading="loading" :data="tableList" height="calc(100vh - 260px)">
diff --git a/src/views/XjApplet/Vip/index.vue b/src/views/XjApplet/Vip/index.vue
index b936912..b73a841 100644
--- a/src/views/XjApplet/Vip/index.vue
+++ b/src/views/XjApplet/Vip/index.vue
@@ -1,16 +1,16 @@
 <template>
   <div>
     <el-tabs v-model="tabIndex">
-      <el-tab-pane label="会员用户" :name="1">
+      <el-tab-pane label="会员用户" :name="1" v-if="checkPermi(['xj-applet:vip:vip-user'])">
         <VipUser v-if="tabIndex == 1" />
       </el-tab-pane>
-      <el-tab-pane label="会员类型" :name="2">
+      <el-tab-pane label="会员类型" :name="2" v-if="checkPermi(['xj-applet:vip:vip-type'])">
         <VipType v-if="tabIndex == 2" />
       </el-tab-pane>
-      <el-tab-pane label="会员折扣" :name="3">
+      <el-tab-pane label="会员折扣" :name="3" v-if="checkPermi(['xj-applet:vip:vip-discount'])">
         <VipDiscount v-if="tabIndex == 3" />
       </el-tab-pane>
-      <el-tab-pane label="用户折扣" :name="4">
+      <el-tab-pane label="用户折扣" :name="4" v-if="checkPermi(['xj-applet:vip:user-discount'])">
         <UserDiscount v-if="tabIndex == 4" />
       </el-tab-pane>
     </el-tabs>
@@ -18,6 +18,7 @@
 </template>
 
 <script setup name="Vip">
+import { checkPermi } from '@/utils/permission'
 import UserDiscount from './components/UserDiscount.vue'
 import VipDiscount from './components/VipDiscount.vue'
 import VipType from './components/VipType.vue'
diff --git a/src/views/XjApplet/VipData/conponents/SecretData.vue b/src/views/XjApplet/VipData/conponents/SecretData.vue
index e7875a8..b93c815 100644
--- a/src/views/XjApplet/VipData/conponents/SecretData.vue
+++ b/src/views/XjApplet/VipData/conponents/SecretData.vue
@@ -20,7 +20,13 @@
       <div style="width: 300px; border-right: 1px solid #eee">
         <div style="display: flex; justify-content: space-between; padding-right: 20px">
           <div style="font-size: 18px; font-weight: bold">密卷</div>
-          <el-button type="primary" link @click="addMjItem">新增</el-button>
+          <el-button
+            type="primary"
+            link
+            @click="addMjItem"
+            v-hasPermi="['xj-applet:vip-data:mj:add']"
+            >新增</el-button
+          >
         </div>
         <el-radio-group
           v-model="mjIndex"
@@ -30,8 +36,20 @@
           <el-radio v-for="(item, index) in mjList" :key="index" :label="index" class="flex-radio">
             <div style="flex: 1; width: 100px">{{ getMjTitle(index) }}</div>
             <div style="padding-right: 15px">
-              <el-button type="primary" link @click="removeMj(item)">删除</el-button>
-              <el-button type="primary" link @click="clearMjDetail(item)">清空</el-button>
+              <el-button
+                type="primary"
+                link
+                @click="removeMj(item)"
+                v-hasPermi="['xj-applet:vip-data:mj:remove']"
+                >删除</el-button
+              >
+              <el-button
+                type="primary"
+                link
+                @click="clearMjDetail(item)"
+                v-hasPermi="['xj-applet:vip-data:mj:clear']"
+                >清空</el-button
+              >
             </div>
           </el-radio>
         </el-radio-group>
@@ -45,7 +63,12 @@
             当前密卷：{{ getMjTitle(mjIndex) }}
           </div>
           <div style="margin-left: 10px; margin-right: 10px"> 题目数：{{ tableList.length }} </div>
-          <el-button type="primary" @click="addMjDetail">新增密卷试题</el-button>
+          <el-button
+            type="primary"
+            @click="addMjDetail"
+            v-hasPermi="['xj-applet:vip-data:mj:add-question']"
+            >新增密卷试题</el-button
+          >
         </div>
         <el-table
           v-loading="loading"
@@ -85,7 +108,13 @@
 
           <el-table-column label="操作" align="center" width="100px">
             <template #default="{ row }">
-              <el-button type="primary" link @click="takeoutMj(row)">移出密卷</el-button>
+              <el-button
+                type="primary"
+                link
+                @click="takeoutMj(row)"
+                v-hasPermi="['xj-applet:vip-data:mj:remove-question']"
+                >移出密卷</el-button
+              >
             </template>
           </el-table-column>
         </el-table>
diff --git a/src/views/XjApplet/VipData/conponents/SimpleData.vue b/src/views/XjApplet/VipData/conponents/SimpleData.vue
index 9da8811..e6745d1 100644
--- a/src/views/XjApplet/VipData/conponents/SimpleData.vue
+++ b/src/views/XjApplet/VipData/conponents/SimpleData.vue
@@ -18,6 +18,7 @@
         <el-form-item>
           <el-button
             type="primary"
+            v-hasPermi="['xj-applet:vip-data:jx:search']"
             @click="
               () => {
                 queryParams.pageNo = 1
@@ -27,7 +28,9 @@
           >
             查询
           </el-button>
-          <el-button type="primary" @click="addMjDetail">新增精选试题</el-button>
+          <el-button type="primary" @click="addMjDetail" v-hasPermi="['xj-applet:vip-data:jx:add']">
+            新增精选试题
+          </el-button>
         </el-form-item>
       </el-row>
     </el-form>
@@ -62,7 +65,15 @@
       </el-table-column>
       <el-table-column label="操作" align="center" width="100px">
         <template #default="{ row }">
-          <el-button size="small" type="primary" link @click="takeoutMj(row)">移出精选</el-button>
+          <el-button
+            size="small"
+            type="primary"
+            link
+            @click="takeoutMj(row)"
+            v-hasPermi="['xj-applet:vip-data:jx:remove']"
+          >
+            移出精选
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/XjApplet/VipData/index.vue b/src/views/XjApplet/VipData/index.vue
index 7321632..e5dcc80 100644
--- a/src/views/XjApplet/VipData/index.vue
+++ b/src/views/XjApplet/VipData/index.vue
@@ -1,15 +1,16 @@
 <template>
   <el-tabs v-model="tabIndex">
-    <el-tab-pane label="精选题" :name="1">
+    <el-tab-pane label="精选题" :name="1" v-if="checkPermi(['xj-applet:vip-data:jx'])">
       <SimpleData v-if="tabIndex == 1" />
     </el-tab-pane>
-    <el-tab-pane label="密卷" :name="2">
+    <el-tab-pane label="密卷" :name="2" v-if="checkPermi(['xj-applet:vip-data:mj'])">
       <SecretData v-if="tabIndex == 2" />
     </el-tab-pane>
   </el-tabs>
 </template>
 
 <script setup name="VipData">
+import { checkPermi } from '@/utils/permission'
 import SimpleData from './conponents/SimpleData.vue'
 import SecretData from './conponents/SecretData.vue'
 
diff --git a/src/views/XjApplet/XjDatabase/index.vue b/src/views/XjApplet/XjDatabase/index.vue
index 89ffc59..ce6ef50 100644
--- a/src/views/XjApplet/XjDatabase/index.vue
+++ b/src/views/XjApplet/XjDatabase/index.vue
@@ -33,9 +33,15 @@
           />
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="handleQuery">搜索</el-button>
-          <el-button @click="resetQuery">重置</el-button>
-          <el-button type="primary" @click="handleAdd">新增</el-button>
+          <el-button
+            type="primary"
+            @click="handleQuery"
+            v-hasPermi="['xj-applet:xj-database:search']"
+            >搜索</el-button
+          >
+          <el-button type="primary" @click="handleAdd" v-hasPermi="['xj-applet:xj-database:add']"
+            >新增</el-button
+          >
         </el-form-item>
       </el-row>
     </el-form>
@@ -78,8 +84,22 @@
 
       <el-table-column label="操作" align="center" width="140">
         <template #default="scope">
-          <el-button type="primary" link @click="handleEdit(scope.row)">编辑</el-button>
-          <el-button type="primary" link @click="handleDelete(scope.row.id)">删除</el-button>
+          <el-button
+            type="primary"
+            link
+            @click="handleEdit(scope.row)"
+            v-hasPermi="['xj-applet:xj-database:edit']"
+          >
+            编辑
+          </el-button>
+          <el-button
+            type="primary"
+            link
+            @click="handleDelete(scope.row.id)"
+            v-hasPermi="['xj-applet:xj-database:remove']"
+          >
+            删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -138,11 +158,6 @@ function handleQuery() {
   getList()
 }
 
-function resetQuery() {
-  queryParams.value.question = ''
-  handleQuery()
-}
-
 const dialogAddForm = ref(null)
 function handleEdit(item) {
   dialogAddForm.value.open(item, chapterOptions.value)

From 6baa78a94f093576621d3b5d01dffd3afc4d0d66 Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Mon, 3 Mar 2025 23:44:10 +0800
Subject: [PATCH 09/11] sc

---
 src/views/XjApplet/Resell/index.vue           | 11 ++++++++++-
 src/views/XjApplet/Vip/components/VipUser.vue |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/views/XjApplet/Resell/index.vue b/src/views/XjApplet/Resell/index.vue
index 884bf00..daa981c 100644
--- a/src/views/XjApplet/Resell/index.vue
+++ b/src/views/XjApplet/Resell/index.vue
@@ -19,6 +19,8 @@
       <el-table-column prop="phone" label="手机号" />
       <el-table-column prop="name" label="姓名" />
       <el-table-column prop="mark" label="标记" />
+      <el-table-column prop="memberName" label="赠送会员" />
+      <el-table-column prop="discountDiscription" label="赠送折扣" />
       <el-table-column label="小程序码" align="center" width="120px">
         <template #default="{ row }">
           <img :src="row.appletUrl" style="width: 80px; height: 80px" />
@@ -152,6 +154,13 @@ function getList() {
 
 function handleAdd() {
   showDialog.value = true
+  form.value = {
+    phone: '',
+    name: '',
+    mark: '',
+    discountId: undefined,
+    memberId: undefined
+  }
 }
 function handleEdit(row) {
   form.value = { ...row }
@@ -165,7 +174,7 @@ async function handleSave() {
   if (!valid) return
 
   // 调用接口
-  if (form.value.id) {
+  if (form.value.distributionId) {
     updateResell(form.value).then(() => {
       message.success('修改成功')
       showDialog.value = false
diff --git a/src/views/XjApplet/Vip/components/VipUser.vue b/src/views/XjApplet/Vip/components/VipUser.vue
index b25e95a..d66f123 100644
--- a/src/views/XjApplet/Vip/components/VipUser.vue
+++ b/src/views/XjApplet/Vip/components/VipUser.vue
@@ -39,7 +39,7 @@
         </template>
       </el-table-column>
       <el-table-column label="科目" align="left" prop="subjects" min-width="100" />
-      <el-table-column label="来源" align="left" prop="useType" min-width="100" />
+      <el-table-column label="来源" align="left" prop="useTypeName" min-width="100" />
       <el-table-column label="截止日期" align="left" prop="endDate" min-width="120" />
       <el-table-column label="操作人" align="left" prop="operUser" min-width="100" />
       <el-table-column label="操作时间" align="left" prop="createTime" min-width="120" />

From 3ec039050fdb2a63d8b29b715ee610781de38431 Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Tue, 4 Mar 2025 17:28:13 +0800
Subject: [PATCH 10/11] sc

---
 src/router/modules/remaining.ts               | 42 +++++++++----------
 .../XjApplet/Vip/components/VipDiscount.vue   | 10 +++++
 src/views/XjApplet/Vip/components/VipType.vue | 12 +++++-
 3 files changed, 42 insertions(+), 22 deletions(-)

diff --git a/src/router/modules/remaining.ts b/src/router/modules/remaining.ts
index 348d8ae..fdd7af5 100644
--- a/src/router/modules/remaining.ts
+++ b/src/router/modules/remaining.ts
@@ -129,27 +129,27 @@ const remainingRouter: AppRouteRecordRaw[] = [
   //     }
   //   ]
   // },
-  {
-    path: '/Basic',
-    component: Layout,
-    name: 'Basic',
-    meta: { title: '菜单管理' },
-    redirect: '/Basic/menu',
-    children: [
-      {
-        path: 'menu',
-        component: () => import('@/views/Basic/Menu/index.vue'),
-        name: 'Menu',
-        meta: {
-          canTo: true,
-          hidden: true,
-          noTagsView: false,
-          icon: 'ep:user',
-          title: '菜单管理'
-        }
-      }
-    ]
-  },
+  // {
+  //   path: '/Basic',
+  //   component: Layout,
+  //   name: 'Basic',
+  //   meta: { title: '菜单管理' },
+  //   redirect: '/Basic/menu',
+  //   children: [
+  //     {
+  //       path: 'menu',
+  //       component: () => import('@/views/Basic/Menu/index.vue'),
+  //       name: 'Menu',
+  //       meta: {
+  //         canTo: true,
+  //         hidden: true,
+  //         noTagsView: false,
+  //         icon: 'ep:user',
+  //         title: '菜单管理'
+  //       }
+  //     }
+  //   ]
+  // },
   {
     path: '/login',
     component: () => import('@/views/Login/Login.vue'),
diff --git a/src/views/XjApplet/Vip/components/VipDiscount.vue b/src/views/XjApplet/Vip/components/VipDiscount.vue
index 0a62e5a..875e731 100644
--- a/src/views/XjApplet/Vip/components/VipDiscount.vue
+++ b/src/views/XjApplet/Vip/components/VipDiscount.vue
@@ -228,6 +228,16 @@ const rules = ref({
 
 function addDiscount() {
   showDialog.value = true
+  form.value = {
+    discountType: '1',
+    subject: '1',
+    param1: undefined,
+    param2: undefined,
+    discount: undefined,
+    duration: undefined,
+    unit: '1',
+    description: undefined
+  }
 }
 
 function editDiscount(row) {
diff --git a/src/views/XjApplet/Vip/components/VipType.vue b/src/views/XjApplet/Vip/components/VipType.vue
index 0ebed54..39c80b8 100644
--- a/src/views/XjApplet/Vip/components/VipType.vue
+++ b/src/views/XjApplet/Vip/components/VipType.vue
@@ -164,7 +164,17 @@ const rules = ref({
 
 function addVip() {
   showDialog.value = true
-  form.value.carTypeId = searchForm.value.carTypeId
+
+  form.value.carTypeId = {
+    memberName: '',
+    carTypeId: searchForm.value.carTypeId,
+    subjects: [],
+    price: '',
+    discount: '',
+    duration: '',
+    unit: 1,
+    useTypes: [1]
+  }
 }
 
 function editVip(row) {

From a8bf678f2ed9a01b15c35013c285efe4f6ab356e Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Tue, 15 Apr 2025 12:18:59 +0800
Subject: [PATCH 11/11] sc

---
 src/styles/index.scss | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/styles/index.scss b/src/styles/index.scss
index f471a55..4973408 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -95,4 +95,16 @@
     align-items: center;
     font-size: 16px;
   }
+}
+
+/* 去除 Chrome、Safari、Edge、Opera 中的指示器 */
+.el-input__inner::-webkit-outer-spin-button,
+.el-input__inner::-webkit-inner-spin-button {
+  -webkit-appearance: none;
+  margin: 0;
+}
+
+/* 去除 Firefox 中的指示器 */
+.el-input__inner[type='number'] {
+  -moz-appearance: textfield;
 }
\ No newline at end of file