From 4ea60a5114d4569c15f2cbce0106358bdbe2b369 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cxxq250=E2=80=9D?= <“xxq250@qq.com”>
Date: Mon, 7 Nov 2022 11:34:15 +0800
Subject: [PATCH] =?UTF-8?q?fixed=20=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=B4=BB?=
 =?UTF-8?q?=E5=8A=A8=E5=90=8E=E5=8F=B0=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform_communicates_controller.rb       | 35 ++++++++++---------
 .../_form_modal.html.erb                      |  6 ++--
 .../platform_communicates/applet.html.erb     |  2 +-
 3 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/app/controllers/admins/platform_communicates_controller.rb b/app/controllers/admins/platform_communicates_controller.rb
index fba41dff..f7d707d3 100644
--- a/app/controllers/admins/platform_communicates_controller.rb
+++ b/app/controllers/admins/platform_communicates_controller.rb
@@ -1,5 +1,6 @@
-class Admins::PlatformCommunicatesController < Admins::BaseController 
+class Admins::PlatformCommunicatesController < Admins::BaseController
   before_action :get_communicate, only: [:edit, :update, :destroy, :show]
+
   def index
     params[:location] = "pc"
     sort_by = PlatformCommunicate.column_names.include?(params[:sort_by]) ? params[:sort_by] : 'order_index'
@@ -40,46 +41,48 @@ class Admins::PlatformCommunicatesController < Admins::BaseController
 
   def create
     @communicate = PlatformCommunicate.new(communicate_params)
-    if @communicate.save 
-      redirect_to admins_platform_communicates_path 
+    if @communicate.save
+      redirect_to @communicate.location == 'pc' ? "/admins/platform_communicates?location=pc" : "/admins/platform_communicates/applet?location=applet"
       flash[:success] = '创建社区动态成功'
     else
-      redirect_to admins_platform_communicates_path 
+      redirect_to @communicate.location == 'pc' ? "/admins/platform_communicates?location=pc" : "/admins/platform_communicates/applet?location=applet"
       flash[:danger] = "创建社区动态失败"
     end
   end
 
-  def edit 
+  def edit
 
   end
 
-  def update 
+  def update
     @communicate.attributes = communicate_params
     if @communicate.save
-      redirect_to admins_platform_communicates_path
+      redirect_to @communicate.location == 'pc' ? "/admins/platform_communicates?location=pc" : "/admins/platform_communicates/applet?location=applet"
       flash[:success] = '更新社区动态成功'
-    else 
-      redirect_to admins_platform_communicates_path
+    else
+      redirect_to @communicate.location == 'pc' ? "/admins/platform_communicates?location=pc" : "/admins/platform_communicates/applet?location=applet"
       flash[:danger] = '更新社区动态失败'
     end
   end
 
-  def destroy 
-    if @communicate.destroy 
-      redirect_to admins_platform_communicates_path
+  def destroy
+    location = @communicate.location
+    if @communicate.destroy
+      redirect_to location == 'pc' ? "/admins/platform_communicates?location=pc" : "/admins/platform_communicates/applet?location=applet"
       flash[:success] = '删除社区动态成功'
     else
-      redirect_to admins_platform_communicates_path
+      redirect_to location == 'pc' ? "/admins/platform_communicates?location=pc" : "/admins/platform_communicates/applet?location=applet"
       flash[:danger] = '删除社区动态失败'
     end
   end
 
-  private 
-  def get_communicate 
+  private
+
+  def get_communicate
     @communicate = PlatformCommunicate.find_by_id(params[:id])
   end
 
-  def communicate_params 
+  def communicate_params
     params.require(:platform_communicate).permit!
   end
 end
\ No newline at end of file
diff --git a/app/views/admins/platform_communicates/_form_modal.html.erb b/app/views/admins/platform_communicates/_form_modal.html.erb
index 9f0a9ecf..8cc7ffa2 100644
--- a/app/views/admins/platform_communicates/_form_modal.html.erb
+++ b/app/views/admins/platform_communicates/_form_modal.html.erb
@@ -40,12 +40,12 @@
             </label>
             <%= p.number_field :order_index,class: "form-control input-lg",required: true%>
           </div>
-          <%if @communicate&.tag_field.to_s.include?("活动") %>
+          <%if @communicate&.tag_field.to_s.include?("活动") && @communicate.location =='applet' %>
           <div class="form-group">
             <label>
-              报名字段（多个请用,隔开）
+              报名字段（多个请用,隔开）<span class="ml10 color-orange mr20">*</span>
             </label>
-            <%= p.text_field :enroll_field,class: "form-control input-lg"%>
+            <%= p.text_field :enroll_field,class: "form-control input-lg", required: true%>
           </div>
           <%end %>
         </div>
diff --git a/app/views/admins/platform_communicates/applet.html.erb b/app/views/admins/platform_communicates/applet.html.erb
index 28f6042a..a18a123c 100644
--- a/app/views/admins/platform_communicates/applet.html.erb
+++ b/app/views/admins/platform_communicates/applet.html.erb
@@ -1,5 +1,5 @@
 <% define_admin_breadcrumbs do %>
-  <% add_admin_breadcrumb('社区动态管理') %>
+  <% add_admin_breadcrumb('小程序动态管理') %>
 <% end %>
 
 <div class="box search-form-container platform-communicate-list-form">