From 6562ecca51771a0b5ad7e4393d394f43d2ad35b9 Mon Sep 17 00:00:00 2001
From: gongfuxiang <2499232802@qq.com>
Date: Wed, 20 Feb 2019 21:35:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=94=E7=94=A8=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/plugins/commononlineservice/Hook.php  | 15 ---------------
 .../view/commononlineservice/index/content.html   |  7 ++++---
 .../plugins/css/commononlineservice/style.css     |  3 ---
 .../plugins/css/commonrightnavigation/style.css   |  8 ++++----
 4 files changed, 8 insertions(+), 25 deletions(-)

diff --git a/application/plugins/commononlineservice/Hook.php b/application/plugins/commononlineservice/Hook.php
index 095f34f20..79057e630 100755
--- a/application/plugins/commononlineservice/Hook.php
+++ b/application/plugins/commononlineservice/Hook.php
@@ -99,9 +99,6 @@ class Hook extends Controller
                 }
             }
 
-            // li数量
-            $online_service_li_count = 0;
-
             // 客服
             $online_service = empty($ret['data']['online_service']) ? [] : explode("\n", $ret['data']['online_service']);
             $online_service_data = [];
@@ -113,23 +110,11 @@ class Hook extends Controller
                     if(count($items) == 2)
                     {
                         $online_service_data[] = $items;
-                        $online_service_li_count++;
                     }
-                    
                 }
             }
             $ret['data']['online_service'] = $online_service_data;
 
-            // 电话
-            if(!empty($ret['data']['tel']))
-            {
-                $online_service_li_count++;
-            }
-
-            // li数量
-            $ret['data']['online_service_li_count'] = $online_service_li_count;
-
-
             $this->assign('data', $ret['data']);
             return $this->fetch('../../../plugins/view/commononlineservice/index/content');
         } else {
diff --git a/application/plugins/view/commononlineservice/index/content.html b/application/plugins/view/commononlineservice/index/content.html
index b48af32ac..4a94762bb 100755
--- a/application/plugins/view/commononlineservice/index/content.html
+++ b/application/plugins/view/commononlineservice/index/content.html
@@ -1,9 +1,9 @@
-<div class="commononlineservice" {{if !empty($data['distance_top'])}} style="top:{{$data.distance_top}}%"{{/if}}>
+<div class="commononlineservice" {{if isset($data['distance_top'])}} style="top:{{$data.distance_top}}%"{{/if}}>
     <div class="float-left" style="{{if !empty($data['bg_color'])}}background: {{$data.bg_color}};{{/if}}">
         <a class="btn-open" title="查看在线客服" href="javascript:void(0);">展开</a>
         <a class="btn-ctn" title="关闭在线客服" href="javascript:void(0);">收缩</a>
     </div>
-    <div class="content" style="{{if isset($data['online_service_li_count']) and $data['online_service_li_count'] ELT 2}}border-radius: 0;{{/if}} {{if !empty($data['bg_color'])}}background: {{$data.bg_color}};{{/if}}">
+    <div class="content" style="{{if !empty($data['bg_color'])}}background: {{$data.bg_color}};{{/if}}">
         <div class="cn">
             {{if !empty($data['title'])}}
                 <h3 class="title">{{$data.title}}</h3>
@@ -24,7 +24,8 @@
                     {{/foreach}}
                     {{if !empty($data['title'])}}
                         <li>
-                            <span>电话：{{$data.tel}}</span>
+                            <span>电话：</span>
+                            <a href="tel:{{$data.tel}}">{{$data.tel}}</a>
                         </li>
                     {{/if}}
                 </ul>
diff --git a/public/static/plugins/css/commononlineservice/style.css b/public/static/plugins/css/commononlineservice/style.css
index 0e362400e..25ff8b7eb 100755
--- a/public/static/plugins/css/commononlineservice/style.css
+++ b/public/static/plugins/css/commononlineservice/style.css
@@ -15,7 +15,6 @@
     z-index:1;
     margin-top: 0;
     height: 120px;
-    border-radius: 3px 0px 0 3px;
 }
 .commononlineservice .float-left a {
     font-size:0;
@@ -27,11 +26,9 @@
     overflow:hidden;
     width: 140px;
     margin-right:-150px;
-    border-radius: 0 0px 0 3px;
 }
 .commononlineservice .content .cn {
     background:#F7F7F7;
-    border-radius:3px;
 }
 .commononlineservice .cn .title {
     font-size: 14px;
diff --git a/public/static/plugins/css/commonrightnavigation/style.css b/public/static/plugins/css/commonrightnavigation/style.css
index 644b1e3ca..eb90b7d5f 100755
--- a/public/static/plugins/css/commonrightnavigation/style.css
+++ b/public/static/plugins/css/commonrightnavigation/style.css
@@ -102,7 +102,7 @@
         height: 35px;
     }
     .commonrightnavigation-right-nav .cart {
-        bottom: 45vh;
+        bottom: 40vh;
         left: 0;
         height: 125px;
         border-top: 1px solid #444;
@@ -114,17 +114,17 @@
         border-bottom: 1px solid #d2364c;
     }
     .commonrightnavigation-right-nav .favor {
-        bottom: calc(45vh + 150px);
+        bottom: calc(40vh + 135px);
         left: 0;
         height: 35px;
     }
     .commonrightnavigation-right-nav .browse {
-        bottom: calc(45vh + 185px);
+        bottom: calc(40vh + 170px);
         left: 0;
         height: 35px;
     }
     .commonrightnavigation-right-nav .user-center {
-        bottom: calc(45vh + 220px);
+        bottom: calc(40vh + 205px);
         left: 0;
         height: 35px;
         padding: 5px;