Merge branch 'develop' of zhengxifeng/tyqngp into master

apps/admin/controller/system/CityController.php

@@ -79,6 +79,8 @@ class CityController extends Controller
                 $mutietitle = str_replace('，', ',', $mutietitle);
                 $pid = post('pid', 'int');
                 $logo = post('logo');
+                $weixin = post('weixin');
+
                 if (! $mutititle) {
                     alert_back('城市名称不能为空！');
                 }
@@ -110,7 +112,8 @@ class CityController extends Controller
                         'email' => '',
                         'qq' => '',
                         'address' => '',
-                        'logo' => $logo
+                        'logo' => $logo,
+                        'weixin' => $weixin
                     );
                 }
             }else{
@@ -125,6 +128,7 @@ class CityController extends Controller
                 $seo_keywords = post('seo_keywords');
                 $seo_description = post('seo_description');
                 $logo = post('logo');
+                $weixin = post('weixin');
 
                 $contact = post('contact');
                 $mobile = post('mobile');
@@ -163,7 +167,8 @@ class CityController extends Controller
                     'email' => $email,
                     'qq' => $qq,
                     'address' => $address,
-                    'logo' => $logo
+                    'logo' => $logo,
+                    'weixin' => $weixin
                 );
             }
             // 执行添加
@@ -234,6 +239,7 @@ class CityController extends Controller
             $qq = post('qq');
             $address = post('address');
             $logo = post('logo');
+            $weixin = post('weixin');
 
             if($id==$pid){
                 alert_back('区域混乱啦！');
@@ -262,7 +268,8 @@ class CityController extends Controller
                 'email' => $email,
                 'qq' => $qq,
                 'address' => $address,
-                'logo' => $logo
+                'logo' => $logo,
+                'weixin' => $weixin
             );
             // 执行添加
             if ($this->model->modCity($id, $data)) {

apps/admin/view/default/system/city.html

@@ -196,6 +196,21 @@
                             <input type="text" name="address" placeholder="请输入分站地址" class="layui-input" />
                         </div>
                     </div>
+
+
+
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">微信图标</label>
+                                <div class="layui-input-inline">
+                                    <input type="text" name="weixin" id="weixin" value="{$city->weixin}" placeholder="请上传微信图标"  class="layui-input">
+                                </div>
+                                <button type="button" class="layui-btn upload" data-des="weixin">
+                                    <i class="layui-icon">&#xe67c;</i>上传图片
+                                </button>
+                                <div id="weixin_box" class="pic"><dl><dt>{if(@[$city->weixin])}<img src="{SITE_DIR}{$city->weixin}" data-url="{$city->weixin}"></dt><dd>删除</dd></dl>{/if}</div>
+                            </div>
+
+
 					    </div>
 					  </div>
 					</div>
@@ -337,6 +352,19 @@
                                         <input type="text" name="address" placeholder="请输入分站地址" value="{$city->address}" class="layui-input" />
                                     </div>
                                 </div>
+
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">微信图标</label>
+                                <div class="layui-input-inline">
+                                    <input type="text" name="weixin" id="weixin" value="{$city->weixin}" placeholder="请上传微信图标"  class="layui-input">
+                                </div>
+                                <button type="button" class="layui-btn upload" data-des="weixin">
+                                    <i class="layui-icon">&#xe67c;</i>上传图片
+                                </button>
+                                <div id="weixin_box" class="pic"><dl><dt>{if(@[$city->weixin])}<img src="{SITE_DIR}{$city->weixin}" data-url="{$city->weixin}"></dt><dd>删除</dd></dl>{/if}</div>
+                            </div>
+
+
 					    </div>
 					  </div>
 					</div>

apps/common/HomeController.php

@@ -101,28 +101,48 @@ class HomeController extends Controller
             if( $domain == $main_domain ){
                 //cookie('city','');
                 cookie('city',$this->config('firstcity'));
-                //var_dump($domain_first);die;
             }else{
                 cookie('city',$domain_first);
 
-                //var_dump($domain_first);
-                //设置新的cookie 城市id
-                //$cityid = 1;
-                $cityid = $this->model->getCityId($domain_first);
-                if(empty($cityid)){
-                    $cityid = 0;
+                $apo = explode('.', $domain);
+                if(!empty($apo[2])){
+                    //非主域名 二级域名 验证是否是城市
+                    $isHf = $this->model->getCityDomain($domain_first);
+                    if((int)$isHf > 0){
+                    }else{
+                        //var_dump($domain);die;
+                        //301到首页
+                        $target_url = "https://www.".$apo[1].'.'.$apo[2];
+                        //var_dump($target_url);die;
+                        header("HTTP/1.1 301 Moved Permanently");
+                        header("Location: $target_url");
+                        exit;
+                    }
                 }
-                //var_dump($cityid);
-                cookie('city_id',$cityid);
-                //模板赋值变量 用于sql 同样查询数组可循环
-                $this->assign('cityId',$cityid);
-                //测试数据
-                /*$testArray = [
-                    1,2,3,4
-                ];
-                $this->assign('testArray',$testArray);*/
             }
 
+            //var_dump($domain_first);die;
+            //var_dump($domain_first);
+            //设置新的cookie 城市id
+            //$cityid = 1;
+            $cityid = $this->model->getCityId($domain_first);
+            if(empty($cityid)){
+                $cityid = 0;
+                $temp_cityId = 381;
+            }else{
+                $temp_cityId = $cityid;
+            }
+            //var_dump($cityid);
+            cookie('city_id',$cityid);
+            //模板赋值变量 用于sql 同样查询数组可循环
+            $this->assign('cityId',$cityid);
+            $this->assign('temp_cityId',$temp_cityId);
+            //测试数据
+            /*$testArray = [
+                1,2,3,4
+            ];
+            $this->assign('testArray',$testArray);*/
+
             //var_dump($domain_first);die;
             //输出logo
             $citylogo = $this->model->getCityLogo($domain_first);

apps/home/controller/ParserController.php

@@ -2999,7 +2999,8 @@ class ParserController extends Controller
 
                         if($kp > 0){
                             if($a%$kp == 0 && $a > 0){
-                                $one_html = $one_html."<br/>";
+                                //计数换行
+                                //$one_html = $one_html."<br/>";
                             }
                         }
                     }
@@ -3479,6 +3480,9 @@ class ParserController extends Controller
     {
         $pattern = '/\{pboot:if\(([^}^\$]+)\)\}([\s\S]*?)\{\/pboot:if\}/';
         $pattern2 = '/pboot:([0-9])+if/';
+
+        $content = str_replace('{xx}', '[xx]', $content);
+
         if (preg_match_all($pattern, $content, $matches)) {
             $count = count($matches[0]);
             for ($i = 0; $i < $count; $i ++) {
@@ -3489,7 +3493,9 @@ class ParserController extends Controller
                 $white_fun = array(
                     'date'
                 );
-                
+
+                $matches[0][$i] = str_replace('[xx]', '{xx}', $matches[0][$i]);
+
                 // 还原可能包含的保留内容，避免判断失效
                 $matches[1][$i] = $this->restorePreLabel($matches[1][$i]);
                 
@@ -3545,11 +3551,19 @@ class ParserController extends Controller
                     $out_html = str_replace('{' . $matches3[1] . 'else}', '{else}', $out_html);
                     $out_html = $this->parserIfLabel($out_html);
                 }
-                
+
+                $content = str_replace('[xx]', '{xx}', $content);
                 // 执行替换
                 $content = str_replace($matches[0][$i], $out_html, $content);
             }
+
+            if((int)$count === 0){
+                $content = str_replace('[xx]', '{xx}', $content);
+            }
+        }else{
+            $content = str_replace('[xx]', '{xx}', $content);
         }
+
 //        var_dump(111);die;
         return $content;
     }

apps/home/model/ParserModel.php

@@ -1055,5 +1055,9 @@ class ParserModel extends Model
         return parent::table('ay_site')->where(['id'=>1])->value('logo');
     }
 
+    public function getCityDomain($name){
+        return parent::table('ay_city')->where(['etitle'=>$name])->value('id');
+    }
+
 
 }

git.txt

@@ -26,6 +26,7 @@ git add .
 git commit -m "clear cached"
 git push origin local-develop:develop
 
+===============================
 git fetch --all
 git reset --hard origin/master
-git pull origin/master
+git pull origin master

skin/css/style.css

@@ -462,4 +462,32 @@ body.bg-white{ background:#fff;}
   border: 1px solid #333;
 }
 .pagination .st{ font-family:宋体}
-.text-secondary{ text-align:center; padding:20px 0}
+.text-secondary{ text-align:center; padding:20px 0}
+
+
+.head-1 .top {
+    height: 34px;
+    line-height: 34px;
+    background-color: #f1f1f1;
+    font-size: 12px;
+    color: #777;
+}
+.head-1 .w1200 {
+    width: 1202px;
+    margin: 0 auto;
+    position: relative;
+}
+.head-1 .top .welcome {
+    float: left;
+    text-align: left;
+}
+.head-1 .top .info {
+    position: absolute;
+    right: 0;
+}
+.head-1 .welcome a{
+    color: red;
+}
+.head-1 .info a{
+    color: red;
+}

template/dafeult/case.html

@@ -56,7 +56,11 @@
           </li>
         </ul>
       </div>
-      <div class="tuandui-zixun"> <a href="http://wpa.qq.com/msgrd?v=3&uin={pboot:companyqq}&site=qq&menu=yes" rel="nofollow" target="_black">我想向TA咨询</a> </div>
+      <div class="tuandui-zixun">
+
+        <a href="/yuyue"  target="_black">向TA咨询（免费评估）</a>
+
+      </div>
       <div class="sxp">
         <p class="prev">上一篇：{content:precontent}</p>
         <p class="next">下一篇：{content:nextcontent}</p>

template/dafeult/city.html

@@ -69,7 +69,7 @@
 <div class="footer" style="font-size: 16px;">
 	<div class="footer-dh">友情链接：
 
-		{pboot:sql sql="select * from ay_link where city='{$cityId}'"}
+		{pboot:sql sql="select * from ay_link where gid=2"}
 		<a href="[sql:link]" class="first-level" target="_blank" style="padding-right: 10px;"> [sql:name] </a>
 		{/pboot:sql}
 

template/dafeult/foot.html

@@ -14,20 +14,69 @@
         </ul>
       </div>
       <div class="footer-message">
+
+
+        {pboot:sql sql="select * from ay_city where id='{$temp_cityId}'"}
+        {pboot:if('[sql:phone]'=='')}
         <p>咨询热线：{pboot:companyphone}</p>
+        {else}
+        <p>咨询热线：[sql:phone]</p>
+        {/pboot:if}
+
+        {pboot:if('[sql:email]'=='')}
         <p>联系邮箱：{pboot:companyemail}</p>
+        {else}
+        <p>联系邮箱：[sql:email]</p>
+        {/pboot:if}
+
+        {pboot:if('[sql:address]'=='')}
         <p>公司地址：{pboot:companyaddress}</p>
+        {else}
+        <p>公司地址：[sql:address]</p>
+        {/pboot:if}
+
+        {/pboot:sql}
+
+
       </div>
     </div>
     <div class="right">
-      <div class="ewm"> <img src="{pboot:companyweixin}">
+      <div class="ewm">
+
+
+
+        {pboot:sql sql="select * from ay_city where id='{$temp_cityId}'"}
+        {pboot:if('[sql:weixin]'=='')}
+        <img src="{pboot:companyweixin}">
+        {else}
+        <img src="[sql:weixin]">
+        {/pboot:if}
+        {/pboot:sql}
+
         <p>客服微信</p>
       </div>
     </div>
   </div>
 </div>
 <div class="footer-copy">
-  <p>{pboot:sitecopyright} <a href="https://beian.miit.gov.cn/" rel="nofollow" target="_blank">{pboot:siteicp}</a> <a href="{pboot:sitedomain}/index.php/sitemap.xml" target="_blank">网站地图</a> {pboot:sitestatistical}</p>
+  <p>
+
+    {pboot:sql sql="select * from ay_city where id='{$temp_cityId}'"}
+    {pboot:if('{$temp_cityId}'==381)}
+
+    <a href="{pboot:sitedomain}">心理咨询</a>  Copyright  ©  2019-2024
+    <a href="{pboot:sitedomain}">心理医生</a>,<a href="{pboot:sitedomain}">心理咨询中心</a>【<a href="{pboot:sitedomain}">乐达心理</a>】全国高端连锁"心理咨询机构"
+
+    {else}
+
+    <a href="{pboot:httpurl}">[sql:title]心理咨询</a>  Copyright  ©  2019-2024
+    <a href="{pboot:httpurl}">[sql:title]心理医生</a>,<a href="{pboot:httpurl}">[sql:title]心理咨询中心</a>【<a href="{pboot:sitedomain}">乐达心理</a>】全国高端连锁"心理咨询机构"
+
+
+    {/pboot:if}
+    {/pboot:sql}
+
+    {pboot:sitecopyright} <a href="https://beian.miit.gov.cn/" rel="nofollow" target="_blank">{pboot:siteicp}</a> <a href="{pboot:sitedomain}/index.php/sitemap.xml" target="_blank">网站地图</a> {pboot:sitestatistical}</p>
   <p style="display:none;"></p>
 </div>
 <!--/页脚--> 
@@ -38,20 +87,61 @@
 <!--    <li> <a href="" target="_black" rel="nofollow"> <i class="icon-kefu-1"></i>
       <p>在线客服</p>
       </a> </li>-->
-    <li> <a href="tel:{pboot:companyphone}"> <i class="icon-kefu-2"></i>
-      <p>电话咨询</p>
+
+
+
+    {pboot:sql sql="select * from ay_city where id='{$temp_cityId}'"}
+
+
+    <li>
+
+
+      {pboot:if('[sql:phone]'=='')}
+      <a href="tel:{pboot:companyphone}">
+        <i class="icon-kefu-2"></i>
+        <p>电话咨询</p>
       </a>
       <div class="kefu-call">
         <p>7×24小时客服</p>
         <strong>{pboot:companyphone}</strong> </div>
+      {else}
+      <a href="tel:[sql:phone]">
+        <i class="icon-kefu-2"></i>
+        <p>电话咨询</p>
+      </a>
+      <div class="kefu-call">
+        <p>7×24小时客服</p>
+        <strong>[sql:phone]</strong> </div>
+      {/pboot:if}
+
+
+
     </li>
+
+
+
+
+
     <li> <i class="icon-kefu-3"></i>
       <p>微信客服</p>
-      <div class="kefu-img"> <img src="{pboot:companyweixin}">
+      <div class="kefu-img">
+
+        {pboot:if('[sql:weixin]'=='')}
+        <img src="{pboot:companyweixin}">
+        {else}
+        <img src="[sql:weixin]">
+        {/pboot:if}
+
         <p class="red">扫描二维码</p>
         <p>添加微信客服</p>
       </div>
     </li>
+
+
+    {/pboot:sql}
+
+
+
     <li> <a href="#top" rel="nofollow"> <i class="icon-kefu-4"></i>
       <p>返回顶部</p>
       </a> </li>

template/dafeult/foot_city.html

@@ -27,7 +27,11 @@
   </div>
 </div>
 <div class="footer-copy">
-  <p>{pboot:sitecopyright} <a href="https://beian.miit.gov.cn/" rel="nofollow" target="_blank">{pboot:siteicp}</a> <a href="{pboot:sitedomain}/index.php/sitemap.xml" target="_blank">网站地图</a> {pboot:sitestatistical}</p>
+  <p>
+    <a href="{label:city_url}">心理咨询</a>  Copyright  ©  2019-2024
+    <a href="{label:city_url}">心理医生</a>,<a href="{label:city_url}">心理咨询中心</a>【<a href="{pboot:sitedomain}">乐达心理</a>】全国高端连锁"心理咨询机构"
+
+    {pboot:sitecopyright} <a href="https://beian.miit.gov.cn/" rel="nofollow" target="_blank">{pboot:siteicp}</a> <a href="{pboot:sitedomain}/index.php/sitemap.xml" target="_blank">网站地图</a> {pboot:sitestatistical}</p>
   <p style="display:none;"></p>
 </div>
 <!--/页脚--> 

template/dafeult/head.html

@@ -1,3 +1,5 @@
+{include file=top.html}
+
 <!--导航栏-->
 <div class="header">
   <div class="header-box">
@@ -33,7 +35,15 @@
 	
     <div class="call">
       <p class="small">心理咨询电话：</p>
+
+      {pboot:sql sql="select * from ay_city where id='{$temp_cityId}'"}
+      {pboot:if('[sql:phone]'=='')}
       <p class="big">{pboot:companyphone}</p>
+      {else}
+      <p class="big">[sql:phone]</p>
+      {/pboot:if}
+      {/pboot:sql}
+
     </div>
   </div>
 </div>

template/dafeult/head_city.html

@@ -1,3 +1,4 @@
+{include file=top_city.html}
 <!--导航栏-->
 <div class="header">
   <div class="header-box">

template/dafeult/hot.html

@@ -2,8 +2,8 @@
     <div class="footer-dh" style="line-height: 16px;"><font style="font-weight: bold;">热门城市</font>：<br/><br/><br/>
 
         <!--环境变量-->
-        {pboot:sql sql="select * from ay_city where pid!=0 OR id IN(1,2,9,22) ORDER BY RAND() LIMIT 50" kp="15"}
-        <a href="https://[sql:etitle].{label:top_domain}" class="first-level" target="_blank" style="margin-right:20px;display:block;float:left;padding-right: 10px;">[sql:title] </a>
+        {pboot:sql sql="select * from ay_city where pid!=0 and status=1 OR id IN(1,2,9,22) ORDER BY RAND() LIMIT 50" kp="15"}
+        <a href="https://[sql:etitle].{label:top_domain}" class="first-level" target="_blank" style="margin-right:20px;display:block;float:left;padding-right: 10px;margin-bottom: 10px;" title="[sql:title]{label:hot_after}">[sql:title]{label:hot_after}</a>
         {/pboot:sql}
 
     </div>

template/dafeult/index.html

@@ -21,6 +21,7 @@
 <script type="text/javascript" src="{pboot:sitedomain}/skin/js/superslide.3.0.js"></script>
 </head>
 <body>
+
 {include file=head.html}
 
 <!--焦点图-->
@@ -182,7 +183,10 @@
             <div class="desc">
               <p>预约方式：电话或微信
                 文字或语音进行初步评估</p>
-              <a href="http://wpa.qq.com/msgrd?v=3&uin={pboot:companyqq}&site=qq&menu=yes" target="_black" rel="nofollow" class="yuyue-btn">在线预约</a> </div>
+
+              <a href="/yuyue" target="_black" class="yuyue-btn">在线预约</a>
+
+            </div>
           </div>
         </li>
         <li>
@@ -245,8 +249,24 @@
         <h4></h4>
         <p>[content:content drophtml=1 dropblank=1 len=200 more='...']</p>
         <br>
+
+        {pboot:sql sql="select * from ay_city where id='{$temp_cityId}'"}
+
+
+        {pboot:if('[sql:address]'=='')}
         <p>联系地址：{pboot:companyaddress}</p>
+        {else}
+        <p>联系地址：[sql:address]</p>
+        {/pboot:if}
+
+        {pboot:if('[sql:phone]'=='')}
         <p>联系电话：{pboot:companyphone}</p>
+        {else}
+        <p>联系电话：[sql:phone]</p>
+        {/pboot:if}
+
+        {/pboot:sql}
+
         <div class="small-more-btn"> <a href="[content:link]">查看更多<i><span class="icon iconfont icon-xiangyou1"></span></i></a> </div>
       </div>
     </div>

template/dafeult/left.html

@@ -13,15 +13,48 @@
         <h4>联系我们</h4>
         <div class="danye-message-list">
           <ul>
+
+            {pboot:sql sql="select * from ay_city where id='{$temp_cityId}'"}
+
+
+            {pboot:if('[sql:phone]'=='')}
             <li> <span>联系电话：</span>
               <p class="text">{pboot:companyphone}</p>
             </li>
+            {else}
+            <li> <span>联系电话：</span>
+              <p class="text">[sql:phone]</p>
+            </li>
+            {/pboot:if}
+
+
+            {pboot:if('[sql:address]'=='')}
             <li> <span>公司地址：</span>
               <p class="text">{pboot:companyaddress}</p>
             </li>
+            {else}
+            <li> <span>公司地址：</span>
+              <p class="text">[sql:address]</p>
+            </li>
+            {/pboot:if}
+
+
+            {pboot:if('[sql:weixin]'=='')}
             <li class="center"> <img src="{pboot:companyweixin}">
               <p>微信预约咨询</p>
             </li>
+            {else}
+            <li class="center"> <img src="[sql:weixin]">
+              <p>微信预约咨询</p>
+            </li>
+
+
+            {/pboot:if}
+
+
+
+            {/pboot:sql}
+
           </ul>
         </div>
       </div>

template/dafeult/message.html

@@ -103,7 +103,7 @@
             <div class="desc">
               <p>预约方式：电话或微信
                 文字或语音进行初步评估</p>
-              <a href="http://wpa.qq.com/msgrd?v=3&uin={pboot:companyqq}&site=qq&menu=yes" target="_black" rel="nofollow" class="yuyue-btn">在线预约</a> </div>
+              <a href="/yuyue" target="_black" class="yuyue-btn">在线预约</a></div>
           </div>
         </li>
         <li>

template/dafeult/team.html

@@ -49,7 +49,7 @@
         </ul>
       </div>
       <div class="tuandui-zixun">
-        <a href="/yuyue" rel="nofollow" target="_black">向TA咨询（免费评估）</a>
+        <a href="/yuyue"  target="_black">向TA咨询（免费评估）</a>
       </div>
       <div class="sxp">
         <p class="prev">上一篇：{content:precontent}</p>

template/dafeult/top.html

@@ -0,0 +1,27 @@
+<div class="head-1">
+<div class="top">
+    <div class="w1200">
+        {pboot:sql sql="select * from ay_city where id='{$temp_cityId}'"}
+        <div class="welcome">
+
+            {pboot:if('{$temp_cityId}'==381)}
+            <a href="{pboot:sitedomain}">心理咨询</a>,<a href="{pboot:sitedomain}">心理医生</a>,<a href="{pboot:sitedomain}">心理咨询中心</a>【<a href="{pboot:sitedomain}">乐达心理</a>】
+            {else}
+
+            <a href="{pboot:httpurl}">[sql:title]心理咨询</a>,<a href="{pboot:httpurl}">[sql:title]心理医生</a>,<a href="{pboot:httpurl}">[sql:title]心理咨询中心</a>【<a href="{pboot:sitedomain}" style="color:blue;">乐达心理</a>】
+
+
+            {/pboot:if}
+
+        </div>
+        <div class="info">
+            {pboot:if('{$temp_cityId}'==381)}
+            找“<a href="{pboot:sitedomain}">心理咨询机构</a>”首选“<a href="{pboot:sitedomain}">乐达心理咨询</a>”效果好！专业！
+            {else}
+            找“<a href="{pboot:httpurl}">[sql:title]心理咨询机构</a>”首选“<a href="{pboot:sitedomain}" style="color:blue;">乐达心理咨询</a>”效果好！专业！
+            {/pboot:if}
+        </div>
+        {/pboot:sql}
+    </div>
+</div>
+</div>

template/dafeult/top_city.html

@@ -0,0 +1,13 @@
+<div class="head-1">
+<div class="top">
+    <div class="w1200">
+        <div class="welcome">
+            <a href="{label:city_url}">心理咨询预约</a>,首选【<a href="{pboot:sitedomain}" style="color:blue;">乐达心理</a>】
+        </div>
+        <div class="info">
+            <a href="{label:city_url}">心理咨询预约</a>【<a href="{pboot:sitedomain}" style="color:blue;">乐达心理</a>ledaxinli.com】全国高端连锁心理咨询机构
+        </div>
+
+    </div>
+</div>
+</div>

template/dafeult/wap/case.html

@@ -54,7 +54,11 @@
       </li>
     </ul>
   </div>
-  <div class="tuandui-zixun"> <a href="http://wpa.qq.com/msgrd?v=3&uin={pboot:companyqq}&site=qq&menu=yes" target="_black">我想向TA咨询</a> </div>
+  <div class="tuandui-zixun">
+
+    <a href="/yuyue" target="_black">向TA咨询（免费评估）</a>
+
+  </div>
   <div class="sxp">
     <p class="prev">上一篇：{content:precontent}</p>
     <p class="next">下一篇：{content:nextcontent}</p>

template/dafeult/wap/head.html

@@ -11,7 +11,19 @@
     </a>
 
   </div>
-  <div class="right-btn"> <a href="tel:{pboot:companyphone}"><span class="icon iconfont icon-dianhua1"></span></a> </div>
+  <div class="right-btn">
+
+    {pboot:sql sql="select * from ay_city where id='{$temp_cityId}'"}
+    {pboot:if('[sql:phone]'=='')}
+    <a href="tel:{pboot:companyphone}"><span class="icon iconfont icon-dianhua1"></span></a>
+    {else}
+    <a href="tel:[sql:phone]"><span class="icon iconfont icon-dianhua1"></span></a>
+    {/pboot:if}
+    {/pboot:sql}
+
+
+
+  </div>
 </div>
 <div class="fixed-nav-bg"> </div>
 <div class="fixed-nav">

template/dafeult/wap/hot.html

@@ -2,8 +2,8 @@
 
 <font style="margin-bottom:10px;display:block;font-weight: bold; ">热门城市：</font>
         <!--环境变量-->
-        {pboot:sql sql="select * from ay_city where pid!=0 OR id IN(1,2,9,22) ORDER BY RAND() LIMIT 50" kp="0"}
-        <a href="https://[sql:etitle].{label:top_domain}" class="first-level" target="_blank" style="margin-right:20px;display:block;float:left;padding-right: 10px;">[sql:title] </a>
+        {pboot:sql sql="select * from ay_city where pid!=0 and status=1 OR id IN(1,2,9,22) ORDER BY RAND() LIMIT 50" kp="0"}
+        <a href="https://[sql:etitle].{label:top_domain}" class="first-level" target="_blank" style="margin-right:20px;display:block;float:left;padding-right: 10px;margin-bottom: 10px;" title="[sql:title]{label:hot_after}">[sql:title]{label:hot_after}</a>
         {/pboot:sql}
 
 

template/dafeult/wap/index.html

@@ -207,8 +207,26 @@
     <div class="desc">
       <p>[content:content drophtml=1 dropblank=1 len=140 more='...']</p>
       <br>
+
+
+      {pboot:sql sql="select * from ay_city where id='{$temp_cityId}'"}
+
+
+      {pboot:if('[sql:address]'=='')}
       <p>联系地址：{pboot:companyaddress}</p>
+      {else}
+      <p>联系地址：[sql:address]</p>
+      {/pboot:if}
+
+      {pboot:if('[sql:phone]'=='')}
       <p>联系电话：{pboot:companyphone}</p>
+      {else}
+      <p>联系电话：[sql:phone]</p>
+      {/pboot:if}
+
+      {/pboot:sql}
+
+
     </div>
   </div>
   {/pboot:content}

template/dafeult/wap/team.html

@@ -42,7 +42,7 @@
     </ul>
   </div>
   <div class="tuandui-zixun">
-    <a href="/yuyue" rel="nofollow" target="_black">向TA咨询（免费评估）</a>
+    <a href="/yuyue" target="_black">向TA咨询（免费评估）</a>
   </div>
   <div class="sxp">
     <p class="prev">上一篇：{content:precontent}</p>