优化代码

common/models/PushHothouse.php

@@ -107,7 +107,7 @@ class PushHothouse extends Common
                 $val['name'] = Opencc::Convert($val['name']);
                 $val['city_name'] = Opencc::Convert($val['city_name']);
                 $val['price_unit'] = Opencc::Convert($val['price_unit']);
-                $val['thumb'] = \Yii::$app->params['httpImg']['hosts'] . \Yii::$app->params['httpImg']['housesch'] . $val['thumb'] . '/same';
+                $val['thumb'] = \Yii::$app->params['httpImg']['hosts'] . \Yii::$app->params['httpImg']['houses'] . $val['thumb'] . '/same';
                 $val['tel'] = HouseHandle::RandTel($val['city']);
                 $val['label'] = HouseHandle::Subject(json_decode($val['characteristic']), 3);
                 if (!empty($val['label'])) {

frontend/server/IndexServer.php

@@ -356,7 +356,7 @@ class IndexServer
         foreach ($data as &$val) {
             $row = $vrModel->getListAndVr(['hid' => $val['id']]);
             $val['thumb'] = Yii::$app->params['httpImg']['host'] . Yii::$app->params['httpImg']['video'] . $row[0]['img'];
-//            $val['thumb'] = Yii::$app->params['httpImg']['hosts'] . Yii::$app->params['httpImg']['housesch'] . $val['thumb'] . '/same';
+//            $val['thumb'] = Yii::$app->params['httpImg']['hosts'] . Yii::$app->params['httpImg']['houses'] . $val['thumb'] . '/same';
         }
         return $data;
     }
@@ -366,7 +366,7 @@ class IndexServer
     {
         $data = (new Live())->getLiveHouseInfo($limit);
 //        foreach ($data as &$val) {
-//            $val['thumb'] = Yii::$app->params['httpImg']['hosts'] . Yii::$app->params['httpImg']['housesch'] . $val['thumb'] . '/same';
+//            $val['thumb'] = Yii::$app->params['httpImg']['hosts'] . Yii::$app->params['httpImg']['houses'] . $val['thumb'] . '/same';
 //        }
         return $data;
     }

frontend/views/public/publichousenav.php

@@ -6,8 +6,8 @@ use common\fm\Opencc;
 $module = Yii::$app->hostserver->module['module'];
 
 if (!empty(Yii::$app->request->get('hid'))) {
-    $name = \common\models\CnHouse::findOne(Yii::$app->request->get('hid'))['name'];
-    $housenews = (new \common\models\CnNews())->getHouseNews($name);
+    $name = \common\models\House::findOne(Yii::$app->request->get('hid'))['name'];
+    $housenews = (new \common\models\News())->getHouseNews($name);
 }
 
 ?>

mobile/controllers/HouseController.php

@@ -111,8 +111,8 @@ class HouseController extends CommonController
 	        'city' => $city,
 	        'house' => $rows['data'],
 	        'start_time' => $start_time,
-	        'house_count' => $rows['count'],
-	        'cityname' => $cityName,'seo'=>$meta]
+	        'house_total' => $rows['count'],
+	        'cityname' => $cityName,'seo'=>$meta],
         );
     }
 

mobile/controllers/IndexController.php

@@ -32,7 +32,7 @@ class IndexController extends CommonController
 	public function actionIndex()
 	{
 		//获取当前模块
-		$module = Yii::$app->hostserver->module;
+		$module = Yii::$app->controller->id;
 		//导航
 		$sysmenu = new \common\models\Frontend();
 		$sysmenu->pid = 5;
@@ -42,7 +42,7 @@ class IndexController extends CommonController
 		
 		$IndexModel = new IndexServer();
 		
-//		$news = $IndexModel->newslist();                                //咨询列表
+		$news = $IndexModel->newslist();                                //咨询列表
 		
 		$housetou = $IndexModel->getHouseTouTiao(1,3);                     //获取房产头条推送
 		
@@ -67,7 +67,7 @@ class IndexController extends CommonController
 		
 		
 		return $this->render($this->action->id, [
-			'module' => $module['module'],
+			'module' => $module,
 			'sysmenu' => $sysrows,
 			'cityname' => $cityName,
 			'news' => $news,

mobile/controllers/JsonController.php

@@ -223,7 +223,7 @@ class JsonController extends BaseController
             foreach ($rows as &$val) {
                 $val['characteristic'] = HouseHandle::Subject(json_decode($val['characteristic']), 3);
                 $val['tel'] = HouseHandle::RandTel($val['city']);
-                $val['thumb'] = Yii::$app->params['httpImg']['hosts'] . Yii::$app->params['httpImg']['housesch'] . $val['thumb'] . '/same';
+                $val['thumb'] = Yii::$app->params['httpImg']['hosts'] . Yii::$app->params['httpImg']['houses'] . $val['thumb'] . '/same';
                 $val['state'] = Yii::$app->params['HouseSalesStatus'][$val['state']];
             }
             return Help::JsonCode(Help::SUCCESS, '成功', $rows);
@@ -321,7 +321,7 @@ class JsonController extends BaseController
 
             $randArr = [];
             foreach ($data as &$val) {
-                $val['thumb'] = Yii::$app->params['httpImg']['hosts'] . Yii::$app->params['httpImg']['housesch'] . $val['thumb'];
+                $val['thumb'] = Yii::$app->params['httpImg']['hosts'] . Yii::$app->params['httpImg']['houses'] . $val['thumb'];
                 if (isset($charaArrs[$val['id']])) {
                     //随机选择3个特色主题
                     if (count($charaArrs[$val['id']]) > 3) {
@@ -367,7 +367,7 @@ class JsonController extends BaseController
             $arr['id'] = $row['house']['id'];
             $arr['name'] = $row['house']['name'];
             $arr['state'] = $row['house']['state'];
-            $arr['thumb'] = Yii::$app->params['httpImg']['hosts'] . Yii::$app->params['httpImg']['housesch'] . $row['house']['thumb'] . '/pfgwatermark';
+            $arr['thumb'] = Yii::$app->params['httpImg']['hosts'] . Yii::$app->params['httpImg']['houses'] . $row['house']['thumb'] . '/pfgwatermark';
             $arr['sale_price'] = $row['house']['sale_price'];
             $arr['price_unit'] = $row['house']['price_unit'];
             $arr['main_units'] = $row['house']['main_units'];

mobile/controllers/ZtController.php

@@ -196,7 +196,7 @@ class ZtController extends CommonController
 			                                    ->limit(8)
 			                                    ->orderBy(['pfg_pushhouse_type.sort'=>SORT_DESC])->asArray()->all();
 			foreach ($data as &$value){
-				$value['thumb'] = Yii::$app->params['httpImg']['hosts'] . Yii::$app->params['httpImg']['housesch'] . $value['thumb'] . '/same';
+				$value['thumb'] = Yii::$app->params['httpImg']['hosts'] . Yii::$app->params['httpImg']['houses'] . $value['thumb'] . '/same';
 			}
 			return \backend\base\Help::JsonData(Help::SUCCESS,'成功',0,$data);
 		}else{
@@ -217,7 +217,7 @@ class ZtController extends CommonController
 			                                    ->limit(6)
 			                                    ->orderBy(['pfg_pushhouse_type.sort' => SORT_DESC])->asArray()->all();
 			foreach ($data as &$value) {
-				$value['thumb'] = Yii::$app->params['httpImg']['hosts'] . Yii::$app->params['httpImg']['housesch'] . $value['thumb'] . '/same';
+				$value['thumb'] = Yii::$app->params['httpImg']['hosts'] . Yii::$app->params['httpImg']['houses'] . $value['thumb'] . '/same';
 				$value['tel'] = $this->RandTel($value['city']);
 			}
 			return \backend\base\Help::JsonData(Help::SUCCESS, '成功', 0, $data);

mobile/modules/live/controllers/EnrollController.php

@@ -4,7 +4,7 @@ namespace mobile\modules\live\controllers;
 
 
 use common\api\EnrollServer;
-use common\models\china\CnEnroll;
+use common\models\china\Enroll;
 use mobile\base\Help;
 use Yii;
 use mobile\modules\live\base\BaseController;
@@ -42,7 +42,7 @@ class EnrollController extends BaseController
         $form->load(Yii::$app->request->post(), '');
         if (!$form->validate()) return Help::JsonCode(Help::ERROR, '提交失败', $form->errors);
 
-        $model = new CnEnroll();
+        $model = new Enroll();
         $model->scenario = 'madd';
         $model->load(array_merge($form->attributes, Yii::$app->request->post()), '');
 

mobile/server/IndexServer.php

@@ -243,7 +243,7 @@ class IndexServer
 			if (empty($val['is_tel'])) {
 				$val['is_tel'] = $this->RandTel($val['city']);
 			}
-			$val['thumb'] = Yii::$app->params['httpImg']['hosts'] . Yii::$app->params['httpImg']['housesch'] . $val['thumb'] . '/same';
+			$val['thumb'] = Yii::$app->params['httpImg']['hosts'] . Yii::$app->params['httpImg']['houses'] . $val['thumb'] . '/same';
 		}
 		return $data;
 	}

mobile/views/house/details.php

@@ -69,7 +69,7 @@ $this->title = '楼盘详情';
                                 <?php } ?></em></li>
                         <li class="c">
                             <span><?= Opencc::ConvertHn('装修状况') ?>：</span><em><?php if (!empty($model['house']['fit'])) {
-                                    echo Yii::$app->params['CnHousefit'][$model['house']['fit']];
+                                    echo Yii::$app->params['Housefit'][$model['house']['fit']];
                                 } else {
                                     echo '暂无信息';
                                 } ?></em></li>
@@ -93,7 +93,7 @@ $this->title = '楼盘详情';
                 <div class="y_lpjbxx_cent">
                     <ul>
                         <li class="c">
-                            <span><?= Opencc::ConvertHn('销售状态') ?>：</span><em><?= Yii::$app->params['CnHouseSalesStatus'][$model['house']['state']] ?></em>
+                            <span><?= Opencc::ConvertHn('销售状态') ?>：</span><em><?= Yii::$app->params['HouseSalesStatus'][$model['house']['state']] ?></em>
                         </li>
                         <li class="c">
                             <span><?= Opencc::ConvertHn('楼盘优惠') ?>：</span><em><?= Opencc::ConvertHn(f_unit($model['house']['preferential'])) ?></em>

mobile/views/house/selftel.php

@@ -51,7 +51,7 @@
     <div class="w-con">
         <div class="w-con-box">
             <div class="w-con-img">
-                <a href=""><img src="<?= Yii::$app->params['httpImg']['hosts'] . Yii::$app->params['httpImg']['housesch'] . $model['house']['thumb'] . '/same' ?>" alt=""></a>
+                <a href=""><img src="<?= Yii::$app->params['httpImg']['hosts'] . Yii::$app->params['httpImg']['houses'] . $model['house']['thumb'] . '/same' ?>" alt=""></a>
             </div>
             <h2><a href=""><?=$model['house']['name']?></a></h2>
             <div class="w-con-tel">

mobile/views/house/videodetails.php

@@ -24,7 +24,7 @@ $this->title = '视频详情-品房海外';
 			<div class="playvideo">
 				<div class="poay"><img src="/image/video/play.png" alt=""></div>
 				<div id="oid" class="zy_media" data-off="2" data-id="<?php echo $info['id']; ?>">
-		    		<video poster="<?= Yii::$app->params['httpImg']['hosts'], Yii::$app->params['httpImg']['housesch'] ,$info['thumb'],'/same' ?>" data-config='{"mediaTitle": "<?=$info['name']?>--视频"}' style="width: 100%; height: 100%; object-fit: fill">
+		    		<video poster="<?= Yii::$app->params['httpImg']['hosts'], Yii::$app->params['httpImg']['houses'] ,$info['thumb'],'/same' ?>" data-config='{"mediaTitle": "<?=$info['name']?>--视频"}' style="width: 100%; height: 100%; object-fit: fill">
 		    	    	<source src="<?php echo $info['video_url']; ?>" type="video/mp4">您的浏览器不支持HTML5视频
 		   		 	</video>
 				</div>

mobile/views/news/details.php

@@ -141,7 +141,7 @@ $this->metaTags[] = '<meta name="description" content="' . $model['subject'] . '
                                     <a href="<?= '/house/', $val['id'] ?>">
                                         <div class="y_centerpc">
                                             <p class="y_img"><img
-                                                        src="<?= Yii::$app->params['httpImg']['hosts'], Yii::$app->params['httpImg']['housesch'], $val['thumb'], '/same' ?>"
+                                                        src="<?= Yii::$app->params['httpImg']['hosts'], Yii::$app->params['httpImg']['houses'], $val['thumb'], '/same' ?>"
                                                         alt=""></p>
                                             <div class="y_bottomtext c">
                                                 <p class="y_left">

mobile/views/public/housenav.php

@@ -1,6 +1,6 @@
 <?php
 
-$module = Yii::$app->hostserver->module['module'];
+$module = Yii::$app->controller->action->id;;
 
 if (!empty(Yii::$app->request->get('hid'))) {
     $name = \common\models\House::findOne(Yii::$app->request->get('hid'))['name'];

mobile/views/public/nav.php

@@ -1,11 +1,13 @@
 <?php
 
 $view = \Yii::$app->getView();
-
+$module = Yii::$app->controller->action->id;
 ?>
 <div>
     <div class="y_header">
-        <div class="header_back"><a href="<?= \common\fm\Request::Referer(Yii::$app->hostserver->module['module']); ?>"><img src="/overseas/img/head-back.png"></a></div>
+        <div class="header_back">
+            <a href="<?= \common\fm\Request::Referer($module); ?>">
+                <img src="/overseas/img/head-back.png"></a></div>
         <div class="header_logo2"><a href="/"><img src="/overseas/img/jpzimg_1.png"></a></div>
         <div class="header_menu"><a></a></div>
     </div>