From 43559d5aca986f69a05e5a4c2412f6b6f551674c Mon Sep 17 00:00:00 2001
From: Terry <2358269014@qq.com>
Date: Fri, 23 Feb 2018 09:44:02 +0800
Subject: [PATCH] appfront product review list show info

---
 app/appfront/languages/zh_CN/appfront.php     |  25 ++-
 .../Catalog/block/reviewproduct/Lists.php     |  27 ++--
 .../front/catalog/product/index/review.php    |  52 +++----
 .../front/catalog/reviewproduct/lists.php     | 144 ++++++++++++------
 4 files changed, 160 insertions(+), 88 deletions(-)

diff --git a/app/appfront/languages/zh_CN/appfront.php b/app/appfront/languages/zh_CN/appfront.php
index 12d8974c..1a299415 100644
--- a/app/appfront/languages/zh_CN/appfront.php
+++ b/app/appfront/languages/zh_CN/appfront.php
@@ -360,5 +360,28 @@ return [
  'We Couldn’t Find this Page'                                   => '我们无法找到这个页面',
  'Please contact us if you think this is a server error, Thank you.' => '如果您认为这是服务器错误，请与我们联系，谢谢。',
  'Bring me back Home'                                           => '带我去首页',
-
+ 'Average Rating' => '平均评分',
+ 'based on {review_count} Customer Reviews' => '基于{review_count}条客户评论',
+ '5 stars' => '5星',
+ '4 stars' => '4星',
+ '3 stars' => '3星',
+ '2 stars' => '2星',
+ '1 stars' => '1星',
+ 'Write a Customer Review' => '填写用户评论',
+ '' => '',
+ '' => '',
+ '' => '',
+ '' => '',
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
 ];
diff --git a/app/appfront/modules/Catalog/block/reviewproduct/Lists.php b/app/appfront/modules/Catalog/block/reviewproduct/Lists.php
index 9cf0f3e3..a439557b 100644
--- a/app/appfront/modules/Catalog/block/reviewproduct/Lists.php
+++ b/app/appfront/modules/Catalog/block/reviewproduct/Lists.php
@@ -99,22 +99,23 @@ class Lists
             $coll = $data['coll'];
             $reviewHelper = $this->_reviewHelper;
             $ReviewAndStarCount = $reviewHelper::getReviewAndStarCount($product);
-            list($review_count, $reviw_rate_star_average) = $ReviewAndStarCount;
+            list($review_count, $reviw_rate_star_average, $reviw_rate_star_info)  = $ReviewAndStarCount;
 
             return [
-                '_id' => $this->product_id,
-                'spu' => $this->spu,
-                'review_count'                => $review_count,
+                '_id'    => $this->product_id,
+                'spu'   => $this->spu,
+                'review_count'               => $review_count,
                 'reviw_rate_star_average'    => $reviw_rate_star_average,
-                'pageToolBar'    => $pageToolBar,
-                'coll'            => $coll,
-                'noActiveStatus'=> Yii::$service->product->review->noActiveStatus(),
-                'addReviewUrl'    => $addReviewUrl,
-                'name'            => $name,
-                'price_info'    => $price_info,
-                'main_img'        => $main_img,
-                'editForm'        => $editForm,
-                'url'        => Yii::$service->url->getUrl($url_key),
+                'reviw_rate_star_info'       => $reviw_rate_star_info,
+                'pageToolBar'       => $pageToolBar,
+                'coll'              => $coll,
+                'noActiveStatus'    => Yii::$service->product->review->noActiveStatus(),
+                'addReviewUrl'      => $addReviewUrl,
+                'name'              => $name,
+                'price_info'        => $price_info,
+                'main_img'          => $main_img,
+                'editForm'          => $editForm,
+                'url'               => Yii::$service->url->getUrl($url_key),
             ];
         }
     }
diff --git a/app/appfront/theme/base/front/catalog/product/index/review.php b/app/appfront/theme/base/front/catalog/product/index/review.php
index ab328a3c..07c593a5 100644
--- a/app/appfront/theme/base/front/catalog/product/index/review.php
+++ b/app/appfront/theme/base/front/catalog/product/index/review.php
@@ -21,59 +21,53 @@
 		</div>
 		<div class="clear"></div>
 		<div class="box pro_commit">
-            
-            
             <div class="averageWarp">
-				<span class="lineBlock fon14">Average Rating:</span>
+				<span class="lineBlock fon14"><?= Yii::$service->page->translate->__('Average Rating'); ?>: </span>
 				<a  lehref="#" class="review_star review_star_<?= round($reviw_rate_star_average) ?>" onclick="javascript:return false;"></a>
 				<b class="lineBlock fon18"><?= $reviw_rate_star_average ?></b>
-				<span class="lineBlock">based on <?= $review_count ?> Customer Reviews</span>
+				<span class="lineBlock"><?= Yii::$service->page->translate->__('based on {review_count} Customer Reviews',['review_count' => $review_count]) ?></span>
 			</div>
             <div class="clear"></div>
             <div class="lbBox writeRiviewTitle">
 				<ul class="lineBlock proportionStars">
-										<li class="lbBox">
-						<span class="lineBlock fz_blue">5 stars</span>
+					<li class="lbBox">
+						<span class="lineBlock fz_blue"><?= Yii::$service->page->translate->__('5 stars'); ?></span>
 						<div class="lineBlock proportionBox">
 							<div style="width: <?=  $reviw_rate_star_info['star_5'] ?>%"> </div>
 						</div>
-													<span class="lineBlock"><?=  $reviw_rate_star_info['star_5'] ?>%</span>
-											</li>
-										<li class="lbBox">
-						<span class="lineBlock fz_blue">4 stars</span>
+						<span class="lineBlock"><?=  $reviw_rate_star_info['star_5'] ?>%</span>
+					</li>
+					<li class="lbBox">
+						<span class="lineBlock fz_blue"><?= Yii::$service->page->translate->__('4 stars'); ?></span>
 						<div class="lineBlock proportionBox">
 							<div style="width: <?=  $reviw_rate_star_info['star_4'] ?>%"> </div>
 						</div>
-													<span class="lineBlock"><?=  $reviw_rate_star_info['star_4'] ?>%</span>
-											</li>
-										<li class="lbBox">
-						<span class="lineBlock fz_blue">3 stars</span>
+						<span class="lineBlock"><?=  $reviw_rate_star_info['star_4'] ?>%</span>
+					</li>
+					<li class="lbBox">
+						<span class="lineBlock fz_blue"><?= Yii::$service->page->translate->__('3 stars'); ?></span>
 						<div class="lineBlock proportionBox">
 							<div style="width: <?=  $reviw_rate_star_info['star_3'] ?>%"> </div>
 						</div>
-                            <span class="lineBlock"><?=  $reviw_rate_star_info['star_3'] ?>%</span>
-											
-											</li>
-										<li class="lbBox">
-						<span class="lineBlock fz_blue">2 stars</span>
+                        <span class="lineBlock"><?=  $reviw_rate_star_info['star_3'] ?>%</span>				
+					</li>
+					<li class="lbBox">
+						<span class="lineBlock fz_blue"><?= Yii::$service->page->translate->__('2 stars'); ?></span>
 						<div class="lineBlock proportionBox">
 							<div style="width: <?=  $reviw_rate_star_info['star_2'] ?>%"> </div>
 						</div>
-													<span class="lineBlock"><?=  $reviw_rate_star_info['star_2'] ?>%</span>
-											</li>
-										<li class="lbBox">
-						<span class="lineBlock fz_blue">1 stars</span>
+						<span class="lineBlock"><?=  $reviw_rate_star_info['star_2'] ?>%</span>
+					</li>
+					<li class="lbBox">
+						<span class="lineBlock fz_blue"><?= Yii::$service->page->translate->__('1 stars'); ?></span>
 						<div class="lineBlock proportionBox">
 							<div style="width: <?=  $reviw_rate_star_info['star_1'] ?>%"> </div>
 						</div>
-                        		<span class="lineBlock"><?=  $reviw_rate_star_info['star_1'] ?>%</span>
-											
-											</li>
-									</ul>
+                        <span class="lineBlock"><?=  $reviw_rate_star_info['star_1'] ?>%</span>
+					</li>
+				</ul>
 				<div class="lineBlock writeRiviewBtn">
-					
 					<button type="submit" title="Save" class="button btn btn-primary addreview" onclick="javascrtpt:window.location.href='<?= Yii::$service->url->getUrl('catalog/reviewproduct/add',['spu'=>$spu,'_id'=>$_id]); ?>'"><span><span><?= Yii::$service->page->translate->__('Write a Customer Review'); ?></span></span></button>
-                    
 				</div>
 			</div>
             
diff --git a/app/appfront/theme/base/front/catalog/reviewproduct/lists.php b/app/appfront/theme/base/front/catalog/reviewproduct/lists.php
index 061f5912..300e4155 100644
--- a/app/appfront/theme/base/front/catalog/reviewproduct/lists.php
+++ b/app/appfront/theme/base/front/catalog/reviewproduct/lists.php
@@ -41,7 +41,7 @@
 							<div class="rbc_cold">
 								<span>
 									<span class="average_rating"><?= Yii::$service->page->translate->__('Average rating :');?></span>
-									<span class="review_star review_star_<?= $reviw_rate_star_average ?>" style="font-weight:bold;" itemprop="average"></span>  
+									<span class="review_star review_star_<?= round($reviw_rate_star_average) ?>" style="font-weight:bold;" itemprop="average"></span>  
 									
 									<a rel="nofollow" href="<?= Yii::$service->url->getUrl('catalog/reviewproduct/lists',['spu'=>$spu,'_id'=>$_id]); ?>">
 										(<span itemprop="count"><?= $review_count ?> <?= Yii::$service->page->translate->__('reviews');?></span>)
@@ -51,10 +51,7 @@
 							<a href="<?= $url ?>"  class="submitbutton">
 								<span><span> <?= Yii::$service->page->translate->__('Add To Cart');?></span></span> 
 							</a>
-							
-							<a style="margin-left:10px" href="<?= $addReviewUrl ?>" onclick="" class="submitbutton">
-								<span><span> <?= Yii::$service->page->translate->__('Add Review');?></span></span> 
-							</a>	 
+								 
 						</div>
 					</div>
 					<div class="clear"></div>
@@ -64,46 +61,103 @@
 					<div class="scroll_left">
 						<a href=""><?= Yii::$service->page->translate->__('Product Review');?></a>
 					</div>
-					<div class="product-Reviews_top">
-						<?php  if(is_array($coll) && !empty($coll)):  ?>
-						<ul id="review_description">
-							<?php foreach($coll as $one):  ?>
-							<li>
-								<div class="review_description_left">
-									<a href="#" class="review_star review_star_<?= $one['rate_star'] ?>" onclick="javascript:return false;"></a>
-									<p><?= Yii::$service->page->translate->__('By');?> <?= $one['name'] ?></p>
-									<span><?= $one['review_date'] ? date('Y-m-d H:i:s',$one['review_date']) : '' ?></span>
-								</div>
-								<div class="review_description_right">
-									<input id="review_url_407" value="" type="hidden">
-									<span class="review_description_right_span"><b><?= $one['summary'] ?></b></span>
-									<div class="review_description_centen">
-										<div class="addsize"></div>
-										<div class="review-content">
-											<?= $one['review_content'] ?>
-										</div>
-										<div class="moderation">
-										<?php if($one['status'] == $noActiveStatus): ?>  
-											<?= Yii::$service->page->translate->__('Your Review is awaiting moderation...');?>
-										<?php elseif($one['status'] == $refuseStatus): ?>
-											<?= Yii::$service->page->translate->__('Your Review is refused.');?>
-										<?php endif; ?>
-										</div>
-									</div>
-								</div>
-								<div class="clear"></div>
-							</li>
-							<?php endforeach; ?>
-						</ul>
-						<?php endif; ?>
-					</div>
-					<?php if($pageToolBar): ?>
-					<div class="pageToolbar">
-						<label class="title"><?= Yii::$service->page->translate->__('Page:');?></label><?= $pageToolBar ?>
-					</div>
-					<?php endif; ?>
-				</div>
-			</div>
+                    <div class="clear"></div>
+                    
+                    
+                    <div class="box pro_commit">
+                        <div class="averageWarp">
+                        <span class="lineBlock fon14"><?= Yii::$service->page->translate->__('Average Rating'); ?>: </span>
+                        <a  lehref="#" class="review_star review_star_<?= round($reviw_rate_star_average) ?>" onclick="javascript:return false;"></a>
+                        <b class="lineBlock fon18"><?= $reviw_rate_star_average ?></b>
+                        <span class="lineBlock"><?= Yii::$service->page->translate->__('based on {review_count} Customer Reviews',['review_count' => $review_count]) ?></span>
+                    </div>
+                    <div class="clear"></div>
+                    <div class="lbBox writeRiviewTitle">
+                        <ul class="lineBlock proportionStars">
+                            <li class="lbBox">
+                                <span class="lineBlock fz_blue"><?= Yii::$service->page->translate->__('5 stars'); ?></span>
+                                <div class="lineBlock proportionBox">
+                                    <div style="width: <?=  $reviw_rate_star_info['star_5'] ?>%"> </div>
+                                </div>
+                                <span class="lineBlock"><?=  $reviw_rate_star_info['star_5'] ?>%</span>
+                            </li>
+                            <li class="lbBox">
+                                <span class="lineBlock fz_blue"><?= Yii::$service->page->translate->__('4 stars'); ?></span>
+                                <div class="lineBlock proportionBox">
+                                    <div style="width: <?=  $reviw_rate_star_info['star_4'] ?>%"> </div>
+                                </div>
+                                <span class="lineBlock"><?=  $reviw_rate_star_info['star_4'] ?>%</span>
+                            </li>
+                            <li class="lbBox">
+                                <span class="lineBlock fz_blue"><?= Yii::$service->page->translate->__('3 stars'); ?></span>
+                                <div class="lineBlock proportionBox">
+                                    <div style="width: <?=  $reviw_rate_star_info['star_3'] ?>%"> </div>
+                                </div>
+                                <span class="lineBlock"><?=  $reviw_rate_star_info['star_3'] ?>%</span>				
+                            </li>
+                            <li class="lbBox">
+                                <span class="lineBlock fz_blue"><?= Yii::$service->page->translate->__('2 stars'); ?></span>
+                                <div class="lineBlock proportionBox">
+                                    <div style="width: <?=  $reviw_rate_star_info['star_2'] ?>%"> </div>
+                                </div>
+                                <span class="lineBlock"><?=  $reviw_rate_star_info['star_2'] ?>%</span>
+                            </li>
+                            <li class="lbBox">
+                                <span class="lineBlock fz_blue"><?= Yii::$service->page->translate->__('1 stars'); ?></span>
+                                <div class="lineBlock proportionBox">
+                                    <div style="width: <?=  $reviw_rate_star_info['star_1'] ?>%"> </div>
+                                </div>
+                                <span class="lineBlock"><?=  $reviw_rate_star_info['star_1'] ?>%</span>
+                            </li>
+                        </ul>
+                        <div class="lineBlock writeRiviewBtn">
+                            <button type="submit" title="Save" class="button btn btn-primary addreview" onclick="javascrtpt:window.location.href='<?= Yii::$service->url->getUrl('catalog/reviewproduct/add',['spu'=>$spu,'_id'=>$_id]); ?>'"><span><span><?= Yii::$service->page->translate->__('Write a Customer Review'); ?></span></span></button>
+                        </div>
+                    </div>
+                    
+                    
+                    
+                        <div class="product-Reviews_top">
+                            <?php  if(is_array($coll) && !empty($coll)):  ?>
+                            <ul id="review_description">
+                                <?php foreach($coll as $one):  ?>
+                                <li>
+                                    <div class="review_description_left">
+                                        <a href="#" class="review_star review_star_<?= $one['rate_star'] ?>" onclick="javascript:return false;"></a>
+                                        <p><?= Yii::$service->page->translate->__('By');?> <?= $one['name'] ?></p>
+                                        <span><?= $one['review_date'] ? date('Y-m-d H:i:s',$one['review_date']) : '' ?></span>
+                                    </div>
+                                    <div class="review_description_right">
+                                        <input id="review_url_407" value="" type="hidden">
+                                        <span class="review_description_right_span"><b><?= $one['summary'] ?></b></span>
+                                        <div class="review_description_centen">
+                                            <div class="addsize"></div>
+                                            <div class="review-content">
+                                                <?= $one['review_content'] ?>
+                                            </div>
+                                            <div class="moderation">
+                                            <?php if($one['status'] == $noActiveStatus): ?>  
+                                                <?= Yii::$service->page->translate->__('Your Review is awaiting moderation...');?>
+                                            <?php elseif($one['status'] == $refuseStatus): ?>
+                                                <?= Yii::$service->page->translate->__('Your Review is refused.');?>
+                                            <?php endif; ?>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="clear"></div>
+                                </li>
+                                <?php endforeach; ?>
+                            </ul>
+                            <?php endif; ?>
+                        </div>
+                        <?php if($pageToolBar): ?>
+                        <div class="pageToolbar">
+                            <label class="title"><?= Yii::$service->page->translate->__('Page:');?></label><?= $pageToolBar ?>
+                        </div>
+                        <?php endif; ?>
+                    </div>
+                </div>
+            </div>
 		</div>
 	</div>
 </div>
\ No newline at end of file
-- 
GitLab