From e7c6081ea6ebf348d2f39ed6d81fd50e756024bb Mon Sep 17 00:00:00 2001
From: axlrose2333 <690927457@qq.com>
Date: Tue, 18 Apr 2023 14:33:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=81=E7=BB=AD=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/view/course/addCourse/index.vue           |  3 ++-
 src/view/course/components/exercisesPool.vue  |  2 +-
 src/view/dealDetailManage/dealDetailMoney.vue | 10 ++++++++++
 src/view/exercisesManage/index.vue            |  3 ++-
 src/view/financeManage/index.vue              |  4 ++--
 src/view/integralManage/index.vue             |  9 +++++----
 src/view/lbtManage/index.vue                  |  2 +-
 src/view/marketManage/brokerage/index.vue     | 10 +++++-----
 src/view/teacherManage/teacherDetail.vue      |  3 ++-
 src/view/userManage/view.vue                  |  2 +-
 10 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/src/view/course/addCourse/index.vue b/src/view/course/addCourse/index.vue
index 12ee50c..846380c 100644
--- a/src/view/course/addCourse/index.vue
+++ b/src/view/course/addCourse/index.vue
@@ -241,7 +241,7 @@ async function enterVerifyDialog() { // 审核提交
   const status = transferStateFromVerify(verifyForm.value.is_pass)
   // console.log(status)
   const res = await api.verifyCourse({
-    course_id:verifyForm.value.course_id,
+    course_id:parseInt(course_id.value),
     status
   })
   if(res.code === 0) {
@@ -251,6 +251,7 @@ async function enterVerifyDialog() { // 审核提交
     })
     // closeVerifyVisibleDialog()
     // getCourseList()
+    verifyVisible.value = false
     getCourseInfo()
   }
   else{
diff --git a/src/view/course/components/exercisesPool.vue b/src/view/course/components/exercisesPool.vue
index e0b0ab0..b25d4a4 100644
--- a/src/view/course/components/exercisesPool.vue
+++ b/src/view/course/components/exercisesPool.vue
@@ -192,7 +192,7 @@ function selectFunc(row, index) {
                 <div v-html="getExercisesName(scope.row)"></div>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="创建者" min-width="150" prop="teacher_id" />
+            <el-table-column align="left" label="分值" min-width="150" prop="score" />
           </el-table>
           <div class="gva-pagination">
             <el-pagination
diff --git a/src/view/dealDetailManage/dealDetailMoney.vue b/src/view/dealDetailManage/dealDetailMoney.vue
index a0e179e..050155b 100644
--- a/src/view/dealDetailManage/dealDetailMoney.vue
+++ b/src/view/dealDetailManage/dealDetailMoney.vue
@@ -34,6 +34,7 @@ const dealTypeList = ref([
   },
 ])
 const deal_types = ref([])
+const std_price_arr = ['balance','consume']
 // 生命周期
 onMounted(() => {
   queryParams.value.id = parseInt(route.params.user_id)
@@ -47,6 +48,15 @@ async function getDealMoneyList() {
     tableData.value = res.data.records
     total.value = res.data.total
     console.log(res.data)
+    for(let item of tableData.value) {
+      for(let prop in item) {
+        if(std_price_arr.includes(prop)) {
+          // console.log(111)
+          item[prop] = Number((item[prop]/100).toFixed(2))
+        }
+      }
+    }
+    
   }
 }
 function onSubmit() {
diff --git a/src/view/exercisesManage/index.vue b/src/view/exercisesManage/index.vue
index 56c164d..6c5dfb6 100644
--- a/src/view/exercisesManage/index.vue
+++ b/src/view/exercisesManage/index.vue
@@ -285,7 +285,8 @@ function delet_func(item) {
             <div v-html="getExercisesName(scope.row)"></div>
           </template>
         </el-table-column>
-        <el-table-column align="left" label="创建者" min-width="150" prop="teacher_id" />
+        <el-table-column align="left" label="分值" prop="score" />
+        <!-- <el-table-column align="left" label="创建者" min-width="150" prop="teacher_id" /> -->
         <el-table-column align="left" label="创建时间" min-width="150" >
           <template #default="scope">
             {{formatDate(scope.row.CreatedAt)}}
diff --git a/src/view/financeManage/index.vue b/src/view/financeManage/index.vue
index 14665c3..9b9bb0f 100644
--- a/src/view/financeManage/index.vue
+++ b/src/view/financeManage/index.vue
@@ -66,10 +66,10 @@ async function getFinanceInfo() {
     </div>
     <div class="total-box">
       <div class="tb-item">
-        今日收益：{{financeInfo.today_income}}
+        今日收益：{{financeInfo.today_income/100}}
       </div>
       <div class="tb-item">
-        累计总收益：{{financeInfo.total_income}}
+        累计总收益：{{financeInfo.total_income/100}}
       </div>
     </div>
   </div>
diff --git a/src/view/integralManage/index.vue b/src/view/integralManage/index.vue
index 5cc2a5e..6340ddf 100644
--- a/src/view/integralManage/index.vue
+++ b/src/view/integralManage/index.vue
@@ -40,6 +40,7 @@ const content = ref(null)
 const exam_types = ref([])
 const exam_ids = ref([])
 import cityList from '@/utils/city.json';
+console.log(cityList)
 // const cityList = ref([])
 // 生命周期
 onMounted(() => {
@@ -232,10 +233,10 @@ async function integralOperationFunc(type,row) { // 冻结 解冻
         <el-form-item label="所属区域">
           <el-select v-model="queryParams.province" filterable placeholder="请选择">
             <el-option
-              v-for="item in cityList"
-              :key="item.ProID"
-              :label="item.name"
-              :value="item.ProID"
+              v-for="(item,i) in cityList"
+              :key="item.province"
+              :label="item.province"
+              :value="i"
             />
           </el-select>
         </el-form-item>
diff --git a/src/view/lbtManage/index.vue b/src/view/lbtManage/index.vue
index 0ff4a76..cc6a0d1 100644
--- a/src/view/lbtManage/index.vue
+++ b/src/view/lbtManage/index.vue
@@ -25,7 +25,7 @@ const form = ref({status:'1'})
 const lbtType_options = ref([
   {
     label:'首页',
-    value:'1'
+    value:1
   }
 ])
 const rules = ref({
diff --git a/src/view/marketManage/brokerage/index.vue b/src/view/marketManage/brokerage/index.vue
index b664825..d94433c 100644
--- a/src/view/marketManage/brokerage/index.vue
+++ b/src/view/marketManage/brokerage/index.vue
@@ -23,8 +23,8 @@ const brokerageFormRules = ref({
   exam_assistant_teacher:[{ required: true, message: '请输入助教推荐老师佣金', trigger: 'blur'},
   { type: 'number', message: '请输入正确的格式' }],
   reward_first:[{ required: true, message: '请输入测试第一名佣金占比', trigger: 'blur' }],
-  reward_second:[{ required: true, message: '请输入测试第二名佣金占比', trigger: 'blur' }],
-  reward_third:[{ required: true, message: '请输入测试第三名佣金占比', trigger: 'blur' }],
+  // reward_second:[{ required: true, message: '请输入测试第二名佣金占比', trigger: 'blur' }],
+  // reward_third:[{ required: true, message: '请输入测试第三名佣金占比', trigger: 'blur' }],
   course_assistant:[{ required: true, message: '请输入助教佣金占比', trigger: 'blur' }],
   course_manage:[{ required: true, message: '请输入主管佣金占比', trigger: 'blur' }],
   course_teacher:[{ required: true, message: '请输入教师佣金占比', trigger: 'blur' }],
@@ -32,7 +32,7 @@ const brokerageFormRules = ref({
   course_assistant_teacher:[{ required: true, message: '请输入助教推荐老师佣金占比', trigger: 'blur' }],
 })
 const brokerageFormRef = ref(null)
-const std_percent_arr = ['course_assistant','course_manage','course_teacher','course_assistant_assistant','course_assistant_teacher']
+const std_percent_arr = ['course_assistant','course_manage','course_teacher','course_assistant_assistant','course_assistant_teacher','reward_first']
 // 方法
 async function getBrokerage() {
   const res = await api.getBrokerage()
@@ -98,12 +98,12 @@ async function saveData() {
       <el-form-item label="测试第一名奖金分佣(%)" prop="reward_first">
           <el-input type="number" v-model.number="brokerageForm.reward_first" placeholder="请输入测试第一名奖金分佣佣金" autocomplete="off" />
       </el-form-item>
-      <el-form-item label="测试第二名奖金分佣(%)" prop="reward_second">
+      <!-- <el-form-item label="测试第二名奖金分佣(%)" prop="reward_second">
           <el-input type="number" v-model.number="brokerageForm.reward_second" placeholder="请输入测试第二名奖金分佣佣金" autocomplete="off" />
       </el-form-item>
       <el-form-item label="测试第三名奖金分佣(%)" prop="reward_third">
           <el-input type="number" v-model.number="brokerageForm.reward_third" placeholder="请输入测试第三名奖金分佣佣金" autocomplete="off" />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>课程佣金设置</el-form-item>
       <el-form-item label="助教(%)" prop="course_assistant">
           <el-input type="number" v-model.number="brokerageForm.course_assistant" placeholder="请输入助教佣金占比" autocomplete="off" />
diff --git a/src/view/teacherManage/teacherDetail.vue b/src/view/teacherManage/teacherDetail.vue
index df41535..2880cc3 100644
--- a/src/view/teacherManage/teacherDetail.vue
+++ b/src/view/teacherManage/teacherDetail.vue
@@ -11,6 +11,7 @@ import {formatDate} from '@/utils/format'
 import {ref,onMounted,provide } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { useRouter, useRoute } from 'vue-router'
+import cityList from '@/utils/city.json';
 const router = useRouter()
 const route = useRoute()
 // 变量
@@ -129,7 +130,7 @@ function toDealDetail(type) {
         <div class="dib-row">
           <div class="dib-item">
             <div class="di-left">区域：</div>
-            <div class="di-right">{{teacherInfo.province}}</div>
+            <div class="di-right">{{cityList[teacherInfo.province]?.province}}</div>
           </div>
           <div class="dib-item">
             <div class="di-left">提交时间：</div>
diff --git a/src/view/userManage/view.vue b/src/view/userManage/view.vue
index a070ac0..ecc3101 100644
--- a/src/view/userManage/view.vue
+++ b/src/view/userManage/view.vue
@@ -82,7 +82,7 @@ function toDealDetail(type) {
           身份：学员
         </div>
         <div class="bb-item">
-          邀请人数：105人
+          邀请人数：{{userManageInfo.invite_num}}人
         </div>
       </div>
     </div>