视频优化等

src/router/guard/index.ts

@@ -24,7 +24,7 @@ const guard = (router: Router) => {
     // 获取用户的 token
     const authToken = getAuthToken();
     // 如果 token 存在
-    if (authToken && userStore.getRememberToken == authToken) {
+    if (authToken) {
       // 如果进入 /login 页面，重定向到首页
       if (to.path === WhiteListPage.LOGIN_PATH) {
         next({ path: '/' });
@@ -64,7 +64,7 @@ const guard = (router: Router) => {
       }
       progress.done();
     } else {
-      console.log(to);
+      console.log(userStore.getRememberToken == authToken);
       // 如果不在白名单
       if (whiteList.indexOf(to.path) !== -1) {
         next();

src/views/settleManage/financialControl/tabs/rechargeSettle/index.vue

@@ -36,9 +36,6 @@
             <div>ID:{{ scope.row.company_uid }}</div>
           </template>
         </el-table-column>
-        <el-table-column v-if="!([4, 5].includes(query.status))" prop="business_str" show-overflow-tooltip label="所属商务"
-          min-width="200px">
-        </el-table-column>
         <el-table-column prop="tixian_money" label="提现金额" show-overflow-tooltip min-width="200px">
         </el-table-column>
         <el-table-column v-if="!([4, 5].includes(query.status))" prop="tixian_money" label="打款金额" show-overflow-tooltip
@@ -56,7 +53,7 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column prop="name_of_payee" label="收款人姓名" show-overflow-tooltip min-width="150px">
+        <el-table-column prop="name_of_payee" label="对公账户名称" show-overflow-tooltip min-width="150px">
         </el-table-column>
         <el-table-column prop="remark" label="备注" show-overflow-tooltip>
         </el-table-column>

src/views/videoManage/videoLibraryList/form/uploadVideo.vue

@@ -8,9 +8,10 @@
       <el-input disabled v-model="formDataForm.total_episode_num" name="author" clearable />
     </el-form-item>
     <el-form-item label="上传" prop="videos" :rules="[{ required: true, message: '请上传文件', trigger: 'change' }]">
-      <div class="items-center w-full">
-        支持MP4格式
-        <span class="text-red-400">上传文件统一命名格式要求,例：1.mp4; 11.mp4; 333.mp4</span>
+      <div class="items-center w-full withdraw-popup-warn">
+        <div class="text-red-400">支持MP4格式</div> 
+        <div class="text-red-400">1.上传文件统一命名格式要求,例：1.mp4; 11.mp4; 333.mp4</div>
+        <div class="text-red-400">2.上传视频时，如果新视频和已上传的视频文件同名，原有视频将被新视频覆盖，所以务必提前为视频文件合理命名</div>
       </div>
       <div class="w-full">
         <video-uploader :fileList="videofileList" :public_video_url='formDataForm.cover_image' @fileRemove="fileRemove"
@@ -82,3 +83,13 @@ if (props.primary) {
 onMounted(async () => {
 });
 </script>
+<style lang="scss" scoped>
+.withdraw-popup-warn {
+  padding: 10px;
+  margin-bottom: 10px;
+  font-weight: 600;
+  line-height: 1.8;
+  padding-left: 30px;
+  background-color: #ffecf4;
+}
+</style>