Merge branch 'master' of 121.36.198.49:zy_duanju/zhiyu_duanju_distribution_manage_front into pansl

.env.example

@@ -2,7 +2,7 @@ APP_NAME=内容中台管理系统
 APP_ENV=local
 APP_KEY=
 APP_DEBUG=true
-APP_URL=http://api.zynrzt.com
+APP_URL=http://api.admin.zyduanju.com
 
 LOG_CHANNEL=stack
 LOG_DEPRECATIONS_CHANNEL=null

src/api/cp/index.ts

@@ -3,20 +3,20 @@ import http from '@/api/http';
  * cp选择项
  */
 export function cpOptions(params: object) {
-  return http.get('/contentManage/cp/options', params);
+  return http.get('/cpManage/cp/options', params);
 }
 /**
  * 数据中心列表
  */
 export function subscribeStatisticDataList(params: object) {
-  return http.get('/contentManage/cp/subscribeStatisticData/list', params);
+  return http.get('/cpManage/cp/subscribeStatisticData/list', params);
 }
 /**
  * 数据中心列表
  */
 export function subscribeStatisticDataListStatistic(params: object) {
   return http.get(
-    '/contentManage/cp/subscribeStatisticData/listStatistic',
+    '/cpManage/cp/subscribeStatisticData/listStatistic',
     params
   );
 }
@@ -24,20 +24,20 @@ export function subscribeStatisticDataListStatistic(params: object) {
  * cp结算列表
  */
 export function subscribeStatisticDataMonthList(params: object) {
-  return http.get('/contentManage/cp/subscribeStatisticData/monthList', params);
+  return http.get('/cpManage/cp/subscribeStatisticData/monthList', params);
 }
 /**
  * cp列表
  */
 export function cpManageCpList(params?: object) {
-  return http.get('/contentManage/cp/manage/cp_list', params);
+  return http.get('/cpManage/cp/manage/cp_list', params);
 }
 /**
  * cp结算列表-某个cp某月的全部书籍结算金额导出
  */
 export function exportListCpMonthFinalAmount(params: object) {
   return http.get(
-    '/contentManage/cp/subscribeStatisticData/listCpMonthFinalAmount',
+    '/cpManage/cp/subscribeStatisticData/listCpMonthFinalAmount',
     params
   );
 }

src/views/contentManage/cpList/form/create.vue

@@ -1,10 +1,10 @@
 <template>
   <el-form :model="formData" label-width="120px" ref="form" v-loading="loading" class="pr-4">
     <el-form-item label="cp名称" prop="cp_name"
-      :rules="[{ required: true, message: 'cp名称必须填写' }, { pattern: /^zy_[A-Za-z_]+$/, message: '必须以zy_开头且只允许英文和下划线', trigger: 'blur' }]">
+      :rules="[{ required: true, message: 'cp名称必须填写' }]">
       <el-input v-model="formData.cp_name" v-if="formData.cp_id" readonly name="cp_name" clearable />
       <el-input v-model="formData.cp_name" v-else name="cp_name" clearable />
-      <label style="color: red;">注意：cp名称必须以zy_开头</label>
+      <!-- <label style="color: red;">注意：cp名称必须以zy_开头</label> -->
     </el-form-item>
     <el-form-item label="cp简称" prop="cp_nick" :rules="[{ required: true, message: 'cp简称必须填写' }]">
       <el-input v-model="formData.cp_nick" name="cp_nick" clearable />
@@ -15,7 +15,7 @@
     <el-form-item label="联系人" prop="manager" :rules="[]">
       <el-input v-model="formData.manager" name="manager" clearable />
     </el-form-item>
-    <el-form-item label="联系电话" prop="phone" :rules="[]">
+    <el-form-item label="联系电话" prop="phone" :rules="[ { pattern: /^1[3456789]\d{9}$/, message: '联系电话号码格式不正确', trigger: 'blur' }]">
       <el-input v-model="formData.phone" name="phone" clearable />
     </el-form-item>
     <el-form-item label="电子邮箱" prop="email" :rules="[
@@ -67,6 +67,7 @@ const emit = defineEmits(['close']);
 onMounted(() => {
   close(() => emit('close'));
 });
+
 </script>
 
 <style lang="scss" scoped></style>

src/views/contentManage/cpList/index.vue

@@ -11,7 +11,7 @@
       </template>
     </Search>
     <div class="table-default">
-      <Operate :show="open" v-action="'contentManage.cpList.store'" />
+      <Operate :show="open" v-action="'cpManage.cpList.store'" />
 
       <el-table :data="tableData" class="mt-3" v-loading="loading">
         <el-table-column type="index" width="100" label="序号" />
@@ -24,11 +24,11 @@
         <el-table-column prop="created_at" label="创建时间" />
         <el-table-column label="操作" width="200">
           <template #default="scope">
-            <el-button v-action="'contentManage.cpList.cpCollection'" @click="syncCp(scope.row)" type="primary" link
+            <el-button v-action="'cpManage.cpList.cpCollection'" @click="syncCp(scope.row)" type="primary" link
               size="small">同步CP书籍</el-button><br>
-            <el-button v-action="'contentManage.cpList.update'" @click="open(scope.row.cp_id)" type="primary" link
+            <el-button v-action="'cpManage.cpList.update'" @click="open(scope.row.cp_id)" type="primary" link
               size="small">编辑</el-button><br>
-            <el-button v-action="'contentManage.cpSettle.index'" @click="goToSettle(scope.row.cp_id, scope.row.cp_name)"
+            <el-button v-action="'cpManage.cpSettle.index'" @click="goToSettle(scope.row.cp_id, scope.row.cp_name)"
               type="primary" link size="small">结算列表</el-button><br>
           </template>
         </el-table-column>
@@ -59,7 +59,7 @@ import {
 } from '@/hook/curd/useOpen';
 import { cpCpCollection } from '@/api/cp/index'
 
-const api = 'contentManage/cp/manage/cp_list';
+const api = 'cpManage/cp/manage/cp_list';
 
 const syncCp = (row: object) => {
   console.log(row);
@@ -84,7 +84,7 @@ const syncCp = (row: object) => {
 }
 
 const goToSettle = (cp_id = 0, cp_name = '') => {
-  router.push({ path: '/contentManage/cpSettle', params: { cp_id: cp_id, cp_name } })
+  router.push({ path: '/cpManage/cpSettle', params: { cp_id: cp_id, cp_name } })
 }
 const { data, query, search, reset, loading } = useGetList(api);
 const { deleted } = useDestroy();

src/views/contentManage/cpSettle/index.vue

@@ -28,7 +28,7 @@
         <el-table-column prop="cp_company" label="所属公司" />
         <el-table-column prop="book_num" label="结算书本量" />
         <el-table-column prop="final_amount" label="结算金额" />
-        <el-table-column label="结算情况" v-action="'contentManage.CpSubscribeStatisticData.saveFinalState'">
+        <el-table-column label="结算情况" v-action="'cpManage.CpSubscribeStatisticData.saveFinalState'">
           <template #default="scope">
             <el-button v-if="scope.row.final_state == 'notCheck'" type="primary" size="default"
               @click="finalStateChange($event, scope.row)">点击结算</el-button>
@@ -68,7 +68,7 @@ const isShowCp = computed(() => {
   return userStore.getRoles?.some(el => (el?.identify == 'cp'))
 })
 
-const api = 'contentManage/cp/subscribeStatisticData/monthList';
+const api = 'cpManage/cp/subscribeStatisticData/monthList';
 // const start_date = moment().startOf('month').format('YYYY-MM')
 // const end_date = moment().endOf('month').format('YYYY-MM')
 const exportSingle = (item) => {

src/views/contentManage/dataCenter/index.vue

@@ -95,7 +95,7 @@ let cooperations = ref([
   { value: "share", name: "分成" }
 ]);
 
-const api = 'contentManage/cp/subscribeStatisticData/list';
+const api = 'cpManage/cp/subscribeStatisticData/list';
 
 const start_date = moment().startOf('month').format('YYYY-MM-DD')
 const end_date = moment().endOf('month').format('YYYY-MM-DD')