【Mod】灯谜修改为答题

app/Http/Controllers/Admin/LotteryRiddleRecord.php

@@ -152,7 +152,7 @@ class LotteryRiddleRecord extends Auth{
 		$excel      		= new \Vtiful\Kernel\Excel(['path' =>public_path().'/uploads/']);
 		$filePath 			= $excel->fileName(uniqid().'.xlsx', 'sheet1')->header(['记录ID','活动ID','活动名称','客户编码','客户昵称','奖品名称','中奖状态','中奖时间','微伴ID'])->data($data)->output();
 		header("Content-Type: application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
-		header('Content-Disposition: attachment;filename="灯谜抽奖中奖记录'.date('Y-m-d His').'.xlsx"');
+		header('Content-Disposition: attachment;filename="答题抽奖中奖记录'.date('Y-m-d His').'.xlsx"');
 		header('Content-Length: ' . filesize($filePath));
 		header('Content-Transfer-Encoding: binary');
 		header('Cache-Control: must-revalidate');

app/Http/Controllers/Admin/RiddleActive.php

@@ -7,7 +7,7 @@ use App\Models\City;
 use App\Models\WeiBan\Taglist as WeiBanTagList;
 
 /**
- * 灯谜活动规则
+ * 答题活动规则
  *
  * @author    刘相欣
  *
@@ -16,7 +16,7 @@ class RiddleActive extends Auth{
 	
 	protected function _initialize(){
 		parent::_initialize();
-		$this->assign('breadcrumb1','灯谜活动');
+		$this->assign('breadcrumb1','答题活动');
 		$this->assign('breadcrumb2','活动列表');
 	}
 

app/Http/Controllers/Admin/RiddleActiveRecord.php

@@ -14,7 +14,7 @@ class RiddleActiveRecord extends Auth{
 	
 	protected function _initialize(){
 		parent::_initialize();
-		$this->assign('breadcrumb1','灯谜活动');
+		$this->assign('breadcrumb1','答题活动');
 		$this->assign('breadcrumb2','答题记录');
 	}
 
@@ -117,7 +117,7 @@ class RiddleActiveRecord extends Auth{
 		$excel      		= new \Vtiful\Kernel\Excel(['path' =>public_path().'/uploads/']);
 		$filePath 			= $excel->fileName('tutorial01.xlsx', 'sheet1')->header(['记录ID','活动ID','活动名称','客户编码','客户昵称','是否答对','微伴ID','答题时间'])->data($data)->output();
 		header("Content-Type: application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
-		header('Content-Disposition: attachment;filename="灯谜活动答题记录'.date('Y-m-d His').'.xlsx"');
+		header('Content-Disposition: attachment;filename="答题活动答题记录'.date('Y-m-d His').'.xlsx"');
 		header('Content-Length: ' . filesize($filePath));
 		header('Content-Transfer-Encoding: binary');
 		header('Cache-Control: must-revalidate');

app/Http/Controllers/Admin/RiddleAnswer.php

@@ -4,7 +4,7 @@ use App\Http\Requests\Admin\Riddle\Answer as Request;
 use App\Models\Riddle\Answer as Model;
 use App\Models\Riddle\Question as Question;
 /**
- * 灯谜答案
+ * 答题答案
  *
  * @author    刘相欣
  *
@@ -13,8 +13,8 @@ class RiddleAnswer extends Auth{
 	
 	protected function _initialize(){
 		parent::_initialize();
-		$this->assign('breadcrumb1','灯谜活动');
-		$this->assign('breadcrumb2','灯谜选项');
+		$this->assign('breadcrumb1','答题活动');
+		$this->assign('breadcrumb2','答题选项');
 	}
 
 	/**

app/Http/Controllers/Admin/RiddleQuestion.php

@@ -4,7 +4,7 @@ use App\Http\Requests\Admin\Riddle\Question as Request;
 use App\Models\Riddle\Question as Model;
 
 /**
- * 灯谜活动题目
+ * 答题活动题目
  *
  * @author    刘相欣
  *
@@ -13,8 +13,8 @@ class RiddleQuestion extends Auth{
 	
 	protected function _initialize(){
 		parent::_initialize();
-		$this->assign('breadcrumb1','灯谜活动');
-		$this->assign('breadcrumb2','灯谜题目');
+		$this->assign('breadcrumb1','答题活动');
+		$this->assign('breadcrumb2','答题题目');
 	}
 
 	/**

app/Http/Controllers/Api/Lottery/Riddle.php

@@ -160,7 +160,7 @@ class Riddle extends Api{
                         // 积分大于0
                         if( $rewardResult['reward_info'] > 0 ){
                             // 积分发放
-                            $result 		= $CustomAmount->trade($uid,$lotteryId,$rewardResult['reward_info'],4,1,'灯谜抽奖');
+                            $result 		= $CustomAmount->trade($uid,$lotteryId,$rewardResult['reward_info'],4,1,'答题抽奖');
                             // 发放失败，改为未中奖
                             if( isset($result['error']) ) $rewardIndex = 0;
                             // 发放成功，状态为已完成

app/Http/Controllers/Api/Riddle/Active.php

@@ -8,7 +8,7 @@ use App\Models\Custom;
 use App\Models\WeiBan\Tags as WeiBanTags;
 
 /**
- * 灯谜活动
+ * 答题活动
  * 
  * @author 刘相欣
  * 

app/Http/Controllers/Api/Riddle/Answer.php

@@ -9,7 +9,7 @@ use App\Models\Lottery\RiddleUsable;
 use Illuminate\Support\Facades\DB;
 
 /**
- * 灯谜问答
+ * 答题问答
  * 
  * @author 刘相欣
  * 

app/Http/Controllers/Api/Riddle/Question.php

@@ -5,7 +5,7 @@ use App\Models\Riddle\Answer;
 use App\Models\Riddle\Question as Model;
 
 /**
- * 灯谜问答
+ * 答题问答
  * 
  * @author 刘相欣
  * 

app/Http/Requests/Admin/Recruitment/Active.php

@@ -3,7 +3,7 @@
 use App\Http\Requests\BaseRequest;
 
 /**
- * 灯谜活动验证器
+ * 答题活动验证器
  * 
  */
 class Active extends BaseRequest

app/Http/Requests/Admin/Riddle/Active.php

@@ -3,7 +3,7 @@
 use App\Http\Requests\BaseRequest;
 
 /**
- * 灯谜活动验证器
+ * 答题活动验证器
  * 
  */
 class Active extends BaseRequest

app/Http/Requests/Admin/Riddle/Answer.php

@@ -3,7 +3,7 @@
 use App\Http\Requests\BaseRequest;
 
 /**
- * 灯谜选项验证器
+ * 答题选项验证器
  * 
  */
 class Answer extends BaseRequest
@@ -40,8 +40,8 @@ class Answer extends BaseRequest
     public function messages()
     {
         return [
-            'title.required'    => '灯谜题目必填',
-            'title.required'    => '灯谜题目已存在',
+            'title.required'    => '答题题目必填',
+            'title.required'    => '答题题目已存在',
             'id.required'       => 'ID未知',
             'id.integer'        => 'ID格式错误',
             'id.gt'   		    => 'ID格式错误',

app/Http/Requests/Admin/Riddle/Question.php

@@ -3,7 +3,7 @@
 use App\Http\Requests\BaseRequest;
 
 /**
- * 灯谜活动验证器
+ * 答题活动验证器
  * 
  */
 class Question extends BaseRequest
@@ -39,8 +39,8 @@ class Question extends BaseRequest
     public function messages()
     {
         return [
-            'title.required'    => '灯谜题目必填',
-            'title.required'    => '灯谜题目已存在',
+            'title.required'    => '答题题目必填',
+            'title.required'    => '答题题目已存在',
             'id.required'       => 'ID未知',
             'id.integer'        => 'ID格式错误',
             'id.gt'   		    => 'ID格式错误',

app/Models/Riddle/Active.php

@@ -4,7 +4,7 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 /**
- * 灯谜活动模型
+ * 答题活动模型
  * 
  */
 class Active extends Model

app/Models/Riddle/ActiveRecord.php

@@ -4,7 +4,7 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 /**
- * 灯谜活动模型
+ * 答题活动模型
  * 
  */
 class ActiveRecord extends Model

app/Models/Riddle/ActiveShare.php

@@ -4,7 +4,7 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 /**
- * 灯谜活动模型
+ * 答题活动模型
  * 
  */
 class ActiveShare extends Model

app/Models/Riddle/Answer.php

@@ -4,7 +4,7 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 /**
- * 灯谜活动模型
+ * 答题活动模型
  * 
  */
 class Answer extends Model

app/Models/Riddle/Question.php

@@ -4,7 +4,7 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 /**
- * 灯谜活动模型
+ * 答题活动模型
  * 
  */
 class Question extends Model

resources/views/admin/riddle_active/add.blade.php

@@ -44,7 +44,7 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 	</div>
 	<div class="form-group col-sm-2">
 		<label class="control-label">抽奖ID</label>
-		<input class="form-control" required="required" type="number" placeholder="灯谜抽奖活动的ID" name="lottery_id" value="" />
+		<input class="form-control" required="required" type="number" placeholder="答题抽奖活动的ID" name="lottery_id" value="" />
 	</div>
 	<div class="form-group col-sm-4">
 		<label class="control-label">活动城市</label>

resources/views/admin/riddle_active/edit.blade.php

@@ -44,7 +44,7 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 	</div>
 	<div class="form-group col-sm-2">
 		<label class="control-label">抽奖ID</label>
-		<input class="form-control" required="required" type="number" placeholder="灯谜抽奖活动的ID" name="lottery_id" value="{{$oldData['lottery_id']}}" />
+		<input class="form-control" required="required" type="number" placeholder="答题抽奖活动的ID" name="lottery_id" value="{{$oldData['lottery_id']}}" />
 	</div>
 	<div class="form-group col-sm-4">
 		<label class="control-label">活动城市</label>

routes/api.php

@@ -259,11 +259,11 @@ Route::any('lottery_riddle_record/get_list_all',[\App\Http\Controllers\Api\Lotte
 Route::any('lottery_riddle_record/set_addr',[\App\Http\Controllers\Api\Lottery\RiddleRecord::class,'set_addr']);
 
 /**
- * 灯谜
+ * 答题
  */
 // 获取活动详情
 Route::any('riddle_active/get_detail',[\App\Http\Controllers\Api\Riddle\Active::class,'get_detail']);
-// 获取灯谜题目
+// 获取答题题目
 Route::any('riddle_question/get_question',[\App\Http\Controllers\Api\Riddle\Question::class,'get_question']);
 // 分享记录
 Route::any('riddle_active_share/add',[\App\Http\Controllers\Api\Riddle\ActiveShare::class,'add']);

routes/web.php

@@ -626,7 +626,7 @@ Route::middleware('admin')->prefix('admin')->group(function(){
     Route::any('lottery_riddle_record/down_excel',[App\Http\Controllers\Admin\LotteryRiddleRecord::class,'down_excel']);
 
 
-    /* 灯谜活动 */
+    /* 答题活动 */
     // 列表
     Route::any('riddle_active/index',[App\Http\Controllers\Admin\RiddleActive::class,'index']);
     // 详情
@@ -636,7 +636,7 @@ Route::middleware('admin')->prefix('admin')->group(function(){
     // 状态
     Route::any('riddle_active/set_status',[App\Http\Controllers\Admin\RiddleActive::class,'set_status']);
 
-    /* 灯谜题目 */
+    /* 答题题目 */
     // 列表
     Route::any('riddle_question/index',[App\Http\Controllers\Admin\RiddleQuestion::class,'index']);
     // 详情
@@ -646,13 +646,13 @@ Route::middleware('admin')->prefix('admin')->group(function(){
     // 状态
     Route::any('riddle_question/set_status',[App\Http\Controllers\Admin\RiddleQuestion::class,'set_status']);
 
-    /* 灯谜记录 */
+    /* 答题记录 */
     // 列表
     Route::any('riddle_active_record/index',[App\Http\Controllers\Admin\RiddleActiveRecord::class,'index']);
     // 下载列表
     Route::any('riddle_active_record/down_excel',[App\Http\Controllers\Admin\RiddleActiveRecord::class,'down_excel']);
 
-    /* 灯谜选项 */
+    /* 答题选项 */
     // 列表
     Route::any('riddle_answer/index',[App\Http\Controllers\Admin\RiddleAnswer::class,'index']);
     // 详情