From 0c7037cae8b123c49679f98ffa34de267ede7753 Mon Sep 17 00:00:00 2001
From: gongfuxiang <2499232802@qq.com>
Date: Sun, 17 Feb 2019 16:07:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/plugins/commonrightnavigation/Hook.php    |  2 +-
 .../view/commonrightnavigation/admin/index.html       | 10 ++++++++++
 .../view/commonrightnavigation/admin/saveinfo.html    | 11 +++++++++++
 .../plugins/css/commonrightnavigation/style.css       |  6 +++++-
 4 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/application/plugins/commonrightnavigation/Hook.php b/application/plugins/commonrightnavigation/Hook.php
index 64e80a6e2..a012bb6de 100755
--- a/application/plugins/commonrightnavigation/Hook.php
+++ b/application/plugins/commonrightnavigation/Hook.php
@@ -147,7 +147,7 @@ class Hook
                 </a>
 
                 <!-- 购物车 -->
-                <a href="'.(empty($params['user']) ? 'javascript:;' : MyUrl('index/cart/index')).'" '.$is_new_window_open.' class="cart-content '.$login_event.'">
+                <a href="'.(empty($params['user']) ? 'javascript:;' : MyUrl('index/cart/index')).'" '.$is_new_window_open.' class="cart-content '.$login_event.' '.(($ret['data']['is_goods_page_show_cart'] == 1 && $module_name.$controller_name.$action_name == 'indexgoodsindex' ? 'cart-show' : '')).'">
                     <div class="base-nav cart">
                         <i class="am-icon-opencart"></i>
                         <div class="cart-text">
diff --git a/application/plugins/view/commonrightnavigation/admin/index.html b/application/plugins/view/commonrightnavigation/admin/index.html
index 80cd06077..97194591e 100755
--- a/application/plugins/view/commonrightnavigation/admin/index.html
+++ b/application/plugins/view/commonrightnavigation/admin/index.html
@@ -57,6 +57,16 @@
                     {{/if}}
                 </div>
             </div>
+            <div class="items">
+                <label>商品详情页面展示购物车入口</label>
+                <div>
+                    {{if isset($data['is_goods_page_show_cart']) and $data['is_goods_page_show_cart'] eq 1}}
+                        是
+                    {{else /}}
+                        否
+                    {{/if}}
+                </div>
+            </div>
             <a href="{{:PluginsAdminUrl('commonrightnavigation', 'admin', 'saveinfo')}}" class="am-btn am-btn-secondary am-radius btn-loading-example am-btn-sm am-btn-block edit-submit">编辑</a>
         </div>
     </div>
diff --git a/application/plugins/view/commonrightnavigation/admin/saveinfo.html b/application/plugins/view/commonrightnavigation/admin/saveinfo.html
index 0436f80b0..16f06212c 100755
--- a/application/plugins/view/commonrightnavigation/admin/saveinfo.html
+++ b/application/plugins/view/commonrightnavigation/admin/saveinfo.html
@@ -88,6 +88,17 @@
                 </div>
             </div>
 
+            <div class="am-form-group">
+                <label>商品详情页面展示购物车入口</label>
+                <div>
+                    {{foreach $is_whether_list as $v}}
+                        <label class="am-radio-inline m-r-10">
+                            <input type="radio" name="is_goods_page_show_cart" value="{{$v.id}}" {{if isset($data['is_goods_page_show_cart']) and $data['is_goods_page_show_cart'] eq $v['id']}}checked="checked"{{else /}}{{if !isset($data['is_goods_page_show_cart']) and isset($v['checked']) and $v['checked'] eq true}}checked="checked"{{/if}}{{/if}} data-am-ucheck /> {{$v.name}}
+                        </label>
+                    {{/foreach}}
+                </div>
+            </div>
+
             <div class="am-form-group">
                 <button type="submit" class="am-btn am-btn-primary am-radius btn-loading-example am-btn-sm w100" data-am-loading="{loadingText:'处理中...'}">保存</button>
             </div>
diff --git a/public/static/plugins/css/commonrightnavigation/style.css b/public/static/plugins/css/commonrightnavigation/style.css
index a46ac508f..85d28a1e1 100644
--- a/public/static/plugins/css/commonrightnavigation/style.css
+++ b/public/static/plugins/css/commonrightnavigation/style.css
@@ -160,6 +160,7 @@
     .commonrightnavigation-right-nav .browse-content,
     .commonrightnavigation-right-nav .favor-content,
     .commonrightnavigation-right-nav .qrcode-content,
+    .commonrightnavigation-right-nav .cart-content,
     .commonrightnavigation-right-nav .go-top .mui-mbar-tab-tip {
         display: none;
     }
@@ -180,7 +181,10 @@
         z-index: 10000;
         display: none;
     }
-    .commonrightnavigation-right-nav .cart {
+    .cart-show {
+        display: block !important;
+    }
+    .commonrightnavigation-right-nav .cart-show .cart {
         position: fixed;
         right: 0;
         bottom: calc(50% - 50px);
-- 
GitLab