diff --git a/app/admin/controller/ReceiveSync.php b/app/admin/controller/ReceiveSync.php index 6f9e237..0a0a95c 100755 --- a/app/admin/controller/ReceiveSync.php +++ b/app/admin/controller/ReceiveSync.php @@ -54,7 +54,7 @@ class ReceiveSync extends Base } $mp = $query->name('product_tco_category') - ->field(['id', 'category_id', 'sync_time']) + ->field(['id', 'tco_id', 'category_id', 'sync_time']) ->where('erp_code', '=', $record['erp_code']) ->where('country_code', '=', $record['country_code']) ->find(); diff --git a/app/index/view/tops_nas/beta.phtml b/app/index/view/tops_nas/beta.phtml index d7499c8..6c2becf 100755 --- a/app/index/view/tops_nas/beta.phtml +++ b/app/index/view/tops_nas/beta.phtml @@ -226,7 +226,7 @@
意见反馈 - 帮助中心 + 帮助中心
diff --git a/app/index/view/tops_nas/helper.phtml b/app/index/view/tops_nas/helper.phtml index 5c8ce91..ad05ed5 100644 --- a/app/index/view/tops_nas/helper.phtml +++ b/app/index/view/tops_nas/helper.phtml @@ -6,6 +6,9 @@ 帮助中心 {include file='include/head-nas' /} - - {include file='include/top-header-nas'/}
+ + {include file='include/top-header-nas'/}
@@ -392,10 +395,10 @@ {/if} {$banners[2]['name']} {$banners[2]['desc']} - + {/if} {if condition="$banners_size > 3"} - + {if condition="!empty($banners[3]['picture']) && $banners[3]['picture'] != '/uploads/nopic.jpg'"} @@ -432,7 +435,7 @@ {/if} {$banners[6]['name']} {$banners[6]['desc']} - + {/if}
@@ -444,32 +447,32 @@ // 监听输入框内容变化 var timeout = null; $('#search-input').on('focus input', function() { - clearTimeout(timeout); - var _this = this; - timeout = setTimeout(function () { - var keywords = $(_this).val(); - if (keywords == '') { - $('#dropdown').hide().html(''); - return; - } - $.ajax({ - url: "{:url('tops_nas/helper_search')}", - type: 'POST', - data: {keywords: keywords}, - dataType: 'JSON', - success: function(r) { - var html = ''; - if (r.code == 0) { - html = '' - } - $('#dropdown').show().html(html); - } - }) - }, 300); + clearTimeout(timeout); + var _this = this; + timeout = setTimeout(function () { + var keywords = $(_this).val(); + if (keywords == '') { + $('#dropdown').hide().html(''); + return; + } + $.ajax({ + url: "{:url('tops_nas/helper_search')}", + type: 'POST', + data: {keywords: keywords}, + dataType: 'JSON', + success: function(r) { + var html = ''; + if (r.code == 0) { + html = '' + } + $('#dropdown').show().html(html); + } + }) + }, 300); }) $(document).on('click', function (e) { var target = $(e.target); diff --git a/app/index/view/tops_nas/helper_detail.phtml b/app/index/view/tops_nas/helper_detail.phtml index 91f2a7b..ebf21c1 100644 --- a/app/index/view/tops_nas/helper_detail.phtml +++ b/app/index/view/tops_nas/helper_detail.phtml @@ -6,6 +6,9 @@ 帮助中心 {include file='include/head-nas' /} {include file='include/head-nas'/}