菜单权限页优化等

src/views/Permissions/permissions/form/create.vue

@@ -1,7 +1,7 @@
 <template>
   <el-form :model="formData" label-width="85px" ref="form" v-loading="loading" class="pr-4">
     <div class="flex flex-row justify-between">
-      <div>
+      <div class="flex-1">
         <el-form-item label="菜单类型" prop="type">
           <el-radio-group v-model="formData.type">
             <el-radio-button v-for="item in [
@@ -17,6 +17,7 @@
         </el-form-item>
         <el-form-item label="所属模块" prop="module" :rules="[{ required: true, message: '所属模块必须填写' }]" v-if="!isAction">
           <Select v-model="formData.module" api="modules" @clear="clearModule" />
+          <el-input v-model="formData.module" disabled></el-input>
         </el-form-item>
         <el-form-item label="路由Path" prop="route" :rules="[{ required: true, message: '路由Path必须填写' }]" v-if="!isAction">
           <el-input v-model="formData.route" name="route" clearable />
@@ -28,7 +29,7 @@
           <el-input-number v-model="formData.sort" name="sort" :min="1" />
         </el-form-item>
       </div>
-      <div>
+      <div class="flex-1">
         <el-form-item label="父级菜单" prop="parent_id">
           <el-cascader :options="permissions" name="parent_id" v-model="formData.parent_id" clearable
             :props="{ value: 'id', label: 'permission_name', checkStrictly: true }" class="w-full" />
@@ -37,8 +38,8 @@
           v-if="!isTop">
           <el-input v-model="formData.permission_mark" name="permission_mark" clearable v-if="isAction" />
           <!-- <Select v-model="formData.permission_mark" placeholder="请选择" api="controllers" :query="{ module: formData.module }" v-else /> -->
-          <el-input v-model="formData.permission_mark" name="permission_mark" clearable />
-          <el-input v-model="action" disabled size="normal" clearable></el-input>
+          <el-input v-model="formData.permission_mark" name="permission_mark" clearable v-else />
+          <el-input v-model="action" disabled clearable v-if="isAction"></el-input>
         </el-form-item>
         <el-form-item label="菜单Icon" prop="icon" v-if="!isAction">
           <el-input v-model="formData.icon" name="icon" clearable @click="open" />

src/views/payBack/juliangAccount/tabs/logList/index.vue

@@ -127,6 +127,10 @@ import { InfoFilled } from '@element-plus/icons-vue';
 import { useGetList } from '@/hook/curd/useGetList';
 import { titleObj } from "./excelTitle"
 import { callbackJuliangAccountList, callbackJuliangAccountLogCallbackAgain } from '@/api/backConfig/index'
+import moment from 'moment';
+const start_date = moment().format('YYYY-MM-DD')
+const end_date = moment().format('YYYY-MM-DD')
+
 const api = 'callback/juliangAccount/log/list';
 const router = useRouter()
 const route = useRoute()
@@ -204,6 +208,12 @@ const openType = (type: string, data: object) => {
 const tableData = computed(() => data.value?.data);
 
 onMounted(() => {
+  query.value.userTime = [start_date, end_date];
+  query.value.orderTime = [start_date, end_date];
+  query.value.user_ranse_start_at_begin_time = start_date
+  query.value.user_ranse_start_at_end_time = end_date
+  query.value.order_created_at_begin_time = start_date
+  query.value.order_created_at_end_time = end_date
   initAdNameOtion()
   search();
 });

src/views/videoManage/detail.vue

@@ -13,8 +13,8 @@
         <el-table-column label="操作" width="200">
           <template #default="scope">
             <el-button link type="primary" size="small" @click="play(scope.row)">播放</el-button>
-            <el-button link type="primary" size="small" @click="createLink(scope.row)"
-              v-action="'Promotion@Promotion@add'">创建推广链接</el-button>
+            <el-button link type="primary" size="small" @click="createLink(scope.row)" v-if="isShowCreatePromotion"
+              v-action="'tuiguang.Promotion.add'">创建推广链接</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -56,6 +56,10 @@ const api = 'videoStock/episode/list';
 const props = defineProps({
   primary: String | Number,
 });
+const isShowCreatePromotion = computed(
+  () => JSON.parse(Cache.get('nav_data'))?.advertiser?.miniProgramIds
+    && JSON.parse(Cache.get('nav_data'))?.app
+)
 const router = useRouter()
 const form = ref()
 const formDataForm = ref({})

src/views/videoManage/index.vue

@@ -102,7 +102,7 @@
             <el-button link type="primary" size="small" @click="openType('videoDLVisible', scope.row)"
               v-action="'video.episode.downloadList'">视频下载</el-button>
             <br />
-            <el-button link type="primary" size="small" v-if="isShowCreatePromotion" v-action="'Promotion@Promotion@add'"
+            <el-button link type="primary" size="small" v-if="isShowCreatePromotion" v-action="'tuiguang.Promotion.add'"
               @click="openType('videoDetailVisible', scope.row)">生成推广链接</el-button>
           </template>
         </el-table-column>