From 54840f8a9a40cfb300ebb11976f54a8256890f21 Mon Sep 17 00:00:00 2001
From: axlrose2333 <690927457@qq.com>
Date: Thu, 16 Mar 2023 18:28:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=BD=E5=A5=96=E7=AB=9E=E6=8B=8D=EF=BC=9B?=
 =?UTF-8?q?=E5=B8=82=E5=9C=BA=E7=AE=A1=E7=90=86=EF=BC=9B=E6=95=99=E5=B8=88?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/integral.js                           |  30 +-
 src/api/market.js                             |  15 +
 src/api/teacher.js                            |   7 +
 src/view/auctionManage/index.vue              |  11 +-
 src/view/drawManage/index.vue                 | 465 ++++++++++++++++++
 src/view/examinationManage/index.vue          |   9 +-
 .../assistantList/assistantDetail.vue         | 157 +++---
 src/view/marketManage/assistantList/index.vue |  32 +-
 src/view/marketManage/managerList/index.vue   | 237 +++++++++
 .../managerList/managerDetail.vue             | 249 ++++++++++
 .../teacherManage/assistantList/index.vue     |   2 +-
 11 files changed, 1100 insertions(+), 114 deletions(-)
 create mode 100644 src/view/drawManage/index.vue
 create mode 100644 src/view/marketManage/managerList/index.vue
 create mode 100644 src/view/marketManage/managerList/managerDetail.vue

diff --git a/src/api/integral.js b/src/api/integral.js
index 040ba1c..6ee24e0 100644
--- a/src/api/integral.js
+++ b/src/api/integral.js
@@ -36,6 +36,34 @@ const api = {
       method: 'delete',
       data
     })
-  }
+  },
+  getDrawList: data => {
+    return service({
+      url: '/lottery',
+      method: 'get',
+      params:data
+    })
+  },
+  addDrawData: data => { // 创建竞拍
+    return service({
+      url: '/lottery',
+      method: 'post',
+      data
+    })
+  },
+  editDrawData: data => { // 编辑竞拍
+    return service({
+      url: '/lottery',
+      method: 'post',
+      data
+    })
+  },
+  delDrawData: data => { // 删除竞拍
+    return service({
+      url: '/lottery',
+      method: 'delete',
+      data
+    })
+  },
 }
 export default api
diff --git a/src/api/market.js b/src/api/market.js
index 4a8924e..138c3a8 100644
--- a/src/api/market.js
+++ b/src/api/market.js
@@ -15,5 +15,20 @@ const api = {
       params:data
     })
   },
+  /*主管*/
+   getManagerList : data => { // 主管列表
+    return service({
+      url: '/manager',
+      method: 'get',
+      params:data
+    })
+  },
+  getManagerDetail: data => { // 主管详情
+    return service({
+      url: '/manager/'+data.managerId,
+      method: 'get',
+      params:data
+    })
+  },
 }
 export default api
diff --git a/src/api/teacher.js b/src/api/teacher.js
index cb5f964..dd998e8 100644
--- a/src/api/teacher.js
+++ b/src/api/teacher.js
@@ -28,5 +28,12 @@ const api = {
       params:data
     })
   },
+  assistantOperator : data => {// 审核提交-助教
+    return service({
+      url: '/assistant/change',
+      method: 'post',
+      data
+    })
+  },
 }
 export default api
diff --git a/src/view/auctionManage/index.vue b/src/view/auctionManage/index.vue
index 37a3d33..f01e354 100644
--- a/src/view/auctionManage/index.vue
+++ b/src/view/auctionManage/index.vue
@@ -192,8 +192,15 @@ async function saveData() {
   const params = {
     ...auctionForm.value
   }
+  let func = ''
+  if(params.id) { // 编辑
+    func = 'editAucitonData'
+  }
+  else{ // 新增
+    func = 'addAucitonData'
+  }
   // console.log(params);return
-  const res = await api.addAucitonData(params)
+  const res = await api[func](params)
   if(res.code === 0) {
     ElMessage({
       type: 'success',
@@ -404,7 +411,7 @@ function fileChange(index) {
        <template #footer>
           <div style="flex: auto">
             <el-button @click="cancelClick">取消</el-button>
-            <el-button type="primary" @click="confirmClick">立即添加</el-button>
+            <el-button type="primary" @click="confirmClick">确定</el-button>
           </div>
        </template>
     </el-drawer>
diff --git a/src/view/drawManage/index.vue b/src/view/drawManage/index.vue
new file mode 100644
index 0000000..21a76ac
--- /dev/null
+++ b/src/view/drawManage/index.vue
@@ -0,0 +1,465 @@
+
+<script setup>
+// 引入依赖
+import api from '@/api/integral'
+import custom from '@/utils/custom'
+import {formatDate} from '@/utils/format'
+import cityList from '@/utils/city.json'
+import {ref,onMounted,provide } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { useRouter, useRoute } from 'vue-router'
+const router = useRouter()
+const route = useRoute()
+// store
+import { useUserStore } from '@/pinia/modules/user'
+const userStore = useUserStore()
+// 变量
+const path = ref(import.meta.env.VITE_BASE_API)
+const queryParams = ref({
+  page:1,
+  pageSize:10,
+  key:'',
+  status:'',
+  sort:'',
+  current_page:1,
+  loading_egg:''
+})
+// const subjectParams = ref({
+//     pageIndex:1,
+//     pageSize:100,
+// })
+const state_arr = ref([
+    {
+      name:'报名中',
+      value:1
+    },
+    {
+      name:'取消',
+      value:2
+    },
+    {
+      name:'结束',
+      value:3
+    }
+])
+const tableData = ref([])
+const deleteVisible = ref(false)
+const total = ref(0)
+const draw_ids = ref([])
+// 生命周期
+onMounted(() => {
+  getDrawList()
+})
+// 方法
+async function getDrawList() {
+  const res = await api.getDrawList(queryParams.value)
+  if(res.code === 0) {
+    tableData.value = res.data.list
+    total.value = res.data.total
+  }
+}
+function onSubmit() {
+  getDrawList()
+}
+const onReset = () => {
+  queryParams.value = {
+    page:1,
+    pageSize:10,
+    key:'',
+    status:'',
+    sort:'',
+    current_page:1
+  }
+}
+async function onDelete() {
+  const ids = draw_ids.value
+  const res = await api.delDrawData({ ids:draw_ids.value })
+  if (res.code === 0) {
+    ElMessage({
+      type: 'success',
+      message: res.msg
+    })
+    deleteVisible.value = false
+    getDrawList()
+  }
+}
+const handleSelectionChange = (val) => {
+  draw_ids.value = val.map((item) => {
+      return item.id
+  })
+}
+function handleCurrentChange(val) {
+  queryParams.value.current_page = val
+  getDrawList()
+}
+function handleSizeChange(val) {
+  queryParams.value.pageSize = val
+  getDrawList()
+}
+// function viewTeacherFunc(row) { // 查看详情
+//   router.push({name:'teacherDetail',params:{id:row.teacher_info_id}})
+// }
+function getStateName(row) {
+  let name = ''
+  switch(row.status) {
+    case 1:
+      // 检查是否过期
+      if(row.end_time < (Date.parse(new Date()))) { // 已过期
+        name = '已结束';
+      }
+      else{
+        name = '报名中';
+      }
+      break;
+    case 2:
+      name = '已取消';
+      break;
+    case 0:
+      name = '已取消';
+      break;
+    case 3:
+      name = '已结束';
+      break;
+  }
+  return name
+}
+
+// 新增 & 编辑相关 ================
+const popupVisible = ref(false)
+const popupTitle = ref('')
+const drawForm = ref({})
+const drawFormRules = ref({
+  product_name: [{ required: true, message: '请输入商品名称', trigger: 'blur' }],
+  market_value:[{ required: true, message: '请输入市场价格', trigger: 'blur'},
+  { type: 'number', message: '请输入正确的格式',trigger: 'blur' }],
+  in_point:[{ required: true, message: '请输入参与积分', trigger: 'blur'},
+  { type: 'number', message: '请输入正确的格式' }],
+  full_member:[{ required: true, message: '请输入满员人数', trigger: 'blur'},
+  { type: 'number', message: '请输入正确的格式' }],
+  end_time:[{ required: true, message: '请输入截止时间', trigger: 'blur' }],
+  begin_time:[{ required: true, message: '请输入开始时间', trigger: 'blur' }],
+  product_cover:[{ required: true, message: '请选择商品封面', trigger: 'blur' }],
+})
+const drawFormRef = ref(null)
+function openDialog() {
+  drawForm.value = {}
+  popupTitle.value = '新增竞拍'
+  popupVisible.value = true
+}
+function editDrawFunc(row) {
+  popupTitle.value = '编辑竞拍'
+  popupVisible.value = true
+  drawForm.value = row
+}
+function delFunc(row) {
+  ElMessageBox.confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  })
+  .then(async() => {
+    console.log(1)
+    const res = await api.delDrawData({
+          ids:[row.id]
+    })
+    if (res.code === 0) {
+      ElMessage({
+        type: 'success',
+        message: '删除成功!'
+      })
+      getDrawList()
+    }
+  },() => {
+  })
+}
+function cancelClick() {
+  popupVisible.value = false
+}
+async function confirmClick() { //提交竞拍
+  submitForm(drawFormRef.value)
+}
+async function submitForm(formEl) {
+  if (!formEl) return
+  await formEl.validate((valid, fields) => {
+    if (valid) { // 验证通过
+      // console.log('submit!')
+      saveData()
+    } else {
+      // console.log('请填写完整信息!', fields)
+    }
+  })
+}
+async function saveData() {
+  const params = {
+    ...drawForm.value
+  }
+  let func = ''
+  if(params.id) { // 编辑
+    func = 'editDrawData'
+  }
+  else{ // 新增
+    func = 'addDrawData'
+  }
+  // console.log(params);return
+  const res = await api[func](params)
+  if(res.code === 0) {
+    ElMessage({
+      type: 'success',
+      message: res.msg
+    })
+    getDrawList()
+    cancelClick()
+  }
+}
+function handleAvatarSuccess(res) { // 图片上传回调
+  console.log(res)
+  drawForm.value[file_type.value[file_type_index]] = res.data.file.url
+
+}
+function beforeAvatarUpload(file) {
+  const isLt05M = file.size / 1024 / 1024 < 20
+  const isJPG = file.type.indexOf('image/') === -1
+  if (isJPG) {
+    ElMessage.error('文件格式错误，请上传图片类型,如：JPG，PNG后缀的文件')
+  }
+  if (!isLt05M) {
+    ElMessage.error('上传头像图片大小不能超过 2M!')
+  }
+  return !isJPG && isLt05M
+}
+const file_type = ref(['product_cover','product_introduce'])
+let file_type_index = 0
+function fileChange(index) {
+  console.log(index)
+  file_type_index = index
+}
+function loadingEggChange() {
+  console.log(drawForm.value)
+}
+</script>
+<template>
+  <div>
+    <!--    搜索框-->
+    <div class="gva-search-box">
+      <el-form ref="searchForm" :inline="true" :model="queryParams">
+        <el-form-item label="关键字">
+          <el-input v-model="queryParams.key" placeholder="根据关键字进行查询" />
+        </el-form-item>
+        <el-form-item label="状态">
+          <el-select v-model="queryParams.status" clearable placeholder="请选择">
+            <el-option
+              v-for="item in state_arr"
+              :key="item.value"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button size="small" type="primary" icon="search" @click="onSubmit">查询</el-button>
+          <el-button size="small" icon="refresh" @click="onReset">重置</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+    <!--    表格数据-->
+    <div class="gva-table-box">
+      <!--      批量操作-->
+      <div class="gva-btn-list">
+        <el-button size="small" type="primary" icon="plus" @click="openDialog('add')">新增</el-button>
+        <el-popover v-model="deleteVisible" placement="top" width="160">
+          <p>确定要删除吗？</p>
+          <div style="text-align: right; margin-top: 8px;">
+            <el-button size="small" type="primary" link @click="deleteVisible = false">取消</el-button>
+            <el-button size="small" type="primary" @click="onDelete">确定</el-button>
+          </div>
+          <template #reference>
+            <el-button icon="delete" size="small" type="danger" :disabled="!draw_ids.length" style="margin-left: 10px;" @click="deleteVisible = true">删除</el-button>
+          </template>
+        </el-popover>
+      </div>
+      <!--      数据列表-->
+      <el-table :data="tableData" @selection-change="handleSelectionChange">
+        <el-table-column
+          type="selection"
+          width="55"
+        />
+        <el-table-column align="center" label="ID"  prop="id" sortable="custom" />
+        <el-table-column align="center" label="商品名称" prop="product_name" />
+        <el-table-column align="center" label="商品图片">
+          <template #default="scope">
+            <img class="avatar-box" :src="scope.row.product_cover" alt="">
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="市场价值（元）" min-width="150" prop="market_value" />
+        <el-table-column align="center" label="参与积分"  prop="in_point" />
+        <el-table-column align="center" label="满员人数"  prop="full_member" />
+        <el-table-column align="center" label="发布日期" min-width="150" >
+          <template #default="scope">
+            {{custom.timestampToDate(scope.row.begin_time)}}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="截止日期" min-width="150" >
+          <template #default="scope">
+            {{custom.timestampToDate(scope.row.end_time)}}
+          </template>
+        </el-table-column>
+
+        <el-table-column align="center" label="已参与人数" min-width="150" prop="in_member" />
+        <el-table-column align="center" label="奖品装蛋" min-width="150" prop="loading_egg" >
+          <template #default="scope">
+            {{scope.row.loading_egg?'是':'否'}}
+          </template>
+        </el-table-column>
+<!--        <el-table-column align="center" label="最高积分" prop="most_point" />-->
+        <el-table-column align="center" label="状态">
+          <template #default="scope">
+            <div>{{getStateName(scope.row)}}</div>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" fixed="right" label="操作" width="200">
+          <template #default="scope">
+            <el-button
+              icon="view"
+              size="small"
+              type="primary"
+              link
+              @click="editDrawFunc(scope.row)"
+            >编辑</el-button>
+            <el-button
+              icon="delete"
+              size="small"
+              type="danger"
+              link
+              @click="delFunc(scope.row)"
+            >删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="gva-pagination">
+        <el-pagination
+          :current-page="queryParams.current_page"
+          :page-size="queryParams.pageSize"
+          :page-sizes="[10, 30, 50, 100]"
+          :total="total"
+          layout="total, sizes, prev, pager, next, jumper"
+          @current-change="handleCurrentChange"
+          @size-change="handleSizeChange"
+        />
+      </div>
+    </div>
+    <!-- 新增&编辑 窗口-->
+    <el-drawer
+      v-model="popupVisible"
+      :title="popupTitle"
+      direction="rtl"
+      size="50%"
+    >
+      <el-form ref="drawFormRef" class="form-box" :model="drawForm" :rules="drawFormRules" label-width="80px">
+        <el-form-item label="商品名称" prop="product_name">
+          <el-input v-model="drawForm.product_name" placeholder="请输入商品名称" autocomplete="off" />
+        </el-form-item>
+        <el-form-item label="奖品封面" prop="product_cover">
+          <el-upload
+            class="avatar-uploader"
+            :action="`${path}/fileUploadAndDownload/upload`"
+            :headers="{ 'x-token': userStore.token }"
+            :show-file-list="false"
+            :on-success="handleAvatarSuccess"
+            @click="fileChange(0)"
+            :before-upload="beforeAvatarUpload"
+          >
+            <img v-if="drawForm.product_cover" :src="drawForm.product_cover" class="img-container" />
+            <el-icon v-else class="avatar-uploader-icon"><Plus /></el-icon>
+          </el-upload>
+        </el-form-item>
+        <el-form-item label="市场价格"  prop="market_value">
+          <el-input v-model.number="drawForm.market_value" placeholder="请输入市场价格" autocomplete="off" />
+        </el-form-item>
+        <el-form-item prop="in_point" label="参与积分" >
+          <el-input v-model.number="drawForm.in_point" placeholder="请输入参与积分" autocomplete="off" />
+        </el-form-item>
+        <el-form-item prop="full_member" label="满员人数" >
+          <el-input v-model.number="drawForm.full_member" placeholder="请输入满员人数" autocomplete="off" />
+        </el-form-item>
+        <el-form-item label="开始日期" prop="begin_time" >
+          <el-date-picker
+            v-model="drawForm.begin_time"
+            type="datetime"
+            placeholder="开始日期"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="x"
+          />
+        </el-form-item>
+        <el-form-item label="截止日期" prop="end_time" >
+          <el-date-picker
+            v-model="drawForm.end_time"
+            type="datetime"
+            placeholder="截止日期"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="x"
+          />
+        </el-form-item>
+        <el-form-item label="奖品装蛋" >
+          <el-switch @change="loadingEggChange" v-model="drawForm.loading_egg" active-text="是" inactive-text="否" :active-value="true" inactive-value="false"  />
+        </el-form-item>
+        <el-form-item label="奖品详情" prop="product_introduce">
+          <el-upload
+            class="avatar-uploader"
+            :action="`${path}/fileUploadAndDownload/upload`"
+            :headers="{ 'x-token': userStore.token }"
+            :show-file-list="false"
+            :on-success="handleAvatarSuccess"
+            @click="fileChange(1)"
+            :before-upload="beforeAvatarUpload"
+          >
+            <img v-if="drawForm.product_introduce" :src="drawForm.product_introduce" class="img-container" />
+            <el-icon v-else class="avatar-uploader-icon"><Plus /></el-icon>
+          </el-upload>
+        </el-form-item>
+        <el-form-item label="启用状态" prop="status">
+          <el-switch v-model="drawForm.status" :active-value="1" :inactive-value="2" active-text="启用" inactive-text="禁用" />
+        </el-form-item>
+
+      </el-form>
+       <template #footer>
+          <div style="flex: auto">
+            <el-button @click="cancelClick">取消</el-button>
+            <el-button type="primary" @click="confirmClick">确定</el-button>
+          </div>
+       </template>
+    </el-drawer>
+  </div>
+</template>
+<style scoped lang="scss">
+  .form-box{
+    padding: 10px;
+  }
+  .img-container{
+    width: 200px;
+    height: 150px;
+  }
+  .avatar-box{
+    width: 50px;
+    height: 50px;
+    border-radius: 50%;
+    border: 1px solid #dbdbdb;
+  }
+  .e-img{
+    width: 150px;
+    height: 100px;
+  }
+  .option-item{
+    display: flex;
+    align-items: center;
+    margin-bottom: 10px;
+  }
+  .button-box {
+    padding: 10px 20px;
+    .el-button {
+      float: right;
+    }
+  }
+  .warning {
+    color: #dc143c;
+  }
+</style>
diff --git a/src/view/examinationManage/index.vue b/src/view/examinationManage/index.vue
index b851794..22a15ab 100644
--- a/src/view/examinationManage/index.vue
+++ b/src/view/examinationManage/index.vue
@@ -404,7 +404,7 @@ function addGroupFunc(data) {
             :on-success="handleAvatarSuccess"
             :before-upload="beforeAvatarUpload"
           >
-            <img v-if="form.cover" :src="form.cover" class="avatar" />
+            <img v-if="form.cover" :src="form.cover" class="avatar avatar-uploader-img" />
             <el-icon v-else class="avatar-uploader-icon"><Plus /></el-icon>
           </el-upload>
         </el-form-item>
@@ -443,6 +443,13 @@ function addGroupFunc(data) {
   </div>
 </template>
 <style scoped lang="scss">
+  .avatar-uploader-img{
+    width: 178px;
+    height: 178px;
+  }
+  .avatar-uploader{
+
+  }
   .rb-item{
     margin-bottom: 10px;
   }
diff --git a/src/view/marketManage/assistantList/assistantDetail.vue b/src/view/marketManage/assistantList/assistantDetail.vue
index fc8a123..d9846b8 100644
--- a/src/view/marketManage/assistantList/assistantDetail.vue
+++ b/src/view/marketManage/assistantList/assistantDetail.vue
@@ -39,10 +39,10 @@ function actionFunc(type) {
   a_type.value = type
   switch (type){
     case 3:
-      tip_text.value = '是否同意该教师申请？';
+      tip_text.value = '是否同意该助教申请？';
       break;
     case 2:
-      tip_text.value = '是否拒绝该教师申请？';
+      tip_text.value = '是否拒绝该助教申请？';
       break;
   }
 }
@@ -91,7 +91,7 @@ function getStateName(state) {
           ID：{{assistantInfo.user_id}}
         </div>
         <div class="bb-item">
-          注册时间：{{assistantInfo.created_at}}
+          注册时间：{{formatDate(assistantInfo.created_at)}}
         </div>
         <div class="bb-item">
           身份：助教
@@ -101,7 +101,7 @@ function getStateName(state) {
 <!--        </div>-->
       </div>
     </div>
-    <!--    章节信息-->
+    <!--    详细信息-->
     <div class="gva-table-box">
       <div class="detail-info-box">
         <div class="dib-row">
@@ -127,123 +127,106 @@ function getStateName(state) {
         <div class="dib-row">
           <div class="dib-item">
             <div class="di-left">邀请人数：</div>
-            <div class="di-right">{{assistantInfo.assistant_info.num}}</div>
+            <div class="di-right">{{assistantInfo.invite_num}}</div>
           </div>
           <div class="dib-item">
             <div class="di-left">有效人数：</div>
-            <div class="di-right">{{assistantInfo.student_info.num}}</div>
+            <div class="di-right">{{assistantInfo.valid_num}}</div>
           </div>
         </div>
         <div class="dib-row">
           <div class="dib-item">
-            <div class="di-left">区域：</div>
-            <div class="di-right">{{assistantInfo.province}}</div>
-          </div>
-          <div class="dib-item">
-            <div class="di-left">提交时间：</div>
-            <div class="di-right">{{formatDate(assistantInfo.created_at)}}</div>
-          </div>
-          <div class="dib-item">
-            <div class="di-left">就职单位：</div>
-            <div class="di-right">重庆大学</div>
-          </div>
-          <div class="dib-item">
-            <div class="di-left">任职行业：</div>
-            <div class="di-right">金融</div>
+            <div class="di-left">管理学员：</div>
+            <div class="di-right">{{assistantInfo.student_num}}</div>
           </div>
         </div>
         <div class="dib-row">
           <div class="dib-item">
-            <div class="di-left">余额：</div>
-            <div class="di-right">{{assistantInfo.balance}}元</div>
+            <div class="di-left">课程订单：</div>
+            <div class="di-right">{{assistantInfo.course_num}}</div>
           </div>
           <div class="dib-item">
-            <div class="di-left">累计收益：</div>
-            <div class="di-right">{{assistantInfo.income}}元</div>
-          </div>
-          <div class="dib-item link-item">
-            <div class="di-left">查看交易明细</div>
-          </div>
-        </div>
-        <div class="dib-row">
-          <div class="dib-item">
-            <div class="di-left">上架课程：</div>
-            <div class="di-right">{{assistantInfo.publish_course}}门</div>
-          </div>
-          <div class="dib-item link-item">
-            <div class="di-left">查看课程列表</div>
-          </div>
-        </div>
-        <div class="dib-row">
-          <div class="dib-item">
-            <div class="di-left">上架测试：</div>
-            <div class="di-right">{{assistantInfo.publish_exam}}份</div>
-          </div>
-          <div class="dib-item link-item">
-            <div class="di-left ">查看试卷列表</div>
-          </div>
-        </div>
-        <div class="dib-row">
-          <div class="dib-item">
-            <div class="di-left">销售次数(课程)：</div>
-            <div class="di-right">{{assistantInfo.course_sale}}次</div>
-          </div>
-          <div class="dib-item">
-            <div class="di-left">累计金额：</div>
+            <div class="di-left">课程收益：</div>
             <div class="di-right">{{assistantInfo.course_income}}</div>
           </div>
-          <div class="dib-item link-item">
-            <div class="di-left">查看学习记录</div>
+        </div>
+        <div class="dib-row">
+          <div class="dib-item">
+            <div class="di-left">试卷订单：</div>
+            <div class="di-right">{{assistantInfo.exam_num}}</div>
+          </div>
+          <div class="dib-item">
+            <div class="di-left">试卷收益：</div>
+            <div class="di-right">{{assistantInfo.exam_income}}</div>
           </div>
         </div>
         <div class="dib-row">
           <div class="dib-item">
-            <div class="di-left">销售次数(测试)：</div>
-            <div class="di-right">{{assistantInfo.exam_sale}}次</div>
-          </div>
-          <div class="dib-item">
-            <div class="di-left">累计金额：</div>
-            <div class="di-right">{{assistantInfo.exam_income}}</div>
-          </div>
-          <div class="dib-item link-item">
-            <div class="di-left">查看测试记录</div>
+            <div class="di-left">推荐老师：</div>
+            <div class="di-right">{{assistantInfo.teacher_num}}</div>
           </div>
         </div>
-<!--        <div class="dib-row" style="margin-top: 50px">-->
+<!--        <div class="dib-row">-->
 <!--          <div class="dib-item">-->
-<!--            <div class="di-left">资质证书（多张）</div>-->
+<!--            <div class="di-left">授课总订单：</div>-->
+<!--            <div class="di-right">{{assistantInfo.assistant_info?.num}}</div>-->
 <!--          </div>-->
 <!--          <div class="dib-item">-->
-<!--            <el-image-->
-<!--              v-for="(item,i) in imgs"-->
-<!--              class="img-css"-->
-<!--              :src="item"-->
-<!--              :zoom-rate="1.2"-->
-<!--              :preview-src-list="imgs"-->
-<!--              :initial-index="4"-->
-<!--              fit="cover"-->
-<!--            />-->
+<!--            <div class="di-left">授课总收益：</div>-->
+<!--            <div class="di-right">{{assistantInfo.assistant_info?.num}}</div>-->
+<!--          </div>-->
+<!--        </div>-->
+<!--        <div class="dib-row">-->
+<!--          <div class="dib-item">-->
+<!--            <div class="di-left">试卷总订单：</div>-->
+<!--            <div class="di-right">{{assistantInfo.assistant_info?.num}}</div>-->
+<!--          </div>-->
+<!--          <div class="dib-item">-->
+<!--            <div class="di-left">试卷总收益：</div>-->
+<!--            <div class="di-right">{{assistantInfo.assistant_info?.num}}</div>-->
+<!--          </div>-->
+<!--        </div>-->
+        <div class="dib-row">
+          <div class="dib-item">
+            <div class="di-left">推荐助教：</div>
+            <div class="di-right">{{assistantInfo.assistant_num}}</div>
+          </div>
+        </div>
+<!--        <div class="dib-row">-->
+<!--          <div class="dib-item">-->
+<!--            <div class="di-left">课程总订单：</div>-->
+<!--            <div class="di-right">{{assistantInfo.assistant_info?.num}}</div>-->
+<!--          </div>-->
+<!--          <div class="dib-item">-->
+<!--            <div class="di-left">课程总收益：</div>-->
+<!--            <div class="di-right">{{assistantInfo.assistant_info?.num}}</div>-->
+<!--          </div>-->
+<!--        </div>-->
+<!--        <div class="dib-row">-->
+<!--          <div class="dib-item">-->
+<!--            <div class="di-left">试卷总订单：</div>-->
+<!--            <div class="di-right">{{assistantInfo.assistant_info?.num}}</div>-->
+<!--          </div>-->
+<!--          <div class="dib-item">-->
+<!--            <div class="di-left">试卷总收益：</div>-->
+<!--            <div class="di-right">{{assistantInfo.assistant_info?.num}}</div>-->
 <!--          </div>-->
 <!--        </div>-->
 
       </div>
       <!--    操作区域-->
-<!--      <div class="action-box" v-if="assistantInfo.status == 1">-->
-<!--        <div class="a-btn approved" @click="actionFunc(3)">同意</div>-->
-<!--        <div class="a-btn refuse" @click="actionFunc(2)">拒绝</div>-->
-<!--      </div>-->
-<!--      <div class="action-box" v-else>-->
-<!--        <div class="state-text" :class="{'reuse-text':assistantInfo.status == 2}">{{getStateName(assistantInfo.status)}}</div>-->
-<!--      </div>-->
-            <div class="action-box">
-              <div class="state-text" :class="{'reuse-text':assistantInfo.status == 2}">{{getStateName(assistantInfo.status)}}</div>
-            </div>
+      <div class="action-box" v-if="assistantInfo.status == 1">
+        <div class="a-btn approved" @click="actionFunc(3)">同意</div>
+        <div class="a-btn refuse" @click="actionFunc(2)">拒绝</div>
+      </div>
+      <div class="action-box" v-else>
+        <div class="state-text" :class="{'reuse-text':assistantInfo.status == 2}">{{getStateName(assistantInfo.status)}}</div>
+      </div>
     </div>
     <el-dialog
       v-model="dialogVisible"
       title="操作提醒"
       width="30%"
-      :before-close="handleClose"
     >
       <span>{{tip_text}}</span>
       <template #footer>
diff --git a/src/view/marketManage/assistantList/index.vue b/src/view/marketManage/assistantList/index.vue
index 02e402b..993363f 100644
--- a/src/view/marketManage/assistantList/index.vue
+++ b/src/view/marketManage/assistantList/index.vue
@@ -194,38 +194,26 @@ async function pOk() { // 审核提交
             <img class="avatar-box" :src="scope.row.avatar" alt="">
           </template>
         </el-table-column>
-        <el-table-column align="center" label="姓名" prop="nickname" />
-        <el-table-column align="center" label="手机号" min-width="150" prop="phone" />
+        <el-table-column align="center" min-width="150" label="姓名" prop="nickname" />
         <el-table-column align="center" label="申请时间" min-width="150" >
           <template #default="scope">
             {{formatDate(scope.row.created_at)}}
           </template>
         </el-table-column>
+        <el-table-column align="center" label="手机号" min-width="150" prop="phone" />
         <el-table-column align="center" label="所属区域" min-width="150">
           <template #default="scope">
-
-            {{scope.row.province>-1?cityList[scope.row.province].name:''}}
+            {{scope.row.province>-1?cityList[scope.row.province].name:'无'}}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="管理学员" prop="invite_id" />
-        <el-table-column align="center" label="课程订单" prop="invite_id" />
-        <el-table-column align="center" label="收益" prop="invite_id" />
-        <el-table-column align="center" label="试卷订单" prop="invite_id" />
-        <el-table-column align="center" label="收益" prop="invite_id" />
-        <el-table-column align="center" label="推荐老师" prop="invite_id" />
-        <el-table-column align="center" label="收益" prop="invite_id" />
+<!--        <el-table-column align="center" label="管理学员" prop="invite_id" />-->
+<!--        <el-table-column align="center" label="课程订单" prop="invite_id" />-->
+<!--        <el-table-column align="center" label="收益" prop="invite_id" />-->
+<!--        <el-table-column align="center" label="试卷订单" prop="invite_id" />-->
+<!--        <el-table-column align="center" label="收益" prop="invite_id" />-->
+<!--        <el-table-column align="center" label="推荐老师" prop="invite_id" />-->
+<!--        <el-table-column align="center" label="收益" prop="invite_id" />-->
 
-
-<!--        <el-table-column align="center" label="推荐人ID" prop="invite_id" />-->
-<!--        <el-table-column align="center" label="授课次数" prop="publish_course" />-->
-<!--        <el-table-column align="center" label="测试次数" prop="publish_exam" />-->
-<!--        <el-table-column align="center" label="累计销售" prop="exam_sale" />-->
-<!--        <el-table-column align="center" label="状态" prop="exam_sale">-->
-<!--          <template #default="scope">-->
-<!--            <div>{{scope.row.status == 1?'审核中':scope.row.status == 2?'已同意':'已拒绝'}}</div>-->
-<!--          </template>-->
-<!--        </el-table-column>-->
-<!--        <el-table-column align="center" label="审核说明" prop="desc" />-->
         <el-table-column align="center" fixed="right" label="操作" width="200">
           <template #default="scope">
             <el-button
diff --git a/src/view/marketManage/managerList/index.vue b/src/view/marketManage/managerList/index.vue
new file mode 100644
index 0000000..d1483bf
--- /dev/null
+++ b/src/view/marketManage/managerList/index.vue
@@ -0,0 +1,237 @@
+
+<script setup>
+// 引入依赖
+import api from '@/api/market'
+import custom from '@/utils/custom'
+import {formatDate} from '@/utils/format'
+import {ref,onMounted,provide } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { useRouter, useRoute } from 'vue-router'
+const router = useRouter()
+const route = useRoute()
+// 地区
+import cityList from '@/utils/city.json'
+// store
+import { useUserStore } from '@/pinia/modules/user'
+const userStore = useUserStore()
+// 变量
+// const path = ref(import.meta.env.VITE_BASE_API)
+const queryParams = ref({
+  page:1,
+  pageSize:10,
+  key:'',
+  province:''
+})
+// const subjectParams = ref({
+//     pageIndex:1,
+//     pageSize:100,
+// })
+const state_arr = ref([
+    {
+      name:'申请中',
+      id:1
+    },
+    {
+      name:'拒绝',
+      id:2
+    },
+    {
+      name:'同意',
+      id:3
+    }
+])
+const tableData = ref([])
+const deleteVisible = ref(false)
+const total = ref(0)
+// const dialogFormVisible = ref(false)
+// const dialogTitle = ref('')
+// const form =ref({})
+// const rules = ref({
+//   name: [{ required: true, message: '请输入课程名称', trigger: 'blur' }]
+// })
+const question_id = ref(0)
+const content = ref(null)
+const teacher_ids = ref([])
+// 生命周期
+onMounted(() => {
+  getManagerList()
+})
+// provide('subjectList', subjectList)
+// provide('current_subject', current_subject)
+// 方法
+async function getManagerList() {
+  const res = await api.getManagerList(queryParams.value)
+  if(res.code === 0) {
+    tableData.value = res.data.records
+    total.value = res.data.total
+  }
+}
+// async function getSubject(){ // 获取课程分类
+//   const res = await capi.getSubjectList(subjectParams.value)
+//   if(res.code === 0) {
+//     subjectList.value = custom.getStdSubject(res.data.records)
+//   }
+// }
+function onSubmit() {
+  getManagerList()
+}
+const onReset = () => {
+  queryParams.value = {
+    pageIndex:1,
+    pageSize:10,
+    name:'',
+    status:'',
+    subject:''
+  }
+}
+async function onDelete() {
+  const ids = teacher_ids.value
+  const res = await api.delExamination({ teacher_ids:ids })
+  if (res.code === 0) {
+    ElMessage({
+      type: 'success',
+      message: res.msg
+    })
+    deleteVisible.value = false
+    getManagerList()
+  }
+}
+const handleSelectionChange = (val) => {
+  teacher_ids.value = val.map((item) => {
+      return item.teacher_info_id
+  })
+}
+function handleCurrentChange(val) {
+  queryParams.value.pageIndex = val
+  getManagerList()
+}
+function handleSizeChange(val) {
+  queryParams.value.pageSize = val
+  getManagerList()
+}
+function viewManagerFunc(row) { // 查看详情
+  router.push({name:'managerDetail',params:{id:row.user_id}})
+}
+
+</script>
+<template>
+  <div>
+    <!--    搜索框-->
+    <div class="gva-search-box">
+      <el-form ref="searchForm" :inline="true" :model="queryParams">
+        <el-form-item label="主管名称">
+          <el-input v-model="queryParams.key" placeholder="根据主管名称进行查询" />
+        </el-form-item>
+        <el-form-item label="管辖区域">
+          <el-select v-model="queryParams.province" clearable placeholder="请选择">
+            <el-option
+              v-for="(item,index) in cityList"
+              :key="item.ProID"
+              :label="item.name"
+              :value="index"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button size="small" type="primary" icon="search" @click="onSubmit">查询</el-button>
+          <el-button size="small" icon="refresh" @click="onReset">重置</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+    <!--    表格数据-->
+    <div class="gva-table-box">
+      <!--      批量操作-->
+      <div class="gva-btn-list">
+        <el-button size="small" type="primary" icon="plus" @click="openDialog('add')">新增</el-button>
+        <el-popover v-model="deleteVisible" placement="top" width="160">
+          <p>确定要删除吗？</p>
+          <div style="text-align: right; margin-top: 8px;">
+            <el-button size="small" type="primary" link @click="deleteVisible = false">取消</el-button>
+            <el-button size="small" type="primary" @click="onDelete">确定</el-button>
+          </div>
+        </el-popover>
+      </div>
+      <!--      数据列表-->
+      <el-table :data="tableData" @selection-change="handleSelectionChange">
+        <el-table-column align="center" label="ID"  prop="user_id" sortable="custom" />
+        <el-table-column align="center" min-width="150" label="姓名" prop="nickname" />
+
+        <el-table-column align="center" label="开通时间" min-width="150" >
+          <template #default="scope">
+            {{formatDate(scope.row.CreatedAt)}}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="手机号" min-width="150" prop="phone" />
+        <el-table-column align="center" label="负责区域" min-width="150">
+          <template #default="scope">
+            {{scope.row.province>-1?cityList[scope.row.province].name:'无'}}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="域内市场助教" prop="assistant_num" />
+        <el-table-column align="center" label="域内市场学员" prop="student_num" />
+        <el-table-column align="center" label="课程订单" prop="course_num" />
+        <el-table-column align="center" label="佣金" prop="course_income" />
+        <el-table-column align="center" label="试卷订单" prop="exam_num" />
+        <el-table-column align="center" label="佣金" prop="exam_income" />
+
+        <el-table-column align="center" fixed="right" label="操作" width="200">
+          <template #default="scope">
+            <el-button
+              icon="view"
+              size="small"
+              type="primary"
+              link
+              @click="viewManagerFunc(scope.row)"
+            >查看</el-button>
+            <el-button
+              icon="delete"
+              size="small"
+              type="danger"
+              link
+              @click="processFunc(scope.row,3)"
+            >关闭</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="gva-pagination">
+        <el-pagination
+          :current-page="queryParams.page"
+          :page-size="queryParams.pageSize"
+          :page-sizes="[10, 30, 50, 100]"
+          :total="total"
+          layout="total, sizes, prev, pager, next, jumper"
+          @current-change="handleCurrentChange"
+          @size-change="handleSizeChange"
+        />
+      </div>
+    </div>
+    <!-- 新增&编辑 窗口-->git
+
+  </div>
+</template>
+<style scoped lang="scss">
+  .avatar-box{
+    width: 50px;
+    height: 50px;
+    border-radius: 50%;
+    border: 1px solid #dbdbdb;
+  }
+  .e-img{
+    width: 150px;
+    height: 100px;
+  }
+  .option-item{
+    display: flex;
+    align-items: center;
+    margin-bottom: 10px;
+  }
+  .button-box {
+    padding: 10px 20px;
+    .el-button {
+      float: right;
+    }
+  }
+  .warning {
+    color: #dc143c;
+  }
+</style>
diff --git a/src/view/marketManage/managerList/managerDetail.vue b/src/view/marketManage/managerList/managerDetail.vue
new file mode 100644
index 0000000..78a7b72
--- /dev/null
+++ b/src/view/marketManage/managerList/managerDetail.vue
@@ -0,0 +1,249 @@
+<script setup>
+// 引入依赖
+import api from '@/api/market'
+// import capi from '@/api/course'
+import custom from '@/utils/custom'
+import {formatDate} from '@/utils/format'
+// import { toSQLLine } from '@/utils/stringFun'
+// import WarningBar from '@/components/warningBar/warningBar.vue'
+// import coursePool from './components/coursePool.vue'
+// import exercisesPool from '@/view/course/components/exercisesPool.vue'
+import {ref,onMounted,provide } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { useRouter, useRoute } from 'vue-router'
+const router = useRouter()
+const route = useRoute()
+// 地区
+import cityList from '@/utils/city.json'
+// 变量
+const managerInfo = ref({})
+const imgs = ref([])
+// 生命周期
+onMounted(() => {
+  getManagerDetail()
+})
+// funstions
+async function getManagerDetail() {
+  const res = await api.getManagerDetail({managerId:route.params.id})
+  if(res.code === 0) {
+    managerInfo.value = res.data
+    // let teacher_cert = JSON.parse(res.data.teacher_cert)
+    // let skill_cert = JSON.parse(res.data.skill_cert)
+    // imgs.value = [...skill_cert,...teacher_cert]
+    // console.log(imgs.value)
+  }
+}
+const tip_text = ref('')
+const dialogVisible = ref(false)
+const a_type = ref(0)
+function actionFunc(type) {
+  dialogVisible.value = true
+  a_type.value = type
+  switch (type){
+    case 3:
+      tip_text.value = '是否同意该助教申请？';
+      break;
+    case 2:
+      tip_text.value = '是否拒绝该助教申请？';
+      break;
+  }
+}
+async function actionOk() { // 确认提交
+  const res = await api.teacherOperator({
+    teacher_id:managerInfo.value.user_id,
+    status:a_type.value
+  })
+  if(res.code === 0) {
+    ElMessage({
+      type: 'success',
+      message: res.msg
+    })
+    getManagerDetail()
+  }
+}
+function getStateName(state) {
+  let str = ''
+  switch (state){
+    case 1:
+        str = '待审核'
+      break;
+    case 2:
+        str = '已拒绝'
+      break;
+    case 3:
+        str = '已同意'
+      break;
+  }
+  return str
+}
+</script>
+<template>
+  <div>
+    助教详情
+    <!--    基本信息-->
+    <div class="gva-search-box">
+      <div class="baseInfo-box">
+        <div class="bb-item">
+          <img class="avatar" :src="managerInfo.avatar" alt="">
+        </div>
+        <div class="bb-item">
+          昵称：{{managerInfo.nickname}}
+        </div>
+        <div class="bb-item">
+          ID：{{managerInfo.user_id}}
+        </div>
+        <div class="bb-item">
+          注册时间：{{formatDate(managerInfo.CreatedAt)}}
+        </div>
+      </div>
+    </div>
+    <!--    详细信息-->
+    <div class="gva-table-box">
+      <div class="detail-info-box">
+        <div class="dib-row">
+          <div class="dib-item">
+            <div class="di-left">管理区域：</div>
+            <div class="di-right">{{managerInfo.province>-1?cityList[managerInfo.province].name:'无'}}</div>
+          </div>
+        </div>
+        <div class="dib-row">
+          <div class="dib-item">
+            <div class="di-left">身份证号码：</div>
+            <div class="di-right">{{managerInfo.id_card}}</div>
+          </div>
+          <div class="dib-item">
+            <div class="di-left">手机号码：</div>
+            <div class="di-right">{{managerInfo.phone}}</div>
+          </div>
+        </div>
+        <div class="dib-row">
+          <div class="dib-item">
+            <div class="di-left">域内助教人数：</div>
+            <div class="di-right">{{managerInfo.assistant_num}}</div>
+          </div>
+          <div class="dib-item">
+            <div class="di-left">域内学员人数：</div>
+            <div class="di-right">{{managerInfo.student_num}}</div>
+          </div>
+        </div>
+        <div class="dib-row">
+          <div class="dib-item">
+            <div class="di-left">课程总订单数：</div>
+            <div class="di-right">{{managerInfo.course_num}}</div>
+          </div>
+          <div class="dib-item">
+            <div class="di-left">课程总学费：</div>
+            <div class="di-right">{{managerInfo.course_income}}</div>
+          </div>
+          <div class="dib-item">
+            <div class="di-left">课程总佣金：</div>
+            <div class="di-right">{{managerInfo.course_income}}</div>
+          </div>
+        </div>
+        <div class="dib-row">
+          <div class="dib-item">
+            <div class="di-left">测试总订单数：</div>
+            <div class="di-right">{{managerInfo.exam_num}}</div>
+          </div>
+          <div class="dib-item">
+            <div class="di-left">测试总学费：</div>
+            <div class="di-right">{{managerInfo.exam_income}}</div>
+          </div>
+          <div class="dib-item">
+            <div class="di-left">测试总佣金：</div>
+            <div class="di-right">{{managerInfo.exam_income}}</div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <el-dialog
+      v-model="dialogVisible"
+      title="操作提醒"
+      width="30%"
+    >
+      <span>{{tip_text}}</span>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="dialogVisible = false">取消</el-button>
+          <el-button type="primary" @click="actionOk">
+            确定
+          </el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+<style scoped lang="scss">
+  .action-box{
+    display: flex;
+    margin-top: 20px;
+    justify-content: center;
+    .a-btn{
+      background: rgb(60, 106, 112);
+      color: white;
+      padding: 10px 50px;
+      cursor: pointer;
+      margin: 10px;
+          border-radius: 5px;
+    }
+    .approved{
+
+    }
+    .refuse{
+      background: white !important;
+      color:rgb(60, 106, 112) !important;
+      border: 1px solid rgb(60, 106, 112) !important;
+    }
+  }
+  /*基本信息*/
+  .gva-search-box{
+    .baseInfo-box{
+      display: flex;
+      align-items: center;
+      //justify-content: space-around;
+      .bb-item{
+        margin: 10px 20px;
+        .avatar{
+          width: 50px;
+          height: 50px;
+          border-radius: 50%;
+          border: 1px solid #cdcdcd;
+        }
+      }
+    }
+  }
+  /*详细信息*/
+  .text{
+    color: red !important;
+  }
+  .state-text{
+    font-size: 15px;
+    color: gray;
+  }
+  .gva-table-box{
+    .detail-info-box{
+      .dib-row{
+        overflow: hidden;
+        .link-item{
+          color: #3C6A70 !important;
+          cursor: pointer;
+        }
+        .dib-item{
+          //color: gray;
+          padding: 10px 0;
+          display: flex;
+          float: left;
+          margin-right: 30px;
+          .di-left{
+          }
+          .img-css{
+            width: 100px;
+            height: 100px;
+            margin: 0 10px 10px 0;
+            cursor: pointer;
+          }
+        }
+      }
+    }
+  }
+</style>
diff --git a/src/view/teacherManage/assistantList/index.vue b/src/view/teacherManage/assistantList/index.vue
index 1768422..cc96b41 100644
--- a/src/view/teacherManage/assistantList/index.vue
+++ b/src/view/teacherManage/assistantList/index.vue
@@ -136,7 +136,7 @@ function close_pv(){
   p_visible.value = false
 }
 async function pOk() { // 审核提交
-  const res = await api.teacherOperator({
+  const res = await api.assistantOperator({
     teacher_id:teacher_id.value,
     status:p_type.value,
     desc:pForm.value.desc