全局搜索中取消“产品展示”和“补件中心”

在“产品展示”和“补件中心”页面不显示搜索下拉列表框
搜索下拉列表框删除“产品展示”和“补件中心”

src/Befri.Goldhoo/Befri.Goldhoo.Mobile.MvcUI/Content/themes/Client/version1/src/search.js

@@ -1,7 +1,7 @@
 /**
  * 查询
- * 2024/8/1
- * version: 1.0.4
+ * 2024/8/6
+ * version: 1.1.0
  */
 !(() => {
     /**
@@ -26,6 +26,11 @@
             text: '',
             url: '',
             selected: -1,
+            enable: true,
+
+            /**
+             * 下拉框列表
+             */
             list: []
         };
 
@@ -112,7 +117,7 @@
 
         // 选择下来列表框
         this.selectCombobox = function (i) {
-            if (Number.IsNullOrEmpty(i) || i < 0 || i > combobox.list.length - 1) {
+            if (!combobox.enable || Number.IsNullOrEmpty(i) || i < 0 || i > combobox.list.length - 1) {
                 return;
             }
             combobox.selected = i;
@@ -129,10 +134,12 @@
          * @returns 
          */
         this.selectComboboxByText = function (text) {
-            $(()=>{
-                for (let i = 0; i < combobox.list.length; i++) {
-                    if (combobox.list[i].text === text) {
-                        return _this.selectCombobox(i);
+            $(() => {
+                if (combobox.enable) {
+                    for (let i = 0; i < combobox.list.length; i++) {
+                        if (combobox.list[i].text === text) {
+                            return _this.selectCombobox(i);
+                        }
                     }
                 }
             });
@@ -155,9 +162,46 @@
             }
             if (isUpdate) {
                 combobox.selected = -1;
-                $('.topbar-search-combobox-view-text').text(combobox.text);
-                $('.topbar-search-combobox-panel>.topbar-search-combobox-item.selected').removeClass('selected');
+                if (combobox.enable) {
+                    $('.topbar-search-combobox-view-text').text(combobox.text);
+                    $('.topbar-search-combobox-panel>.topbar-search-combobox-item.selected').removeClass('selected');
+                }
+            }
+        }
+
+        /**
+         * 查找
+         * @param {string} text 我的
+         * @returns
+         */
+        this.findCombobox = function (text) {
+            let res = null;
+            if (Array.IsNullOrEmpty(combobox.list)) {
+                return res;
+            }
+            for (let i = 0; i < combobox.list.length; i++) {
+                if (combobox.list[i].text === text) {
+                    res = combobox.list[i];
+                    break;
+                }
             }
+            return res;
+        }
+
+        /**
+         * 启用下拉框
+         */
+        this.enableCombobox = function () {
+            combobox.display = true;
+            $('.topbar-search-combobox').css('display', 'block');
+        }
+
+        /**
+         * 禁用下拉框
+         */
+        this.disableCombobox = function () {
+            combobox.display = false;
+            $('.topbar-search-combobox').css('display', 'none');
         }
 
         /**
@@ -169,55 +213,52 @@
          * @param {string} paramenter.searchField 查询输入框字段名
          */
         this.search = function (paramenter) {
-            if (String.IsNullOrWhiteSpace(combobox.url)) {
+            if (Object.IsNullOrEmpty(paramenter)) {
+                paramenter = {
+                    data: {}
+                };
+            }
+
+            if (Object.IsNullOrEmpty(paramenter.data)) {
+                paramenter.data = {};
+            }
+
+            if (String.IsNullOrWhiteSpace(paramenter.url)) {
+                paramenter.url = combobox.url;
+            } else {
+                combobox.url = paramenter.url;
+            }
+            if (String.IsNullOrWhiteSpace(paramenter.url)) {
                 console.warn('未设置查询 url');
                 return;
             }
 
+            if (!String.IsNullOrEmpty(paramenter.comboboxText)) {
+                combobox.text = paramenter.comboboxText;
+            }
+
             /**
              * 查询字符串
              */
-            let searchText = $('.topbar-searchInput').val().trim();
+            if (String.IsNullOrWhiteSpace(paramenter.data.searchText)) {
+                paramenter.data.searchText = $('.topbar-searchInput').val().trim();
+            } else {
+                paramenter.data.searchText = paramenter.data.searchText.trim();
+            }
 
             // 搜索字符串不能为空
-            if (String.IsNullOrWhiteSpace(searchText)) {
-                Sys.Show('请输入搜索内容');
+            if (String.IsNullOrWhiteSpace(paramenter.data.searchText)) {
+                //Sys.Show('<span style="color:red">请输入搜索内容</span>');
                 return;
             }
 
             // 判断特殊字符
-            spStr = String.IsSpecialCharacters(searchText, '%');
+            spStr = String.IsSpecialCharacters(paramenter.data.searchText, '%');
             if (spStr) {
                 Sys.Show(`<span style="color:red">请重新填写查询条件，查询条件中含有特殊字符：${spStr}</span>`);
                 return;
             }
 
-            if (Object.IsNullOrEmpty(paramenter)) {
-                let data = {};
-                data[searchField] = searchText;
-                paramenter = {
-                    url: combobox.url,
-                    data: data
-                };
-            } else {
-                if (String.IsNullOrWhiteSpace(paramenter.url)) {
-                    paramenter.url = combobox.url;
-                } else {
-                    combobox.url = paramenter.url;
-                }
-
-                if (!String.IsNullOrEmpty(paramenter.comboboxText)) {
-                    combobox.text = paramenter.comboboxText;
-                }
-
-                if (Object.IsNullOrEmpty(paramenter.data)) {
-                    paramenter.data = {};
-                    paramenter.data[searchField] = searchText;
-                } else if (Strins.IsNullOrEmpty(paramenter.data[searchField])) {
-                    paramenter.data[searchField] = searchText;
-                }
-            }
-
             if (typeof this.onSearch === 'function') {
                 // 调用查询事件
                 if (this.onSearch(paramenter.data) === false) {

src/Befri.Goldhoo/Befri.Goldhoo.Mobile.MvcUI/Content/themes/Client/version1/themes/Goldhoo/style.css

@@ -1520,4 +1520,14 @@ td .sui-button {
     font-size: 16px;
     font-weight: bold;
     align-items: center;
+    box-sizing: border-box;
+    padding: 0 10px;
+    justify-content: space-between;
+}
+
+.search-title-tools {
+    position: relative;
+    display: flex;
+    align-items: center;
+    font-size: 12px;
 }

src/Befri.Goldhoo/Befri.Goldhoo.Mobile.MvcUI/Views/ProductsShow/CombtDetails.cshtml

@@ -160,5 +160,6 @@
 
 <script>
     $.search.setSearchText('@(ViewBag.SearchText??"")');
-    $.search.selectComboboxByText('产品展示');
+    $.search.disableCombobox();
+    $.search.setCombobox('补件中心', '@Url.Content("~/ProductsShow/Index")');
 </script>

src/Befri.Goldhoo/Befri.Goldhoo.Mobile.MvcUI/Views/ProductsShow/Details.cshtml

@@ -142,5 +142,7 @@
 <!-- End 内容描述 ] -->
 
 <script>
-    $.search.selectComboboxByText('产品展示');
+    $.search.setSearchText('@(ViewBag.SearchText??"")');
+    $.search.disableCombobox();
+    $.search.setCombobox('补件中心', '@Url.Content("~/ProductsShow/Index")');
 </script>

src/Befri.Goldhoo/Befri.Goldhoo.Mobile.MvcUI/Views/ProductsShow/ProductsShow.cshtml

@@ -73,5 +73,6 @@
 
 <script>
     $.search.setSearchText('@(ViewBag.SearchText??"")');
-    $.search.selectComboboxByText('产品展示');
+    $.search.disableCombobox();
+    $.search.setCombobox('产品展示', '@Url.Content("~/ProductsShow/Index")');
 </script>

src/Befri.Goldhoo/Befri.Goldhoo.Mobile.MvcUI/Views/Replenish/Index.cshtml

@@ -197,5 +197,6 @@
 <!-- End 产品列表 ] -->
 <script>
     $.search.setSearchText('@(ViewBag.SearchText??"")');
-    $.search.selectComboboxByText('补件中心');
+    $.search.disableCombobox();
+    $.search.setCombobox('补件中心', '@Url.Content("~/ProductsShow/Index")');
 </script>

src/Befri.Goldhoo/Befri.Goldhoo.Mobile.MvcUI/Views/Search/Index.cshtml

@@ -6,32 +6,47 @@
 
 <div class="Global-Container">
     <!-- 产品展示·商品列表 -->
+    @*<div class="search-title">
+            <div class="search-title-name">产品展示</div>
+            <div class="search-title-tools">
+                <a class="search-title-tools-a" href="@Url.Content("~/ProductsShow/Index")">更多</a>
+            </div>
+        </div>*@
+    <!-- 产品列表 sui/extend/gallery/sui.checkGallery.js -->
+    @*<div class="sui-gallery" data-sui-options="PageSize: 40, Url: '@Url.Content("~/ProductsShow/List")', Theme: 'gallery-theme-Gray', OnBeforeLoad: $.page.onBeforeLoad, OnCreateItem: $.page.onCreateProdoctsShowItem, ATarget: '_child', IsShowPrice: false, ScaleX: 8, ScaleY: 5, IsLoadMore: false"></div>*@
+
+    <!-- 产品中心·商品列表 -->
     <div class="search-title">
-        <div class="search-title-name">产品展示</div>
+        <div class="search-title-name">产品中心</div>
         <div class="search-title-tools">
-            <a class="search-title-tools-a" href="@Url.Content("~/ProductsShow/Index")">更多</a>
+            <a class="search-title-tools-a" target="_blank" href="@Url.Content("~/Product/Index")?searchText=@Model.SearchText">更多</a>
         </div>
     </div>
     <!-- 产品列表 sui/extend/gallery/sui.checkGallery.js -->
-    <div class="sui-gallery" data-sui-options="PageSize: 40, Url: '@Url.Content("~/ProductsShow/List")', Theme: 'gallery-theme-Gray', OnBeforeLoad: $.page.onBeforeLoad, OnCreateItem: $.page.onCreateProdoctsShowItem, ATarget: '_child', IsShowPrice: false, ScaleX: 8, ScaleY: 5, IsLoadMore: false"></div>
-
-    <!-- 产品中心·商品列表 -->
-    <div class="search-title">产品中心</div>
-    <!-- 产品列表 sui/extend/gallery/sui.checkGallery.js -->
     <div class="sui-checkGallery" data-sui-options="PageSize: 20, Url: '@Url.Content("~/Product/List")', Theme: 'gallery-theme-Gray', OnBeforeLoad: $.page.onBeforeLoad, GetItemContentDom: $.page.getProdoctItemContentDom, GetCombtItemContentDom: $.page.getProductCombtItemContentDom, OnClickAddToCart: $.page.productAddToCart, ATarget: '_child', MaxWidth: 1920, ImageWidth: 130, ScaleX: 8, ScaleY: 5, IsLoadMore: false"></div>
 
     <!-- 补件中心·商品列表 -->
-    <div class="search-title">补件中心</div>
+    @*<div class="search-title">补件中心</div>*@
     <!-- 产品列表 sui/extend/gallery/sui.checkGallery.js -->
-    <div id="ReplenishCheckGallery" class="sui-checkGallery" data-sui-options="PageSize: 20, Url: '@Url.Content("~/Replenish/List")', Theme: 'gallery-theme-Gray', OnBeforeLoad: $.page.onBeforeLoad, GetItemContentDom: $.page.getReplenishItemContentDom, GetCombtItemContentDom: $.page.getReplenishCombtItemContentDom, OnClickAddToCart: $.page.replenishCreateOrder, ATarget: '_child', MaxWidth: 1920, ImageWidth: 130, ScaleX: 8, ScaleY: 5, IsLoadMore: false"></div>
+    @*<div id="ReplenishCheckGallery" class="sui-checkGallery" data-sui-options="PageSize: 20, Url: '@Url.Content("~/Replenish/List")', Theme: 'gallery-theme-Gray', OnBeforeLoad: $.page.onBeforeLoad, GetItemContentDom: $.page.getReplenishItemContentDom, GetCombtItemContentDom: $.page.getReplenishCombtItemContentDom, OnClickAddToCart: $.page.replenishCreateOrder, ATarget: '_child', MaxWidth: 1920, ImageWidth: 130, ScaleX: 8, ScaleY: 5, IsLoadMore: false"></div>*@
 
     <!-- 清仓区·商品列表 -->
-    <div class="search-title">清仓区</div>
+    <div class="search-title">
+        <div class="search-title-name">清仓区</div>
+        <div class="search-title-tools">
+            <a class="search-title-tools-a" target="_blank" href="@Url.Content("~/Product/Index")?searchText=@Model.SearchText">更多</a>
+        </div>
+    </div>
     <!-- 产品列表 sui/extend/gallery/sui.checkGallery.js -->
     <div class="sui-checkGallery" data-sui-options="PageSize: 20, Url: '@Url.Content("~/Clearance/List")', Theme: 'gallery-theme-Gray', OnBeforeLoad: $.page.onBeforeLoad, GetLabelDom: $.page.getClearanLabelDom, GetItemContentDom: $.page.getClearanItemContentDom, GetCombtItemContentDom: $.page.getClearanCombtItemContentDom, OnClickAddToCart: $.page.productAddToCart, ATarget: '_child', MaxWidth: 1920, IsLoadMore: false"></div>
 
     <!-- 折扣区·商品列表 -->
-    <div class="search-title">折扣区</div>
+    <div class="search-title">
+        <div class="search-title-name">折扣区</div>
+        <div class="search-title-tools">
+            <a class="search-title-tools-a" target="_blank" href="@Url.Content("~/Product/Index")?searchText=@Model.SearchText">更多</a>
+        </div>
+    </div>
     <!-- 产品列表 sui/extend/gallery/sui.checkGallery.js -->
     <div class="sui-checkGallery" data-sui-options="PageSize: 20, Url: '@Url.Content("~/Discount/List")', Theme: 'gallery-theme-Gray', OnBeforeLoad: $.page.onBeforeLoad, GetItemContentDom: $.page.getDiscountItemContentDom, GetCombtItemContentDom: $.page.getDiscountCombtItemContentDom, OnClickAddToCart: $.page.productAddToCart, ATarget: '_child', MaxWidth: 1920, IsLoadMore: false"></div>
 </div>

src/Befri.Goldhoo/Befri.Goldhoo.Mobile.MvcUI/Views/Shared/_Layout.cshtml

@@ -22,19 +22,19 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, maximum-scale=1.0, user-scalable=0">
     <title>@ViewBag.Title - @Befri.Goldhoo.Mobile.MvcUI.WebConstants.TITLE_NAME</title>
     <link href="@Url.Content("~/Content/themes/SUI/font-awesome/css/all.css")" rel="stylesheet" />
-    <link href="@Url.Content("~/Content/themes/SUI/themes/default/sui.css")?v=1.1.5" rel="stylesheet" />
-    <link href="@Url.Content("~/Content/themes/SUI/extend/topbar/themes/sui.topbar." + Befri.Goldhoo.Mobile.MvcUI.WebConstants.THEMES + ".css")?v=3" rel="stylesheet" />
+    <link href="@Url.Content("~/Content/themes/SUI/themes/default/sui.css")?v=1.2.11" rel="stylesheet" />
+    <link href="@Url.Content("~/Content/themes/SUI/extend/topbar/themes/sui.topbar." + Befri.Goldhoo.Mobile.MvcUI.WebConstants.THEMES + ".css")?v=3.1" rel="stylesheet" />
     <link href="@Url.Content("~/Content/themes/SUI/extend/header/themes/sui.header." + Befri.Goldhoo.Mobile.MvcUI.WebConstants.THEMES + ".css")?v=1.0.1" rel="stylesheet" />
     <link href="@Url.Content("~/Content/themes/Client/version1/themes/" + Befri.Goldhoo.Mobile.MvcUI.WebConstants.THEMES +"/style.css")?v=0.1.2" rel="stylesheet" />
     <script src="@Url.Content("~/Content/themes/Library/jQuery/1.9.1/jquery.min.js")"></script>
     <script src="@Url.Content("~/Content/themes/SUI/src/jquery.mobile.touch.min.js")"></script>
-    <script src="@Url.Content("~/Content/themes/SUI/src/sui.main.js")?v=1.2.10"></script>
+    <script src="@Url.Content("~/Content/themes/SUI/src/sui.main.js")?v=1.2.11"></script>
     <script src="@Url.Content("~/Content/themes/SUI/extend/topbar/sui.topbar.js")?v=3"></script>
     <script src="@Url.Content("~/Content/themes/SUI/extend/header/sui.header.js")?v=1.0.1"></script>
     <script src="@Url.Content("~/Content/themes/Client/version1/src/system.js")?v=1.1.0"></script>
     <script src="@Url.Content("~/Content/themes/Client/version1/src/base.js")?v=1.3.6"></script>
     <script src="@Url.Content("~/Content/themes/Client/version1/src/fixed.js")?v=2"></script>
-    <script src="@Url.Content("~/Content/themes/Client/version1/src/search.js")?v=1.0.4"></script>
+    <script src="@Url.Content("~/Content/themes/Client/version1/src/search.js")?v=1.1.0"></script>
     <script>
         // 必读列表获取地址
         Sys.Config.Add('GetMustReadListUrl', '@Url.Content("~/Activity/ListRequiredReadActivities")');

src/Befri.Goldhoo/Befri.Goldhoo.Mobile.MvcUI/Views/Shared/_LayoutEmpty.cshtml

@@ -13,10 +13,10 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
     <title>@ViewBag.Title - @Befri.Goldhoo.Mobile.MvcUI.WebConstants.TITLE_NAME</title>
     <link href="@Url.Content("~/Content/themes/SUI/font-awesome/css/all.css")" rel="stylesheet" />
-    <link href="@Url.Content("~/Content/themes/SUI/themes/default/sui.css")?v=1.1.5" rel="stylesheet" />
+    <link href="@Url.Content("~/Content/themes/SUI/themes/default/sui.css")?v=1.2.11" rel="stylesheet" />
     <script src="@Url.Content("~/Content/themes/SUI/src/jquery.min.js")"></script>
     <script src="@Url.Content("~/Content/themes/SUI/src/jquery.mobile.touch.min.js")"></script>
-    <script src="@Url.Content("~/Content/themes/SUI/src/sui.main.js")?v=1.2.10"></script>
+    <script src="@Url.Content("~/Content/themes/SUI/src/sui.main.js")?v=1.2.11"></script>
     <script src="@Url.Content("~/Content/themes/Client/version1/src/system.js")?v=1.1.0"></script>
     <script type="text/javascript">
         // 电脑谷歌浏览器下载地址

src/Befri.Goldhoo/Befri.Goldhoo.Mobile.MvcUI/Views/Shared/_PartialTop.cshtml

@@ -67,9 +67,9 @@
                         </div>
                         <div class="topbar-search-combobox-panel">
                             <div class="topbar-search-combobox-item" url="@Url.Content("~/Search/Index")" )>全部</div>
-                            <div class="topbar-search-combobox-item" url="@Url.Content("~/ProductsShow/Index")">产品展示</div>
+                            @*<div class="topbar-search-combobox-item" url="@Url.Content("~/ProductsShow/Index")">产品展示</div>*@
                             <div class="topbar-search-combobox-item" url="@Url.Content("~/Product/Index")">产品中心</div>
-                            <div class="topbar-search-combobox-item" url="@Url.Content("~/Replenish/Index")">补件中心</div>
+                            @*<div class="topbar-search-combobox-item" url="@Url.Content("~/Replenish/Index")">补件中心</div>*@
                             <div class="topbar-search-combobox-item" url="@Url.Content("~/Clearance/Index")">清仓区</div>
                             <div class="topbar-search-combobox-item" url="@Url.Content("~/Discount/Index")">折扣区</div>
                         </div>