pansl před 1 rokem
rodič
revize
5048ebff52

+ 1 - 1
src/components/Upload/myUpload.vue

@@ -91,7 +91,7 @@ const props = withDefaults(defineProps<Props>(), {
   isCheckName: false,
   limitNum: 10,
   isDisableUpload: false,
-  maxFileSize: 0.3,
+  maxFileSize: 0.5,
   isShowTips: true,
   isLimitSize: true,
   action: "/qiniu/upload/image",

+ 16 - 13
src/views/chargeManage/chargeTemplate/form/create.vue

@@ -1,11 +1,16 @@
 <template>
   <el-card shadow="always" :body-style="{ padding: '20px' }">
+    <template #header>
+      <div class="card-header">
+        <span>{{ props.primary ? '编辑' : '添加' }}充值模板</span>
+      </div>
+    </template>
     <el-form :model="dataForm" label-width="120px" ref="form" v-loading="loading" class="pr-6">
       <el-form-item label="模板名称" prop="name"
         :rules="[{ required: true, message: '模板名称必须填写' }, { max: 20, message: '至多输入20个字符', trigger: 'blur' },]">
         <el-input :disabled="props.primary" class="item" v-model="dataForm.name" clearable />
       </el-form-item>
-      <el-form-item label="充值档位" prop="options" :rules="[{ required: true, message: '请选择通知类型' }]">
+      <el-form-item label="充值档位" prop="options" :rules="[{ required: true, message: '请添加充值档位' }]">
         <el-card class="w-full" shadow="never">
           <div class="pt-5 pl-2">
             <Add @click="openGears(null, null)" />
@@ -52,7 +57,7 @@
       </div>
     </el-form>
     <Dialog v-model="visibleGears" :title="title" width="40%" destroy-on-close>
-      <createGears @close="gearsClose" @success="success" :data="tableData" :primary="gearsData" :ismulSet="ismulSet" />
+      <createGears @close="gearsClose" @success="success" :data="tableData" :primary="gearsData" />
     </Dialog>
   </el-card>
 </template>
@@ -62,7 +67,8 @@ import { onMounted, ref } from 'vue';
 import {
   channelPaytemplateShow,
   channelPaytemplateStore,
-  channelPaytemplateUpdate
+  channelPaytemplateUpdate,
+  channelPaytemplateOptionTypeList
 } from '@/api/charge/index'
 import { FormInstance } from 'element-plus';
 import createGears from './createGears.vue'
@@ -72,11 +78,13 @@ const gearsData = ref()
 const tableData = ref([])
 const form = ref()
 const emit = defineEmits(['close']);
-const dataForm = ref({})
-import {
-  channelPaytemplateOptionTypeList,
-  channelPaytemplateOptionOptionSequence
-} from '@/api/charge/index'
+const dataForm = ref({ status: 1 })
+
+const title = computed(() =>
+  gearsData.value ?
+    '编辑充值档位' : '添加充值档位'
+)
+
 const optionTypeList = ref([]);
 const props = defineProps({
   primary: String | Number | Object,
@@ -128,8 +136,6 @@ const success = (e) => {
   } else {
     tableData.value.push(data)
   }
-
-  // emit('close')
 }
 const cancel = () => {
   emit('close')
@@ -157,14 +163,11 @@ const submitFormChange = (formEl: FormInstance | undefined) => {
         console.log(params, 'paramsparams');
         if (props.primary) {
           channelPaytemplateUpdate(dataForm.value.id, params).then(res => {
-            console.log(res, 'channelPaytemplateUpdatechannelPaytemplateUpdatechannelPaytemplateUpdate');
             loading.value = false;
             emit('close')
           })
-
         } else {
           channelPaytemplateStore(params).then(res => {
-            console.log(res, 'channelPaytemplateStorechannelPaytemplateStorechannelPaytemplateStore');
             loading.value = false;
             emit('close')
           })

+ 1 - 7
src/views/chargeManage/chargeTemplate/form/createGears.vue

@@ -108,27 +108,22 @@ const rules = reactive({
 });
 const init = () => {
   channelPaytemplateOptionTypeList().then(res => {
-    console.log(res);
     optionTypeList.value = res.data
 
   })
   channelPaytemplateOptionOptionSequence().then(res => {
-    console.log(res);
     optionSequence.value = res.data
   })
 }
 
 const sequenceChange = (e) => {
-  console.log(e, 'sequenceChangesequenceChange');
-  console.log(props.data, 'props.data');
   const findSequence = props.data.find(el => el.sequence == e.sequence)
-  console.log(findSequence, 'findSequencefindSequence');
   if (findSequence?.sequence_text) {
     ElMessage.error(`${findSequence.sequence_text},已存在请重新选择`)
     const timer = setTimeout(() => {
       formData.value.sequenceObj = ''
       clearTimeout(timer)
-    }, 30)
+    }, 300)
   }
 }
 
@@ -146,7 +141,6 @@ const submitForm = (formEl: FormInstance | undefined) => {
 }
 
 if (props.primary) {
-  console.log(props.primary, '88888888888');
   formData.value = JSON.parse(JSON.stringify(props.primary))
   formData.value.sequenceObj = { sequence_text: props.primary.sequence_text, sequence: props.primary.sequence }
   formData.value.typeObj = { type_name: props.primary.type_name, type: props.primary.type }

+ 1 - 1
src/views/cpManage/cpSettle/index.vue

@@ -26,7 +26,7 @@
         <el-table-column prop="cp_id" label="cpid" />
         <el-table-column prop="cp_name" label="cp名称" />
         <el-table-column prop="cp_company" label="所属公司" />
-        <el-table-column prop="book_num" label="结算书本量" />
+        <el-table-column prop="book_num" label="结算短剧量" />
         <el-table-column prop="final_amount" label="结算金额" />
         <el-table-column label="结算情况" v-action="'cpManage.CpSubscribeStatisticData.saveFinalState'">
           <template #default="scope">

+ 8 - 8
src/views/cpManage/dataCenter/index.vue

@@ -2,10 +2,10 @@
   <div>
     <Search :search="moreSearch" :reset="moreReset">
       <template v-slot:body>
-        <el-form-item label="书名">
+        <el-form-item label="短剧名称">
           <el-input v-model="query.book_name" name="book_name" clearable />
         </el-form-item>
-        <el-form-item label="bid">
+        <el-form-item label="短剧ID">
           <el-input v-model="query.bid" name="bid" clearable />
         </el-form-item>
         <el-form-item label="版权方" v-if="!isShowCp">
@@ -41,7 +41,7 @@
     <div style="margin:8px 0;">
       <el-card shadow="hover" :body-style="{ padding: '20px' }">
         <div class="stat-wrapper">
-          <div>订阅结算统计币: <span class="ml-2 mr-4 stat">{{ statisticalData.yesterday_total_coins || '暂无数据' }}</span></div>
+          <div>订阅结算统计币: <span class="ml-2 mr-4 stat">{{ statisticalData.yesterday_total_coins || '暂无数据' }}</span></div>
           <div>订阅的总金额: <span class="ml-2 mr-4 stat">{{ statisticalData.yesterday_available_amount || '暂无数据' }}</span>
           </div>
           <div>应结算金额: <span class="ml-2 mr-4 stat">{{ statisticalData.yesterday_final_amount || '暂无数据' }}</span></div>
@@ -50,13 +50,13 @@
     </div>
     <div class="table-default">
       <el-table :data="tableData" class="mt-3" v-loading="loading">
-        <el-table-column prop="book_name" label="书名" />
-        <el-table-column prop="bid" label="bid" />
+        <el-table-column prop="book_name" label="短剧名称" />
+        <el-table-column prop="bid" label="短剧ID" />
         <el-table-column prop="cp_name" label="版权方" />
-        <el-table-column prop="yesterday_total_coins" label="订单结算币" />
-        <el-table-column prop="yesterday_available_amount" label="订阅金额" />
+        <el-table-column prop="yesterday_total_coins" label="订单结算币" />
+        <el-table-column prop="yesterday_available_amount" label="充值金额" />
         <el-table-column prop="yesterday_final_amount" label="应结算金额" />
-        <el-table-column prop="book_settlement_type_str" label="书籍合作模式" />
+        <el-table-column prop="book_settlement_type_str" label="短剧合作模式" />
         <el-table-column prop="date" label="被结算日期" />
       </el-table>
       <Paginate />