From cc0b5aaf907fe5e454e3a2b25b331cfa73704ca3 Mon Sep 17 00:00:00 2001
From: cyc <cyc@hainatravel.com>
Date: Thu, 15 Aug 2019 10:43:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96excel=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5TA=E8=AF=84=E8=AE=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tripadvisor_spider/controllers/index.php        |  7 +++++--
 .../models/Tripadvisor_Review_model.php             |  2 +-
 .../tripadvisor_spider/views/third_party_input.php  | 13 ++++++-------
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/application/third_party/tripadvisor_spider/controllers/index.php b/application/third_party/tripadvisor_spider/controllers/index.php
index bc67b596..5a8c5da9 100644
--- a/application/third_party/tripadvisor_spider/controllers/index.php
+++ b/application/third_party/tripadvisor_spider/controllers/index.php
@@ -231,14 +231,15 @@ class Index extends CI_Controller {
 				
 				//创建返回的数组
 				$data = [];
-				foreach ($phpExcel->getSheetNames() as $key=>$destination){
+				foreach ($phpExcel->getSheetNames() as $key=>$form_name){
 					$data[$key] = new stdClass();
-					$data[$key]->destination = $destination;
+					$data[$key]->form_name = $form_name;
 					$data[$key]->list_name = array();
 					$data[$key]->list_data = array();
 					//循环获取每个表格的行/列数
 					$row = $phpExcel->getSheet($key)->getHighestRow();
 					$column = $phpExcel->getSheet($key)->getHighestColumn();
+					$column = 'D';
 					$j = 0;
 					// 行数循环
 					for ($i = 1; $i <= $row; $i++) {
@@ -309,6 +310,7 @@ class Index extends CI_Controller {
 		$url = $this->input->get_post('url');
 		$destination = $this->input->get_post('destination');
 		$html_num = $this->input->get_post('html_num');
+		$group_name = $this->input->get_post('group_name');
 		
 		//$url = 'https://www.tripadvisor.com/ShowUserReviews-g308272-d6222868-r599123490-Shanghai_Trippest_Mini_Group_Tours-Shanghai.html';
 		//$destination = 'tp_Beijing';
@@ -320,6 +322,7 @@ class Index extends CI_Controller {
 			//做一个数组用于存储数据
 			$detail_data = new stdClass();
 			$detail_data->destination = $destination;
+			$detail_data->group_name = $group_name;
 			
 			//提取局部,不做整个页面的寻找元素,提升效率
 			$meta_inner = $html_object->find('.meta_inner');
diff --git a/application/third_party/tripadvisor_spider/models/Tripadvisor_Review_model.php b/application/third_party/tripadvisor_spider/models/Tripadvisor_Review_model.php
index 6e50f862..a0d1c324 100644
--- a/application/third_party/tripadvisor_spider/models/Tripadvisor_Review_model.php
+++ b/application/third_party/tripadvisor_spider/models/Tripadvisor_Review_model.php
@@ -186,7 +186,7 @@ class Tripadvisor_Review_model extends CI_Model {
 							?,?,?,?,?,?,?,?,?,?,?,?,GETDATE()
 						)			
 		";
-		$query = $this->INFO->query($sql, array($detail_data->review_id,$detail_data->destination,$detail_data->review_id,$detail_data->title,$detail_data->content,$detail_data->review_name,$detail_data->user_loc,$detail_data->star_nums,$detail_data->rating_date,$detail_data->experience_date,json_encode($detail_data->pic),'',''));
+		$query = $this->INFO->query($sql, array($detail_data->review_id,$detail_data->destination,$detail_data->review_id,$detail_data->title,$detail_data->content,$detail_data->review_name,$detail_data->user_loc,$detail_data->star_nums,$detail_data->rating_date,$detail_data->experience_date,json_encode($detail_data->pic),$detail_data->group_name,''));
 		//$result = $query->result();
 	}
 	
diff --git a/application/third_party/tripadvisor_spider/views/third_party_input.php b/application/third_party/tripadvisor_spider/views/third_party_input.php
index aa4caea8..68eba40f 100644
--- a/application/third_party/tripadvisor_spider/views/third_party_input.php
+++ b/application/third_party/tripadvisor_spider/views/third_party_input.php
@@ -201,24 +201,23 @@ $(function(){
 				 var html = '';
 				 var j,ta_url;
 				 var num = 0;
+				 	
 				 for (var i=0;i<jsondata.length;i++){
 					 for (j in jsondata[i].list_data){
 						 html += '<div class="row"><div class="col-md-4">';
-						 html += '<p>'+jsondata[i].destination+'</p>';
-						 html += '<p>团名:'+jsondata[i].list_data[j][0]+'</p>';
-						 html += '<p>导游:'+jsondata[i].list_data[j][1]+'</p>';
-						 html += '<p>发帖账户:'+jsondata[i].list_data[j][3]+'</p>';
-						 html += '<p>星级:'+jsondata[i].list_data[j][4]+'</p>';
+						 html += '<p>'+jsondata[i].list_data[j][0]+'</p>';
+						 html += '<p>团名:'+jsondata[i].list_data[j][1]+'</p>';
+						 html += '<p>导游:'+jsondata[i].list_data[j][2]+'</p>';
 						 html += '</div>';
 						 html += '<div class="col-md-20">';
 						 html += '<p id="excel_title_'+num+'"></p>';
 						 html += '<p id="excel_content_'+num+'"></p>';
-						 ta_url = jsondata[i].list_data[j][2];
+						 ta_url = jsondata[i].list_data[j][3];
 						 //console.log(ta_url);
 						 if(ta_url.indexOf('ShowUserReviews') != -1){
 							 $.ajax({
 								 url:'/info.php/apps/tripadvisor_spider/index/get_reviews_detail',
-								 data:{url:ta_url,html_num:num},
+								 data:{url:ta_url,html_num:num,destination:jsondata[i].list_data[j][0],group_name:jsondata[i].list_data[j][1]},
 								 success:function(json_detail,status){
 									 var data = $.parseJSON(json_detail);
 									 $('#excel_title_'+data.html_id).html(data.title);