Merge branch 'test' into pansl

src/components/Upload/VideoUploader.vue

@@ -111,6 +111,7 @@ const getToken = async () => {
 
 const handleError = (error: Error, uploadFile: any, uploadFiles: any) => {
   console.log(error, uploadFile, uploadFiles, 'handleError');
+  fileNameList.value = props.fileList.map(el => el.name)
   loadingInstance.value.close();
 }
 

src/components/admin/dialog/index.vue

@@ -1,7 +1,8 @@
 <template>
   <div>
-    <el-dialog :model-value="modelValue" :align-center="alignCenter" :show-close="false" :style="{ height }"
-      :fullscreen="isFullscreen" v-bind="$attrs" :width="width" :close="close" :before-close="beforeClose" draggable>
+    <el-dialog :model-value="modelValue" :align-center="alignCenter" :close-on-click-modal="closeOnClickModal"
+      :close-on-press-escape='closeOnPressEscape' :show-close="false" :style="{ height }" :fullscreen="isFullscreen"
+      v-bind="$attrs" :width="width" :close="close" :before-close="beforeClose" draggable>
       <template #header="{ titleId, titleClass }">
         <div class="flex justify-between w-full">
           <div>
@@ -33,6 +34,14 @@ const props = defineProps({
     default: false,
     require: true,
   },
+  closeOnClickModal: {
+    type: Boolean,
+    default: true,
+  },
+  closeOnPressEscape: {
+    type: Boolean,
+    default: true,
+  },
   showFooter: {
     type: Boolean,
     default: false,

src/views/pageLayout/viewpagerPageManage/form/create.vue

@@ -13,7 +13,7 @@
       <el-input v-model.number="formCallback.sort" min="1" type="number" size="default" clearable></el-input>
     </el-form-item>
     <el-form-item label="封面图" prop="img_url" :rules="[{ required: true, message: '请上传封面图' }]">
-      <my-upload acceptType=".png,.jpg,.jpeg" :isCheckMM="true" :isMultiple="true" @fileRemove="fileRemove"
+      <my-upload acceptType=".png,.jpg,.jpeg" :isCheckMM="false" :isMultiple="true" @fileRemove="fileRemove"
         @fileSuccess="fileSuccess" :fileList="formCallback.fileList" action="/qiniu/upload/image"></my-upload>
     </el-form-item>
     <el-form-item label="链接短剧信息" prop="duanjus" :rules="[{ required: false, message: '选择链接短剧信息', trigger: 'change' }]">
@@ -129,10 +129,10 @@ const submitForm = (formEl: FormInstance | undefined) => {
 }
 
 if (props.primary.id) {
-  console.log(props.primary, 'props.primaryprops.primary');
   formCallback.value = JSON.parse(JSON.stringify(props.primary))
   formCallback.value.duanjus = JSON.parse(JSON.stringify(props.primary.videoInfo))
   formCallback.value.fileList = [{ uid: props.primary.id, url: props.primary.img_url }]
+  console.log(props.primary, 'props.primaryprops.primary', formCallback.value);
 } else {
   formCallback.value.fileList = []
 }

src/views/payBack/juliangAccount/index.vue

@@ -2,7 +2,7 @@
   <div>
     <el-card shadow="always" :body-style="{ padding: '20px' }">
       <el-tabs v-model="activeName" class="demo-tabs" @tab-change="handChange">
-        <el-tab-pane label="广告主列表" name="advertiser">
+        <el-tab-pane label="广告账户列表" name="advertiser">
           <advertiser v-if="activeName == 'advertiser'"></advertiser>
         </el-tab-pane>
         <el-tab-pane label="回传日志" name="log">

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

@@ -4,13 +4,13 @@
       <el-form-item label="巨量账户ID">
         <el-input placeholder="请输入巨量账户ID" class="input" icon="search" v-model="query.account_id" clearable></el-input>
       </el-form-item>
-	  <el-form-item label="回传配置ID">
-	    <el-input placeholder="请输入回传配置ID" class="input" icon="search" v-model="query.id" clearable></el-input>
-	  </el-form-item>
-	  <el-form-item label="关联推广ID">
-	    <el-input placeholder="关联推广ID" class="input" icon="search" v-model="query.promotion_id" clearable></el-input>
-	  </el-form-item>
-    <!--  <el-form-item label="巨量账户">
+      <el-form-item label="回传配置ID">
+        <el-input placeholder="请输入回传配置ID" class="input" icon="search" v-model="query.id" clearable></el-input>
+      </el-form-item>
+      <el-form-item label="关联推广ID">
+        <el-input placeholder="关联推广ID" class="input" icon="search" v-model="query.promotion_id" clearable></el-input>
+      </el-form-item>
+      <!--  <el-form-item label="巨量账户">
         <el-input placeholder="请输入巨量账户" class="input" icon="search" v-model="query.account_name" clearable></el-input>
       </el-form-item> -->
     </template>
@@ -22,8 +22,8 @@
     </div>
     <el-table :data="tableData" class="mt-3" v-loading="loading" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="80"></el-table-column>
-	   <el-table-column label="回传配置ID" width="260" prop="id"></el-table-column>
-      <el-table-column label="巨量账户ID" width="260" prop="adv_account_id"></el-table-column>
+      <el-table-column label="回传配置ID" min-width="260" prop="id"></el-table-column>
+      <el-table-column label="巨量账户ID" min-width="260" show-overflow-tooltip prop="adv_account_id"></el-table-column>
       <!-- <el-table-column label="巨量账户" width="260" prop="adv_account_name"></el-table-column> -->
       <el-table-column label="回传开关" width="150" v-action="'callback.JuliangAccount.turnCallbackState'">
         <template #default="scope">
@@ -33,19 +33,20 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column label="关联推广名称" width="260" prop="promotion_name">
+      <el-table-column label="关联推广名称" min-width="260" show-overflow-tooltip prop="promotion_name">
       </el-table-column>
-      <el-table-column label="关联推广ID" width="260" prop="promotion_id">
-		<template #default="scope">
-			   <el-button link type="primary" size="small" @click="goToPromotion( scope.row)" >{{scope.row.promotion_id}}</el-button>
-		 </template>
+      <el-table-column label="关联推广ID" show-overflow-tooltip prop="promotion_id">
+        <template #default="scope">
+          <el-button link type="primary" size="default" @click="goToPromotion(scope.row)">{{ scope.row.promotion_id
+          }}</el-button>
+        </template>
       </el-table-column>
-      <el-table-column label="操作">
+      <el-table-column label="操作" min-width="200" fixed="right">
         <template #default="scope">
           <el-button link type="primary" size="small" @click="handleEdit(scope.$index, scope.row)"
             v-action="'callback.JuliangAccount.updateCallbackConfig'">回传配置</el-button>
           <br />
-          <el-button link type="primary" v-if="scope.row.promotion_id >  0" size="small" @click="handleCancel(scope.row)"
+          <el-button link type="primary" v-if="scope.row.promotion_id > 0" size="small" @click="handleCancel(scope.row)"
             v-action="'callback.JuliangAccount.unbindPromotion'">取消推广回传关联</el-button>
         </template>
       </el-table-column>
@@ -100,10 +101,10 @@ const switchStatus = (data: object) => {
     search()
   })
 }
-const goToPromotion = (row: object) =>{
-	 router.push({ path: '/promotion/promotionList', query: { tab: 1,id:row.promotion_id } })
+const goToPromotion = (row: object) => {
+  router.push({ path: '/promotion/promotionList', query: { tab: 1, id: row.promotion_id } })
 }
-	
+
 
 const handleCancel = (row: object) => {
   ElMessageBox.confirm(
@@ -116,7 +117,7 @@ const handleCancel = (row: object) => {
     }
   )
     .then(() => {
-      callbackJuliangAccountUnbindPromotion({ id: row.promotion_id }).then(res => {
+      callbackJuliangAccountUnbindPromotion({ id: row.id }).then(res => {
         ElMessage.success(res.message)
         search()
       })
@@ -191,7 +192,7 @@ const openForm = (data: any) => {
   addAccountVisible.value = true
 };
 onMounted(() => {
-query.value.id = route.query.id 
+  query.value.id = route.query.id
   search();
 });
 </script>

src/views/promotion/promotionList/index.vue

@@ -24,10 +24,10 @@
           <div class="table-default">
             <el-table :data="tableData" class="mt-3" v-loading="loading">
               <el-table-column prop="id" label="推广ID" />
-              <el-table-column label="推广名称" show-overflow-tooltip>
+              <el-table-column label="推广名称" show-overflow-tooltip min-width="200px">
                 <template #default="scope">
                   <div class="wrapper">
-                    <span class="text-lg font-bold text-blue-400 content">
+                    <span class="text-lg content">
                       {{ scope.row.name }}
                     </span>
                   </div>
@@ -37,10 +37,11 @@
                   </div>
                 </template>
               </el-table-column>
-              <el-table-column prop="total_episode_num" label="入口章节">
+              <el-table-column prop="miniprogram_name" label="小程序名称" min-width="200px" />
+              <el-table-column prop="total_episode_num" label="入口章节" min-width="200px">
                 <template #default="scope">
                   <div class="wrapper">
-                    <span class="text-lg font-bold text-blue-400 content">
+                    <span class="text-lg content">
                       {{ scope.row.video_name }}
                     </span>
                   </div>
@@ -49,10 +50,10 @@
                   </div>
                 </template>
               </el-table-column>
-              <el-table-column prop="total_episode_num" label="推广链接">
+              <el-table-column prop="total_episode_num" label="复制链接" min-width="200px">
                 <template #header>
                   <div class="flex items-center">
-                    <span>推广链接</span>
+                    <span>复制链接</span>
                     <el-tooltip placement="top">
                       <template #content>鼠标移动到【点击复制】文字，进行查看链接，点击，进行复制链接</template>
                       <el-icon>
@@ -62,24 +63,47 @@
                   </div>
                 </template>
                 <template #default="scope">
-                  <div class="wrapper" v-if="scope.row.promotion_path">
-                    <el-popover placement="top" title="推广链接" :width="500" trigger="hover"
-                      :content="scope.row.promotion_path">
-                      <template #reference>
-                        <copy-button :text="scope.row.promotion_path">
-                          <el-link type="primary" :underline="false">点击复制</el-link>
-                        </copy-button>
-                      </template>
-                    </el-popover>
+                  <div class="wrapper" v-if="scope.row.status">
+                    <div>
+                      <el-popover placement="top" title="推广链接" :width="500" trigger="hover"
+                        v-if="scope.row.promotion_path" :content="scope.row.promotion_path">
+                        <template #reference>
+                          <copy-button :text="scope.row.promotion_path" class="mb-6">
+                            <el-link type="primary" :underline="false">点击复制推广链接</el-link>
+                          </copy-button>
+                        </template>
+                      </el-popover>
+                    </div>
+                    <div>
+                      <el-popover placement="top" title="监测链接" :width="500" trigger="hover" v-if="scope.row.track_url"
+                        :content="scope.row.track_url">
+                        <template #reference>
+                          <copy-button :text="scope.row.track_url">
+                            <el-link type="primary" :underline="false">点击复制监测链接</el-link>
+                          </copy-button>
+                        </template>
+                      </el-popover>
+                    </div>
                   </div>
                 </template>
               </el-table-column>
-              <el-table-column prop="total_episode_num" label="监测链接">
+              <el-table-column prop="callback_type_str" label="回传类型" />
+              <el-table-column prop="callback_config_id" label="回传配置ID" min-width="160px">
+                <template #default="scope">
+                  <el-button link type="primary" size="default" @click="goToTtHuicHuan(scope.row)">{{
+                    scope.row.callback_config_id }}</el-button>
+                </template>
+              </el-table-column>
+              <el-table-column prop="status_str" label="状态">
                 <template #header>
                   <div class="flex items-center">
-                    <span>监测链接</span>
+                    <span>状态</span>
                     <el-tooltip placement="top">
-                      <template #content>鼠标移动到【点击复制】文字，进行查看链接，点击，进行复制链接</template>
+                      <template #content>
+                        当前推广链接的状态<br />
+                        启用：当前推广ID已绑定回传配置<br />
+                        禁用：当前推广ID未绑定回传配置
+                      </template>
                       <el-icon>
                         <InfoFilled />
                       </el-icon>
@@ -87,26 +111,6 @@
                   </div>
                 </template>
                 <template #default="scope">
-                  <div class="wrapper" v-if="scope.row.track_url">
-                    <el-popover placement="top" title="监测链接" popper-style="width:80%" trigger="hover"
-                      :content="scope.row.track_url">
-                      <template #reference>
-                        <copy-button :text="scope.row.track_url">
-                          <el-link type="primary" :underline="false">点击复制</el-link>
-                        </copy-button>
-                      </template>
-                    </el-popover>
-                  </div>
-                </template>
-              </el-table-column>
-              <el-table-column prop="callback_type_str" label="回传类型" />
-              <el-table-column prop="callback_config_id" label="回传配置ID" >
-				  <template #default="scope">
-				  	   <el-button link type="primary" size="small" @click="goToTtHuicHuan( scope.row)" >{{scope.row.callback_config_id}}</el-button>
-				   </template>
-			  </el-table-column>
-              <el-table-column prop="status_str" label="状态">
-                <template #default="scope">
                   <div class="wrapper">
                     <span class="text-lg font-bold content">
                       <el-text class="mx-1" :type="colorType(scope.row)">{{ scope.row.status_str }}</el-text>
@@ -121,7 +125,7 @@
                   </div>
                 </template>
               </el-table-column>
-              <el-table-column label="操作">
+              <el-table-column label="操作" fixed="right">
                 <template #default="scope">
                   <el-button @click="openType('promotionVisible', scope.row)" link type="primary"
                     v-action="'tuiguang.Promotion.updateSeriesSequence'" size="small">编辑</el-button>
@@ -232,8 +236,8 @@ const timeChange = (e) => {
   }
 }
 
-const goToTtHuicHuan = (row: object) =>{
-	 router.push({ path: '/payback/juliangAccount', query: { id:row.callback_config_id } })
+const goToTtHuicHuan = (row: object) => {
+  router.push({ path: '/payback/juliangAccount', query: { id: row.callback_config_id } })
 }
 const handChange = (tab: TabsPaneContext, event: Event) => {
   console.log(tab, event)
@@ -266,7 +270,7 @@ const deletePromotion = (row: object) => {
 }
 
 const resetQuery = () => {
-  query.value = Object.assign({ page: query.value.page, limit: query.value.limit, miniprogram_id: query.value.miniprogram_id, is_config: query.value.is_config,id:value.id });
+  query.value = Object.assign({ page: query.value.page, limit: query.value.limit, miniprogram_id: query.value.miniprogram_id, is_config: query.value.is_config, id: query.value.id });
   search()
 }
 const openType = (type: string, data: object) => {
@@ -312,7 +316,7 @@ const closeType = (type: string) => {
 onMounted(() => {
   activeName.value = Number(route.query.tab || 1)
   query.value.is_config = activeName.value
-  query.value.id = route.query.id 
+  query.value.id = route.query.id
   if (JSON.parse(Cache.get('nav_data'))?.app.id) {
     query.value.miniprogram_id = JSON.parse(Cache.get('nav_data'))?.app.id
   }

src/views/videoManage/videoLibraryList/index.vue

@@ -148,11 +148,12 @@
     <Dialog v-model="takeVisible" width="50%" title="订阅设置" destroy-on-close>
       <subscribeSet @close="closeType('takeVisible')" :primary="takeData"></subscribeSet>
     </Dialog>
-    <Dialog v-model="uploadVisible" width="50%" title="上传视频" destroy-on-close>
+    <Dialog v-model="uploadVisible" width="50%" title="上传视频" :closeOnClickModal="false" :closeOnPressEscape="false"
+      destroy-on-close>
       <uploadVideo @close="closeType('uploadVisible')" :primary="uploadData"></uploadVideo>
     </Dialog>
-    <el-dialog draggable v-action="'video.video.list'" align-center append-to-body v-model="videoDetailVisible" width="50%" title="短剧详情"
-      destroy-on-close>
+    <el-dialog draggable v-action="'video.video.list'" align-center append-to-body v-model="videoDetailVisible"
+      width="50%" title="短剧详情" destroy-on-close>
       <videoDetail @close="closeType('videoDetailVisible')" :primary="videoDetailData"></videoDetail>
     </el-dialog>
     <!-- <Dialog v-action="'video.video.list'" v-model="videoDetailVisible" width="50%" title="短剧详情" destroy-on-close>