Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

app/assets/javascripts/admins/disciplines/index.js

@@ -120,5 +120,19 @@ $(document).on('turbolinks:load', function() {
               });
           }
       });
+
+      // ------------ 上移/下移 -------------
+      $('.discipline-list-container').on('click', ".move-action", function () {
+          var $doAction = $(this);
+
+          var disciplineId = $doAction.data('id');
+          var opr = $doAction.data('opr');
+          $.ajax({
+              url: '/admins/disciplines/' + disciplineId + '/adjust_position',
+              method: 'POST',
+              dataType: 'script',
+              data: {opr: opr}
+          });
+      });
   }
 });

app/assets/javascripts/admins/salesman_customers/index.js

@@ -58,7 +58,7 @@ $(document).on('turbolinks:load', function() {
                         $addMemberModal.modal('hide');
 
                         setTimeout(function(){
-                            window.location.reload();
+                            listForm();
                         }, 500);
                     },
                     error: function(res){
@@ -70,5 +70,13 @@ $(document).on('turbolinks:load', function() {
                 $addMemberModal.modal('hide');
             }
         });
+
+
+        var listForm = function(){
+            $.ajax({
+                url: '/admins/salesman_customers?salesman_id='+ $salesmanIdInput.data("salesman-id"),
+                dataType: "script"
+            });
+        };
     }
 });

app/assets/javascripts/admins/sub_disciplines/index.js

@@ -72,5 +72,18 @@ $(document).on('turbolinks:load', function () {
                 data: json
             });
         });
+        // ------------ 上移/下移 -------------
+        $('.sub-discipline-list-container').on('click', ".move-action", function () {
+            var $doAction = $(this);
+
+            var objectId = $doAction.data('id');
+            var opr = $doAction.data('opr');
+            $.ajax({
+                url: '/admins/sub_disciplines/' + objectId + '/adjust_position',
+                method: 'POST',
+                dataType: 'script',
+                data: {opr: opr}
+            });
+        });
     }
 });

app/assets/javascripts/admins/tag_disciplines/index.js

@@ -72,5 +72,19 @@ $(document).on('turbolinks:load', function () {
                 data: json
             });
         });
+
+        // ------------ 上移/下移 -------------
+        $('.tag-discipline-list-container').on('click', ".move-action", function () {
+            var $doAction = $(this);
+
+            var objectId = $doAction.data('id');
+            var opr = $doAction.data('opr');
+            $.ajax({
+                url: '/admins/tag_disciplines/' + objectId + '/adjust_position',
+                method: 'POST',
+                dataType: 'script',
+                data: {opr: opr}
+            });
+        });
     }
 });

app/controllers/admins/disciplines_controller.rb

@@ -7,7 +7,7 @@ class Admins::DisciplinesController < Admins::BaseController
   def create
     name = params[:name].to_s.strip
     return render_error('名称重复') if Discipline.where(name: name).exists?
-    Discipline.create!(name: name)
+    Discipline.create!(name: name, position: Discipline.all.pluck(:position).max + 1)
     render_ok
   end
 
@@ -39,7 +39,31 @@ class Admins::DisciplinesController < Admins::BaseController
 
   def destroy
     @discipline_id = params[:id]
-    current_discipline.destroy!
+    ActiveRecord::Base.transaction do
+      Discipline.where("position > #{current_discipline.position}").update_all("position=position-1")
+      current_discipline.destroy!
+    end
+  end
+
+  def adjust_position
+    max_position = Discipline.all.pluck(:position).max
+    opr = params[:opr] || "down"
+    if (params[:opr] == "up" && current_discipline.position == 1) || (params[:opr] == "down" && current_discipline.position == max_position)
+      @message = "超出范围"
+    else
+      ActiveRecord::Base.transaction do
+        if opr == "up"
+          Discipline.find_by("position = #{current_discipline.position - 1}")&.update!(position: current_discipline.position)
+          current_discipline.update!(position: current_discipline.position - 1)
+        else
+          Discipline.find_by("position = #{current_discipline.position + 1}")&.update!(position: current_discipline.position)
+          current_discipline.update!(position: current_discipline.position + 1)
+        end
+      end
+    end
+    @disciplines = Discipline.all
+  rescue Exception => e
+    @message = e.message
   end
 
   private

app/controllers/admins/salesman_channels_controller.rb

@@ -15,7 +15,7 @@ class Admins::SalesmanChannelsController < Admins::BaseController
     school_ids = params[:school_ids] - channel_ids
     school_ids.each do |school_id|
       school = School.find_by(id: school_id)
-      next if school.blank?
+      next if school.blank? || @salesman.salesman_channels.where(school_id: school.id).exists?
       @salesman.salesman_channels.create!(school_id: school.id)
     end
     render_ok

app/controllers/admins/salesman_customers_controller.rb

@@ -10,7 +10,7 @@ class Admins::SalesmanCustomersController < Admins::BaseController
     user_ids = params[:user_ids] - customer_ids
     user_ids.each do |user_id|
       user = UserExtension.find_by(user_id: user_id)
-      next if user.blank?
+      next if user.blank? || @salesman.salesman_customers.where(user_id: user.user_id).exists?
       @salesman.salesman_customers.create!(user_id: user.user_id, school_id: user.school_id)
     end
     render_ok

app/controllers/admins/sub_disciplines_controller.rb

@@ -9,7 +9,7 @@ class Admins::SubDisciplinesController < Admins::BaseController
     name = params[:name].to_s.strip
     return render_error('名称不能为空') if name.blank?
     return render_error('名称重复') if current_discipline.sub_disciplines.where(name: name).exists?
-    SubDiscipline.create!(name: name, discipline_id: current_discipline.id)
+    SubDiscipline.create!(name: name, discipline_id: current_discipline.id, position: current_discipline.sub_disciplines.pluck(:position).max + 1)
     render_ok
   end
 
@@ -38,9 +38,36 @@ class Admins::SubDisciplinesController < Admins::BaseController
 
   def destroy
     @sub_discipline_id = params[:id]
-    current_sub_discipline.destroy!
+    ActiveRecord::Base.transaction do
+      discipline = current_sub_discipline.discipline
+      discipline.sub_disciplines.where("position > #{current_sub_discipline.position}").update_all("position=position-1")
+      current_sub_discipline.destroy!
+    end
   end
 
+  def adjust_position
+    discipline = current_sub_discipline.discipline
+    max_position = discipline.sub_disciplines.pluck(:position).max
+    opr = params[:opr] || "down"
+    if (params[:opr] == "up" && current_sub_discipline.position == 1) || (params[:opr] == "down" && current_sub_discipline.position == max_position)
+      @message = "超出范围"
+    else
+      ActiveRecord::Base.transaction do
+        if opr == "up"
+          discipline.sub_disciplines.find_by("position = #{current_sub_discipline.position - 1}")&.update!(position: current_sub_discipline.position)
+          current_sub_discipline.update!(position: current_sub_discipline.position - 1)
+        else
+          discipline.sub_disciplines.find_by("position = #{current_sub_discipline.position + 1}")&.update!(position: current_sub_discipline.position)
+          current_sub_discipline.update!(position: current_sub_discipline.position + 1)
+        end
+      end
+    end
+    @sub_disciplines = discipline&.sub_disciplines
+  rescue Exception => e
+    @message = e.message
+  end
+
+
   private
 
   def current_sub_discipline

app/controllers/admins/tag_disciplines_controller.rb

@@ -8,7 +8,8 @@ class Admins::TagDisciplinesController < Admins::BaseController
   def create
     name = params[:name].to_s.strip
     return render_error('名称重复') if current_sub_discipline.tag_disciplines.where(name: name).exists?
-    TagDiscipline.create!(name: name, sub_discipline_id: current_sub_discipline.id, user_id: current_user.id)
+    TagDiscipline.create!(name: name, sub_discipline_id: current_sub_discipline.id, user_id: current_user.id,
+                          position: current_sub_discipline.tag_disciplines.pluck(:position).max + 1)
     render_ok
   end
 
@@ -32,9 +33,36 @@ class Admins::TagDisciplinesController < Admins::BaseController
 
   def destroy
     @tag_discipline_id = params[:id]
-    current_tag_discipline.destroy!
+    ActiveRecord::Base.transaction do
+      sub_discipline = current_tag_discipline.sub_discipline
+      sub_discipline.tag_disciplines.where("position > #{current_tag_discipline.position}").update_all("position=position-1")
+      current_tag_discipline.destroy!
+    end
+  end
+
+  def adjust_position
+    sub_discipline = current_tag_discipline.sub_discipline
+    max_position = sub_discipline.tag_disciplines.pluck(:position).max
+    opr = params[:opr] || "down"
+    if (params[:opr] == "up" && current_tag_discipline.position == 1) || (params[:opr] == "down" && current_tag_discipline.position == max_position)
+      @message = "超出范围"
+    else
+      ActiveRecord::Base.transaction do
+        if opr == "up"
+          sub_discipline.tag_disciplines.find_by("position = #{current_tag_discipline.position - 1}")&.update!(position: current_tag_discipline.position)
+          current_tag_discipline.update!(position: current_tag_discipline.position - 1)
+        else
+          sub_discipline.tag_disciplines.find_by("position = #{current_tag_discipline.position + 1}")&.update!(position: current_tag_discipline.position)
+          current_tag_discipline.update!(position: current_tag_discipline.position + 1)
+        end
+      end
+    end
+    @tag_disciplines = sub_discipline&.tag_disciplines
+  rescue Exception => e
+    @message = e.message
   end
 
+
   private
 
   def current_sub_discipline

app/controllers/tag_disciplines_controller.rb

@@ -4,7 +4,8 @@ class TagDisciplinesController < ApplicationController
   def create
     sub_discipline = SubDiscipline.find_by!(id: params[:sub_discipline_id])
     tip_exception("重复的知识点") if sub_discipline.tag_disciplines.exists?(name: params[:name].to_s.strip)
-    tag_discipline = TagDiscipline.create!(name: params[:name].to_s.strip, sub_discipline: sub_discipline, user_id: current_user.id)
+    tag_discipline = TagDiscipline.create!(name: params[:name].to_s.strip, sub_discipline: sub_discipline, user_id: current_user.id,
+                                           position: sub_discipline.tag_disciplines.pluck(:position).max + 1)
     render_ok({tag_discipline_id: tag_discipline.id})
   end
 end

app/models/discipline.rb

@@ -1,5 +1,7 @@
 class Discipline < ApplicationRecord
-  has_many :sub_disciplines, dependent: :destroy
+  default_scope { order(position: :asc) }
+
+  has_many :sub_disciplines, -> { order("sub_disciplines.position ASC") }, dependent: :destroy
 
   has_many :shixun_sub_disciplines, -> { where("shixun = 1") }, class_name: "SubDiscipline"
   has_many :subject_sub_disciplines, -> { where("subject = 1") }, class_name: "SubDiscipline"

app/models/salesman_customer.rb

@@ -1,6 +1,6 @@
 class SalesmanCustomer < ApplicationRecord
   belongs_to :salesman, :touch => true, counter_cache: true
-  belongs_to :school
+  belongs_to :school, optional: true
   belongs_to :user
 
   def name
@@ -8,7 +8,7 @@ class SalesmanCustomer < ApplicationRecord
   end
 
   def school_name
-    school.name
+    school&.name
   end
 
   def courses_count

app/models/sub_discipline.rb

@@ -1,6 +1,6 @@
 class SubDiscipline < ApplicationRecord
   belongs_to :discipline
-  has_many :tag_disciplines, dependent: :destroy
+  has_many :tag_disciplines, -> { order("tag_disciplines.position ASC") }, dependent: :destroy
   has_many :sub_discipline_containers, dependent: :destroy
   has_one :hack
 

app/services/admins/import_discipline_service.rb

@@ -29,14 +29,14 @@ class Admins::ImportDisciplineService < ApplicationService
     return unless discipline_name.present?
     discipline = Discipline.find_by(name: discipline_name)
     if discipline.blank?
-      discipline = Discipline.create!(name: discipline_name)
+      discipline = Discipline.create!(name: discipline_name, position: Discipline.all.pluck(:position).max + 1)
       count += 1
     end
 
     if sub_discipline_name.present?
       sub_discipline = SubDiscipline.find_by(name: discipline_name, discipline: discipline)
       if sub_discipline.blank?
-        SubDiscipline.create!(name: sub_discipline_name, discipline: discipline)
+        SubDiscipline.create!(name: sub_discipline_name, discipline: discipline, position: discipline.sub_disciplines.pluck(:position).max + 1)
         count += 1
       end
     end

app/views/admins/disciplines/adjust_position.js.erb

@@ -0,0 +1,5 @@
+<% if @message.present? %>
+$.notify({ message: "<%= @message %>" });
+<% else %>
+$(".discipline-list-container").html("<%= j(render :partial => 'admins/disciplines/shared/list') %>");
+<% end %>

app/views/admins/disciplines/shared/_list.html.erb

@@ -1,3 +1,4 @@
+<% max_position = @disciplines.pluck(:position).max %>
 <table class="table table-hover text-center discipline-list-table">
   <thead class="thead-light">
   <tr>
@@ -11,9 +12,9 @@
   </thead>
   <tbody>
   <% if @disciplines.present? %>
-    <% @disciplines.each_with_index do |discipline, index| %>
+    <% @disciplines.each do |discipline| %>
       <tr class="discipline-item discipline-item-<%= discipline.id %>">
-        <td><%= index + 1 %></td>
+        <td><%= discipline.position %></td>
         <td class="text-left">
           <span><%= link_to discipline.name, admins_sub_disciplines_path(discipline_id: discipline), :title => discipline.name %></span>
         </td>
@@ -21,6 +22,9 @@
         <td><%= check_box_tag :shixun,!discipline.shixun,discipline.shixun,remote:true,data:{id:discipline.id},class:"discipline-source-form" %></td>
         <td><%= check_box_tag :question,!discipline.question,discipline.question,remote:true,data:{id:discipline.id},class:"discipline-source-form" %></td>
         <td>
+          <%= javascript_void_link('上移', class: 'move-action', data: { id: discipline.id, opr: "up" }, style: discipline.position == 1 ? 'display:none' : '') %>
+          <%= javascript_void_link('下移', class: 'move-action', data: { id: discipline.id, opr: "down" }, style: discipline.position == max_position ? 'display:none' : '') %>
+
           <%= link_to '编辑', edit_admins_discipline_path(discipline), remote: true, class: 'action' %>
           <%= delete_link '删除', admins_discipline_path(discipline, element: ".discipline-item-#{discipline.id}"), class: 'delete-discipline-action' %>
         </td>

app/views/admins/salesman_customers/index.js.erb

@@ -0,0 +1 @@
+  $(".salesman-customer-list-container").html("<%= j(render partial: 'admins/salesman_customers/shared/list') %>")

app/views/admins/sub_disciplines/adjust_position.js.erb

@@ -0,0 +1,5 @@
+<% if @message.present? %>
+$.notify({ message: "<%= @message %>" });
+<% else %>
+$(".sub-discipline-list-container").html("<%= j(render :partial => 'admins/sub_disciplines/shared/list') %>");
+<% end %>

app/views/admins/sub_disciplines/shared/_list.html.erb

@@ -1,3 +1,4 @@
+<% max_position = @sub_disciplines.pluck(:position).max %>
 <table class="table table-hover text-center sub-discipline-list-table">
   <thead class="thead-light">
   <tr>
@@ -11,9 +12,9 @@
   </thead>
   <tbody>
   <% if @sub_disciplines.present? %>
-    <% @sub_disciplines.each_with_index do |sub, index| %>
+    <% @sub_disciplines.each do |sub| %>
       <tr class="sub-discipline-item sub-discipline-item-<%= sub.id %>">
-        <td><%= index + 1 %></td>
+        <td><%= sub.position %></td>
         <td class="text-left">
           <span><%= link_to sub.name, admins_tag_disciplines_path(sub_discipline_id: sub), :title => sub.name %></span>
         </td>
@@ -21,6 +22,9 @@
         <td><%= check_box_tag :shixun,!sub.shixun,sub.shixun,disabled:!sub.discipline&.shixun,remote:true,data:{id:sub.id},class:"sub-discipline-source-form" %></td>
         <td><%= check_box_tag :question,!sub.question,sub.question,disabled:!sub.discipline&.question,remote:true,data:{id:sub.id},class:"sub-discipline-source-form" %></td>
         <td>
+          <%= javascript_void_link('上移', class: 'move-action', data: { id: sub.id, opr: "up" }, style: sub.position == 1 ? 'display:none' : '') %>
+          <%= javascript_void_link('下移', class: 'move-action', data: { id: sub.id, opr: "down" }, style: sub.position == max_position ? 'display:none' : '') %>
+
           <%= link_to '编辑', edit_admins_sub_discipline_path(sub), remote: true, class: 'action' %>
           <%= delete_link '删除', admins_sub_discipline_path(sub, element: ".sub-discipline-item-#{sub.id}"), class: 'delete-sub-discipline-action' %>
         </td>

app/views/admins/tag_disciplines/adjust_position.js.erb

@@ -0,0 +1,5 @@
+<% if @message.present? %>
+$.notify({ message: "<%= @message %>" });
+<% else %>
+$(".tag-discipline-list-container").html("<%= j(render :partial => 'admins/tag_disciplines/shared/list') %>");
+<% end %>

app/views/admins/tag_disciplines/shared/_list.html.erb

@@ -1,3 +1,4 @@
+<% max_position = @tag_disciplines.pluck(:position).max %>
 <table class="table table-hover text-center tag-discipline-list-table">
   <thead class="thead-light">
   <tr>
@@ -12,9 +13,9 @@
   </thead>
   <tbody>
   <% if @tag_disciplines.present? %>
-    <% @tag_disciplines.each_with_index do |tag, index| %>
+    <% @tag_disciplines.each do |tag| %>
       <tr class="tag-discipline-item tag-discipline-item-<%= tag.id %>">
-        <td><%= index + 1 %></td>
+        <td><%= tag.position %></td>
         <td class="text-left"><%= tag.name %></td>
         <td>
           <% if tag.user.present? %>
@@ -36,6 +37,9 @@
           <%= check_box_tag :question,!tag.question,tag.question,disabled:disabled,remote:true,data:{id:tag.id},class:"tag-discipline-source-form" %>
         </td>
         <td>
+          <%= javascript_void_link('上移', class: 'move-action', data: { id: tag.id, opr: "up" }, style: tag.position == 1 ? 'display:none' : '') %>
+          <%= javascript_void_link('下移', class: 'move-action', data: { id: tag.id, opr: "down" }, style: tag.position == max_position ? 'display:none' : '') %>
+
           <%= link_to '编辑', edit_admins_tag_discipline_path(tag), remote: true, class: 'action' %>
           <%= delete_link '删除', admins_tag_discipline_path(tag, element: ".tag-discipline-item-#{tag.id}"), class: 'delete-tag-discipline-action' %>
         </td>

config/routes.rb

@@ -1355,9 +1355,15 @@ Rails.application.routes.draw do
 
     resources :projects, only: [:index, :destroy]
 
-    resources :disciplines, only: [:index, :create, :edit, :update, :destroy]
-    resources :sub_disciplines, only: [:index, :create, :edit, :update, :destroy]
-    resources :tag_disciplines, only: [:index, :create, :edit, :update, :destroy]
+    resources :disciplines, only: [:index, :create, :edit, :update, :destroy] do
+      post :adjust_position, on: :member
+    end
+    resources :sub_disciplines, only: [:index, :create, :edit, :update, :destroy] do
+      post :adjust_position, on: :member
+    end
+    resources :tag_disciplines, only: [:index, :create, :edit, :update, :destroy] do
+      post :adjust_position, on: :member
+    end
 
     resources :repertoires, only: [:index, :create, :edit, :update, :destroy]
     resources :sub_repertoires, only: [:index, :create, :edit, :update, :destroy]

db/migrate/20200225063751_add_position_to_discipline.rb

@@ -0,0 +1,7 @@
+class AddPositionToDiscipline < ActiveRecord::Migration[5.2]
+  def change
+    add_column :disciplines, :position, :integer, default: 0
+    add_column :sub_disciplines, :position, :integer, default: 0
+    add_column :tag_disciplines, :position, :integer, default: 0
+  end
+end

db/migrate/20200225063932_migrate_discipline_position.rb

@@ -0,0 +1,15 @@
+class MigrateDisciplinePosition < ActiveRecord::Migration[5.2]
+  def change
+    Discipline.all.each_with_index do |discipline, i|
+      discipline.update_column("position", i + 1)
+
+      discipline.sub_disciplines.each_with_index do |sub, j|
+        sub.update_column("position", j + 1)
+
+        sub.tag_disciplines.each_with_index do |tag, k|
+          tag.update_column("position", k + 1)
+        end
+      end
+    end
+  end
+end

db/migrate/20200225092846_add_uniq_index_to_salesman_channel.rb

@@ -0,0 +1,10 @@
+class AddUniqIndexToSalesmanChannel < ActiveRecord::Migration[5.2]
+  def change
+    sql = %Q(delete from salesman_channels where (salesman_id, school_id) in
+            (select * from (select salesman_id, school_id from salesman_channels group by salesman_id, school_id having count(*) > 1) a)
+            and id not in (select * from (select min(id) from salesman_channels group by salesman_id, school_id having count(*) > 1 order by id) b))
+    ActiveRecord::Base.connection.execute sql
+
+    add_index :salesman_channels, [:salesman_id, :school_id], unique: true
+  end
+end

db/migrate/20200225093944_add_uniq_index_to_salesman_customer.rb

@@ -0,0 +1,10 @@
+class AddUniqIndexToSalesmanCustomer < ActiveRecord::Migration[5.2]
+  def change
+    sql = %Q(delete from salesman_customers where (salesman_id, user_id) in
+            (select * from (select salesman_id, user_id from salesman_customers group by salesman_id, user_id having count(*) > 1) a)
+            and id not in (select * from (select min(id) from salesman_customers group by salesman_id, user_id having count(*) > 1 order by id) b))
+    ActiveRecord::Base.connection.execute sql
+
+    add_index :salesman_customers, [:salesman_id, :user_id], unique: true
+  end
+end

public/react/src/modules/courses/Video/VideoIndex.js

@@ -55,13 +55,17 @@ class VideoIndex extends Component{
   componentDidMount=()=>{
     const { search } = this.props.location;
     const { page } = this.state;
-
     if(search && search === "?open=live"){
       this.setState({
         type:"live"
       })
       this.checkType("live",page);
     }else{
+      if(search === "?open=new"){
+        this.setState({
+          upload:true
+        })
+      }
       this.checkType("video",page);
     }
   }
@@ -138,10 +142,13 @@ class VideoIndex extends Component{
   }
   uploadVideo=(upload)=>{
     this.setState({
-      upload
+      upload,
+      isSpining:true
     })
     const { page } = this.state;
-    this.getList(page);
+    setTimeout(()=>{
+      this.getList(page);
+    },500)
   }
 
   toUpload =()=> {

public/react/src/modules/courses/new/CoursesNew.js

@@ -654,8 +654,8 @@ class CoursesNew extends Component {
 												{
 													`
 													body{
-													
-													overflow:hidden !important ;
+														position: relative;
+                            width: calc(100% - 0px) !important ;
 													}
 													`
 												}

public/react/src/modules/user/usersInfo/video/VideoProtocol.js

@@ -5,17 +5,16 @@ import axios from 'axios'
 import okIcon from './images/ok_border.png'
 
 function VideoProtocol (props) {
-    const theme = useContext(ThemeContext);
     const username = props.match.params.username
-    const { history } = props;
-    
+    const { search } = props.history.location;    
+    const courseId = search && search.split("=")[1];
     return (
         <div className={`educontent videoProtocol`}>
             <CBreadcrumb
                 className="mb26 mt16"
                 separator=" > "
                 items={[
-                    { to: `/users/${username}/videos/upload`, name:  '视频上传'},
+                    { to: `${courseId?`/courses/${courseId}/course_videos?open=new`:`/users/${username}/videos/upload`}`, name:  '视频上传'},
                     { name: '内容上传协议'}
                 ]}
             ></CBreadcrumb>

public/react/src/modules/user/usersInfo/video/VideoUploadList.js

@@ -258,9 +258,14 @@ function VideoUploadList (props) {
         dispatch({type: 'updateTitle', title, index})
     }
     // login
-    const protocolLine = <div>上传视频，即表示您已同意
-        <Link to={`/users/${username}/videos/protocol`} style={{color: theme.foreground_select}}>上传内容协议</Link>，不得上传未经他人授权的作品</div>
-    const { flag } = props;
+    const { flag , CourseId } = props;
+    const urls = 
+    flag ? 
+    <Link to={`/users/${username}/videos/protocol?course=${CourseId}`} target="_blank" style={{color: theme.foreground_select}}>上传内容协议</Link>
+    :
+    <Link to={`/users/${username}/videos/protocol`} style={{color: theme.foreground_select}}>上传内容协议</Link>
+    const protocolLine = <div>上传视频，即表示您已同意{urls}，不得上传未经他人授权的作品</div>
+    
     return (
         <div className={flag?"edu-back-white pb100 videoUploadList":"educontent videoUploadList"} style={{ marginBottom: `${flag?"0px":"200px"}` }}>
             <Prompt