Merge remote-tracking branch 'origin/master'

# Conflicts:
#	application/admin/controller/CourseStore.php
#	application/admin/view/course_store/edit.html
#	application/api/controller/Course.php
#	application/config.php
#	public/api.html

@@ -77,7 +77,7 @@ class Events
                 $notice->insert($insert);
 
                 //小程序通知
-                $data = [
+                /*$data = [
                     'touser' => $k['user']['openid'],
                     'template_id' => $config['order_over_tmp'],
                     'form_id'=> $k['id'],
@@ -88,7 +88,7 @@ class Events
                         "name3" => ["value" => $k['user']['nickname']],
                     ],
                 ];
-                $template->send($data);
+                $template->send($data);*/
             }
         });
 
@@ -129,7 +129,7 @@ class Events
                     $notice->insert($insert);
 
                     //小程序通知
-                    $data = [
+                    /*$data = [
                         'touser' => $v['user']['openid'],
                         'template_id' => $config['course_start_tmp'],
                         'form_id'=> $v['id'],
@@ -142,7 +142,7 @@ class Events
                         ],
                     ];
 
-                    $template->send($data);
+                    $template->send($data);*/
                 }
             }
         });